Add cups-1.3.7-r2.ebuild, fixes glibc-2.8 compatibility bug #225421 and also addresses an issue with IPP authentification.

Package-Manager: portage-2.1.5.4

5 files changed, 323 insertions, 12 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 26ac3a8565b4..35c7823b57bc 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.312 2008/05/18 14:37:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.313 2008/06/09 21:37:05 tgurr Exp $
+
+*cups-1.3.7-r2 (09 Jun 2008)
+
+  09 Jun 2008; Timo Gurr <tgurr@gentoo.org>
+  +files/cups-1.3.7-peercred.patch, +files/cups-1.3.7-str2750.patch,
+  +cups-1.3.7-r2.ebuild:
+  Add cups-1.3.7-r2.ebuild, fixes glibc-2.8 compatibility bug #225421 and
+  also addresses an issue with IPP authentification.
 
   18 May 2008; Markus Meier <maekke@gentoo.org> cups-1.3.7-r1.ebuild:
   amd64/x86 stable, bug #221065
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 222ebee785ac..f4234c11c0c5 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cups-1.2.0-bindnow.patch 2178 RMD160 cdf51a6734c7a38fab33f270c7c374445a934321 SHA1 5406422e6b92c571f636d521baee354f84fafc2d SHA256 0fffd86557fdfbf85e32781d1b77f9696e5f0ed7eb30a78fb57ca82cfafdc190
 AUX cups-1.2.12-CVE-2007-4045.patch 1737 RMD160 6c239b26443af6cf841a457cc5611a2f78d809c3 SHA1 02c2bd1bf58204fd9e1b380f8899dae2f98c2fed SHA256 0e4898b7e42f74f894b416a1398d75bcf6062497a87e061984f09e904f68489e
 AUX cups-1.2.12-CVE-2007-4351.patch 3910 RMD160 461a232b2a0ebc52a83cb729112c0f7d3f3d0ffe SHA1 9b7706a34fd08c32b7911a9f09f02a02c790a77c SHA256 1da64de6358dea65971105530795ffb8d100ddfe5b42c03cdbd815432de219c8
@@ -13,6 +10,8 @@ AUX cups-1.2.12-CVE-2008-1722.patch 1457 RMD160 5c887ad9b824c1e41f7a4894f757d03f
 AUX cups-1.3.0-configure.patch 651 RMD160 e4c7f45d7ddc28157433bf025c7f946c7e3b6d6a SHA1 101bf1893b56640d9fa82078e29319fbbd1449c7 SHA256 d6e5e60a982a3c093c0d0f89cf865e2b4c36290f5b1e188b7bf305d210070736
 AUX cups-1.3.7-CVE-2008-1722.patch 1752 RMD160 25dd7948f4a3c8ac0f39b33387e79195b104bf1d SHA1 309d26918fc11619a97b3f560662478437d97a54 SHA256 d372a4595f52ccd88deb5545f64b70c3dbf8a6e9bec7524b6ac32c59cb131749
 AUX cups-1.3.7-backend-https.patch 450 RMD160 9a1ad48d2be40c89510ccc512649f0a2eb5543b0 SHA1 d3dd55fcdee47855d6b7c1443adb6c2b3d8c9cdb SHA256 060f929ae3eae5dc411ce6352a0d50c3296b013974f034fc2ad8d6bb0c81b45a
+AUX cups-1.3.7-peercred.patch 350 RMD160 1f7025a28bcba9a394bc6744afda9759a6d40343 SHA1 2c82cf1e06f9d3be5bae6fdd11cc5924072fd132 SHA256 3564daff966c12db738bbda3e5443883217c5a4407d50144c09d5d9f98ba4711
+AUX cups-1.3.7-str2750.patch 365 RMD160 4cffde801c811b52683ea6c9811c2349295620ca SHA1 d0df41aa310dedd12ae4210654ed788e0d762cd2 SHA256 8e052687c6bfb5f117baacaa10826a3327db26f193991d3dab6fb27678bbc522
 AUX cupsd.init 288 RMD160 9bd676af5b43a97ba08ca51f70cefb445faeb8b8 SHA1 922868e1a6acb81b83e87a3c6905149789f16503 SHA256 008eeadc4979ad0e1f05e8ce5d22449eb798375e75ffc3176cbef138a53de4f9
 AUX cupsd.init.d 293 RMD160 19fbef21cee7e472e7028f3101b680baa0089c54 SHA1 e6b27b2638fec258fe2f55c926c2530e909ca3d2 SHA256 b4268a6bae95e96b6af21c3716ecc905073736ce7dc33be1489d574a447f3c48
 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
@@ -22,12 +21,6 @@ EBUILD cups-1.2.12-r4.ebuild 7115 RMD160 fee0f16a1e8c129ad1cd0eafb08c35c595ab112
 EBUILD cups-1.2.12-r7.ebuild 7258 RMD160 e958afeffea6e9091ca95a5a71c268684d554a80 SHA1 df11df1295526ff2ba1976393cda1102bfcf8b6d SHA256 764fac899e31568ea09db6fc0457049659fc5e3e72978cafab709056223b8e96
 EBUILD cups-1.2.12-r8.ebuild 7360 RMD160 496fde17c1d47d51ff96e280ead462d41948e59e SHA1 13790e5978af371e3a06949a00bf114ab0a3ced2 SHA256 f7e826fbec0425ba598b23651946af118f330fd9645ed0c82d32d66100863ce8
 EBUILD cups-1.3.7-r1.ebuild 8284 RMD160 4f18357d6ee4f127f5c47aecc676992a42328fde SHA1 d05e73142d4b2ac85ef73416f95fa041c8a2df1c SHA256 23f13201003ea129736b22cabb50d3b37aba37da35c2733b8da9a479016d7db1
-MISC ChangeLog 45382 RMD160 8690eeaef9a819c5790fb43c17e7913ec1c5dc31 SHA1 3e3b2fee5a9d8843a1cab45efb08eb96f8839378 SHA256 af53e2e485438cada11edf9111f020811519d67ccc094ef31a92683cb3384f96
+EBUILD cups-1.3.7-r2.ebuild 8520 RMD160 e5f68cf370cdf17f870f7189591998a86ae80840 SHA1 a6f6cdf531e95f7b4699dc7503f5b5f0a90a15c5 SHA256 44bfb044b0fc0f89a59290a8ce19c339ded7f39f32f675b0bd7789080aaf7b55
+MISC ChangeLog 45677 RMD160 fc7e989b5436bb1cf493a92daa49da364c9220bb SHA1 9be3b573977913ad2dfa74da7622d68482c06e8b SHA256 1defd1eb264fb2b7f86b565677e7918d5a0b8c2614c3a99058715140bbf85e1b
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgwP1QACgkQkKaRLQcq0GLAmgCfZ8R2fMc6F9P0Z91h+G6STLjj
-KoIAn10F3v5B77aPDaXJUd1T579pGUnV
-=A5ud
------END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.3.7-r2.ebuild b/net-print/cups/cups-1.3.7-r2.ebuild
new file mode 100644
index 000000000000..fe8046aca3f1
--- /dev/null
+++ b/net-print/cups/cups-1.3.7-r2.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.7-r2.ebuild,v 1.1 2008/06/09 21:37:06 tgurr Exp $
+
+inherit autotools eutils flag-o-matic multilib pam
+
+MY_P=${P/_}
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+SRC_URI="mirror://sourceforge/cups/${MY_P}-source.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="acl avahi dbus java jpeg kerberos ldap nls pam perl php png ppds python samba slp ssl static tiff X zeroconf"
+
+COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
+	avahi? ( net-dns/avahi )
+	dbus? ( sys-apps/dbus )
+	java? ( >=virtual/jre-1.4 )
+	jpeg? ( >=media-libs/jpeg-6b )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
+	perl? ( dev-lang/perl )
+	php? ( dev-lang/php )
+	png? ( >=media-libs/libpng-1.2.1 )
+	python? ( dev-lang/python )
+	slp? ( >=net-libs/openslp-1.0.4 )
+	ssl? ( net-libs/gnutls )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	zeroconf? ( !avahi? ( net-misc/mDNSResponder ) )
+	app-text/libpaper
+	dev-libs/libgcrypt"
+
+DEPEND="${COMMON_DEPEND}
+	!<net-print/foomatic-filters-ppds-20070501
+	!<net-print/hplip-1.7.4a-r1
+	nls? ( sys-devel/gettext )"
+
+RDEPEND="${COMMON_DEPEND}
+	!virtual/lpr
+	nls? ( virtual/libintl )
+	X? ( x11-misc/xdg-utils )
+	>=app-text/poppler-0.4.3-r1"
+
+PDEPEND="
+	ppds? ( || (
+		(
+			net-print/foomatic-filters-ppds
+			net-print/foomatic-db-ppds
+		)
+		net-print/foomatic-filters-ppds
+		net-print/foomatic-db-ppds
+		net-print/hplip
+		net-print/gutenprint
+		net-print/foo2zjs
+		net-print/cups-pdf
+	) )
+	samba? ( >=net-fs/samba-3.0.8 )
+	virtual/ghostscript"
+
+PROVIDE="virtual/lpr"
+
+# upstream includes an interactive test which is a nono for gentoo.
+# therefore, since the printing herd has bigger fish to fry, for now,
+# we just leave it out, even if FEATURES=test
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+LANGS="de en es et fr he it ja pl sv zh_TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+pkg_setup() {
+	if use avahi && ! built_with_use net-dns/avahi mdnsresponder-compat ; then
+		echo
+		eerror "In order to have cups working with avahi zeroconf support, you need"
+		eerror "to have net-dns/avahi emerged with \"mdnsresponder-compat\" in your USE"
+		eerror "flag. Please add that flag, re-emerge avahi, and then emerge cups again."
+		die "net-dns/avahi is missing the mdnsresponder-compat feature."
+	fi
+
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+
+	enewgroup lpadmin 106
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# disable configure automagic for acl/attr, upstream bug STR #2723
+	epatch "${FILESDIR}/${PN}-1.3.0-configure.patch"
+
+	# create a missing symlink to allow https printing via IPP, bug #217293
+	epatch "${FILESDIR}/${PN}-1.3.7-backend-https.patch"
+
+	# CVE-2008-1722 security patch, bug #217232
+	epatch "${FILESDIR}/${PN}-1.3.7-CVE-2008-1722.patch"
+
+	# fix compilation against glibc-2.8, bug #225421
+	epatch "${FILESDIR}/${PN}-1.3.7-peercred.patch"
+
+	# fix IPP authentification, upstream bug STR #2750 (already fixed in CUPS SVN)
+	epatch "${FILESDIR}/${PN}-1.3.7-str2750.patch"
+
+	# cups does not use autotools "the usual way" and ship a static config.h.in
+	eaclocal
+	eautoconf
+}
+
+src_compile() {
+	# needed to prevent ghostscript compile failures
+	use kerberos && strip-flags
+
+	# locale support
+	strip-linguas ${LANGS}
+
+	if [ -z "${LINGUAS}" ] ; then
+		export LINGUAS=all
+	fi
+
+	export DSOFLAGS="${LDFLAGS}"
+
+	if use ldap ; then
+		append-flags -DLDAP_DEPRECATED
+	fi
+
+	local myconf
+
+	if use avahi || use zeroconf ; then
+		myconf="${myconf} --enable-dnssd"
+	else
+		myconf="${myconf} --disable-dnssd"
+	fi
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--localstatedir=/var \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-docdir=/usr/share/cups/html \
+		--with-languages=${LINGUAS} \
+		--with-system-groups=lpadmin \
+		$(use_enable acl) \
+		$(use_enable dbus) \
+		$(use_enable jpeg) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable ldap) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_enable png) \
+		$(use_enable slp) \
+		$(use_enable ssl) \
+		$(use_enable static) \
+		$(use_enable tiff) \
+		$(use_with java) \
+		$(use_with perl) \
+		$(use_with php) \
+		$(use_with python) \
+		--enable-gnutls \
+		--enable-libpaper \
+		--enable-threads \
+		--disable-pdftops \
+		${myconf} \
+		|| die "econf failed"
+
+	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs
+	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h
+	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake BUILDROOT="${D}" install || die "emake install failed"
+	dodoc {CHANGES{,-1.{0,1}},CREDITS,README}.txt || die "dodoc install failed"
+
+	# clean out cups init scripts
+	rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+	# install our init script
+	local neededservices
+	use avahi && neededservices="$neededservices avahi-daemon"
+	use dbus && neededservices="$neededservices dbus"
+	use zeroconf && ! use avahi && neededservices="$neededservices mDNSResponderPosix"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	sed -e "s/@neededservices@/$neededservices/" "${FILESDIR}"/cupsd.init.d > "${T}"/cupsd
+	doinitd "${T}"/cupsd
+
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	# correct path
+	sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" "${D}"/etc/xinetd.d/cups-lpd
+	# it is safer to disable this by default, bug 137130
+	grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \
+		sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd
+
+	# install pdftops filter
+	exeinto /usr/libexec/cups/filter/
+	newexe "${FILESDIR}"/pdftops-1.20.gentoo pdftops
+
+	# only for gs-esp this is correct, see bug 163897
+	if has_version app-text/ghostscript-gpl || has_version app-text/ghostscript-gnu ; then
+		sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-postscript:" "${D}"/etc/cups/mime.convs
+	fi
+
+	keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
+		/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl
+
+	# .desktop handling. X useflag. xdg-open from freedesktop is preferred, upstream bug STR #2724.
+	if use X ; then
+		sed -i -e "s:htmlview:xdg-open:" "${D}"/usr/share/applications/cups.desktop
+	else
+		rm -r "${D}"/usr/share/applications
+	fi
+
+	# fix a symlink collision, see bug #172341
+	dodir /usr/share/ppd
+	dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
+
+	# create RSS feed directory
+	diropts -m 0740 -o lp -g lp
+	dodir /var/cache/cups/rss
+
+	# create /etc/cups/client.conf, bug #196967
+	echo "ServerName localhost" >> "${D}"/etc/cups/client.conf
+}
+
+pkg_preinst() {
+	# cleanups
+	[ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/"${PN}"-*
+}
+
+pkg_postinst() {
+	echo
+	elog "For information about installing a printer and general cups setup"
+	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
+	echo
+
+	local good_gs=false
+	for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghostscript-esp ; do
+		if has_version ${x} && built_with_use ${x} cups ; then
+			good_gs=true
+			break
+		fi
+	done
+	if ! ${good_gs} ; then
+		echo
+		ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned on."
+		echo
+	fi
+
+	if has_version =net-print/cups-1.2* ; then
+		echo
+		ewarn "You have upgraded from an older cups version. Please make sure"
+		ewarn "to run \"etc-update\" and \"revdep-rebuild\" NOW."
+		echo
+	fi
+
+	if [ -e "${ROOT}"/usr/lib/cups ] ; then
+		echo
+		ewarn "/usr/lib/cups exists - You need to remerge every ebuild that"
+		ewarn "installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:"
+		ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")"
+		echo
+		ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility"
+		ewarn "symlinks installed by this package, it won't be needed on later merges."
+		ewarn "You should also run revdep-rebuild"
+		echo
+
+		# place symlinks to make the update smoothless
+		for i in "${ROOT}"/usr/lib/cups/{backend,filter}/* ; do
+			if [ "${i/\*}" == "${i}" ] && ! [ -e ${i/lib/libexec} ] ; then
+				ln -s ${i} ${i/lib/libexec}
+			fi
+		done
+	fi
+}
diff --git a/net-print/cups/files/cups-1.3.7-peercred.patch b/net-print/cups/files/cups-1.3.7-peercred.patch
new file mode 100644
index 000000000000..eda2c93a6766
--- /dev/null
+++ b/net-print/cups/files/cups-1.3.7-peercred.patch
@@ -0,0 +1,11 @@
+diff -Naur cups-1.3.7/scheduler/auth.c cups-1.3.7.new/scheduler/auth.c
+--- cups-1.3.7/scheduler/auth.c	2008-03-20 21:58:16.000000000 +0100
++++ cups-1.3.7.new/scheduler/auth.c	2008-06-09 14:53:45.535194741 +0200
+@@ -54,6 +54,7 @@
+  * Include necessary headers...
+  */
+ 
++#define _GNU_SOURCE
+ #include "cupsd.h"
+ #include <grp.h>
+ #ifdef HAVE_SHADOW_H
diff --git a/net-print/cups/files/cups-1.3.7-str2750.patch b/net-print/cups/files/cups-1.3.7-str2750.patch
new file mode 100644
index 000000000000..bf492bca69c8
--- /dev/null
+++ b/net-print/cups/files/cups-1.3.7-str2750.patch
@@ -0,0 +1,12 @@
+diff -Naur cups-1.3.7/backend/ipp.c cups-1.3.7.new/backend/ipp.c
+--- cups-1.3.7/backend/ipp.c	2008-01-23 23:23:42.000000000 +0100
++++ cups-1.3.7.new/backend/ipp.c	2008-06-09 15:03:37.794195564 +0200
+@@ -1410,7 +1410,7 @@
+ {
+   (void)prompt;
+ 
+-  if (password && password_tries < 3)
++  if (password && *password && password_tries < 3)
+   {
+     password_tries ++;
+