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

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.25-gentoo-r5 x86_64

5 files changed, 16 insertions, 48 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/Manifest b/net-print/cups/Manifest
index c4ed0944d2a3..8eea200cadf8 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -9,17 +9,16 @@ AUX cups-1.2.12-CVE-2008-1722.patch 1457 RMD160 5c887ad9b824c1e41f7a4894f757d03f
 AUX cups-1.3.0-configure.patch 651 RMD160 e4c7f45d7ddc28157433bf025c7f946c7e3b6d6a SHA1 101bf1893b56640d9fa82078e29319fbbd1449c7 SHA256 d6e5e60a982a3c093c0d0f89cf865e2b4c36290f5b1e188b7bf305d210070736
 AUX cups-1.3.7-CVE-2008-1722.patch 1752 RMD160 25dd7948f4a3c8ac0f39b33387e79195b104bf1d SHA1 309d26918fc11619a97b3f560662478437d97a54 SHA256 d372a4595f52ccd88deb5545f64b70c3dbf8a6e9bec7524b6ac32c59cb131749
 AUX cups-1.3.7-backend-https.patch 450 RMD160 9a1ad48d2be40c89510ccc512649f0a2eb5543b0 SHA1 d3dd55fcdee47855d6b7c1443adb6c2b3d8c9cdb SHA256 060f929ae3eae5dc411ce6352a0d50c3296b013974f034fc2ad8d6bb0c81b45a
-AUX cups-1.3.7-str2750.patch 365 RMD160 4cffde801c811b52683ea6c9811c2349295620ca SHA1 d0df41aa310dedd12ae4210654ed788e0d762cd2 SHA256 8e052687c6bfb5f117baacaa10826a3327db26f193991d3dab6fb27678bbc522
-AUX cups-1.3.7-str2860.patch 568 RMD160 1c1c20279bc922f59e3ee273f4e9a912d069a09d SHA1 97c9f96236161e4a9ba1acb65c9a44e5dc0e9781 SHA256 68e994dbfb8f9c3eeb0ad63fed61e03bc7e102f31df10cbe278ee7838b053ef1
 AUX cupsd.init 288 RMD160 9bd676af5b43a97ba08ca51f70cefb445faeb8b8 SHA1 922868e1a6acb81b83e87a3c6905149789f16503 SHA256 008eeadc4979ad0e1f05e8ce5d22449eb798375e75ffc3176cbef138a53de4f9
 AUX cupsd.init.d 293 RMD160 19fbef21cee7e472e7028f3101b680baa0089c54 SHA1 e6b27b2638fec258fe2f55c926c2530e909ca3d2 SHA256 b4268a6bae95e96b6af21c3716ecc905073736ce7dc33be1489d574a447f3c48
 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
 DIST cups-1.2.12-source.tar.bz2 3788301 RMD160 598270e37ff8a9b9ff1e667066d6f7e120493e32 SHA1 11a540f76a1d3164b6636bf8ba47928803ad9356 SHA256 b4ff8e934da7db32d5654360ea9068faa0ed5a00fde02161ae53c2052510d00f
 DIST cups-1.3.7-source.tar.bz2 3895825 RMD160 7d3bd9dbe91e787f7032b770e576ab31cfcf6588 SHA1 4267822cdad2fdad44ff0885587132250bcf8dff SHA256 1c8bb310131498934657651fb0ea3e44b4f6d0243ba2ad252644a8f039dda0fe
+DIST cups-1.3.8-source.tar.bz2 3978466 RMD160 86511e538aa3f35b4cf6de8d972692f9aef9ccc1 SHA1 60a28467eb05d4d996e1b301968dea12aebc84ad SHA256 bb6e013e104d82e454a98460136360111d77160300a0eb98063d7051e71c4f05
 EBUILD cups-1.2.12-r4.ebuild 7030 RMD160 4ec61a70c3083168ed6b52cd0d1fba061527f911 SHA1 6446066e419f2970ddbd4316e57572954ea3ff4c SHA256 f7a592fd58ff1b72f5e7809175a968b00e16b1bd81af4a9412dce6abbdc1701b
 EBUILD cups-1.2.12-r7.ebuild 7314 RMD160 c6571ff1a1b3afeda21abdf5d7d4607ecbc76cad SHA1 6df0db0117f502ee889d4456cc17e5af10c05c12 SHA256 f15c11ae4e20d55ced89e52618a70457fc8182c5cde94618293d71931dcb6a98
 EBUILD cups-1.2.12-r8.ebuild 7416 RMD160 7d1e6b67af75ff60d5c488408e68da23f57061f3 SHA1 08de0991b1f65616d70db2c18b7223a1c7095742 SHA256 41d4a04d0bbe3c215f87070662128b529197795076ce65943f86047d6066d28b
 EBUILD cups-1.3.7-r1.ebuild 8340 RMD160 3a9c75d00b566c521c0d89a6e9646ef5b342f5d7 SHA1 e3d46179ffb83d79c6f0182930eb9447171796d8 SHA256 28d1fdf8b5469d8eea0c6af36cc41a4cd1e3a14686727a1e99d85c91163e35b8
-EBUILD cups-1.3.7-r3.ebuild 8908 RMD160 91147c21b6b434a1510ca9be295ba35d1b8aa53c SHA1 413edd263348cb6d382148b2089a93849466d0b7 SHA256 8964937fb867d4afbd6b58dc73c1a3ec08d056b1ab617516f3b155fb05bd086a
-MISC ChangeLog 46317 RMD160 11cadc1e6f08eae504c2f55a734c422e2224eda6 SHA1 2ab769d41c897e01459b68c7982b9fee478b3fff SHA256 84d521b02faca1445198089155821c407caba3534677e0ddc9936685b50a30d0
+EBUILD cups-1.3.8.ebuild 8511 RMD160 9197dfc00abff7855e5caf31da663dcebb10fb11 SHA1 a64e196fe486e78262b77f4b1c324b758d23cd04 SHA256 b4cd0ac176a2199f3803c4f292b5743c7aba4d04aa139e33b42deb720824932a
+MISC ChangeLog 46601 RMD160 65228cedc14cfaa6df75d7ccac670543952ef05e SHA1 1aca3475085b9faa7e028bf225e1d958ec8dfc5b SHA256 56b0d4dc6c9bde3ffa9928f54d3011618fc1ab48608a7ec1159bfc961dd74b1e
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
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...