Patch for bug #342127.

Package-Manager: portage-2.2_rc99/cvs/Linux i686

4 files changed, 70 insertions, 3 deletions

diff --git a/net-libs/libsmi/ChangeLog b/net-libs/libsmi/ChangeLog
index 00c654fb9746..21eaffaf87dd 100644
--- a/net-libs/libsmi/ChangeLog
+++ b/net-libs/libsmi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libsmi
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsmi/ChangeLog,v 1.29 2009/02/20 18:55:13 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsmi/ChangeLog,v 1.30 2010/10/22 16:45:20 jer Exp $
+
+*libsmi-0.4.8-r1 (22 Oct 2010)
+
+  22 Oct 2010; Jeroen Roovers <jer@gentoo.org> +libsmi-0.4.8-r1.ebuild,
+  +files/libsmi-0.4.8-CVE-2010-2891.patch:
+  Patch for bug #342127.
 
   20 Feb 2009; Raúl Porcel <armin76@gentoo.org> libsmi-0.4.8.ebuild:
   Add ~arm/~s390/~sh wrt #247076
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index 14d53ce3dfc9..b054c4aaa27f 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -1,4 +1,6 @@
+AUX libsmi-0.4.8-CVE-2010-2891.patch 589 RMD160 3e54f09da703e63b93fa5a69d762baea89e700db SHA1 fb71eced315bd165b857e150a54153e814b38c84 SHA256 eba2a999d777c7c377bd231ae230e80a8291c65a1d70b8917f06109ff770aba8
 DIST libsmi-0.4.8.tar.gz 4104111 RMD160 66fbe0e0128c4134cce386aaf754a48bb2d2580e SHA1 77c512ccbdd29667d152398b0dcde533aed57b49 SHA256 f048a5270f41bc88b0c3b0a8fe70ca4d716a46b531a0ecaaa87c462f49d74849
+EBUILD libsmi-0.4.8-r1.ebuild 1115 RMD160 86e6ad53cba62039072df5123e84e96c5d485324 SHA1 68100ab850a9bc6c025542eb1627a5a8a58bb461 SHA256 53edb28bc5ca8d6a8291860416212696feff64aef31849a5089d51358bdd3e1d
 EBUILD libsmi-0.4.8.ebuild 1034 RMD160 babbe117a3c2c1dae4d22036be937bdc051eb410 SHA1 8f5d0d70bb9be06568c7a24dd3e9e98cc0c01ffb SHA256 e2cb41f6495eed86aeccfa924e9194e9347825e6fa240b8c7c826679e4fb0147
-MISC ChangeLog 3444 RMD160 4d8e15c73509931c79c2bcddb5d50bc28c4e2246 SHA1 c0c6b6085d8099958765e454909a03c3767db2ac SHA256 793ce026431bda50db07b483ad46e8c379d6ef355fa543aeb41fec23d9ceffaf
+MISC ChangeLog 3613 RMD160 b5abb3f3c1157cf60e7f7dde8f191cb8e457ee35 SHA1 35c532473d07092bafe6c261a664b96bec6e3fd0 SHA256 84ace44a32a4551840ca0f7e6561024f4efc91534fb29b6527e986b16a5bbb76
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
diff --git a/net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch b/net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch
new file mode 100644
index 000000000000..114431d00e31
--- /dev/null
+++ b/net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch
@@ -0,0 +1,21 @@
+Index: lib/smi.c
+===================================================================
+--- lib/smi.c	(revision 29144)
++++ lib/smi.c	(working copy)
+@@ -1793,10 +1793,15 @@
+     }
+ 
+     if (isdigit((int)node2[0])) {
+-	for (oidlen = 0, p = strtok(node2, ". "); p;
++	for (oidlen = 0, p = strtok(node2, ". ");
++	     p && oidlen < sizeof(oid)/sizeof(oid[0]);
+ 	     oidlen++, p = strtok(NULL, ". ")) {
+ 	    oid[oidlen] = strtoul(p, NULL, 0);
+ 	}
++	if (p) {
++	    /* the numeric OID is too long */
++	    return NULL;
++	}
+ 	nodePtr = getNode(oidlen, oid);
+ 	if (nodePtr) {
+ 	    if (modulePtr) {
diff --git a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
new file mode 100644
index 000000000000..330c43daaaee
--- /dev/null
+++ b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsmi/libsmi-0.4.8-r1.ebuild,v 1.1 2010/10/22 16:45:20 jer Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A Library to Access SMI MIB Information"
+SRC_URI="ftp://ftp.ibr.cs.tu-bs.de/pub/local/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.ibr.cs.tu-bs.de/projects/libsmi"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-CVE-2010-2891.patch
+}
+
+src_configure() {
+	replace-flags -O? -O2
+	econf
+}
+
+src_test() {
+	# sming test is known to fail and some other fail if LC_ALL!=C:
+	# http://mail.ibr.cs.tu-bs.de/pipermail/libsmi/2008-March/001014.html
+	sed -i '/^[[:space:]]*smidump-sming.test \\$/d' test/Makefile
+	LC_ALL=C emake -j1 check || die "Make check failed. See above for details."
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+	dodoc smi.conf-example ANNOUNCE ChangeLog README THANKS TODO \
+		doc/{*.txt,smi.dia,smi.dtd,smi.xsd}
+}