Bump, fixes information disclosure vulnerability (CVE-2012-2737, bug #424842). 0.6.22 is targeted for stabilization, and therefore has systemd support disabled, while 0.6.22-r10 has optional systemd support. Lower glib dependency to 2.30 (should work).

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

5 files changed, 151 insertions, 13 deletions

diff --git a/sys-apps/accountsservice/ChangeLog b/sys-apps/accountsservice/ChangeLog
index 984a78503174..d9f7419a6052 100644
--- a/sys-apps/accountsservice/ChangeLog
+++ b/sys-apps/accountsservice/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-apps/accountsservice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/ChangeLog,v 1.11 2012/07/03 06:19:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/ChangeLog,v 1.12 2012/07/05 05:50:59 tetromino Exp $
+
+*accountsservice-0.6.22-r10 (05 Jul 2012)
+*accountsservice-0.6.22 (05 Jul 2012)
+
+  05 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  accountsservice-0.6.21.ebuild, +accountsservice-0.6.22.ebuild,
+  +accountsservice-0.6.22-r10.ebuild:
+  Bump, fixes information disclosure vulnerability (CVE-2012-2737, bug
+  #424842). 0.6.22 is targeted for stabilization, and therefore has systemd
+  support disabled, while 0.6.22-r10 has optional systemd support. Lower glib
+  dependency to 2.30 (should work).
 
   03 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   accountsservice-0.6.21.ebuild:
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 100ab74b47ee..478c40f827dd 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -4,18 +4,21 @@ Hash: SHA1
 AUX accountsservice-0.6.21-gentoo-system-users.patch 1320 RMD160 02eb2193a8fd3b0ca86e7dca07b8d647ca6c2f3f SHA1 5d946ffdb03f7bec29bdaf6bd527f9d91a94a8ee SHA256 c8b8961cf9825c46c320237e0c48af5f253007de6499c4ac7da454c3f87ecf15
 DIST accountsservice-0.6.15.tar.xz 286480 RMD160 1552b4d217606c4f6e442dae77ec8d142edb199b SHA1 792760f220a4fd5fff26a250ebc0d8c33cf57dfd SHA256 9feb3d58c5c739f2df4b5410404b29f16e3f4aa6739b685ceb12903f4d5ea867
 DIST accountsservice-0.6.21.tar.xz 329916 RMD160 770e8f280f75efa3b60200c819ab82191c3f6270 SHA1 96c9216cab937d1d79faca998f4602dab248145a SHA256 adf681cef68852b65d57de7102483ef0cf31175ea0bbc3bad59957259dc64192
+DIST accountsservice-0.6.22.tar.xz 331028 RMD160 a965e9493b005ad887a236da41ba9927367e6c99 SHA1 3238f734a24ff3589747d263c1509dafad5d9f2c SHA256 851e05aa593cd8e3ed5c635a7fee3ffc0f418d3db2f28c5ebd6b7503294e3bdd
 EBUILD accountsservice-0.6.15.ebuild 1182 RMD160 1140e46faf08f9e3fc17fc5fd6817407fe5fdb0f SHA1 7cf52d78e4412b702ab7041380034c815f84bf3b SHA256 b783ec50ab10677db443330d24afe17ded8034803f3fe88684cab95f001f7989
-EBUILD accountsservice-0.6.21.ebuild 1855 RMD160 3ebfd7e21a86b2efa803ed40e280b90d8feee55b SHA1 3abf3f8541a6ed3ab80d1cb288c03855aaf36d72 SHA256 4d89effa059af12d5557e429ab4d5e3076f20965756e52b16159dd0c3a8810c5
-MISC ChangeLog 2480 RMD160 3bc4ab7e6dae86f63d384a80f3b03b39e0259632 SHA1 a4a4e2fab106a4d22d7bdf27eb5b271e103c3b1b SHA256 3a65ebdbe2757c2e44ac1262a867bd66429649b328f00c897a715898248b9f10
+EBUILD accountsservice-0.6.21.ebuild 1842 RMD160 eed6649be13fe188ddf4684563a16fada0e25195 SHA1 8cb06a97a8b66eb5bce9e8001090626f20183a9f SHA256 35ad74f634391820f1c29cf5b5c1ad03d1347f5b8f69d4a4c2be37d4f69cfad5
+EBUILD accountsservice-0.6.22-r10.ebuild 1846 RMD160 ae648938da2856848d9b736bda28fceeb9941503 SHA1 75ae66c01605fba6616c86c1f22b4eb9f29bf88c SHA256 88b105ae4a6bd91c4a82975f64252c6b12e4c4bc62c5094b0276b9ee2f80d69d
+EBUILD accountsservice-0.6.22.ebuild 1888 RMD160 600d0432efbda8992ed9460169bbc11d321994bc SHA1 ab1795c17e19381f627556b0632ff461c185bd70 SHA256 65cb90db88aa00d38fd0bc4155b3531062a15b18918f28ce0987909eec366676
+MISC ChangeLog 2985 RMD160 1517f23fe0375e5c0d425f864ee5f56274bbe180 SHA1 b2306cd11aa10c32a4fb43a889aa5614110f6736 SHA256 1740a9ebe856539bc7ca8e9d4d233aa92c50b0fa987ce204c96ad48de3a1e483
 MISC metadata.xml 477 RMD160 5bba86fd441efe22f42340735869d278bc8e5190 SHA1 827e6bf2f26e0bbf9964c61f57f81d570c1a1ad0 SHA256 cfe68d08f14d29166ff46c0e1187002e7c895307deab521b2b78637cbe45e8ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP8o8IAAoJEJ0WA1zPCt1hPcwH/3cDRovHxH81R6tbshc09YdB
-IN6mZwv9Qey27ns9E8MoXN2DU7S0N6SP3m8/NjlQO0w9mfu9lSI5Ix5Z/Q9TVdu/
-EWaGuM4NiwNT8C8sTAVSAS6665PEV6Wxi8j5XiW/3OzrEAI1Q94v1IhcLKKEjzkd
-rvNj+4fiHTomnHJoeMXOjwRCZLV2U6WH4B+Jqeq2fh4I4ExuKgFM2vt5chQIkjbD
-r8JOPxD1gHUHAzeFDrbn9aNaSq4z8BlwTE17LSY5gI7umTG/S46dt+Hi9th6UDs6
-0WPseVGQ3qKDoGtWOlkA4+kKT2Qjpyr94IY1bzSDqg9FkKWvi6XJe3H2J0IcddQ=
-=5wzT
+iQEcBAEBAgAGBQJP9StJAAoJEJ0WA1zPCt1hYQIIAKONu/0MNvvbkF0UeAZVH+h/
++Z32mrsXN+tNBxjQcw32FZiEjkMXn5pSNZ8oj9kAyybTznm5ZKPfkJUYvtq8UWNE
+8jg5ydutpnJF/hV9DHpqX9GKrADlRJWQmGgdAZi6OLAl9XKN30/uztW2RcEBVhQF
+X0AhP6iVSjLsk7TsUxUK4W1mekeeb/yDATqVHXDMDRSiPaxRCOi+824+SPG0v94j
+4MqKCKqY6zYzwB57C5ceceIViN53D3kqLsm46U7LfLTPKDzkmflrSLRwYa4+Q98O
+1lSHw5N1MG2C7RqeySaaX3zMH08tW63gEFKdwkGEQPK+q3T52JF53IAAJvW3ke0=
+=AfaO
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/accountsservice/accountsservice-0.6.21.ebuild b/sys-apps/accountsservice/accountsservice-0.6.21.ebuild
index aa8a2db56bbc..28ef5c99f619 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.21.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.21.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/sys-apps/accountsservice/accountsservice-0.6.21.ebuild,v 1.2 2012/07/03 06:19:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.21.ebuild,v 1.3 2012/07/05 05:50:59 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -17,8 +17,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~x86"
 IUSE="doc +introspection systemd vala"
 
-# Want glib-2.32 for generated bindings
-RDEPEND=">=dev-libs/glib-2.32:2
+# Want glib-2.30 for gdbus
+RDEPEND=">=dev-libs/glib-2.30:2
 	sys-auth/polkit
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
 	systemd? ( >=sys-apps/systemd-43 )
diff --git a/sys-apps/accountsservice/accountsservice-0.6.22-r10.ebuild b/sys-apps/accountsservice/accountsservice-0.6.22-r10.ebuild
new file mode 100644
index 000000000000..1d82c524f31e
--- /dev/null
+++ b/sys-apps/accountsservice/accountsservice-0.6.22-r10.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.22-r10.ebuild,v 1.1 2012/07/05 05:50:59 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 systemd
+
+DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
+HOMEPAGE="http://www.fedoraproject.org/wiki/Features/UserAccountDialog"
+SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~x86"
+IUSE="doc +introspection systemd vala"
+
+# Want glib-2.30 for gdbus
+RDEPEND=">=dev-libs/glib-2.30:2
+	sys-auth/polkit
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+	systemd? ( >=sys-apps/systemd-43 )
+	!systemd? ( sys-auth/consolekit )"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto )
+	vala? ( >=dev-lang/vala-0.16.1-r1:0.16[vapigen] )"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-more-warnings
+		--localstatedir=${EPREFIX}/var
+		--docdir=${EPREFIX}/usr/share/doc/${PF}
+		$(use_enable doc docbook-docs)
+		$(use_enable introspection)
+		$(use_enable vala)
+		$(use_enable systemd)
+		$(systemd_with_unitdir)"
+	DOCS="AUTHORS NEWS README TODO"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.6.21-gentoo-system-users.patch"
+	gnome2_src_prepare
+
+	# FIXME: write a sane version of vapigen.m4 that properly deals with
+	# versioned vapigen pkgconfig files, submit to vala upstream, and get
+	# ${PN} upstream to use it.
+	sed -e 's:vapigen_pkg_name=vapigen$:vapigen_pkg_name=vapigen-0.16:' \
+		-e 's: vapigen\([^a-z_-]\): $vapigen_pkg_name\1:' \
+		-i configure || die 'sed failed'
+}
diff --git a/sys-apps/accountsservice/accountsservice-0.6.22.ebuild b/sys-apps/accountsservice/accountsservice-0.6.22.ebuild
new file mode 100644
index 000000000000..bd610a4539bd
--- /dev/null
+++ b/sys-apps/accountsservice/accountsservice-0.6.22.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.22.ebuild,v 1.1 2012/07/05 05:50:59 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 systemd
+
+DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
+HOMEPAGE="http://www.fedoraproject.org/wiki/Features/UserAccountDialog"
+SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~x86"
+IUSE="doc +introspection vala" # systemd
+
+# Want glib-2.30 for gdbus
+RDEPEND=">=dev-libs/glib-2.30:2
+	sys-auth/polkit
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+	sys-auth/consolekit"
+#	systemd? ( >=sys-apps/systemd-43 )
+#	!systemd? ( sys-auth/consolekit )
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto )
+	vala? ( >=dev-lang/vala-0.16.1-r1:0.16[vapigen] )"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-more-warnings
+		--localstatedir=${EPREFIX}/var
+		--docdir=${EPREFIX}/usr/share/doc/${PF}
+		$(use_enable doc docbook-docs)
+		$(use_enable introspection)
+		$(use_enable vala)
+		$(systemd_with_unitdir)
+		--disable-systemd"
+#		$(use_enable systemd)
+	DOCS="AUTHORS NEWS README TODO"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.6.21-gentoo-system-users.patch"
+	gnome2_src_prepare
+
+	# FIXME: write a sane version of vapigen.m4 that properly deals with
+	# versioned vapigen pkgconfig files, submit to vala upstream, and get
+	# ${PN} upstream to use it.
+	sed -e 's:vapigen_pkg_name=vapigen$:vapigen_pkg_name=vapigen-0.16:' \
+		-e 's: vapigen\([^a-z_-]\): $vapigen_pkg_name\1:' \
+		-i configure || die 'sed failed'
+}