Version bump: fix CVE-2011-2524 and memleak. Remove old.

(Portage version: 2.1.10.7/cvs/Linux x86_64)

4 files changed, 11 insertions, 325 deletions

diff --git a/net-libs/libsoup-gnome/ChangeLog b/net-libs/libsoup-gnome/ChangeLog
index 302c6a524095..c94f06072a4e 100644
--- a/net-libs/libsoup-gnome/ChangeLog
+++ b/net-libs/libsoup-gnome/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libsoup-gnome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.54 2011/07/15 11:09:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.55 2011/07/28 18:33:02 pacho Exp $
+
+*libsoup-gnome-2.34.3 (28 Jul 2011)
+
+  28 Jul 2011; Pacho Ramos <pacho@gentoo.org>
+  -files/libsoup-gnome-2.30.1-system-lib.patch, -libsoup-gnome-2.30.2.ebuild,
+  -libsoup-gnome-2.34.1.ebuild, +libsoup-gnome-2.34.3.ebuild:
+  Version bump: fix CVE-2011-2524 and memleak. Remove old.
 
   15 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org>
   libsoup-gnome-2.34.2.ebuild:
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.30.1-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.30.1-system-lib.patch
deleted file mode 100644
index 4e6cf178c916..000000000000
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.30.1-system-lib.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-From 97871504515f029f004d032572b9ded0da2d948e Mon Sep 17 00:00:00 2001
-From: Arun Raghavan <ford_prefect@gentoo.org>
-Date: Sun, 20 Jun 2010 18:15:01 +0530
-Subject: [PATCH] Split support for libgnome-soup.
-
-Original patch by Romain Perier.
----
- Makefile.am         |   13 ++++++++++---
- configure.ac        |   49 ++++++++++++++++++++++++++++++++-----------------
- libsoup/Makefile.am |   49 +++++++++++++++++++++++++++++++++++++++----------
- 3 files changed, 81 insertions(+), 30 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 861daff..039fb80 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,12 @@
- ## Process this file with automake to produce Makefile.in
- ACLOCAL_AMFLAGS = -I m4
- 
--SUBDIRS = libsoup tests docs
-+SUBDIRS = libsoup
-+
-+if BUILD_LIBSOUP
-+SUBDIRS += tests docs
-+endif
-+
- 
- EXTRA_DIST =			\
- 	libsoup-2.4.pc.in	\
-@@ -14,8 +19,10 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
- 
- pkgconfigdir = $(libdir)/pkgconfig
- 
--pkgconfig_DATA = libsoup-2.4.pc
--
-+pkgconfig_DATA=
-+if BUILD_LIBSOUP
-+pkgconfig_DATA += libsoup-2.4.pc
-+endif
- if BUILD_LIBSOUP_GNOME
- pkgconfig_DATA += libsoup-gnome-2.4.pc
- endif
-diff --git a/configure.ac b/configure.ac
-index 275620d..d25875e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -72,6 +72,14 @@ dnl ***********************
- dnl *** Checks for glib ***
- dnl ***********************
- 
-+PKG_PROG_PKG_CONFIG
-+enable_ssl=no
-+AC_ARG_WITH(libsoup-system,
-+   AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
-+   [with_libsoup_system=$withval], [with_libsoup_system=no])
-+
-+if test "$with_libsoup_system" = "no"; then
-+
- AM_PATH_GLIB_2_0(2.21.3,,,gobject gthread gio)
- if test "$GLIB_LIBS" = ""; then
-    AC_MSG_ERROR(GLIB 2.21.3 or later is required to build libsoup)
-@@ -82,23 +90,6 @@ PKG_CHECK_MODULES(XML, libxml-2.0)
- AC_SUBST(XML_CFLAGS)
- AC_SUBST(XML_LIBS)
- 
--dnl ***********************
--dnl *** Check for Win32 ***
--dnl ***********************
--
--AC_MSG_CHECKING([for Win32])
--case "$host" in
--  *-*-mingw*)
--    os_win32=yes
--    CFLAGS="$CFLAGS -D_REENTRANT"
--    ;;
--  *)
--    os_win32=no
--    ;;
--esac
--AC_MSG_RESULT([$os_win32])
--AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
--
- dnl *******************
- dnl *** Misc checks ***
- dnl *******************
-@@ -135,8 +126,28 @@ AC_SUBST(LIBGNUTLS_CFLAGS)
- AC_SUBST(LIBGNUTLS_LIBS)
- AC_SUBST(SSL_REQUIREMENT)
- 
-+fi
-+
- dnl This is not supposed to be conditional, but...
- AM_CONDITIONAL(HAVE_SSL, test $enable_ssl != no)
-+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
-+
-+dnl ***********************
-+dnl *** Check for Win32 ***
-+dnl ***********************
-+
-+AC_MSG_CHECKING([for Win32])
-+case "$host" in
-+  *-*-mingw*)
-+    os_win32=yes
-+    CFLAGS="$CFLAGS -D_REENTRANT"
-+    ;;
-+  *)
-+    os_win32=no
-+    ;;
-+esac
-+AC_MSG_RESULT([$os_win32])
-+AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
- 
- 
- dnl *********************
-@@ -163,6 +174,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
- if test $with_gnome != no; then
- 	AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
- 
-+    if test $with_libsoup_system != no; then
-+       PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
-+    fi
-+
- 	PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0, :, [AC_MSG_ERROR(dnl
- [Could not find libproxy:
- 
-diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
-index 2e7c1fb..306ee8f 100644
---- a/libsoup/Makefile.am
-+++ b/libsoup/Makefile.am
-@@ -4,17 +4,18 @@ if OS_WIN32
- LIBWS2_32 = -lws2_32
- endif
- 
--INCLUDES = 				\
-+INCLUDES =
-+lib_LTLIBRARIES =
-+CLEANFILES =
-+
-+if BUILD_LIBSOUP
-+INCLUDES +=                \
- 	-DG_LOG_DOMAIN=\"libsoup\" 	\
- 	-I$(top_srcdir)			\
- 	$(SOUP_DEBUG_FLAGS)		\
- 	$(SOUP_MAINTAINER_FLAGS)	\
- 	$(GLIB_CFLAGS)			\
- 	$(XML_CFLAGS)			\
--	$(GCONF_CFLAGS)			\
--	$(LIBPROXY_CFLAGS)		\
--	$(SQLITE_CFLAGS)		\
--	$(GNOME_KEYRING_CFLAGS)		\
- 	$(LIBGCRYPT_CFLAGS)		\
- 	$(LIBGNUTLS_CFLAGS)
- 
-@@ -45,7 +46,7 @@ soup-enum-types.c: $(libsoupinclude_HEADERS)
- 
- BUILT_SOURCES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
- 
--CLEANFILES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
-+CLEANFILES += $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
- 
- libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
- 
-@@ -91,7 +92,7 @@ libsoupinclude_HEADERS =	\
- 	$(soup_headers)		\
- 	soup-enum-types.h
- 
--lib_LTLIBRARIES = libsoup-2.4.la
-+lib_LTLIBRARIES += libsoup-2.4.la
- 
- libsoup_2_4_la_LDFLAGS =	\
- 	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
-@@ -171,10 +172,18 @@ libsoup_2_4_la_SOURCES =		\
- 	soup-value-utils.c		\
- 	soup-xmlrpc.c
- 
-+endif
-+
- if BUILD_LIBSOUP_GNOME
- 
- libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
- 
-+INCLUDES += $(LIBSOUP_CFLAGS)  \
-+    $(GCONF_CFLAGS)     \
-+    $(LIBPROXY_CFLAGS)  \
-+    $(SQLITE_CFLAGS)    \
-+    $(GNOME_KEYRING_CFLAGS)
-+
- libsoupgnomeinclude_HEADERS =	\
- 	soup-cookie-jar-sqlite.h\
- 	soup-gnome.h		\
-@@ -182,16 +191,26 @@ libsoupgnomeinclude_HEADERS =	\
- 
- lib_LTLIBRARIES += libsoup-gnome-2.4.la
- 
--libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
-+if BUILD_LIBSOUP
-+   libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
-+else
-+  libsoup_gnome_2_4_la_LDFLAGS =        \
-+	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
-+endif
- 
- libsoup_gnome_2_4_la_LIBADD =		\
--	libsoup-2.4.la			\
- 	$(GLIB_LIBS)			\
- 	$(GCONF_LIBS)			\
- 	$(LIBPROXY_LIBS)		\
- 	$(SQLITE_LIBS)			\
- 	$(GNOME_KEYRING_LIBS)
- 
-+if BUILD_LIBSOUP
-+  libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
-+else
-+  libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
-+endif
-+
- libsoup_gnome_2_4_la_SOURCES =		\
- 	soup-cookie-jar-sqlite.c	\
- 	soup-gnome-features.c		\
-@@ -212,6 +231,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
- 
- if HAVE_INTROSPECTION
- 
-+if BUILD_LIBSOUP
-+
- # Core library
- gi_soup_files = \
- 	$(filter-out soup.h soup-enum-types.% soup-marshal.%,\
-@@ -231,13 +252,21 @@ Soup_2_4_gir_FILES = \
- 
- INTROSPECTION_GIRS += Soup-2.4.gir
- 
-+endif
-+
- if BUILD_LIBSOUP_GNOME
- 
-+if BUILD_LIBSOUP
-+SOUP_GIR = Soup-2.4.gir
-+else
-+SOUP_GIR =
-+endif
-+
- # GNOME extensions
- gi_soup_gnome_files = $(filter-out soup-gnome.h,\
- 		          $(libsoupgnomeinclude_HEADERS) \
- 	                  $(libsoup_gnome_2_4_la_SOURCES))
--SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
-+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR)
- SoupGNOME_2_4_gir_SCANNERFLAGS = --strip-prefix=soup
- SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
- SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES)
--- 
-1.7.1
-
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.30.2.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.30.2.ebuild
deleted file mode 100644
index 8b8d699a3890..000000000000
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.30.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.30.2.ebuild,v 1.10 2010/10/17 14:48:37 armin76 Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-MY_PN=${PN/-gnome}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="GNOME plugin for libsoup"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="${SRC_URI//-gnome}
-	mirror://gentoo/${MY_PN}-2.30.1-build-gir-patches.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2.4"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
-# Do NOT build with --disable-debug/--enable-debug=no - gnome2.eclass takes care of that
-IUSE="debug doc +introspection"
-
-RDEPEND="~net-libs/libsoup-${PV}
-	|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
-	net-libs/libproxy
-	>=gnome-base/gconf-2
-	dev-db/sqlite:3
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1.10 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable introspection)
-		--with-libsoup-system
-		--with-gnome"
-	DOCS="AUTHORS NEWS README"
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-	gnome2_src_configure
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix test to follow POSIX (for x86-fbsd)
-	# No patch to prevent having to eautoreconf
-	sed -e 's/\(test.*\)==/\1=/g' -i configure.ac configure || die "sed failed"
-
-	# Unconditionally apply so the next patch applies
-	epatch "${WORKDIR}/${MY_PN}-2.30.1-build-gir-1.patch"
-	epatch "${WORKDIR}/${MY_PN}-2.30.1-build-gir-2.patch"
-
-	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-2.30.1-system-lib.patch
-	eautoreconf
-}
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.34.1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.34.3.ebuild
index 4a74a2607c2e..05f2c01ccbda 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.34.1.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.34.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.34.1.ebuild,v 1.4 2011/06/11 16:00:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.34.3.ebuild,v 1.1 2011/07/28 18:33:02 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
@@ -17,7 +17,7 @@ SRC_URI="${SRC_URI//-gnome}"
 
 LICENSE="LGPL-2"
 SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
 IUSE="debug doc +introspection"
 
 RDEPEND="~net-libs/libsoup-${PV}