gentoo resync : 13.11.2021

4 files changed, 124 insertions, 6 deletions

diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index f845a7fed0a9..3ee65360c6dd 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,8 +1,11 @@
+AUX 3.0.2-fix-leak.patch 797 BLAKE2B 9c4adbb52f79a84dd9e31c2473c502f55b0c33f10a8a18754bd36d83a3290b93bff918780bd7ff1ef70befb1f597736b4ca049d373a0b86d6ddaa800a7d7ab6e SHA512 b89195e2a886d0f0e8d324439f327bb9711294dce244c696313704fa9d2c6726063b9bc8f0239fde099106b97bbb0d7307ad6f5a004ce0c43ce3cea7ed0c3e6b
 AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
 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.99.9.tar.xz 1514372 BLAKE2B c7c708e477e38fa03d19e3a35eb99a6183774275ed0e2c00a1c62c238ca932e62aa71713386010b36a3c7aac1c78ebc3555635a2e2db4c68406e25510432db62 SHA512 77fff5c4d72bd5acad5b9b4a312cc999b960d6eb7e4715cdd2571859a0ee888988fee12bd46684ca948993a2308f10def1141fe3e3137ac9cce68190222ee858
+DIST libsoup-2.74.1.tar.xz 1496188 BLAKE2B 6f15415d5d4d68fa1f7167363cbed77dee9d4feea226357389209c96367c27c554fdc81fa25bcc8ce02290d6781dc2cc99298342349aada9ad9e32a10727c641 SHA512 107726e069becc0a79904905a10a0ceb0c010fcae57ee86fbb838e6edf58abfc464c8e6c3afb610e495d9c2a24ec6b4ba4c023921611642a9d3c89627daa154b
+DIST libsoup-3.0.2.tar.xz 1518728 BLAKE2B 17a476b08a78c06885de5bb63650b7232541bbb70aaa00a9ae67641b0a2d83fc726d8ef24c0c1cc1ca010b645e184bf7f17ced459d41e01a031712bf21108833 SHA512 0853d094555b3cff2a48f16ea1058ba55f9475ac1e0c1515792101e387596cdd8e3d69947eb4056b69b3cbee5d09111e99c3e684d207180d8e64b23a238f181f
 EBUILD libsoup-2.72.0-r1.ebuild 2935 BLAKE2B 4d611b5f77df37809765846aae89afe31af53b0d4dfb9b39e45e62dc9b91007442180b92c57e4cd57547d904ff3e6db9ab3ec5cebadbe54f10ba4dbd32ec70ec SHA512 b32dc99e460e040a6aa710d80363dd2fb5f462a36c1b7b79defda746456455e7b1cfce57f68a6bd6f7a940fb917e1ef5c1db1b538bde0637ce8cc0f7b20133c9
 EBUILD libsoup-2.74.0.ebuild 2942 BLAKE2B cac75b9dd4356c6fcc3a2745ce014ca3759d9e99a306f36b7972ee7e406dc45347b9f21437c83d98bf5dfc76ec593721410ff7c882f49775ae9a4046a6c0d810 SHA512 6b798d13d350cb6b9654ef6487a562e07916acf83ac0acfb12d8511575ed8d9ad6e5e228f59864a13de384aef5ec23526afe312950c428f48715feb2a4b53694
-EBUILD libsoup-2.99.9.ebuild 2990 BLAKE2B 1b6649e1e2ae0a2e95ef95c49d3b95bbd6fa49dc3e3f6d9006c458115fd634bf5143de8f361251a5978df82822ec7476e86da547217b5c81a0b6fc086a07d493 SHA512 fd306261c940b352c8d08c7d8fc150efa343b86760a5807e9187dadc3628c9721fe738d60f66273c2bdc75472ba3053a87bdd23b1f17ed8f92805e4ec81333a4
+EBUILD libsoup-2.74.1.ebuild 2942 BLAKE2B cac75b9dd4356c6fcc3a2745ce014ca3759d9e99a306f36b7972ee7e406dc45347b9f21437c83d98bf5dfc76ec593721410ff7c882f49775ae9a4046a6c0d810 SHA512 6b798d13d350cb6b9654ef6487a562e07916acf83ac0acfb12d8511575ed8d9ad6e5e228f59864a13de384aef5ec23526afe312950c428f48715feb2a4b53694
+EBUILD libsoup-3.0.2.ebuild 3035 BLAKE2B 76c45192ef31d286e1d6a788a9e6577894462e970b4efff699370766a3e0f033cff526ed00ab2d8a8816158c78e98c1605e86c82ade2bcfe561cf409c48facd4 SHA512 7e7e5b1ef8f5e0bac799000800c51b053db67eb4c2a045be5c5f358e4eb710b5fbdcedfea5a5c71021a124696e9e9b5f1829361049edc513b3b21d3be76d42e5
 MISC metadata.xml 578 BLAKE2B eb74705e02403da0706e9eba5fd7ce416721a8f4eaa7f0548376a11767f8d6f0214b6c696e8a65c3b2b1b9753bd1397bc2c9b5cdd953e89f23c00749884d7966 SHA512 120645b4e9ca76acaba6ae6eb86daca28be6af566576458b443996ff7e2c922eda059db209aa92dda28123d0474640e69e25236908b10d8472f4442608b7a6a2
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 000000000000..cad804a7a038
--- /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 <leio@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.74.1.ebuild b/net-libs/libsoup/libsoup-2.74.1.ebuild
new file mode 100644
index 000000000000..5bf1131885f8
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.74.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson-multilib vala xdg
+
+DESCRIPTION="HTTP client/server library for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.4"
+
+# TODO: Default enable brotli at some point? But in 2.70.0 not advertised to servers yet - https://gitlab.gnome.org/GNOME/libsoup/issues/146
+IUSE="brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.58:2[${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}] )
+	sys-libs/zlib
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	samba? ( net-fs/samba )
+"
+RDEPEND="${DEPEND}
+	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
+"
+BDEPEND="
+	dev-libs/glib
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+#	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,
+#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
+#		dev-lang/php[apache2,xmlrpc]
+#		net-misc/curl
+#		net-libs/glib-networking[ssl])"
+
+PATCHES=(
+	# Disable apache tests until they are usable on Gentoo, bug #326957
+	"${FILESDIR}"/disable-apache-tests.patch
+)
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+	# https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname
+	sed -e '/hsts/d' -i tests/meson.build || die
+}
+
+src_configure() {
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	# But necessary while apache tests are disabled
+	#addpredict /usr/share/snmp/mibs/.index
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature gssapi)
+		-Dkrb5_config="${CHOST}-krb5-config"
+		$(meson_feature samba ntlm)
+		$(meson_feature brotli)
+		-Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
+		-Dtls_check=false # disables check, we still rdep on glib-networking
+		-Dgnome=false
+		$(meson_native_use_feature introspection)
+		$(meson_native_use_feature vala vapi)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		$(meson_feature sysprof)
+	)
+	meson_src_configure
+}
diff --git a/net-libs/libsoup/libsoup-2.99.9.ebuild b/net-libs/libsoup/libsoup-3.0.2.ebuild
index 9c73bf6e9873..42bc6d7a2963 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
 )