diff options
| -rw-r--r-- | main/net-snmp/APKBUILD | 21 | ||||
| -rw-r--r-- | main/net-snmp/netsnmp-arp-netlink-fix.patch | 19 |
2 files changed, 11 insertions, 29 deletions
diff --git a/main/net-snmp/APKBUILD b/main/net-snmp/APKBUILD index 3552f8046b..a700f6a286 100644 --- a/main/net-snmp/APKBUILD +++ b/main/net-snmp/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=net-snmp -pkgver=5.7.1 -pkgrel=7 +pkgver=5.7.2 +pkgrel=0 pkgdesc="Simple Network Management Protocol" url="http://www.net-snmp.org/" arch="all" @@ -15,7 +15,6 @@ makedepends="perl-dev openssl-dev perl-net-snmp" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-agent-libs:alibs $pkgname-perl:pl $pkgname-gui $pkgname-tools" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - netsnmp-arp-netlink-fix.patch netsnmp-swinst-crash.patch snmpd.initd snmpd.confd @@ -71,11 +70,14 @@ build() { # embedded-perl seems to create TEXTREL's # work around parallell build issue - make sedscript EXAMPLE.conf net-snmp-config-x \ - && make -j1 -C man \ - && make standardall \ - && make net-snmp-create-v3-user \ - && make || return 1 + #make sedscript EXAMPLE.conf net-snmp-config-x \ + # && make -j1 -C man \ + # && make standardall \ + # && make net-snmp-create-v3-user \ + # && make || return 1 + # + # still fails even with the workaround above. + make -j1 || return 1 } package() { @@ -155,8 +157,7 @@ tools() { } -md5sums="c95d08fd5d93df0c11a2e1bdf0e01e0b net-snmp-5.7.1.tar.gz -58bdd8a68042be16c22d8b4b40d3ec9c netsnmp-arp-netlink-fix.patch +md5sums="5bddd02e2f82b62daa79f82717737a14 net-snmp-5.7.2.tar.gz bd7dc10ffb5839e35ec37effcc53c2ad netsnmp-swinst-crash.patch 198a4a7b80557fa8112394df5ec9914e snmpd.initd 96510a2f3bc9f21648b03f7e8d76c0d3 snmpd.confd diff --git a/main/net-snmp/netsnmp-arp-netlink-fix.patch b/main/net-snmp/netsnmp-arp-netlink-fix.patch deleted file mode 100644 index 269f509da9..0000000000 --- a/main/net-snmp/netsnmp-arp-netlink-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- net-snmp-5.7.1/agent/mibgroup/ip-mib/data_access/arp_netlink.c -+++ /home/fabled//net-snmp-5.7.1.patched/agent/mibgroup/ip-mib/data_access/arp_netlink.c -@@ -43,7 +43,7 @@ - if (cache_timeout != NULL) - *cache_timeout = 5; - if (cache_flags != NULL) -- *cache_flags |= NETSNMP_CACHE_RESET_TIMER_ON_USE; -+ *cache_flags |= NETSNMP_CACHE_RESET_TIMER_ON_USE | NETSNMP_CACHE_DONT_FREE_BEFORE_LOAD; - access->cache_expired = cache_expired; - - DEBUGMSGTL(("access:netlink:arp", "create arp cache\n")); -@@ -131,6 +131,7 @@ - unregister_readfd(fd); - close(fd); - access->arch_magic = NULL; -+ access->synchronized = 0; - } - return 0; - } |