summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Scherbaum <dertobi123@gentoo.org>2009-07-11 08:05:48 +0000
committerTobias Scherbaum <dertobi123@gentoo.org>2009-07-11 08:05:48 +0000
commit37a2d2b8714fb358ba42a3f3308363e49e817d40 (patch)
treef0869515f187cd8f39d0f46a865408758e46785b /net-analyzer/net-snmp
parentx11-drivers/xf86-input-dynapro: drop old ebuilds (diff)
downloadhistorical-37a2d2b8714fb358ba42a3f3308363e49e817d40.tar.gz
historical-37a2d2b8714fb358ba42a3f3308363e49e817d40.tar.bz2
historical-37a2d2b8714fb358ba42a3f3308363e49e817d40.zip
Update patch for CVE-2008-6123
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'net-analyzer/net-snmp')
-rw-r--r--net-analyzer/net-snmp/ChangeLog6
-rw-r--r--net-analyzer/net-snmp/Manifest4
-rw-r--r--net-analyzer/net-snmp/files/CVE-2008-6123.patch31
3 files changed, 7 insertions, 34 deletions
diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index ed1e5ffde637..d9032d0fc699 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/net-snmp
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.191 2009/07/10 21:58:28 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.192 2009/07/11 08:05:48 dertobi123 Exp $
+
+ 11 Jul 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+ files/CVE-2008-6123.patch:
+ Update patch for CVE-2008-6123
*net-snmp-5.4.2.1-r1 (10 Jul 2009)
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 82a2ddd85462..cef20f0fd651 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,4 +1,4 @@
-AUX CVE-2008-6123.patch 1717 RMD160 64a8369454866fa66067a0aa6b52b2d6bc3e153c SHA1 229e044b440b71a5fcabc190634e000f97d98814 SHA256 4ec0b0930db75d38fed66e3c3d1a9332945a7285238ac449201e64ed295abda7
+AUX CVE-2008-6123.patch 867 RMD160 1e8b6521ae0955681493c1ba594eb0344183e147 SHA1 3742c405fab9ac829acc93383bc39ba5b39962e9 SHA256 31a9b72b252582cd84e7f673b670ebbd2153dc719894aa668a48b24d6ba516f6
AUX net-snmp-5.1.2-snmpconf-selinux.patch 286 RMD160 c78fd9d2a563ebafd21aa85a582b989a805eb645 SHA1 159990e855cfeb50ac3657d1b97eda181d4ffb9e SHA256 70b4bdaa243efd5ae5703b3272063314fc56b6e2333f7c650b635ddab141f874
AUX snmpd.conf 598 RMD160 c72a20fe6d4682ceea533587762782d62906b630 SHA1 51ebdca93c68ca04b7f402fad4f504422ec2c6cf SHA256 1f4f07b831c3227588fd546423137ed5c60a602fbee13b0d66edd801e4e7d598
AUX snmpd.rc7 706 RMD160 137d85e5f2b7cae62e214141aabcec495777007e SHA1 8d94d3bb2d3b43e20604030dc585c735685cf99b SHA256 93337ebeac92ec0073c896db0a4384beebf84ee17365bdc2594285fd33ac7dfe
@@ -7,5 +7,5 @@ AUX snmptrapd.rc7 557 RMD160 e67117fbcb0a6f8668cb1abbc8fcfcb548ebfdb5 SHA1 dcaac
DIST net-snmp-5.4.2.1.tar.gz 5185390 RMD160 2148c42d486ed88f9cfc3ca1d50c68abcd7e3d63 SHA1 4f2df9ea62344fe840f493d0e08abe5de3697862 SHA256 11a8baf167f7bfff60d2590e050991400a3a082923dbcdbf85e0e0ce46eb247c
EBUILD net-snmp-5.4.2.1-r1.ebuild 5454 RMD160 a70998f640d6ec7c0d10634e04bf5ca97fd054a1 SHA1 851f92c813b3b7c00808325f611aa665dee316b7 SHA256 2ec234fcf3fa8aa35c1525ea76b121657d108ae944ad31e83e4bc7ea331252d5
EBUILD net-snmp-5.4.2.1.ebuild 5373 RMD160 f4b6092b59df20c6b35af8c49667ab345c0df0ce SHA1 e233b605178ba053ae16e6116072cc7ee61ea019 SHA256 d581aa2e578fab9f4b73e0ef77e9fbc587d1de2fc8c3da050b7fe02aa749e702
-MISC ChangeLog 32212 RMD160 bb15701134bf679be3df865298d805078acf80c7 SHA1 aea4c8e21f612176b504448aa81551b559c0dcf5 SHA256 fb211e3b6a289d6482b8bce78b56a1a980bdb41ef3a9b0e536aa52341486497c
+MISC ChangeLog 32331 RMD160 b64aa30194743e0d69998edb1df039a15aa611dd SHA1 483c79ed30eed8bb9132dd901941880fb05206e9 SHA256 573282d0c4c57f6762dc3e6ac5b525ae2b6ae51384e1ac1ca797425e35fddb6d
MISC metadata.xml 674 RMD160 102cd7df943ef25f0f462f2520fa77ceac3b5680 SHA1 90b51daab27e161a48feed336a348a8ecf0865c2 SHA256 233feade72f1b013bb5b0739478ab7200727db25a1d06977d0d122862565de24
diff --git a/net-analyzer/net-snmp/files/CVE-2008-6123.patch b/net-analyzer/net-snmp/files/CVE-2008-6123.patch
index 557d71b85539..b4b06f63e9f1 100644
--- a/net-analyzer/net-snmp/files/CVE-2008-6123.patch
+++ b/net-analyzer/net-snmp/files/CVE-2008-6123.patch
@@ -1,19 +1,6 @@
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
-@@ -65,6 +65,12 @@
- #define INADDR_NONE -1
- #endif
-
-+#ifdef MSG_DONTWAIT
-+#define NETSNMP_DONTWAIT MSG_DONTWAIT
-+#else
-+#define NETSNMP_DONTWAIT 0
-+#endif
-+
- static netsnmp_tdomain udpDomain;
-
- typedef struct netsnmp_udp_addr_pair_s {
@@ -104,12 +110,12 @@
char tmp[64];
to = (struct sockaddr_in *) &(addr_pair->remote_addr);
@@ -30,21 +17,3 @@ diff -Naur snmplib.orig/snmpUDPDomain.c snmplib/snmpUDPDomain.c
}
return strdup(tmp);
}
-@@ -140,7 +146,7 @@
- msg.msg_control = &cmsg;
- msg.msg_controllen = sizeof(cmsg);
-
-- r = recvmsg(s, &msg, 0);
-+ r = recvmsg(s, &msg, NETSNMP_DONTWAIT);
-
- if (r == -1) {
- return -1;
-@@ -215,7 +221,7 @@
- #if defined(linux) && defined(IP_PKTINFO)
- rc = netsnmp_udp_recvfrom(t->sock, buf, size, from, &fromlen, &(addr_pair->local_addr));
- #else
-- rc = recvfrom(t->sock, buf, size, 0, from, &fromlen);
-+ rc = recvfrom(t->sock, buf, size, NETSNMP_DONTWAIT, from, &fromlen);
- #endif /* linux && IP_PKTINFO */
- if (rc < 0 && errno != EINTR) {
- break;