Bump

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/vmware@3028 6952d904-891a-0410-993b-d76249ca496b
2011-11-12 11:30:04 +00:00 · 2011-11-12 11:30:04 +00:00 · f7b5b22458
parent 8e4acf575b
commit f7b5b22458
5 changed files with 53 additions and 9 deletions
--- a/dev-libs/expat/ChangeLog
+++ b/dev-libs/expat/ChangeLog
@ -1,7 +1,11 @@
 # ChangeLog for dev-libs/expat
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $

+  12 Nov 2011; Mario Fetka <mario.fetka@gmail.com> expat-1.95.8.ebuild,
+  +files/expat-CVE-2009-2625.patch, +files/expat-CVE-2009-3560.patch:
+  Correct multilib build
+
  20 Aug 2010; Mario Fetka <mario.fetka@gmail.com> +metadata.xml:
  Initial checkin of lib only expat for vmnware

--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@ -1,4 +1,6 @@
+AUX expat-CVE-2009-2625.patch 508 RMD160 16a19965ad4df09d057c8287801ea22be2fcab41 SHA1 4addddc878f9764539dc1ffac378a657c9a05463 SHA256 17dc95fe3003a21961ef90baf4f54df7fcc6f3b4c309327653cf4dd552ec8e9b
+AUX expat-CVE-2009-3560.patch 573 RMD160 9fc974347eb3f58a95a25e0af4cc0ab87a3cd498 SHA1 dc58791cf6c0835f695498e3a96ae909ba58a258 SHA256 52176c7fcd8c1d0cf686396fc7c6f48df97cd990de8a71b0598a1b6d337b631b
 DIST expat-1.95.8.tar.gz 318349 RMD160 1b3e5a50a28e2c8efb79188d4c3071318fe1d0dd SHA1 73cb8fc326d04c44ae0e3b3f797f0e6ba9c4121f SHA256 c6aaa0b427e775a0fd5a956a75ae41e5110f22760723d9bda316100010e891ca
-EBUILD expat-1.95.8.ebuild 1049 RMD160 397cbba1b95eb164634364e142b83646ed8ccefa SHA1 f1fae3c2cdf5f6be248e94f0e07ca322161c740c SHA256 9a8ef3fb474ec4c4de68266a9cd3dc6f6222a0917acf6cfc3380e63424479bcc
-MISC ChangeLog 230 RMD160 3d1d90415c1575a4843f91360481ea2047844d3b SHA1 dcfb7d50b6078f73a5e4357045341fab43191909 SHA256 8f4bf83b51cef1a02e37cdf8d007158939ef5552b5eb6f84d0a4147590372fc9
+EBUILD expat-1.95.8.ebuild 1384 RMD160 c2027c3fac04404ad1525aac4a7958f592c0de1d SHA1 397ce66473e541d4d28b86d0bdb12649b6f997a8 SHA256 58b76f730cb636661a5cdac8d4a0082af911941fa459419f8a2781841368fe71
+MISC ChangeLog 398 RMD160 7bf2c11108dd71f9014618a57c9d9ae3ef48d5fb SHA1 ca53d675d6e067277c0c2c63c04658cbd11bf854 SHA256 2828cd628a482caba70c48dd86cbbb0ce8b1da168f1d70a11370bfbbcceae777
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
--- a/dev-libs/expat/expat-1.95.8.ebuild
+++ b/dev-libs/expat/expat-1.95.8.ebuild
@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/Attic/expat-1.95.8.ebuild,v 1.23 2009/03/21 22:48:49 eva dead $

-inherit libtool multilib
+EAPI="3"
+
+inherit eutils multilib libtool

 DESCRIPTION="XML parsing libraries"
 HOMEPAGE="http://expat.sourceforge.net/"
@ -16,10 +18,15 @@ IUSE="test"
 DEPEND="test? ( >=dev-libs/check-0.8 )"
 RDEPEND=""

-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	elibtoolize
+src_prepare() {
+	epatch "${FILESDIR}/expat-CVE-2009-2625.patch"
+	epatch "${FILESDIR}/expat-CVE-2009-3560.patch"
+	sed -e 's/^LTFLAGS/#LTFLAGS/' -i Makefile.in
+	cp `aclocal --print-ac-dir`/libtool.m4 conftools || die
+	libtoolize --copy --force --automake && aclocal && autoheader && autoconf
+#	rm conftools/libtool.m4
+#	elibtoolize --copy --force --automake
+#	eautoreconf
 }

 src_test() {
--- a/dev-libs/expat/files/expat-CVE-2009-2625.patch
+++ b/dev-libs/expat/files/expat-CVE-2009-2625.patch
@ -0,0 +1,15 @@
+http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmltok_impl.c?r1=1.13&r2=1.15
+
+Index: lib/xmltok_impl.c
+===================================================================
+--- lib/xmltok_impl.c.orig
+++ lib/xmltok_impl.c
+@@ -1741,7 +1741,7 @@ PREFIX(updatePosition)(const ENCODING *e
+                        const char *end,
+                        POSITION *pos)
+ {
+-  while (ptr != end) {
+  while (ptr < end) {
+     switch (BYTE_TYPE(enc, ptr)) {
+ #define LEAD_CASE(n) \
+     case BT_LEAD ## n: \
--- a/dev-libs/expat/files/expat-CVE-2009-3560.patch
+++ b/dev-libs/expat/files/expat-CVE-2009-3560.patch
@ -0,0 +1,16 @@
+http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmlparse.c?r1=1.164&r2=1.166&view=patch
+
+Index: lib/xmlparse.c
+===================================================================
+--- lib/xmlparse.c.orig
+++ lib/xmlparse.c
+@@ -3615,6 +3615,9 @@ doProlog(XML_Parser parser,
+         return XML_ERROR_UNCLOSED_TOKEN;
+       case XML_TOK_PARTIAL_CHAR:
+         return XML_ERROR_PARTIAL_CHAR;
+      case -XML_TOK_PROLOG_S:
+        tok = -tok;
+        break;
+       case XML_TOK_NONE:
+ #ifdef XML_DTD
+         /* for internal PE NOT referenced between declarations */