Mon Apr 15 00:06:15 PDT 2013

4 files changed, 15 insertions, 62 deletions

diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD
index 354e3f56a..ead8059fa 100644
--- a/extra/net-snmp/PKGBUILD
+++ b/extra/net-snmp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 179640 2013-03-08 23:40:45Z foutrelis $
+# $Id: PKGBUILD 182744 2013-04-14 04:22:21Z eric $
 # Maintainer:
 # Contributor: Dale Blount <dale@archlinux.org>
 
 pkgname=net-snmp
 pkgver=5.7.2
-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/"
@@ -14,25 +14,23 @@ 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')
-backup=('etc/conf.d/snmpd')
-options=('!libtool' '!emptydirs')
+options=('!libtool' '!emptydirs' '!makeflags')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
-        snmpd.confd snmpd.rc snmpd.service libnl32.patch)
+        snmpd.service libnl32.patch)
 sha1sums=('c493027907f32400648244d81117a126aecd27ee'
-          '25ee4b2e7b5a1b91122d06e82d41ef5bb5359d6d'
-          'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b'
-          '90600c0141eed10d6e3ca3ccc97ad8dda15c2112'
-          'f59ddc049c1c689f04e68c3c7cd8b8e301df3158'
+          'SKIP'
+          '2ad00f89ecb8ec97adfbae7adfbfa3499319e5d7'
           '74a9848b95f63378eb1753fc309d2b74de5afb0f')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694
+prepare() {
+  cd ${pkgname}-${pkgver}
+# http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694
   patch -Np1 -i "$srcdir/libnl32.patch"
   autoreconf -f -i
+}
 
+build() {
+  cd ${pkgname}-${pkgver}
   PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --mandir=/usr/share/man \
@@ -50,11 +48,9 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   sed -i -e "s:install --basedir=\$\$dir:install --basedir=\$\$dir --root=${pkgdir}:" Makefile
   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 "${srcdir}/snmpd.service" "${pkgdir}/usr/lib/systemd/system/snmpd.service"
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/net-snmp/snmpd.confd b/extra/net-snmp/snmpd.confd
deleted file mode 100644
index 926b09bbf..000000000
--- a/extra/net-snmp/snmpd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters to be passed to snmpd
-#
-SNMPD_ARGS=""
-
diff --git a/extra/net-snmp/snmpd.rc b/extra/net-snmp/snmpd.rc
deleted file mode 100644
index b00c09f4f..000000000
--- a/extra/net-snmp/snmpd.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /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 $SNMPD_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/snmpd.pid
-      add_daemon snmpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Net-SNMP"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/snmpd.pid
-      rm_daemon snmpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/net-snmp/snmpd.service b/extra/net-snmp/snmpd.service
index 111a8d6a9..3e5dbc534 100644
--- a/extra/net-snmp/snmpd.service
+++ b/extra/net-snmp/snmpd.service
@@ -4,7 +4,8 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/snmpd
+PIDFile=/run/snmpd.pid
+ExecStart=/usr/sbin/snmpd -p /run/snmpd.pid
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]