public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libsoup/, net-libs/libsoup/files/
@ 2020-02-12 11:46 Mart Raudsepp
  0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2020-02-12 11:46 UTC (permalink / raw
  To: gentoo-commits

commit:     80c0e75ebdb49dff7fba80eac6db3df4d4c7e967
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 11:45:13 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 11:45:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80c0e75e

net-libs/libsoup: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/libsoup/Manifest                          |  1 -
 .../files/libsoup-2.58.2-sparc-unaligned.patch     | 28 ------
 net-libs/libsoup/libsoup-2.58.2.ebuild             | 99 ----------------------
 3 files changed, 128 deletions(-)

diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 62f938e2e88..09b9b4d21d9 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,3 +1,2 @@
-DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de
 DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e720005c4fdbbe963ba68030d5fcfb11deb5103843f47f221b540e96c5d5ea0f7c52f898617dca37d8df9faec669 SHA512 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b
 DIST libsoup-2.66.4.tar.xz 1451200 BLAKE2B 4ee37592beb9227eb5a61901e4b100b613fef2be512b7c61052a8df17184783e4b6e4e898893d6f63f1fa32b97fac935ad0f4b4d5ae1c56fedd62c0c8f41a8ea SHA512 c1d57c6c5099ac345373409dd3f384dd454e47218cc6bd8be1c6b2de967d7753bfcc3010836f7131f049b1ab9c49318d6ae5203be0bcc0ca5d4b62a0c64f27ad

diff --git a/net-libs/libsoup/files/libsoup-2.58.2-sparc-unaligned.patch b/net-libs/libsoup/files/libsoup-2.58.2-sparc-unaligned.patch
deleted file mode 100644
index d09d52c292a..00000000000
--- a/net-libs/libsoup/files/libsoup-2.58.2-sparc-unaligned.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c2aaac0083f58d285b8feb24f13fe347d7f726fe Mon Sep 17 00:00:00 2001
-From: Rolf Eike Beer <eike@sf-mail.de>
-Date: Sat, 17 Mar 2018 10:28:00 +0000
-Subject: [PATCH] WebSockets: Avoid unaligned memory access
-
-This is causing test failures in SPARC architectures.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=794421
----
- libsoup/soup-websocket-connection.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libsoup/soup-websocket-connection.c b/libsoup/soup-websocket-connection.c
-index 0258a22c..35eee6a6 100644
---- a/libsoup/soup-websocket-connection.c
-+++ b/libsoup/soup-websocket-connection.c
-@@ -401,9 +401,10 @@ send_message (SoupWebsocketConnection *self,
- 	 * probably a client somewhere that's not expecting it.
- 	 */
- 	if (self->pv->connection_type == SOUP_WEBSOCKET_CONNECTION_CLIENT) {
-+		guint32 rnd = g_random_int ();
- 		outer[1] |= 0x80;
- 		mask = outer + bytes->len;
--		* ((guint32 *)mask) = g_random_int ();
-+		memcpy (mask, &rnd, sizeof (rnd));
- 		bytes->len += 4;
- 	}
- 

diff --git a/net-libs/libsoup/libsoup-2.58.2.ebuild b/net-libs/libsoup/libsoup-2.58.2.ebuild
deleted file mode 100644
index 9e276e84fa3..00000000000
--- a/net-libs/libsoup/libsoup-2.58.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_6 )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 multilib-minimal python-any-r1 vala
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-
-IUSE="debug gssapi +introspection samba ssl test vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
-	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	samba? ( net-fs/samba )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
-	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=(
-	# https://bugs.gentoo.org/630516
-	"${FILESDIR}/${PN}-2.58.2-sparc-unaligned.patch"
-)
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests (bug #226271)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# FIXME: workaround upstream not respecting --without-apache-httpd
-	sed -e '/check: start-httpd/d' \
-		-i tests/Makefile.am tests/Makefile.in || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tls-check \
-		--without-gnome \
-		--without-apache-httpd \
-		$(usex debug --enable-debug=yes ' ') \
-		$(multilib_native_use_with gssapi) \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_enable vala) \
-		$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
-
-	if multilib_is_native_abi; then
-		# fix gtk-doc
-		ln -s "${S}"/docs/reference/html docs/reference/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libsoup/, net-libs/libsoup/files/
@ 2020-07-29 11:23 Mart Raudsepp
  0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2020-07-29 11:23 UTC (permalink / raw
  To: gentoo-commits

commit:     d41d13f7700507a497ef9f7691d3ba8adb5b8b5b
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 11:21:47 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 11:23:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d41d13f7

net-libs/libsoup: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/libsoup/Manifest                          |  2 -
 .../libsoup/files/2.66.2-vala-0.46-compat.patch    | 26 ------
 net-libs/libsoup/libsoup-2.62.3.ebuild             | 94 ---------------------
 net-libs/libsoup/libsoup-2.66.4.ebuild             | 96 ----------------------
 4 files changed, 218 deletions(-)

diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 23d404c7da8..44c7c0730b2 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,3 +1 @@
-DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e720005c4fdbbe963ba68030d5fcfb11deb5103843f47f221b540e96c5d5ea0f7c52f898617dca37d8df9faec669 SHA512 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b
-DIST libsoup-2.66.4.tar.xz 1451200 BLAKE2B 4ee37592beb9227eb5a61901e4b100b613fef2be512b7c61052a8df17184783e4b6e4e898893d6f63f1fa32b97fac935ad0f4b4d5ae1c56fedd62c0c8f41a8ea SHA512 c1d57c6c5099ac345373409dd3f384dd454e47218cc6bd8be1c6b2de967d7753bfcc3010836f7131f049b1ab9c49318d6ae5203be0bcc0ca5d4b62a0c64f27ad
 DIST libsoup-2.70.0.tar.xz 1494220 BLAKE2B f6bf30c741c7919a31598132ca65c0081d074e7c90d915f3598cb986e1f51f5354538f76dc7117a94d946bd8cd5fe8477ead689f343797757224014932061d28 SHA512 c3e2a963f4b38b2eee5d772b68a325c076fde19c26413bb3ada91824d3c7e108fbc325bfdc49a28141a641233485d3044d18142720c2aebaa7cc820f8718159b

diff --git a/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch b/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch
deleted file mode 100644
index ce0e1dc9b62..00000000000
--- a/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1c6f47df99cc5b2efe3d629c71c5d85a7871689c Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Tue, 28 May 2019 09:08:35 +0200
-Subject: [PATCH] gir: soup_auth_new is not a constructor
-
----
- libsoup/Soup-2.4.metadata | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libsoup/Soup-2.4.metadata b/libsoup/Soup-2.4.metadata
-index c0056ec8..1f107eda 100644
---- a/libsoup/Soup-2.4.metadata
-+++ b/libsoup/Soup-2.4.metadata
-@@ -18,6 +18,9 @@ ProxyResolver deprecated_since="2.28" replacement="ProxyURIResolver"
- 
- // Report upstream
- add_* skip=false type="unowned GLib.TimeoutSource"
-+Auth
-+	// Factory method
-+	.new symbol_type="function"
- AuthDomain
- 	.accepts#method name="accepts_authorization"
- AuthDomainBasic.new skip=false
--- 
-2.20.1
-

diff --git a/net-libs/libsoup/libsoup-2.62.3.ebuild b/net-libs/libsoup/libsoup-2.62.3.ebuild
deleted file mode 100644
index d55643d5a8f..00000000000
--- a/net-libs/libsoup/libsoup-2.62.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_6 )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 multilib-minimal python-any-r1 vala
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-
-IUSE="debug gssapi +introspection samba ssl test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
-	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	samba? ( net-fs/samba )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
-	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])"
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests (bug #226271)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# FIXME: workaround upstream not respecting --without-apache-httpd
-	sed -e '/check: start-httpd/d' \
-		-i tests/Makefile.am tests/Makefile.in || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tls-check \
-		--without-gnome \
-		--without-apache-httpd \
-		$(usex debug --enable-debug=yes ' ') \
-		$(multilib_native_use_with gssapi) \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_enable vala) \
-		$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
-
-	if multilib_is_native_abi; then
-		# fix gtk-doc
-		ln -s "${S}"/docs/reference/html docs/reference/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}

diff --git a/net-libs/libsoup/libsoup-2.66.4.ebuild b/net-libs/libsoup/libsoup-2.66.4.ebuild
deleted file mode 100644
index c26cf2bfb52..00000000000
--- a/net-libs/libsoup/libsoup-2.66.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson multilib-minimal vala xdg
-
-DESCRIPTION="HTTP client/server library for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.4"
-
-IUSE="gssapi gtk-doc +introspection samba ssl test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
-
-DEPEND="
-	>=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
-	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-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
-	# Fix libsoup-2.4.vapi to be compatible with vala:0.46 and onwards. Included in 2.67.2
-	"${FILESDIR}"/2.66.2-vala-0.46-compat.patch
-	"${FILESDIR}"/2.66.2-meson-ntlm_auth-fix.patch
-)
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-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_use gssapi)
-		-Dkrb5_config="${CHOST}-krb5-config"
-		$(meson_use samba ntlm)
-		-Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
-		-Dtls_check=false # disables check, we still rdep on glib-networking
-		-Dgnome=false
-		-Dintrospection=$(multilib_native_usex introspection true false)
-		-Dvapi=$(multilib_native_usex vala true false)
-		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libsoup/, net-libs/libsoup/files/
@ 2021-11-11 18:46 Mart Raudsepp
  0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2021-11-11 18:46 UTC (permalink / raw
  To: gentoo-commits

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 <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.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
 )


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libsoup/, net-libs/libsoup/files/
@ 2021-12-09 17:11 Mart Raudsepp
  0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2021-12-09 17:11 UTC (permalink / raw
  To: gentoo-commits

commit:     056422b22206f4c8b548ae2996c783e7e95fa075
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  9 17:11:10 2021 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Dec  9 17:11:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=056422b2

net-libs/libsoup: bump to 3.0.3

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-3.0.2.ebuild => libsoup-3.0.3.ebuild} |  1 -
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index eeda67948b94..803f87f45375 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-3.0.2.tar.xz 1518728 BLAKE2B 17a476b08a78c06885de5bb63650b7232541bbb70aaa00a9ae67641b0a2d83fc726d8ef24c0c1cc1ca010b645e184bf7f17ced459d41e01a031712bf21108833 SHA512 0853d094555b3cff2a48f16ea1058ba55f9475ac1e0c1515792101e387596cdd8e3d69947eb4056b69b3cbee5d09111e99c3e684d207180d8e64b23a238f181f
+DIST libsoup-3.0.3.tar.xz 1525388 BLAKE2B cd515656647bfa9d0bc3b93ade90823803219f11b1ca9688e3b5e6ac62a0d12f72fd7bf9feb6059ced8885c22568768ae5511e270ddc72fe495f078ccecce5a4 SHA512 9ba6f7e9e2a975dff52e5b28b147cad707aa1596a67f45bb1b9feaccf130eca2cb0b80b7ebf0a424388ec4f0b5297578b51142f8b135cddc367ac59d00279094

diff --git a/net-libs/libsoup/files/3.0.2-fix-leak.patch b/net-libs/libsoup/files/3.0.2-fix-leak.patch
deleted file mode 100644
index cad804a7a038..000000000000
--- a/net-libs/libsoup/files/3.0.2-fix-leak.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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-3.0.2.ebuild b/net-libs/libsoup/libsoup-3.0.3.ebuild
similarity index 98%
rename from net-libs/libsoup/libsoup-3.0.2.ebuild
rename to net-libs/libsoup/libsoup-3.0.3.ebuild
index 42bc6d7a2963..4628b97f09f5 100644
--- a/net-libs/libsoup/libsoup-3.0.2.ebuild
+++ b/net-libs/libsoup/libsoup-3.0.3.ebuild
@@ -51,7 +51,6 @@ 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
 )


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libsoup/, net-libs/libsoup/files/
@ 2023-03-19  0:25 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-03-19  0:25 UTC (permalink / raw
  To: gentoo-commits

commit:     4c8133327f5ef5aa53610089f13c2c5ea7c3976c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 19 00:23:33 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 00:24:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c813332

net-libs/libsoup: fix HTTP/2 on unsigned char arches, -Wstrict-prototype

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/libsoup/files/strict-prototypes.patch      | 20 ++++++++++++++++++++
 net-libs/libsoup/files/unsigned-char-http2.patch    | 21 +++++++++++++++++++++
 ...libsoup-3.4.0.ebuild => libsoup-3.4.0-r1.ebuild} |  4 ++++
 3 files changed, 45 insertions(+)

diff --git a/net-libs/libsoup/files/strict-prototypes.patch b/net-libs/libsoup/files/strict-prototypes.patch
new file mode 100644
index 000000000000..e9a84257ccb5
--- /dev/null
+++ b/net-libs/libsoup/files/strict-prototypes.patch
@@ -0,0 +1,20 @@
+https://gitlab.gnome.org/GNOME/libsoup/-/commit/146f1c96f741fb9ab62d74d99585b2e859f6cb5f
+
+From 146f1c96f741fb9ab62d74d99585b2e859f6cb5f Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Fri, 17 Mar 2023 19:10:40 -0500
+Subject: [PATCH] Fix strict-prototype warning
+
+--- a/libsoup/http2/soup-body-input-stream-http2.c
++++ b/libsoup/http2/soup-body-input-stream-http2.c
+@@ -72,7 +72,7 @@ static guint signals [LAST_SIGNAL] = { 0 };
+  * Returns: a new #GInputStream
+  */
+ GInputStream *
+-soup_body_input_stream_http2_new ()
++soup_body_input_stream_http2_new (void)
+ {
+         return G_INPUT_STREAM (g_object_new (SOUP_TYPE_BODY_INPUT_STREAM_HTTP2, NULL));
+ }
+-- 
+GitLab

diff --git a/net-libs/libsoup/files/unsigned-char-http2.patch b/net-libs/libsoup/files/unsigned-char-http2.patch
new file mode 100644
index 000000000000..ceee9d360e4b
--- /dev/null
+++ b/net-libs/libsoup/files/unsigned-char-http2.patch
@@ -0,0 +1,21 @@
+https://gitlab.gnome.org/GNOME/libsoup/-/commit/d1509188ebd2219db1a147e9d77ffd5b4d161a2e
+
+From d1509188ebd2219db1a147e9d77ffd5b4d161a2e Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Fri, 17 Mar 2023 19:05:35 -0500
+Subject: [PATCH] Fix regression breaking HTTP/2 on platforms with unsigned
+ char
+
+--- a/libsoup/soup-connection-manager.c
++++ b/libsoup/soup-connection-manager.c
+@@ -378,7 +378,7 @@ static SoupConnection *
+ soup_connection_manager_get_connection_locked (SoupConnectionManager *manager,
+                                                SoupMessageQueueItem  *item)
+ {
+-        static gchar env_force_http1 = -1;
++        static int env_force_http1 = -1;
+         SoupMessage *msg = item->msg;
+         gboolean need_new_connection;
+         SoupConnection *conn;
+-- 
+GitLab

diff --git a/net-libs/libsoup/libsoup-3.4.0.ebuild b/net-libs/libsoup/libsoup-3.4.0-r1.ebuild
similarity index 94%
rename from net-libs/libsoup/libsoup-3.4.0.ebuild
rename to net-libs/libsoup/libsoup-3.4.0-r1.ebuild
index 73364f0a5c02..af164f1c1964 100644
--- a/net-libs/libsoup/libsoup-3.4.0.ebuild
+++ b/net-libs/libsoup/libsoup-3.4.0-r1.ebuild
@@ -54,6 +54,10 @@ BDEPEND="
 PATCHES=(
 	# Disable apache tests until they are usable on Gentoo, bug #326957
 	"${FILESDIR}"/disable-apache-tests.patch
+	# Upstream patch to fix HTTP/2 on platforms w/ unsigned char
+	"${FILESDIR}"/unsigned-char-http2.patch
+	# Upstream patch to fix -Wstrict-prototypes
+	"${FILESDIR}"/strict-prototypes.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libsoup/, net-libs/libsoup/files/
@ 2024-01-16  3:19 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-01-16  3:19 UTC (permalink / raw
  To: gentoo-commits

commit:     6a20a163ee9cabbe8fc4c6903abdbf1f5baf230b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 03:02:42 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 03:14:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a20a163

net-libs/libsoup: fix build w/ libxml2-2.12

Closes: https://bugs.gentoo.org/917556
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/libsoup/files/libxml2-2.12.patch | 36 +++++++++++++++++++++++++++++++
 net-libs/libsoup/libsoup-2.74.3.ebuild    |  4 +++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/net-libs/libsoup/files/libxml2-2.12.patch b/net-libs/libsoup/files/libxml2-2.12.patch
new file mode 100644
index 000000000000..3190eeb6301c
--- /dev/null
+++ b/net-libs/libsoup/files/libxml2-2.12.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/917556
+https://gitlab.gnome.org/GNOME/libsoup/-/commit/ced3c5d8cad0177b297666343f1561799dfefb0d
+
+From ced3c5d8cad0177b297666343f1561799dfefb0d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 22 Nov 2023 18:49:10 -0800
+Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17
+
+Fixes build errors about missing function prototypes with clang-17
+
+Fixes
+| ../libsoup-2.74.3/libsoup/soup-xmlrpc-old.c:512:8: error: call to undeclared function 'xmlParseMemory'; ISO C99 and later do not support implicit function declarations
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/libsoup/soup-xmlrpc-old.c
++++ b/libsoup/soup-xmlrpc-old.c
+@@ -11,6 +11,7 @@
+ 
+ #include <string.h>
+ 
++#include <libxml/parser.h>
+ #include <libxml/tree.h>
+ 
+ #include "soup-xmlrpc-old.h"
+--- a/libsoup/soup-xmlrpc.c
++++ b/libsoup/soup-xmlrpc.c
+@@ -17,6 +17,7 @@
+ 
+ #include <string.h>
+ #include <errno.h>
++#include <libxml/parser.h>
+ #include <libxml/tree.h>
+ #include "soup-xmlrpc.h"
+ #include "soup.h"
+-- 
+GitLab

diff --git a/net-libs/libsoup/libsoup-2.74.3.ebuild b/net-libs/libsoup/libsoup-2.74.3.ebuild
index 7e1740520995..4287161e6fb3 100644
--- a/net-libs/libsoup/libsoup-2.74.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.74.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -53,6 +53,8 @@ BDEPEND="
 PATCHES=(
 	# Disable apache tests until they are usable on Gentoo, bug #326957
 	"${FILESDIR}"/disable-apache-tests.patch
+	# libxml2-2.12 fix, bug #917556
+	"${FILESDIR}"/libxml2-2.12.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-01-16  3:19 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-11 18:46 [gentoo-commits] repo/gentoo:master commit in: net-libs/libsoup/, net-libs/libsoup/files/ Mart Raudsepp
  -- strict thread matches above, loose matches on Subject: below --
2024-01-16  3:19 Sam James
2023-03-19  0:25 Sam James
2021-12-09 17:11 Mart Raudsepp
2020-07-29 11:23 Mart Raudsepp
2020-02-12 11:46 Mart Raudsepp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox