bug #74479

4 files changed, 149 insertions, 2 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 846964c3b7c0..0f65e014f638 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.101 2004/11/12 12:01:12 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.102 2004/12/26 19:29:02 lanius Exp $
+
+*cups-1.1.23_rc1 (26 Dec 2004)
+
+  26 Dec 2004; Heinrich Wendel <lanius@gentoo.org> +cups-1.1.23_rc1.ebuild:
+  version bump; mark stable on x86 because of security bugs in pdftops and
+  lppasswd, bug #74479
 
   12 Nov 2004; Heinrich Wendel <lanius@gentoo.org> -cups-1.1.20-r3.ebuild,
   -cups-1.1.20-r4.ebuild, cups-1.1.22.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 0543ffa2d117..1f916cf7b3d7 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,8 +1,10 @@
 MD5 7d527fbd218552edf324a082dfe75bdd cups-1.1.22.ebuild 3895
+MD5 f8aecff9eab3a54de317d7b9bd7ae887 cups-1.1.23_rc1.ebuild 4117
 MD5 44312919fe8a6c361fd4d36adc37ac61 cups-1.1.20-r5.ebuild 3648
-MD5 0c1b665f0c6629ec3c05975443215a3b ChangeLog 13307
+MD5 1cb00d2c85201601f7b9db9e31b32e13 ChangeLog 13514
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 85bc20d893f097ef0f13947179c3838c files/cups-1.1.22-xpdf2-underflow.patch 2301
+MD5 a072271745e21050d873cc0cd2d7b6aa files/digest-cups-1.1.23_rc1 75
 MD5 1219d8139b95119054d7744f6dea85a6 files/str920.patch 5795
 MD5 ff2fde0af36236ae1813438275525fa2 files/cups-1.1.21-xpdf-CESA-2004-007.patch.bz2 966
 MD5 d7e6454c7e8062203b324c5f6a1a2c65 files/cupsd.rc6 515
diff --git a/net-print/cups/cups-1.1.23_rc1.ebuild b/net-print/cups/cups-1.1.23_rc1.ebuild
new file mode 100644
index 000000000000..c8a4c06e9c46
--- /dev/null
+++ b/net-print/cups/cups-1.1.23_rc1.ebuild
@@ -0,0 +1,138 @@
+# 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.23_rc1.ebuild,v 1.1 2004/12/26 19:29:02 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/test/${MY_P}-source.tar.bz2 ftp://ftp.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2 ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/test/${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 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 )
+	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
+
+	#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
+
+	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
+
+	#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
+
+	# fix bug in lib installation (appeared in 1.1.23_rc1)
+	dodir /usr/lib/
+	mv ${D}/usr/libc* ${D}/usr/lib
+}
+
+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/digest-cups-1.1.23_rc1 b/net-print/cups/files/digest-cups-1.1.23_rc1
new file mode 100644
index 000000000000..5fb4420811da
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.1.23_rc1
@@ -0,0 +1 @@
+MD5 1f23d8949a81bcfed62d3927729e9070 cups-1.1.23rc1-source.tar.bz2 8476750