Bump for CVE-2013-4324

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD7DFA8D318FA9AEF!

4 files changed, 24 insertions, 200 deletions

diff --git a/net-misc/spice-gtk/ChangeLog b/net-misc/spice-gtk/ChangeLog
index 76d88ad19f82..f9da4e78d914 100644
--- a/net-misc/spice-gtk/ChangeLog
+++ b/net-misc/spice-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/spice-gtk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.70 2013/09/12 22:33:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.71 2013/09/19 16:21:23 cardoe Exp $
+
+*spice-gtk-0.21 (19 Sep 2013)
+
+  19 Sep 2013; Doug Goldstein <cardoe@gentoo.org> +spice-gtk-0.21.ebuild,
+  -spice-gtk-0.18.ebuild, -spice-gtk-0.20.ebuild:
+  Bump for CVE-2013-4324
 
   12 Sep 2013; Michał Górny <mgorny@gentoo.org> spice-gtk-0.18.ebuild,
   spice-gtk-0.20-r1.ebuild, spice-gtk-0.20.ebuild:
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 0d1434b43139..c7291d31d935 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -7,29 +7,22 @@ AUX 0001-build-sys-fix-out-of-tree-build-with-vala.patch 1273 SHA256 697bb0d30a9
 AUX spice-gtk-0.20-add-spice-channel-string-to-type.patch 2591 SHA256 9335c92940541858dcb0b36effa1bb56d3b1acff03f4343628ab720ced6ad3d1 SHA512 2216717a8aa9ab06dd95c21f83e0493809d40280ec243aa774d9f02a90a5ba90f3e7e10f7e34b3ba496f3684b40c29a992e51a84f2f4e1b05f169792ffd2d917 WHIRLPOOL a2791b24ca8fd7747d633417cc033894dcf6568f8322ab495941a4a8f38d07092ef36a05959dc8be44f3359ee212d30b3eccd2b699e761c0c6aeda9f032aaa7e
 AUX spice.protocol 159 SHA256 9a13ea202d5b26cbb45874c56df95d30c15a9372e55140426742f249f5b16525 SHA512 39be4ab9878e1c2eb77955e80c23b58d33b6695f1177fda675ba35330ac57c7973d354e58c2b3ffa2129badb9202799e9e07db450fbb9b2d0b123a5361e2ebda WHIRLPOOL 1df7713b6e574f23fec5164e89b16909b8a88ab4cde6204dc7f013b52e1a88018fa2a685560996dcb37df5057ce62a482599f5ef7fa217762abc6fb78c627051
 AUX spice.schemas 1305 SHA256 aa21d09f57e539a9206d88051f2b4d1a15e9eb3e8ea2d104bdcdcb677801ea14 SHA512 bf894c8970c92353df0849e532ac46f7e04a3344090ca70c325ea198aa1a10e94a71649f7648a867d18b07fddc2e87be67d82d332965fc5777466e4798bfa33e WHIRLPOOL 593b2c2bad2ec1c975838ac5665a143c96f04e14a9537863eedd58ee1b34653aaa538b1e1e0a81f756c32ecc5ea4b8e08a5f988ff0fc05759633f6610eb27702
-DIST spice-gtk-0.18.tar.bz2 1220594 SHA256 decc954ad3af5894d49b772d7b291620cfea19651fcd2f6c9bf76340428719f3 SHA512 78609767bb2c3313f4823a995cf332a3d9181086bb7875d37070fa6b2e3749344ca21d25fa555dcd38294143416858069b316b36176ad8d031876c82366f3c65 WHIRLPOOL 5e196af787676763c8552e47e1d8c4cc622c21890b2f099ab5eed6fcb966ee64e148fd00d01365fa4371561fdd5481dbe65553c4c79c5133509064cb155fd4d2
 DIST spice-gtk-0.20.tar.bz2 1210694 SHA256 b1355823b0ceb2e118c1f9a9a602ccab78e1e2edf2d93f71fa42d3bc85ca75df SHA512 db07d05d93bf5639c193f374b6eb3fe9f6bb198f0146e64f8e6e6c03d12e931c1f18a353aed123fe28535a95eb8448ef8a8babc66bdd283f951b8433839d6b9e WHIRLPOOL 82ea2e7a1ebec0155c6aadd03143456498db332e64f4a2c5cb15beb47e0371790ee5fc29b7ff1b40dba34c63dd021cecf6f27cd1aaa1c58c465f9bb2d22ca50e
-EBUILD spice-gtk-0.18.ebuild 4267 SHA256 c385f78a9aad4400728f06d72128f4a69c6193c08b7859c4aa7a0f9a4bebd986 SHA512 48364544de085350dafaaac2eeeb1227f3e95b94c89fff25f73ae3123bd66e29fa1548447d23486a481e567fcb67212be30ab5867349b390282c84205d1d820e WHIRLPOOL 8b581442a766b35719a700507c1298de77df7875154938cb78360ac2a1e3c8f3a571a1d3b6e652688d27699f835dd64e0198aafe5e046ff2118191f6a0c2687f
+DIST spice-gtk-0.21.tar.bz2 1191082 SHA256 73d418ffa97d6cf5edb1920d46f1d51fc40d14a8d4edfab3be6041e25062c564 SHA512 970c5de33c5f2117c4c4c0864da4d3796226771be54fdcc5393d17eefecb297cdc0767003699afa03db7e72a9810de4d157217e40de62013e410b90c8c759151 WHIRLPOOL caabfcc4654077dce70d9f82d7ccd77bd390d365c23f6c82c906b5490c1dd135c82c48e2aab486b699470829b24b3253dcb39c22921c13132dc16a03369d62f9
 EBUILD spice-gtk-0.20-r1.ebuild 4223 SHA256 7e31e0ed66740cc669b7f019a6fa2cf443844a79d4d76e458f09b2d4c845d6c9 SHA512 4d82b74b9aece1af44acd4c5efcd23956ab88b7e1c828c7b4a031587c64cab48baab7ca2e8483f04b45ffd3368680fbea327521e850fb4ff7e1185afc47f4597 WHIRLPOOL 3072b6f207e818a8eb6d9e11823470db1abaa0e59f2edd93f8a2b58ced5fb3a7173577d3f938ec3dc93582099f3dec00b7cd069dd957e95ecaf9373fe1a30509
-EBUILD spice-gtk-0.20.ebuild 4149 SHA256 15d0ae1436513a56d838f7668070b927daae704ddd68621748ec045c229a9cee SHA512 47c57b09329189d005c819a89dc75fdc23ba4213b33fab14ecc5e51a92d16a4e54889968eda559d3eedee87e63f15c2d779ccde1ee20d368266257fb9a74debc WHIRLPOOL 326cc7e673555b5273d5e37a539392bb0c6a341a9c61c2c77b82e12bc3b8cea219778cbb494ffe4dd17224ffa362f0f93dc76ee0e9ac78b75b07820f10f7ff8e
-MISC ChangeLog 10982 SHA256 e7b7811cfc6830aced61dee967d6293e9237018862b72fbe4937ebb40ea75bac SHA512 fc26bf1008da2950e0d898038f821ce8c2c4b1b776d820341c1fc2ddaf3fb47321ce49501282361194191096c1ef4304dfd27c5dafd8cef15347c23f35259268 WHIRLPOOL 3644a84ac2b536cfff2c9bf6212cfee8128852168af38da9b9d90d4a754618d764de178151ee7af6d6e495ada0d4fdeb1834656b6c13559f9baf7ba90b6f2bc4
+EBUILD spice-gtk-0.21.ebuild 4185 SHA256 13af9255e0470122a6bdf6a4e05f45448f2af3987b5b63f6bf3a555c33c40814 SHA512 1fd3e39097c6cffc9d97ed0f3f2ce8f3d57e03e23ae85d214ee22a3b38da0cb0ef9cf6212bb3eb7b08182387dc013556ad413346027a4f1efd42ce1563c2cd6f WHIRLPOOL 2bd0fb9ef9005627e1789150d867c2562ca2f52d44255ff1a399e03f57610f2aa56b51113d704119aac947678797656017f7866572c6b0b6ecb32c43a41cff00
+MISC ChangeLog 11163 SHA256 d5e44264854be290019a08615e65e8a9094f26dffa3a4d310a97ffad166bdbce SHA512 370c55aa8c5ddd4be324b982ba2e0ce099b47d1eac5c2bbb9631c96fded73ec867f4ec0b7e51d1ba347da78c447bbb09863db69620dafd38481debb57ee95880 WHIRLPOOL 73bd1f10fc1c1f5b35bd73ca7cf2c2e44392d77dcbe1dd241f1bb5e4ab7e9c0ecd30f51bece08bdd52e85f3b980dc4c203b7c6a21dfa1eabf9e31f6e8c5dedc4
 MISC metadata.xml 1093 SHA256 e870c8e701b20e9b02117b10d3a5a401b21df1e6259c03e0c13540db6c2fd123 SHA512 20eebe5c2396bc77a6eff62cf742ada3cd4ddbef3fa38a0cee2758964d6e9810bd45734c33e89bd18d784d16faecf3ca61e5311053e4c77d1338144f9cb5032e WHIRLPOOL 19828941ec2e27d8f06fdaeea1f45b78156c5265923492f2b2e5073cec0d072fd93ae5ec4951bd82bad306afd21ed9e9424addb3bde152038eefc8ff7d4f6407
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSMkF2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO6ZMQALfEtJChS8Vn0CW/5WPPHjU1
-Xd++al7GD5ZIDTmMsrnRE+Fj+CH+Mu0G++m33C/pf5/+us/wn1rJbOmaoyfVAMbB
-X9EGYx5gItN9oSaYguAqUVdVXIfIy3302yUhGt4gdzDkQ6Sg3BsOJlr/+wVG3odj
-25A5zILygUloImPlUjWY6XajTF/hYGRQwSUobtImdqhBA9BKctR4m5hYTxTOT8Vz
-512uyBqrjvY+T3toC2FaMS7IH1lp1M4i/xk7TQ5k4gdu5hTsLbCxf4T7CPQ7gy83
-0IAGY6RbEJKIrmdrDgJdjULaaq8hoeuXxLvsifMKoGO3gM/vG1yjQT+o6NtQONGm
-5PC+/mZEs3x1+qwWPoDClnWVT9MUuxxTJbNnqVch6Zu/F9iGtwEYPkMD+40o6QSj
-0pxk3y9hEAp/5HcHFH1oCTn4xnIOC48upz+KqyBFcYnDyzo/iHRxEAaEh3BaPzAB
-eSLKoMA0dCe4alEA2olmjHJCa4BpMfZBR0mIoLwgMJ/3MoDi7hOuu/OhjvbKqQbg
-JeZpORwbcMaDTV/6AzpyLJmiw48gBrosOX46ubYyjMoH0PXyrPt28+jQ9WLiT89S
-uxDYSgqKedZQlwGRQTJA3hpGveGMRViD/Sl4hUKVQKSx8dh1EMLxUwCJAMSN43EL
-ZewjXW9P9q/1bLSi26GR
-=AWnV
+iQF8BAEBCABmBQJSOySGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE
+N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prv+1AH/1ugPlQyK1rKb1Y2Qic28vf2
+yw9P8dUlvk+k1GntNvrL5GW5nE6rRMnacb2MtS/1uriDoPoV9ptGaLjPeyGtDCXP
+/p2QNeEu/9Fi8/avbG39c8KXZoCGAHalSK375fT5w7vlArG5PI0ZrUNU/70GkBtq
+sxbk0xgL5Qz+TDNkTIwB+4Qe0/Rth+Z2H+00RL0CA43WJ2NcHREN36VD3sCUZZGO
++7jQrc0QRQYOKqVTF91TSgQGwFZ+n1d7pl2zX1fOgNe4iygbzz6ChABDC47tiO2J
+3CgEwmrBFRtHAoVakgfsX+d9mi0FDazJAUhxMWdrsOHwweMaoRoq5OP7QMTMZec=
+=Ni8k
 -----END PGP SIGNATURE-----
diff --git a/net-misc/spice-gtk/spice-gtk-0.18.ebuild b/net-misc/spice-gtk/spice-gtk-0.18.ebuild
deleted file mode 100644
index 79ea5dfa5b7d..000000000000
--- a/net-misc/spice-gtk/spice-gtk-0.18.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.18.ebuild,v 1.5 2013/09/12 22:33:54 mgorny Exp $
-
-EAPI=5
-GCONF_DEBUG="no"
-WANT_AUTOMAKE="1.12"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils python vala
-
-PYTHON_DEPEND="2"
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI."
-HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="dbus doc gstreamer gtk3 +introspection policykit pulseaudio
-python sasl smartcard static-libs usbredir vala"
-
-REQUIRED_USE="?? ( pulseaudio gstreamer )"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="pulseaudio? ( media-sound/pulseaudio[glib] )
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10 )
-	>=x11-libs/pixman-0.17.7
-	>=media-libs/celt-0.5.1.1:0.5.1
-	dev-libs/openssl
-	gtk3? ( x11-libs/gtk+:3[introspection?] )
-	x11-libs/gtk+:2[introspection?]
-	>=dev-libs/glib-2.26:2
-	>=x11-libs/cairo-1.2
-	virtual/jpeg
-	sys-libs/zlib
-	dbus? ( dev-libs/dbus-glib )
-	introspection? ( dev-libs/gobject-introspection )
-	python? ( dev-python/pygtk:2 )
-	sasl? ( dev-libs/cyrus-sasl )
-	smartcard? ( app-emulation/libcacard )
-	usbredir? (
-		sys-apps/hwids
-		>=sys-apps/usbredir-0.4.2
-		virtual/libusb:1
-		virtual/udev[gudev]
-		policykit? (
-			sys-apps/acl
-			>=sys-auth/polkit-0.101 )
-		)"
-DEPEND="${RDEPEND}
-	>=app-emulation/spice-protocol-0.10.1
-	dev-lang/python
-	dev-python/pyparsing
-	dev-perl/Text-CSV
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-# Hard-deps while building from git:
-# dev-lang/vala:0.14
-# dev-lang/perl
-
-GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
-GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	mkdir ${GTK2_BUILDDIR} || die
-	mkdir ${GTK3_BUILDDIR} || die
-
-	epatch \
-		"${FILESDIR}/0.12-parallel-install.patch"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	local audio="no"
-
-	use gstreamer && audio="gstreamer"
-	use pulseaudio && audio="pulse"
-
-	if use vala ; then
-		# force vala regen for MinGW, etc
-		rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
-	fi
-
-	myconf="
-		$(use_enable static-libs static) \
-		$(use_enable introspection) \
-		--with-audio=${audio} \
-		$(use_with python) \
-		$(use_with sasl) \
-		$(use_enable smartcard) \
-		$(use_enable usbredir) \
-		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
-		$(use_with usbredir usb-acl-helper-dir /usr/libexec) \
-		$(use_enable policykit polkit) \
-		$(use_enable vala) \
-		$(use_enable dbus) \
-		--disable-werror \
-		--enable-pie"
-
-	cd ${GTK2_BUILDDIR}
-	echo "Running configure in ${GTK2_BUILDDIR}"
-	ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
-		--with-gtk=2.0 \
-		${myconf}
-
-	if use gtk3; then
-		cd ${GTK3_BUILDDIR}
-		echo "Running configure in ${GTK3_BUILDDIR}"
-		ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
-			--with-gtk=3.0 \
-			${myconf}
-	fi
-}
-
-src_compile() {
-	cd ${GTK2_BUILDDIR}
-	einfo "Running make in ${GTK2_BUILDDIR}"
-	default
-
-	if use gtk3; then
-		cd ${GTK3_BUILDDIR}
-		einfo "Running make in ${GTK3_BUILDDIR}"
-		default
-	fi
-}
-
-src_test() {
-	cd ${GTK2_BUILDDIR}
-	einfo "Running make check in ${GTK2_BUILDDIR}"
-	default
-
-	if use gtk3; then
-		cd ${GTK3_BUILDDIR}
-		einfo "Running make check in ${GTK3_BUILDDIR}"
-		default
-	fi
-}
-
-src_install() {
-	cd ${GTK2_BUILDDIR}
-	einfo "Running make check in ${GTK2_BUILDDIR}"
-	default
-
-	if use gtk3; then
-		cd ${GTK3_BUILDDIR}
-		einfo "Running make install in ${GTK3_BUILDDIR}"
-		default
-	fi
-
-	# Remove .la files if they're not needed
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -exec rm -f '{}' + || die
-	fi
-
-	use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la
-	use doc || rm -rf "${ED}/usr/share/gtk-doc"
-
-	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-}
diff --git a/net-misc/spice-gtk/spice-gtk-0.20.ebuild b/net-misc/spice-gtk/spice-gtk-0.21.ebuild
index c9d9d89f6625..7fd45d35fb79 100644
--- a/net-misc/spice-gtk/spice-gtk-0.20.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.20.ebuild,v 1.5 2013/09/12 22:33:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.21.ebuild,v 1.1 2013/09/19 16:21:23 cardoe Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -20,7 +20,7 @@ HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
 LICENSE="LGPL-2.1"
 SLOT="0"
 SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="dbus doc gstreamer gtk3 +introspection policykit pulseaudio
 python sasl smartcard static-libs usbredir vala"
 
@@ -57,7 +57,8 @@ RDEPEND="${PYTHON_DEPS}
 		virtual/udev[gudev]
 		policykit? (
 			sys-apps/acl
-			>=sys-auth/polkit-0.101 )
+			>=sys-auth/polkit-0.110-r1
+			!~sys-auth/polkit-0.111 )
 		)"
 DEPEND="${RDEPEND}
 	dev-lang/python