.gitignore

@@ -1 +1 @@
-SOURCES/glib-networking-2.56.1.tar.xz
+SOURCES/glib-networking-2.68.3.tar.xz

.glib-networking.metadata

@@ -1 +1 @@
-afd114bee6154e3bd99d1a30d2c1a4dc118abf16 SOURCES/glib-networking-2.56.1.tar.xz
+c1fcfb3ff99798d532fb2640b3b0b5eb112d106c SOURCES/glib-networking-2.68.3.tar.xz

SOURCES/fedora-crypto-policy.patch

@@ -1,26 +0,0 @@
-From a4eaf05533e0e92e159fd0b964c36279726bfad3 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@gnome.org>
-Date: Wed, 15 Jun 2016 10:29:50 -0500
-Subject: [PATCH] Comply with Fedora system-wide crypto policy
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1179295
----
- tls/gnutls/gtlsconnection-gnutls.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
-index d2914fa..30fa34d 100644
---- a/tls/gnutls/gtlsconnection-gnutls.c
-+++ b/tls/gnutls/gtlsconnection-gnutls.c
-@@ -213,7 +213,7 @@ g_tls_connection_gnutls_init (GTlsConnectionGnutls *gnutls)
- /* First field is "fallback", second is "allow unsafe rehandshaking" */
- static gnutls_priority_t priorities[2][2];
- 
--#define DEFAULT_BASE_PRIORITY "NORMAL:%COMPAT"
-+#define DEFAULT_BASE_PRIORITY "@SYSTEM:%COMPAT"
- 
- static void
- g_tls_connection_gnutls_init_priorities (void)
--- 
-2.13.0
-

SPECS/glib-networking.spec

@@ -1,30 +1,39 @@
-%define glib2_version 2.55.1
+%define glib2_version 2.67.0
+
+%global tarball_version %%(echo %{version} | tr '~' '.')
+
+%global with_libproxy 1
 
 Name:           glib-networking
-Version:        2.56.1
-Release:        1.1%{?dist}
+Version:        2.68.3
+Release:        3%{?dist}
 Summary:        Networking support for GLib
 
 License:        LGPLv2+
 URL:            http://www.gnome.org
-Source0:        http://download.gnome.org/sources/glib-networking/2.56/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/glib-networking/2.68/%{name}-%{tarball_version}.tar.xz
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1179295
-Patch0:         fedora-crypto-policy.patch
-
-BuildRequires:  gettext
-BuildRequires:  glib2-devel >= %{glib2_version}
-BuildRequires:  libproxy-devel
-BuildRequires:  gnutls-devel
-BuildRequires:  ca-certificates
-BuildRequires:  gsettings-desktop-schemas-devel
 BuildRequires:  meson
+BuildRequires:  gcc
+BuildRequires:  pkgconfig(glib-2.0) >= %{glib2_version}
+BuildRequires:  pkgconfig(gio-2.0)
+%if 0%{?with_libproxy}
+BuildRequires:  pkgconfig(libproxy-1.0)
+%endif
+BuildRequires:  pkgconfig(gsettings-desktop-schemas)
+BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  ca-certificates
+BuildRequires:  pkgconfig(p11-kit-1)
+BuildRequires:  gettext
 BuildRequires:  systemd
 
 Requires:       ca-certificates
 Requires:       glib2%{?_isa} >= %{glib2_version}
 Requires:       gsettings-desktop-schemas
 
+# For glib-pacrunner
+Recommends:     libproxy-webkitgtk4
+
 %description
 This package contains modules that extend the networking support in
 GIO. In particular, it contains libproxy- and GSettings-based
@@ -40,10 +49,15 @@ The glib-networking-tests package contains tests that can be used to verify
 the functionality of the installed glib-networking package.
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{name}-%{tarball_version}
 
 %build
-%meson -Dinstalled_tests=true
+%meson \
+%if !0%{?with_libproxy}
+  -Dlibproxy=disabled \
+%endif
+  -Dinstalled_tests=true \
+  %nil
 %meson_build
 
 %install
@@ -54,23 +68,178 @@ the functionality of the installed glib-networking package.
 %files -f %{name}.lang
 %license COPYING
 %doc NEWS README
-%{_libdir}/gio/modules/libgiolibproxy.so
 %{_libdir}/gio/modules/libgiognomeproxy.so
 %{_libdir}/gio/modules/libgiognutls.so
+%if 0%{?with_libproxy}
+%{_libdir}/gio/modules/libgiolibproxy.so
 %{_libexecdir}/glib-pacrunner
 %{_datadir}/dbus-1/services/org.gtk.GLib.PACRunner.service
 %{_userunitdir}/glib-pacrunner.service
+%endif
 
 %files tests
 %{_libexecdir}/installed-tests/glib-networking
 %{_datadir}/installed-tests
 
 %changelog
-* Tue Jul 25 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 2.56.1-1.1
-- Rebuilt for MSVSphere 8.8
+* Thu Feb 24 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.3-3
+- Recommends: libproxy-webkitgtk4 for glib-pacrunner
+- Related: #2056988
+
+* Tue Feb 22 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.3-2
+- Reenable libproxy dependency
+- Resolves: #2056988
+
+* Mon Dec 06 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.3-1
+- Update to 2.68.3
+- Resolves: #1947187
+
+* Thu Sep 02 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.2-1
+- Update to 2.68.2
+- Resolves: #1993765
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.68.1-3
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Mon Jun 07 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.1-2
+- Disable libproxy in RHEL
+- Resolves: #1968554
+
+* Mon May 03 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.1-1
+- Update to 2.68.1
+- Resolves: #1947188
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2.68.0-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Mon Mar 22 2021 Kalev Lember <klember@redhat.com> - 2.68.0-1
+- Update to 2.68.0
+
+* Mon Mar 15 2021 Kalev Lember <klember@redhat.com> - 2.68~rc-1
+- Update to 2.68.rc
+
+* Thu Feb 18 2021 Kalev Lember <klember@redhat.com> - 2.68~alpha-1
+- Update to 2.68.alpha
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.66.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Sep 12 2020 Kalev Lember <klember@redhat.com> - 2.66.0-1
+- Update to 2.66.0
+
+* Mon Aug 17 2020 Kalev Lember <klember@redhat.com> - 2.65.90-1
+- Update to 2.65.90
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.65.1-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.65.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 20 2020 Kalev Lember <klember@redhat.com> - 2.65.1-1
+- Update to 2.65.1
+
+* Fri May 29 2020 Kalev Lember <klember@redhat.com> - 2.64.3-1
+- Update to 2.64.3
+
+* Tue Apr 14 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.64.2-1
+- Update to 2.64.2
+
+* Sat Mar 28 2020 Kalev Lember <klember@redhat.com> - 2.64.1-1
+- Update to 2.64.1
+
+* Fri Mar 06 2020 Kalev Lember <klember@redhat.com> - 2.64.0-1
+- Update to 2.64.0
+
+* Mon Mar 02 2020 Kalev Lember <klember@redhat.com> - 2.63.92-1
+- Update to 2.63.92
+
+* Mon Feb 17 2020 Kalev Lember <klember@redhat.com> - 2.63.91-1
+- Update to 2.63.91
+
+* Mon Feb 03 2020 Kalev Lember <klember@redhat.com> - 2.63.90-1
+- Update to 2.63.90
+- Drop fedora-crypto-policy.patch that's no longer needed with 2.63.90
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.62.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Jan 07 2020 Kalev Lember <klember@redhat.com> - 2.62.3-1
+- Update to 2.62.3
+
+* Mon Dec 09 2019 Kalev Lember <klember@redhat.com> - 2.62.2-1
+- Update to 2.62.2
+
+* Mon Oct 07 2019 Kalev Lember <klember@redhat.com> - 2.62.1-1
+- Update to 2.62.1
+
+* Sat Sep 07 2019 Kalev Lember <klember@redhat.com> - 2.62.0-1
+- Update to 2.62.0
+
+* Tue Sep 03 2019 Kalev Lember <klember@redhat.com> - 2.61.92-1
+- Update to 2.61.92
+
+* Mon Aug 12 2019 Kalev Lember <klember@redhat.com> - 2.61.90-1
+- Update to 2.61.90
+
+* Mon Aug  5 2019 Owen Taylor <otaylor@redhat.com> - 2.61.2-1
+- Update to 2.61.2
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.61.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Jun 09 2019 Kalev Lember <klember@redhat.com> - 2.61.1-1
+- Update to 2.61.1
+
+* Mon May 06 2019 Kalev Lember <klember@redhat.com> - 2.60.2-1
+- Update to 2.60.2
+
+* Tue Apr 16 2019 Adam Williamson <awilliam@redhat.com> - 2.60.1-2
+- Rebuild with Meson fix for #1699099
+
+* Tue Apr 02 2019 Kalev Lember <klember@redhat.com> - 2.60.1-1
+- Update to 2.60.1
+
+* Wed Mar 13 2019 Kalev Lember <klember@redhat.com> - 2.60.0.1-1
+- Update to 2.60.0.1
+
+* Mon Mar 11 2019 Kalev Lember <klember@redhat.com> - 2.60.0-1
+- Update to 2.60.0
+
+* Mon Mar 04 2019 Kalev Lember <klember@redhat.com> - 2.59.92-1
+- Update to 2.59.92
+
+* Tue Feb 19 2019 Kalev Lember <klember@redhat.com> - 2.59.91-1
+- Update to 2.59.91
+
+* Tue Feb 05 2019 Kalev Lember <klember@redhat.com> - 2.59.90-1
+- Update to 2.59.90
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.59.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jan 08 2019 Kalev Lember <klember@redhat.com> - 2.59.2-1
+- Update to 2.59.2
+
+* Tue Nov 20 2018 Dan Winship <danw@redhat.com> - 2.58.0-3
+- Remove Fedora-only conditional on the crypto policy patch
+
+* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 2.58.0-2
+- Rebuilt for GNOME 3.30.0 megaupdate
+
+* Sun Sep 02 2018 Michael Catanzaro <mcatanzaro@igalia.com> - 2.58.0-1
+- Update to 2.58.0
+
+* Mon Aug 13 2018 Kalev Lember <klember@redhat.com> - 2.57.90-1
+- Update to 2.57.90
+
+* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 2.56.1-3
+- Rebuild with fixed binutils
 
-* Tue Nov 20 2018 Dan Winship <danw@redhat.com> - 2.56.1-1.1
-- Use system crypto policy (#1640534)
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.56.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Tue May 22 2018 Kalev Lember <klember@redhat.com> - 2.56.1-1
 - Update to 2.56.1