[gentoo-commits] repo/gentoo:master commit in: net-libs/libsoup/files/, net-libs/libsoup/

2023-05-17 Thread Matt Turner 
commit: 97e1796d5bc5667af47f4ebe54936b2d2d77e0ce
Author: Matt Turner  gentoo  org>
AuthorDate: Wed May 17 21:14:07 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed May 17 21:54:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e1796d

net-libs/libsoup: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 net-libs/libsoup/Manifest|   2 -
 net-libs/libsoup/files/strict-prototypes.patch   |  20 -
 net-libs/libsoup/files/unsigned-char-http2.patch |  21 -
 net-libs/libsoup/libsoup-3.2.2.ebuild| 101 --
 net-libs/libsoup/libsoup-3.4.0-r1.ebuild | 105 ---
 5 files changed, 249 deletions(-)

diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 24933980acea..d90ea73c1cff 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,5 +1,3 @@
 DIST libsoup-2.74.3.tar.xz 1504804 BLAKE2B 
91f441197414314bb78cf15e7c13b54714e669145784812fb7a68cc41c8965ea29c53dc686d690e00f28f711be9f767038e5cc43b11aa0136f190dd2d41ec2a0
 SHA512 
72f8a055df984cb35105fe67f4ca67d3fb110d40a9cacb660fccd89f93b06bc32e25d94375dcc76608a245f7c5e081d968d7aaf5952eb16013d81c741247cb4c
-DIST libsoup-3.2.2.tar.xz 1530460 BLAKE2B 
8df66651a0bdcdb3337ced0031e4e8a32883241f6b7310a2b91396883368fa849d1e7dbab3766ec38ec05fdd81fafabd1f165cfe22a168e87db9a431ca86274d
 SHA512 
1f2b49244f8bac4d112b39ac9c6a942acbc1ae1cff33262ed02e7682af3994cf6ba6741b365b3c80c45c6427d391599fa6f31df6caa4ffefe7d078ac373bad1b
-DIST libsoup-3.4.0.tar.xz 1530892 BLAKE2B 
9c5ad6ba8a476c633d8e6a65e6c3e910e4b4848e80284a0e47f67fba61efb8743973a1498ad5735dcfb92a7cd7517603de8a503e98aeb3e51029cf587562d67c
 SHA512 
d9bc5c160e453d5bc467694dac057e03d9e6c075a87bd6ff59be4ddedbfcb496168d9457e905edc3aff569270f0401560001f3d54fca1a7c3679ac631bd779d6
 DIST libsoup-3.4.1.tar.xz 1537968 BLAKE2B 
4cee695f35fcfa87a43b1015fe4be679927939eb5d7ba6f5a95da32308bf16215d9cd45a15a82a39a5c105aa5b85bd6ee76d733dab5d7a053e8a8185d03b700c
 SHA512 
1fabd75aa4fa74b322eab3a2c073555daaaf216e70c5f0cb41a57ef6e56553756e499cceea29e726a291ecc2e381e507b122f9d5771db2730f85beee803d22dc
 DIST libsoup-3.4.2.tar.xz 1535992 BLAKE2B 
09423b5f7f0385105d00523f38597ebd91d8a19ed1c4cd6fbc27b12d81fdbd13c54f8fabbe16411ea45de4b48d6dd85c226ea812618b337a34c3dfd220c0be9a
 SHA512 
711007599f639625fe2efdb7adb81de2dea0035180737ce0ec8234afb034646a2b6bd9ae384a69d6591aa142e91d245d502d13e1d97cd7b51c8c87c2d925f6b3

diff --git a/net-libs/libsoup/files/strict-prototypes.patch 
b/net-libs/libsoup/files/strict-prototypes.patch
deleted file mode 100644
index e9a84257ccb5..
--- a/net-libs/libsoup/files/strict-prototypes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://gitlab.gnome.org/GNOME/libsoup/-/commit/146f1c96f741fb9ab62d74d99585b2e859f6cb5f
-
-From 146f1c96f741fb9ab62d74d99585b2e859f6cb5f Mon Sep 17 00:00:00 2001
-From: Patrick Griffis 
-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
deleted file mode 100644
index ceee9d360e4b..
--- a/net-libs/libsoup/files/unsigned-char-http2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://gitlab.gnome.org/GNOME/libsoup/-/commit/d1509188ebd2219db1a147e9d77ffd5b4d161a2e
-
-From d1509188ebd2219db1a147e9d77ffd5b4d161a2e Mon Sep 17 00:00:00 2001
-From: Patrick Griffis 
-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.2.2.ebuild 
b/net-libs/libsoup/libsoup-3.2.2.ebuild
deleted file mode 100644
index a683c5c8c682..
--- a/net-libs/libsoup/libsoup-3.2.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson-multilib vala xdg
-
-DESCRIPTION="HTTP client/server library for GNOME"

[gentoo-commits] repo/gentoo:master commit in: net-libs/libsoup/files/, net-libs/libsoup/

2019-08-24 Thread Mart Raudsepp 
commit: 749c26be5e5cf37aaaf445af0d174f8fc31f1a8c
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Aug 24 09:47:51 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Aug 24 09:49:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=749c26be

net-libs/libsoup-2.66.2: fix build with USE=samba

Closes: https://bugs.gentoo.org/692814
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../libsoup/files/2.66.2-meson-ntlm_auth-fix.patch | 28 ++
 net-libs/libsoup/libsoup-2.66.2.ebuild |  1 +
 2 files changed, 29 insertions(+)

diff --git a/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch 
b/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch
new file mode 100644
index 000..04c9cccfeec
--- /dev/null
+++ b/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch
@@ -0,0 +1,28 @@
+From ecd64363f82eb9d6cea07674f49c2d2869e5b62b Mon Sep 17 00:00:00 2001
+From: Claudio Saavedra 
+Date: Tue, 20 Aug 2019 16:04:06 +0300
+Subject: [PATCH] NTLM: Fix build with ntlm enabled
+
+Just realized that build with NTLM enabled was broken (!?)
+
+(cherry picked from commit bab0db142d508e92e72970db72cbbce3c13a526a)
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index f0e34cb0..346ed2fd 100644
+--- a/meson.build
 b/meson.build
+@@ -271,7 +271,7 @@ if host_machine.system() != 'windows'
+ 
+ if ntlm_auth.found()
+   add_project_arguments('-DUSE_NTLM_AUTH=1', language : 'c')
+-  add_project_arguments('-DNTLM_AUTH=' + ntlm_auth.path(), language : 'c')
++  add_project_arguments('-DNTLM_AUTH="' + ntlm_auth.path() + '"', 
language : 'c')
+ endif
+   endif
+ endif
+-- 
+2.20.1
+

diff --git a/net-libs/libsoup/libsoup-2.66.2.ebuild 
b/net-libs/libsoup/libsoup-2.66.2.ebuild
index 57963364f49..238bf9bb966 100644
--- a/net-libs/libsoup/libsoup-2.66.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.66.2.ebuild
@@ -49,6 +49,7 @@ PATCHES=(
"${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}"/${PV}-vala-0.46-compat.patch
+   "${FILESDIR}"/${PV}-meson-ntlm_auth-fix.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: net-libs/libsoup/files/, net-libs/libsoup/

2019-08-23 Thread Mart Raudsepp 
commit: 4226ad83c5e7cacf9dcddd5181eb27d42ed75035
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Aug 23 19:19:17 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Aug 23 19:32:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4226ad83

net-libs/libsoup: bump to 2.66.2, fix vala:0.46 compat

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 net-libs/libsoup/Manifest  |  1 +
 .../libsoup/files/2.66.2-vala-0.46-compat.patch| 26 ++
 net-libs/libsoup/files/disable-apache-tests.patch  | 33 
 net-libs/libsoup/libsoup-2.66.2.ebuild | 94 ++
 4 files changed, 154 insertions(+)

diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index f7aa4020665..f180d4e59e4 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,3 +1,4 @@
 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.64.2.tar.xz 1793440 BLAKE2B 
77a41ad62e0e419711cb26f510b6c0ca09c0430300f72144a0d0563a24e24639d1ca430784051b8de279623193a273510d5c95de6edb4a54a3aee0bd7903d9cd
 SHA512 
c001495be4e1eafd169b904431b22e961b52f5a3202f2e75b0657281cbfd91153148765bd95378bba3e85a66d7eaca428750641f20c07ca3232d1f9bdabdc90f
+DIST libsoup-2.66.2.tar.xz 1446024 BLAKE2B 
2953b91e3bf28b80189a87ecff3a9d103d57bb090f62121dc441e9bfa65750b67f2ab4f50e7a7a0cf5691b79139ae84de5aeaff69e7505b5c2fdd3f375536724
 SHA512 
1df443470239f23d22301e37e36f3d34963352ee0122f317cd15b19d90115831091bddcee27bc6f0d4994adcf4e5bd9c0395de2bd7f39ae305ba0edea7789092

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
new file mode 100644
index 000..ce0e1dc9b62
--- /dev/null
+++ b/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch
@@ -0,0 +1,26 @@
+From 1c6f47df99cc5b2efe3d629c71c5d85a7871689c Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz 
+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/files/disable-apache-tests.patch 
b/net-libs/libsoup/files/disable-apache-tests.patch
new file mode 100644
index 000..e7d306bde97
--- /dev/null
+++ b/net-libs/libsoup/files/disable-apache-tests.patch
@@ -0,0 +1,33 @@
+From 6c9bbf0d91688e831f8f19232e18619bfc57e12e Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Fri, 23 Aug 2019 21:11:57 +0300
+Subject: [PATCH] meson: Force disable apache/php using tests for now
+
+We had them disabled in autotools with a sed. Keep them disabled for now
+in meson port as well. Should be revisited at some point.
+---
+ meson.build | 7 ++-
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 89837c15..f0e34cb0 100644
+--- a/meson.build
 b/meson.build
+@@ -162,12 +162,9 @@ endif
+ #
+ # The summary is that for the configuration parsing we will use the apachectl,
+ # but for running the tests we will use the httpd binary.
+-apachectl = find_program('apachectl', '/sbin/apachectl', 
'/usr/sbin/apachectl', required : false)
++apachectl = disabler()
+ # This abomination is a result of 
https://github.com/mesonbuild/meson/issues/1576
+-apache_httpd2 = find_program('httpd2', 'httpd', 'apache2', 'apache',
+- '/sbin/httpd2', '/sbin/httpd', '/sbin/apache2', '/sbin/apache',
+- '/usr/sbin/httpd2', '/usr/sbin/httpd', '/usr/sbin/apache2', 
'/usr/sbin/apache',
+- required : false)
++apache_httpd2 = disabler()
+ have_apache=false
+ apache_httpd2_version = ''
+ if apache_httpd2.found() and apachectl.found()
+-- 
+2.20.1
+

diff --git a/net-libs/libsoup/libsoup-2.66.2.ebuild 
b/net-libs/libsoup/libsoup-2.66.2.ebuild
new file mode 100644
index 000..57963364f49
--- /dev/null
+++

[gentoo-commits] repo/gentoo:master commit in: net-libs/libsoup/files/, net-libs/libsoup/

2018-03-21 Thread Sergei Trofimovich 
commit: a5d6ac97e6f58d8ce46dd78620b9df077b2a7507
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Mar 19 17:16:05 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Mar 21 22:12:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d6ac97

net-libs/libsoup-2.58.2: fix unaligned accesses

Bug: https://bugs.gentoo.org/630516
Closes: https://github.com/gentoo/gentoo/pull/7511

 .../files/libsoup-2.58.2-sparc-unaligned.patch | 28 ++
 net-libs/libsoup/libsoup-2.58.2.ebuild |  5 
 2 files changed, 33 insertions(+)

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
new file mode 100644
index 000..d09d52c292a
--- /dev/null
+++ b/net-libs/libsoup/files/libsoup-2.58.2-sparc-unaligned.patch
@@ -0,0 +1,28 @@
+From c2aaac0083f58d285b8feb24f13fe347d7f726fe Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer 
+Date: Sat, 17 Mar 2018 10:28:00 +
+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, , 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
index 194a65bc08c..2f60a0a4290 100644
--- a/net-libs/libsoup/libsoup-2.58.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.58.2.ebuild
@@ -44,6 +44,11 @@ DEPEND="${RDEPEND}
 #  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)