[arch-commits] Commit in net-snmp/trunk (PKGBUILD snmpd.confd snmpd.rc snmpd.service)
Eric Bélanger
eric at nymeria.archlinux.org
Sun Apr 14 04:21:37 UTC 2013
Date: Sunday, April 14, 2013 @ 06:21:37
Author: eric
Revision: 182743
upgpkg: net-snmp 5.7.2-4
Set PIDFile in snmpd.service (close FS#32258), Disable SMP build (close FS#33757), Remove initscripts support, Add prepare function, Remove old provides array
Modified:
net-snmp/trunk/PKGBUILD
net-snmp/trunk/snmpd.service
Deleted:
net-snmp/trunk/snmpd.confd
net-snmp/trunk/snmpd.rc
---------------+
PKGBUILD | 28 ++++++++++++----------------
snmpd.confd | 5 -----
snmpd.rc | 39 ---------------------------------------
snmpd.service | 3 ++-
4 files changed, 14 insertions(+), 61 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-04-14 01:15:35 UTC (rev 182742)
+++ PKGBUILD 2013-04-14 04:21:37 UTC (rev 182743)
@@ -4,7 +4,7 @@
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 @@
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 @@
}
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"
}
Deleted: snmpd.confd
===================================================================
--- snmpd.confd 2013-04-14 01:15:35 UTC (rev 182742)
+++ snmpd.confd 2013-04-14 04:21:37 UTC (rev 182743)
@@ -1,5 +0,0 @@
-#
-# Parameters to be passed to snmpd
-#
-SNMPD_ARGS=""
-
Deleted: snmpd.rc
===================================================================
--- snmpd.rc 2013-04-14 01:15:35 UTC (rev 182742)
+++ snmpd.rc 2013-04-14 04:21:37 UTC (rev 182743)
@@ -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
Modified: snmpd.service
===================================================================
--- snmpd.service 2013-04-14 01:15:35 UTC (rev 182742)
+++ snmpd.service 2013-04-14 04:21:37 UTC (rev 182743)
@@ -4,7 +4,8 @@
[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]
More information about the arch-commits
mailing list