Fix CVE-2008-2950 bug #229931

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64, RepoMan options: --force)

4 files changed, 41 insertions, 6 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/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 \