security bump; bug #78249

5 files changed, 160 insertions, 7 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index bd664cb86fd0..877302e2c109 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.116 2005/01/19 13:08:02 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.117 2005/01/19 13:42:36 lanius Exp $
+
+*cups-1.1.23-r1 (19 Jan 2005)
+
+  19 Jan 2005; Heinrich Wendel <lanius@gentoo.org> +files/xpdf-pl3.patch,
+  +cups-1.1.23-r1.ebuild:
+  security bump; bug #78249
 
   19 Jan 2005; Joshua Kinard <kumba@gentoo.org> cups-1.1.23.ebuild:
   Marked stable on mips.
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 380515e78162..35ea710c8d36 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,12 +1,15 @@
-MD5 8152c8d9c022d656687783833ae5d16e ChangeLog 15311
 MD5 59404234e8dfa10d387de039ba444d9f cups-1.1.23_rc1.ebuild 3908
-MD5 c23f232faeac14ad659d68f75825c20c cups-1.1.23.ebuild 3803
+MD5 90a2a0f34dd48756a58ae71b6d333640 cups-1.1.23-r1.ebuild 3861
+MD5 8152c8d9c022d656687783833ae5d16e ChangeLog 15311
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 a072271745e21050d873cc0cd2d7b6aa files/digest-cups-1.1.23_rc1 75
-MD5 eb02b2008717b62447ec2d2ac1e37d5a files/digest-cups-1.1.23 72
+MD5 c23f232faeac14ad659d68f75825c20c cups-1.1.23.ebuild 3803
 MD5 85bc20d893f097ef0f13947179c3838c files/cups-1.1.22-xpdf2-underflow.patch 2301
-MD5 7242b8a2000fe4c5a2b398e6602f7f1c files/cups.pam 234
-MD5 b041836e6ee51876ca7ec86869643018 files/cups.xinetd 368
+MD5 a097b6a9c53c9ef50a6f3662d802cdfa files/xpdf-pl3.patch 348
+MD5 a072271745e21050d873cc0cd2d7b6aa files/digest-cups-1.1.23_rc1 75
 MD5 d7e6454c7e8062203b324c5f6a1a2c65 files/cupsd.rc6 515
+MD5 7242b8a2000fe4c5a2b398e6602f7f1c files/cups.pam 234
+MD5 eb02b2008717b62447ec2d2ac1e37d5a files/digest-cups-1.1.23 72
+MD5 eb02b2008717b62447ec2d2ac1e37d5a files/digest-cups-1.1.23-r1 72
 MD5 7bce495a238ee9dbebb61496f3b3ae51 files/disable-strip.patch 422
 MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
+MD5 b041836e6ee51876ca7ec86869643018 files/cups.xinetd 368
diff --git a/net-print/cups/cups-1.1.23-r1.ebuild b/net-print/cups/cups-1.1.23-r1.ebuild
new file mode 100644
index 000000000000..4b117976d44a
--- /dev/null
+++ b/net-print/cups/cups-1.1.23-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r1.ebuild,v 1.1 2005/01/19 13:42:36 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+IUSE="ssl slp pam samba nls"
+
+DEP="virtual/libc
+	pam? ( >=sys-libs/pam-0.75 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	slp? ( >=net-libs/openslp-1.0.4 )
+	nls? ( sys-devel/gettext )
+	>=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"
+PDEPEND="samba? ( >=net-fs/samba-3.0.8 )"
+PROVIDE="virtual/lpr"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/disable-strip.patch
+	( cd pdftops; epatch ${FILESDIR}/xpdf-goo-sizet.patch )
+	( cd pdftops; epatch ${FILESDIR}/cups-1.1.22-xpdf2-underflow.patch )
+	( cd pdftops; epatch ${FILESDIR}/xpdf-pl3.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"
+	use nls || myconf="${myconf} --disable-nls"
+
+	./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
+
+	# 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
+
+	if use pam; then
+		insinto /etc/pam.d ; newins ${FILESDIR}/cups.pam cups
+	fi
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/cupsd.rc6 cupsd
+	insinto /etc/xinetd.d ; newins ${FILESDIR}/cups.xinetd cups-lpd
+
+	# 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 coldplug; rc-update add"
+	einfo "coldplug 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/digest-cups-1.1.23-r1 b/net-print/cups/files/digest-cups-1.1.23-r1
new file mode 100644
index 000000000000..64352b8bc3d5
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.1.23-r1
@@ -0,0 +1 @@
+MD5 4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2 8705521
diff --git a/net-print/cups/files/xpdf-pl3.patch b/net-print/cups/files/xpdf-pl3.patch
new file mode 100644
index 000000000000..e7b33e514da1
--- /dev/null
+++ b/net-print/cups/files/xpdf-pl3.patch
@@ -0,0 +1,14 @@
+*** XRef.cxx.orig	Wed Jan 12 17:10:53 2005
+--- XRef.cxx	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) {