diff options
| -rw-r--r-- | net-print/cups/ChangeLog | 10 | ||||
| -rw-r--r-- | net-print/cups/cups-1.2.12-r4.ebuild | 6 | ||||
| -rw-r--r-- | net-print/cups/cups-1.3.7-r3.ebuild (renamed from net-print/cups/cups-1.3.7-r2.ebuild) | 46 | ||||
| -rw-r--r-- | net-print/cups/files/cups-1.2.0-bindnow.patch | 47 | ||||
| -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-str2860.patch | 16 |
6 files changed, 56 insertions, 80 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index ec0d726ed9fb..d119663d9095 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.314 2008/06/15 01:14:09 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.315 2008/07/16 22:47:37 tgurr Exp $ + +*cups-1.3.7-r3 (16 Jul 2008) + + 16 Jul 2008; Timo Gurr <tgurr@gentoo.org> -files/cups-1.2.0-bindnow.patch, + -files/cups-1.3.7-peercred.patch, +files/cups-1.3.7-str2860.patch, + cups-1.2.12-r4.ebuild, -cups-1.3.7-r2.ebuild, +cups-1.3.7-r3.ebuild: + Revision bump, fixing bug #222513, bug #223333, bug #230769 and bug + #227013. 14 Jun 2008; Zac Medico <zmedico@gentoo.org> cups-1.2.12-r4.ebuild, cups-1.2.12-r7.ebuild, cups-1.2.12-r8.ebuild, cups-1.3.7-r1.ebuild, diff --git a/net-print/cups/cups-1.2.12-r4.ebuild b/net-print/cups/cups-1.2.12-r4.ebuild index adf712bcfb32..562a8b79a17e 100644 --- a/net-print/cups/cups-1.2.12-r4.ebuild +++ b/net-print/cups/cups-1.2.12-r4.ebuild @@ -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.6 2008/06/15 01:14:09 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r4.ebuild,v 1.7 2008/07/16 22:47:37 tgurr Exp $ WANT_AUTOMAKE=latest @@ -81,9 +81,6 @@ src_unpack() { unpack ${A} cd "${S}" - # upstream does not acknowledge bindnow as a solution - epatch "${FILESDIR}"/cups-1.2.0-bindnow.patch - # CVE-2007-4045 security patch, bug #199195 epatch "${FILESDIR}"/${PN}-1.2.12-CVE-2007-4045.patch # CVE-2007-4351 security patch, bug #196736 @@ -109,7 +106,6 @@ src_compile() { --with-system-groups=lpadmin \ --localstatedir=/var \ --with-docdir=/usr/share/cups/html \ - --with-bindnow=$(bindnow-flags) \ $(use_enable pam) \ $(use_enable ssl) \ --enable-gnutls \ diff --git a/net-print/cups/cups-1.3.7-r2.ebuild b/net-print/cups/cups-1.3.7-r3.ebuild index e219bb610bde..3920cd0c5ee3 100644 --- a/net-print/cups/cups-1.3.7-r2.ebuild +++ b/net-print/cups/cups-1.3.7-r3.ebuild @@ -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.3.7-r2.ebuild,v 1.2 2008/06/15 01:14:09 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.7-r3.ebuild,v 1.1 2008/07/16 22:47:37 tgurr Exp $ inherit autotools eutils flag-o-matic multilib pam @@ -13,11 +13,12 @@ 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" +IUSE="acl avahi dbus gnutls java jpeg kerberos ldap nls 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 ) @@ -28,8 +29,9 @@ COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) png? ( >=media-libs/libpng-1.2.1 ) python? ( dev-lang/python ) slp? ( >=net-libs/openslp-1.0.4 ) - ssl? ( net-libs/gnutls ) + 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" @@ -103,11 +105,11 @@ src_unpack() { # 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) + # Already fixed in CUPS SVN + # fix IPP authentification, upstream bug STR #2750 epatch "${FILESDIR}/${PN}-1.3.7-str2750.patch" + # fix compilation against glibc-2.8, upstream bug STR #2860 + epatch "${FILESDIR}/${PN}-1.3.7-str2860.patch" # cups does not use autotools "the usual way" and ship a static config.h.in eaclocal @@ -139,6 +141,16 @@ src_compile() { 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 \ @@ -147,23 +159,21 @@ src_compile() { --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 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 \ @@ -198,17 +208,21 @@ src_install() { # 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 + 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 + # 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 diff --git a/net-print/cups/files/cups-1.2.0-bindnow.patch b/net-print/cups/files/cups-1.2.0-bindnow.patch deleted file mode 100644 index eb1b14e96ba8..000000000000 --- a/net-print/cups/files/cups-1.2.0-bindnow.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -Naupr --exclude '*.rej' --exclude '*.orig' cups-1.2.0.orig/config-scripts/cups-setXid.m4 cups-1.2.0/config-scripts/cups-setXid.m4 ---- cups-1.2.0.orig/config-scripts/cups-setXid.m4 1970-01-01 01:00:00.000000000 +0100 -+++ cups-1.2.0/config-scripts/cups-setXid.m4 2006-05-08 23:50:22.000000000 +0200 -@@ -0,0 +1,9 @@ -+dnl -+dnl Copyright 1999-2005 Gentoo Foundation -+dnl Distributed under the terms of the GNU General Public License v2 -+dnl -+ -+AC_ARG_WITH(bindnow, [ --with-bindnow Set linker flags for force-binding setuid binaries], -+ BINDNOW_FLAGS="$withval", -+ BINDNOW_FLAGS="") -+AC_SUBST(BINDNOW_FLAGS) -diff -Naupr --exclude '*.rej' --exclude '*.orig' cups-1.2.0.orig/configure.in cups-1.2.0/configure.in ---- cups-1.2.0.orig/configure.in 2006-05-08 23:50:10.000000000 +0200 -+++ cups-1.2.0/configure.in 2006-05-08 23:50:22.000000000 +0200 -@@ -46,6 +46,7 @@ sinclude(config-scripts/cups-defaults.m4 - sinclude(config-scripts/cups-pap.m4) - sinclude(config-scripts/cups-pdf.m4) - sinclude(config-scripts/cups-scripting.m4) -+sinclude(config-scripts/cups-setXid.m4) - - LANGFILES="" - if test "x$LANGUAGES" != x; then -diff -Naupr --exclude '*.rej' --exclude '*.orig' cups-1.2.0.orig/Makedefs.in cups-1.2.0/Makedefs.in ---- cups-1.2.0.orig/Makedefs.in 2006-05-08 23:50:10.000000000 +0200 -+++ cups-1.2.0/Makedefs.in 2006-05-08 23:50:44.000000000 +0200 -@@ -131,6 +131,7 @@ IMGLIBS = @IMGLIBS@ -lm - IMGFILTERS = @IMGFILTERS@ - LDFLAGS = -L../cups -L../filter $(RC_CFLAGS) $(ARCHFLAGS) \ - @LDFLAGS@ @PIEFLAGS@ $(OPTIM) -+BINDNOW_FLAGS = @BINDNOW_FLAGS@ - LINKCUPS = @LINKCUPS@ $(SSLLIBS) - LINKCUPSIMAGE = @LINKCUPSIMAGE@ - LIBS = $(LINKCUPS) $(COMMONLIBS) -diff -Naupr --exclude '*.rej' --exclude '*.orig' cups-1.2.0.orig/systemv/Makefile cups-1.2.0/systemv/Makefile ---- cups-1.2.0.orig/systemv/Makefile 2006-05-08 23:50:10.000000000 +0200 -+++ cups-1.2.0/systemv/Makefile 2006-05-08 23:50:22.000000000 +0200 -@@ -205,7 +205,7 @@ lpoptions: lpoptions.o ../cups/$(LIBCUPS - - lppasswd: lppasswd.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS) -+ $(CC) $(LDFLAGS) $(BINDNOW_FLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS) - - - # diff --git a/net-print/cups/files/cups-1.3.7-peercred.patch b/net-print/cups/files/cups-1.3.7-peercred.patch deleted file mode 100644 index eda2c93a6766..000000000000 --- a/net-print/cups/files/cups-1.3.7-peercred.patch +++ /dev/null @@ -1,11 +0,0 @@ -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-str2860.patch b/net-print/cups/files/cups-1.3.7-str2860.patch new file mode 100644 index 000000000000..597225a8b112 --- /dev/null +++ b/net-print/cups/files/cups-1.3.7-str2860.patch @@ -0,0 +1,16 @@ +diff -Naur cups-1.3.7/config-scripts/cups-compiler.m4 cups-1.3.7.new/config-scripts/cups-compiler.m4 +--- cups-1.3.7/config-scripts/cups-compiler.m4 2008-02-28 01:54:04.000000000 +0100 ++++ cups-1.3.7.new/config-scripts/cups-compiler.m4 2008-07-02 23:54:33.915981796 +0200 +@@ -521,6 +521,12 @@ + OPTIM="$OPTIM -D_HPUX_SOURCE" + ;; + ++ Linux*) ++ # glibc 2.8 and higher breaks peer credentials unless you ++ # define _GNU_SOURCE... ++ OPTIM="$OPTIM -D_GNU_SOURCE" ++ ;; ++ + OSF*) + # Tru64 UNIX aka Digital UNIX aka OSF/1 need to be told + # to be POSIX-compliant... |