version bump; fix security bug in 1.1.20, bug #64168

8 files changed, 289 insertions, 9 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 0f78e094ab0b..9e15101c60ac 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,11 +1,18 @@
 # 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.76 2004/09/02 21:23:08 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.77 2004/09/16 13:55:11 lanius Exp $
 
   02 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> cups-1.1.20-r1.ebuild,
   cups-1.1.21_rc2.ebuild:
   Made cups $(get_libdir) aware.
 
+*cups-1.1.21 (16 Sep 2004)
+
+  16 Sep 2004; Heinrich Wendel <lanius@gentoo.org>
+  +files/cups-1.1.20-zero-len-udp-dos.patch, +cups-1.1.20-r2.ebuild,
+  +cups-1.1.21.ebuild, cups-1.1.21_rc2.ebuild:
+  version bump; fix security bug in 1.1.20, bug #64168
+
 *cups-1.1.21_rc2 (24 Aug 2004)
 
   24 Aug 2004; Heinrich Wendel <lanius@gentoo.org>
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 589416cb2aa8..ee18746387f8 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,12 +1,15 @@
-MD5 6116837bf5ab1dca1bc85509b68da141 ChangeLog 10253
 MD5 21c3793835074509964b5f3c108364a0 cups-1.1.20-r1.ebuild 3381
+MD5 272685d9333e3bb04a8f9f7d5e35cb70 cups-1.1.21.ebuild 3621
+MD5 4437273249fd3d221796c488cbef1d07 cups-1.1.20-r2.ebuild 3440
+MD5 af45b0ba349926b3ee4dfc7a10d3b43f ChangeLog 10504
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 4e6688997534ae7b49275f48a4b59f73 cups-1.1.21_rc2.ebuild 3622
-MD5 6832d1647445477ffcc4b02fb78bed35 files/digest-cups-1.1.21_rc2 75
-MD5 152f70bcd644a5da56756b8b82193d10 files/cups-1.1.20-str633.patch 268
-MD5 7242b8a2000fe4c5a2b398e6602f7f1c files/cups.pam 234
-MD5 b041836e6ee51876ca7ec86869643018 files/cups.xinetd 368
-MD5 e8608b3605ae84d0f10dbc635d65292a files/cupsd.conf-1.1.18 20538
 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 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
+MD5 b041836e6ee51876ca7ec86869643018 files/cups.xinetd 368
diff --git a/net-print/cups/cups-1.1.20-r2.ebuild b/net-print/cups/cups-1.1.20-r2.ebuild
new file mode 100644
index 000000000000..0c4bfbbb3cfd
--- /dev/null
+++ b/net-print/cups/cups-1.1.20-r2.ebuild
@@ -0,0 +1,120 @@
+# 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.1 2004/09/16 13:55:11 lanius 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
+	epatch ${FILESDIR}/${P}-zero-len-udp-dos.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.21.ebuild b/net-print/cups/cups-1.1.21.ebuild
new file mode 100644
index 000000000000..ba8c893d07c5
--- /dev/null
+++ b/net-print/cups/cups-1.1.21.ebuild
@@ -0,0 +1,127 @@
+# 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.1 2004/09/16 13:55:11 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"
+
+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
+	samba? ( net-fs/samba )"
+DEPEND="${DEP}
+	>=sys-devel/autoconf-2.58"
+RDEPEND="${DEP}
+	!virtual/lpr"
+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-zero-len-udp-dos.patch b/net-print/cups/files/cups-1.1.20-zero-len-udp-dos.patch
new file mode 100644
index 000000000000..04ab3f2e08e4
--- /dev/null
+++ b/net-print/cups/files/cups-1.1.20-zero-len-udp-dos.patch
@@ -0,0 +1,22 @@
+--- cupsys-1.1.20final+rc1/scheduler/dirsvc.c.OLD	2004-05-27 11:04:32.000000000 -0700
++++ cupsys-1.1.20final+rc1/scheduler/dirsvc.c	2004-08-20 19:20:08.000000000 -0700
+@@ -1093,7 +1093,7 @@
+   int		auth;			/* Authorization status */
+   int		len;			/* Length of name string */
+   int		bytes;			/* Number of bytes left */
+-  char		packet[1540],		/* Broadcast packet */
++  char		packet[1541],		/* Broadcast packet */
+ 		*pptr;			/* Pointer into packet */
+   struct sockaddr_in srcaddr;		/* Source address */
+   char		srcname[1024];		/* Source hostname */
+@@ -1118,8 +1118,8 @@
+   */
+ 
+   len = sizeof(srcaddr);
+-  if ((bytes = recvfrom(BrowseSocket, packet, sizeof(packet), 0, 
+-                        (struct sockaddr *)&srcaddr, &len)) <= 0)
++  if ((bytes = recvfrom(BrowseSocket, packet, sizeof(packet)-1, 0, 
++                        (struct sockaddr *)&srcaddr, &len)) < 0)
+   {
+    /*
+     * "Connection refused" is returned under Linux if the destination port
diff --git a/net-print/cups/files/digest-cups-1.1.20-r2 b/net-print/cups/files/digest-cups-1.1.20-r2
new file mode 100644
index 000000000000..002ebb34be36
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.1.20-r2
@@ -0,0 +1 @@
+MD5 09d0be2bad1b0617bc0eba6eef81f6e9 cups-1.1.20-source.tar.bz2 3741510
diff --git a/net-print/cups/files/digest-cups-1.1.21 b/net-print/cups/files/digest-cups-1.1.21
new file mode 100644
index 000000000000..71015b6895ef
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.1.21
@@ -0,0 +1 @@
+MD5 54e9b0d9c0bdb45b956f88c14793ef65 cups-1.1.21-source.tar.bz2 8549181
diff --git a/net-print/cups/files/digest-cups-1.1.21_rc2 b/net-print/cups/files/digest-cups-1.1.21_rc2
deleted file mode 100644
index 9a91ee140041..000000000000
--- a/net-print/cups/files/digest-cups-1.1.21_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7532f7dc5ef7870bb49d65299f99906d cups-1.1.21rc2-source.tar.bz2 3867630