From a12c8144cb504f2914ffeead8313f68a2467703fdc906db2f47c1d11baa62089 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 17 Apr 2020 22:53:00 +0000 Subject: [PATCH] Accepting request 795091 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/795091 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libsoup?expand=0&rev=244 --- libsoup-2.68.4.tar.xz | 3 --- libsoup-2.70.0.tar.xz | 3 +++ libsoup-disable-hsts-tests.patch | 9 +++++---- libsoup-disable-ssl-tests.patch | 12 +++++++++++ libsoup-test-utils-fix.patch | 32 ++++++++++++++++++++++++++++++ libsoup.changes | 34 ++++++++++++++++++++++++++++++++ libsoup.spec | 11 ++++++++--- 7 files changed, 94 insertions(+), 10 deletions(-) delete mode 100644 libsoup-2.68.4.tar.xz create mode 100644 libsoup-2.70.0.tar.xz create mode 100644 libsoup-disable-ssl-tests.patch create mode 100644 libsoup-test-utils-fix.patch diff --git a/libsoup-2.68.4.tar.xz b/libsoup-2.68.4.tar.xz deleted file mode 100644 index 1806e06..0000000 --- a/libsoup-2.68.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2d50b12922cc516ab6a7c35844d42f9c8a331668bbdf139232743d82582b3294 -size 1489616 diff --git a/libsoup-2.70.0.tar.xz b/libsoup-2.70.0.tar.xz new file mode 100644 index 0000000..eb0cf30 --- /dev/null +++ b/libsoup-2.70.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54b020f74aefa438918d8e53cff62e2b1e59efe2de53e06b19a4b07b1f4d5342 +size 1494220 diff --git a/libsoup-disable-hsts-tests.patch b/libsoup-disable-hsts-tests.patch index 561946c..83e8e13 100644 --- a/libsoup-disable-hsts-tests.patch +++ b/libsoup-disable-hsts-tests.patch @@ -1,7 +1,8 @@ -diff -urp libsoup-2.67.92.orig/tests/meson.build libsoup-2.67.92/tests/meson.build ---- libsoup-2.67.92.orig/tests/meson.build 2019-08-20 08:06:39.000000000 -0500 -+++ libsoup-2.67.92/tests/meson.build 2019-08-30 20:06:14.780598736 -0500 -@@ -24,8 +24,6 @@ tests = [ +Index: libsoup-2.70.0/tests/meson.build +=================================================================== +--- libsoup-2.70.0.orig/tests/meson.build ++++ libsoup-2.70.0/tests/meson.build +@@ -35,8 +35,6 @@ tests = [ ['date', true, []], ['forms', true, []], ['header-parsing', true, []], diff --git a/libsoup-disable-ssl-tests.patch b/libsoup-disable-ssl-tests.patch new file mode 100644 index 0000000..045e420 --- /dev/null +++ b/libsoup-disable-ssl-tests.patch @@ -0,0 +1,12 @@ +Index: libsoup-2.70.0/tests/meson.build +=================================================================== +--- libsoup-2.70.0.orig/tests/meson.build ++++ libsoup-2.70.0/tests/meson.build +@@ -48,7 +48,6 @@ tests = [ + ['server', true, []], + ['sniffing', true, []], + ['socket', true, []], +- ['ssl', true, []], + ['streaming', true, []], + ['timeout', true, []], + ['tld', true, []], diff --git a/libsoup-test-utils-fix.patch b/libsoup-test-utils-fix.patch new file mode 100644 index 0000000..ec7a5fe --- /dev/null +++ b/libsoup-test-utils-fix.patch @@ -0,0 +1,32 @@ +From 3058a0ed3aaf0a54058a96f884b0a73b0cc578a8 Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Wed, 11 Mar 2020 09:16:50 +0000 +Subject: [PATCH] test-utils: Clarify meaning of an environment variable + +SOUP_TESTS_IN_MAKE_CHECK used to be used for the Autotools build system. +I mistakenly thought it was a way to skip the Apache-dependent tests +during `make check`, but in fact the Autotools build system used to +start a single instance of Apache, then run all the tests against that +single instance, and finally shut it down. + +This mechanism is currently unused, but resurrecting it might be one way +to avoid GNOME/libsoup#175. +--- + tests/test-utils.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +Index: libsoup-2.70.0/tests/test-utils.c +=================================================================== +--- libsoup-2.70.0.orig/tests/test-utils.c ++++ libsoup-2.70.0/tests/test-utils.c +@@ -189,7 +189,9 @@ apache_cmd (const char *cmd) + void + apache_init (void) + { +- if (g_getenv ("SOUP_TESTS_IN_MAKE_CHECK")) ++ /* Set this environment variable if you are already running a ++ * suitably-configured Apache server */ ++ if (g_getenv ("SOUP_TESTS_ALREADY_RUNNING_APACHE")) + return; + + if (!apache_cmd ("start")) { diff --git a/libsoup.changes b/libsoup.changes index 4f6fc84..56e4899 100644 --- a/libsoup.changes +++ b/libsoup.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Thu Apr 16 18:23:07 UTC 2020 - Bjørn Lie + +- Add libsoup-disable-ssl-tests.patch: Disable ssl tests, as they + randomly fail for all arches (glgo#GNOME/libsoup#188). +- Rebase/refresh patches. + +------------------------------------------------------------------- +Tue Mar 24 13:09:03 UTC 2020 - Bjørn Lie + +- Add libsoup-test-utils-fix.patch: test-utils: Clarify meaning of + an environment variable. + +------------------------------------------------------------------- +Sat Mar 7 17:51:57 UTC 2020 - bjorn.lie@gmail.com + +- Update to version 2.70.0: + + Deprecate SoupSession:proxy-uri. + + Updated translations. + +------------------------------------------------------------------- +Wed Feb 26 08:57:51 UTC 2020 - dimstar@opensuse.org + +- Update to version 2.69.90: + + Add new API to expose support for same-site cookies. + + Fix TRACE method not being considered safe and idempotent + internally. + + WebSockets: ensure a new connection is created for WebSocket + requests. + + WebSockets: do not start the input source when IO is closing. + + Deprecate soup_date_to_timeval(). + + build: Update glib requirement to 2.58. + + Updated translations. + ------------------------------------------------------------------- Wed Feb 26 08:57:50 UTC 2020 - Bjørn Lie diff --git a/libsoup.spec b/libsoup.spec index c418b33..2aec6ed 100644 --- a/libsoup.spec +++ b/libsoup.spec @@ -17,16 +17,21 @@ Name: libsoup -Version: 2.68.4 +Version: 2.70.0 Release: 0 Summary: HTTP client/server library for GNOME License: LGPL-2.1-or-later Group: Development/Libraries/GNOME URL: https://wiki.gnome.org/Projects/libsoup -Source0: https://download.gnome.org/sources/libsoup/2.68/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/libsoup/2.70/%{name}-%{version}.tar.xz Source99: baselibs.conf + # PATCH-FIX-OPENSUSE libsoup-disable-hsts-tests.patch mgorse@suse.com -- disable hsts tests. Patch0: libsoup-disable-hsts-tests.patch +# PATCH-FIX-UPSTREAM libsoup-test-utils-fix.patch -- test-utils: Clarify meaning of an environment variable +Patch1: libsoup-test-utils-fix.patch +# PATCH-FIX-OPENSUSE libsoup-disable-ssl-tests.patch glgo#GNOME/libsoup#188 -- Disable ssl tests +Patch2: libsoup-disable-ssl-tests.patch BuildRequires: glib-networking BuildRequires: meson >= 0.50 @@ -125,7 +130,7 @@ translation-update-upstream po libsoup -Dkrb5_config='%{_libexecdir}/mit/bin/krb5-config' \ -Dvapi=enabled \ -Dgtk_doc=true \ - -Dntlm=disabled \ + -Dntlm=disabled \ %{nil} %meson_build