From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1JUpJE-00028i-Lv for garchives@archives.gentoo.org; Thu, 28 Feb 2008 20:24:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1358CE069B; Thu, 28 Feb 2008 20:24:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 98036E069B for ; Thu, 28 Feb 2008 20:24:51 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 29CA466BFE for ; Thu, 28 Feb 2008 20:24:51 +0000 (UTC) Received: from tgurr by stork.gentoo.org with local (Exim 4.68) (envelope-from ) id 1JUpJB-0006UI-Np for gentoo-commits@lists.gentoo.org; Thu, 28 Feb 2008 20:24:49 +0000 From: "Timo Gurr (tgurr)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, tgurr@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-print/cups: cups-1.2.12-r4.ebuild ChangeLog cups-1.2.12-r5.ebuild cups-1.3.6-r1.ebuild cups-1.2.10-r1.ebuild cups-1.3.5.ebuild cups-1.3.6.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: cups-1.2.12-r4.ebuild ChangeLog cups-1.2.12-r5.ebuild cups-1.3.6-r1.ebuild cups-1.2.10-r1.ebuild cups-1.3.5.ebuild cups-1.3.6.ebuild X-VCS-Directories: net-print/cups X-VCS-Committer: tgurr X-VCS-Committer-Name: Timo Gurr Content-Type: text/plain; charset=utf8 Message-Id: Sender: Timo Gurr Date: Thu, 28 Feb 2008 20:24:49 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 751274d6-0324-43f8-bcb3-1125afad511b X-Archives-Hash: 119ca98e06052e55c177e021c9c40393 tgurr 08/02/28 20:24:49 Modified: cups-1.2.12-r4.ebuild ChangeLog Added: cups-1.2.12-r5.ebuild cups-1.3.6-r1.ebuild Removed: cups-1.2.10-r1.ebuild cups-1.3.5.ebuild cups-1.3.6.ebuild Log: Add cups-1.2.12-r5.ebuild to fix security issue CVE-2008-0882, see bug = #211449.Remove older vulnerable versions. Rename patches for better versi= oning. Minor ebuild cleanups. (Portage version: 2.1.4.4) Revision Changes Path 1.4 net-print/cups/cups-1.2.12-r4.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cup= s-1.2.12-r4.ebuild?rev=3D1.4&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cup= s-1.2.12-r4.ebuild?rev=3D1.4&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cup= s-1.2.12-r4.ebuild?r1=3D1.3&r2=3D1.4 Index: cups-1.2.12-r4.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r4.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cups-1.2.12-r4.ebuild 10 Jan 2008 09:04:24 -0000 1.3 +++ cups-1.2.12-r4.ebuild 28 Feb 2008 20:24:49 -0000 1.4 @@ -1,6 +1,6 @@ # 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.2.12-r4.ebuild,= v 1.3 2008/01/10 09:04:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r4.ebuild,= v 1.4 2008/02/28 20:24:49 tgurr Exp $ =20 WANT_AUTOMAKE=3Dlatest =20 @@ -84,10 +84,10 @@ # upstream does not acknowledge bindnow as a solution epatch "${FILESDIR}"/cups-1.2.0-bindnow.patch =20 - # CVE-2007-4351 security patch, bug #196736 - epatch "${FILESDIR}"/${PN}-1.2-str2561-v2.patch # CVE-2007-4045 security patch, bug #199195 - epatch "${FILESDIR}"/${PN}-1.2.4-CVE-2007-4045.patch + epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2007-4045.patch + # CVE-2007-4351 security patch, bug #196736 + epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2007-4351.patch # CVE-2007-5849 security patch, bug #201570 epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2007-5849.patch =20 1.282 net-print/cups/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/Cha= ngeLog?rev=3D1.282&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/Cha= ngeLog?rev=3D1.282&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/Cha= ngeLog?r1=3D1.281&r2=3D1.282 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v retrieving revision 1.281 retrieving revision 1.282 diff -u -r1.281 -r1.282 --- ChangeLog 22 Feb 2008 18:13:58 -0000 1.281 +++ ChangeLog 28 Feb 2008 20:24:49 -0000 1.282 @@ -1,6 +1,21 @@ # 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.281 2008= /02/22 18:13:58 tgurr Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.282 2008= /02/28 20:24:49 tgurr Exp $ + +*cups-1.3.6-r1 (28 Feb 2008) +*cups-1.2.12-r5 (28 Feb 2008) + + 28 Feb 2008; Timo Gurr + -files/cups-1.2.4-CVE-2007-4045.patch, -files/cups-1.2-str2561-v2.patc= h, + +files/cups-1.2.12-CVE-2007-4045.patch, + +files/cups-1.2.12-CVE-2007-4351.patch, + +files/cups-1.2.12-CVE-2008-0882.patch, -files/cups-1.3.0-bindnow.patc= h, + -files/cups-1.3.4-CVE-2007-4045.patch, -files/pdftops.pl, + -cups-1.2.10-r1.ebuild, cups-1.2.12-r4.ebuild, +cups-1.2.12-r5.ebuild, + -cups-1.3.5.ebuild, -cups-1.3.6.ebuild, +cups-1.3.6-r1.ebuild: + Add cups-1.2.12-r5.ebuild to fix security issue CVE-2008-0882, see bug + #211449.Remove older vulnerable versions. Rename patches for better + versioning. Minor ebuild cleanups. =20 *cups-1.3.6 (22 Feb 2008) =20 1.1 net-print/cups/cups-1.2.12-r5.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cup= s-1.2.12-r5.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cup= s-1.2.12-r5.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: cups-1.2.12-r5.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # 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.2.12-r5.ebuild,v= 1.1 2008/02/28 20:24:49 tgurr Exp $ inherit autotools eutils flag-o-matic multilib pam MY_P=3D${P/_} DESCRIPTION=3D"The Common Unix Printing System" HOMEPAGE=3D"http://www.cups.org/" SRC_URI=3D"mirror://sourceforge/cups/${MY_P}-source.tar.bz2" LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 = ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" IUSE=3D"ldap ssl slp pam php samba nls dbus tiff png ppds jpeg X" DEP=3D"pam? ( virtual/pam ) ssl? ( net-libs/gnutls ) slp? ( >=3Dnet-libs/openslp-1.0.4 ) ldap? ( net-nds/openldap ) dbus? ( sys-apps/dbus ) png? ( >=3Dmedia-libs/libpng-1.2.1 ) tiff? ( >=3Dmedia-libs/tiff-3.5.5 ) jpeg? ( >=3Dmedia-libs/jpeg-6b ) php? ( dev-lang/php ) app-text/libpaper" DEPEND=3D"${DEP} !=3Dapp-text/poppler-0.4.3-r1 X? ( x11-misc/xdg-utils )" PDEPEND=3D" ppds? ( || ( ( net-print/foomatic-filters-ppds net-print/foomatic-db-ppds ) net-print/foomatic-filters-ppds net-print/foomatic-db-ppds net-print/hplip media-gfx/gimp-print net-print/foo2zjs net-print/cups-pdf ) ) samba? ( >=3Dnet-fs/samba-3.0.8 ) virtual/ghostscript" PROVIDE=3D"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=3Dtest RESTRICT=3D"test" S=3D${WORKDIR}/${MY_P} pkg_setup() { if use x86 && [ -d "/usr/lib64" ] then eerror "You are running an x86 system, but /usr/lib64 exists, cups will= install all library objects into this directory!" eerror "You should remove /usr/lib64, but before you do, you should che= ck for existing objects, and re-compile all affected packages." eerror "You can use qfile (emerge portage-utils to install qfile) to ge= t a list of the affected ebuilds:" eerror "# qfile -qC /usr/lib64" die "lib64 on x86 detected" fi enewgroup lp enewuser lp -1 -1 -1 lp enewgroup lpadmin 106 } src_unpack() { unpack ${A} cd "${S}" # CVE-2007-4045 security patch, bug #199195 epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2007-4045.patch # CVE-2007-4351 security patch, bug #196736 epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2007-4351.patch # CVE-2007-5849 security patch, bug #201570 epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2007-5849.patch # CVE-2008-0882 security patch, bug #211449 epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2008-0882.patch # cups does not use autotools "the usual way" and ship a static config.h= .in eaclocal eautoconf } src_compile() { export DSOFLAGS=3D"${LDFLAGS}" if use ldap; then append-flags -DLDAP_DEPRECATED fi econf \ --with-cups-user=3Dlp \ --with-cups-group=3Dlp \ --with-system-groups=3Dlpadmin \ --localstatedir=3D/var \ --with-docdir=3D/usr/share/cups/html \ $(use_enable pam) \ $(use_enable ssl) \ --enable-gnutls \ $(use_enable slp) \ $(use_enable nls) \ $(use_enable dbus) \ $(use_enable png) \ $(use_enable jpeg) \ $(use_enable tiff) \ $(use_with php) \ $(use_enable ldap) \ --enable-libpaper \ --enable-threads \ --enable-static \ --disable-pdftops \ || die "econf failed" # Install in /usr/libexec always, instead of using /usr/lib/cups, as tha= t # makes more sense when facing multilib support. sed -i -e 's:SERVERBIN.*:SERVERBIN =3D $(BUILDROOT)/usr/libexec/cups:' M= akedefs sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libex= ec/cups":' config.h sed -i -e 's:cups_serverbin=3D.*:cups_serverbin=3D/usr/libexec/cups:' cu= ps-config emake || die "emake failed" } src_install() { emake BUILDROOT=3D"${D}" install || die "emake install failed" dodoc {CHANGES{,-1.{0,1}},CREDITS,LICENSE,README}.txt # clean out cups init scripts rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups} # install our init scripts newinitd "${FILESDIR}"/cupsd.init cupsd # install our pam script pamd_mimic_system cups auth account # correct path sed -i -e "s:server =3D .*:server =3D /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 =3D 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/ghostscr= ipt-gnu; then sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-post= script:" "${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 if use X; then sed -i -e "s:htmlview:xdg-open:" "${D}"/usr/share/applications/cups.des= ktop 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 } pkg_preinst() { # cleanups [ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/${PN}-* } pkg_postinst() { echo elog "Remote printing: change " elog "Listen localhost:631" elog "to" elog "Listen *:631" elog "in /etc/cups/cupsd.conf" echo elog "For more information about installing a printer take a look at:" elog "http://www.gentoo.org/doc/en/printing-howto.xml." echo local good_gs=3Dfalse for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghos= tscript-esp; do if has_version ${x} && built_with_use ${x} cups; then good_gs=3Dtrue break fi done; if ! ${good_gs}; then ewarn ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned= on" fi if has_version =3Dnet-print/cups-1.1*; then ewarn ewarn "The configuration changed with cups-1.2, you may want to save th= e old" ewarn "one and start from scratch:" ewarn "# mv /etc/cups /etc/cups.orig; emerge -va1 cups" ewarn ewarn "You need to rebuild kdelibs for kdeprinter to work with cups-1.2= " fi if [ -e "${ROOT}"/usr/lib/cups ]; then ewarn 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=3D-collision-protect emerge -va1 \$(qfile -qC /usr/li= b/cups /etc/cups | sed \"s:net-print/cups$::\")" ewarn ewarn "FEATURES=3D-collision-protect is needed to overwrite the compati= bility" ewarn "symlinks installed by this package, it wont be needed on later m= erges." ewarn "You should also run revdep-rebuild" # place symlinks to make the update smoothless for i in "${ROOT}"/usr/lib/cups/{backend,filter}/*; do if [ "${i/\*}" =3D=3D "${i}" ] && ! [ -e ${i/lib/libexec} ]; then ln -s ${i} ${i/lib/libexec} fi done fi } 1.1 net-print/cups/cups-1.3.6-r1.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cup= s-1.3.6-r1.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cup= s-1.3.6-r1.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: cups-1.3.6-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # 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.6-r1.ebuild,v = 1.1 2008/02/28 20:24:49 tgurr Exp $ inherit autotools eutils flag-o-matic multilib pam MY_P=3D${P/_} DESCRIPTION=3D"The Common Unix Printing System" HOMEPAGE=3D"http://www.cups.org/" SRC_URI=3D"mirror://sourceforge/cups/${MY_P}-source.tar.bz2" LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 = ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" IUSE=3D"acl avahi dbus java jpeg kerberos ldap nls pam perl php png ppds = python samba slp ssl static tiff X zeroconf" COMMON_DEPEND=3D"acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) avahi? ( net-dns/avahi ) dbus? ( sys-apps/dbus ) java? ( >=3Dvirtual/jre-1.4 ) jpeg? ( >=3Dmedia-libs/jpeg-6b ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) png? ( >=3Dmedia-libs/libpng-1.2.1 ) python? ( dev-lang/python ) slp? ( >=3Dnet-libs/openslp-1.0.4 ) ssl? ( net-libs/gnutls ) tiff? ( >=3Dmedia-libs/tiff-3.5.5 ) zeroconf? ( !avahi? ( net-misc/mDNSResponder ) ) app-text/libpaper dev-libs/libgcrypt" DEPEND=3D"${COMMON_DEPEND} !=3Dapp-text/poppler-0.4.3-r1" PDEPEND=3D" ppds? ( || ( ( net-print/foomatic-filters-ppds net-print/foomatic-db-ppds ) net-print/foomatic-filters-ppds net-print/foomatic-db-ppds net-print/hplip media-gfx/gimp-print net-print/foo2zjs net-print/cups-pdf ) ) samba? ( >=3Dnet-fs/samba-3.0.8 ) virtual/ghostscript" PROVIDE=3D"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=3Dtest RESTRICT=3D"test" S=3D"${WORKDIR}/${MY_P}" LANGS=3D"de en es et fr he it ja pl sv zh_TW" for X in ${LANGS} ; do IUSE=3D"${IUSE} linguas_${X}" done pkg_setup() { if use avahi && ! built_with_use net-dns/avahi mdnsresponder-compat ; th= en 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 yo= ur USE" eerror "flag. Please add that flag, re-emerge avahi, and then emerge cu= ps 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" # cups does not use autotools "the usual way" and ship a static config.h= .in eaclocal eautoconf } src_compile() { # locale support strip-linguas ${LANGS} if [ -z "${LINGUAS}" ] ; then export LINGUAS=3Dall fi export DSOFLAGS=3D"${LDFLAGS}" if use ldap ; then append-flags -DLDAP_DEPRECATED fi local myconf if use avahi || use zeroconf ; then myconf=3D"${myconf} --enable-dnssd" else myconf=3D"${myconf} --disable-dnssd" fi econf \ --libdir=3D/usr/$(get_libdir) \ --localstatedir=3D/var \ --with-cups-user=3Dlp \ --with-cups-group=3Dlp \ --with-docdir=3D/usr/share/cups/html \ --with-languages=3D${LINGUAS} \ --with-system-groups=3Dlpadmin \ $(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 tha= t # makes more sense when facing multilib support. sed -i -e 's:SERVERBIN.*:SERVERBIN =3D "$(BUILDROOT)"/usr/libexec/cups:'= Makedefs sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libex= ec/cups":' config.h sed -i -e 's:cups_serverbin=3D.*:cups_serverbin=3D/usr/libexec/cups:' cu= ps-config emake || die "emake failed" } src_install() { emake BUILDROOT=3D"${D}" install || die "emake install failed" dodoc {CHANGES{,-1.{0,1}},CREDITS,README}.txt || die "dodoc install fail= ed" # 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=3D"$neededservices avahi-daemon" use dbus && neededservices=3D"$neededservices dbus" use zeroconf && ! use avahi && neededservices=3D"$neededservices mDNSRes= ponderPosix" [[ -n ${neededservices} ]] && neededservices=3D"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 =3D .*:server =3D /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 =3D 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/ghostscr= ipt-gnu ; then sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-post= script:" "${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.des= ktop 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 } 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=3Dfalse for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghos= tscript-esp ; do if has_version ${x} && built_with_use ${x} cups ; then good_gs=3Dtrue 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 =3Dnet-print/cups-1.1* ; then echo ewarn "The configuration changed with cups-1.3, you may want to save th= e old" ewarn "one and start from scratch:" ewarn "# mv /etc/cups /etc/cups.orig; emerge -va1 cups" echo ewarn "You need to rebuild kdelibs for kdeprinter to work with cups-1.3= " 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=3D-collision-protect emerge -va1 \$(qfile -qC /usr/li= b/cups /etc/cups | sed \"s:net-print/cups$::\")" echo ewarn "FEATURES=3D-collision-protect is needed to overwrite the compati= bility" 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/\*}" =3D=3D "${i}" ] && ! [ -e ${i/lib/libexec} ] ; then ln -s ${i} ${i/lib/libexec} fi done fi } --=20 gentoo-commits@lists.gentoo.org mailing list