Date: Saturday, February 7, 2015 @ 03:58:02 Author: fyan Revision: 230918
upgpkg: net-snmp 5.7.3-1 Modified: net-snmp/trunk/PKGBUILD Deleted: net-snmp/trunk/libnl32.patch ---------------+ PKGBUILD | 19 ++++--------- libnl32.patch | 80 -------------------------------------------------------- 2 files changed, 7 insertions(+), 92 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-02-06 21:31:23 UTC (rev 230917) +++ PKGBUILD 2015-02-07 02:58:02 UTC (rev 230918) @@ -3,8 +3,8 @@ # Contributor: Dale Blount <[email protected]> pkgname=net-snmp -pkgver=5.7.2.1 -pkgrel=3 +pkgver=5.7.3 +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/"; @@ -16,22 +16,17 @@ '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' + snmpd.service snmptrapd.service) +sha1sums=('97dc25077257680815de44e34128d365c76bd839' 'SKIP' '84e32c54d32e6b608747054e04a3ddfe6d6638cc' - '0244e91c7baa0abebfb5c0560e8ce04c966c5992' - '74a9848b95f63378eb1753fc309d2b74de5afb0f') -validpgpkeys=('8AAA779B597B405BBC329B6376CF47B8A77C5329') # Net-SNMP Administrators + '0244e91c7baa0abebfb5c0560e8ce04c966c5992') +validpgpkeys=('8AAA779B597B405BBC329B6376CF47B8A77C5329' + '27CAA4A32E371383A33ED0587D5F9576E0F81533') # Net-SNMP Administrators 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() { Deleted: libnl32.patch =================================================================== --- libnl32.patch 2015-02-06 21:31:23 UTC (rev 230917) +++ libnl32.patch 2015-02-07 02:58:02 UTC (rev 230918) @@ -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
