fix integer overflows, bug #68058

21 files changed, 43 insertions, 361 deletions

diff --git a/app-text/xpdf/ChangeLog b/app-text/xpdf/ChangeLog
index 9177c648c322..f59c645c304c 100644
--- 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.44 2004/10/19 20:11:33 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.45 2004/10/21 14:02:35 lanius Exp $
+
+*xpdf-3.00-r3 (21 Oct 2004)
+
+  21 Oct 2004; Heinrich Wendel <lanius@gentoo.org> -xpdf-2.02.1.ebuild,
+  -xpdf-3.00-r2.ebuild, +xpdf-3.00-r3.ebuild, -xpdf-3.00.ebuild:
+  fix integer overflows, bug #68058
 
   19 Oct 2004; Guy Martin <gmsoft@gentoo.org> xpdf-3.00-r2.ebuild:
   Stable on hppa.
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 783df6a4e980..063e6a814a1a 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,18 +1,21 @@
-MD5 ecbbe9f936de244d360e021fa85e030f ChangeLog 5451
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 78e8623c972db9014d5ed698031c9189 xpdf-2.02.1.ebuild 1127
-MD5 e72ff64a0feb9484ea01864bd308c13c xpdf-2.03.ebuild 1128
 MD5 da4e42aa1b0307c9a605711650025436 xpdf-3.00-r1.ebuild 951
+MD5 65fb9ad781e47bb2d7e0971bd7da421a xpdf-3.00-r3.ebuild 3103
+MD5 78e8623c972db9014d5ed698031c9189 xpdf-2.02.1.ebuild 1127
 MD5 6077c4fa36327883ebb4aaa2ed20023e xpdf-3.00.ebuild 835
 MD5 21c3483ef925b4a49d6aab4bf8cb6ae2 xpdf-3.00-r2.ebuild 3034
-MD5 5b8ecf36053280853d55ea04143da297 files/digest-xpdf-2.02.1 64
+MD5 e72ff64a0feb9484ea01864bd308c13c xpdf-2.03.ebuild 1128
+MD5 ecbbe9f936de244d360e021fa85e030f ChangeLog 5451
+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 90113e3ad42ec1df8d56deefa4571c10 files/xpdf-3.00-CESA-2004-007.diff.bz2 2083
+MD5 d2fc1b3562bfee9f9c7fb5beaa741084 files/xpdf-3.00-truetype.diff.gz 3288
 MD5 87cd94ef77a9e99ca1fac42c32270d39 files/digest-xpdf-2.03 61
 MD5 fd6eaa6f4bb5d94506718515cf20ac26 files/digest-xpdf-3.00 61
-MD5 fd6eaa6f4bb5d94506718515cf20ac26 files/digest-xpdf-3.00-r1 61
-MD5 d2fc1b3562bfee9f9c7fb5beaa741084 files/xpdf-3.00-truetype.diff.gz 3288
+MD5 1ca86139c360680d756c771b7c6c8647 files/xpdf-3.00-freetype-2.1.7.patch 2743
 MD5 7c0787e730fecfb5b6ebc5a7a69cd64e files/xpdfrc 1092
+MD5 5b8ecf36053280853d55ea04143da297 files/digest-xpdf-2.02.1 64
+MD5 fd6eaa6f4bb5d94506718515cf20ac26 files/digest-xpdf-3.00-r1 61
 MD5 36b521d0408d11075c1e6536e91265f2 files/digest-xpdf-3.00-r2 767
-MD5 f200f24c7cfa6061337dc6c0e03f36b9 files/xpdf-3.00-nodrm.diff 1049
-MD5 263f91efedaa87e4597ab0a83407137d files/xpdfrc.1 1593
-MD5 8221707abac9c48b486b8c2b9bc7a7a0 files/xpdf-3.00-empty-bookmark.patch 373
-MD5 1ca86139c360680d756c771b7c6c8647 files/xpdf-3.00-freetype-2.1.7.patch 2743
+MD5 36b521d0408d11075c1e6536e91265f2 files/digest-xpdf-3.00-r3 767
diff --git a/app-text/xpdf/files/digest-xpdf-2.02.1 b/app-text/xpdf/files/digest-xpdf-2.02.1
deleted file mode 100644
index 1e72fb400d32..000000000000
--- a/app-text/xpdf/files/digest-xpdf-2.02.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e2932bb0f844d8318c940350c2aa2eb6 xpdf-2.02pl1.tar.gz 476349
diff --git a/app-text/xpdf/files/digest-xpdf-3.00 b/app-text/xpdf/files/digest-xpdf-3.00
deleted file mode 100644
index 0c8a53eec796..000000000000
--- a/app-text/xpdf/files/digest-xpdf-3.00
+++ /dev/null
@@ -1 +0,0 @@
-MD5 95294cef3031dd68e65f331e8750b2c2 xpdf-3.00.tar.gz 534697
diff --git a/app-text/xpdf/files/digest-xpdf-3.00-r2 b/app-text/xpdf/files/digest-xpdf-3.00-r3
index b34171ad26f4..b34171ad26f4 100644
--- a/app-text/xpdf/files/digest-xpdf-3.00-r2
+++ b/app-text/xpdf/files/digest-xpdf-3.00-r3
diff --git a/app-text/xpdf/files/xpdf-3.00-CESA-2004-007.diff.bz2 b/app-text/xpdf/files/xpdf-3.00-CESA-2004-007.diff.bz2
new file mode 100644
index 000000000000..8899286e879b
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-3.00-CESA-2004-007.diff.bz2
diff --git a/app-text/xpdf/xpdf-2.02.1.ebuild b/app-text/xpdf/xpdf-2.02.1.ebuild
deleted file mode 100644
index f77ab8a10609..000000000000
--- a/app-text/xpdf/xpdf-2.02.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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-2.02.1.ebuild,v 1.10 2004/06/24 22:57:22 agriffis Exp $
-
-IUSE="motif"
-
-MY_PV=${PV/.1/pl1}
-
-S=${WORKDIR}/${PN}-${MY_PV}
-DESCRIPTION="An X Viewer for PDF Files"
-HOMEPAGE="http://www.foolabs.com/xpdf/"
-SRC_URI="ftp://ftp.foolabs.com/pub/xpdf/${PN}-${MY_PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa amd64"
-
-DEPEND="motif? ( virtual/x11
-		x11-libs/openmotif )
-	>=media-libs/freetype-2.0.5
-	>=media-libs/t1lib-1.3
-	virtual/ghostscript"
-
-src_compile() {
-	econf \
-		--enable-freetype2 \
-		--with-freetype2-includes=/usr/include/freetype2 \
-		--with-gzip || die
-
-	make ${MAKEOPTS} || die
-}
-
-
-src_install() {
-	make DESTDIR=${D} install || die
-	prepallman
-	dodoc README ANNOUNCE CHANGES
-	insinto /etc
-	doins ${FILESDIR}/xpdfrc
-}
-
-pkg_postinst() {
-	einfo
-	einfo "HINT: To have even nicer results add these lines to your ~/.xpdfrc"
-	einfo
-	einfo "  include         /etc/xpdfrc"
-	einfo "  t1libControl    high"
-	einfo "  freetypeControl high"
-	einfo
-}
diff --git a/app-text/xpdf/xpdf-3.00-r2.ebuild b/app-text/xpdf/xpdf-3.00-r3.ebuild
index c651af9119c7..cce51dd4b4f4 100644
--- a/app-text/xpdf/xpdf-3.00-r2.ebuild
+++ b/app-text/xpdf/xpdf-3.00-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.9 2004/10/19 20:11:33 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.00-r3.ebuild,v 1.1 2004/10/21 14:02:35 lanius Exp $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ SRC_URI="ftp://ftp.foolabs.com/pub/xpdf/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~alpha hppa amd64 ~ia64 ~ppc64"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64 ~ppc64"
 
 DEPEND="motif? ( virtual/x11
 	x11-libs/openmotif )
@@ -53,6 +53,7 @@ src_unpack() {
 	epatch ${FILESDIR}/xpdf-3.00-freetype-2.1.7.patch
 	epatch ${FILESDIR}/xpdf-3.00-empty-bookmark.patch
 	use nodrm && epatch ${FILESDIR}/xpdf-3.00-nodrm.diff
+	( cd xpdf; epatch ${FILESDIR}/xpdf-3.00-CESA-2004-007.diff.bz2 )
 	autoconf
 }
 
diff --git a/app-text/xpdf/xpdf-3.00.ebuild b/app-text/xpdf/xpdf-3.00.ebuild
deleted file mode 100644
index d9af6dc8dabd..000000000000
--- a/app-text/xpdf/xpdf-3.00.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.ebuild,v 1.4 2004/06/24 22:57:22 agriffis Exp $
-
-DESCRIPTION="An X Viewer for PDF Files"
-HOMEPAGE="http://www.foolabs.com/xpdf/"
-SRC_URI="ftp://ftp.foolabs.com/pub/xpdf/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa ~amd64 ~ia64"
-IUSE="motif"
-
-DEPEND="motif? ( virtual/x11
-	x11-libs/openmotif )
-	>=media-libs/freetype-2.0.5
-	>=media-libs/t1lib-1.3
-	virtual/ghostscript"
-
-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 COPYING
-	insinto /etc
-	doins ${FILESDIR}/xpdfrc
-}
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index da30562261bd..4d6c484aaab3 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.92 2004/10/17 03:26:45 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.93 2004/10/21 14:02:38 lanius Exp $
+
+*cups-1.1.21-r2 (21 Oct 2004)
+
+  21 Oct 2004; Heinrich Wendel <lanius@gentoo.org> +cups-1.1.20-r4.ebuild,
+  +cups-1.1.21-r2.ebuild:
+  fix integer overflows in xpdf, bug #68058
 
   16 Oct 2004; Hardave Riar <hardave@gentoo.org> cups-1.1.20-r3.ebuild:
   Stable on mips, bug #66501.
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 9fe18bf041ef..58cdd0615cb6 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,19 +1,16 @@
-MD5 06dad681067f674f5a607f9db4c842a6 cups-1.1.21-r1.ebuild 3802
-MD5 21c3793835074509964b5f3c108364a0 cups-1.1.20-r1.ebuild 3381
+MD5 8d88f33e36bc9b239922040d881af641 cups-1.1.20-r4.ebuild 3536
 MD5 e270118520bdf5e46c568047cea6eb0d cups-1.1.20-r3.ebuild 3460
-MD5 49d8636f749e452a342f3faa84555fcb cups-1.1.21.ebuild 3766
-MD5 a0febdd1dfbea0ccee6699ef83628cb1 cups-1.1.20-r2.ebuild 3427
-MD5 802c033d09ed5cd12cbf10c55b80308b ChangeLog 12159
+MD5 e043a67b59970fd418a13d8e96976844 cups-1.1.21-r2.ebuild 3872
+MD5 f8331765685d951d1667f8e4831af9d2 ChangeLog 12336
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 1219d8139b95119054d7744f6dea85a6 files/str920.patch 5795
+MD5 04f90143ff0dc0329b242a1f955af20e files/cups-xpdf-CESA-2004-007.patch.bz2 968
 MD5 d7e6454c7e8062203b324c5f6a1a2c65 files/cupsd.rc6 515
 MD5 fbd28fb7593c247a7151704df5a253ea files/cups-1.1.20-zero-len-udp-dos.patch 965
 MD5 7242b8a2000fe4c5a2b398e6602f7f1c files/cups.pam 234
-MD5 91e81d96543dd250e610b0d542becb3a files/digest-cups-1.1.21 72
-MD5 baaa1e0bc63f959779998f5e57de6f9d files/digest-cups-1.1.20-r1 72
-MD5 baaa1e0bc63f959779998f5e57de6f9d files/digest-cups-1.1.20-r2 72
 MD5 baaa1e0bc63f959779998f5e57de6f9d files/digest-cups-1.1.20-r3 72
-MD5 91e81d96543dd250e610b0d542becb3a files/digest-cups-1.1.21-r1 72
+MD5 baaa1e0bc63f959779998f5e57de6f9d files/digest-cups-1.1.20-r4 72
+MD5 91e81d96543dd250e610b0d542becb3a files/digest-cups-1.1.21-r2 72
 MD5 7bce495a238ee9dbebb61496f3b3ae51 files/disable-strip.patch 422
 MD5 152f70bcd644a5da56756b8b82193d10 files/cups-1.1.20-str633.patch 268
 MD5 e8608b3605ae84d0f10dbc635d65292a files/cupsd.conf-1.1.18 20538
diff --git a/net-print/cups/cups-1.1.20-r1.ebuild b/net-print/cups/cups-1.1.20-r1.ebuild
deleted file mode 100644
index bdee9dc7af0d..000000000000
--- a/net-print/cups/cups-1.1.20-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.20-r1.ebuild,v 1.8 2004/09/02 21:23:08 kugelfang Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="ftp://ftp.easysw.com/pub/cups/${PV}/${P}-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 ppc64"
-IUSE="ssl slp pam"
-
-DEP="virtual/libc
-	pam? ( >=sys-libs/pam-0.75 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	slp? ( >=net-libs/openslp-1.0.4 )
-	>=media-libs/libpng-1.2.1
-	>=media-libs/tiff-3.5.5
-	>=media-libs/jpeg-6b"
-DEPEND="${DEP}
-	>=sys-devel/autoconf-2.58"
-RDEPEND="${DEP}
-	!virtual/lpr"
-PROVIDE="virtual/lpr"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/disable-strip.patch
-	epatch ${FILESDIR}/${P}-str633.patch
-	WANT_AUTOCONF=2.5 autoconf || die
-}
-
-src_compile() {
-	filter-flags -fomit-frame-pointer
-
-	local myconf
-	use amd64 && replace-flags -Os -O2
-	use pam || myconf="${myconf} --disable-pam"
-	use ssl || myconf="${myconf} --disable-ssl"
-	use slp || myconf="${myconf} --disable-slp"
-
-	./configure \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-src_install() {
-	dodir /var/spool /var/log/cups /etc/cups
-
-	make \
-	LOCALEDIR=${D}/usr/share/locale \
-	DOCDIR=${D}/usr/share/cups/docs \
-	REQUESTS=${D}/var/spool/cups \
-	SERVERBIN=${D}/usr/$(get_libdir)/cups \
-	DATADIR=${D}/usr/share/cups \
-	INCLUDEDIR=${D}/usr/include \
-	AMANDIR=${D}/usr/share/man \
-	PMANDIR=${D}/usr/share/man \
-	MANDIR=${D}/usr/share/man \
-	SERVERROOT=${D}/etc/cups \
-	LOGDIR=${D}/var/log/cups \
-	SBINDIR=${D}/usr/sbin \
-	PAMDIR=${D}/etc/pam.d \
-	EXEC_PREFIX=${D}/usr \
-	LIBDIR=${D}/usr/$(get_libdir) \
-	BINDIR=${D}/usr/bin \
-	bindir=${D}/usr/bin \
-	INITDIR=${D}/etc \
-	PREFIX=${D} \
-	install || die "install problem"
-
-	dodoc {CHANGES,CREDITS,ENCRYPTION,LICENSE,README}.txt
-	dosym /usr/share/cups/docs /usr/share/doc/${PF}/html
-
-	#seems nobody installs it like this anymore.. security risk?
-	#fowners lp.root /usr/bin/lppasswd
-	#fperms 4755 /usr/bin/lppasswd
-
-	# cleanups
-	rm -rf ${D}/etc/init.d
-	rm -rf ${D}/etc/pam.d
-	rm -rf ${D}/etc/rc*
-	rm -rf ${D}/usr/share/man/cat*
-	rm -rf ${D}/etc/cups/{certs,interfaces,ppd}
-	rm -rf ${D}/var
-
-	sed -i -e "s:^#\(DocumentRoot\).*:\1 /usr/share/cups/docs:" \
-		-e "s:^#\(SystemGroup\).*:\1 lp:" \
-		-e "s:^#\(User\).*:\1 lp:" \
-		-e "s:^#\(Group\).*:\1 lp:" \
-		${D}/etc/cups/cupsd.conf
-
-	insinto /etc/pam.d ; newins ${FILESDIR}/cups.pam cups
-	exeinto /etc/init.d ; newexe ${FILESDIR}/cupsd.rc6 cupsd
-	insinto /etc/xinetd.d ; newins ${FILESDIR}/cups.xinetd cups-lpd
-
-	#insinto /etc/cups; newins ${FILESDIR}/cupsd.conf-1.1.18 cupsd.conf
-}
-
-pkg_postinst() {
-	install -d -m0755 ${ROOT}/var/log/cups
-	install -d -m0755 ${ROOT}/var/spool
-	install -m0700 -o lp -d ${ROOT}/var/spool/cups
-	install -m1700 -o lp -d ${ROOT}/var/spool/cups/tmp
-	install -m0711 -o lp -d ${ROOT}/etc/cups/certs
-	install -d -m0755 ${ROOT}/etc/cups/{interfaces,ppd}
-
-	einfo "If you're using a USB printer, \"emerge hotplug; rc-update add"
-	einfo "hotplug default\" is something you should probably do. This"
-	einfo "will allow any USB kernel modules (if present) to be loaded"
-	einfo "automatically at boot."
-}
diff --git a/net-print/cups/cups-1.1.20-r2.ebuild b/net-print/cups/cups-1.1.20-r4.ebuild
index 63a5dc61af6f..c6b952d26847 100644
--- a/net-print/cups/cups-1.1.20-r2.ebuild
+++ b/net-print/cups/cups-1.1.20-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.20-r2.ebuild,v 1.8 2004/09/23 04:04:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.20-r4.ebuild,v 1.1 2004/10/21 14:02:38 lanius Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.easysw.com/pub/cups/${PV}/${P}-source.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 ~ppc64"
+KEYWORDS="x86 ppc sparc ~mips alpha ~arm hppa amd64 ~ia64 ~s390 ~ppc64"
 IUSE="ssl slp pam"
 
 DEP="virtual/libc
@@ -32,6 +32,8 @@ src_unpack() {
 	epatch ${FILESDIR}/disable-strip.patch
 	epatch ${FILESDIR}/${P}-str633.patch
 	epatch ${FILESDIR}/${P}-zero-len-udp-dos.patch
+	epatch ${FILESDIR}/str920.patch
+	( cd pdftops; epatch ${FILESDIR}/${P}-xpdf-CESA-2004-007.patch.bz2 )
 	WANT_AUTOCONF=2.5 autoconf || die
 }
 
diff --git a/net-print/cups/cups-1.1.21-r1.ebuild b/net-print/cups/cups-1.1.21-r2.ebuild
index 50bf65e14194..0f936acbe4dd 100644
--- a/net-print/cups/cups-1.1.21-r1.ebuild
+++ b/net-print/cups/cups-1.1.21-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.21-r1.ebuild,v 1.1 2004/10/06 13:17:28 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.21-r2.ebuild,v 1.1 2004/10/21 14:02:38 lanius Exp $
 
 inherit eutils flag-o-matic
 
@@ -36,6 +36,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/disable-strip.patch
 	epatch ${FILESDIR}/str920.patch
+	( cd pdftops; epatch ${FILESDIR}/${P}-xpdf-CESA-2004-007.patch.bz2 )
 	WANT_AUTOCONF=2.5 autoconf || die
 }
 
diff --git a/net-print/cups/cups-1.1.21.ebuild b/net-print/cups/cups-1.1.21.ebuild
deleted file mode 100644
index be0aab04cc66..000000000000
--- a/net-print/cups/cups-1.1.21.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.21.ebuild,v 1.3 2004/09/22 13:08:33 lanius Exp $
-
-inherit eutils flag-o-matic
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="ftp://ftp2.easysw.com/pub/cups/${PV}/${MY_P}-source.tar.bz2 ftp://ftp.easysw.com/pub/cups/${PV}/${MY_P}-source.tar.bz2 ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${PV}/${MY_P}-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
-IUSE="ssl slp pam samba"
-
-DEP="virtual/libc
-	pam? ( >=sys-libs/pam-0.75 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	slp? ( >=net-libs/openslp-1.0.4 )
-	>=media-libs/libpng-1.2.1
-	>=media-libs/tiff-3.5.5
-	>=media-libs/jpeg-6b"
-DEPEND="${DEP}
-	>=sys-devel/autoconf-2.58"
-RDEPEND="${DEP}
-	!virtual/lpr
-	samba? ( net-fs/samba )"
-PROVIDE="virtual/lpr"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/disable-strip.patch
-	WANT_AUTOCONF=2.5 autoconf || die
-}
-
-src_compile() {
-	filter-flags -fomit-frame-pointer
-
-	local myconf
-	use amd64 && replace-flags -Os -O2
-	use pam || myconf="${myconf} --disable-pam"
-	use ssl || myconf="${myconf} --disable-ssl"
-	use slp || myconf="${myconf} --disable-slp"
-
-	./configure \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-src_install() {
-	dodir /var/spool /var/log/cups /etc/cups
-
-	make \
-	LOCALEDIR=${D}/usr/share/locale \
-	DOCDIR=${D}/usr/share/cups/docs \
-	REQUESTS=${D}/var/spool/cups \
-	SERVERBIN=${D}/usr/$(get_libdir)/cups \
-	DATADIR=${D}/usr/share/cups \
-	INCLUDEDIR=${D}/usr/include \
-	AMANDIR=${D}/usr/share/man \
-	PMANDIR=${D}/usr/share/man \
-	MANDIR=${D}/usr/share/man \
-	SERVERROOT=${D}/etc/cups \
-	LOGDIR=${D}/var/log/cups \
-	SBINDIR=${D}/usr/sbin \
-	PAMDIR=${D}/etc/pam.d \
-	EXEC_PREFIX=${D}/usr \
-	LIBDIR=${D}/usr/$(get_libdir) \
-	BINDIR=${D}/usr/bin \
-	bindir=${D}/usr/bin \
-	INITDIR=${D}/etc \
-	PREFIX=${D} \
-	install || die "install problem"
-
-	dodoc {CHANGES,CREDITS,ENCRYPTION,LICENSE,README}.txt
-	dosym /usr/share/cups/docs /usr/share/doc/${PF}/html
-
-	#seems nobody installs it like this anymore.. security risk?
-	#fowners lp.root /usr/bin/lppasswd
-	#fperms 4755 /usr/bin/lppasswd
-
-	# cleanups
-	rm -rf ${D}/etc/init.d
-	rm -rf ${D}/etc/pam.d
-	rm -rf ${D}/etc/rc*
-	rm -rf ${D}/usr/share/man/cat*
-	rm -rf ${D}/etc/cups/{certs,interfaces,ppd}
-	rm -rf ${D}/var
-
-	sed -i -e "s:^#\(DocumentRoot\).*:\1 /usr/share/cups/docs:" \
-		-e "s:^#\(SystemGroup\).*:\1 lp:" \
-		-e "s:^#\(User\).*:\1 lp:" \
-		-e "s:^#\(Group\).*:\1 lp:" \
-		${D}/etc/cups/cupsd.conf
-
-	insinto /etc/pam.d ; newins ${FILESDIR}/cups.pam cups
-	exeinto /etc/init.d ; newexe ${FILESDIR}/cupsd.rc6 cupsd
-	insinto /etc/xinetd.d ; newins ${FILESDIR}/cups.xinetd cups-lpd
-
-	#insinto /etc/cups; newins ${FILESDIR}/cupsd.conf-1.1.18 cupsd.conf
-
-	# allow raw printing
-	sed -i -e "s:#application/octet-stream:application/octet-stream" ${D}/etc/cups/mime.types
-	sed -i -e "s:#application/octet-stream:application/octet-stream" ${D}/etc/cups/mime.conv
-}
-
-pkg_postinst() {
-	install -d -m0755 ${ROOT}/var/log/cups
-	install -d -m0755 ${ROOT}/var/spool
-	install -m0700 -o lp -d ${ROOT}/var/spool/cups
-	install -m1700 -o lp -d ${ROOT}/var/spool/cups/tmp
-	install -m0711 -o lp -d ${ROOT}/etc/cups/certs
-	install -d -m0755 ${ROOT}/etc/cups/{interfaces,ppd}
-
-	einfo "If you're using a USB printer, \"emerge hotplug; rc-update add"
-	einfo "hotplug default\" is something you should probably do. This"
-	einfo "will allow any USB kernel modules (if present) to be loaded"
-	einfo "automatically at boot."
-}
diff --git a/net-print/cups/files/cups-1.1.20-xpdf-CESA-2004-007.patch.bz2 b/net-print/cups/files/cups-1.1.20-xpdf-CESA-2004-007.patch.bz2
new file mode 100644
index 000000000000..4e58c2bbea38
--- /dev/null
+++ b/net-print/cups/files/cups-1.1.20-xpdf-CESA-2004-007.patch.bz2
diff --git a/net-print/cups/files/cups-1.1.21-xpdf-CESA-2004-007.patch.bz2 b/net-print/cups/files/cups-1.1.21-xpdf-CESA-2004-007.patch.bz2
new file mode 100644
index 000000000000..f285905e8f04
--- /dev/null
+++ b/net-print/cups/files/cups-1.1.21-xpdf-CESA-2004-007.patch.bz2
diff --git a/net-print/cups/files/digest-cups-1.1.20-r2 b/net-print/cups/files/digest-cups-1.1.20-r2
deleted file mode 100644
index 002ebb34be36..000000000000
--- a/net-print/cups/files/digest-cups-1.1.20-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 09d0be2bad1b0617bc0eba6eef81f6e9 cups-1.1.20-source.tar.bz2 3741510
diff --git a/net-print/cups/files/digest-cups-1.1.20-r1 b/net-print/cups/files/digest-cups-1.1.20-r4
index 002ebb34be36..002ebb34be36 100644
--- a/net-print/cups/files/digest-cups-1.1.20-r1
+++ b/net-print/cups/files/digest-cups-1.1.20-r4
diff --git a/net-print/cups/files/digest-cups-1.1.21-r1 b/net-print/cups/files/digest-cups-1.1.21-r1
deleted file mode 100644
index 71015b6895ef..000000000000
--- a/net-print/cups/files/digest-cups-1.1.21-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 54e9b0d9c0bdb45b956f88c14793ef65 cups-1.1.21-source.tar.bz2 8549181
diff --git a/net-print/cups/files/digest-cups-1.1.21 b/net-print/cups/files/digest-cups-1.1.21-r2
index 71015b6895ef..71015b6895ef 100644
--- a/net-print/cups/files/digest-cups-1.1.21
+++ b/net-print/cups/files/digest-cups-1.1.21-r2