Revbump adding upstream fix for using the webinterface via SSL with FF3, upstream bug STR #2892, Gentoo bug #231430.

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64)

3 files changed, 391 insertions, 1 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 79b083d1485e..cbc96d063076 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,13 @@
 # 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.317 2008/08/01 19:19:33 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.318 2008/08/22 19:10:46 tgurr Exp $
+
+*cups-1.3.8-r1 (22 Aug 2008)
+
+  22 Aug 2008; Timo Gurr <tgurr@gentoo.org>
+  +files/cups-1.3.8-str2892-1.3.patch, +cups-1.3.8-r1.ebuild:
+  Revbump adding upstream fix for using the webinterface via SSL with FF3,
+  upstream bug STR #2892, Gentoo bug #231430.
 
   01 Aug 2008; Timo Gurr <tgurr@gentoo.org> cups-1.3.8.ebuild:
   Update SRC_URI, fixing bug #232978.
diff --git a/net-print/cups/cups-1.3.8-r1.ebuild b/net-print/cups/cups-1.3.8-r1.ebuild
new file mode 100644
index 000000000000..8ef825c1c12e
--- /dev/null
+++ b/net-print/cups/cups-1.3.8-r1.ebuild
@@ -0,0 +1,295 @@
+# 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.8-r1.ebuild,v 1.1 2008/08/22 19:10:46 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="http://ftp.easysw.com/pub/cups/{PV}/${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 gnutls java jpeg kerberos ldap pam perl php png ppds python samba slp ssl static tiff X xinetd zeroconf"
+
+COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
+	avahi? ( net-dns/avahi )
+	dbus? ( sys-apps/dbus )
+	gnutls? ( net-libs/gnutls )
+	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? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	xinetd? ( sys-apps/xinetd )
+	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"
+
+RDEPEND="${COMMON_DEPEND}
+	!virtual/lpr
+	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 id 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"
+
+	# Upstream fix for using the webinterface via SSL with FF3, upstream bug STR #2892
+	epatch "${FILESDIR}/${PN}-1.3.8-str2892-1.3.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
+
+	if use ssl || use gnutls ; then
+		myconf="${myconf} \
+			$(use_enable gnutls) \
+			$(use_enable !gnutls openssl)"
+	else
+		myconf="${myconf} \
+			--disable-gnutls \
+			--disable-openssl"
+	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 \
+		--with-xinetd=/etc/xinetd.d \
+		$(use_enable acl) \
+		$(use_enable dbus) \
+		$(use_enable jpeg) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable ldap) \
+		$(use_enable pam) \
+		$(use_enable png) \
+		$(use_enable slp) \
+		$(use_enable static) \
+		$(use_enable tiff) \
+		$(use_with java) \
+		$(use_with perl) \
+		$(use_with php) \
+		$(use_with python) \
+		--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
+
+	if use xinetd ; then
+		# 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
+	else
+		rm -rf "${D}"/etc/xinetd.d
+	fi
+
+	# 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}"-*
+	has_version "=${CATEGORY}/${PN}-1.2*"
+	upgrade_from_1_2=$?
+}
+
+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 [[ $upgrade_from_1_2 = 0 ]] ; 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.8-str2892-1.3.patch b/net-print/cups/files/cups-1.3.8-str2892-1.3.patch
new file mode 100644
index 000000000000..3404086da0f5
--- /dev/null
+++ b/net-print/cups/files/cups-1.3.8-str2892-1.3.patch
@@ -0,0 +1,88 @@
+Index: scheduler/client.c
+===================================================================
+--- scheduler/client.c	(revision 7820)
++++ scheduler/client.c	(working copy)
+@@ -28,6 +28,7 @@
+  *   cupsdUpdateCGI()        - Read status messages from CGI scripts and programs.
+  *   cupsdWriteClient()      - Write data to a client as needed.
+  *   check_if_modified()     - Decode an "If-Modified-Since" line.
++ *   data_ready()            - Check whether data is available from a client.
+  *   encrypt_client()        - Enable encryption for the client...
+  *   get_cdsa_certificate()  - Convert a keychain name into the CFArrayRef
+  *			       required by SSLSetCertificate.
+@@ -83,6 +84,7 @@
+ 
+ static int		check_if_modified(cupsd_client_t *con,
+ 			                  struct stat *filestats);
++static int		data_ready(cupsd_client_t *con);
+ #ifdef HAVE_SSL
+ static int		encrypt_client(cupsd_client_t *con);
+ #endif /* HAVE_SSL */
+@@ -989,8 +991,7 @@
+ 	*/
+ 
+         while ((status = httpUpdate(HTTP(con))) == HTTP_CONTINUE)
+-	  if (con->http.used == 0 ||
+-	      !memchr(con->http.buffer, '\n', con->http.used))
++	  if (!data_ready(con))
+ 	    break;
+ 
+ 	if (status != HTTP_OK && status != HTTP_CONTINUE)
+@@ -1889,7 +1890,7 @@
+ 	    }
+ 	  }
+         }
+-	while (con->http.state == HTTP_PUT_RECV && con->http.used > 0);
++	while (con->http.state == HTTP_PUT_RECV && data_ready(con));
+ 
+         if (con->http.state == HTTP_WAITING)
+ 	{
+@@ -2064,7 +2065,7 @@
+ 	    }
+ 	  }
+         }
+-	while (con->http.state == HTTP_POST_RECV && con->http.used > 0);
++	while (con->http.state == HTTP_POST_RECV && data_ready(con));
+ 
+ 	if (con->http.state == HTTP_POST_SEND)
+ 	{
+@@ -2914,7 +2915,39 @@
+ }
+ 
+ 
++/*
++ * 'data_ready()' - Check whether data is available from a client.
++ */
++
++static int				/* O - 1 if data is ready, 0 otherwise */
++data_ready(cupsd_client_t *con)		/* I - Client */
++{
++  if (con->http.used > 0)
++    return (1);
+ #ifdef HAVE_SSL
++  else if (con->http.tls)
++  {
++#  ifdef HAVE_LIBSSL
++    if (SSL_pending((SSL *)(con->http.tls)))
++      return (1);
++#  elif defined(HAVE_GNUTLS)
++    if (gnutls_record_check_pending(((http_tls_t *)(con->http.tls))->session))
++      return (1);
++#  elif defined(HAVE_CDSASSL)
++    size_t bytes;			/* Bytes that are available */
++
++    if (!SSLGetBufferedReadSize(((http_tls_t *)(con->http.tls))->session,
++                                &bytes) && bytes > 0)
++      return (1);
++#  endif /* HAVE_LIBSSL */
++  }
++#endif /* HAVE_SSL */
++
++  return (0);
++}
++
++
++#ifdef HAVE_SSL
+ /*
+  * 'encrypt_client()' - Enable encryption for the client...
+  */