Version bump; fixes a security flaw that allowed users to overwrite system files (bug #438450, CVE-2012-4510). Update license. Drop old.

Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64

4 files changed, 25 insertions, 21 deletions

diff --git a/net-print/cups-pk-helper/ChangeLog b/net-print/cups-pk-helper/ChangeLog
index 806c55f758ac..6ad5f519d5cf 100644
--- a/net-print/cups-pk-helper/ChangeLog
+++ b/net-print/cups-pk-helper/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-print/cups-pk-helper
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-pk-helper/ChangeLog,v 1.14 2012/10/06 09:52:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-pk-helper/ChangeLog,v 1.15 2012/10/16 02:23:00 tetromino Exp $
+
+*cups-pk-helper-0.2.4 (16 Oct 2012)
+
+  16 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -cups-pk-helper-0.2.1.ebuild, cups-pk-helper-0.2.2.ebuild,
+  +cups-pk-helper-0.2.4.ebuild:
+  Version bump; fixes a security flaw that allowed users to overwrite system
+  files (bug #438450, CVE-2012-4510). Update license. Drop old.
 
   06 Oct 2012; Markus Meier <maekke@gentoo.org> cups-pk-helper-0.2.2.ebuild:
   arm stable, bug #427544
diff --git a/net-print/cups-pk-helper/Manifest b/net-print/cups-pk-helper/Manifest
index 31895aff6567..69efaf7a67e7 100644
--- a/net-print/cups-pk-helper/Manifest
+++ b/net-print/cups-pk-helper/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX cups-pk-helper-0.2.2-cups-1.6.patch 15968 SHA256 aa5dfb9254637b41cf67239c824c6d43e61e5f485f1416c93e5c4ccd326b085a SHA512 5c8028a5a5ceb6eefbb8e307846017b24c9edeefd951fa7fd688840008f6bc09fd02e6d24740cee2054209244e2d5ad85e572fc302da6ecf8ae7d876f99bc8b3 WHIRLPOOL 3988535da0abfc88660d5f4b008aa73b452e6f3d77602c71d4bf050e2c4d8b3fd6296fa894b77166d5283c8af05e3c70a6e586d7773aaa6a3a8f2ec857c7a063
-DIST cups-pk-helper-0.2.1.tar.bz2 216528 SHA256 b620abc83d5e8595c533264c00c6f6d9f44ec020b62968797747687857679c9c SHA512 0cb6696ae02283347af7585bf40f923aeda14fee79a600e01486461e0b10e2ef4918eb40477eeb7d4236b3a25b1b5c3ae5f9dea365425c87a038d566bd71fd08 WHIRLPOOL 4099471c97fc22ccfd8e682fe2d2e005e741499a5b252b791c07fb87079a8b4cb79879b27d4ea7b7aca07974aaa7e142a48389221afd56aedc6769cf0338cbc6
 DIST cups-pk-helper-0.2.2.tar.xz 213660 SHA256 56a10efbc0f37db39a940d99d549c7f37fa95f1af4745b30b79c240b0f37cfd7 SHA512 16a9c0e51470893cbbc554b47a17b7ff1f23018aa5fed43bccda230d9951b4a2a3f3811dd483b6cffe33fd1b54ecbf5896b4ae2e83128a79643885c412d27c32 WHIRLPOOL dfb87d14b5bc9f82a167e79907dffc6d5f0a2719654413a4250d65f1fa2d6f3516dceeb47d03a1ede38592a27c641256f1d78466209c41bef627d90633aa32ca
-EBUILD cups-pk-helper-0.2.1.ebuild 918 SHA256 aea76704d513e93d6a4c586d91bf7d872c16b0333f284e246807c73af538b44f SHA512 6740d1859c8f53e45b51beca6c27d37a86bb1575b26649b7c0d27ff4799a2543970dcea853bb61e8f63eb92c712184725bda8e2cb5bd293f57c4dfa69246fbe2 WHIRLPOOL b6e4aec8530369af0f5e383cbe5bd7807e4e9d140be03f19001d4a5aaccd2f497ad73170bdb8c6bc4b636f036b9ddaf70cacb8074f5647f545d80e33d4d94a67
-EBUILD cups-pk-helper-0.2.2.ebuild 1207 SHA256 6ed7e8360892fb3bfcd3cd72076a83fe309b09373b4ed0e9913b131e34358267 SHA512 2ad63d5129fbf95509c75e9590a9d63a3de4e21f367f45e860218068c329da5253504894f5816fd763e6f98c0bef6f9de91baf93d577397711a8e21baeac5531 WHIRLPOOL b133f2698e7c85ffa99a69596b4b0eb0b987c604b1b920cd86f1a7eb22570269976091d9229e0a4292bc4e1e5bfe5749ed3c0871d449d7ef1ce37b9da3b886d0
-MISC ChangeLog 2213 SHA256 d208d736778c2625cb887e9e585332f06300b9e931f69fcf40d2c499bfe0ff94 SHA512 6f7d80351ba152d31ee8bdeabe52f5fe4433c9bc3aa2b29503f34664a1c4578fffba416b393a0d84d6282dbbcb5cce063ae7bd42e0cee81a795bada0d7d5943b WHIRLPOOL 84409ac7b3eaa078c4ab35f27f636e0aa3a4033f359517005c1b504f24c05a09f4a5c96127b382e3020767b140793a49737f74f0dedd4771d50b5eaa088deeee
+DIST cups-pk-helper-0.2.4.tar.xz 149828 SHA256 d187dc994ff64621aa090d114170b292daa11122481d8b8adb7613b32ca4e3c3 SHA512 0e071cad5cb8177caefa973de754f015fca3f6bc291ff1f30b978be990f45e443ca91999a2c733aff616cd9a5fc3b4074e1e01a18dd049f6d9b629171587ba02 WHIRLPOOL 7b34eba1fd4fc26c81dafe1eb118e2aec7b6f955a3f0323866a732c85ae3046236e87deb7f6c0427c02bfaff6e823182f42909ac8b19817c6cb089e90127da32
+EBUILD cups-pk-helper-0.2.2.ebuild 1211 SHA256 037857e3a1783bc3fe3a7277fac1c4e06a8f0d728693c828891f52e2415643d7 SHA512 6ab071eb118212d704f550e4d95e1d03900d9b4d16f89a8727215b887873c0e7b7a7a743f9b86526b4ae26f0010c88a59fe633b2fc15195d10e66cdd52a989f3 WHIRLPOOL 7567b677bd8741e11ea4a8f396e3a98c82ffaf4af935041e53e3b1e9ca794dbfd4851b61e2fe5e336067a73f68f43f865ec846627ae36befc9b998369623fb52
+EBUILD cups-pk-helper-0.2.4.ebuild 1096 SHA256 21c5446f8df4df8a170c5535d5e3541b11e99be4c2be7090a2406657a28fef2a SHA512 a4f58cb408a1fab8a97fe58a7927877db76b958032049091f250b4c12feccd9b06082aa4c5bdb7253d2bd28a3c4781aeb3dfa8359c42bf4e08246ac7f3a15d6d WHIRLPOOL b4d6530cb437d7f31cb92fbe7ee7db18c79fcb63ad39f470939959d9a374b1da74c1a2931d7ee710672b77678dfd75c70f8a26a113d69a46126e58f63bda4a4e
+MISC ChangeLog 2547 SHA256 c71abca1b74d35376ac6d25218197c76380fdfdc8f09506ce9c5c194d78a3b98 SHA512 f232c627ddcfb3eb1fc5c154e8cb22456a7cd23fb284e44e9463df6d5f155c3fec936448fdc55ff369ec77e5a360011a054a7f276723cbc658d4652ce6773435 WHIRLPOOL 7465943958706f21396701d6e48d8329478d3911afc022e5843adee319f11302fdfcb55ebf8e8198ec7d36b4ce20e6763c8ae0cea56cbd63785abc9d67c9847c
 MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlBwAFMACgkQkKaRLQcq0GKeAQCggbJWkX3nzFRekM2TH7oz1jC7
-w6cAoJ9d6u/bKWzNeNQueSKqkpB4IxcO
-=7JUR
------END PGP SIGNATURE-----
diff --git a/net-print/cups-pk-helper/cups-pk-helper-0.2.2.ebuild b/net-print/cups-pk-helper/cups-pk-helper-0.2.2.ebuild
index febaf45a3124..7d114b7d6f5d 100644
--- a/net-print/cups-pk-helper/cups-pk-helper-0.2.2.ebuild
+++ b/net-print/cups-pk-helper/cups-pk-helper-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-pk-helper/cups-pk-helper-0.2.2.ebuild,v 1.10 2012/10/06 09:52:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-pk-helper/cups-pk-helper-0.2.2.ebuild,v 1.11 2012/10/16 02:23:00 tetromino Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ DESCRIPTION="PolicyKit helper to configure cups with fine-grained privileges"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/cups-pk-helper"
 SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~ppc ~ppc64 x86"
 IUSE=""
diff --git a/net-print/cups-pk-helper/cups-pk-helper-0.2.1.ebuild b/net-print/cups-pk-helper/cups-pk-helper-0.2.4.ebuild
index 82a38289ace8..1af912d685dc 100644
--- a/net-print/cups-pk-helper/cups-pk-helper-0.2.1.ebuild
+++ b/net-print/cups-pk-helper/cups-pk-helper-0.2.4.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-pk-helper/cups-pk-helper-0.2.1.ebuild,v 1.3 2012/05/03 07:22:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-pk-helper/cups-pk-helper-0.2.4.ebuild,v 1.1 2012/10/16 02:23:00 tetromino Exp $
 
 EAPI="4"
 
+inherit eutils
+
 DESCRIPTION="PolicyKit helper to configure cups with fine-grained privileges"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/cups-pk-helper"
-SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.bz2"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 # Require {glib,gdbus-codegen}-2.30.0 due to GDBus changes between 2.29.92
@@ -21,6 +23,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/dbus"
 DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
 	>=dev-util/gdbus-codegen-2.30.0
 	>=dev-util/intltool-0.40.6
 	virtual/pkgconfig
@@ -28,4 +31,7 @@ DEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	DOCS="AUTHORS HACKING NEWS README"
+
+	# Regenerate dbus-codegen files to fix build with glib-2.30.x; bug #410773
+	rm -v src/cph-iface-mechanism.{c,h} || die
 }