Sync from SUSE:SLFO:Main libsoup2 revision 267bcf702076a53c5165fc24c30ea995
This commit is contained in:
commit
103196f3f0
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
5
baselibs.conf
Normal file
5
baselibs.conf
Normal file
@ -0,0 +1,5 @@
|
||||
libsoup-2_4-1
|
||||
obsoletes "libsoup-<targettype>"
|
||||
libsoup2-devel
|
||||
requires -libsoup-<targettype>
|
||||
requires "libsoup-2_4-1-<targettype> = <version>"
|
BIN
libsoup-2.74.3.tar.xz
(Stored with Git LFS)
Normal file
BIN
libsoup-2.74.3.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
14
libsoup-skip-tls_interaction-test.patch
Normal file
14
libsoup-skip-tls_interaction-test.patch
Normal file
@ -0,0 +1,14 @@
|
||||
Index: libsoup-2.72.0/tests/ssl-test.c
|
||||
===================================================================
|
||||
--- libsoup-2.72.0.orig/tests/ssl-test.c
|
||||
+++ libsoup-2.72.0/tests/ssl-test.c
|
||||
@@ -370,6 +370,9 @@ do_tls_interaction_test (void)
|
||||
|
||||
SOUP_TEST_SKIP_IF_NO_TLS;
|
||||
|
||||
+ g_test_skip ("Not reliable? See https://gitlab.gnome.org/GNOME/libsoup/issues/120");
|
||||
+ return;
|
||||
+
|
||||
service = g_threaded_socket_service_new (1);
|
||||
address = g_inet_socket_address_new_from_string ("127.0.0.1", 0);
|
||||
g_socket_listener_add_address (G_SOCKET_LISTENER (service), address,
|
59
libsoup2-extend-test-cert.patch
Normal file
59
libsoup2-extend-test-cert.patch
Normal file
@ -0,0 +1,59 @@
|
||||
https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/177
|
||||
From 38a65f080a3168e8af78bdd3e4928debeea2dbd8 Mon Sep 17 00:00:00 2001
|
||||
From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
|
||||
Date: Thu, 18 Feb 2021 09:13:40 +0100
|
||||
Subject: [PATCH] Extend test cert to 2049
|
||||
|
||||
used certtool -u \
|
||||
--load-ca-privkey ./tests/test-key.pem \
|
||||
--load-ca-certificate ./tests/test-cert.pem \
|
||||
--load-certificate ./tests/test-cert.pem
|
||||
|
||||
Without this patch, 3 tests failed in 2027
|
||||
11/29 misc-test FAIL 0.67s (exit status 1)
|
||||
21/29 server-test FAIL 0.12s (exit status 1)
|
||||
25/29 timeout-test FAIL 4.08s (killed by signal 5 SIGTRAP)
|
||||
|
||||
Background:
|
||||
As part of my work on reproducible builds for openSUSE, I check that software still gives identical build results in the future.
|
||||
The usual offset is +15 years, because that is how long I expect some software will be used in some places.
|
||||
This showed up failing tests in our package build.
|
||||
See https://reproducible-builds.org/ for why this matters.
|
||||
---
|
||||
tests/test-cert.pem | 16 ++++++++--------
|
||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/tests/test-cert.pem b/tests/test-cert.pem
|
||||
index ff863b4d..4b8b180d 100644
|
||||
--- a/tests/test-cert.pem
|
||||
+++ b/tests/test-cert.pem
|
||||
@@ -1,6 +1,6 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIC2zCCAcOgAwIBAgIJALRbg2WnuAAqMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
|
||||
-BAMMCTEyNy4wLjAuMTAeFw0xNzA2MjAxNDI3MzBaFw0yNzA2MTgxNDI3MzBaMBQx
|
||||
+BAMMCTEyNy4wLjAuMTAeFw0yMTAyMTgwODA3MzBaFw00OTEyMzEwODA3MzRaMBQx
|
||||
EjAQBgNVBAMMCTEyNy4wLjAuMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
|
||||
ggEBAKs4fuRuW77nORhOT9kbbU6BsjKW3GEsMc+ZSmXjINQWpfkES2hV+DQyzhm5
|
||||
qh4OLi1vYtXoSbdQNDCbA8ybZJqR8m9F3ed8vobdSSQGxWpPdXTgz27x+TpiAc9P
|
||||
@@ -8,11 +8,11 @@ w83UuPvlu/0AxHJBFXVAg+id0yFu3wmGWYJHoAtvFi2xeRtAXurNuPtjZyO+gfM9
|
||||
BKTRCkGsRSmPpJyGbU2Q96fjxnVfV9oYvQXeugUcSx/pTUCM/kDgD9QZCxG2rflX
|
||||
NWcqDFY3uO6ZR68Qwi/KouOa8rzrgAcwhFUI6Wz0Zwi1rzRtWK5WqC24aBUYz/tK
|
||||
hl8i88UDXSMh7spChdYDBGLhZyUCAwEAAaMwMC4wLAYDVR0RBCUwI4IJbG9jYWxo
|
||||
-b3N0hwR/AAABhxAAAAAAAAAAAAAAAAAAAAABMA0GCSqGSIb3DQEBCwUAA4IBAQBj
|
||||
-+U8tebwg5/pof5Rht6TMHqeg6Fcr4OJkL2ph2g+T/AMTS7kEGeFIKJN5AZ+S/qIY
|
||||
-cdoDKHwc8+bCK/mG6DPmJ4z/2Eamb85YhplOLVrLRwfxRebTK9CtnjcjnflAiU9H
|
||||
-7vPVwXIvkwebhBSQNKTdkBlPXKaTNWXuygeFG2OVQkPf/KAxSdtg2R+owv/s802Z
|
||||
-HISk26wY9oFIQz6AiXWdrY1QqNOltZ7rlU5iofAH7X+9ryZlxPWj/gHg2YQRvvLl
|
||||
-dq6nCF+ED0ke7h0lg5nU0beKEygwli8DlLVbu0JK0PkARFp5t7wUtzC9DCjzvfOc
|
||||
-gxR44PyZX7/2oaTDm4PS
|
||||
+b3N0hwR/AAABhxAAAAAAAAAAAAAAAAAAAAABMA0GCSqGSIb3DQEBCwUAA4IBAQAz
|
||||
+/qYTUuBGHgp7T1cfaJPnhx6U1SMfdJRtFoWOXDx+MNCK9GYkdMEabzRGUP5uNHO+
|
||||
+PiZP/bMIHlpsbRA5AyyVf9Xv8JCujvYh24qYcBbwgZrfvNTm0D52P9JJm0SalTXS
|
||||
+kwwTj00DWGVfVzJR+wiwYGHRIlyXbHqQSRzv6+z9f/xY5gXw/KpCNYTuOJcXW7w6
|
||||
+JfMrUnc9pphRUpcLkuuzOMKuB0dtWRc0mZIr7PZHt+0gitNZWA0bDYI3JI9tlK17
|
||||
+nxBUSpGtJwDgH//b8ek/P0P9a5VzQbBC6lXtQUMdxg7ovfAI//IS8ekBoRKI0Wde
|
||||
+r2IpM9hKSBU3c2gGXcJC
|
||||
-----END CERTIFICATE-----
|
||||
--
|
||||
GitLab
|
||||
|
3348
libsoup2.changes
Normal file
3348
libsoup2.changes
Normal file
File diff suppressed because it is too large
Load Diff
170
libsoup2.spec
Normal file
170
libsoup2.spec
Normal file
@ -0,0 +1,170 @@
|
||||
#
|
||||
# spec file for package libsoup2
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: libsoup2
|
||||
%define _name libsoup
|
||||
Version: 2.74.3
|
||||
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.74/%{_name}-%{version}.tar.xz
|
||||
Source99: baselibs.conf
|
||||
# PATCH-FIX-OPENSUSE disable tls_interaction-test https://gitlab.gnome.org/GNOME/libsoup/issues/120
|
||||
Patch1: libsoup-skip-tls_interaction-test.patch
|
||||
# PATCH-FIX-UPSTREAM libsoup2-extend-test-cert.patch boo#1102840 -- Fix tests after 2027
|
||||
Patch2: libsoup2-extend-test-cert.patch
|
||||
BuildRequires: glib-networking
|
||||
BuildRequires: meson >= 0.50
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: translation-update-upstream
|
||||
BuildRequires: pkgconfig(gio-2.0) >= 2.58.0
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.58.0
|
||||
BuildRequires: pkgconfig(gobject-2.0) >= 2.58.0
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.5
|
||||
BuildRequires: pkgconfig(gtk-doc) >= 1.20
|
||||
BuildRequires: pkgconfig(krb5)
|
||||
BuildRequires: pkgconfig(libbrotlidec)
|
||||
BuildRequires: pkgconfig(libpsl) >= 0.20
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: pkgconfig(sqlite3)
|
||||
BuildRequires: pkgconfig(vapigen)
|
||||
# We do not need these dependencies needed only for tests.
|
||||
#BuildRequires: apache2-mod_php5 php5-xmlrpc
|
||||
|
||||
%description
|
||||
Libsoup is an HTTP client/server library for GNOME. It uses GObjects
|
||||
and the glib main loop, to integrate well with GNOME applications.
|
||||
|
||||
Features:
|
||||
* Both asynchronous (GMainLoop and callback-based) and synchronous APIs
|
||||
* Automatically caches connections
|
||||
* SSL Support using GnuTLS
|
||||
* Proxy support, including authentication and SSL tunneling
|
||||
* Client support for Digest, NTLM, and Basic authentication
|
||||
* Server support for Digest and Basic authentication
|
||||
* XML-RPC support
|
||||
|
||||
%package -n %{_name}-2_4-1
|
||||
Summary: HTTP client/server library for GNOME
|
||||
Group: Development/Libraries/GNOME
|
||||
Requires: glib-networking >= 2.27.90
|
||||
# For NTLM single sign on
|
||||
Suggests: samba-winbind
|
||||
# Needed to make the lang package installable
|
||||
Provides: %{name} = %{version}
|
||||
|
||||
%description -n %{_name}-2_4-1
|
||||
Libsoup is an HTTP client/server library for GNOME. It uses GObjects
|
||||
and the glib main loop, to integrate well with GNOME applications.
|
||||
|
||||
Features:
|
||||
* Both asynchronous (GMainLoop and callback-based) and synchronous APIs
|
||||
* Automatically caches connections
|
||||
* SSL Support using GnuTLS
|
||||
* Proxy support, including authentication and SSL tunneling
|
||||
* Client support for Digest, NTLM, and Basic authentication
|
||||
* Server support for Digest and Basic authentication
|
||||
* XML-RPC support
|
||||
|
||||
%package -n typelib-1_0-Soup-2_4
|
||||
Summary: HTTP client/server library for GNOME -- Introspection bindings
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n typelib-1_0-Soup-2_4
|
||||
Libsoup is an HTTP client/server library for GNOME. It uses GObjects
|
||||
and the glib main loop, to integrate well with GNOME applications.
|
||||
|
||||
This package provides the GObject Introspection bindings for libsoup.
|
||||
|
||||
%package devel
|
||||
Summary: HTTP client/server library for GNOME - Development Files
|
||||
Group: Development/Libraries/GNOME
|
||||
Requires: libsoup-2_4-1 = %{version}
|
||||
Requires: typelib-1_0-Soup-2_4 = %{version}
|
||||
Provides: %{_name}-doc = %{version}
|
||||
Obsoletes: %{_name}-doc < %{version}
|
||||
|
||||
%description devel
|
||||
Libsoup is an HTTP client/server library for GNOME. It uses GObjects
|
||||
and the glib main loop, to integrate well with GNOME applications.
|
||||
|
||||
Features:
|
||||
* Both asynchronous (GMainLoop and callback-based) and synchronous APIs
|
||||
* Automatically caches connections
|
||||
* SSL Support using GnuTLS
|
||||
* Proxy support, including authentication and SSL tunneling
|
||||
* Client support for Digest, NTLM, and Basic authentication
|
||||
* Server support for Digest and Basic authentication
|
||||
* XML-RPC support
|
||||
|
||||
%lang_package
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{_name}-%{version}
|
||||
translation-update-upstream po libsoup
|
||||
|
||||
%build
|
||||
%meson \
|
||||
-Dgssapi=enabled \
|
||||
-Dkrb5_config="$(which krb5-config)" \
|
||||
-Dvapi=enabled \
|
||||
-Dgtk_doc=true \
|
||||
-Dntlm=disabled \
|
||||
-Dsysprof=disabled \
|
||||
%{nil}
|
||||
%meson_build
|
||||
|
||||
%check
|
||||
# Run the regression tests using GnuTLS NORMAL priority
|
||||
export G_TLS_GNUTLS_PRIORITY=NORMAL
|
||||
%meson_test
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
%find_lang %{_name} %{?no_lang_C}
|
||||
|
||||
%post -n %{_name}-2_4-1 -p /sbin/ldconfig
|
||||
%postun -n %{_name}-2_4-1 -p /sbin/ldconfig
|
||||
|
||||
%files -n %{_name}-2_4-1
|
||||
%license COPYING
|
||||
%doc NEWS
|
||||
%{_libdir}/*.so.*
|
||||
|
||||
%files -n typelib-1_0-Soup-2_4
|
||||
%{_libdir}/girepository-1.0/Soup-2.4.typelib
|
||||
%{_libdir}/girepository-1.0/SoupGNOME-2.4.typelib
|
||||
|
||||
%files devel
|
||||
%doc AUTHORS README
|
||||
%{_includedir}/libsoup-2.4
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_includedir}/libsoup-gnome-2.4
|
||||
%doc %{_datadir}/gtk-doc/html/libsoup-2.4
|
||||
%{_datadir}/gir-1.0/Soup-2.4.gir
|
||||
%{_datadir}/gir-1.0/SoupGNOME-2.4.gir
|
||||
%dir %{_datadir}/vala/vapi/
|
||||
%{_datadir}/vala/vapi/libsoup-2.4.vapi
|
||||
%{_datadir}/vala/vapi/libsoup-2.4.deps
|
||||
|
||||
%files lang -f %{_name}.lang
|
||||
|
||||
%changelog
|
Loading…
Reference in New Issue
Block a user