Compare commits

..

2 Commits
rawhide ... f36

Author SHA1 Message Date
Kalev Lember 22a4dc0447 Update to 2.72.2 2022-08-18 12:38:52 +02:00
Kalev Lember 142c0de1be Update to 2.72.1 2022-07-15 15:07:16 +02:00
4 changed files with 28 additions and 15 deletions

8
.gitignore vendored
View File

@ -109,9 +109,5 @@
/glib-networking-2.72.alpha.tar.xz
/glib-networking-2.72.beta.tar.xz
/glib-networking-2.72.0.tar.xz
/glib-networking-2.74.alpha.tar.xz
/glib-networking-2.74.rc.tar.xz
/glib-networking-2.74.0.tar.xz
/glib-networking-2.76.alpha.tar.xz
/glib-networking-2.76.beta.tar.xz
/glib-networking-2.76.0.tar.xz
/glib-networking-2.72.1.tar.xz
/glib-networking-2.72.2.tar.xz

View File

@ -1,18 +1,23 @@
%define glib2_version 2.73.3
%define glib2_version 2.69.0
%global tarball_version %%(echo %{version} | tr '~' '.')
# Not yet sure whether to have libproxy in el10, but assume yes for now.
# No libproxy in RHEL
%if !0%{?rhel}
%global with_libproxy 1
%endif
Name: glib-networking
Version: 2.76.0
Version: 2.72.2
Release: %autorelease
Summary: Networking support for GLib
License: LGPLv2+
URL: https://gitlab.gnome.org/GNOME/glib-networking
Source0: https://download.gnome.org/sources/glib-networking/2.76/%{name}-%{tarball_version}.tar.xz
Source0: https://download.gnome.org/sources/glib-networking/2.72/%{name}-%{tarball_version}.tar.xz
# https://bugzilla.redhat.com/show_bug.cgi?id=2024296
Patch0: sabotage-revocation-checks.patch
BuildRequires: ca-certificates
BuildRequires: gcc
@ -33,7 +38,7 @@ Requires: glib2%{?_isa} >= %{glib2_version}
Requires: gsettings-desktop-schemas
# For glib-pacrunner
Recommends: libproxy-duktape
Recommends: libproxy-webkitgtk4
%description
This package contains modules that extend the networking support in
@ -56,7 +61,6 @@ the functionality of the installed glib-networking package.
%meson \
%if !0%{?with_libproxy}
-Dlibproxy=disabled \
-Denvironment_proxy=enabled \
%endif
-Dinstalled_tests=true \
%nil
@ -70,6 +74,7 @@ the functionality of the installed glib-networking package.
%files -f %{name}.lang
%license COPYING
%doc NEWS README
%{_libdir}/gio/modules/libgioenvironmentproxy.so
%{_libdir}/gio/modules/libgiognomeproxy.so
%{_libdir}/gio/modules/libgiognutls.so
%if 0%{?with_libproxy}
@ -77,8 +82,6 @@ the functionality of the installed glib-networking package.
%{_libexecdir}/glib-pacrunner
%{_datadir}/dbus-1/services/org.gtk.GLib.PACRunner.service
%{_userunitdir}/glib-pacrunner.service
%else
%{_libdir}/gio/modules/libgioenvironmentproxy.so
%endif
%files tests

View File

@ -0,0 +1,14 @@
diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
index 1b60740..e8fee43 100644
--- a/tls/gnutls/gtlsconnection-gnutls.c
+++ b/tls/gnutls/gtlsconnection-gnutls.c
@@ -1016,7 +1016,7 @@ g_tls_connection_gnutls_verify_chain (GTlsConnectionBase *tls,
* GTlsDatabaseGnutls.
*/
database = g_tls_connection_get_database (G_TLS_CONNECTION (gnutls));
- if (!G_IS_TLS_DATABASE_GNUTLS (database))
+ if (TRUE) /* Fedora: sabotage new codepath due to https://bugzilla.redhat.com/show_bug.cgi?id=2024296 */
{
return g_tls_database_verify_chain (database,
chain,

View File

@ -1 +1 @@
SHA512 (glib-networking-2.76.0.tar.xz) = dae704ad70312239379e1e66a4171e9315ee44e1785c9cb2563adc3f0bbab43d08a75873bfd2be12e3ed4210d4a7e177c9540815c8eb4bda89032c5354c4be30
SHA512 (glib-networking-2.72.2.tar.xz) = b2837f1521ea8312fb508d3000d465898d409bb48033a63430609331f45628f6b49eaaf16278f2ef48c41b9fccf38f78a85374d23e9ea75692a11cbd7ef058ec