Version bump, fixing bug #232493. Dropping patches included upstream and remove older version.

(Portage version: 2.2_rc3/cvs/Linux 2.6.25-gentoo-r5 x86_64)

4 files changed, 13 insertions, 44 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index d119663d9095..ec79d7978c7a 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.315 2008/07/16 22:47:37 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.316 2008/07/25 19:45:54 tgurr Exp $
+
+*cups-1.3.8 (25 Jul 2008)
+
+  25 Jul 2008; Timo Gurr <tgurr@gentoo.org> -files/cups-1.3.7-str2750.patch,
+  -files/cups-1.3.7-str2860.patch, -cups-1.3.7-r3.ebuild,
+  +cups-1.3.8.ebuild:
+  Version bump, fixing bug #232493. Dropping patches included upstream and
+  remove older version.
 
 *cups-1.3.7-r3 (16 Jul 2008)
 
diff --git a/net-print/cups/cups-1.3.7-r3.ebuild b/net-print/cups/cups-1.3.8.ebuild
index 3920cd0c5ee3..26389297ad5a 100644
--- a/net-print/cups/cups-1.3.7-r3.ebuild
+++ b/net-print/cups/cups-1.3.8.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-r3.ebuild,v 1.1 2008/07/16 22:47:37 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.8.ebuild,v 1.1 2008/07/25 19:45:54 tgurr Exp $
 
 inherit autotools eutils flag-o-matic multilib pam
 
@@ -13,7 +13,7 @@ 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 gnutls java jpeg kerberos ldap nls pam perl php png ppds python samba slp ssl static tiff X xinetd zeroconf"
+IUSE="acl avahi dbus gnutls java jpeg kerberos ldap 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 )
@@ -38,12 +38,10 @@ COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 
 DEPEND="${COMMON_DEPEND}
 	!<net-print/foomatic-filters-ppds-20070501
-	!<net-print/hplip-1.7.4a-r1
-	nls? ( sys-devel/gettext )"
+	!<net-print/hplip-1.7.4a-r1"
 
 RDEPEND="${COMMON_DEPEND}
 	!virtual/lpr
-	nls? ( virtual/libintl )
 	X? ( x11-misc/xdg-utils )
 	>=app-text/poppler-0.4.3-r1"
 
@@ -72,7 +70,7 @@ RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
-LANGS="de en es et fr he it ja pl sv zh_TW"
+LANGS="de en es et fr he id it ja pl sv zh_TW"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} linguas_${X}"
 done
@@ -102,15 +100,6 @@ src_unpack() {
 	# 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"
-
-	# 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
 	eautoconf
diff --git a/net-print/cups/files/cups-1.3.7-str2750.patch b/net-print/cups/files/cups-1.3.7-str2750.patch
deleted file mode 100644
index bf492bca69c8..000000000000
--- a/net-print/cups/files/cups-1.3.7-str2750.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 ++;
- 
diff --git a/net-print/cups/files/cups-1.3.7-str2860.patch b/net-print/cups/files/cups-1.3.7-str2860.patch
deleted file mode 100644
index 597225a8b112..000000000000
--- a/net-print/cups/files/cups-1.3.7-str2860.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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...