Version bump, no longer connects to Flickr without permission (bug #438722, CVE-2012-4511, thanks to Agostino Sarubbo). Drop useless USE=doc, it only regenerated documentation. Use vala.eclass.

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

5 files changed, 155 insertions, 11 deletions

diff --git a/net-libs/libsocialweb/ChangeLog b/net-libs/libsocialweb/ChangeLog
index b91dc6bd4636..c84a89abd01d 100644
--- a/net-libs/libsocialweb/ChangeLog
+++ b/net-libs/libsocialweb/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/libsocialweb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsocialweb/ChangeLog,v 1.12 2012/09/23 06:14:45 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsocialweb/ChangeLog,v 1.13 2012/10/20 03:01:33 tetromino Exp $
+
+*libsocialweb-0.25.21 (20 Oct 2012)
+
+  20 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libsocialweb-0.25.20.ebuild, +libsocialweb-0.25.21.ebuild,
+  +files/libsocialweb-0.25.21-gmodule.patch:
+  Version bump, no longer connects to Flickr without permission (bug #438722,
+  CVE-2012-4511, thanks to Agostino Sarubbo). Drop useless USE=doc, it only
+  regenerated documentation. Use vala.eclass.
 
   23 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
   libsocialweb-0.25.20.ebuild:
diff --git a/net-libs/libsocialweb/Manifest b/net-libs/libsocialweb/Manifest
index fa11efaff6e0..d9df6eb4f03f 100644
--- a/net-libs/libsocialweb/Manifest
+++ b/net-libs/libsocialweb/Manifest
@@ -3,14 +3,21 @@ Hash: SHA256
 
 AUX libsocialweb-0.25.20-gold.patch 5004 SHA256 c61af2d8855e44bdb4e54ebfff874e53d5d7af5ea304a5e8983b2f0a02a71f4d SHA512 b25e77bb6797298536fb11af57ddf1491e70dee9698ee1fb43c7341801f9d30d2c681ff712ecea4d89669da1c6135c6c6c9ba78f93a640b92e614b7f79c7e0ff WHIRLPOOL 066cbd90eb23f18e9c10a7bbe506bab7b4c6913743e475d8488facf6f42a050d57861f3cd15cf914216701adbb671d71ec9d0665e2266267d7a1308610510b77
 AUX libsocialweb-0.25.20-introspection-annotations.patch 3152 SHA256 fec8d2c67c62618b89dca238ebe502c6525d42987625b6d87dd704f88219a46a SHA512 aad78b04fc850babff31a2b88e019d40642ffb838b54e891b0ebc33f07d5acd75b4bf257aee9cfee340180687ef23c0a07327f4003a09f1981d1f7728ef5ff82 WHIRLPOOL a3676fbc8f0399bdeaaeaa2d428d5c18370146d7912a6cf85053efc4f56b13464072a4a998b9c2fe96d0ed252b784428a56ecfeae09e64db84158452e13aabf7
+AUX libsocialweb-0.25.21-gmodule.patch 1824 SHA256 2f3dd7ddcd3daf807b17f18f0ac24130b513be0e09c05b20959c111923b1e6cb SHA512 99505faa240a415f2c275671f557dbf0bb3be88854ccd7631a7c1ab82b2d097178bef39d8a633a92894a7ea849c0ccf3f96bcac58de5db26224b940de3395c21 WHIRLPOOL d8f555923da6bb5a762a045a8f43f1cfc1e31c3364582c5f40808167171465abca8c39597d4e2298b5c0ea3e4a75569e431860ae0771c7a8967632713a2b99c5
 DIST libsocialweb-0.25.20.tar.xz 471464 SHA256 eb0078f44eb5fc4570fcee26c5670a433ca1bb83be0cead421a4a03e7d838ff5 SHA512 f10899e24a5127d63f46f07fffb32235209188aac0100f4756a077ed9cf74b928d0edcb7359fc606e0d6301c5ab2d79a525f1dfddf730250e31b5b30f3ef1544 WHIRLPOOL 3f456e189f604f125c7de71936f24b23ba00a25459f8b7112f24848a0179d36f92aa8f81107bf5f8f44b50a9523625ce1a61b4aa3058b047e7b1cdc1b0cd614d
-EBUILD libsocialweb-0.25.20.ebuild 2255 SHA256 9fa3dca6f1059398d7b1601aabe63ddf5c831da32eeb1037e2dfab33349b27db SHA512 d8fa1af54673dcb1106492dc1468e264569bd98df8fe23b4bc813385701c60be8cc2db48ff03f0076f5d8bf85a445a10f410b6f5a6eb5c3b750975a7aea132a6 WHIRLPOOL 065bd3e0d0297013c9e1373f174c6139f8e2e05926b7a0666da1df92cadef7cb663697e67257c3f996ef071a99dab5b3e119d6983bbad0edb5ca29ed3ec64e59
-MISC ChangeLog 2420 SHA256 7fcba91b2db76db0541e287d4401e21e02c602ca1b154f9ecedf8d699c393748 SHA512 7c1e24fb8296642be3938674221df429d8dd673a99d6491e26c9eafd430ea89bcbf45bcd04bc28eae869555c48e2bd4db2954430726101f76d3a664fd7b4aaf9 WHIRLPOOL c676963c385dbc9d002a0d0a97ae1c4059f413d423535fc8d64e839706bfff2223788df69d1abb445dcbab8f9eeba025ad6b6bd88fd39b830319e6b26ab74b41
+DIST libsocialweb-0.25.21.tar.xz 472152 SHA256 f676567640cede66b6ff62f440c968943c2f3a164dd5f26155b6154ab93bf687 SHA512 8ee8885d02327c685397f5df899ce807400e94b7e5d80f7d00ad43955f765ca6c12ac077cc0a10d9fc9d601feaf8fa609a71daa6779f8b1dd1969916afe829dd WHIRLPOOL f1b7c588a89526f6bfdc79a68e4b54f78f5899715fb0eab26fea70d1fad79a236ce71b9b207bb9559276f4c87186f77fbd58d6425acb5528b130028210376792
+EBUILD libsocialweb-0.25.20.ebuild 2197 SHA256 8bbf91ce14100c130d4438463c57154207327959bf623cdd4f40bf1ff3eeea48 SHA512 d28e3c93a7124542d10a71dcc9476cd4912c51736de98412615a333f9d566d408cc48583a8f66532541340fcd969e1c0df72f04c977278e503741b8a0fb8688d WHIRLPOOL 62baad08182d58d9faa0dbbcb8cbc8ed3c2b4bb780d56b2ed10e56e9e2acd765cd546d86246a872cb96ad00c178f4d2472fb2a32b1c839967dbb0278875f4c28
+EBUILD libsocialweb-0.25.21.ebuild 2296 SHA256 3f81bbb42fca4b1bad7489890b77dd9eba45e06f64deb1b3ccdaebf1ad3d86df SHA512 fead449b2c305ecd34e1caba8dedefeab3ec87f49a042110a4691b1add13b4ccf391cae648e449cd7558d81e63be28eebb76a393dd5c0c0973fc8d1f396fb39e WHIRLPOOL 040df121ac38e32d18773442734ddc9930e5d1db1dfec3cb167a778fcafdff63be2c23f1ff093e33ee378674d73feefd1f02f70b3ab2fd484e491ad08dfc585f
+MISC ChangeLog 2824 SHA256 ea39eb00aab70ed27e7db6d9246dbda91f44d97384082d39836fe73bf87c4618 SHA512 d43be8b71acfcc5c9253728898183e99dfe75e1d86936c05e12c18bbf7ad39f66142a837b236e250e2af6d7f5b455f5abcd0d00b5f7789b7f8e06588733de0d4 WHIRLPOOL f1481772fd3d207d377fb3c9e4a1f8340db1e15b7e56c1c5bdaa2d2c5f48bb6ed7998206ddf04ab7bc755b12ac1876b554d86746d81a3b153f346043645fb3aa
 MISC metadata.xml 556 SHA256 105ea0ba3827c13d8e3feea95034e64d682ecf6a3f17e62a396873a79fa32e18 SHA512 cfdff39a285a9163cdcad3bc007b4ce45ee18fe05e3150bfce29d6c2412915ec6e2a23c981d98a72bee28ba3f2c028347d0fd8f8f201a7dbddb548d3db509db8 WHIRLPOOL 225b12d5556c9c20cb5e989ca2d29c0b0319cb4faee5aa4a1fb51fbc507d572d0e6d3a1ddf6e9bd331d037db71e5edfa875520f8a94aa347d7b27eba771d06f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBeqNsACgkQl5yvQNBFVTUz5QCdFoyqWbgTXUumtoWv3yYhvinE
-HK8An293Vb40WpT40ndxfihJ/0ZtPeGz
-=uv+E
+iQEcBAEBCAAGBQJQghQPAAoJEJ0WA1zPCt1hsKIIAKmit1SATrCTAWpUN6FdXIXO
+qIOcfs5Gr9zffzYqZ040msbb7GposBkKzHV1tp4kik3KObkKqHLhari5v1799G6L
+vRrzV6CQNK8IbNF8VyQfzJWVPDW6GEDeqsKaSEIkov0jY43ORmql5VkwNk4/MNiP
+wwUw9K0lM2joqxBRXbMXx+C4nNa9egpynVM1C8uZsW5zgxzqCFq47bVfws74cWyG
+cx3ifYch+EEqnDE/AUauQpeYuqvgEZJqQG8r+lsWp5xrgLuxulIptI7a0p02WxTp
+jHMAgPhSZ44d+FS1RYTBZixKCsa8assKts3CP50KqyIRNzbAY1TF+OaiYBIRRd8=
+=107U
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsocialweb/files/libsocialweb-0.25.21-gmodule.patch b/net-libs/libsocialweb/files/libsocialweb-0.25.21-gmodule.patch
new file mode 100644
index 000000000000..e30d66f48f43
--- /dev/null
+++ b/net-libs/libsocialweb/files/libsocialweb-0.25.21-gmodule.patch
@@ -0,0 +1,48 @@
+From 29d049bf2ea710fde880f23a9613d1071de83e7e Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 19 Oct 2012 21:46:28 -0400
+Subject: [PATCH] build: explicitly check for and link to gmodule
+
+Needed to prevent underlinking failure with ld.gold and recent versions
+of libsocialweb's dependencies.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686503
+---
+ configure.ac             | 1 +
+ libsocialweb/Makefile.am | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index af23ac2..b9a8f74 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,6 +65,7 @@ GOBJECT_INTROSPECTION_CHECK([0.9.6])
+ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.14)
+ PKG_CHECK_MODULES(GIO, gio-2.0)
+ PKG_CHECK_MODULES(GOBJECT, gobject-2.0 >= 2.14)
++PKG_CHECK_MODULES(GMODULE, gmodule-2.0)
+ PKG_CHECK_MODULES(GCONF, gconf-2.0)
+ PKG_CHECK_MODULES(SOUP, libsoup-2.4 gthread-2.0)
+ PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1)
+diff --git a/libsocialweb/Makefile.am b/libsocialweb/Makefile.am
+index fa7d88b..57d0d34 100644
+--- a/libsocialweb/Makefile.am
++++ b/libsocialweb/Makefile.am
+@@ -10,12 +10,12 @@ libsocialweb_ladir = $(pkgincludedir)/libsocialweb
+ libsocialweb_la_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/interfaces \
+ 		     $(DBUS_GLIB_CFLAGS) $(SOUP_CFLAGS) $(SOUP_GNOME_CFLAGS) \
+ 		     $(NM_CFLAGS) $(GTK_CFLAGS) $(REST_CFLAGS) \
+-		     $(GCOV_CFLAGS) \
++		     $(GMODULE_CFLAGS) $(GCOV_CFLAGS) \
+ 		     -DSOCIALWEB_SERVICES_MODULES_DIR=\"$(servicesdir)\"
+ 
+ libsocialweb_la_LIBADD = $(DBUS_GLIB_LIBS) $(SOUP_LIBS) $(SOUP_GNOME_LIBS) \
+ 		      $(NM_LIBS) $(GTK_LIBS) $(REST_LIBS) \
+-		      $(GCOV_LDFLAGS) \
++		      $(GMODULE_LIBS) $(GCOV_LDFLAGS) \
+ 		      $(top_builddir)/interfaces/libsocialweb-ginterfaces.la
+ 
+ libsocialweb_la_SOURCES = sw-types.h \
+-- 
+1.7.12.3
+
diff --git a/net-libs/libsocialweb/libsocialweb-0.25.20.ebuild b/net-libs/libsocialweb/libsocialweb-0.25.20.ebuild
index 1549262c4c5d..71e9398ea59b 100644
--- a/net-libs/libsocialweb/libsocialweb-0.25.20.ebuild
+++ b/net-libs/libsocialweb/libsocialweb-0.25.20.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-libs/libsocialweb/libsocialweb-0.25.20.ebuild,v 1.8 2012/09/23 06:14:45 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsocialweb/libsocialweb-0.25.20.ebuild,v 1.9 2012/10/20 03:01:33 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ HOMEPAGE="http://git.gnome.org/browse/libsocialweb"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="doc connman +gnome +introspection +networkmanager vala"
+IUSE="connman +gnome +introspection +networkmanager vala"
 
 # NOTE: coverage testing should not be enabled
 RDEPEND=">=dev-libs/glib-2.14:2
@@ -36,9 +36,6 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
 	sys-devel/gettext
-	doc? (
-		dev-libs/libxslt
-		>=dev-util/gtk-doc-1.15 )
 	vala? (
 		>=dev-lang/vala-0.10.0:0.12[vapigen]
 		>=dev-libs/gobject-introspection-0.9.6 )"
diff --git a/net-libs/libsocialweb/libsocialweb-0.25.21.ebuild b/net-libs/libsocialweb/libsocialweb-0.25.21.ebuild
new file mode 100644
index 000000000000..9c76155137a8
--- /dev/null
+++ b/net-libs/libsocialweb/libsocialweb-0.25.21.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsocialweb/libsocialweb-0.25.21.ebuild,v 1.1 2012/10/20 03:01:33 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2"
+VALA_MIN_API_VERSION="0.12"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools eutils gnome2 python vala
+
+DESCRIPTION="Social web services integration framework"
+HOMEPAGE="http://git.gnome.org/browse/libsocialweb"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="connman +gnome +introspection +networkmanager vala"
+
+# NOTE: coverage testing should not be enabled
+RDEPEND=">=dev-libs/glib-2.14:2
+	>=net-libs/rest-0.7.10
+
+	gnome-base/gconf:2
+	gnome-base/libgnome-keyring
+	dev-libs/dbus-glib
+	dev-libs/json-glib
+	net-libs/libsoup:2.4
+
+	gnome? ( >=net-libs/libsoup-gnome-2.25.1:2.4 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+	networkmanager? ( net-misc/networkmanager )
+	!networkmanager? ( connman? ( net-misc/connman ) )"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.15
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )"
+
+# Introspection is needed for vala bindings
+REQUIRED_USE="vala? ( introspection )"
+
+pkg_setup() {
+	# TODO: enable sys-apps/keyutils support (--without-kernel-keyring)
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-gcov
+		--without-kernel-keyring
+		--enable-all-services
+		$(use_enable introspection)
+		$(use_enable vala vala-bindings)
+		$(use_with gnome)
+		--with-online=always"
+
+	# NetworkManager always overrides connman support
+	use connman && G2CONF="${G2CONF} --with-online=connman"
+	use networkmanager && G2CONF="${G2CONF} --with-online=networkmanager"
+
+	DOCS="AUTHORS README TODO"
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Sent upstream, gnome bug 677445
+	epatch "${FILESDIR}"/${PN}-0.25.20-gold.patch
+	# https://bugzilla.gnome.org/show_bug.cgi?id=686503 
+	epatch "${FILESDIR}"/${PN}-0.25.21-gmodule.patch
+
+	# Fix namespacing of introspection annotations, bug #426984
+	epatch "${FILESDIR}"/${PN}-0.25.20-introspection-annotations.patch
+
+	eautoreconf
+
+	gnome2_src_prepare
+	use vala && vala_src_prepare
+
+	python_convert_shebangs 2 "${S}/tools/glib-ginterface-gen.py"
+}