diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2010-03-22 18:13:56 +0300 |
|---|---|---|
| committer | Sergey Lapin <slapin@ossfans.org> | 2010-03-22 18:13:56 +0300 |
| commit | 3937c88166a493900a694ea8fe53b860f4099d83 (patch) | |
| tree | 57597245b6efd4cf27c1f4c9ff21c0515e530c15 /recipes/net-snmp | |
| parent | df2ace6d59e22b42e50bcf4e8a9c92b580602c2e (diff) | |
| parent | 3510d2ed15a4b477aa7af802a839e11a87b981ed (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/net-snmp')
| -rw-r--r-- | recipes/net-snmp/net-snmp-5.4.2.1/CVE-2008-6123.patch | 21 | ||||
| -rw-r--r-- | recipes/net-snmp/net-snmp.inc | 2 | ||||
| -rw-r--r-- | recipes/net-snmp/net-snmp_5.4.2.1.bb | 3 |
3 files changed, 24 insertions, 2 deletions
diff --git a/recipes/net-snmp/net-snmp-5.4.2.1/CVE-2008-6123.patch b/recipes/net-snmp/net-snmp-5.4.2.1/CVE-2008-6123.patch new file mode 100644 index 0000000000..5d4658cf7d --- /dev/null +++ b/recipes/net-snmp/net-snmp-5.4.2.1/CVE-2008-6123.patch @@ -0,0 +1,21 @@ +http://bugs.gentoo.org/show_bug.cgi?id=250429 + +diff -Naur a/snmplib.orig/snmpUDPDomain.c b/snmplib/snmpUDPDomain.c +--- a/snmplib.orig/snmpUDPDomain.c 2007-10-11 22:46:30.000000000 +0200 ++++ b/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); + } diff --git a/recipes/net-snmp/net-snmp.inc b/recipes/net-snmp/net-snmp.inc index 7ba48c6dec..a96ae70f39 100644 --- a/recipes/net-snmp/net-snmp.inc +++ b/recipes/net-snmp/net-snmp.inc @@ -8,7 +8,7 @@ RDEPENDS_${PN}-dev = "net-snmp-client (= ${EXTENDPV}) net-snmp-server (= ${EXTEN RRECOMMENDS_${PN}-dbg = "net-snmp-client (= ${EXTENDPV}) net-snmp-server (= ${EXTENDPV})" INC_PR = "r5" -inherit autotools update-rc.d +inherit autotools update-rc.d siteinfo TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/recipes/net-snmp/net-snmp_5.4.2.1.bb b/recipes/net-snmp/net-snmp_5.4.2.1.bb index 7e81151c6d..f22120c7dd 100644 --- a/recipes/net-snmp/net-snmp_5.4.2.1.bb +++ b/recipes/net-snmp/net-snmp_5.4.2.1.bb @@ -1,8 +1,9 @@ require net-snmp.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://configure-tail.patch;patch=1 \ + file://CVE-2008-6123.patch;patch=1 \ file://init \ file://snmpd.conf \ file://snmptrapd.conf" |