\e[5~add security fix on 64bit platforms, bug #69662

diff --git a/app-text/xpdf/ChangeLog b/app-text/xpdf/ChangeLog
index 308a52e59dc3fa8778eaa1663be98ca6df170cbb..9bab1b0dc464e34cd4fcf7643605f781c6746a2d 100644 (file)
--- a/app-text/xpdf/ChangeLog
+++ b/app-text/xpdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/xpdf
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.49 2004/10/25 19:48:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.50 2004/11/01 14:00:28 lanius Exp $
+
+*xpdf-3.00-r5 (01 Nov 2004)
+
+  01 Nov 2004; <heino@gentoo.org> +files/xpdf-goo-sizet.patch,
+  +xpdf-3.00-r5.ebuild:
+  add security fix on 64bit platforms, bug #69662
 
   27 Oct 2004; Aron Griffis <agriffis@gentoo.org> xpdf-3.00-r4.ebuild:
   stable on ia64 #68661

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index a4e8e04db5907a8e72e16576ed99e92de1a11221..292c423f0d7b2b5222cc81606fae9fd223315ee5 100644 (file)
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,18 +1,21 @@
-MD5 bd52bd6525cf1ec0798be613abee75d9 ChangeLog 6334
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 9f80037668ee21ff1e8772317ca8f6a0 xpdf-2.03.ebuild 1154
 MD5 6dd4db69399ea021171a0c490a2cd8c5 xpdf-3.00-r1.ebuild 978
+MD5 f09d3d5f903a503dbcffdb633727a7ea xpdf-3.00-r5.ebuild 3257
+MD5 9f80037668ee21ff1e8772317ca8f6a0 xpdf-2.03.ebuild 1154
 MD5 bef529ecba71098065eee2e36263c067 xpdf-3.00-r4.ebuild 3212
-MD5 87cd94ef77a9e99ca1fac42c32270d39 files/digest-xpdf-2.03 61
-MD5 fd6eaa6f4bb5d94506718515cf20ac26 files/digest-xpdf-3.00-r1 61
-MD5 d2fc1b3562bfee9f9c7fb5beaa741084 files/xpdf-3.00-truetype.diff.gz 3288
-MD5 7c0787e730fecfb5b6ebc5a7a69cd64e files/xpdfrc 1092
-MD5 36b521d0408d11075c1e6536e91265f2 files/digest-xpdf-3.00-r4 767
-MD5 f200f24c7cfa6061337dc6c0e03f36b9 files/xpdf-3.00-nodrm.diff 1049
-MD5 263f91efedaa87e4597ab0a83407137d files/xpdfrc.1 1593
+MD5 de549df3e918c4920507417bad0e5c51 ChangeLog 6499
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 8221707abac9c48b486b8c2b9bc7a7a0 files/xpdf-3.00-empty-bookmark.patch 373
+MD5 263f91efedaa87e4597ab0a83407137d files/xpdfrc.1 1593
+MD5 f200f24c7cfa6061337dc6c0e03f36b9 files/xpdf-3.00-nodrm.diff 1049
+MD5 d2fc1b3562bfee9f9c7fb5beaa741084 files/xpdf-3.00-truetype.diff.gz 3288
+MD5 87cd94ef77a9e99ca1fac42c32270d39 files/digest-xpdf-2.03 61
+MD5 37f0b42aad269cb5896773b47b1d83ac files/xpdf-3.00-truetype-new.diff.gz 1271
 MD5 1ca86139c360680d756c771b7c6c8647 files/xpdf-3.00-freetype-2.1.7.patch 2743
-MD5 41c050cd5c7ccdcf1676a6852c7a35ed files/xpdf-3.00-PathScanner.patch.bz2 1003
+MD5 7c0787e730fecfb5b6ebc5a7a69cd64e files/xpdfrc 1092
 MD5 3df9058a9971c09627e71dad6b056244 files/xpdf-3.00-core.patch.bz2 271
 MD5 c3d50c3fb232fe51c2ae06ff1f530d49 files/xpdf-3.00-overflow.patch.bz2 2097
-MD5 37f0b42aad269cb5896773b47b1d83ac files/xpdf-3.00-truetype-new.diff.gz 1271
+MD5 41c050cd5c7ccdcf1676a6852c7a35ed files/xpdf-3.00-PathScanner.patch.bz2 1003
+MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
+MD5 fd6eaa6f4bb5d94506718515cf20ac26 files/digest-xpdf-3.00-r1 61
+MD5 36b521d0408d11075c1e6536e91265f2 files/digest-xpdf-3.00-r4 767
+MD5 36b521d0408d11075c1e6536e91265f2 files/digest-xpdf-3.00-r5 767

diff --git a/app-text/xpdf/files/digest-xpdf-3.00-r5 b/app-text/xpdf/files/digest-xpdf-3.00-r5
new file mode 100644 (file)
index 0000000..b34171a
--- /dev/null
+++ b/app-text/xpdf/files/digest-xpdf-3.00-r5
@@ -0,0 +1,12 @@
+MD5 95294cef3031dd68e65f331e8750b2c2 xpdf-3.00.tar.gz 534697
+MD5 67f05f65bc64bf022b36138c7c26746d xpdf-arabic.tar.gz 1058
+MD5 713659f0282b9e3d169390e246e5eb74 xpdf-chinese-simplified.tar.gz 756127
+MD5 5be730b859f8b01de569eb1bad188426 xpdf-chinese-traditional.tar.gz 698902
+MD5 21f57122247e2e2a63bfed4dc4f6c199 xpdf-cyrillic.tar.gz 1286
+MD5 2240a364b9c28ce09fd8c3107784ce40 xpdf-greek.tar.gz 1124
+MD5 438dd417517641cbb78a94facf2d938e xpdf-hebrew.tar.gz 1314
+MD5 57bb9359437583479b6670e75fa06c31 xpdf-japanese.tar.gz 430478
+MD5 10cd92e4eef065a6a26341d9a2a1b5c2 xpdf-korean.tar.gz 419081
+MD5 b305d44eb5d2b8e1da291b577017945e xpdf-latin2.tar.gz 1440
+MD5 9af495766ee4eaf3411d1fa74560f0ec xpdf-thai.tar.gz 1876
+MD5 f9233880805e3d8d2cf15a4fe679f25b xpdf-turkish.tar.gz 1140

diff --git a/app-text/xpdf/files/xpdf-goo-sizet.patch b/app-text/xpdf/files/xpdf-goo-sizet.patch
new file mode 100644 (file)
index 0000000..5d90c51
--- /dev/null
+++ b/app-text/xpdf/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/app-text/xpdf/xpdf-3.00-r5.ebuild b/app-text/xpdf/xpdf-3.00-r5.ebuild
new file mode 100644 (file)
index 0000000..cbf9dbf
--- /dev/null
+++ b/app-text/xpdf/xpdf-3.00-r5.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.00-r5.ebuild,v 1.1 2004/11/01 14:00:28 lanius Exp $
+
+inherit eutils
+
+DESCRIPTION="An X Viewer for PDF Files"
+HOMEPAGE="http://www.foolabs.com/xpdf/"
+SRC_URI="ftp://ftp.foolabs.com/pub/xpdf/${P}.tar.gz
+       linguas_ar? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-arabic.tar.gz )
+       linguas_zh_CN? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-simplified.tar.gz )
+       linguas_zh_TW? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-traditional.tar.gz )
+       linguas_ru? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-cyrillic.tar.gz )
+       linguas_el? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-greek.tar.gz )
+       linguas_he? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-hebrew.tar.gz )
+       linguas_ja? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-japanese.tar.gz )
+       linguas_ko? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-korean.tar.gz )
+       linguas_la? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-latin2.tar.gz )
+       linguas_th? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-thai.tar.gz )
+       linguas_tr? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-turkish.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~ppc64"
+
+DEPEND="motif? ( virtual/x11
+       x11-libs/openmotif )
+       >=media-libs/freetype-2.0.5
+       >=media-libs/t1lib-1.3
+       virtual/ghostscript"
+
+RDEPEND="${DEPEND}
+       linguas_ja? ( media-fonts/kochi-substitute )
+       linguas_zh_CN? ( media-fonts/arphicfonts )
+       linguas_zh_TW? ( media-fonts/arphicfonts )
+       linguas_ko? ( media-fonts/baekmuk-fonts )
+       !app-text/xpdf-chinese-simplified
+       !app-text/xpdf-chinese-traditional
+       !app-text/xpdf-cyrillic
+       !app-text/xpdf-greek
+       !app-text/xpdf-japanese
+       !app-text/xpdf-korean
+       !app-text/xpdf-latin2
+       !app-text/xpdf-thai
+       !app-text/xpdf-turkish"
+
+PROVIDE="virtual/pdfviewer"
+
+IUSE="motif nodrm"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/xpdf-3.00-truetype-new.diff.gz
+       epatch ${FILESDIR}/xpdf-3.00-freetype-2.1.7.patch
+       epatch ${FILESDIR}/xpdf-3.00-empty-bookmark.patch
+       epatch ${FILESDIR}/xpdf-3.00-core.patch.bz2
+       epatch ${FILESDIR}/xpdf-3.00-overflow.patch.bz2
+       epatch ${FILESDIR}/xpdf-3.00-PathScanner.patch.bz2
+       use nodrm && epatch ${FILESDIR}/xpdf-3.00-nodrm.diff
+       epatch ${FILESDIR}/xpdf-goo-sizet.patch
+       autoconf
+}
+
+src_compile() {
+       econf \
+               --enable-freetype2 \
+               --with-freetype2-includes=/usr/include/freetype2 || die
+
+       emake || die
+}
+
+src_install() {
+       make DESTDIR=${D} install || die
+       prepallman
+       dodoc README ANNOUNCE CHANGES
+       insinto /etc
+       newins ${FILESDIR}/xpdfrc.1 xpdfrc
+
+       # install languages
+       use linguas_ar && install_lang turkish
+       use linguas_zh_CN && install_lang chinese-simplified
+       use linguas_zh_TW && install_lang chinese-traditional
+       use linguas_ru && install_lang cyrillic
+       use linguas_el && install_lang greek
+       use linguas_he && install_lang hebrew
+       use linguas_ja && install_lang japanese
+       use linguas_ko && install_lang korean
+       use linguas_la && install_lang latin2
+       use linguas_th && install_lang thai
+       use linguas_tr && install_lang turkish
+
+}
+
+install_lang() {
+       cd ../xpdf-$1
+       sed 's,/usr/local/share/xpdf/,/usr/share/xpdf/,g' add-to-xpdfrc >> ${D}/etc/xpdfrc
+       insinto /usr/share/xpdf/$1
+       doins *.unicodeMap
+       doins *.cid*
+       insinto /usr/share/xpdf/$1/CMap
+       doins CMap/*
+}