From 025161251fa1a16247e3ed41853abaeca1d751d4 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 19:01:48 +0000 Subject: [PATCH] import UBI glib-networking-2.80.0-3.el10 --- .gitignore | 3 +- fedora-crypto-policy.patch | 26 ---- gating.yaml | 6 - glib-networking.spec | 310 ++++++++++++++++++++++++++++++++++--- sources | 2 +- 5 files changed, 292 insertions(+), 55 deletions(-) delete mode 100644 fedora-crypto-policy.patch delete mode 100644 gating.yaml diff --git a/.gitignore b/.gitignore index 2b5f4a4..7c1549b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/glib-networking-2.56.1.tar.xz -/glib-networking-2.56.1.tar.xz +glib-networking-2.80.0.tar.xz diff --git a/fedora-crypto-policy.patch b/fedora-crypto-policy.patch deleted file mode 100644 index b9cd94b..0000000 --- a/fedora-crypto-policy.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a4eaf05533e0e92e159fd0b964c36279726bfad3 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -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 - diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index ea86f9d..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional} diff --git a/glib-networking.spec b/glib-networking.spec index e583ac4..9666758 100644 --- a/glib-networking.spec +++ b/glib-networking.spec @@ -1,30 +1,45 @@ -%define glib2_version 2.55.1 +## START: Set by rpmautospec +## (rpmautospec version 0.6.5) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 3; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + +%define glib2_version 2.73.3 + +%global tarball_version %%(echo %{version} | tr '~' '.') Name: glib-networking -Version: 2.56.1 -Release: 1.1%{?dist} +Version: 2.80.0 +Release: %autorelease 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 +License: LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception +URL: https://gitlab.gnome.org/GNOME/glib-networking +Source0: https://download.gnome.org/sources/glib-networking/2.80/%{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: gcc +BuildRequires: gettext BuildRequires: meson -BuildRequires: systemd +BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(gsettings-desktop-schemas) +BuildRequires: pkgconfig(libproxy-1.0) +BuildRequires: pkgconfig(p11-kit-1) +BuildRequires: systemd-rpm-macros Requires: ca-certificates Requires: glib2%{?_isa} >= %{glib2_version} Requires: gsettings-desktop-schemas +# For glib-pacrunner +Recommends: libproxy-duktape + %description This package contains modules that extend the networking support in GIO. In particular, it contains libproxy- and GSettings-based @@ -33,6 +48,10 @@ implementation. %package tests Summary: Tests for the glib-networking package +# glib-networking-2.78.0/tls/tests/mock-pkcs11.c is Apache-2.0 +# pkcs11t.h is LicenseRef-RSA +# dtls-connection.c is LGPL-2.0-or-later but not currently included in the binaries +License: LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception AND Apache-2.0 AND LicenseRef-RSA Requires: %{name}%{?_isa} = %{version}-%{release} %description tests @@ -40,7 +59,7 @@ 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 @@ -49,14 +68,17 @@ the functionality of the installed glib-networking package. %install %meson_install +%check +%meson_test + %find_lang %{name} %files -f %{name}.lang -%license COPYING +%license COPYING LICENSE_EXCEPTION %doc NEWS README -%{_libdir}/gio/modules/libgiolibproxy.so %{_libdir}/gio/modules/libgiognomeproxy.so %{_libdir}/gio/modules/libgiognutls.so +%{_libdir}/gio/modules/libgiolibproxy.so %{_libexecdir}/glib-pacrunner %{_datadir}/dbus-1/services/org.gtk.GLib.PACRunner.service %{_userunitdir}/glib-pacrunner.service @@ -66,8 +88,254 @@ the functionality of the installed glib-networking package. %{_datadir}/installed-tests %changelog -* Tue Nov 20 2018 Dan Winship - 2.56.1-1.1 -- Use system crypto policy (#1640534) +## START: Generated by rpmautospec +* Tue Oct 29 2024 Troy Dawson - 2.80.0-3 +- Bump release for October 2024 mass rebuild: + +* Mon Jun 24 2024 Troy Dawson - 2.80.0-2 +- Bump release for June 2024 mass rebuild + +* Thu Apr 18 2024 Michael Catanzaro - 2.80.0-1 +- Update to 2.80.0 + +* Thu Apr 18 2024 Michael Catanzaro - 2.80~alpha-4 +- libproxy lives! Remove the !libproxy conditionals + +* Thu Apr 18 2024 Tomas Popela - 2.80~alpha-3 +- Fix license tag so its validated by license-validate + +* Tue Apr 09 2024 Tomas Pelka - 2.80~alpha-2 +- Update file gating.yaml + +* Fri Jan 26 2024 David King - 2.80~alpha-1 +- Update to 2.80.alpha + +* Wed Jan 24 2024 Fedora Release Engineering - 2.78.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 2.78.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Dec 15 2023 David King - 2.78.0-3 +- Run tests during check phase + +* Fri Dec 15 2023 Miroslav Suchý - 2.78.0-2 +- Migrate to SPDX license + +* Sat Sep 16 2023 Kalev Lember - 2.78.0-1 +- Update to 2.78.0 + +* Wed Jul 19 2023 Fedora Release Engineering - 2.76.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 30 2023 Kalev Lember - 2.76.1-1 +- Update to 2.76.1 + +* Sat Mar 18 2023 David King - 2.76.0-2 +- Update to 2.76.0 + +* Sat Mar 18 2023 David King - 2.76.0-1 +- Update to 2.76.0 + +* Wed Feb 15 2023 David King - 2.76~beta-1 +- Update to 2.76.beta + +* Mon Feb 13 2023 Michael Catanzaro - 2.76~alpha-4 +- Fix file list + +* Mon Feb 13 2023 Michael Catanzaro - 2.76~alpha-3 +- Unconditionally enable libproxy, at least for now + +* Mon Feb 13 2023 Michael Catanzaro - 2.76~alpha-2 +- Build environment proxy module only if libproxy module is disabled + +* Tue Feb 07 2023 David King - 2.76~alpha-1 +- Update to 2.76.alpha + +* Thu Jan 19 2023 Fedora Release Engineering - 2.74.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Sep 19 2022 Kalev Lember - 2.74.0-1 +- Update to 2.74.0 + +* Tue Sep 06 2022 Kalev Lember - 2.74~rc-1 +- Update to 2.74.rc + +* Tue Jul 26 2022 Michael Catanzaro - 2.74~alpha-4 +- Restore certificate revocation checking + +* Tue Jul 26 2022 Michael Catanzaro - 2.74~alpha-3 +- libproxy-webkitgtk4 -> libproxy-duktape + +* Thu Jul 21 2022 Fedora Release Engineering - 2.74~alpha-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jul 12 2022 Kalev Lember - 2.74~alpha-1 +- Update to 2.74.alpha + +* Wed Mar 23 2022 David King - 2.72.0-1 +- Update to 2.72.0 + +* Thu Feb 24 2022 Michael Catanzaro - 2.72~beta-2 +- Add Recommends: libproxy-webkitgtk4, so glib-pacrunner works + +* Sun Feb 13 2022 David King - 2.72~beta-1 +- Update to 42.beta + +* Thu Jan 20 2022 Fedora Release Engineering - 2.72~alpha-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Jan 08 2022 David King - 2.72~alpha-1 +- Update to 2.72.alpha + +* Thu Sep 16 2021 Kalev Lember - 2.70.0-1 +- Update to 2.70.0 + +* Wed Sep 08 2021 Kalev Lember - 2.70~rc-1 +- Update to 2.70.rc + +* Mon Aug 16 2021 Kalev Lember - 2.70~beta-1 +- Update to 2.70.beta + +* Wed Aug 04 2021 Kalev Lember - 2.68.1-4 +- BuildRequire systemd-rpm-macros rather than systemd + +* Thu Jul 22 2021 Fedora Release Engineering - 2.68.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 07 2021 Michael Catanzaro - 2.68.1-2 +- Disable libproxy in RHEL + +* Thu Apr 22 2021 Michael Catanzaro - 2.68.1-1 +- Update to 2.68.1 + +* Mon Mar 22 2021 Kalev Lember - 2.68.0-1 +- Update to 2.68.0 + +* Mon Mar 15 2021 Kalev Lember - 2.68~rc-1 +- Update to 2.68.rc + +* Thu Feb 18 2021 Kalev Lember - 2.68~alpha-1 +- Update to 2.68.alpha + +* Tue Jan 26 2021 Fedora Release Engineering - 2.66.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Sep 12 2020 Kalev Lember - 2.66.0-1 +- Update to 2.66.0 + +* Mon Aug 17 2020 Kalev Lember - 2.65.90-1 +- Update to 2.65.90 + +* Sat Aug 01 2020 Fedora Release Engineering - 2.65.1-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 2.65.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 20 2020 Kalev Lember - 2.65.1-1 +- Update to 2.65.1 + +* Fri May 29 2020 Kalev Lember - 2.64.3-1 +- Update to 2.64.3 + +* Tue Apr 14 2020 Michael Catanzaro - 2.64.2-1 +- Update to 2.64.2 + +* Sat Mar 28 2020 Kalev Lember - 2.64.1-1 +- Update to 2.64.1 + +* Fri Mar 06 2020 Kalev Lember - 2.64.0-1 +- Update to 2.64.0 + +* Mon Mar 02 2020 Kalev Lember - 2.63.92-1 +- Update to 2.63.92 + +* Mon Feb 17 2020 Kalev Lember - 2.63.91-1 +- Update to 2.63.91 + +* Mon Feb 03 2020 Kalev Lember - 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 - 2.62.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Jan 07 2020 Kalev Lember - 2.62.3-1 +- Update to 2.62.3 + +* Mon Dec 09 2019 Kalev Lember - 2.62.2-1 +- Update to 2.62.2 + +* Mon Oct 07 2019 Kalev Lember - 2.62.1-1 +- Update to 2.62.1 + +* Sat Sep 07 2019 Kalev Lember - 2.62.0-1 +- Update to 2.62.0 + +* Tue Sep 03 2019 Kalev Lember - 2.61.92-1 +- Update to 2.61.92 + +* Mon Aug 12 2019 Kalev Lember - 2.61.90-1 +- Update to 2.61.90 + +* Mon Aug 5 2019 Owen Taylor - 2.61.2-1 +- Update to 2.61.2 + +* Thu Jul 25 2019 Fedora Release Engineering - 2.61.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Jun 09 2019 Kalev Lember - 2.61.1-1 +- Update to 2.61.1 + +* Mon May 06 2019 Kalev Lember - 2.60.2-1 +- Update to 2.60.2 + +* Tue Apr 16 2019 Adam Williamson - 2.60.1-2 +- Rebuild with Meson fix for #1699099 + +* Tue Apr 02 2019 Kalev Lember - 2.60.1-1 +- Update to 2.60.1 + +* Wed Mar 13 2019 Kalev Lember - 2.60.0.1-1 +- Update to 2.60.0.1 + +* Mon Mar 11 2019 Kalev Lember - 2.60.0-1 +- Update to 2.60.0 + +* Mon Mar 04 2019 Kalev Lember - 2.59.92-1 +- Update to 2.59.92 + +* Tue Feb 19 2019 Kalev Lember - 2.59.91-1 +- Update to 2.59.91 + +* Tue Feb 05 2019 Kalev Lember - 2.59.90-1 +- Update to 2.59.90 + +* Thu Jan 31 2019 Fedora Release Engineering - 2.59.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 08 2019 Kalev Lember - 2.59.2-1 +- Update to 2.59.2 + +* Tue Nov 20 2018 Dan Winship - 2.58.0-3 +- Remove Fedora-only conditional on the crypto policy patch + +* Fri Sep 07 2018 Kalev Lember - 2.58.0-2 +- Rebuilt for GNOME 3.30.0 megaupdate + +* Sun Sep 02 2018 Michael Catanzaro - 2.58.0-1 +- Update to 2.58.0 + +* Mon Aug 13 2018 Kalev Lember - 2.57.90-1 +- Update to 2.57.90 + +* Tue Jul 31 2018 Florian Weimer - 2.56.1-3 +- Rebuild with fixed binutils + +* Fri Jul 13 2018 Fedora Release Engineering - 2.56.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild * Tue May 22 2018 Kalev Lember - 2.56.1-1 - Update to 2.56.1 @@ -342,3 +610,5 @@ the functionality of the installed glib-networking package. * Thu Oct 7 2010 Matthias Clasen - 2.25.0-1 - Initial packaging + +## END: Generated by rpmautospec diff --git a/sources b/sources index ef88c9a..02b9867 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glib-networking-2.56.1.tar.xz) = 474d3e334b901c7445a2ee38018a23bbf0a1f4f7403952bf0e1c882f5c9a518b11696d0c69695b3cb378e33e15f619414e46733172ff6564732b96f3c375003d +SHA512 (glib-networking-2.80.0.tar.xz) = 9707bd47a7f613bc24ac3212737b6b67c57fb6c5dc20e8659a6276750cb07d2af7d42277e4c7294644e8e833eb5aea28320f3d517073e1316860a1dee2e3dc2b