From 157c2a0f2811a136831939fc71cf1fe4e110238d Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Thu, 28 Jul 2011 18:33:02 +0000 Subject: [PATCH] Version bump: fix CVE-2011-2524 and memleak. Remove old. Package-Manager: portage-2.1.10.7/cvs/Linux x86_64 --- net-libs/glib-networking/Manifest | 18 +- net-libs/libsoup-gnome/ChangeLog | 9 +- .../libsoup-gnome-2.30.1-system-lib.patch | 255 ------------------ .../libsoup-gnome/libsoup-gnome-2.30.2.ebuild | 66 ----- ...4.1.ebuild => libsoup-gnome-2.34.3.ebuild} | 6 +- net-libs/libsoup/ChangeLog | 9 +- .../files/libsoup-2.30.2-disable-tls1.2.patch | 31 --- net-libs/libsoup/libsoup-2.30.2-r1.ebuild | 73 ----- ...up-2.34.1.ebuild => libsoup-2.34.3.ebuild} | 8 +- 9 files changed, 29 insertions(+), 446 deletions(-) delete mode 100644 net-libs/libsoup-gnome/files/libsoup-gnome-2.30.1-system-lib.patch delete mode 100644 net-libs/libsoup-gnome/libsoup-gnome-2.30.2.ebuild rename net-libs/libsoup-gnome/{libsoup-gnome-2.34.1.ebuild => libsoup-gnome-2.34.3.ebuild} (87%) delete mode 100644 net-libs/libsoup/files/libsoup-2.30.2-disable-tls1.2.patch delete mode 100644 net-libs/libsoup/libsoup-2.30.2-r1.ebuild rename net-libs/libsoup/{libsoup-2.34.1.ebuild => libsoup-2.34.3.ebuild} (86%) diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest index a88bdb729f9b..7f40f6636bb4 100644 --- a/net-libs/glib-networking/Manifest +++ b/net-libs/glib-networking/Manifest @@ -1,20 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 -DIST glib-networking-2.28.5.tar.bz2 318064 RMD160 e4da3f1132c24729a5347c21c6083f3c5f443e4f SHA1 b1477eed8596dca9e21b670bdddabac491391cef SHA256 959ffeb91fee17c1b0fb2aa82872c3daae0230de93708b2ebabeb92b747d7876 -DIST glib-networking-2.28.6.1.tar.bz2 318400 RMD160 99623984bc55fdc83e6576f78258c305a844364c SHA1 15cac2b3ca486fe568f551ec4c05e7e594861cc0 SHA256 50f9aac36ce49b0e16f84a9f516cf59d0a1f9b3199634787fd9db7470ab6c65b DIST glib-networking-2.28.7.tar.bz2 319260 RMD160 059f5956c96de586db6f457d52909420b0a86f7d SHA1 711d548a88dffb4c3be7ffa1d515ef3efccedc62 SHA256 98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c -EBUILD glib-networking-2.28.5.ebuild 1042 RMD160 f2a302b988158addc98460d000e70cc5db179582 SHA1 d82a52568abd12a15722235cc31fb0e1284b282b SHA256 95e43f09e2ab7a4166c0b018b83fa06166e29b50200fd916d6a0ff098537ba11 -EBUILD glib-networking-2.28.6.1.ebuild 1140 RMD160 90ead0804f0f27ea7075daf5611dab898d3fae19 SHA1 d5faa2406e71d603c6444c1a3c08dfe87613ba1b SHA256 e4d49747fa2f642e793588401dd2f7d33929ef879c748a5c776ee42085bdeb19 -EBUILD glib-networking-2.28.7.ebuild 1169 RMD160 35968d0d408f64f9e523a8b2ea701f8b7755359c SHA1 2a91e0cf5f07fcf606b94da9acf092450f845fc5 SHA256 4d32233db19d0d2333a7b994063467eaa4cc3db29dea8acd327f1b785aaf4e52 -MISC ChangeLog 1877 RMD160 d8b2588824ee569d3d4f6c76d8572619433dfa5d SHA1 ff8d24244dc2a9e1815882f94b94efae312b145d SHA256 903cc24193a86ce64c1a4b9634d07af0c5d892d94c32794c6a5c960b1b8779dc +EBUILD glib-networking-2.28.7.ebuild 1167 RMD160 237506d86ce3f5c61d8c4a68a9414ef34f579251 SHA1 a6d3fe5e0f365130715eb88a90199209b4ba1b61 SHA256 f19623443cbd485698d29cbec1fe26a4d800bf0a74ce9375412f9ec0849e8290 +MISC ChangeLog 2133 RMD160 193e12619fc5d698e7f32cce616bbcd52a183b04 SHA1 94335fe8c81c856cede217ed4af0c90c3b13b1b7 SHA256 de10c0925c615a5f36b6e4f0764ed830532b2e6e8604b9e4dbaf8740c5c8ec93 MISC metadata.xml 395 RMD160 18bae0d230824208fc84fdad0c54b73e2e99eeeb SHA1 a07face2c8ec4a0b4bf04b18dbbd9b29a86f20b8 SHA256 a55b4f7f8a8d4bffa2ec51ee271f2f9360e8bafe955871a253f32c16911a395e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iJwEAQEIAAYFAk4gH3oACgkQIiMqcbOVdxSEbwP/Wg2nNT2d5zANuO2xcMtNgaAy -zLRqRwLs6hjD8K0XoB3qWMgQ9qgzIZPyhwg1O3YeF0MI+fUzhMzqg6GAqdAoqOGY -LUOJKQ/jJUsNYYH2yePoDZ/hcn47SZYFJ0q72P+ExqkA3+SdraxpZiFsYWCXSQnc -BpNLKRxEZBnPWaeQvPI= -=M/CI +iEYEARECAAYFAk4xrAsACgkQCaWpQKGI+9R8sQCfQ+yuzeT+0/GgV2GVY/yc0j7q +pQoAn3MTk2CQ/7CGHKcl3QMYzEC+/AI6 +=9oSc -----END PGP SIGNATURE----- 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 + -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 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 -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/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 similarity index 87% rename from net-libs/libsoup-gnome/libsoup-gnome-2.34.1.ebuild rename to 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} diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog index b43d7e72bd11..79aef6307aaa 100644 --- a/net-libs/libsoup/ChangeLog +++ b/net-libs/libsoup/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-libs/libsoup # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.256 2011/07/15 11:08:46 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.257 2011/07/28 18:30:39 pacho Exp $ + +*libsoup-2.34.3 (28 Jul 2011) + + 28 Jul 2011; Pacho Ramos -libsoup-2.30.2-r1.ebuild, + -files/libsoup-2.30.2-disable-tls1.2.patch, -libsoup-2.34.1.ebuild, + +libsoup-2.34.3.ebuild: + Version bump: fix CVE-2011-2524 and memleak. Remove old. 15 Jul 2011; Kacper Kowalik libsoup-2.34.2.ebuild: Marked ~ppc/~ppc64 wrt #365331 diff --git a/net-libs/libsoup/files/libsoup-2.30.2-disable-tls1.2.patch b/net-libs/libsoup/files/libsoup-2.30.2-disable-tls1.2.patch deleted file mode 100644 index d3cf218857b3..000000000000 --- a/net-libs/libsoup/files/libsoup-2.30.2-disable-tls1.2.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix for bug #307343 (GNOME bug #622857), disabling TLS1.2 ---- -From 01a43ad9824fba77384534c6d588e0e0d653986e Mon Sep 17 00:00:00 2001 -From: Dan Winship -Date: Tue, 29 Jun 2010 13:43:20 +0000 -Subject: Disable TLS 1.2 in addition to 1.0 and 1.1 - -Due to bug 581342 we want to only negotiate SSL 3.0. Previously we -were telling gnutls to not do TLS1.0 or TLS1.1, but that means with -newer versions of gnutls that support TLS1.2 it would try to negotiate -that instead and generally fail. Fix that by disabling TLS1.2 too -(which works fine even with gnutls versions that don't support TLS1.2 -yet). - -https://bugzilla.gnome.org/show_bug.cgi?id=622857 ---- -diff --git a/libsoup/soup-gnutls.c b/libsoup/soup-gnutls.c -index cb0fbe5..0b57f28 100644 ---- a/libsoup/soup-gnutls.c -+++ b/libsoup/soup-gnutls.c -@@ -477,7 +477,7 @@ soup_ssl_wrap_iochannel (GIOChannel *sock, gboolean non_blocking, - goto THROW_CREATE_ERROR; - - /* See http://bugzilla.gnome.org/show_bug.cgi?id=581342 */ -- if (gnutls_priority_set_direct (session, "NORMAL:!VERS-TLS1.1:!VERS-TLS1.0", NULL) != 0) -+ if (gnutls_priority_set_direct (session, "NORMAL:!VERS-TLS1.2:!VERS-TLS1.1:!VERS-TLS1.0", NULL) != 0) - goto THROW_CREATE_ERROR; - - if (gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, --- -cgit v0.8.3.1 diff --git a/net-libs/libsoup/libsoup-2.30.2-r1.ebuild b/net-libs/libsoup/libsoup-2.30.2-r1.ebuild deleted file mode 100644 index 0ea51e33f8ba..000000000000 --- a/net-libs/libsoup/libsoup-2.30.2-r1.ebuild +++ /dev/null @@ -1,73 +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/libsoup-2.30.2-r1.ebuild,v 1.11 2010/10/17 14:49:24 armin76 Exp $ - -EAPI="2" - -inherit autotools eutils gnome2 - -DESCRIPTION="An HTTP library implementation in C" -HOMEPAGE="http://www.gnome.org/" -SRC_URI="${SRC_URI} - mirror://gentoo/${PN}-2.30.1-build-gir-patches.tar.bz2" - -LICENSE="LGPL-2" -SLOT="2.4" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" -# Do NOT build with --disable-debug/--enable-debug=no - gnome2.eclass takes care of that -IUSE="debug doc +introspection gnome ssl" - -RDEPEND=">=dev-libs/glib-2.21.3 - >=dev-libs/libxml2-2 - introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) - ssl? ( >=net-libs/gnutls-2.1.7 )" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9 - >=dev-util/gtk-doc-am-1.10 - doc? ( >=dev-util/gtk-doc-1.10 )" -# test? ( -# www-servers/apache -# dev-lang/php -# net-misc/curl ) -PDEPEND="gnome? ( ~net-libs/${PN}-gnome-${PV} )" - -DOCS="AUTHORS NEWS README" - -pkg_setup() { - G2CONF="${G2CONF} - --disable-static - --without-gnome - $(use_enable introspection) - $(use_enable ssl)" -} - -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" - - # Patch *must* be applied conditionally (see patch for details) - if use doc; then - # Fix bug 268592 (build fails !gnome && doc) - epatch "${FILESDIR}/${PN}-2.30.1-fix-build-without-gnome-with-doc.patch" - fi - - if use introspection; then - epatch "${WORKDIR}/${PN}-2.30.1-build-gir-1.patch" - epatch "${WORKDIR}/${PN}-2.30.1-build-gir-2.patch" - fi - - # Fix for new versions of gnutls (bug #307343, GNOME bug #622857) - epatch "${FILESDIR}/${P}-disable-tls1.2.patch" - - eautoreconf -} diff --git a/net-libs/libsoup/libsoup-2.34.1.ebuild b/net-libs/libsoup/libsoup-2.34.3.ebuild similarity index 86% rename from net-libs/libsoup/libsoup-2.34.1.ebuild rename to net-libs/libsoup/libsoup-2.34.3.ebuild index 6f46af20c0c3..56b8ca109832 100644 --- a/net-libs/libsoup/libsoup-2.34.1.ebuild +++ b/net-libs/libsoup/libsoup-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/libsoup-2.34.1.ebuild,v 1.4 2011/06/11 15:59:13 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.34.3.ebuild,v 1.1 2011/07/28 18:30:39 pacho Exp $ -EAPI="3" +EAPI="4" GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" @@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/LibSoup" LICENSE="LGPL-2" SLOT="2.4" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="debug doc +introspection ssl test" RDEPEND=">=dev-libs/glib-2.27.5:2 @@ -61,7 +61,7 @@ src_prepare() { # Patch *must* be applied conditionally (see patch for details) if use doc; then # Fix bug 268592 (upstream #573685) (build fails without gnome && doc) - epatch "${FILESDIR}/${PN}-2.30.1-fix-build-without-gnome-with-doc.patch" + epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch" eautoreconf fi } -- 2.26.2