diff options
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/ChangeLog | 10 | ||||
| -rw-r--r-- | net-print/cups/cups-1.3.7-r2.ebuild | 287 | ||||
| -rw-r--r-- | net-print/cups/files/cups-1.3.7-peercred.patch | 11 | ||||
| -rw-r--r-- | net-print/cups/files/cups-1.3.7-str2750.patch | 12 |
4 files changed, 319 insertions, 1 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/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 ++; + |