Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

13 files changed, 54 insertions, 8 deletions

diff --git a/net/net-snmp/BUILD b/net/net-snmp/BUILD
index d056d75355..53f7a4807d 100755
--- a/net/net-snmp/BUILD
+++ b/net/net-snmp/BUILD
@@ -1,6 +1,7 @@
-OPTS="$OPTS --with-sys-contact=root@$( hostname -f) \
+OPTS="$OPTS --with-sys-contact=root@$(hostname -f) \
     --enable-ucd-snmp-compatibility \
     --with-persistent-directory=/var/state/ucd-snmp --with-defaults"
 
-make_single    &&
-default_build
+make_single &&
+default_build &&
+make_normal
diff --git a/net/net-snmp/DETAILS b/net/net-snmp/DETAILS
index 33c3ac51b5..211ab0cb0b 100755
--- a/net/net-snmp/DETAILS
+++ b/net/net-snmp/DETAILS
@@ -1,10 +1,13 @@
            SPELL=net-snmp
-         VERSION=5.4.2.1
+         VERSION=5.5
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-      SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:dda84a84ab59786b3115dcd15619b8e16d2c55317dc1f81639a113efec08c26f4ef1cc150035f738f2c568a404754c407c6ec705975cf098271b256aa9a82b10
+         SOURCE2=$SOURCE.asc
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+  SOURCE2_URL[0]=$SOURCE_URL.asc
+      SOURCE_GPG=net-snmp.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
         WEB_SITE=http://www.net-snmp.org/
          ENTERED=20011108
       LICENSE[0]=http://www.net-snmp.org/COPYING.txt
diff --git a/net/net-snmp/HISTORY b/net/net-snmp/HISTORY
index 4b8d8e0579..e8c1521cc7 100644
--- a/net/net-snmp/HISTORY
+++ b/net/net-snmp/HISTORY
@@ -1,3 +1,11 @@
+2009-10-01 Vlad Glagolev <stealth@sourcemage.org>
+	* net-snmp.gpg: added gpg keyring
+	* DETAILS: updated spell to 5.5; quoting paths; converted to upstream
+	  signature checking; corrected source urls
+	* init.d/snmpd{,.conf}: added, to provide init script and its config
+	* INSTALL: added, to install default config files (if noone)
+	* BUILD: corrected non-multijob build
+
 2009-08-30 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* TRIGGERS: on_cast perl check_self
 
diff --git a/net/net-snmp/INSTALL b/net/net-snmp/INSTALL
new file mode 100755
index 0000000000..0af111b90c
--- /dev/null
+++ b/net/net-snmp/INSTALL
@@ -0,0 +1,11 @@
+default_install &&
+
+install -vm 755 -d "$INSTALL_ROOT/etc/snmp" &&
+
+if [[ $INIT_INSTALLED ]]; then
+  install_config_file "$SOURCE_DIRECTORY/EXAMPLE.conf.def" \
+                      "$INSTALL_ROOT/etc/snmp/snmpd.conf" &&
+
+  install_config_file "$SPELL_DIRECTORY/init.d/snmpd.conf" \
+                      "$INSTALL_ROOT/etc/sysconfig/snmpd"
+fi
diff --git a/net/net-snmp/init.d/snmpd b/net/net-snmp/init.d/snmpd
new file mode 100755
index 0000000000..1782330c5e
--- /dev/null
+++ b/net/net-snmp/init.d/snmpd
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+. /etc/sysconfig/snmpd
+
+PROGRAM=/usr/sbin/snmpd
+ARGS="-p /var/run/snmpd.pid $SNMPD_ARGS"
+RUNLEVEL=3
+PIDFILE=/var/run/snmpd.pid
+NEEDS="+network"
+
+. /etc/init.d/smgl_init
diff --git a/net/net-snmp/init.d/snmpd.conf b/net/net-snmp/init.d/snmpd.conf
new file mode 100644
index 0000000000..3614aa9719
--- /dev/null
+++ b/net/net-snmp/init.d/snmpd.conf
@@ -0,0 +1,3 @@
+# For the arguments and description see snmpd.conf(5)
+
+SNMPD_ARGS=""
diff --git a/net/net-snmp/net-snmp.gpg b/net/net-snmp/net-snmp.gpg
new file mode 100644
index 0000000000..9cd5d57f8e
--- /dev/null
+++ b/net/net-snmp/net-snmp.gpg
diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE
index 6a83a06a5a..ff1ee321c6 100755
--- a/php-pear/php/CONFIGURE
+++ b/php-pear/php/CONFIGURE
@@ -91,6 +91,9 @@ if list_find "$PHP5_OPTS" "--enable-pdo"; then
 			else
 				config_query_option PHP5_OPTS "Enable PDO driver for $foo?" n "--with-pdo-$foo=${INSTALL_ROOT}/usr" "--without-pdo-$foo"
 			fi
+		else
+			#be sure that the PDO driver is disabled
+			PHP5_OPTS="$PHP5_OPTS --without-pdo-$foo"
 		fi
 	done
 fi &&
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 4e0441ac3e..8b8602d0ee 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,6 @@
+2009-09-30 David Kowis <dkowis@shlrm.org>
+	* CONFIGURE: need to force removing of pdo drivers if they're not selected
+
 2009-09-23 Vlad Glagolev <stealth@sourcemage.org>
 	* DEPENDS: fixed built-in curl support when the subdep is selected
 	* CONFIGURE: fixed some typos
diff --git a/xfce-plugins/xfce4-clipman-plugin/DETAILS b/xfce-plugins/xfce4-clipman-plugin/DETAILS
index 40299b9a66..653306cea2 100755
--- a/xfce-plugins/xfce4-clipman-plugin/DETAILS
+++ b/xfce-plugins/xfce4-clipman-plugin/DETAILS
@@ -1,5 +1,5 @@
            SPELL=xfce4-clipman-plugin
-         VERSION=1.1.0
+         VERSION=1.1.1
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://archive.xfce.org/src/panel-plugins/$SPELL/1.1/$SOURCE
diff --git a/xfce-plugins/xfce4-clipman-plugin/HISTORY b/xfce-plugins/xfce4-clipman-plugin/HISTORY
index e8dc3c3fe9..3ce4aed4fb 100644
--- a/xfce-plugins/xfce4-clipman-plugin/HISTORY
+++ b/xfce-plugins/xfce4-clipman-plugin/HISTORY
@@ -1,3 +1,6 @@
+2009-09-30 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated to version 1.1.1
+
 2009-09-03 George Sherwood <gsherwood@sourcemage.org>
 	* DETAILS: Updated to version 1.1.0. Fixed SOURCE_URL[0]
 
diff --git a/xfce-plugins/xfce4-clipman-plugin/xfce4-clipman-plugin-1.1.0.tar.bz2.sig b/xfce-plugins/xfce4-clipman-plugin/xfce4-clipman-plugin-1.1.0.tar.bz2.sig
deleted file mode 100644
index a8fe258fc8..0000000000
--- a/xfce-plugins/xfce4-clipman-plugin/xfce4-clipman-plugin-1.1.0.tar.bz2.sig
+++ /dev/null
diff --git a/xfce-plugins/xfce4-clipman-plugin/xfce4-clipman-plugin-1.1.1.tar.bz2.sig b/xfce-plugins/xfce4-clipman-plugin/xfce4-clipman-plugin-1.1.1.tar.bz2.sig
new file mode 100644
index 0000000000..227bc8fa55
--- /dev/null
+++ b/xfce-plugins/xfce4-clipman-plugin/xfce4-clipman-plugin-1.1.1.tar.bz2.sig