diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 10cc634..d933d4a 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.344 2009/03/09 18:42:27 armin76 Exp $ + 02 May 2010; Mario Fetka +cups-1.4.3-r1.ebuild: + bump + 18 Feb 2010; Mario Fetka +files/cups-1.3.11-str3200.patch, +files/cups-1.3.11-str3367-security-1.3v2.patch, diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index a50581f..97893e2 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -17,6 +17,7 @@ DIST cups-1.3.11-source.tar.bz2 3799424 RMD160 aa263fe29350cee307bbd72ef2f5cb061 DIST cups-1.3.9-source.tar.bz2 3993875 RMD160 ec8bd9fc6ee45648b6eb22949f44fc4cf2defd4e SHA1 c1a596b355201320456b393446286fe3947bce16 SHA256 38856ab4b8bcf51be2bed1f554cd8089c1f2448a6979c055762b49eda82a6b6b DIST cups-1.4.1-source.tar.bz2 4449577 RMD160 d6db8ff3c7b0e56e147d227dcac0c8ca92f190cf SHA1 e53cadf8d9fa5b52b224fc29364a879feb0f3508 SHA256 cff66f14ca2099c977d693136b8f1b4c5d2d66e4471d67fa4114653852c2d3ba DIST cups-1.4.2-source.tar.bz2 4450466 RMD160 3848989e3e585e69def0b5ccc9645c1670b0a687 SHA1 84be13b1a83a981cf1f3f9f812d53f3a3ca247cf SHA256 646bc0dbac064d05c0a93735fb556299eda0ae32ce4568506654cb952c719314 +DIST cups-1.4.3-source.tar.bz2 4461101 RMD160 6c5ab282405d6a1132163c727583f3a572307d88 SHA1 0dd9e3d709614d26cce77728b9263556c94c9559 SHA256 47a559b1c50192b94479ae7dab132ea0008727045d4993501cf0a6df0c64db97 EBUILD cups-1.3.10-r2.ebuild 8429 RMD160 7fdbadc2774bd04df819ea98223a06eb32196c20 SHA1 f026a96451664de7bd7913932f7d9cef2ad7b455 SHA256 97e393257c0daf3441c2872010b41b858ea8443361bd4976cb0e616601a2238d EBUILD cups-1.3.10.ebuild 8319 RMD160 6c2363efe252c52124ab37dc572be6b68bc8e5aa SHA1 6b71d8b4a7cc38cb689f74da88567de0eb0cf636 SHA256 3903dd4d66c18f0251495446cc686fdaa2b3a7f435a3faee9bf736f6cb61209b EBUILD cups-1.3.11.ebuild 8430 RMD160 24de5585670d0c815277e00080257ccb6a9c5304 SHA1 573503a30d53c8d4fdbb1e1b2aab7d3f71e8a916 SHA256 14562a09f3546cf8bfa7592efedc89b835c9485b2331b03717616a84da3de58a @@ -24,5 +25,6 @@ EBUILD cups-1.3.9-r1.ebuild 8724 RMD160 2fadb7b929fa65fad0aab8df9e23a59f47843424 EBUILD cups-1.3.9-r2.ebuild 8724 RMD160 2fadb7b929fa65fad0aab8df9e23a59f47843424 SHA1 9c3d039bb8941370f280915dded0c2467b573509 SHA256 823b083c2c1670f3dc069c70b07d408d96e92e567822106dac4e3613ed0b1588 EBUILD cups-1.4.1.ebuild 5228 RMD160 4fecb94344765ca29d0f12fc624ddd11b0a44aa7 SHA1 3cea580ca9e54c72b8643f36e613ca5a1ddec9ec SHA256 cc80002f6484e01713e5a4ed250573d5d212fa348bb7baff269f47a7b24038a7 EBUILD cups-1.4.2-r1.ebuild 5418 RMD160 c855cdc6d3cb82242d62b7db011e52d2ef7619c8 SHA1 b0a18ad9c66a1f0a243cdd62319fbf93ebe5e36b SHA256 9ab2d4719b51b96af15c29649c3a6b2688be5ec865526e9d009b7d678caaa8fd -MISC ChangeLog 51915 RMD160 69eaab46d40cdfd8789cf2e291cacb60302d7373 SHA1 b722bf2b2547c8b5b7afe8cf7b64024acaaab3a4 SHA256 01597411facf096e161b0a124038d4b1ab573c7cba25f189f95a608c6a803f49 +EBUILD cups-1.4.3-r1.ebuild 5446 RMD160 a8f19657974ba89f02b2e2c8f49767f2cfbe9fae SHA1 2dcf671b8a289493843ff8f1ced712878948e261 SHA256 6cb8383862c8ef67b2d3bca54602dd04d7b92efdcb2a0ec8815599f9b54962b0 +MISC ChangeLog 51997 RMD160 21b96cbffd6b461ddd9188d35673a3d7fa2eb80e SHA1 8d105dbd77a1acf833f00a2b0b385d475de35467 SHA256 cbd07b2e7d1baa0016d78406cdebeea407a178ca2d4cd92ff009152091a4b925 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 diff --git a/net-print/cups/cups-1.4.3-r1.ebuild b/net-print/cups/cups-1.4.3-r1.ebuild new file mode 100644 index 0000000..b4037df --- /dev/null +++ b/net-print/cups/cups-1.4.3-r1.ebuild @@ -0,0 +1,197 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.3.ebuild,v 1.1 2010/03/31 23:01:18 tgurr Exp $ + +EAPI="2" + +inherit autotools 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 +usb X xinetd" + +COMMON_DEPEND=" + app-text/libpaper + dev-libs/libgcrypt + 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:0 ) + 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 ) + usb? ( dev-libs/libusb ) + xinetd? ( sys-apps/xinetd ) +" +DEPEND="${COMMON_DEPEND}" + +RDEPEND="${COMMON_DEPEND} + !net-print/cupsddk + !virtual/lpr + X? ( x11-misc/xdg-utils ) +" +PDEPEND=" + app-text/ghostscript-gpl[cups] + >=app-text/poppler-0.12.3-r3[utils] +" + +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 id 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() { + # remove default optimizations and do not strip by default + sed -e 's:OPTIM="-Os -g":OPTIM="":' \ + -e 's:INSTALL_STRIP="-s":INSTALL_STRIP="":' \ + -i config-scripts/cups-compiler.m4 + + # create a missing symlink to allow https printing via IPP, bug #217293 + epatch "${FILESDIR}/${PN}-1.4.0-backend-https.patch" + + # use the ldap schema of the ldap draft + epatch "${FILESDIR}/${PN}-1.4.1-ldap-draft-1.patch" + + AT_M4DIR=config-scripts eaclocal + eautoconf +} + +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=/usr/bin/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 usb libusb) \ + $(use_with java) \ + $(use_with perl) \ + $(use_with php) \ + $(use_with python) \ + $(use_with xinetd xinetd /etc/xinetd.d) \ + --enable-libpaper \ + --enable-threads \ + --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 +}