security fixes

5 files changed, 97 insertions, 2 deletions

diff --git a/gnustep-libs/pdfkit/ChangeLog b/gnustep-libs/pdfkit/ChangeLog
index e86c0a8cdd3d..a166a0761ca5 100644
--- a/gnustep-libs/pdfkit/ChangeLog
+++ b/gnustep-libs/pdfkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnustep-libs/pdfkit
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pdfkit/ChangeLog,v 1.2 2004/10/29 20:36:52 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pdfkit/ChangeLog,v 1.3 2004/11/02 03:24:00 fafhrd Exp $
+
+*pdfkit-0.8-r2 (01 Nov 2004)
+
+  01 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/xpdf-goo-sizet.patch, +pdfkit-0.8-r2.ebuild:
+  security fixes bug 69662
 
 *pdfkit-0.8-r1 (29 Oct 2004)
 
diff --git a/gnustep-libs/pdfkit/Manifest b/gnustep-libs/pdfkit/Manifest
index 02ff26f511b9..f430fee825e5 100644
--- a/gnustep-libs/pdfkit/Manifest
+++ b/gnustep-libs/pdfkit/Manifest
@@ -1,7 +1,10 @@
-MD5 80a2d1f5bbb8badca3c6356eb408f1ea ChangeLog 567
+MD5 d2fc46dac8f4af0560cd6f2d3e349b19 ChangeLog 732
 MD5 7665a07a9a72d21043383c0cbbc02177 metadata.xml 346
 MD5 55df5b3d81df276a9179202f37bb8691 pdfkit-0.8-r1.ebuild 760
 MD5 7b1a700e284a42fd78c3fad3b85bb601 pdfkit-0.8.ebuild 638
+MD5 c84d7cccd14f63c2936cb230011382e6 pdfkit-0.8-r2.ebuild 828
 MD5 41964a8057a8059f88f443baffe84f44 files/digest-pdfkit-0.8 64
 MD5 41964a8057a8059f88f443baffe84f44 files/digest-pdfkit-0.8-r1 64
 MD5 90113e3ad42ec1df8d56deefa4571c10 files/xpdf-3.00-CESA-2004-007.diff.bz2 2083
+MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
+MD5 41964a8057a8059f88f443baffe84f44 files/digest-pdfkit-0.8-r2 64
diff --git a/gnustep-libs/pdfkit/files/digest-pdfkit-0.8-r2 b/gnustep-libs/pdfkit/files/digest-pdfkit-0.8-r2
new file mode 100644
index 000000000000..2256fc733979
--- /dev/null
+++ b/gnustep-libs/pdfkit/files/digest-pdfkit-0.8-r2
@@ -0,0 +1 @@
+MD5 75a0a437f2e9aa82ecf2189a67a67b35 PDFKit-0.8.tar.bz2 1735057
diff --git a/gnustep-libs/pdfkit/files/xpdf-goo-sizet.patch b/gnustep-libs/pdfkit/files/xpdf-goo-sizet.patch
new file mode 100644
index 000000000000..5d90c5120bd4
--- /dev/null
+++ b/gnustep-libs/pdfkit/files/xpdf-goo-sizet.patch
@@ -0,0 +1,57 @@
+diff -ru xpdf-2.02pl1/goo/gmem.c xpdf-2.02pl1/goo/gmem.c
+--- xpdf-2.02pl1/goo/gmem.c	2003-06-16 22:01:26.000000000 +0200
++++ xpdf-2.02pl1/goo/gmem.c	2004-10-29 15:13:34.866919791 +0200
+@@ -53,9 +53,9 @@
+ 
+ #endif /* DEBUG_MEM */
+ 
+-void *gmalloc(int size) {
++void *gmalloc(size_t size) {
+ #ifdef DEBUG_MEM
+-  int size1;
++  size_t size1;
+   char *mem;
+   GMemHdr *hdr;
+   void *data;
+@@ -94,11 +94,11 @@
+ #endif
+ }
+ 
+-void *grealloc(void *p, int size) {
++void *grealloc(void *p, size_t size) {
+ #ifdef DEBUG_MEM
+   GMemHdr *hdr;
+   void *q;
+-  int oldSize;
++  size_t oldSize;
+ 
+   if (size == 0) {
+     if (p)
+@@ -137,7 +137,7 @@
+ 
+ void gfree(void *p) {
+ #ifdef DEBUG_MEM
+-  int size;
++  size_t size;
+   GMemHdr *hdr;
+   GMemHdr *prevHdr, *q;
+   int lst;
+diff -ru xpdf-2.02pl1/goo/gmem.h xpdf-2.02pl1/goo/gmem.h
+--- xpdf-2.02pl1/goo/gmem.h	2003-06-16 22:01:26.000000000 +0200
++++ xpdf-2.02pl1/goo/gmem.h	2004-10-29 15:13:50.864027201 +0200
+@@ -19,13 +19,13 @@
+  * Same as malloc, but prints error message and exits if malloc()
+  * returns NULL.
+  */
+-extern void *gmalloc(int size);
++extern void *gmalloc(size_t size);
+ 
+ /*
+  * Same as realloc, but prints error message and exits if realloc()
+  * returns NULL.  If <p> is NULL, calls malloc instead of realloc().
+  */
+-extern void *grealloc(void *p, int size);
++extern void *grealloc(void *p, size_t size);
+ 
+ /*
+  * Same as free, but checks for and ignores NULL pointers.
diff --git a/gnustep-libs/pdfkit/pdfkit-0.8-r2.ebuild b/gnustep-libs/pdfkit/pdfkit-0.8-r2.ebuild
new file mode 100644
index 000000000000..0fa619515831
--- /dev/null
+++ b/gnustep-libs/pdfkit/pdfkit-0.8-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2004 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.1 2004/11/02 03:24:00 fafhrd Exp $
+
+inherit gnustep
+
+S=${WORKDIR}/${PN/pdfk/PDFK}
+
+DESCRIPTION="PDFKit is a framework that supports rendering of PDF content in GNUstep applications"
+HOMEPAGE="http://home.gna.org/gsimageapps/"
+SRC_URI="http://download.gna.org/gsimageapps/${P/pdfk/PDFK}.tar.bz2"
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~x86"
+SLOT="0"
+
+IUSE="${IUSE}"
+DEPEND="${GS_DEPEND}
+	!gnustep-libs/imagekits"
+RDEPEND="${GS_RDEPEND}
+	!gnustep-libs/imagekits"
+
+src_unpack()
+{
+	gnustep_src_unpack
+	( 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 )
+}
+