xpdf makeFileKey2 stack overflow, #78619

10 files changed, 237 insertions, 2 deletions

diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index fff670daa406..ebff82f70dc0 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.141 2005/01/14 23:11:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.142 2005/01/19 12:31:10 carlo Exp $
+
+*kdegraphics-3.4.0_beta1-r1 (19 Jan 2005)
+
+  19 Jan 2005; Carsten Lohrke <carlo@gentoo.org> +files/CAN-2005-0064.patch,
+  +files/CAN-2005-0064_kde-3.4.patch, +kdegraphics-3.2.3-r4.ebuild,
+  +kdegraphics-3.3.2-r2.ebuild, +kdegraphics-3.4.0_beta1-r1.ebuild:
+  fix for xpdf makeFileKey2 stack overflow, #78619
 
   15 Jan 2005; Dan Armak <danarmak@gentoo.org>
   kdegraphics-3.4.0_beta1.ebuild:
diff --git a/kde-base/kdegraphics/Manifest b/kde-base/kdegraphics/Manifest
index 311d67e687e6..97ed0fcb4dfe 100644
--- a/kde-base/kdegraphics/Manifest
+++ b/kde-base/kdegraphics/Manifest
@@ -4,14 +4,17 @@ MD5 417f1a97eb963071f331d7d754f30b50 kdegraphics-3.2.3-r2.ebuild 1284
 MD5 58df579808694539bf17e0e6cb01e429 kdegraphics-3.3.0.ebuild 1436
 MD5 d6ae8813366bcda4e47aada44b249000 kdegraphics-3.3.0-r2.ebuild 1490
 MD5 46f099908f4272981a20ec6ffd98156d kdegraphics-3.3.1-r1.ebuild 1492
+MD5 974b71f5ad08afb9f3fe646bdea06293 kdegraphics-3.2.3-r4.ebuild 1265
 MD5 ea7d7fb7549be9a73c98f4a89038826e kdegraphics-3.3.2.ebuild 1448
+MD5 bdd1b57d3e1d6d87d24091c91bd53d2d kdegraphics-3.4.0_beta1-r1.ebuild 1283
 MD5 75aeebb9515fef7bf793e2f843f9610d kdegraphics-3.2.3-r1.ebuild 1281
 MD5 269eb46a7ec7654ea45c9f08fdceb6af kdegraphics-3.3.0-r1.ebuild 1506
+MD5 2c5301b01e59d418fcc3656c5d0778c5 kdegraphics-3.3.2-r2.ebuild 1426
 MD5 fcfa7a1bbe4972cd267102d2693961e0 kdegraphics-3.4.0_beta1.ebuild 1201
 MD5 77b523fb0c02003d9f15515bf9876201 kdegraphics-3.2.3.ebuild 1231
 MD5 d2028ede99c0950869e387c95f0748c9 kdegraphics-3.2.3-r3.ebuild 1329
 MD5 0da1b6a041e8e4eb834d5058f4a794ce kdegraphics-3.3.1.ebuild 1441
-MD5 32d1c3c40a264dbd6df49843126fd5a0 ChangeLog 19716
+MD5 c397d2077f7f4ae1b5a51ed14fbf6ed5 ChangeLog 20024
 MD5 f9586f0dba844cf4c2c4ed66fff6deb2 kdegraphics-3.3.1-r2.ebuild 1495
 MD5 6cdec4dd413492cf864d2ffafda42340 kdegraphics-3.2.0.ebuild 1334
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
@@ -20,6 +23,7 @@ MD5 33d7a652f3ae6f9e66d79fb818b684f6 files/digest-kdegraphics-3.3.0-r2 71
 MD5 fecf5cb3209323e56be3368df325411a files/digest-kdegraphics-3.3.1-r1 71
 MD5 fecf5cb3209323e56be3368df325411a files/digest-kdegraphics-3.3.1-r2 71
 MD5 9eb12845ce85cc31e216d463877cb519 files/digest-kdegraphics-3.3.2-r1 71
+MD5 9eb12845ce85cc31e216d463877cb519 files/digest-kdegraphics-3.3.2-r2 71
 MD5 eb03ab721af71700a0b445f1c50b55f8 files/kdegraphics-3.2.2-gcc34-compile.patch 7723
 MD5 8c9db7f8d52169b544da66be07e9979a files/digest-kdegraphics-3.2.0 71
 MD5 80f49f2fcc0bb31559666e47fc28b047 files/digest-kdegraphics-3.2.2 71
@@ -27,16 +31,20 @@ MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3 71
 MD5 33d7a652f3ae6f9e66d79fb818b684f6 files/digest-kdegraphics-3.3.0 71
 MD5 fecf5cb3209323e56be3368df325411a files/digest-kdegraphics-3.3.1 71
 MD5 9eb12845ce85cc31e216d463877cb519 files/digest-kdegraphics-3.3.2 71
+MD5 c8894012c11807a905fa8928fc304aab files/CAN-2005-0064_kde-3.4.patch 803
 MD5 bf6b28780e0f5ea8f99e0777187e73cb files/post-3.3.2-kdegraphics.diff 1385
 MD5 146755f9a619c2eed600b896b940f447 files/digest-kdegraphics-3.4.0_beta1 72
 MD5 8d995a343d5083ba8ac84f1d4136d359 files/xpdf-3.3.0-kdegraphics.diff 1630
+MD5 284f518172a2843428d308d2d48bbbee files/CAN-2005-0064.patch 793
 MD5 4f854adb507f4d04e997702e44ffc2ea files/post-3.2.3-kdegraphics.diff 3853
 MD5 26b54ece47e2617478338586ebfd253d files/post-3.2.3-kdegraphics-2.diff 1742
 MD5 d97c962408abd235435f6857fc405ebf files/kdegraphics-3.2.3-gcc34-compile.patch 7162
 MD5 06573d3829a3009c879f870746607056 files/post-3.3.0-kdegraphics_2.diff 3586
 MD5 870d90051bb236753070fb553890f95d files/post-3.2.3-kdegraphics_2.diff 3205
 MD5 651fba579516ea947fbefee373f40a6c files/post-3.3.1-kdegraphics.diff 1533
+MD5 146755f9a619c2eed600b896b940f447 files/digest-kdegraphics-3.4.0_beta1-r1 72
 MD5 6c3f55477c5f566c711563caa3c51296 files/post-3.3.1-kdegraphics_2.diff 3887
 MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3-r1 71
 MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3-r2 71
 MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3-r3 71
+MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3-r4 71
diff --git a/kde-base/kdegraphics/files/CAN-2005-0064.patch b/kde-base/kdegraphics/files/CAN-2005-0064.patch
new file mode 100644
index 000000000000..620f8a34969f
--- /dev/null
+++ b/kde-base/kdegraphics/files/CAN-2005-0064.patch
@@ -0,0 +1,31 @@
+--- kpdf/xpdf/Decrypt.cc.jn	2002-12-06 00:44:32.000000000 +0100
++++ kpdf/xpdf/Decrypt.cc	2005-01-14 13:38:48.192647128 +0100
+@@ -132,13 +132,19 @@ GBool Decrypt::makeFileKey2(int encVersi
+   Guchar *buf;
+   Guchar test[32];
+   Guchar fState[256];
+-  Guchar tmpKey[16];
++  Guchar *tmpKey;
+   Guchar fx, fy;
+   int len, i, j;
+   GBool ok;
+ 
++  // check whether we have non-zero keyLength
++  if ( !keyLength ) {
++    return gFalse;
++  }
++  
+   // generate file key
+   buf = (Guchar *)gmalloc(68 + fileID->getLength());
++  tmpKey = (Guchar *)gmalloc(keyLength * sizeof(Guchar));
+   if (userPassword) {
+     len = userPassword->getLength();
+     if (len < 32) {
+@@ -191,6 +197,7 @@ GBool Decrypt::makeFileKey2(int encVersi
+     ok = gFalse;
+   }
+ 
++  gfree(tmpKey);
+   gfree(buf);
+   return ok;
+ }
diff --git a/kde-base/kdegraphics/files/CAN-2005-0064_kde-3.4.patch b/kde-base/kdegraphics/files/CAN-2005-0064_kde-3.4.patch
new file mode 100644
index 000000000000..bd14ca666cd6
--- /dev/null
+++ b/kde-base/kdegraphics/files/CAN-2005-0064_kde-3.4.patch
@@ -0,0 +1,31 @@
+--- kpdf/xpdf/xpdf/Decrypt.cc.jn	2002-12-06 00:44:32.000000000 +0100
++++ kpdf/xpdf/xpdf/Decrypt.cc	2005-01-14 13:38:48.192647128 +0100
+@@ -132,13 +132,19 @@ GBool Decrypt::makeFileKey2(int encVersi
+   Guchar *buf;
+   Guchar test[32];
+   Guchar fState[256];
+-  Guchar tmpKey[16];
++  Guchar *tmpKey;
+   Guchar fx, fy;
+   int len, i, j;
+   GBool ok;
+ 
++  // check whether we have non-zero keyLength
++  if ( !keyLength ) {
++    return gFalse;
++  }
++  
+   // generate file key
+   buf = (Guchar *)gmalloc(68 + fileID->getLength());
++  tmpKey = (Guchar *)gmalloc(keyLength * sizeof(Guchar));
+   if (userPassword) {
+     len = userPassword->getLength();
+     if (len < 32) {
+@@ -191,6 +197,7 @@ GBool Decrypt::makeFileKey2(int encVersi
+     ok = gFalse;
+   }
+ 
++  gfree(tmpKey);
+   gfree(buf);
+   return ok;
+ }
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.2.3-r4 b/kde-base/kdegraphics/files/digest-kdegraphics-3.2.3-r4
new file mode 100644
index 000000000000..2e0072d98c01
--- /dev/null
+++ b/kde-base/kdegraphics/files/digest-kdegraphics-3.2.3-r4
@@ -0,0 +1 @@
+MD5 af7092f2afc5a8565eb5017ecee6b67e kdegraphics-3.2.3.tar.bz2 5676995
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.3.2-r2 b/kde-base/kdegraphics/files/digest-kdegraphics-3.3.2-r2
new file mode 100644
index 000000000000..19c2a1ed829e
--- /dev/null
+++ b/kde-base/kdegraphics/files/digest-kdegraphics-3.3.2-r2
@@ -0,0 +1 @@
+MD5 03092b8be2f7054d71895b8fd58ad26e kdegraphics-3.3.2.tar.bz2 6234394
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.4.0_beta1-r1 b/kde-base/kdegraphics/files/digest-kdegraphics-3.4.0_beta1-r1
new file mode 100644
index 000000000000..309553c09472
--- /dev/null
+++ b/kde-base/kdegraphics/files/digest-kdegraphics-3.4.0_beta1-r1
@@ -0,0 +1 @@
+MD5 e819ff09157f1bf83c6a1ac70ab41439 kdegraphics-3.3.91.tar.bz2 6455135
diff --git a/kde-base/kdegraphics/kdegraphics-3.2.3-r4.ebuild b/kde-base/kdegraphics/kdegraphics-3.2.3-r4.ebuild
new file mode 100644
index 000000000000..aaa9dbd66720
--- /dev/null
+++ b/kde-base/kdegraphics/kdegraphics-3.2.3-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.2.3-r4.ebuild,v 1.1 2005/01/19 12:31:10 carlo Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE graphics-related apps"
+
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+IUSE="gphoto2 tetex scanner opengl"
+
+DEPEND="~kde-base/kdebase-${PV}
+	gphoto2? ( media-gfx/gphoto2 )
+	scanner? ( media-gfx/sane-backends )
+	tetex? ( virtual/tetex )
+	dev-libs/fribidi
+	opengl? ( virtual/glut virtual/opengl )
+	media-libs/imlib
+	virtual/ghostscript
+	media-libs/tiff
+	x86? ( scanner? ( sys-libs/libieee1284 ) )"
+RDEPEND="${DEPEND}
+	app-text/xpdf"
+
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/${P}-gcc34-compile.patch
+	epatch ${FILESDIR}/post-3.2.3-kdegraphics_2.diff
+	epatch ${FILESDIR}/post-3.2.3-kdegraphics-2.diff
+	epatch ${FILESDIR}/CAN-2005-0064.patch
+}
+
+src_compile() {
+
+	use gphoto2	\
+		&& myconf="$myconf --with-kamera \
+				   --with-gphoto2-includes=/usr/include/gphoto2 \
+				   --with-gphoto2-libraries=/usr/lib/gphoto2" \
+		|| myconf="$myconf --without-kamera"
+
+	use tetex 	&& myconf="$myconf --with-system-kpathsea --with-tex-datadir=/usr/share"
+
+	use scanner	|| DO_NOT_COMPILE="$DO_NOT_COMPILE kooka libkscan"
+
+	myconf="$myconf --with-imlib --with-imlib-config=/usr/bin"
+	kde_src_compile
+}
diff --git a/kde-base/kdegraphics/kdegraphics-3.3.2-r2.ebuild b/kde-base/kdegraphics/kdegraphics-3.3.2-r2.ebuild
new file mode 100644
index 000000000000..0223236e6c51
--- /dev/null
+++ b/kde-base/kdegraphics/kdegraphics-3.3.2-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.3.2-r2.ebuild,v 1.1 2005/01/19 12:31:10 carlo Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE graphics-related apps"
+
+KEYWORDS="x86 ~amd64 ~ppc64 ~sparc ~ppc ~hppa ~alpha"
+IUSE="gphoto2 imlib jpeg2k opengl povray scanner tetex"
+
+DEPEND="~kde-base/kdebase-${PV}
+	gphoto2? ( media-gfx/gphoto2 )
+	scanner? ( media-gfx/sane-backends )
+	dev-libs/fribidi
+	opengl? ( virtual/glut virtual/opengl )
+	imlib? ( media-libs/imlib )
+	virtual/ghostscript
+	media-libs/tiff
+	x86? ( scanner? ( sys-libs/libieee1284 ) )
+	povray? ( x86? ( media-gfx/povray ) )
+	jpeg2k? ( x86? ( media-libs/jasper ) )
+	!media-gfx/kolourpaint"
+RDEPEND="${DEPEND}
+	app-text/xpdf
+	tetex? (
+	|| ( >=app-text/tetex-2
+	app-text/ptex
+	app-text/cstetex
+	app-text/dvipdfm )
+	)"
+
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/post-3.3.2-kdegraphics.diff
+	epatch ${FILESDIR}/CAN-2005-0064.patch
+}
+
+src_compile() {
+
+	use gphoto2	\
+		&& myconf="$myconf --with-kamera \
+				   --with-gphoto2-includes=/usr/include/gphoto2 \
+				   --with-gphoto2-libraries=/usr/lib/gphoto2" \
+		|| myconf="$myconf --without-kamera"
+
+	use tetex 	&& myconf="$myconf --with-system-kpathsea --with-tex-datadir=/usr/share"
+
+	use scanner	|| DO_NOT_COMPILE="$DO_NOT_COMPILE kooka libkscan"
+
+	use imlib \
+		&& myconf="$myconf --with-imlib --with-imlib-config=/usr/bin" \
+		|| myconf="$myconf --without-imlib"
+
+	kde_src_compile
+}
diff --git a/kde-base/kdegraphics/kdegraphics-3.4.0_beta1-r1.ebuild b/kde-base/kdegraphics/kdegraphics-3.4.0_beta1-r1.ebuild
new file mode 100644
index 000000000000..e5d79089846b
--- /dev/null
+++ b/kde-base/kdegraphics/kdegraphics-3.4.0_beta1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.4.0_beta1-r1.ebuild,v 1.1 2005/01/19 12:31:10 carlo Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE graphics-related apps"
+
+KEYWORDS="~x86"
+IUSE="gphoto2 imlib opengl povray scanner tetex"
+
+DEPEND="~kde-base/kdebase-${PV}
+	gphoto2? ( media-gfx/gphoto2 )
+	scanner? ( media-gfx/sane-backends )
+	dev-libs/fribidi
+	imlib? ( media-libs/imlib )
+	virtual/ghostscript
+	media-libs/tiff
+	povray? ( x86? ( media-gfx/povray
+			virtual/opengl ) )
+	!media-gfx/kolourpaint
+	!kde-misc/kgamma"
+
+RDEPEND="${DEPEND}
+	app-text/xpdf
+	tetex? (
+	|| ( >=app-text/tetex-2
+	app-text/ptex
+	app-text/cstetex
+	app-text/dvipdfm )
+	)"
+
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/CAN-2005-0064_kde-3.4.patch
+}
+
+src_compile() {
+	use gphoto2	\
+		&& myconf="$myconf --with-kamera \
+				   --with-gphoto2-includes=/usr/include/gphoto2 \
+				   --with-gphoto2-libraries=/usr/lib/gphoto2" \
+		|| myconf="$myconf --without-kamera"
+
+	use scanner	|| export DO_NOT_COMPILE="${DO_NOT_COMPILE} kooka libkscan"
+
+	use imlib \
+		&& myconf="$myconf --with-imlib --with-imlib-config=/usr/bin" \
+		|| myconf="$myconf --without-imlib"
+
+	kde_src_compile
+}