Security patch for bug 78630 added; two-times-older version pruned out

5 files changed, 27 insertions, 2 deletions

diff --git a/gnustep-libs/pdfkit/ChangeLog b/gnustep-libs/pdfkit/ChangeLog
index 414fac4987e9..c0145ec64518 100644
--- a/gnustep-libs/pdfkit/ChangeLog
+++ b/gnustep-libs/pdfkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnustep-libs/pdfkit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pdfkit/ChangeLog,v 1.5 2005/01/12 21:03:28 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pdfkit/ChangeLog,v 1.6 2005/01/19 16:13:09 fafhrd Exp $
+
+*pdfkit-0.8-r4 (19 Jan 2005)
+
+  19 Jan 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/xpdf-3.00pl3.patch, -pdfkit-0.8-r2.ebuild, +pdfkit-0.8-r4.ebuild:
+  Security patch for bug 78630 added; two-times-older version pruned out
 
 *pdfkit-0.8-r3 (12 Jan 2005)
 
diff --git a/gnustep-libs/pdfkit/Manifest b/gnustep-libs/pdfkit/Manifest
index 9eacddf6d470..f91e9d1c9978 100644
--- a/gnustep-libs/pdfkit/Manifest
+++ b/gnustep-libs/pdfkit/Manifest
@@ -1,9 +1,12 @@
+MD5 bb689465f62556bbede3ea7ac4a09ffd pdfkit-0.8-r4.ebuild 896
 MD5 94279f4c3ac20e0339b28884fb805d95 pdfkit-0.8-r3.ebuild 931
 MD5 d35f4e59f6e574a2d66f0daa2c76663a ChangeLog 1445
 MD5 7665a07a9a72d21043383c0cbbc02177 metadata.xml 346
 MD5 abbea5fc9189993aa5e138e4987cd750 pdfkit-0.8-r2.ebuild 864
 MD5 84d2e5e0ce13534390f4f761f017c67c files/xpdf-3.00-CESA-2004-007.diff.bz2 2075
 MD5 d4de4d643cf7db65c2a6cdbd4ac868e2 files/xpdf-3.00pl2.patch 1645
+MD5 c32a612ce419b9930ff273cf382558bf files/xpdf-3.00pl3.patch 346
 MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
 MD5 41964a8057a8059f88f443baffe84f44 files/digest-pdfkit-0.8-r2 64
 MD5 41964a8057a8059f88f443baffe84f44 files/digest-pdfkit-0.8-r3 64
+MD5 41964a8057a8059f88f443baffe84f44 files/digest-pdfkit-0.8-r4 64
diff --git a/gnustep-libs/pdfkit/files/digest-pdfkit-0.8-r2 b/gnustep-libs/pdfkit/files/digest-pdfkit-0.8-r4
index 2256fc733979..2256fc733979 100644
--- a/gnustep-libs/pdfkit/files/digest-pdfkit-0.8-r2
+++ b/gnustep-libs/pdfkit/files/digest-pdfkit-0.8-r4
diff --git a/gnustep-libs/pdfkit/files/xpdf-3.00pl3.patch b/gnustep-libs/pdfkit/files/xpdf-3.00pl3.patch
new file mode 100644
index 000000000000..d7d2294c8527
--- /dev/null
+++ b/gnustep-libs/pdfkit/files/xpdf-3.00pl3.patch
@@ -0,0 +1,14 @@
+*** XRef.cc.orig	Wed Jan 12 17:10:53 2005
+--- XRef.cc	Wed Jan 12 17:11:22 2005
+***************
+*** 793,798 ****
+--- 793,801 ----
+  	} else {
+  	  keyLength = 5;
+  	}
++ 	if (keyLength > 16) {
++ 	  keyLength = 16;
++ 	}
+  	permFlags = permissions.getInt();
+  	if (encVersion >= 1 && encVersion <= 2 &&
+  	    encRevision >= 2 && encRevision <= 3) {
diff --git a/gnustep-libs/pdfkit/pdfkit-0.8-r2.ebuild b/gnustep-libs/pdfkit/pdfkit-0.8-r4.ebuild
index b6bb20f62eed..7f46e9155d59 100644
--- a/gnustep-libs/pdfkit/pdfkit-0.8-r2.ebuild
+++ b/gnustep-libs/pdfkit/pdfkit-0.8-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pdfkit/pdfkit-0.8-r2.ebuild,v 1.3 2005/01/12 21:03:28 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pdfkit/pdfkit-0.8-r4.ebuild,v 1.1 2005/01/19 16:13:09 fafhrd Exp $
 
 inherit gnustep
 
@@ -27,5 +27,7 @@ src_unpack()
 	cd ${S}
 	( cd xpdf/xpdf-3.00/xpdf; epatch ${FILESDIR}/xpdf-3.00-CESA-2004-007.diff.bz2 )
 	( cd xpdf/xpdf-3.00/goo; epatch ${FILESDIR}/xpdf-goo-sizet.patch )
+	( cd xpdf/xpdf-3.00/xpdf; epatch ${FILESDIR}/xpdf-3.00pl2.patch )
+	( cd xpdf/xpdf-3.00/xpdf; epatch ${FILESDIR}/xpdf-3.00pl3.patch )
 }