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

(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)

3 files changed, 21 insertions, 7 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/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
 }