summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2005-02-04 21:43:54 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2005-02-04 21:43:54 +0000
commitbf4ea1b61bb6229a8d5d581a55affc50a23a43e3 (patch)
tree8a9d17e815c72836a8ff731dde40cbc1ca921102 /app-text/pdftohtml
parentYah, I tested it this time as the CROSSCOMPILE variable detection was still b... (diff)
downloadgentoo-2-bf4ea1b61bb6229a8d5d581a55affc50a23a43e3.tar.gz
gentoo-2-bf4ea1b61bb6229a8d5d581a55affc50a23a43e3.tar.bz2
gentoo-2-bf4ea1b61bb6229a8d5d581a55affc50a23a43e3.zip
Bug #78629, more xpdf security problems.
(Portage version: 2.0.51-r15)
Diffstat (limited to 'app-text/pdftohtml')
-rw-r--r--app-text/pdftohtml/ChangeLog8
-rw-r--r--app-text/pdftohtml/Manifest16
-rw-r--r--app-text/pdftohtml/files/digest-pdftohtml-0.36-r31
-rw-r--r--app-text/pdftohtml/files/xpdf-3.00pl3-keylength.patch14
-rw-r--r--app-text/pdftohtml/pdftohtml-0.36-r3.ebuild33
5 files changed, 64 insertions, 8 deletions
diff --git a/app-text/pdftohtml/ChangeLog b/app-text/pdftohtml/ChangeLog
index a4d68be3998d..154ddacce867 100644
--- a/app-text/pdftohtml/ChangeLog
+++ b/app-text/pdftohtml/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-text/pdftohtml
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/ChangeLog,v 1.17 2005/01/09 17:29:54 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/ChangeLog,v 1.18 2005/02/04 21:43:54 robbat2 Exp $
+
+*pdftohtml-0.36-r3 (04 Feb 2005)
+
+ 04 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+ +files/xpdf-3.00pl3-keylength.patch, +pdftohtml-0.36-r3.ebuild:
+ Bug #78629, more xpdf security problems.
09 Jan 2005; Jason Wever <weeve@gentoo.org> pdftohtml-0.36-r2.ebuild:
Stable on sparc wrt security bug #75200.
diff --git a/app-text/pdftohtml/Manifest b/app-text/pdftohtml/Manifest
index 2e9e9e165128..9242d0acac32 100644
--- a/app-text/pdftohtml/Manifest
+++ b/app-text/pdftohtml/Manifest
@@ -1,11 +1,13 @@
-MD5 569b5ee441a456e48148939aa5a4d0bd ChangeLog 2028
-MD5 89ef7f9c7de9131f44bb5467613d98ed pdftohtml-0.36.ebuild 660
MD5 205429f970817d3e1f5c7abff1360296 pdftohtml-0.36-r1.ebuild 931
-MD5 3754e096d50f0ec4fb6aacfd1845101f pdftohtml-0.36-r2.ebuild 1020
+MD5 f3cf6dfc74c3fd25a451dd81022aed93 pdftohtml-0.36-r3.ebuild 1104
+MD5 89ef7f9c7de9131f44bb5467613d98ed pdftohtml-0.36.ebuild 660
+MD5 569b5ee441a456e48148939aa5a4d0bd ChangeLog 2028
MD5 89167430147d99e86ca445b23be50f1b files/digest-pdftohtml-0.36 66
-MD5 89167430147d99e86ca445b23be50f1b files/digest-pdftohtml-0.36-r1 66
-MD5 87d20c86d1451638e4b7adc2f7ac8067 files/xpdf-CESA-2004-007-xpdf2-newer.diff 2718
-MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
MD5 362296e34a1a04a6e5e2a7d9e97547c6 files/xpdf2-underflow.patch 2363
-MD5 89167430147d99e86ca445b23be50f1b files/digest-pdftohtml-0.36-r2 66
+MD5 c32a612ce419b9930ff273cf382558bf files/xpdf-3.00pl3-keylength.patch 346
MD5 5d40ba9d885af84bcc917ad17e2bf8e0 files/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch 1136
+MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
+MD5 89167430147d99e86ca445b23be50f1b files/digest-pdftohtml-0.36-r1 66
+MD5 89167430147d99e86ca445b23be50f1b files/digest-pdftohtml-0.36-r2 66
+MD5 89167430147d99e86ca445b23be50f1b files/digest-pdftohtml-0.36-r3 66
+MD5 87d20c86d1451638e4b7adc2f7ac8067 files/xpdf-CESA-2004-007-xpdf2-newer.diff 2718
diff --git a/app-text/pdftohtml/files/digest-pdftohtml-0.36-r3 b/app-text/pdftohtml/files/digest-pdftohtml-0.36-r3
new file mode 100644
index 000000000000..5ae8348e609f
--- /dev/null
+++ b/app-text/pdftohtml/files/digest-pdftohtml-0.36-r3
@@ -0,0 +1 @@
+MD5 75ad095bb51e1f66c9f7691e6af12f44 pdftohtml-0.36.tar.gz 300922
diff --git a/app-text/pdftohtml/files/xpdf-3.00pl3-keylength.patch b/app-text/pdftohtml/files/xpdf-3.00pl3-keylength.patch
new file mode 100644
index 000000000000..d7d2294c8527
--- /dev/null
+++ b/app-text/pdftohtml/files/xpdf-3.00pl3-keylength.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/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild b/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild
new file mode 100644
index 000000000000..57a88e7e4f0e
--- /dev/null
+++ b/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild,v 1.1 2005/02/04 21:43:54 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="pdftohtml is a utility which converts PDF files into HTML and XML formats"
+HOMEPAGE="http://${PN}.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~ppc64"
+IUSE=""
+DEPEND="virtual/libc sys-devel/gcc"
+RDEPEND="virtual/libc"
+
+src_unpack() {
+ unpack ${A}
+ EPATCH_OPTS="-d ${S}/xpdf -p0" epatch ${FILESDIR}/xpdf-CESA-2004-007-xpdf2-newer.diff
+ EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xpdf-goo-sizet.patch
+ EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xpdf2-underflow.patch
+ EPATCH_OPTS="-d ${S}/xpdf -p0" epatch ${FILESDIR}/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch
+ EPATCH_OPTS="-d ${S}/xpdf -p0" epatch ${FILESDIR}/xpdf-3.00pl3-keylength.patch
+}
+
+src_compile() {
+ emake || die
+}
+
+src_install() {
+ dobin pdftohtml
+ dodoc AUTHORS BUGS CHANGES COPYING README pdf2xml.dtd
+}