From b71eb2bd479358559ac73ad2e3f5743dc9503d23 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sun, 24 Jan 2010 18:12:26 +0100 Subject: [PATCH] Add net-print/cups-1.4.2-r1. Contrary to the original ebuild this does not depend on app-text/poppler-utils directly but on virtual/poppler-utils instead, causing muck less breakage. --- net-print/cups/Manifest | 5 + net-print/cups/cups-1.4.2-r1.ebuild | 182 +++++++++++++++++++++ .../cups/files/cups-1.4.0-backend-https.patch | 11 ++ net-print/cups/files/cups-1.4.2-str3200.patch | 43 +++++ net-print/cups/files/cupsd.init.d | 20 +++ 5 files changed, 261 insertions(+) create mode 100644 net-print/cups/Manifest create mode 100644 net-print/cups/cups-1.4.2-r1.ebuild create mode 100644 net-print/cups/files/cups-1.4.0-backend-https.patch create mode 100644 net-print/cups/files/cups-1.4.2-str3200.patch create mode 100644 net-print/cups/files/cupsd.init.d diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest new file mode 100644 index 0000000..541e65e --- /dev/null +++ b/net-print/cups/Manifest @@ -0,0 +1,5 @@ +AUX cups-1.4.0-backend-https.patch 483 RMD160 b338f67ebf0719b5e12eaa8490affbd7a1bb8c0e SHA1 bfeadba67792203d654a64bdec16f3d2a31aeca6 SHA256 9060a5d848d6655db4629822d01fd772a3fbe1a5107109c50cb0ecb4de7a9526 +AUX cups-1.4.2-str3200.patch 1654 RMD160 cc40d26f7e9dbe5a12d9426535d09de10254da26 SHA1 b330108bcfb8ca3ab5d6dd3b48dc3d2937c7bca1 SHA256 8a64f5c72d64ecd95d330fd90630eb02a67865c07921ecb0c010e84b49b537e0 +AUX cupsd.init.d 293 RMD160 19fbef21cee7e472e7028f3101b680baa0089c54 SHA1 e6b27b2638fec258fe2f55c926c2530e909ca3d2 SHA256 b4268a6bae95e96b6af21c3716ecc905073736ce7dc33be1489d574a447f3c48 +DIST cups-1.4.2-source.tar.bz2 4450466 RMD160 3848989e3e585e69def0b5ccc9645c1670b0a687 SHA1 84be13b1a83a981cf1f3f9f812d53f3a3ca247cf SHA256 646bc0dbac064d05c0a93735fb556299eda0ae32ce4568506654cb952c719314 +EBUILD cups-1.4.2-r1.ebuild 5304 RMD160 5d94f77e999e254a6cf1e5e9d267a833d8191093 SHA1 20921aa58f69b118e503f73dc829cb51826eb1e5 SHA256 8451551c5d12858e16a5cf215edd616ceb827aa185ab1b31cef35b0bf1490ce4 diff --git a/net-print/cups/cups-1.4.2-r1.ebuild b/net-print/cups/cups-1.4.2-r1.ebuild new file mode 100644 index 0000000..1ab757f --- /dev/null +++ b/net-print/cups/cups-1.4.2-r1.ebuild @@ -0,0 +1,182 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.2-r1.ebuild,v 1.1 2009/11/30 22:00:56 tgurr Exp $ + +EAPI="2" + +inherit eutils flag-o-matic multilib pam versionator + +MY_P=${P/_} + +DESCRIPTION="The Common Unix Printing System." +HOMEPAGE="http://www.cups.org/" +SRC_URI="mirror://easysw/${PN}/${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 dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static +tiff X xinetd" + +COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) + 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 ) + app-text/libpaper + virtual/poppler-utils + dev-libs/libgcrypt + dev-libs/libusb + !net-print/cupsddk" + +DEPEND="${COMMON_DEPEND}" + +RDEPEND="${COMMON_DEPEND} + !virtual/lpr + X? ( x11-misc/xdg-utils )" + +PDEPEND="|| ( app-text/ghostscript-gpl[cups] app-text/ghostscript-gnu[cups] )" + +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="da de es eu fi fr it ja ko nl no pl pt pt_BR ru sv zh zh_TW" +for X in ${LANGS} ; do + IUSE="${IUSE} linguas_${X}" +done + +pkg_setup() { + enewgroup lp + enewuser lp -1 -1 -1 lp + enewgroup lpadmin 106 +} + +src_prepare() { + # create a missing symlink to allow https printing via IPP, bug #217293 + epatch "${FILESDIR}/${PN}-1.4.0-backend-https.patch" + + # CVE-2009-3553: Use-after-free (crash) due improper reference counting + # in abstract file descriptors handling interface + # upstream bug STR #3200 + epatch "${FILESDIR}/${PN}-1.4.2-str3200.patch" +} + +src_configure() { + # locale support + strip-linguas ${LANGS} + if [ -z "${LINGUAS}" ] ; then + export LINGUAS=none + fi + + local myconf + 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-pdftops=pdftops \ + --with-system-groups=lpadmin \ + $(use_enable acl) \ + $(use_enable dbus) \ + $(use_enable debug) \ + $(use_enable debug debug-guards) \ + $(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_enable xinetd xinetd /etc/xinetd.d) \ + $(use_with java) \ + $(use_with perl) \ + $(use_with php) \ + $(use_with python) \ + --enable-libpaper \ + --enable-libusb \ + --enable-threads \ + --enable-pdftops \ + --disable-dnssd \ + ${myconf} + + # 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 +} + +src_install() { + emake BUILDROOT="${D}" install || die "emake install failed" + dodoc {CHANGES,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 dbus && neededservices="$neededservices dbus" + [[ -n ${neededservices} ]] && neededservices="need${neededservices}" + sed -e "s/@neededservices@/$neededservices/" "${FILESDIR}"/cupsd.init.d > "${T}"/cupsd + doinitd "${T}"/cupsd || die "doinitd failed" + + # 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 + + keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ + /var/cache/cups /var/cache/cups/rss /var/log/cups /var/run/cups/certs \ + /var/spool/cups/tmp + + keepdir /etc/cups/{interfaces,ppd,ssl} + + use X || rm -r "${D}"/usr/share/applications + + # create /etc/cups/client.conf, bug #196967 and #266678 + echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf +} + +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 +} diff --git a/net-print/cups/files/cups-1.4.0-backend-https.patch b/net-print/cups/files/cups-1.4.0-backend-https.patch new file mode 100644 index 0000000..8a70a20 --- /dev/null +++ b/net-print/cups/files/cups-1.4.0-backend-https.patch @@ -0,0 +1,11 @@ +diff -Naur cups-1.4.0/backend/Makefile cups-1.4.0.new/backend/Makefile +--- cups-1.4.0/backend/Makefile 2009-03-03 20:39:21.000000000 +0100 ++++ cups-1.4.0.new/backend/Makefile 2009-09-01 14:00:05.592615359 +0200 +@@ -91,6 +91,7 @@ + done + $(RM) $(SERVERBIN)/backend/http + $(LN) ipp $(SERVERBIN)/backend/http ++ $(LN) ipp $(SERVERBIN)/backend/https + if test "x$(DNSSD_BACKEND)" != x; then \ + $(RM) $(SERVERBIN)/backend/mdns; \ + $(LN) $(DNSSD_BACKEND) $(SERVERBIN)/backend/mdns; \ diff --git a/net-print/cups/files/cups-1.4.2-str3200.patch b/net-print/cups/files/cups-1.4.2-str3200.patch new file mode 100644 index 0000000..47d9114 --- /dev/null +++ b/net-print/cups/files/cups-1.4.2-str3200.patch @@ -0,0 +1,43 @@ +Index: scheduler/select.c +=================================================================== +--- scheduler/select.c (revision 8887) ++++ scheduler/select.c (working copy) +@@ -454,7 +454,7 @@ + if (fdptr->read_cb && event->filter == EVFILT_READ) + (*(fdptr->read_cb))(fdptr->data); + +- if (fdptr->write_cb && event->filter == EVFILT_WRITE) ++ if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE) + (*(fdptr->write_cb))(fdptr->data); + + release_fd(fdptr); +@@ -499,7 +499,8 @@ + if (fdptr->read_cb && (event->events & (EPOLLIN | EPOLLERR | EPOLLHUP))) + (*(fdptr->read_cb))(fdptr->data); + +- if (fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP))) ++ if (fdptr->use > 1 && fdptr->write_cb && ++ (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP))) + (*(fdptr->write_cb))(fdptr->data); + + release_fd(fdptr); +@@ -590,7 +591,8 @@ + if (fdptr->read_cb && (pfd->revents & (POLLIN | POLLERR | POLLHUP))) + (*(fdptr->read_cb))(fdptr->data); + +- if (fdptr->write_cb && (pfd->revents & (POLLOUT | POLLERR | POLLHUP))) ++ if (fdptr->use > 1 && fdptr->write_cb && ++ (pfd->revents & (POLLOUT | POLLERR | POLLHUP))) + (*(fdptr->write_cb))(fdptr->data); + + release_fd(fdptr); +@@ -645,7 +647,8 @@ + if (fdptr->read_cb && FD_ISSET(fdptr->fd, &cupsd_current_input)) + (*(fdptr->read_cb))(fdptr->data); + +- if (fdptr->write_cb && FD_ISSET(fdptr->fd, &cupsd_current_output)) ++ if (fdptr->use > 1 && fdptr->write_cb && ++ FD_ISSET(fdptr->fd, &cupsd_current_output)) + (*(fdptr->write_cb))(fdptr->data); + + release_fd(fdptr); diff --git a/net-print/cups/files/cupsd.init.d b/net-print/cups/files/cupsd.init.d new file mode 100644 index 0000000..e5529ee --- /dev/null +++ b/net-print/cups/files/cupsd.init.d @@ -0,0 +1,20 @@ +#!/sbin/runscript + +depend() { + use net + @neededservices@ + before nfs + after logger +} + +start() { + ebegin "Starting cupsd" + start-stop-daemon --start --quiet --exec /usr/sbin/cupsd + eend $? +} + +stop() { + ebegin "Stopping cupsd" + start-stop-daemon --stop --quiet --exec /usr/sbin/cupsd + eend $? +} -- 2.7.4