Date: Thursday, March 13, 2014 @ 16:36:37
Author: fyan
Revision: 207700
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
net-snmp/repos/extra-i686/PKGBUILD
(from rev 207699, net-snmp/trunk/PKGBUILD)
net-snmp/repos/extra-i686/libnl32.patch
(from rev 207699, net-snmp/trunk/libnl32.patch)
net-snmp/repos/extra-i686/snmpd.service
(from rev 207699, net-snmp/trunk/snmpd.service)
net-snmp/repos/extra-i686/snmptrapd.service
(from rev 207699, net-snmp/trunk/snmptrapd.service)
net-snmp/repos/extra-x86_64/PKGBUILD
(from rev 207699, net-snmp/trunk/PKGBUILD)
net-snmp/repos/extra-x86_64/libnl32.patch
(from rev 207699, net-snmp/trunk/libnl32.patch)
net-snmp/repos/extra-x86_64/snmpd.service
(from rev 207699, net-snmp/trunk/snmpd.service)
net-snmp/repos/extra-x86_64/snmptrapd.service
(from rev 207699, net-snmp/trunk/snmptrapd.service)
Deleted:
net-snmp/repos/extra-i686/PKGBUILD
net-snmp/repos/extra-i686/libnl32.patch
net-snmp/repos/extra-i686/snmpd.service
net-snmp/repos/extra-i686/snmptrapd.service
net-snmp/repos/extra-x86_64/PKGBUILD
net-snmp/repos/extra-x86_64/libnl32.patch
net-snmp/repos/extra-x86_64/snmpd.service
net-snmp/repos/extra-x86_64/snmptrapd.service
--------------------------------+
/PKGBUILD | 120 +++++++++++++++++++++++++++++
/libnl32.patch | 160 +++++++++++++++++++++++++++++++++++++++
/snmpd.service | 24 +++++
/snmptrapd.service | 24 +++++
extra-i686/PKGBUILD | 58 --------------
extra-i686/libnl32.patch | 80 -------------------
extra-i686/snmpd.service | 12 --
extra-i686/snmptrapd.service | 12 --
extra-x86_64/PKGBUILD | 58 --------------
extra-x86_64/libnl32.patch | 80 -------------------
extra-x86_64/snmpd.service | 12 --
extra-x86_64/snmptrapd.service | 12 --
12 files changed, 328 insertions(+), 324 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-03-13 15:30:20 UTC (rev 207699)
+++ extra-i686/PKGBUILD 2014-03-13 15:36:37 UTC (rev 207700)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Dale Blount <d...@archlinux.org>
-
-pkgname=net-snmp
-pkgver=5.7.2.1
-pkgrel=1
-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=('BSD')
-depends=('openssl' 'libnl' 'pciutils')
-makedepends=('python2-setuptools')
-optdepends=('perl-term-readkey: for snmpcheck application'
- 'perl-tk: for snmpcheck and tkmib applications'
- 'python2: for the python modules')
-options=('!emptydirs' '!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
- snmpd.service snmptrapd.service libnl32.patch)
-sha1sums=('ea5b8952ca482eceac8cb1f3ffbac50e13c0a5b0'
- 'SKIP'
- '84e32c54d32e6b608747054e04a3ddfe6d6638cc'
- '0244e91c7baa0abebfb5c0560e8ce04c966c5992'
- '74a9848b95f63378eb1753fc309d2b74de5afb0f')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- make PERL_ARCHLIB=/usr/lib/perl5/core_perl
PERL_INC=/usr/lib/perl5/core_perl/CORE distclean
-#
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 --sbindir=/usr/bin \
- --mandir=/usr/share/man \
- --enable-ucd-snmp-compatibility \
- --enable-ipv6 \
- --with-python-modules \
- --with-default-snmp-version="3" \
- --with-sys-contact="root@localhost" \
- --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"
- make NETSNMP_DONT_CHECK_VERSION=1
-}
-
-package() {
- 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 -m644 "${srcdir}/snmpd.service"
"${pkgdir}/usr/lib/systemd/system/snmpd.service"
- install -D -m644 "${srcdir}/snmptrapd.service"
"${pkgdir}/usr/lib/systemd/system/snmptrapd.service"
- install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: net-snmp/repos/extra-i686/PKGBUILD (from rev 207699,
net-snmp/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-03-13 15:36:37 UTC (rev 207700)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer:
+# Contributor: Dale Blount <d...@archlinux.org>
+
+pkgname=net-snmp
+pkgver=5.7.2.1
+pkgrel=2
+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=('BSD')
+depends=('openssl' 'libnl' 'pciutils')
+makedepends=('python2-setuptools')
+optdepends=('perl-term-readkey: for snmpcheck application'
+ 'perl-tk: for snmpcheck and tkmib applications'
+ 'python2: for the python modules')
+options=('!emptydirs' '!makeflags')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
+ snmpd.service snmptrapd.service libnl32.patch)
+sha1sums=('815d4e5520a1ed96a27def33e7534b4190599f0f'
+ 'SKIP'
+ '84e32c54d32e6b608747054e04a3ddfe6d6638cc'
+ '0244e91c7baa0abebfb5c0560e8ce04c966c5992'
+ '74a9848b95f63378eb1753fc309d2b74de5afb0f')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ #make PERL_ARCHLIB=/usr/lib/perl5/core_perl
PERL_INC=/usr/lib/perl5/core_perl/CORE distclean
+
+ #
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 --sbindir=/usr/bin \
+ --mandir=/usr/share/man \
+ --enable-ucd-snmp-compatibility \
+ --enable-ipv6 \
+ --with-python-modules \
+ --with-default-snmp-version="3" \
+ --with-sys-contact="root@localhost" \
+ --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"
+ make NETSNMP_DONT_CHECK_VERSION=1
+}
+
+package() {
+ 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 -m644 "${srcdir}/snmpd.service"
"${pkgdir}/usr/lib/systemd/system/snmpd.service"
+ install -D -m644 "${srcdir}/snmptrapd.service"
"${pkgdir}/usr/lib/systemd/system/snmptrapd.service"
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: extra-i686/libnl32.patch
===================================================================
--- extra-i686/libnl32.patch 2014-03-13 15:30:20 UTC (rev 207699)
+++ extra-i686/libnl32.patch 2014-03-13 15:36:37 UTC (rev 207700)
@@ -1,80 +0,0 @@
-diff -u -r net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c
net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c
---- net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c 2011-09-28
06:53:47.000000000 +0200
-+++ net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c 2012-02-09
20:02:49.136022132 +0100
-@@ -566,8 +566,9 @@
- static int
- tcpTable_load_netlink(void)
- {
-+ int err;
- /* TODO: perhaps use permanent nl handle? */
-- struct nl_handle *nl = nl_handle_alloc();
-+ struct nl_sock *nl = nl_socket_alloc();
-
- if (nl == NULL) {
- DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink
handle\n"));
-@@ -575,10 +576,10 @@
- return -1;
- }
-
-- if (nl_connect(nl, NETLINK_INET_DIAG) < 0) {
-- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink:
%s\n", nl_geterror()));
-- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n",
nl_geterror());
-- nl_handle_destroy(nl);
-+ if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) {
-+ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink:
%s\n", nl_geterror(err)));
-+ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n",
nl_geterror(err));
-+ nl_socket_free(nl);
- return -1;
- }
-
-@@ -590,10 +591,10 @@
- struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK,
NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST);
- nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0);
-
-- if (nl_send_auto_complete(nl, nm) < 0) {
-- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n",
nl_geterror()));
-- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n",
nl_geterror());
-- nl_handle_destroy(nl);
-+ if ((err = nl_send_auto_complete(nl, nm)) < 0) {
-+ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n",
nl_geterror(err)));
-+ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n",
nl_geterror(err));
-+ nl_socket_free(nl);
- return -1;
- }
- nlmsg_free(nm);
-@@ -604,9 +605,9 @@
-
- while (running) {
- if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) {
-- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n",
nl_geterror()));
-- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n",
nl_geterror());
-- nl_handle_destroy(nl);
-+ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n",
nl_geterror(len)));
-+ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n",
nl_geterror(len));
-+ nl_socket_free(nl);
- return -1;
- }
-
-@@ -655,7 +656,7 @@
- free(buf);
- }
-
-- nl_handle_destroy(nl);
-+ nl_socket_free(nl);
-
- if (tcp_head) {
- DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using
netlink\n"));
-diff -u -r net-snmp-5.7.1/configure.d/config_os_libs2
net-snmp-5.7.1-libnl32/configure.d/config_os_libs2
---- net-snmp-5.7.1/configure.d/config_os_libs2 2011-09-28 06:53:47.000000000
+0200
-+++ net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 2012-02-09
20:10:44.282165275 +0100
-@@ -224,8 +224,9 @@
- if test "x$with_nl" != "xno"; then
- case $target_os in
- linux*) # Check for libnl (linux)
-+ CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I libnl-3.0)"
- NETSNMP_SEARCH_LIBS(
-- nl_connect, nl,
-+ nl_connect, nl-3,
- [AC_CHECK_HEADERS(netlink/netlink.h)],,, LMIBLIBS)
- ;;
- esac
Copied: net-snmp/repos/extra-i686/libnl32.patch (from rev 207699,
net-snmp/trunk/libnl32.patch)
===================================================================
--- extra-i686/libnl32.patch (rev 0)
+++ extra-i686/libnl32.patch 2014-03-13 15:36:37 UTC (rev 207700)
@@ -0,0 +1,80 @@
+diff -u -r net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c
net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c
+--- net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c 2011-09-28
06:53:47.000000000 +0200
++++ net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c 2012-02-09
20:02:49.136022132 +0100
+@@ -566,8 +566,9 @@
+ static int
+ tcpTable_load_netlink(void)
+ {
++ int err;
+ /* TODO: perhaps use permanent nl handle? */
+- struct nl_handle *nl = nl_handle_alloc();
++ struct nl_sock *nl = nl_socket_alloc();
+
+ if (nl == NULL) {
+ DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink
handle\n"));
+@@ -575,10 +576,10 @@
+ return -1;
+ }
+
+- if (nl_connect(nl, NETLINK_INET_DIAG) < 0) {
+- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink:
%s\n", nl_geterror()));
+- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n",
nl_geterror());
+- nl_handle_destroy(nl);
++ if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) {
++ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink:
%s\n", nl_geterror(err)));
++ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n",
nl_geterror(err));
++ nl_socket_free(nl);
+ return -1;
+ }
+
+@@ -590,10 +591,10 @@
+ struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK,
NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST);
+ nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0);
+
+- if (nl_send_auto_complete(nl, nm) < 0) {
+- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n",
nl_geterror()));
+- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n",
nl_geterror());
+- nl_handle_destroy(nl);
++ if ((err = nl_send_auto_complete(nl, nm)) < 0) {
++ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n",
nl_geterror(err)));
++ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n",
nl_geterror(err));
++ nl_socket_free(nl);
+ return -1;
+ }
+ nlmsg_free(nm);
+@@ -604,9 +605,9 @@
+
+ while (running) {
+ if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) {
+- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n",
nl_geterror()));
+- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n",
nl_geterror());
+- nl_handle_destroy(nl);
++ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n",
nl_geterror(len)));
++ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n",
nl_geterror(len));
++ nl_socket_free(nl);
+ return -1;
+ }
+
+@@ -655,7 +656,7 @@
+ free(buf);
+ }
+
+- nl_handle_destroy(nl);
++ nl_socket_free(nl);
+
+ if (tcp_head) {
+ DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using
netlink\n"));
+diff -u -r net-snmp-5.7.1/configure.d/config_os_libs2
net-snmp-5.7.1-libnl32/configure.d/config_os_libs2
+--- net-snmp-5.7.1/configure.d/config_os_libs2 2011-09-28 06:53:47.000000000
+0200
++++ net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 2012-02-09
20:10:44.282165275 +0100
+@@ -224,8 +224,9 @@
+ if test "x$with_nl" != "xno"; then
+ case $target_os in
+ linux*) # Check for libnl (linux)
++ CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I libnl-3.0)"
+ NETSNMP_SEARCH_LIBS(
+- nl_connect, nl,
++ nl_connect, nl-3,
+ [AC_CHECK_HEADERS(netlink/netlink.h)],,, LMIBLIBS)
+ ;;
+ esac
Deleted: extra-i686/snmpd.service
===================================================================
--- extra-i686/snmpd.service 2014-03-13 15:30:20 UTC (rev 207699)
+++ extra-i686/snmpd.service 2014-03-13 15:36:37 UTC (rev 207700)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Simple Network Management Protocol (SNMP) Daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/snmpd.pid
-ExecStart=/usr/bin/snmpd -p /run/snmpd.pid
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
Copied: net-snmp/repos/extra-i686/snmpd.service (from rev 207699,
net-snmp/trunk/snmpd.service)
===================================================================
--- extra-i686/snmpd.service (rev 0)
+++ extra-i686/snmpd.service 2014-03-13 15:36:37 UTC (rev 207700)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Simple Network Management Protocol (SNMP) Daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/run/snmpd.pid
+ExecStart=/usr/bin/snmpd -p /run/snmpd.pid
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-i686/snmptrapd.service
===================================================================
--- extra-i686/snmptrapd.service 2014-03-13 15:30:20 UTC (rev 207699)
+++ extra-i686/snmptrapd.service 2014-03-13 15:36:37 UTC (rev 207700)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Simple Network Management Protocol (SNMP) TRAP Daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/snmptrapd.pid
-ExecStart=/usr/bin/snmptrapd -p /run/snmptrapd.pid
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
Copied: net-snmp/repos/extra-i686/snmptrapd.service (from rev 207699,
net-snmp/trunk/snmptrapd.service)
===================================================================
--- extra-i686/snmptrapd.service (rev 0)
+++ extra-i686/snmptrapd.service 2014-03-13 15:36:37 UTC (rev 207700)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Simple Network Management Protocol (SNMP) TRAP Daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/run/snmptrapd.pid
+ExecStart=/usr/bin/snmptrapd -p /run/snmptrapd.pid
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-03-13 15:30:20 UTC (rev 207699)
+++ extra-x86_64/PKGBUILD 2014-03-13 15:36:37 UTC (rev 207700)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Dale Blount <d...@archlinux.org>
-
-pkgname=net-snmp
-pkgver=5.7.2.1
-pkgrel=1
-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=('BSD')
-depends=('openssl' 'libnl' 'pciutils')
-makedepends=('python2-setuptools')
-optdepends=('perl-term-readkey: for snmpcheck application'
- 'perl-tk: for snmpcheck and tkmib applications'
- 'python2: for the python modules')
-options=('!emptydirs' '!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
- snmpd.service snmptrapd.service libnl32.patch)
-sha1sums=('ea5b8952ca482eceac8cb1f3ffbac50e13c0a5b0'
- 'SKIP'
- '84e32c54d32e6b608747054e04a3ddfe6d6638cc'
- '0244e91c7baa0abebfb5c0560e8ce04c966c5992'
- '74a9848b95f63378eb1753fc309d2b74de5afb0f')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- make PERL_ARCHLIB=/usr/lib/perl5/core_perl
PERL_INC=/usr/lib/perl5/core_perl/CORE distclean
-#
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 --sbindir=/usr/bin \
- --mandir=/usr/share/man \
- --enable-ucd-snmp-compatibility \
- --enable-ipv6 \
- --with-python-modules \
- --with-default-snmp-version="3" \
- --with-sys-contact="root@localhost" \
- --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"
- make NETSNMP_DONT_CHECK_VERSION=1
-}
-
-package() {
- 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 -m644 "${srcdir}/snmpd.service"
"${pkgdir}/usr/lib/systemd/system/snmpd.service"
- install -D -m644 "${srcdir}/snmptrapd.service"
"${pkgdir}/usr/lib/systemd/system/snmptrapd.service"
- install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: net-snmp/repos/extra-x86_64/PKGBUILD (from rev 207699,
net-snmp/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-03-13 15:36:37 UTC (rev 207700)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer:
+# Contributor: Dale Blount <d...@archlinux.org>
+
+pkgname=net-snmp
+pkgver=5.7.2.1
+pkgrel=2
+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=('BSD')
+depends=('openssl' 'libnl' 'pciutils')
+makedepends=('python2-setuptools')
+optdepends=('perl-term-readkey: for snmpcheck application'
+ 'perl-tk: for snmpcheck and tkmib applications'
+ 'python2: for the python modules')
+options=('!emptydirs' '!makeflags')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
+ snmpd.service snmptrapd.service libnl32.patch)
+sha1sums=('815d4e5520a1ed96a27def33e7534b4190599f0f'
+ 'SKIP'
+ '84e32c54d32e6b608747054e04a3ddfe6d6638cc'
+ '0244e91c7baa0abebfb5c0560e8ce04c966c5992'
+ '74a9848b95f63378eb1753fc309d2b74de5afb0f')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ #make PERL_ARCHLIB=/usr/lib/perl5/core_perl
PERL_INC=/usr/lib/perl5/core_perl/CORE distclean
+
+ #
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 --sbindir=/usr/bin \
+ --mandir=/usr/share/man \
+ --enable-ucd-snmp-compatibility \
+ --enable-ipv6 \
+ --with-python-modules \
+ --with-default-snmp-version="3" \
+ --with-sys-contact="root@localhost" \
+ --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"
+ make NETSNMP_DONT_CHECK_VERSION=1
+}
+
+package() {
+ 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 -m644 "${srcdir}/snmpd.service"
"${pkgdir}/usr/lib/systemd/system/snmpd.service"
+ install -D -m644 "${srcdir}/snmptrapd.service"
"${pkgdir}/usr/lib/systemd/system/snmptrapd.service"
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: extra-x86_64/libnl32.patch
===================================================================
--- extra-x86_64/libnl32.patch 2014-03-13 15:30:20 UTC (rev 207699)
+++ extra-x86_64/libnl32.patch 2014-03-13 15:36:37 UTC (rev 207700)
@@ -1,80 +0,0 @@
-diff -u -r net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c
net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c
---- net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c 2011-09-28
06:53:47.000000000 +0200
-+++ net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c 2012-02-09
20:02:49.136022132 +0100
-@@ -566,8 +566,9 @@
- static int
- tcpTable_load_netlink(void)
- {
-+ int err;
- /* TODO: perhaps use permanent nl handle? */
-- struct nl_handle *nl = nl_handle_alloc();
-+ struct nl_sock *nl = nl_socket_alloc();
-
- if (nl == NULL) {
- DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink
handle\n"));
-@@ -575,10 +576,10 @@
- return -1;
- }
-
-- if (nl_connect(nl, NETLINK_INET_DIAG) < 0) {
-- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink:
%s\n", nl_geterror()));
-- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n",
nl_geterror());
-- nl_handle_destroy(nl);
-+ if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) {
-+ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink:
%s\n", nl_geterror(err)));
-+ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n",
nl_geterror(err));
-+ nl_socket_free(nl);
- return -1;
- }
-
-@@ -590,10 +591,10 @@
- struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK,
NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST);
- nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0);
-
-- if (nl_send_auto_complete(nl, nm) < 0) {
-- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n",
nl_geterror()));
-- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n",
nl_geterror());
-- nl_handle_destroy(nl);
-+ if ((err = nl_send_auto_complete(nl, nm)) < 0) {
-+ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n",
nl_geterror(err)));
-+ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n",
nl_geterror(err));
-+ nl_socket_free(nl);
- return -1;
- }
- nlmsg_free(nm);
-@@ -604,9 +605,9 @@
-
- while (running) {
- if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) {
-- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n",
nl_geterror()));
-- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n",
nl_geterror());
-- nl_handle_destroy(nl);
-+ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n",
nl_geterror(len)));
-+ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n",
nl_geterror(len));
-+ nl_socket_free(nl);
- return -1;
- }
-
-@@ -655,7 +656,7 @@
- free(buf);
- }
-
-- nl_handle_destroy(nl);
-+ nl_socket_free(nl);
-
- if (tcp_head) {
- DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using
netlink\n"));
-diff -u -r net-snmp-5.7.1/configure.d/config_os_libs2
net-snmp-5.7.1-libnl32/configure.d/config_os_libs2
---- net-snmp-5.7.1/configure.d/config_os_libs2 2011-09-28 06:53:47.000000000
+0200
-+++ net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 2012-02-09
20:10:44.282165275 +0100
-@@ -224,8 +224,9 @@
- if test "x$with_nl" != "xno"; then
- case $target_os in
- linux*) # Check for libnl (linux)
-+ CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I libnl-3.0)"
- NETSNMP_SEARCH_LIBS(
-- nl_connect, nl,
-+ nl_connect, nl-3,
- [AC_CHECK_HEADERS(netlink/netlink.h)],,, LMIBLIBS)
- ;;
- esac
Copied: net-snmp/repos/extra-x86_64/libnl32.patch (from rev 207699,
net-snmp/trunk/libnl32.patch)
===================================================================
--- extra-x86_64/libnl32.patch (rev 0)
+++ extra-x86_64/libnl32.patch 2014-03-13 15:36:37 UTC (rev 207700)
@@ -0,0 +1,80 @@
+diff -u -r net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c
net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c
+--- net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c 2011-09-28
06:53:47.000000000 +0200
++++ net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c 2012-02-09
20:02:49.136022132 +0100
+@@ -566,8 +566,9 @@
+ static int
+ tcpTable_load_netlink(void)
+ {
++ int err;
+ /* TODO: perhaps use permanent nl handle? */
+- struct nl_handle *nl = nl_handle_alloc();
++ struct nl_sock *nl = nl_socket_alloc();
+
+ if (nl == NULL) {
+ DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink
handle\n"));
+@@ -575,10 +576,10 @@
+ return -1;
+ }
+
+- if (nl_connect(nl, NETLINK_INET_DIAG) < 0) {
+- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink:
%s\n", nl_geterror()));
+- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n",
nl_geterror());
+- nl_handle_destroy(nl);
++ if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) {
++ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink:
%s\n", nl_geterror(err)));
++ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n",
nl_geterror(err));
++ nl_socket_free(nl);
+ return -1;
+ }
+
+@@ -590,10 +591,10 @@
+ struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK,
NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST);
+ nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0);
+
+- if (nl_send_auto_complete(nl, nm) < 0) {
+- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n",
nl_geterror()));
+- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n",
nl_geterror());
+- nl_handle_destroy(nl);
++ if ((err = nl_send_auto_complete(nl, nm)) < 0) {
++ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n",
nl_geterror(err)));
++ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n",
nl_geterror(err));
++ nl_socket_free(nl);
+ return -1;
+ }
+ nlmsg_free(nm);
+@@ -604,9 +605,9 @@
+
+ while (running) {
+ if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) {
+- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n",
nl_geterror()));
+- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n",
nl_geterror());
+- nl_handle_destroy(nl);
++ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n",
nl_geterror(len)));
++ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n",
nl_geterror(len));
++ nl_socket_free(nl);
+ return -1;
+ }
+
+@@ -655,7 +656,7 @@
+ free(buf);
+ }
+
+- nl_handle_destroy(nl);
++ nl_socket_free(nl);
+
+ if (tcp_head) {
+ DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using
netlink\n"));
+diff -u -r net-snmp-5.7.1/configure.d/config_os_libs2
net-snmp-5.7.1-libnl32/configure.d/config_os_libs2
+--- net-snmp-5.7.1/configure.d/config_os_libs2 2011-09-28 06:53:47.000000000
+0200
++++ net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 2012-02-09
20:10:44.282165275 +0100
+@@ -224,8 +224,9 @@
+ if test "x$with_nl" != "xno"; then
+ case $target_os in
+ linux*) # Check for libnl (linux)
++ CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I libnl-3.0)"
+ NETSNMP_SEARCH_LIBS(
+- nl_connect, nl,
++ nl_connect, nl-3,
+ [AC_CHECK_HEADERS(netlink/netlink.h)],,, LMIBLIBS)
+ ;;
+ esac
Deleted: extra-x86_64/snmpd.service
===================================================================
--- extra-x86_64/snmpd.service 2014-03-13 15:30:20 UTC (rev 207699)
+++ extra-x86_64/snmpd.service 2014-03-13 15:36:37 UTC (rev 207700)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Simple Network Management Protocol (SNMP) Daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/snmpd.pid
-ExecStart=/usr/bin/snmpd -p /run/snmpd.pid
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
Copied: net-snmp/repos/extra-x86_64/snmpd.service (from rev 207699,
net-snmp/trunk/snmpd.service)
===================================================================
--- extra-x86_64/snmpd.service (rev 0)
+++ extra-x86_64/snmpd.service 2014-03-13 15:36:37 UTC (rev 207700)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Simple Network Management Protocol (SNMP) Daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/run/snmpd.pid
+ExecStart=/usr/bin/snmpd -p /run/snmpd.pid
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-x86_64/snmptrapd.service
===================================================================
--- extra-x86_64/snmptrapd.service 2014-03-13 15:30:20 UTC (rev 207699)
+++ extra-x86_64/snmptrapd.service 2014-03-13 15:36:37 UTC (rev 207700)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Simple Network Management Protocol (SNMP) TRAP Daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/snmptrapd.pid
-ExecStart=/usr/bin/snmptrapd -p /run/snmptrapd.pid
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
Copied: net-snmp/repos/extra-x86_64/snmptrapd.service (from rev 207699,
net-snmp/trunk/snmptrapd.service)
===================================================================
--- extra-x86_64/snmptrapd.service (rev 0)
+++ extra-x86_64/snmptrapd.service 2014-03-13 15:36:37 UTC (rev 207700)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Simple Network Management Protocol (SNMP) TRAP Daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/run/snmptrapd.pid
+ExecStart=/usr/bin/snmptrapd -p /run/snmptrapd.pid
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
