commit: 86bbe182a9624c098a1648453a71c1657b79239a
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 11 18:45:49 2021 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Nov 11 18:46:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86bbe182
net-libs/libsoup: bump to 3.0.2
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
net-libs/libsoup/Manifest | 2 +-
net-libs/libsoup/files/3.0.2-fix-leak.patch | 24 ++++++++++++++++++++++
...{libsoup-2.99.9.ebuild => libsoup-3.0.2.ebuild} | 8 ++++----
3 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 5bfb22929de..eeda67948b9 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,4 +1,4 @@
DIST libsoup-2.72.0.tar.xz 1477940 BLAKE2B
e63a26aa29a4a34c4e4b0a2713818db52b206b04b56d99391648351f87a62dc3455020e8eb0312ef17b2b7d047a7d5731905ecc214085afd4eff25fefa30782b
SHA512
ca16772d0d318c4be0c4859db1e32baffa2231b4732f3bf9814aa405febde86395a0fb8bfa1635d70a7b5853d2567403920b9b0d0f5c3c179294352af27e91de
DIST libsoup-2.74.0.tar.xz 1498224 BLAKE2B
c03b817a7a7f708480581aad258e5e24c541c6c2f39e48c51597d67c729b3a0722ef094916ad841904a0cafc67f12ad20d05b74ac41aeb174cb79b49fdd0977e
SHA512
d78374c31631d7d1fb30ceb7c6016ab970cb321b06191d3463f178ceea9dacd08c828b8f16f5a30c185489ebfbc93ff9da09ae4978be3e3ff11bf7ee95a2a9a6
DIST libsoup-2.74.1.tar.xz 1496188 BLAKE2B
6f15415d5d4d68fa1f7167363cbed77dee9d4feea226357389209c96367c27c554fdc81fa25bcc8ce02290d6781dc2cc99298342349aada9ad9e32a10727c641
SHA512
107726e069becc0a79904905a10a0ceb0c010fcae57ee86fbb838e6edf58abfc464c8e6c3afb610e495d9c2a24ec6b4ba4c023921611642a9d3c89627daa154b
-DIST libsoup-2.99.9.tar.xz 1514372 BLAKE2B
c7c708e477e38fa03d19e3a35eb99a6183774275ed0e2c00a1c62c238ca932e62aa71713386010b36a3c7aac1c78ebc3555635a2e2db4c68406e25510432db62
SHA512
77fff5c4d72bd5acad5b9b4a312cc999b960d6eb7e4715cdd2571859a0ee888988fee12bd46684ca948993a2308f10def1141fe3e3137ac9cce68190222ee858
+DIST libsoup-3.0.2.tar.xz 1518728 BLAKE2B
17a476b08a78c06885de5bb63650b7232541bbb70aaa00a9ae67641b0a2d83fc726d8ef24c0c1cc1ca010b645e184bf7f17ced459d41e01a031712bf21108833
SHA512
0853d094555b3cff2a48f16ea1058ba55f9475ac1e0c1515792101e387596cdd8e3d69947eb4056b69b3cbee5d09111e99c3e684d207180d8e64b23a238f181f
diff --git a/net-libs/libsoup/files/3.0.2-fix-leak.patch
b/net-libs/libsoup/files/3.0.2-fix-leak.patch
new file mode 100644
index 00000000000..cad804a7a03
--- /dev/null
+++ b/net-libs/libsoup/files/3.0.2-fix-leak.patch
@@ -0,0 +1,24 @@
+From c7e251644c618ce5193881b2a16374ababc2ccf8 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <l...@gentoo.org>
+Date: Thu, 11 Nov 2021 16:47:34 +0200
+Subject: [PATCH] connection: Fix memory leak in new_tls_connection
+
+---
+ libsoup/soup-connection.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libsoup/soup-connection.c b/libsoup/soup-connection.c
+index f2e35f47..38a91e46 100644
+--- a/libsoup/soup-connection.c
++++ b/libsoup/soup-connection.c
+@@ -585,6 +585,7 @@ new_tls_connection (SoupConnection *conn,
+ "advertised-protocols",
advertised_protocols->pdata,
+ NULL);
+
++ g_object_unref (tls_interaction);
+ g_ptr_array_unref (advertised_protocols);
+
+ if (!tls_connection)
+--
+2.32.0
+
diff --git a/net-libs/libsoup/libsoup-2.99.9.ebuild
b/net-libs/libsoup/libsoup-3.0.2.ebuild
similarity index 93%
rename from net-libs/libsoup/libsoup-2.99.9.ebuild
rename to net-libs/libsoup/libsoup-3.0.2.ebuild
index 9c73bf6e987..42bc6d7a296 100644
--- a/net-libs/libsoup/libsoup-2.99.9.ebuild
+++ b/net-libs/libsoup/libsoup-3.0.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.54" # requires gio-2.0.vapi generated from glib-2.70+
inherit gnome.org meson-multilib vala xdg
@@ -19,10 +19,9 @@ REQUIRED_USE="vala? ( introspection )"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390
~sparc ~x86"
DEPEND="
- >=dev-libs/glib-2.69.0:2[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.69.1:2[${MULTILIB_USEDEP}]
net-libs/nghttp2:=[${MULTILIB_USEDEP}]
>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] )
>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
@@ -42,7 +41,7 @@ BDEPEND="
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
vala? ( $(vala_depend) )
- test? ( net-libs/gnutls[pkcs11] )
+ test? ( >=net-libs/gnutls-3.6.0[pkcs11] )
"
# test? (
www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
#
apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
@@ -52,6 +51,7 @@ BDEPEND="
# net-libs/glib-networking[ssl])"
PATCHES=(
+ "${FILESDIR}"/${PV}-fix-leak.patch
# Disable apache tests until they are usable on Gentoo, bug #326957
"${FILESDIR}"/disable-apache-tests.patch
)
