[arch-commits] Commit in net-snmp/trunk (PKGBUILD snmpd.confd snmpd.rc)

[Eric Bélanger]

    Date: Sunday, August 21, 2011 @ 08:33:57
  Author: eric
Revision: 136007

upgpkg: net-snmp 5.6.1-4

	Add config file to specify options to daemon (close FS#23095), Update setuptools makedepends to python2-distribute

Added:
  net-snmp/trunk/snmpd.confd
Modified:
  net-snmp/trunk/PKGBUILD
  net-snmp/trunk/snmpd.rc

-------------+
 PKGBUILD    |   21 +++++++++++----------
 snmpd.confd |    5 +++++
 snmpd.rc    |    3 ++-
 3 files changed, 18 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-21 12:22:50 UTC (rev 136006)
+++ PKGBUILD	2011-08-21 12:33:57 UTC (rev 136007)
@@ -1,30 +1,31 @@
 # $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
+# Maintainer: 
 # Contributor: Dale Blount <dale at archlinux.org>
 
 pkgname=net-snmp
 pkgver=5.6.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
 arch=('i686' 'x86_64')
 url="http://www.net-snmp.org/"
 license=('custom')
 depends=('openssl' 'libnl')
-makedepends=('setuptools')
+makedepends=('python2-distribute')
 optdepends=('perl-term-readkey: for snmpcheck application' 
             'perl-tk: for snmpcheck and tkmib applications'
             'python2: for the python modules')
 provides=('ucd-snmp')
 options=('!libtool' '!makeflags' '!emptydirs')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'snmpd.rc')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        snmpd.confd snmpd.rc)
 md5sums=('b4e30ead5783b0bb1d280172c6095ea4'
-         '9f0d13676ba1fae1eb7eb178edd85b43')
+         '37bc5db8707004fe284c202437c6aa7d'
+         'edab44a12f76045e41340d433a79dcec')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in
-  ./configure --prefix=/usr \
+  PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --mandir=/usr/share/man \
     --enable-ucd-snmp-compatibility \
@@ -35,14 +36,14 @@
     --with-sys-location="Unknown" \
     --with-logfile="/var/log/snmpd.log" \
     --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \
-    --with-persistent-directory="/var/net-snmp" \
-    PYTHONPROG=/usr/bin/python2
-  make NETSNMP_DONT_CHECK_VERSION=1 LDFLAGS+="-Wl,-rpath -Wl,/usr/lib/perl5/core_perl/CORE"
+    --with-persistent-directory="/var/net-snmp"
+  make NETSNMP_DONT_CHECK_VERSION=1
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install
   install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
+  install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd"
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Added: snmpd.confd
===================================================================
--- snmpd.confd	                        (rev 0)
+++ snmpd.confd	2011-08-21 12:33:57 UTC (rev 136007)
@@ -0,0 +1,5 @@
+#
+# Parameters to be passed to snmpd
+#
+SNMPD_ARGS=""
+

Modified: snmpd.rc
===================================================================
--- snmpd.rc	2011-08-21 12:22:50 UTC (rev 136006)
+++ snmpd.rc	2011-08-21 12:33:57 UTC (rev 136007)
@@ -2,12 +2,13 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
+. /etc/conf.d/snmpd
 
 PID=`pidof -o %PPID /usr/sbin/snmpd`
 case "$1" in
   start)
     stat_busy "Starting Net-SNMP"
-    [ -z "$PID" ] && /usr/sbin/snmpd
+    [ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS
     if [ $? -gt 0 ]; then
       stat_fail
     else