Version bump, fixing bug #284771 and #295369.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 25 insertions, 20 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index deca972ad556..aa1a8e6b6494 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.380 2010/03/08 22:20:59 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.381 2010/03/31 23:01:18 tgurr Exp $
+
+*cups-1.4.3 (31 Mar 2010)
+
+  31 Mar 2010; Timo Gurr <tgurr@gentoo.org> -cups-1.4.2-r1.ebuild,
+  +cups-1.4.3.ebuild:
+  Version bump, fixing bug #284771 and #295369.
 
   08 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org> cups-1.3.11-r1.ebuild,
   cups-1.3.11-r2.ebuild, cups-1.4.2-r1.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 281eb6d729c4..a89e568da19e 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -9,9 +9,9 @@ AUX cups-1.4.2-str3200.patch 1654 RMD160 cc40d26f7e9dbe5a12d9426535d09de10254da2
 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.3.11-source.tar.bz2 3799393 RMD160 a0646f2ba29fbd39d211ea5c3fdbd24a00f66a78 SHA1 df5cfb64fb608fc128acadde670dc30af49bdb18 SHA256 5e310fd324a15fae1e1c9721879f5c948d788e04735a5263a40c6146fff607b8
-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.11-r1.ebuild 8585 RMD160 a29cc095f206ac9ad17fe2898eecc9d75777ce5a SHA1 48593d69334dbd740642cdbadc6190701b26acf7 SHA256 9917c16ab6441e58aa7c752653634771d6188f40e0460aea3f1d0a8d6b3e6b52
 EBUILD cups-1.3.11-r2.ebuild 8791 RMD160 f516abbd9e16eb700563871c3a2fb354f23c3459 SHA1 d47719da41455b885d8cbb623689ca280bfe4259 SHA256 fd41ea7708a601df3350a0eb4c6b2741e8bff899a03134fce468fb1319aefe59
-EBUILD cups-1.4.2-r1.ebuild 5355 RMD160 4f6db294cea45b48162680533cf2e26db505cccd SHA1 7b7d501509c3393594a4f1d25d0c4f6082cf509f SHA256 6ce51358a801bb0a54ec1c2c2a6d0a68a0244802f569456b526900e0b6c155f5
-MISC ChangeLog 56761 RMD160 41526e87e01312e2fd0773ce2f3af9fb2a660aa7 SHA1 1c1ea47f17e65bdc61515643b7301453db1fe758 SHA256 b19287ebf323c962a6440193570b40f89b9665102bd0176cf8d61ab65bb54ee5
+EBUILD cups-1.4.3.ebuild 5351 RMD160 f6ec808bc326ca7022d557af1b55b47c303b931a SHA1 f5f05e6e177c845f91a227a79f60a56530863969 SHA256 bfe5e5aff72ac66a73a2159c7c1e6a28be4facb4deb38f57c32399ddb655aaba
+MISC ChangeLog 56923 RMD160 c24fb89b1d40cc06a06f0a52ce10232c96b0502a SHA1 c469228d292bf8deda42f1f92482bde23065ee10 SHA256 4883d0a68a3e0d2170e2cc634458b80b8e1d33d1c39c3fbd0b29bd9f12cd914e
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/net-print/cups/cups-1.4.2-r1.ebuild b/net-print/cups/cups-1.4.3.ebuild
index 016abcfca388..a2567ded2bdd 100644
--- a/net-print/cups/cups-1.4.2-r1.ebuild
+++ b/net-print/cups/cups-1.4.3.ebuild
@@ -1,10 +1,10 @@
 # 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.2-r1.ebuild,v 1.5 2010/03/08 22:20:59 reavertm Exp $
+# $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 eutils flag-o-matic multilib pam versionator
+inherit autotools eutils flag-o-matic multilib pam versionator
 
 MY_P=${P/_}
 
@@ -15,12 +15,11 @@ 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 X xinetd"
+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
-	dev-libs/libusb
 	acl? (
 		kernel_linux? (
 			sys-apps/acl
@@ -43,6 +42,7 @@ COMMON_DEPEND="
 		!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}"
@@ -53,10 +53,7 @@ RDEPEND="${COMMON_DEPEND}
 	X? ( x11-misc/xdg-utils )
 "
 PDEPEND="
-	|| (
-		app-text/ghostscript-gpl[cups]
-		app-text/ghostscript-gnu[cups]
-	)
+	app-text/ghostscript-gpl[cups]
 	>=app-text/poppler-0.12.3-r3[utils]
 "
 
@@ -69,7 +66,7 @@ RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
-LANGS="da de es eu fi fr it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
+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
@@ -81,13 +78,16 @@ pkg_setup() {
 }
 
 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"
 
-	# CVE-2009-3553: Use-after-free (crash) due improper reference counting
-	# in abstract file descriptors handling interface
-	# upstream bug STR #3200
-	epatch "${FILESDIR}/${PN}-1.4.2-str3200.patch"
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
 }
 
 src_configure() {
@@ -129,15 +129,14 @@ src_configure() {
 		$(use_enable slp) \
 		$(use_enable static) \
 		$(use_enable tiff) \
-		$(use_enable xinetd xinetd /etc/xinetd.d) \
+		$(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-libusb \
 		--enable-threads \
-		--enable-pdftops \
 		--disable-dnssd \
 		${myconf}