Fix CVE-2008-2950 bug #229931

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64
RepoMan-Options: --force

5 files changed, 55 insertions, 10 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 763df138f16d..affec3c6bcae 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.162 2008/06/29 11:07:58 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.163 2008/07/07 14:44:40 dang Exp $
+
+*poppler-0.8.4-r1 (07 Jul 2008)
+*poppler-0.6.3-r1 (07 Jul 2008)
+
+  07 Jul 2008; Daniel Gryniewicz <dang@gentoo.org>
+  +files/poppler-0.8.3-page-init.patch, +poppler-0.6.3-r1.ebuild,
+  -poppler-0.8.3.ebuild, -poppler-0.8.4.ebuild, +poppler-0.8.4-r1.ebuild:
+  Fix CVE-2008-2950 bug #229931
 
 *poppler-0.8.4 (29 Jun 2008)
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 6d1d1a071a7a..9c8a2c242934 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,11 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX poppler-0.6.1-xpdf-3.02pl2.patch 17438 RMD160 c8a4bd0eda87f94b183fe0d0aa6d8864f3f9c569 SHA1 fc17401fea3cbe73687cce9ddb9185018fdb859e SHA256 5c6fd90b752f3f40a3d3e9d63fdc5ac0220841a88a05f5551054edd78f1f0f9d
+AUX poppler-0.8.3-page-init.patch 400 RMD160 9e2a4aa31e862996d7227084a46357c8fdd7a299 SHA1 edb7be8791b0e19119714c68f60cc3bf1cb6446d SHA256 9a44ccad42dcb2644713921c9e3dac2b757e54a81d313653345e176b6a36a158
 DIST poppler-0.6.1.tar.gz 1286501 RMD160 19496a6b3a5aeb7eca2f7edc2e957868880a90f4 SHA1 f28184df94fe6312db0a11e285d7832c3cfd0797 SHA256 d4fb2789bf880ce82b4f90f9e269409d81a804e7877265610494646e463d3ff2
 DIST poppler-0.6.3.tar.gz 1292971 RMD160 f2971c6c5f717ec529b76e593f2c2a09ce81e53e SHA1 10bdce5eb8a4ed831fd047389bcbb34b7939f502 SHA256 32112064cb310933ea820b8ca3fd64bcfa951243901aca9b6a0a11994d19a66e
-DIST poppler-0.8.3.tar.gz 1463306 RMD160 f6553fdf468bd67ec8a7f943ba2cc7f141052302 SHA1 763d18d9f0e625a936b3a3fbbcd00b58ddd2f84f SHA256 4d7334a64de975c1453744f2b91a549b25cf35c2d3e66fa2b969c91fc1c4b535
 DIST poppler-0.8.4.tar.gz 1465322 RMD160 96a5109d03211575c00a49d3efe1d583dd710dec SHA1 2ad0acfea3a8787b19c2882a2eac2f9d0afd5a48 SHA256 45bd5740b07e6c15db9859a5ee82e2acc9eeec62be537735ae5872fc3648257a
 EBUILD poppler-0.6.1-r1.ebuild 1246 RMD160 291f8625c09d9267a8dc2b0456471611135944bf SHA1 9869e9c1542999b9e185a80e2fe93389525527c5 SHA256 7224f34cbf3fc73bb2e691ebf422c84e8d5a942f710ed2850442604458a5e79f
+EBUILD poppler-0.6.3-r1.ebuild 1297 RMD160 0baa8307f43bbcb1e36ed3b81de3bf847cb60533 SHA1 5e80ee9e19ad15e0d255b1ad77227d6c9b71738c SHA256 404e1cdd45f7b955b9116cb3aa0c87494b20c2fe1106be23ae80e607c1b32fa0
 EBUILD poppler-0.6.3.ebuild 1191 RMD160 64a614683674f2d7621cfdf028b670dc836ce086 SHA1 58dc9433455b1f94cf65479ff8b8800e946d3184 SHA256 83d51c5a8784708a6db604f5da31f4ab261875cbed4b4efba330709a7cd07a5f
-EBUILD poppler-0.8.3.ebuild 1204 RMD160 924876d010d66b06b1e68362446dc951ca8d7e77 SHA1 be137fd0ce4eff4df6a3dcb960281bf7f694ca1f SHA256 b2efd7c737f3098a407a05ba380f74bd251cfee0323f8be0e057fde7d8c4e157
-EBUILD poppler-0.8.4.ebuild 1204 RMD160 0456dcf48d9de2f6c320fc3af83a5c170d449a50 SHA1 92a8d20705b8d7540dc1e745627889e61de856e2 SHA256 bb85df27a03f30bb0c46cc9d65bc8a78261794b3003a90d31d556f8cfd91b284
-MISC ChangeLog 21945 RMD160 0c36d2f56b81b4d4d5aaca6b26f1b9713db6a526 SHA1 dd18099bf2a275fed047a303d7cdb069d8a4bac8 SHA256 715ef1e8fb5f6a9bdeac347db56ec5d25f39d65f86630eff0cb65ece059241a0
+EBUILD poppler-0.8.4-r1.ebuild 1303 RMD160 960ff476e206cec5749484861e8ade4ff20f205b SHA1 6b73f43be041d69a8733bd06adc30b97d5828c32 SHA256 1b12bda54f7ee101e9d1f860bdc6ffd6fb864cc6009fe82c03dc4c786dbf6bf7
+MISC ChangeLog 22230 RMD160 bea616679a7c2b3f5d7d17f603ceabea0aee3fb6 SHA1 a2a083b0b17422aade8a86d6e51b1abb057c1c78 SHA256 0b920be7805db8d19f8c86f9a5238c90f1ed3a518f8fcd0af18ff3441536cb91
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iD8DBQFIciwMomPajV0RnrERAoVfAKCDzxeymgbqcO1hnZch3iGXEtQ4QgCeLBdC
+4t6rJK7RpKWHscBzvR4KUOA=
+=SxqW
+-----END PGP SIGNATURE-----
diff --git a/app-text/poppler/files/poppler-0.8.3-page-init.patch b/app-text/poppler/files/poppler-0.8.3-page-init.patch
new file mode 100644
index 000000000000..84f4b4edfb79
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.8.3-page-init.patch
@@ -0,0 +1,13 @@
+diff --git a/poppler/Page.cc b/poppler/Page.cc
+index b28a3ee..72a706b 100644
+--- a/poppler/Page.cc
++++ b/poppler/Page.cc
+@@ -230,7 +230,7 @@ GBool PageAttrs::readBox(Dict *dict, char *key, PDFRectangle *box) {
+ 
+ Page::Page(XRef *xrefA, int numA, Dict *pageDict, PageAttrs *attrsA, Form *form) {
+   Object tmp;
+-	
++  pageWidgets =	NULL;  //Security fix
+   ok = gTrue;
+   xref = xrefA;
+   num = numA;
diff --git a/app-text/poppler/poppler-0.8.4.ebuild b/app-text/poppler/poppler-0.6.3-r1.ebuild
index c453ded6f110..84aa1e1736c3 100644
--- a/app-text/poppler/poppler-0.8.4.ebuild
+++ b/app-text/poppler/poppler-0.6.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.8.4.ebuild,v 1.1 2008/06/29 11:07:58 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.6.3-r1.ebuild,v 1.1 2008/07/07 14:44:40 dang Exp $
 
-inherit libtool
+inherit libtool eutils
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="http://poppler.freedesktop.org/"
@@ -10,7 +10,7 @@ SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="cjk jpeg zlib"
 
 RDEPEND=">=media-libs/freetype-2.1.8
@@ -22,6 +22,13 @@ RDEPEND=">=media-libs/freetype-2.1.8
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-0.8.3-page-init.patch
+}
+
 src_compile() {
 	econf \
 		--disable-poppler-qt4 \
diff --git a/app-text/poppler/poppler-0.8.3.ebuild b/app-text/poppler/poppler-0.8.4-r1.ebuild
index 604225df3a66..97010bef3e3d 100644
--- a/app-text/poppler/poppler-0.8.3.ebuild
+++ b/app-text/poppler/poppler-0.8.4-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.8.3.ebuild,v 1.1 2008/06/04 08:43:49 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.8.4-r1.ebuild,v 1.1 2008/07/07 14:44:40 dang Exp $
 
-inherit libtool
+inherit libtool eutils
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="http://poppler.freedesktop.org/"
@@ -22,6 +22,13 @@ RDEPEND=">=media-libs/freetype-2.1.8
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-0.8.3-page-init.patch
+}
+
 src_compile() {
 	econf \
 		--disable-poppler-qt4 \