summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2010-05-12 10:58:36 +0000
committerCarlo Landmeter <clandmeter@gmail.com>2010-05-12 10:58:36 +0000
commit46a1314e8ae3975088f893c2d5c1f519077d175b (patch)
treee88bb2ebd2b50a9ada5a44f62be30a66580ace4a /main
parentab1a76054e476edd4a0342d01ac765af084b7a92 (diff)
downloadaports-46a1314e8ae3975088f893c2d5c1f519077d175b.tar.bz2
aports-46a1314e8ae3975088f893c2d5c1f519077d175b.tar.xz
main/net-snmp: upgrade to 5.5
Diffstat (limited to 'main')
-rw-r--r--main/net-snmp/APKBUILD38
-rw-r--r--main/net-snmp/CVE-2008-6123.patch19
2 files changed, 22 insertions, 35 deletions
diff --git a/main/net-snmp/APKBUILD b/main/net-snmp/APKBUILD
index 7ff3a8ace..ad3462f86 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.4.2.1
-pkgrel=4
+pkgver=5.5
+pkgrel=0
pkgdesc="Simple Network Management Protocol"
url="http://www.net-snmp.org/"
license="GPL"
@@ -14,14 +14,17 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
snmpd.confd
snmptrapd.initd
snmptrapd.confd
- CVE-2008-6123.patch
"
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -p0 -i ../CVE-2008-6123.patch || return 1
+_builddir="$srcdir/$pkgname-$pkgver"
+build() {
+ cd "$_builddir"
+
export lt_cv_sys_max_cmd_len=8192
+
+ #build fails on: libnetsnmpmibs.so: undefined reference to `pthread_create'
+ LDFLAGS="$LDFLAGS -lpthread"
./configure --prefix=/usr \
--sysconfdir=/etc/snmp \
@@ -40,16 +43,20 @@ build() {
--disable-embedded-perl
# embedded-perl seems to create TEXTREL's
- make -j1 || return 1
+ make || return 1
+}
+
+package() {
+ cd "$_builddir"
make -j1 DESTDIR="$pkgdir" install
- install -m755 -D "$srcdir"/snmpd.initd "$pkgdir"/etc/init.d/snmpd
- install -m644 -D "$srcdir"/snmpd.confd "$pkgdir"/etc/conf.d/snmpd
+ install -m755 -D "$srcdir"/snmpd.initd "$pkgdir"/etc/init.d/snmpd
+ install -m644 -D "$srcdir"/snmpd.confd "$pkgdir"/etc/conf.d/snmpd
install -m755 -D "$srcdir"/snmptrapd.initd "$pkgdir"/etc/init.d/snmptrapd
- install -m644 -D "$srcdir"/snmptrapd.confd "$pkgdir"/etc/conf.d/snmptrapd
- install -m644 -D EXAMPLE.conf "$pkgdir"/etc/snmp/snmpd.conf.example
- mkdir -p "$pkgdir"/var/lib/net-snmp
- find "$pkgdir" -name perllocal.pod -delete
+ install -m644 -D "$srcdir"/snmptrapd.confd "$pkgdir"/etc/conf.d/snmptrapd
+ install -m644 -D EXAMPLE.conf "$pkgdir"/etc/snmp/snmpd.conf.example
+ mkdir -p "$pkgdir"/var/lib/net-snmp
+ find "$pkgdir" -name perllocal.pod -delete
}
tools() {
@@ -58,9 +65,8 @@ tools() {
}
-md5sums="984932520143f0c8bf7b7ce1fc9e1da1 net-snmp-5.4.2.1.tar.gz
+md5sums="5b2551e7bd024fbbee84dca22a5f13a1 net-snmp-5.5.tar.gz
198a4a7b80557fa8112394df5ec9914e snmpd.initd
96510a2f3bc9f21648b03f7e8d76c0d3 snmpd.confd
7ce3e9e880fc6313ae87eb000bae4bda snmptrapd.initd
-363f7728a76bdfc46e29b7e1f5cf4950 snmptrapd.confd
-e8eac801c76e03bca7e7bf6b267b0d3d CVE-2008-6123.patch"
+363f7728a76bdfc46e29b7e1f5cf4950 snmptrapd.confd"
diff --git a/main/net-snmp/CVE-2008-6123.patch b/main/net-snmp/CVE-2008-6123.patch
deleted file mode 100644
index b4b06f63e..000000000
--- a/main/net-snmp/CVE-2008-6123.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur snmplib.orig/snmpUDPDomain.c snmplib/snmpUDPDomain.c
---- snmplib.orig/snmpUDPDomain.c 2007-10-11 22:46:30.000000000 +0200
-+++ snmplib/snmpUDPDomain.c 2009-07-10 23:41:37.000000000 +0200
-@@ -104,12 +110,12 @@
- char tmp[64];
- to = (struct sockaddr_in *) &(addr_pair->remote_addr);
- if (to == NULL) {
-- sprintf(tmp, "UDP: [%s]->unknown",
-+ sprintf(tmp, "UDP: unknown->[%s]",
- inet_ntoa(addr_pair->local_addr));
- } else {
-- sprintf(tmp, "UDP: [%s]->", inet_ntoa(addr_pair->local_addr));
-- sprintf(tmp + strlen(tmp), "[%s]:%hd",
-+ sprintf(tmp, "UDP: [%s]:%hu->",
- inet_ntoa(to->sin_addr), ntohs(to->sin_port));
-+ sprintf(tmp + strlen(tmp), "[%s]", inet_ntoa(addr_pair->local_addr));
- }
- return strdup(tmp);
- }