diff options
author | David Haley | 2010-08-31 19:10:56 -0500 |
---|---|---|
committer | David Haley | 2010-08-31 19:10:56 -0500 |
commit | 1f3223dbb8b8e9b4f8dba5271d03833ffeb622f5 (patch) | |
tree | 9af1eb26bd3e000a002eb4f58d0ec288502009fa | |
parent | cf023f25b519178d42bab651878c58595870b85b (diff) | |
parent | 1eb5d70b4cf6e054e88e192279742ec7c7efbb9d (diff) |
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
-rw-r--r-- | chat-im/prosody/HISTORY | 3 | ||||
-rw-r--r-- | chat-im/prosody/init.d/smgl-prosody | 23 | ||||
-rwxr-xr-x | net/net-snmp/BUILD | 4 | ||||
-rw-r--r-- | net/net-snmp/HISTORY | 3 | ||||
-rwxr-xr-x | news/slrn/DETAILS | 4 | ||||
-rw-r--r-- | news/slrn/HISTORY | 3 | ||||
-rwxr-xr-x | security/wireshark/DETAILS | 4 | ||||
-rw-r--r-- | security/wireshark/HISTORY | 3 | ||||
-rwxr-xr-x | video/mplayer/DEPENDS | 3 | ||||
-rw-r--r-- | video/mplayer/HISTORY | 3 |
10 files changed, 47 insertions, 6 deletions
diff --git a/chat-im/prosody/HISTORY b/chat-im/prosody/HISTORY index 8801480597..8af8daa254 100644 --- a/chat-im/prosody/HISTORY +++ b/chat-im/prosody/HISTORY @@ -1,3 +1,6 @@ +2010-08-31 Arjan Bouter <abouter@sourcemage.org> + * init.d/smgl-prosody: fixed init script + 2010-07-14 Arjan Bouter <abouter@sourcemage.org> * prosody.log: removed diff --git a/chat-im/prosody/init.d/smgl-prosody b/chat-im/prosody/init.d/smgl-prosody index a142a00217..bb601a4deb 100644 --- a/chat-im/prosody/init.d/smgl-prosody +++ b/chat-im/prosody/init.d/smgl-prosody @@ -1,7 +1,30 @@ #!/bin/bash PROGRAM="/usr/bin/prosody" +ARGS="start" RUNLEVEL=3 NEEDS="+remote_fs +network" . /etc/init.d/smgl_init + +start() { + echo -n "Starting Prosody..." + su -s /bin/bash -c "/usr/bin/prosodyctl start" + evaluate_retval +} + +stop() { + echo -n "Stopping Prosody..." + su -s /bin/bash -c "/usr/bin/prosodyctl stop" + evaluate_retval +} + +restart() { + echo -n "Restarting Prosody..." + su -s /bin/bash -c "/usr/bin/prosodyctl restart" + evaluate_retval +} + +status() { + su -s /bin/bash -c "/usr/bin/prosodyctl status" +} diff --git a/net/net-snmp/BUILD b/net/net-snmp/BUILD index 53f7a4807d..db32e6a846 100755 --- a/net/net-snmp/BUILD +++ b/net/net-snmp/BUILD @@ -1,6 +1,8 @@ OPTS="$OPTS --with-sys-contact=root@$(hostname -f) \ --enable-ucd-snmp-compatibility \ - --with-persistent-directory=/var/state/ucd-snmp --with-defaults" + --with-persistent-directory=/var/state/ucd-snmp \ + --with-mib-modules=ucd-snmp/diskio \ + --with-defaults" make_single && default_build && diff --git a/net/net-snmp/HISTORY b/net/net-snmp/HISTORY index aec5d26fc7..a23f970f76 100644 --- a/net/net-snmp/HISTORY +++ b/net/net-snmp/HISTORY @@ -1,3 +1,6 @@ +2010-08-31 Vlad Glagolev <stealth@sourcemage.org> + * BUILD: added useful ucd-snmp/diskio module to build + 2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster@sourcemage.org> * DEPENDS: updated mysql dependency to MYSQL provider diff --git a/news/slrn/DETAILS b/news/slrn/DETAILS index 47aa9047bd..6be3fb61f5 100755 --- a/news/slrn/DETAILS +++ b/news/slrn/DETAILS @@ -1,9 +1,9 @@ SPELL=slrn - VERSION=0.9.9 + VERSION=0.9.9p1 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE - SOURCE_HASH=sha512:ea882e4a1a93d7c05c699928cba2b4ea5cf0c32959f720666828306180842c703af2e50ca4b990bcfddf67aae7dc7adec85cd29e883c5c0d3b60585ccdc4576e + SOURCE_HASH=sha512:87774cce2c3e443b19460add0a0b02d3505b26f23fc07be75317c0ef6e09d03151567402a9444e83d1d99caebc3fd0b7f8c9ea6cba991ac0b85617314897f93d WEB_SITE=http://slrn.sourceforge.net/ ENTERED=20010922 LICENSE=GPL diff --git a/news/slrn/HISTORY b/news/slrn/HISTORY index bc4cb3314d..f4897be825 100644 --- a/news/slrn/HISTORY +++ b/news/slrn/HISTORY @@ -1,3 +1,6 @@ +2010-08-31 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 0.9.9p1 + 2008-08-30 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * DETAILS: changed the SOURCE_URL to use the mirror variable diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS index eaab442cc4..2322989492 100755 --- a/security/wireshark/DETAILS +++ b/security/wireshark/DETAILS @@ -1,11 +1,11 @@ SPELL=wireshark - VERSION=1.2.10 + VERSION=1.4.0 SECURITY_PATCH=24 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE - SOURCE_HASH=sha512:9c350f3178eed07c7b7dee15f717b4d37969a9c7df1143d4d49b0c0559565abbad6a535ab8052169e3b5cf2eb0925ba5ee3e986dff5662f5ac7dd997566f13d7 + SOURCE_HASH=sha512:ffe075be34d7610b6e80cf6b685dcf807179d4d63e96e8d6d967c0e54c8d741b365bf999e9b539c267e5a86caae802632faf34478eee6f422cc2256c294d29c5 WEB_SITE=http://www.wireshark.org/ ENTERED=20020116 LICENSE[0]=GPL diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY index a5da646c63..4c24a5ccbe 100644 --- a/security/wireshark/HISTORY +++ b/security/wireshark/HISTORY @@ -1,3 +1,6 @@ +2010-08-30 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 1.4.0 + 2010-07-30 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 1.2.10; SECURITY_PATCH++ diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS index e2f00825ef..4570032889 100755 --- a/video/mplayer/DEPENDS +++ b/video/mplayer/DEPENDS @@ -92,4 +92,5 @@ optional_depends libdvdread "" "--disable-dvdread" "support for reading scrambl optional_depends fribidi "" "--disable-fribidi" "for locales writing from right to left" && optional_depends enca "" "--disable-enca" "for ENCA charset oracle library" && optional_depends OPENAL "" "--disable-openal" "for OpenAL sound support" && -optional_depends samba "--enable-smb" "" "for SMB protocol support" +optional_depends samba "--enable-smb" "" "for SMB protocol support" && +optional_depends yasm "" "--yasm=" "for NASM assembler support" diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY index 75df611d0f..27f8c3765a 100644 --- a/video/mplayer/HISTORY +++ b/video/mplayer/HISTORY @@ -1,3 +1,6 @@ +2010-08-31 Philippe "Puppet_Master" Caseiro <puppetmaster@sourcemage.org> + * DEPENDS: added optional dep on yasm + 2010-06-03 Vlad Glagolev <stealth@sourcemage.org> * DEPENDS: removed polypaudio; pulseaudio isn't SVN anymore; cleaned up; replaced tabs with spaces |