Add patches for CVE-2011-1485, remove vulnerable 0.100 version

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

3 files changed, 43 insertions, 13 deletions

diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index 047bea7a23ac..171cce46f03c 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/polkit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.42 2011/03/22 21:12:38 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.43 2011/04/25 10:13:13 nirbheek Exp $
+
+*polkit-0.101-r1 (25 Apr 2011)
+
+  25 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -polkit-0.100.ebuild,
+  +polkit-0.101-r1.ebuild:
+  Add patches for CVE-2011-1485, remove vulnerable 0.100 version
 
   22 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> polkit-0.99-r1.ebuild:
   ppc/ppc64 stable wrt #354509
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index d3d8384ae275..762f08179775 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -1,9 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX polkit-0.96-getcwd.patch 576 RMD160 107abc47650cfe9dadaa2180a20a389a693a9e77 SHA1 68a9f2b46ab902e67c29576802e20e6b89624fbe SHA256 175a6e80a2563721e060f321ec152310e90c48ab62c5b3fd092e177222a1a9d2
-DIST polkit-0.100.tar.gz 1050355 RMD160 2a94764af9097747d02ada906ececce259e2171c SHA1 dcf746b1507b732ef9558385507cb961d5659e04 SHA256 afe63bec81b7f49e884ea4f2671ec76db121d84d05f36e75cde9b4ca4c828186
+DIST polkit-0.101-CVE-2011-1485.tar.xz 6804 RMD160 2117a01ad8fe6019c78c3da49a89f6a2d48ba1bc SHA1 efae676c2611c50013bbfddf3c0d00ff5b0472ed SHA256 f70b2ec3ddbc1fcef59f4eefc84803bb46681c74785142e4718dc3009b4c09fa
 DIST polkit-0.101.tar.gz 1066155 RMD160 692dfbcc275c0711940f29b8c7d500144b6b921a SHA1 9d1f58a99d40889ceebbde142f93c305471fc151 SHA256 927f65760e4fce23d7cdeae90245c22986eb0a39335a344915302158f73f9f1b
 DIST polkit-0.99.tar.gz 1042461 RMD160 bb3556732e658b1a3ca51129d05ae96aec734ec9 SHA1 4c1fcabfa51bb3f716258a855a22366e7ed1ee22 SHA256 f612c7c26ec822f67751420057a4ae113fc50ab51070758faacf2ad30bb3583f
-EBUILD polkit-0.100.ebuild 3357 RMD160 efe26f1b35e3ad85c4b9b1f3b8cf065faeeb988c SHA1 b3d4ebe4d076793638a40fd9f7590fad6afcf195 SHA256 2e9d741a82bce8104d677d4cf7d4fc9cc23c0250e4c6b272ccb5f2324b92cfc8
+EBUILD polkit-0.101-r1.ebuild 3487 RMD160 ff10ca95f24c7926d0c80e274127609ce0e58e0b SHA1 e3f7a2280ae884fa22e8b13f6a1a35806d3ba115 SHA256 f36425d4ee3c9d211c4dda740b63d57e0b54c5157f8bb303749123f70df2d6ec
 EBUILD polkit-0.101.ebuild 3241 RMD160 02d953e09b01ad64096dc7ff5a6e71cbf271b8e7 SHA1 ed1efebbdefc784d5588056819a28d0533432d0a SHA256 5fcaad1d6b5c9d2d7d1adfbc5f5f0e0beae1a6df489395438f0f072ab9078803
 EBUILD polkit-0.99-r1.ebuild 3473 RMD160 cdfed5d7d2b8487585983438694f7df5a231713f SHA1 99ab66d0058de9bb76afb25f6140e42c913f82bf SHA256 5e86f2242273549f73138c6c5afc810081c285f3be63a9ed8e93bdc324142def
-MISC ChangeLog 5672 RMD160 86e9dd30b5647751fc08567e968f245ba7285d01 SHA1 ddee598ec1ceec44f0bd47e982fc5c294d9aff0a SHA256 8fd427164bd64ec3bf73279a2709d2283f4724bb0c8fb9e7b90140b252c8faf1
+MISC ChangeLog 5871 RMD160 ba01096f4a08651f974c02da4e2d4d6f0d97a289 SHA1 fd39c5bca8d74d61d6ec67dea3b40eb8fed549cb SHA256 6e4c324defb7370a6bd5f1269c93b1a8d4d1dd3542d119b464e860efd9e8760d
 MISC metadata.xml 389 RMD160 3a54b59d35cd9c5b920de1b6d07447a95c7c7de0 SHA1 4a94516eb92b02ed46d9da1ab420a4fe3832211e SHA256 cfd3de2aafbe1b3e663e793170c36caf8c8ba8a48d75e581af69962e6cdc2815
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNtUk/AAoJEO/kOhxWD91kWDEP/Rss6GmXCcsPzG4M7JgS+7my
+ycq66To+CzkM9QOh28li9rYf5skQcO3OyqlEiZk8K9n8KJ7RhvnjY3mqDtqNuq4T
+7CPDVuaVwozASUU2Khdx4iBDlRIKVObhxQI9sPb8OdhUGtFr4p5no/N6s3w6AIP+
+oLlkjng5VKQXStp28yctPXRh41hIvE0O6e1vZl1QDWgwINRhRKrRQdnmn1igOb2a
+jVKgJETbnxnEX5GRab23UkwgZtvBMYFvtPgaCxnhwPWI6YdhU1M1E8/HMYSZv9b4
+4xwXcTy5uWPt5jdCYutChynX9yEbDmcwUuiNTGoMJ/wQhgEAArf5w6VpNqcTNFoY
+PNcMFHIcBFAbNHM2GTwlNYSpAo6bdSILdE8Od5DDOhdATinxlR8z2i9taCIZjwLm
+8naHvmzp4OrIL/z4vCNaLkKKyS7YFuZFHS+PM1M8aMyyRoWimkdJpvT3xkxRzhyk
+p/OmF6TdB375G34YwCUZ1ZySCwZB6v+IawPqdJ4td4XoHvu/epYdH8PWiKXfWvp0
+X/kdK5TqpZo6Nnt5f9W7G/WNUEb4+E90z2Oav7evPX/xkK2fneZ+uGM0PwSqR47+
+m+5tX1oMaU7WK7Vl4JUUZUddYjv0Esx8Tbu6r1h0Y3ki/TyVO5Au6PK6YP802UfG
+wpB84gQQGlQdcSFh/d3M
+=Xcji
+-----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit/polkit-0.100.ebuild b/sys-auth/polkit/polkit-0.101-r1.ebuild
index 484a3866b50c..2ecb28266a48 100644
--- a/sys-auth/polkit/polkit-0.100.ebuild
+++ b/sys-auth/polkit/polkit-0.101-r1.ebuild
@@ -1,37 +1,41 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.100.ebuild,v 1.2 2011/02/23 14:05:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.101-r1.ebuild,v 1.1 2011/04/25 10:13:13 nirbheek Exp $
 
-EAPI="3"
+EAPI=3
 inherit eutils pam
 
 DESCRIPTION="Policy framework for controlling privileges for system-wide services"
 HOMEPAGE="http://hal.freedesktop.org/docs/polkit/"
-SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
+SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz
+	mirror://gentoo/${P}-CVE-2011-1485.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc examples gtk +introspection kde nls pam"
 
-RDEPEND=">=dev-libs/glib-2.25.12
+RDEPEND=">=dev-libs/glib-2.28
 	dev-libs/expat
 	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
 	pam? ( virtual/pam )"
 DEPEND="${RDEPEND}
-	!!>=sys-auth/policykit-0.92
-	!<sys-auth/policykit-0.92
+	!!sys-auth/policykit
 	dev-libs/libxslt
 	app-text/docbook-xsl-stylesheets
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.36
 	doc? ( >=dev-util/gtk-doc-1.13 )"
 PDEPEND=">=sys-auth/consolekit-0.4[policykit]
-	gtk? ( || ( >=gnome-extra/polkit-gnome-0.96-r1 lxde-base/lxpolkit ) )
+	gtk? ( || ( >=gnome-extra/polkit-gnome-0.101 lxde-base/lxpolkit ) )
 	kde? ( || ( sys-auth/polkit-kde-agent sys-auth/polkit-kde ) )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.96-getcwd.patch
+	default
+
+	# http://lists.freedesktop.org/archives/polkit-devel/2011-April/000349.html
+	# Not needed for next release
+	epatch "${WORKDIR}/polkit-0.101-CVE-2011-1485/"*.patch
 }
 
 src_configure() {
@@ -56,7 +60,7 @@ src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc docs/TODO HACKING NEWS README
 
-	find "${D}" -name '*.la' -exec rm -f '{}' +
+	find "${D}" -name '*.la' -exec rm -f {} +
 
 	# We disable example compilation above, and handle it here
 	if use examples; then