Disable LTO on riscv64

[..] /usr/bin/ld: /tmp/cctkGP8Z.ltrans0.ltrans.o:(.note.stapsdt+0x24): undefined reference to `glib_rcbox__acquire_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans0.ltrans.o:(.note.stapsdt+0x70): undefined reference to `glib_rcbox__release_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans0.ltrans.o:(.note.stapsdt+0xbc): undefined reference to `glib_rcbox__free_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x24): undefined reference to `glib_main__context_before_query_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x7c): undefined reference to `glib_main__context_after_query_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0xe4): undefined reference to `glib_source__set_callback_indirect_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x158): undefined reference to `glib_source__set_ready_time_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x1ac): undefined reference to `glib_main__loop_quit_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x1f4): undefined reference to `glib_source__new_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x260): undefined reference to `glib_main__context_new_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x2a8): undefined reference to `glib_main__context_default_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x2f4): undefined reference to `glib_main__loop_new_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x340): undefined reference to `glib_main__context_wakeup_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x38c): undefined reference to `glib_source__set_priority_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x3e4): undefined reference to `glib_main__context_acquire_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x438): undefined reference to `glib_main__context_acquire_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x48c): undefined reference to `glib_main__context_push_thread_default_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x4e4): undefined reference to `glib_main__source_attach_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x540): undefined reference to `glib_source__add_child_source_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x594): undefined reference to `glib_source__set_callback_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x5f0): undefined reference to `glib_source__set_name_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x63c): undefined reference to `glib_source__before_free_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x694): undefined reference to `glib_main__source_destroy_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x6ec): undefined reference to `glib_idle__add_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x748): undefined reference to `glib_idle__dispatch_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x7a8): undefined reference to `glib_main__context_release_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x7f4): undefined reference to `glib_main__context_free_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x840): undefined reference to `glib_main__context_pop_thread_default_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x898): undefined reference to `glib_main__context_before_prepare_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x8ec): undefined reference to `glib_main__context_after_prepare_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x94c): undefined reference to `glib_main__after_prepare_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x9a8): undefined reference to `glib_main__context_before_dispatch_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x9fc): undefined reference to `glib_main__context_after_dispatch_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0xa50): undefined reference to `glib_main__before_dispatch_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0xab8): undefined reference to `glib_main__after_dispatch_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0xb14): undefined reference to `glib_main__context_before_check_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0xb78): undefined reference to `glib_main__context_after_check_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0xbd0): undefined reference to `glib_main__context_after_check_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0xc28): undefined reference to `glib_main__after_check_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0xc7c): undefined reference to `glib_main__context_wakeup_acknowledge_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0xcd4): undefined reference to `glib_timeout__dispatch_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x24): undefined reference to `glib_mem__free_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x64): undefined reference to `glib_mem__alloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0xb4): undefined reference to `glib_mem__realloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x108): undefined reference to `glib_mem__alloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x158): undefined reference to `glib_mem__alloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x1a8): undefined reference to `glib_mem__alloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x1f8): undefined reference to `glib_mem__alloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x248): undefined reference to `glib_mem__realloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x29c): undefined reference to `glib_mem__realloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x2f0): undefined reference to `glib_quark__new_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x338): undefined reference to `glib_quark__new_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x380): undefined reference to `glib_quark__new_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x3c8): undefined reference to `glib_mem__alloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x418): undefined reference to `glib_mem__alloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans6.ltrans.o:(.note.stapsdt+0x24): undefined reference to `glib_rcbox__release_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans6.ltrans.o:(.note.stapsdt+0x70): undefined reference to `glib_rcbox__free_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans6.ltrans.o:(.note.stapsdt+0xb4): undefined reference to `glib_rcbox__acquire_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans7.ltrans.o:(.note.stapsdt+0x24): undefined reference to `glib_slice__free_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans7.ltrans.o:(.note.stapsdt+0x6c): undefined reference to `glib_slice__alloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans8.ltrans.o:(.note.stapsdt+0x24): undefined reference to `glib_thread__spawned_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans12.ltrans.o:(.note.stapsdt+0x24): undefined reference to `glib_timeout__add_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans12.ltrans.o:(.note.stapsdt+0x88): undefined reference to `glib_rcbox__alloc_semaphore' collect2: error: ld returned 1 exit status [..] Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
Update to 2.74.0
2022-09-18 14:19:31 +03:00 · 2022-09-18 10:45:57 +02:00 · 2022-09-06 18:54:36 +02:00 · 2022-08-26 14:25:53 -05:00 · 2022-08-26 13:31:06 -05:00 · 2022-08-15 14:50:44 +02:00
7 changed files with 1232 additions and 4168 deletions
--- a/1719.patch
+++ b/1719.patch
--- a/1728.patch
+++ b/1728.patch
@ -1,32 +0,0 @@
-From c2b8fa8a34765d42be69e7eb9a4c44eeb970f775 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@gnome.org>
-Date: Wed, 28 Oct 2020 10:41:13 -0500
-Subject: [PATCH] gsocketclient: fix crash when async connection step fails
-
-This is a regression from !1686. The tmp_error is no longer valid after
-it is "considered" and cannot be used at this point. We should print the
-error earlier instead.
-
-Fixes #2233
---
- gio/gsocketclient.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c
-index ce3c186fb..373774682 100644
--- a/gio/gsocketclient.c
-+++ b/gio/gsocketclient.c
-@@ -1837,9 +1837,9 @@ g_socket_client_connected_callback (GObject      *source,
-     {
-       if (!g_cancellable_is_cancelled (attempt->cancellable))
-         {
-+          g_debug ("GSocketClient: Connection attempt failed: %s", data->error_info->tmp_error->message);
-           clarify_connect_error (data->error_info->tmp_error, data->connectable, attempt->address);
-           consider_tmp_error (data->error_info, G_SOCKET_CLIENT_CONNECTING);
-          g_debug ("GSocketClient: Connection attempt failed: %s", data->error_info->tmp_error->message);
-           connection_attempt_remove (attempt);
-           connection_attempt_unref (attempt);
-           try_next_connection_or_finish (data, FALSE);
-- 
-GitLab
-
--- a/691
+++ b/691
@ -0,0 +1,691 @@
+* Thu Jul 01 2021 Michael Catanzaro <mcatanzaro@gnome.org> - 2.68.3-4
+- Refresh gnutls-hmac patchset to fix leaks in error path
+
+* Mon Jun 28 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.3-3
+- Drop Recommends: shared-mime-info (#1947897)
+- Remove old Conflicts: gcr < 3.28.1
+
+* Wed Jun 23 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.3-2
+- Drop check-rpath hack, no longer required
+
+* Mon Jun 21 2021 Kalev Lember <klember@redhat.com> - 2.68.3-1
+- Update to 2.68.3
+
+* Thu Jun 17 2021 Stephen Gallagher <sgallagh@redhat.com> - 2.68.2-3
+- Fix the requirement for 32-bit libgnutls.so.30
+
+* Thu Jun 17 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.2-2
+- Enable GnuTLS-based GHmac in Fedora and reenable glib2-static in RHEL
+- Consolidate GDesktopAppInfo changes into gdesktopappinfo.patch
+- Disable check-rpath since it seems to be broken
+
+* Tue May 11 2021 Kalev Lember <klember@redhat.com> - 2.68.2-1
+- Update to 2.68.2
+
+* Wed May 05 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.1-3
+- Add missing bundled provides
+
+* Wed Apr 28 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.1-2
+- Refresh GDesktopAppInfo patchset
+
+* Thu Apr 08 2021 Kalev Lember <klember@redhat.com> - 2.68.1-1
+- Update to 2.68.1
+
+* Fri Mar 26 2021 Kalev Lember <klember@redhat.com> - 2.68.0-2
+- Rebuild to fix sysprof-capture symbols leaking into libraries consuming it
+
+* Thu Mar 18 2021 Kalev Lember <klember@redhat.com> - 2.68.0-1
+- Update to 2.68.0
+
+* Thu Mar 18 2021 Petr Pisar <ppisar@redhat.com> - 2.67.6-2
+- Disable debugging glib (bug #1936339)
+
+* Thu Mar 11 2021 Kalev Lember <klember@redhat.com> - 2.67.6-1
+- Update to 2.67.6
+
+* Tue Mar 02 2021 Kalev Lember <klember@redhat.com> - 2.67.5-1
+- Update to 2.67.5
+
+* Wed Feb 24 2021 Kalev Lember <klember@redhat.com> - 2.67.4-3
+- Enable sysprof capture support
+
+* Fri Feb 19 2021 Kalev Lember <klember@redhat.com> - 2.67.4-2
+- Backport a fix for gsubprocesslauncher regression
+
+* Tue Feb 16 2021 Kalev Lember <klember@redhat.com> - 2.67.4-1
+- Update to 2.67.4
+
+* Tue Feb 09 2021 Benjamin Berg <bberg@redhat.com> - 2.67.3-2
+- Add patches to move applications into systemd scopes
+
+* Thu Feb 04 2021 Kalev Lember <klember@redhat.com> - 2.67.3-1
+- Update to 2.67.3
+- Fix gtk-doc directory ownership
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.67.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 22 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2.67.1-3
+- Drop dependency on gamin
+
+* Sat Dec 19 2020 Kevin Fenzi <kevin@scrye.com> - 2.67.1-2
+- Add already upstream patch to fix gdm crasher.
+
+* Sat Dec 19 2020 Kalev Lember <klember@redhat.com> - 2.67.1-1
+- Update to 2.67.1
+
+* Fri Dec 04 2020 Ondrej Holy <oholy@redhat.com> - 2.67.0-7
+- Explicitly create modules dir to fix ELN build
+
+* Tue Dec 01 2020 Ondrej Holy and Michael Catanzaro <mcatanzaro@redhat.com> - 2.67.0-6
+- Disable glib2-fam in RHEL
+
+* Tue Nov 24 2020 Kalev Lember <klember@redhat.com> - 2.67.0-5
+- Backport upstream patches to fix invalid use of volatile objects
+  (gcc 11 support)
+
+* Wed Nov 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.67.0-4
+- Make GnuTLS patch RHEL-specific, and make glib2-static subpackage Fedora-specific
+
+* Tue Nov 10 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.67.0-3
+- Use GnuTLS to implement GHmac (thanks to Colin Walters)
+
+* Wed Nov 04 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.67.0-2
+- Backport fix for GSocketClient crash
+
+* Thu Oct 29 2020 Kalev Lember <klember@redhat.com> - 2.67.0-1
+- Update to 2.67.0
+
+* Mon Oct 19 2020 Kalev Lember <klember@redhat.com> - 2.66.2-1
+- Update to 2.66.2
+- Drop gtk-doc patch as we finally have a new enough gtk-doc
+
+* Wed Oct 14 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.66.1-3
+- Fix yet another timezone bug
+
+* Wed Oct 14 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.66.1-2
+- Fix timezone-related bugs in many applications caused by new glib timezone cache
+
+* Thu Oct  1 2020 Kalev Lember <klember@redhat.com> - 2.66.1-1
+- Update to 2.66.1
+
+* Thu Sep 10 2020 Kalev Lember <klember@redhat.com> - 2.66.0-1
+- Update to 2.66.0
+
+* Wed Sep 02 2020 Kalev Lember <klember@redhat.com> - 2.65.3-1
+- Update to 2.65.3
+
+* Tue Aug 25 2020 Adam Williamson <awilliam@redhat.com> - 2.65.2-3
+- Backport fix for GGO #2189 (error accessing some filesystems)
+
+* Thu Aug 20 2020 Jeff Law <law@redhat.com> - 2.65.2-2
+- Re-enable LTO
+
+* Tue Aug 18 2020 Kalev Lember <klember@redhat.com> - 2.65.2-1
+- Update to 2.65.2
+
+* Mon Aug 17 2020 Kalev Lember <klember@redhat.com> - 2.65.1-1
+- Update to 2.65.1
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.65.0-5
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.65.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jun 30 2020 Jeff Law <aw@redhat.com> - 2.65.0-3
+Disable LTO
+
+* Mon Jun 22 2020 Kalev Lember <klember@redhat.com> - 2.65.0-2
+- Update gio-2.0.pc with correct gio-querymodules name when renaming it
+  (#1849441)
+
+* Mon Jun 22 2020 Kalev Lember <klember@redhat.com> - 2.65.0-1
+- Update to 2.65.0
+
+* Wed May 20 2020 Kalev Lember <klember@redhat.com> - 2.64.3-1
+- Update to 2.64.3
+
+* Tue Apr 28 2020 Tomas Popela <tpopela@redhat.com> - 2.64.2-2
+- Backport fix for a race condition in GCancellable (rhbz#1825230)
+
+* Fri Apr 10 2020 Kalev Lember <klember@redhat.com> - 2.64.2-1
+- Update to 2.64.2
+
+* Wed Mar 11 2020 Kalev Lember <klember@redhat.com> - 2.64.1-1
+- Update to 2.64.1
+
+* Mon Mar 02 2020 Kalev Lember <klember@redhat.com> - 2.64.0-1
+- Update to 2.64.0
+
+* Mon Feb 24 2020 Kalev Lember <klember@redhat.com> - 2.63.6-1
+- Update to 2.63.6
+
+* Wed Feb 12 2020 Kalev Lember <klember@redhat.com> - 2.63.5-3
+- Backport a patch to work around SELinux policies not allowing
+  SYS_sched_setattr (#1795524)
+
+* Fri Feb 07 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.63.5-2
+- Add patch for CVE-2020-6750 and related issues.
+
+* Mon Feb 03 2020 Kalev Lember <klember@redhat.com> - 2.63.5-1
+- Update to 2.63.5
+
+* Wed Jan 29 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.63.4-3
+- Fix GThreadPool initialization that is breaking createrepo_c (BZ #1795052)
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.63.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jan 24 2020 Kalev Lember <klember@redhat.com> - 2.63.4-1
+- Update to 2.63.4
+
+* Mon Dec 16 2019 Kalev Lember <klember@redhat.com> - 2.63.3-1
+- Update to 2.63.3
+
+* Mon Dec 02 2019 Kalev Lember <klember@redhat.com> - 2.63.2-1
+- Update to 2.63.2
+
+* Fri Oct 04 2019 Kalev Lember <klember@redhat.com> - 2.63.0-1
+- Update to 2.63.0
+
+* Fri Oct 04 2019 Kalev Lember <klember@redhat.com> - 2.62.1-1
+- Update to 2.62.1
+
+* Fri Sep 06 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.3-1
+- Update to 2.61.3
+
+* Mon Aug 12 2019 Kalev Lember <klember@redhat.com> - 2.61.2-1
+- Update to 2.61.2
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.61.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jun 11 2019 David King <amigadave@amigadave.com> - 2.61.1-2
+- Fix CVE-2019-12450 (#1719142)
+- Consistently use buildroot macro
+
+* Fri May 24 2019 Kalev Lember <klember@redhat.com> - 2.61.1-1
+- Update to 2.61.1
+
+* Tue Apr 16 2019 Adam Williamson <awilliam@redhat.com> - 2.61.0-2
+- Rebuild with Meson fix for #1699099
+
+* Mon Apr 15 2019 Kalev Lember <klember@redhat.com> - 2.61.0-1
+- Update to 2.61.0
+
+* Mon Apr 15 2019 Kalev Lember <klember@redhat.com> - 2.60.1-1
+- Update to 2.60.1
+
+* Wed Mar 13 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.60.0-3
+- Switch back to timestamp-based pyc invalidation mode
+
+* Wed Mar  6 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.60.0-2
+- Make sure all .py files have fixed timestamps (fixes issue with
+  parallel installability of i686 and amd64 -devel packages)
+- Switch to explicit byte compilation to override invalidation mode
+
+* Mon Mar 04 2019 Kalev Lember <klember@redhat.com> - 2.60.0-1
+- Update to 2.60.0
+
+* Mon Feb 18 2019 Kalev Lember <klember@redhat.com> - 2.59.3-1
+- Update to 2.59.3
+
+* Mon Feb 04 2019 Kalev Lember <klember@redhat.com> - 2.59.2-1
+- Update to 2.59.2
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.59.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jan 26 2019 Kalev Lember <klember@redhat.com> - 2.59.1-1
+- Update to 2.59.1
+
+* Thu Jan 03 2019 Kalev Lember <klember@redhat.com> - 2.59.0-1
+- Update to 2.59.0
+- Switch to the meson build system
+
+* Tue Dec 18 2018 Kalev Lember <klember@redhat.com> - 2.58.2-1
+- Update to 2.58.2
+
+* Fri Oct 05 2018 Kalev Lember <klember@redhat.com> - 2.58.1-2
+- Fix multilib -devel installs (#1634778)
+
+* Fri Sep 21 2018 Kalev Lember <klember@redhat.com> - 2.58.1-1
+- Update to 2.58.1
+
+* Wed Sep 05 2018 Kalev Lember <klember@redhat.com> - 2.58.0-1
+- Update to 2.58.0
+
+* Thu Aug 2 2018 Ondrej Holy <oholy@redhat.com> - 2.57.2-1
+- Update to 2.57.2
+
+* Fri Jul 20 2018 Ondrej Holy <oholy@redhat.com> - 2.57.1-1
+- Update to 2.57.1
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.56.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.56.1-5
+- Rebuilt for Python 3.7
+
+* Thu Jun 14 2018 Debarshi Ray <rishi@fedoraproject.org> - 2.56.1-4
+- Backport patch to fix possible invalid pointer in dbus callback in the FD.o
+  notification backend (RH #1584916)
+
+* Sun May 27 2018 Kalev Lember <klember@redhat.com> - 2.56.1-3
+- Fix multilib -devel installs (#1581067)
+
+* Sun May 13 2018 Fabio Valentini <decathorpe@gmail.com> - 2.56.1-2
+- Include upstream patch to fix gdbus-codegen with meson 0.46.
+
+* Sun Apr 08 2018 Kalev Lember <klember@redhat.com> - 2.56.1-1
+- Update to 2.56.1
+
+* Mon Mar 12 2018 Kalev Lember <klember@redhat.com> - 2.56.0-1
+- Update to 2.56.0
+
+* Wed Feb 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.55.2-3
+- Undo disabling mangling
+
+* Wed Feb 07 2018 Kalev Lember <klember@redhat.com> - 2.55.2-2
+- Disable brp-mangle-shebangs shebangs
+
+* Wed Feb 07 2018 Kalev Lember <klember@redhat.com> - 2.55.2-1
+- Update to 2.55.2
+- Drop ldconfig scriptlets
+
+* Wed Jan 31 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.55.1-3
+- Switch to %%ldconfig_scriptlets
+
+* Thu Jan 18 2018 Kalev Lember <klember@redhat.com> - 2.55.1-2
+- gmain: Partial revert of recent wakeup changes
+
+* Mon Jan 08 2018 Kalev Lember <klember@redhat.com> - 2.55.1-1
+- Update to 2.55.1
+- Drop upstreamed systemtap multilib fix
+
+* Tue Dec 19 2017 Kalev Lember <klember@redhat.com> - 2.55.0-1
+- Update to 2.55.0
+
+* Wed Nov 01 2017 Kalev Lember <klember@redhat.com> - 2.54.2-1
+- Update to 2.54.2
+
+* Fri Oct 06 2017 Kalev Lember <klember@redhat.com> - 2.54.1-1
+- Update to 2.54.1
+
+* Mon Sep 11 2017 Kalev Lember <klember@redhat.com> - 2.54.0-1
+- Update to 2.54.0
+
+* Tue Sep 05 2017 Kalev Lember <klember@redhat.com> - 2.53.7-1
+- Update to 2.53.7
+
+* Sat Aug 19 2017 Kalev Lember <klember@redhat.com> - 2.53.6-1
+- Update to 2.53.6
+
+* Mon Aug 07 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.53.5-1
+- Update to 2.53.5
+
+* Tue Aug 01 2017 Kalev Lember <klember@redhat.com> - 2.53.4-4
+- Backport glib-mkenums flags annotation parsing fixes
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.53.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Jul 21 2017 Kalev Lember <klember@redhat.com> - 2.53.4-2
+- Revert a GKeyFile introspection ABI change
+
+* Tue Jul 18 2017 Kalev Lember <klember@redhat.com> - 2.53.4-1
+- Update to 2.53.4
+
+* Thu Jun 22 2017 Kalev Lember <klember@redhat.com> - 2.53.3-1
+- Update to 2.53.3
+
+* Thu Jun 8 2017 Owen Taylor <otaylor@redhat.com> - 2.53.2-2
+- Make triggers also compile schemas in /app/share/glib-2.0/schemas
+
+* Wed May 24 2017 Florian Müllner <fmuellner@redhat.com> - 2.53.2-1
+- Update to 2.53.2
+
+* Mon May 15 2017 Kalev Lember <klember@redhat.com> - 2.52.2-2
+- Backport a gmain GWakeup patch to fix timedatex high CPU usage (#1450628)
+
+* Tue May 09 2017 Kalev Lember <klember@redhat.com> - 2.52.2-1
+- Update to 2.52.2
+
+* Tue Apr 11 2017 Colin Walters <walters@verbum.org> - 2.52.1-3
+- Backport patches for gmain wakeup for qemu
+  See: https://bugzilla.gnome.org/show_bug.cgi?id=761102
+
+* Tue Apr 11 2017 Colin Walters <walters@verbum.org> - 2.52.1-2
+- Explictly remove PCRE sources
+- Related: https://bugzilla.redhat.com/show_bug.cgi?id=1324770
+
+* Tue Apr 11 2017 Kalev Lember <klember@redhat.com> - 2.52.1-1
+- Update to 2.52.1
+
+* Mon Mar 20 2017 Kalev Lember <klember@redhat.com> - 2.52.0-1
+- Update to 2.52.0
+
+* Thu Mar 16 2017 Kalev Lember <klember@redhat.com> - 2.51.5-1
+- Update to 2.51.5
+
+* Thu Mar 02 2017 Kalev Lember <klember@redhat.com> - 2.51.4-2
+- Remove the dependency on dbus-launch again (#927212)
+
+* Wed Mar 01 2017 David King <amigadave@amigadave.com> - 2.51.4-1
+- Update to 2.51.4
+- Add a Requires on dbus-launch (#927212)
+- Use pkgconfig for BuildRequires
+
+* Tue Feb 14 2017 Richard Hughes <rhughes@redhat.com> - 2.51.2-1
+- Update to 2.51.2
+
+* Mon Feb 13 2017 Richard Hughes <rhughes@redhat.com> - 2.51.1-1
+- Update to 2.51.1
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.51.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 2.51.0-2
+- Rebuild for Python 3.6
+
+* Sun Oct 30 2016 Kalev Lember <klember@redhat.com> - 2.51.0-1
+- Update to 2.51.0
+
+* Wed Oct 12 2016 Kalev Lember <klember@redhat.com> - 2.50.1-1
+- Update to 2.50.1
+
+* Mon Sep 19 2016 Kalev Lember <klember@redhat.com> - 2.50.0-1
+- Update to 2.50.0
+
+* Tue Sep 13 2016 Kalev Lember <klember@redhat.com> - 2.49.7-1
+- Update to 2.49.7
+- Don't set group tags
+
+* Sun Aug 28 2016 Kalev Lember <klember@redhat.com> - 2.49.6-1
+- Update to 2.49.6
+
+* Thu Aug 18 2016 Kalev Lember <klember@redhat.com> - 2.49.5-1
+- Update to 2.49.5
+- Own /usr/share/gdb and /usr/share/systemtap directories
+
+* Tue Aug 16 2016 Miro Hrončok <mhroncok@redhat.com> - 2.49.4-3
+- Use Python 3 for the RPM Python byte compilation
+
+* Wed Jul 27 2016 Ville Skyttä <ville.skytta@iki.fi> - 2.49.4-2
+- Switch to Python 3 (#1286284)
+
+* Thu Jul 21 2016 Kalev Lember <klember@redhat.com> - 2.49.4-1
+- Update to 2.49.4
+
+* Sun Jul 17 2016 Kalev Lember <klember@redhat.com> - 2.49.3-1
+- Update to 2.49.3
+
+* Wed Jun 22 2016 Richard Hughes <rhughes@redhat.com> - 2.49.2-1
+- Update to 2.49.2
+
+* Wed Jun 01 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 2.49.1-2
+- Soften shared-mime-info dependency (#1266118)
+
+* Fri May 27 2016 Florian Müllner <fmuellner@redhat.com> - 2.49.1-1
+- Update to 2.49.1
+
+* Tue May 10 2016 Kalev Lember <klember@redhat.com> - 2.48.1-1
+- Update to 2.48.1
+
+* Wed Apr 06 2016 Colin Walters <walters@redhat.com> - 2.48.0-2
+- Explicitly require system pcre, though we happened to default to this now
+  anyways due to something else pulling PCRE into the buildroot
+  Closes rhbz#1287266
+
+* Tue Mar 22 2016 Kalev Lember <klember@redhat.com> - 2.48.0-1
+- Update to 2.48.0
+
+* Thu Mar 17 2016 Richard Hughes <rhughes@redhat.com> - 2.47.92-1
+- Update to 2.47.92
+
+* Wed Feb 24 2016 Colin Walters <walters@redhat.com> - 2.47.6.19.gad2092b-2
+- git snapshot to work around https://bugzilla.gnome.org/show_bug.cgi?id=762637
+- Add --with-python=/usr/bin/python explicitly to hopefully fix a weird
+  issue I am seeing where librepo fails to build in epel7 with this due to
+  us requiring /bin/python.
+
+* Wed Feb 17 2016 Richard Hughes <rhughes@redhat.com> - 2.47.6-1
+- Update to 2.47.6
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.47.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Jan 19 2016 David King <amigadave@amigadave.com> - 2.47.5-1
+- Update to 2.47.5
+
+* Wed Dec 16 2015 Kalev Lember <klember@redhat.com> - 2.47.4-1
+- Update to 2.47.4
+
+* Wed Nov 25 2015 Kalev Lember <klember@redhat.com> - 2.47.3-1
+- Update to 2.47.3
+
+* Wed Nov 25 2015 Kalev Lember <klember@redhat.com> - 2.47.2-1
+- Update to 2.47.2
+
+* Mon Nov 09 2015 Kevin Fenzi <kevin@scrye.com> - 2.47.1-2
+- Add full path redirect output to null and || : to triggers.
+
+* Wed Oct 28 2015 Kalev Lember <klember@redhat.com> - 2.47.1-1
+- Update to 2.47.1
+
+* Mon Oct 19 2015 Kalev Lember <klember@redhat.com> - 2.46.1-2
+- Backport an upstream fix for app launching under wayland (#1273146)
+
+* Wed Oct 14 2015 Kalev Lember <klember@redhat.com> - 2.46.1-1
+- Update to 2.46.1
+
+* Mon Sep 21 2015 Kalev Lember <klember@redhat.com> - 2.46.0-1
+- Update to 2.46.0
+
+* Mon Sep 14 2015 Kalev Lember <klember@redhat.com> - 2.45.8-1
+- Update to 2.45.8
+
+* Tue Sep 01 2015 Kalev Lember <klember@redhat.com> - 2.45.7-1
+- Update to 2.45.7
+
+* Wed Aug 19 2015 Kalev Lember <klember@redhat.com> - 2.45.6-1
+- Update to 2.45.6
+
+* Wed Aug 19 2015 Kalev Lember <klember@redhat.com> - 2.45.5-1
+- Update to 2.45.5
+
+* Fri Aug 14 2015 Matthias Clasen <mclasen@redhat.com> - 2.45.4-2
+- Add file triggers for gio modules and gsettings schemas
+
+* Tue Jul 21 2015 David King <amigadave@amigadave.com> - 2.45.4-1
+- Update to 2.45.4
+
+* Wed Jun 24 2015 Kalev Lember <klember@redhat.com> - 2.45.3-2
+- Backport a patch to fix notification withdrawing in gnome-software
+
+* Wed Jun 24 2015 David King <amigadave@amigadave.com> - 2.45.3-1
+- Update to 2.45.3
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.45.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue May 26 2015 David King <amigadave@amigadave.com> - 2.45.2-1
+- Update to 2.45.2
+
+* Thu Apr 30 2015 Kalev Lember <kalevlember@gmail.com> - 2.45.1-1
+- Update to 2.45.1
+
+* Mon Mar 23 2015 Kalev Lember <kalevlember@gmail.com> - 2.44.0-1
+- Update to 2.44.0
+
+* Tue Mar 17 2015 Kalev Lember <kalevlember@gmail.com> - 2.43.92-1
+- Update to 2.43.92
+
+* Mon Mar 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.43.91-1
+- Update to 2.43.91
+
+* Sat Feb 21 2015 Till Maas <opensource@till.name> - 2.43.90-2
+- Rebuilt for Fedora 23 Change
+  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
+
+* Wed Feb 18 2015 David King <amigadave@amigadave.com> - 2.43.90-1
+- Update to 2.43.90
+- Update man pages glob in files section
+
+* Tue Feb 10 2015 Matthias Clasen <mclasen@redhat.com> - 2.43.4-1
+- Update to 2.43.4
+
+* Tue Jan 20 2015 David King <amigadave@amigadave.com> - 2.43.3-1
+- Update to 2.43.3
+
+* Wed Dec 17 2014 Kalev Lember <kalevlember@gmail.com> - 2.43.2-1
+- Update to 2.43.2
+
+* Tue Nov 25 2014 Kalev Lember <kalevlember@gmail.com> - 2.43.1-1
+- Update to 2.43.1
+
+* Thu Oct 30 2014 Florian Müllner <fmuellner@redhat.com> - 2.43.0-1
+- Update to 2.43.0
+
+* Mon Sep 22 2014 Kalev Lember <kalevlember@gmail.com> - 2.42.0-1
+- Update to 2.42.0
+
+* Tue Sep 16 2014 Kalev Lember <kalevlember@gmail.com> - 2.41.5-1
+- Update to 2.41.5
+
+* Thu Sep  4 2014 Matthias Clasen <mclasen@redhat.com> 2.41.4-3
+- Don't remove rpath from gdbus-peer test - it doesn't work without it
+
+* Thu Sep 04 2014 Bastien Nocera <bnocera@redhat.com> 2.41.4-2
+- Fix banshee getting selected as the default movie player
+
+* Tue Sep 02 2014 Kalev Lember <kalevlember@gmail.com> - 2.41.4-1
+- Update to 2.41.4
+
+* Sat Aug 16 2014 Kalev Lember <kalevlember@gmail.com> - 2.41.3-1
+- Update to 2.41.3
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.41.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Wed Jul 23 2014 Stef Walter <stefw@redhat.com> - 2.41.2-2
+- Fix regression with GDBus array encoding rhbz#1122128
+
+* Mon Jul 14 2014 Kalev Lember <kalevlember@gmail.com> - 2.41.2-1
+- Update to 2.41.2
+
+* Sat Jul 12 2014 Tom Callaway <spot@fedoraproject.org> - 2.41.1-2
+- fix license handling
+
+* Tue Jun 24 2014 Richard Hughes <rhughes@redhat.com> - 2.41.1-1
+- Update to 2.41.1
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.41.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue May 27 2014 Kalev Lember <kalevlember@gmail.com> - 2.41.0-1
+- Update to 2.41.0
+
+* Mon Mar 24 2014 Richard Hughes <rhughes@redhat.com> - 2.40.0-1
+- Update to 2.40.0
+
+* Tue Mar 18 2014 Richard Hughes <rhughes@redhat.com> - 2.39.92-1
+- Update to 2.39.92
+
+* Tue Mar 04 2014 Richard Hughes <rhughes@redhat.com> - 2.39.91-1
+- Update to 2.39.91
+
+* Tue Feb 18 2014 Richard Hughes <rhughes@redhat.com> - 2.39.90-1
+- Update to 2.39.90
+
+* Tue Feb 04 2014 Richard Hughes <rhughes@redhat.com> - 2.39.4-1
+- Update to 2.39.4
+
+* Tue Jan 14 2014 Richard Hughes <rhughes@redhat.com> - 2.39.3-1
+- Update to 2.39.3
+
+* Sun Dec 22 2013 Richard W.M. Jones <rjones@redhat.com> - 2.39.2-2
+- Re-add static subpackage so that we can build static qemu as
+  an AArch64 binfmt.
+
+* Tue Dec 17 2013 Richard Hughes <rhughes@redhat.com> - 2.39.2-1
+- Update to 2.39.2
+
+* Mon Dec 09 2013 Richard Hughes <rhughes@redhat.com> - 2.39.1-2
+- Backport a patch from master to stop gnome-settings-daemon crashing.
+
+* Thu Nov 14 2013 Richard Hughes <rhughes@redhat.com> - 2.39.1-1
+- Update to 2.39.1
+
+* Mon Oct 28 2013 Richard Hughes <rhughes@redhat.com> - 2.39.0-1
+- Update to 2.39.0
+
+* Tue Sep 24 2013 Kalev Lember <kalevlember@gmail.com> - 2.38.0-1
+- Update to 2.38.0
+
+* Tue Sep 17 2013 Kalev Lember <kalevlember@gmail.com> - 2.37.93-1
+- Update to 2.37.93
+
+* Mon Sep 02 2013 Kalev Lember <kalevlember@gmail.com> - 2.37.7-1
+- Update to 2.37.7
+
+* Wed Aug 21 2013 Debarshi Ray <rishi@fedoraproject.org> - 2.37.6-1
+- Update to 2.37.6
+
+* Sat Aug 03 2013 Petr Pisar <ppisar@redhat.com> - 2.37.5-2
+- Perl 5.18 rebuild
+
+* Thu Aug  1 2013 Debarshi Ray <rishi@fedoraproject.org> - 2.37.5-1
+- Update to 2.37.5
+
+* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 2.37.4-2
+- Perl 5.18 rebuild
+
+* Tue Jul  9 2013 Matthias Clasen <mclasen@redhat.com> - 2.37.4-1
+- Update to 2.37.4
+
+* Thu Jun 20 2013 Debarshi Ray <rishi@fedoraproject.org> - 2.37.2-1
+- Update to 2.37.2
+
+* Tue May 28 2013 Matthias Clasen <mclasen@redhat.com> - 2.37.1-1
+- Update to 2.37.1
+- Add a tests subpackage
+
+* Sat May 04 2013 Kalev Lember <kalevlember@gmail.com> - 2.37.0-1
+- Update to 2.37.0
+
+* Sat Apr 27 2013 Thorsten Leemhuis <fedora@leemhuis.info> - 2.36.1-2
+- Fix pidgin freezes by applying patch from master (#956872)
+
+* Mon Apr 15 2013 Kalev Lember <kalevlember@gmail.com> - 2.36.1-1
+- Update to 2.36.1
+
+* Mon Mar 25 2013 Kalev Lember <kalevlember@gmail.com> - 2.36.0-1
+- Update to 2.36.0
+
+* Tue Mar 19 2013 Matthias Clasen <mclasen@redhat.com> - 2.35.9-1
+- Update to 2.35.9
+
+* Thu Feb 21 2013 Kalev Lember <kalevlember@gmail.com> - 2.35.8-1
+- Update to 2.35.8
+
+* Tue Feb 05 2013 Kalev Lember <kalevlember@gmail.com> - 2.35.7-1
+- Update to 2.35.7
+
+* Tue Jan 15 2013 Matthias Clasen <mclasen@redhat.com> - 2.35.4-1
+- Update to 2.35.4
+
+* Thu Dec 20 2012 Kalev Lember <kalevlember@gmail.com> - 2.35.3-1
+- Update to 2.35.3
+
+* Sat Nov 24 2012 Kalev Lember <kalevlember@gmail.com> - 2.35.2-1
+- Update to 2.35.2
+
+* Thu Nov 08 2012 Kalev Lember <kalevlember@gmail.com> - 2.35.1-1
+- Update to 2.35.1
+- Drop upstreamed codegen-in-datadir.patch
--- a/glib2.spec
+++ b/glib2.spec
@ -1,27 +1,17 @@
-Name: glib2
-Version: 2.67.0
-Release: 5%{?dist}
+Name:    glib2
+Version: 2.74.0
+Release: 1.0.riscv64%{?dist}
 Summary: A library of handy utility functions

 License: LGPLv2+
-URL: http://www.gtk.org
-Source0: http://download.gnome.org/sources/glib/2.67/glib-%{version}.tar.xz
+URL:     https://www.gtk.org
+Source0: https://download.gnome.org/sources/glib/2.72/glib-%{version}.tar.xz

-# Required for RHEL core crypto components policy.
+# Required for RHEL core crypto components policy. Good for Fedora too.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1630260
 # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/903
 Patch0: gnutls-hmac.patch

-# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1728
-Patch1: 1728.patch
-
-# gcc 11 support: Fix invalid use of volatile objects
-# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719
-Patch2: 1719.patch
-
-# For gnutls-hmac.patch
-BuildRequires: pkgconfig(gnutls)
-
-BuildRequires: chrpath
 BuildRequires: gcc
 BuildRequires: gcc-c++
 BuildRequires: gettext
@ -36,16 +26,33 @@ BuildRequires: meson
 BuildRequires: systemtap-sdt-devel
 BuildRequires: pkgconfig(libelf)
 BuildRequires: pkgconfig(libffi)
-BuildRequires: pkgconfig(libpcre)
+BuildRequires: pkgconfig(libpcre2-8)
 BuildRequires: pkgconfig(mount)
+BuildRequires: pkgconfig(sysprof-capture-4)
 BuildRequires: pkgconfig(zlib)
 BuildRequires: python3-devel
+BuildRequires: /usr/bin/marshalparser

-# for GIO content-type support
-Recommends: shared-mime-info
+# For gnutls-hmac.patch. We now dlopen libgnutls.so.30 so that we can build a
+# static glib2 without depending on a static build of GnuTLS as well. This will
+# ensure we notice if the GnuTLS soname bumps, so that we can update our patch.
+%if 0%{?__isa_bits} == 64
+Requires: libgnutls.so.30()(64bit)
+%else
+Requires: libgnutls.so.30
+%endif

-# glib 2.59.0 hash table changes broke older gcr versions / password prompts in gnome-shell
-Conflicts: gcr < 3.28.1
+# Remove gamin dependency
+Obsoletes: glib2-fam < 2.67.1-3
+
+Provides: bundled(gnulib)
+Provides: bundled(gvdb)
+Provides: bundled(libcharset)
+Provides: bundled(xdgmime)
+
+# This package has static probes which do not work with LTO
+# Disable LTO
+%define _lto_cflags %{nil}

 %description
 GLib is the low-level core library that forms the basis for projects
@ -69,22 +76,14 @@ BuildArch: noarch
 %description doc
 The glib2-doc package includes documentation for the GLib library.

-%package fam
-Summary: FAM monitoring module for GIO
-Requires: %{name}%{?_isa} = %{version}-%{release}
-BuildRequires: gamin-devel
-
-%description fam
-The glib2-fam package contains the FAM (File Alteration Monitor) module for GIO.
-
-%if 0%{?fedora}
 %package static
 Summary: glib static
 Requires: %{name}-devel = %{version}-%{release}
+Requires: pcre2-static
+Requires: sysprof-capture-static

 %description static
 The %{name}-static subpackage contains static libraries for %{name}.
-%endif

 %package tests
 Summary: Tests for the glib2 package
@ -98,48 +97,44 @@ the functionality of the installed glib2 package.
 %autosetup -n glib-%{version} -p1

 %build
-# Bug 1324770: Also explicitly remove PCRE sources since we use --with-pcre=system
-rm glib/pcre/*.[ch]
-
-# We cannot build with GnuTLS in Fedora since there is no gnutls-static
-# subpackage. (glib2-static is needed by qemu in Fedora, but not in RHEL.)
-# Accordingly, we can't build a usable glib2-static in RHEL.
 %meson \
    -Dman=true \
    -Ddtrace=true \
    -Dsystemtap=true \
+    -Dsysprof=enabled \
+    -Dglib_debug=disabled \
    -Dgtk_doc=true \
-    -Dfam=true \
    -Dinstalled_tests=true \
-%if 0%{?rhel}
    -Dgnutls=true \
-%endif
-%if 0%{?fedora}
    --default-library=both \
-%endif
    %{nil}

 %meson_build

 %install
 %meson_install
-# Since this is a generated .py file, set it to a known timestamp for
-# better reproducibility.
+
+# We need reproducible .pyc files across architectures to support multilib installations
+# https://bugzilla.redhat.com/show_bug.cgi?id=2008912
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/Python_Appendix/#_byte_compilation_reproducibility
+%global py_reproducible_pyc_path %{buildroot}%{_datadir}
+
+# Since this is a generated .py file, set it to a known timestamp
+# because the source timestamp is baked into the .pyc file
 # Also copy the timestamp for other .py files, because meson doesn't
 # do this, see https://github.com/mesonbuild/meson/issues/5027.
 touch -r gio/gdbus-2.0/codegen/config.py.in %{buildroot}%{_datadir}/glib-2.0/codegen/*.py
-chrpath --delete %{buildroot}%{_libdir}/*.so

 # Perform byte compilation manually to avoid issues with
 # irreproducibility of the default invalidation mode, see
 # https://www.python.org/dev/peps/pep-0552/ and
 # https://bugzilla.redhat.com/show_bug.cgi?id=1686078
-export PYTHONHASHSEED=0
-%py_byte_compile %{__python3} %{buildroot}%{_datadir}
+%py_byte_compile %{python3} %{buildroot}%{_datadir}

 mv %{buildroot}%{_bindir}/gio-querymodules %{buildroot}%{_bindir}/gio-querymodules-%{__isa_bits}
 sed -i -e "/^gio_querymodules=/s/gio-querymodules/gio-querymodules-%{__isa_bits}/" %{buildroot}%{_libdir}/pkgconfig/gio-2.0.pc

+mkdir -p %{buildroot}%{_libdir}/gio/modules
 touch %{buildroot}%{_libdir}/gio/modules/giomodule.cache

 %find_lang glib20
@ -157,13 +152,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :

 %files -f glib20.lang
-%license COPYING
-%doc AUTHORS NEWS README
-%{_libdir}/libglib-2.0.so.*
-%{_libdir}/libgthread-2.0.so.*
-%{_libdir}/libgmodule-2.0.so.*
-%{_libdir}/libgobject-2.0.so.*
-%{_libdir}/libgio-2.0.so.*
+%license LICENSES/LGPL-2.1-or-later.txt
+%doc NEWS README.md
+%{_libdir}/libglib-2.0.so.0*
+%{_libdir}/libgthread-2.0.so.0*
+%{_libdir}/libgmodule-2.0.so.0*
+%{_libdir}/libgobject-2.0.so.0*
+%{_libdir}/libgio-2.0.so.0*
 %dir %{_datadir}/bash-completion
 %dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/gapplication
@ -181,6 +176,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_bindir}/gsettings
 %{_bindir}/gdbus
 %{_bindir}/gapplication
+%{_libexecdir}/gio-launch-desktop
 %{_mandir}/man1/gio.1*
 %{_mandir}/man1/gio-querymodules.1*
 %{_mandir}/man1/glib-compile-schemas.1*
@ -223,631 +219,18 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/systemtap/

 %files doc
-%doc %{_datadir}/gtk-doc/html/*
+%{_datadir}/gtk-doc/

-%files fam
-%{_libdir}/gio/modules/libgiofam.so
-
-%if 0%{?fedora}
 %files static
 %{_libdir}/libgio-2.0.a
 %{_libdir}/libglib-2.0.a
 %{_libdir}/libgmodule-2.0.a
 %{_libdir}/libgobject-2.0.a
 %{_libdir}/libgthread-2.0.a
-%endif

 %files tests
 %{_libexecdir}/installed-tests
 %{_datadir}/installed-tests

 %changelog
-* Tue Nov 24 2020 Kalev Lember <klember@redhat.com> - 2.67.0-5
- Backport upstream patches to fix invalid use of volatile objects
-  (gcc 11 support)
-
-* Wed Nov 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.67.0-4
- Make GnuTLS patch RHEL-specific, and make glib2-static subpackage Fedora-specific
-
-* Tue Nov 10 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.67.0-3
- Use GnuTLS to implement GHmac (thanks to Colin Walters)
-
-* Wed Nov 04 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.67.0-2
- Backport fix for GSocketClient crash
-
-* Thu Oct 29 2020 Kalev Lember <klember@redhat.com> - 2.67.0-1
- Update to 2.67.0
-
-* Mon Oct 19 2020 Kalev Lember <klember@redhat.com> - 2.66.2-1
- Update to 2.66.2
- Drop gtk-doc patch as we finally have a new enough gtk-doc
-
-* Wed Oct 14 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.66.1-3
- Fix yet another timezone bug
-
-* Wed Oct 14 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.66.1-2
- Fix timezone-related bugs in many applications caused by new glib timezone cache
-
-* Thu Oct  1 2020 Kalev Lember <klember@redhat.com> - 2.66.1-1
- Update to 2.66.1
-
-* Thu Sep 10 2020 Kalev Lember <klember@redhat.com> - 2.66.0-1
- Update to 2.66.0
-
-* Wed Sep 02 2020 Kalev Lember <klember@redhat.com> - 2.65.3-1
- Update to 2.65.3
-
-* Tue Aug 25 2020 Adam Williamson <awilliam@redhat.com> - 2.65.2-3
- Backport fix for GGO #2189 (error accessing some filesystems)
-
-* Thu Aug 20 2020 Jeff Law <law@redhat.com> - 2.65.2-2
- Re-enable LTO
-
-* Tue Aug 18 2020 Kalev Lember <klember@redhat.com> - 2.65.2-1
- Update to 2.65.2
-
-* Mon Aug 17 2020 Kalev Lember <klember@redhat.com> - 2.65.1-1
- Update to 2.65.1
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.65.0-5
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.65.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jun 30 2020 Jeff Law <aw@redhat.com> - 2.65.0-3
-Disable LTO
-
-* Mon Jun 22 2020 Kalev Lember <klember@redhat.com> - 2.65.0-2
- Update gio-2.0.pc with correct gio-querymodules name when renaming it
-  (#1849441)
-
-* Mon Jun 22 2020 Kalev Lember <klember@redhat.com> - 2.65.0-1
- Update to 2.65.0
-
-* Wed May 20 2020 Kalev Lember <klember@redhat.com> - 2.64.3-1
- Update to 2.64.3
-
-* Tue Apr 28 2020 Tomas Popela <tpopela@redhat.com> - 2.64.2-2
- Backport fix for a race condition in GCancellable (rhbz#1825230)
-
-* Fri Apr 10 2020 Kalev Lember <klember@redhat.com> - 2.64.2-1
- Update to 2.64.2
-
-* Wed Mar 11 2020 Kalev Lember <klember@redhat.com> - 2.64.1-1
- Update to 2.64.1
-
-* Mon Mar 02 2020 Kalev Lember <klember@redhat.com> - 2.64.0-1
- Update to 2.64.0
-
-* Mon Feb 24 2020 Kalev Lember <klember@redhat.com> - 2.63.6-1
- Update to 2.63.6
-
-* Wed Feb 12 2020 Kalev Lember <klember@redhat.com> - 2.63.5-3
- Backport a patch to work around SELinux policies not allowing
-  SYS_sched_setattr (#1795524)
-
-* Fri Feb 07 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.63.5-2
- Add patch for CVE-2020-6750 and related issues.
-
-* Mon Feb 03 2020 Kalev Lember <klember@redhat.com> - 2.63.5-1
- Update to 2.63.5
-
-* Wed Jan 29 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.63.4-3
- Fix GThreadPool initialization that is breaking createrepo_c (BZ #1795052)
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.63.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jan 24 2020 Kalev Lember <klember@redhat.com> - 2.63.4-1
- Update to 2.63.4
-
-* Mon Dec 16 2019 Kalev Lember <klember@redhat.com> - 2.63.3-1
- Update to 2.63.3
-
-* Mon Dec 02 2019 Kalev Lember <klember@redhat.com> - 2.63.2-1
- Update to 2.63.2
-
-* Fri Oct 04 2019 Kalev Lember <klember@redhat.com> - 2.63.0-1
- Update to 2.63.0
-
-* Fri Oct 04 2019 Kalev Lember <klember@redhat.com> - 2.62.1-1
- Update to 2.62.1
-
-* Fri Sep 06 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.3-1
- Update to 2.61.3
-
-* Mon Aug 12 2019 Kalev Lember <klember@redhat.com> - 2.61.2-1
- Update to 2.61.2
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.61.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jun 11 2019 David King <amigadave@amigadave.com> - 2.61.1-2
- Fix CVE-2019-12450 (#1719142)
- Consistently use buildroot macro
-
-* Fri May 24 2019 Kalev Lember <klember@redhat.com> - 2.61.1-1
- Update to 2.61.1
-
-* Tue Apr 16 2019 Adam Williamson <awilliam@redhat.com> - 2.61.0-2
- Rebuild with Meson fix for #1699099
-
-* Mon Apr 15 2019 Kalev Lember <klember@redhat.com> - 2.61.0-1
- Update to 2.61.0
-
-* Mon Apr 15 2019 Kalev Lember <klember@redhat.com> - 2.60.1-1
- Update to 2.60.1
-
-* Wed Mar 13 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.60.0-3
- Switch back to timestamp-based pyc invalidation mode
-
-* Wed Mar  6 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.60.0-2
- Make sure all .py files have fixed timestamps (fixes issue with
-  parallel installability of i686 and amd64 -devel packages)
- Switch to explicit byte compilation to override invalidation mode
-
-* Mon Mar 04 2019 Kalev Lember <klember@redhat.com> - 2.60.0-1
- Update to 2.60.0
-
-* Mon Feb 18 2019 Kalev Lember <klember@redhat.com> - 2.59.3-1
- Update to 2.59.3
-
-* Mon Feb 04 2019 Kalev Lember <klember@redhat.com> - 2.59.2-1
- Update to 2.59.2
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.59.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jan 26 2019 Kalev Lember <klember@redhat.com> - 2.59.1-1
- Update to 2.59.1
-
-* Thu Jan 03 2019 Kalev Lember <klember@redhat.com> - 2.59.0-1
- Update to 2.59.0
- Switch to the meson build system
-
-* Tue Dec 18 2018 Kalev Lember <klember@redhat.com> - 2.58.2-1
- Update to 2.58.2
-
-* Fri Oct 05 2018 Kalev Lember <klember@redhat.com> - 2.58.1-2
- Fix multilib -devel installs (#1634778)
-
-* Fri Sep 21 2018 Kalev Lember <klember@redhat.com> - 2.58.1-1
- Update to 2.58.1
-
-* Wed Sep 05 2018 Kalev Lember <klember@redhat.com> - 2.58.0-1
- Update to 2.58.0
-
-* Thu Aug 2 2018 Ondrej Holy <oholy@redhat.com> - 2.57.2-1
- Update to 2.57.2
-
-* Fri Jul 20 2018 Ondrej Holy <oholy@redhat.com> - 2.57.1-1
- Update to 2.57.1
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.56.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.56.1-5
- Rebuilt for Python 3.7
-
-* Thu Jun 14 2018 Debarshi Ray <rishi@fedoraproject.org> - 2.56.1-4
- Backport patch to fix possible invalid pointer in dbus callback in the FD.o
-  notification backend (RH #1584916)
-
-* Sun May 27 2018 Kalev Lember <klember@redhat.com> - 2.56.1-3
- Fix multilib -devel installs (#1581067)
-
-* Sun May 13 2018 Fabio Valentini <decathorpe@gmail.com> - 2.56.1-2
- Include upstream patch to fix gdbus-codegen with meson 0.46.
-
-* Sun Apr 08 2018 Kalev Lember <klember@redhat.com> - 2.56.1-1
- Update to 2.56.1
-
-* Mon Mar 12 2018 Kalev Lember <klember@redhat.com> - 2.56.0-1
- Update to 2.56.0
-
-* Wed Feb 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.55.2-3
- Undo disabling mangling
-
-* Wed Feb 07 2018 Kalev Lember <klember@redhat.com> - 2.55.2-2
- Disable brp-mangle-shebangs shebangs
-
-* Wed Feb 07 2018 Kalev Lember <klember@redhat.com> - 2.55.2-1
- Update to 2.55.2
- Drop ldconfig scriptlets
-
-* Wed Jan 31 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.55.1-3
- Switch to %%ldconfig_scriptlets
-
-* Thu Jan 18 2018 Kalev Lember <klember@redhat.com> - 2.55.1-2
- gmain: Partial revert of recent wakeup changes
-
-* Mon Jan 08 2018 Kalev Lember <klember@redhat.com> - 2.55.1-1
- Update to 2.55.1
- Drop upstreamed systemtap multilib fix
-
-* Tue Dec 19 2017 Kalev Lember <klember@redhat.com> - 2.55.0-1
- Update to 2.55.0
-
-* Wed Nov 01 2017 Kalev Lember <klember@redhat.com> - 2.54.2-1
- Update to 2.54.2
-
-* Fri Oct 06 2017 Kalev Lember <klember@redhat.com> - 2.54.1-1
- Update to 2.54.1
-
-* Mon Sep 11 2017 Kalev Lember <klember@redhat.com> - 2.54.0-1
- Update to 2.54.0
-
-* Tue Sep 05 2017 Kalev Lember <klember@redhat.com> - 2.53.7-1
- Update to 2.53.7
-
-* Sat Aug 19 2017 Kalev Lember <klember@redhat.com> - 2.53.6-1
- Update to 2.53.6
-
-* Mon Aug 07 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.53.5-1
- Update to 2.53.5
-
-* Tue Aug 01 2017 Kalev Lember <klember@redhat.com> - 2.53.4-4
- Backport glib-mkenums flags annotation parsing fixes
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.53.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Jul 21 2017 Kalev Lember <klember@redhat.com> - 2.53.4-2
- Revert a GKeyFile introspection ABI change
-
-* Tue Jul 18 2017 Kalev Lember <klember@redhat.com> - 2.53.4-1
- Update to 2.53.4
-
-* Thu Jun 22 2017 Kalev Lember <klember@redhat.com> - 2.53.3-1
- Update to 2.53.3
-
-* Thu Jun 8 2017 Owen Taylor <otaylor@redhat.com> - 2.53.2-2
- Make triggers also compile schemas in /app/share/glib-2.0/schemas
-
-* Wed May 24 2017 Florian Müllner <fmuellner@redhat.com> - 2.53.2-1
- Update to 2.53.2
-
-* Mon May 15 2017 Kalev Lember <klember@redhat.com> - 2.52.2-2
- Backport a gmain GWakeup patch to fix timedatex high CPU usage (#1450628)
-
-* Tue May 09 2017 Kalev Lember <klember@redhat.com> - 2.52.2-1
- Update to 2.52.2
-
-* Tue Apr 11 2017 Colin Walters <walters@verbum.org> - 2.52.1-3
- Backport patches for gmain wakeup for qemu
-  See: https://bugzilla.gnome.org/show_bug.cgi?id=761102
-
-* Tue Apr 11 2017 Colin Walters <walters@verbum.org> - 2.52.1-2
- Explictly remove PCRE sources
- Related: https://bugzilla.redhat.com/show_bug.cgi?id=1324770
-
-* Tue Apr 11 2017 Kalev Lember <klember@redhat.com> - 2.52.1-1
- Update to 2.52.1
-
-* Mon Mar 20 2017 Kalev Lember <klember@redhat.com> - 2.52.0-1
- Update to 2.52.0
-
-* Thu Mar 16 2017 Kalev Lember <klember@redhat.com> - 2.51.5-1
- Update to 2.51.5
-
-* Thu Mar 02 2017 Kalev Lember <klember@redhat.com> - 2.51.4-2
- Remove the dependency on dbus-launch again (#927212)
-
-* Wed Mar 01 2017 David King <amigadave@amigadave.com> - 2.51.4-1
- Update to 2.51.4
- Add a Requires on dbus-launch (#927212)
- Use pkgconfig for BuildRequires
-
-* Tue Feb 14 2017 Richard Hughes <rhughes@redhat.com> - 2.51.2-1
- Update to 2.51.2
-
-* Mon Feb 13 2017 Richard Hughes <rhughes@redhat.com> - 2.51.1-1
- Update to 2.51.1
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.51.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 2.51.0-2
- Rebuild for Python 3.6
-
-* Sun Oct 30 2016 Kalev Lember <klember@redhat.com> - 2.51.0-1
- Update to 2.51.0
-
-* Wed Oct 12 2016 Kalev Lember <klember@redhat.com> - 2.50.1-1
- Update to 2.50.1
-
-* Mon Sep 19 2016 Kalev Lember <klember@redhat.com> - 2.50.0-1
- Update to 2.50.0
-
-* Tue Sep 13 2016 Kalev Lember <klember@redhat.com> - 2.49.7-1
- Update to 2.49.7
- Don't set group tags
-
-* Sun Aug 28 2016 Kalev Lember <klember@redhat.com> - 2.49.6-1
- Update to 2.49.6
-
-* Thu Aug 18 2016 Kalev Lember <klember@redhat.com> - 2.49.5-1
- Update to 2.49.5
- Own /usr/share/gdb and /usr/share/systemtap directories
-
-* Tue Aug 16 2016 Miro Hrončok <mhroncok@redhat.com> - 2.49.4-3
- Use Python 3 for the RPM Python byte compilation
-
-* Wed Jul 27 2016 Ville Skyttä <ville.skytta@iki.fi> - 2.49.4-2
- Switch to Python 3 (#1286284)
-
-* Thu Jul 21 2016 Kalev Lember <klember@redhat.com> - 2.49.4-1
- Update to 2.49.4
-
-* Sun Jul 17 2016 Kalev Lember <klember@redhat.com> - 2.49.3-1
- Update to 2.49.3
-
-* Wed Jun 22 2016 Richard Hughes <rhughes@redhat.com> - 2.49.2-1
- Update to 2.49.2
-
-* Wed Jun 01 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 2.49.1-2
- Soften shared-mime-info dependency (#1266118)
-
-* Fri May 27 2016 Florian Müllner <fmuellner@redhat.com> - 2.49.1-1
- Update to 2.49.1
-
-* Tue May 10 2016 Kalev Lember <klember@redhat.com> - 2.48.1-1
- Update to 2.48.1
-
-* Wed Apr 06 2016 Colin Walters <walters@redhat.com> - 2.48.0-2
- Explicitly require system pcre, though we happened to default to this now
-  anyways due to something else pulling PCRE into the buildroot
-  Closes rhbz#1287266
-
-* Tue Mar 22 2016 Kalev Lember <klember@redhat.com> - 2.48.0-1
- Update to 2.48.0
-
-* Thu Mar 17 2016 Richard Hughes <rhughes@redhat.com> - 2.47.92-1
- Update to 2.47.92
-
-* Wed Feb 24 2016 Colin Walters <walters@redhat.com> - 2.47.6.19.gad2092b-2
- git snapshot to work around https://bugzilla.gnome.org/show_bug.cgi?id=762637
- Add --with-python=/usr/bin/python explicitly to hopefully fix a weird
-  issue I am seeing where librepo fails to build in epel7 with this due to
-  us requiring /bin/python.
-
-* Wed Feb 17 2016 Richard Hughes <rhughes@redhat.com> - 2.47.6-1
- Update to 2.47.6
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.47.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Jan 19 2016 David King <amigadave@amigadave.com> - 2.47.5-1
- Update to 2.47.5
-
-* Wed Dec 16 2015 Kalev Lember <klember@redhat.com> - 2.47.4-1
- Update to 2.47.4
-
-* Wed Nov 25 2015 Kalev Lember <klember@redhat.com> - 2.47.3-1
- Update to 2.47.3
-
-* Wed Nov 25 2015 Kalev Lember <klember@redhat.com> - 2.47.2-1
- Update to 2.47.2
-
-* Mon Nov 09 2015 Kevin Fenzi <kevin@scrye.com> - 2.47.1-2
- Add full path redirect output to null and || : to triggers.
-
-* Wed Oct 28 2015 Kalev Lember <klember@redhat.com> - 2.47.1-1
- Update to 2.47.1
-
-* Mon Oct 19 2015 Kalev Lember <klember@redhat.com> - 2.46.1-2
- Backport an upstream fix for app launching under wayland (#1273146)
-
-* Wed Oct 14 2015 Kalev Lember <klember@redhat.com> - 2.46.1-1
- Update to 2.46.1
-
-* Mon Sep 21 2015 Kalev Lember <klember@redhat.com> - 2.46.0-1
- Update to 2.46.0
-
-* Mon Sep 14 2015 Kalev Lember <klember@redhat.com> - 2.45.8-1
- Update to 2.45.8
-
-* Tue Sep 01 2015 Kalev Lember <klember@redhat.com> - 2.45.7-1
- Update to 2.45.7
-
-* Wed Aug 19 2015 Kalev Lember <klember@redhat.com> - 2.45.6-1
- Update to 2.45.6
-
-* Wed Aug 19 2015 Kalev Lember <klember@redhat.com> - 2.45.5-1
- Update to 2.45.5
-
-* Fri Aug 14 2015 Matthias Clasen <mclasen@redhat.com> - 2.45.4-2
- Add file triggers for gio modules and gsettings schemas
-
-* Tue Jul 21 2015 David King <amigadave@amigadave.com> - 2.45.4-1
- Update to 2.45.4
-
-* Wed Jun 24 2015 Kalev Lember <klember@redhat.com> - 2.45.3-2
- Backport a patch to fix notification withdrawing in gnome-software
-
-* Wed Jun 24 2015 David King <amigadave@amigadave.com> - 2.45.3-1
- Update to 2.45.3
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.45.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue May 26 2015 David King <amigadave@amigadave.com> - 2.45.2-1
- Update to 2.45.2
-
-* Thu Apr 30 2015 Kalev Lember <kalevlember@gmail.com> - 2.45.1-1
- Update to 2.45.1
-
-* Mon Mar 23 2015 Kalev Lember <kalevlember@gmail.com> - 2.44.0-1
- Update to 2.44.0
-
-* Tue Mar 17 2015 Kalev Lember <kalevlember@gmail.com> - 2.43.92-1
- Update to 2.43.92
-
-* Mon Mar 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.43.91-1
- Update to 2.43.91
-
-* Sat Feb 21 2015 Till Maas <opensource@till.name> - 2.43.90-2
- Rebuilt for Fedora 23 Change
-  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
-
-* Wed Feb 18 2015 David King <amigadave@amigadave.com> - 2.43.90-1
- Update to 2.43.90
- Update man pages glob in files section
-
-* Tue Feb 10 2015 Matthias Clasen <mclasen@redhat.com> - 2.43.4-1
- Update to 2.43.4
-
-* Tue Jan 20 2015 David King <amigadave@amigadave.com> - 2.43.3-1
- Update to 2.43.3
-
-* Wed Dec 17 2014 Kalev Lember <kalevlember@gmail.com> - 2.43.2-1
- Update to 2.43.2
-
-* Tue Nov 25 2014 Kalev Lember <kalevlember@gmail.com> - 2.43.1-1
- Update to 2.43.1
-
-* Thu Oct 30 2014 Florian Müllner <fmuellner@redhat.com> - 2.43.0-1
- Update to 2.43.0
-
-* Mon Sep 22 2014 Kalev Lember <kalevlember@gmail.com> - 2.42.0-1
- Update to 2.42.0
-
-* Tue Sep 16 2014 Kalev Lember <kalevlember@gmail.com> - 2.41.5-1
- Update to 2.41.5
-
-* Thu Sep  4 2014 Matthias Clasen <mclasen@redhat.com> 2.41.4-3
- Don't remove rpath from gdbus-peer test - it doesn't work without it
-
-* Thu Sep 04 2014 Bastien Nocera <bnocera@redhat.com> 2.41.4-2
- Fix banshee getting selected as the default movie player
-
-* Tue Sep 02 2014 Kalev Lember <kalevlember@gmail.com> - 2.41.4-1
- Update to 2.41.4
-
-* Sat Aug 16 2014 Kalev Lember <kalevlember@gmail.com> - 2.41.3-1
- Update to 2.41.3
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.41.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Wed Jul 23 2014 Stef Walter <stefw@redhat.com> - 2.41.2-2
- Fix regression with GDBus array encoding rhbz#1122128
-
-* Mon Jul 14 2014 Kalev Lember <kalevlember@gmail.com> - 2.41.2-1
- Update to 2.41.2
-
-* Sat Jul 12 2014 Tom Callaway <spot@fedoraproject.org> - 2.41.1-2
- fix license handling
-
-* Tue Jun 24 2014 Richard Hughes <rhughes@redhat.com> - 2.41.1-1
- Update to 2.41.1
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.41.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue May 27 2014 Kalev Lember <kalevlember@gmail.com> - 2.41.0-1
- Update to 2.41.0
-
-* Mon Mar 24 2014 Richard Hughes <rhughes@redhat.com> - 2.40.0-1
- Update to 2.40.0
-
-* Tue Mar 18 2014 Richard Hughes <rhughes@redhat.com> - 2.39.92-1
- Update to 2.39.92
-
-* Tue Mar 04 2014 Richard Hughes <rhughes@redhat.com> - 2.39.91-1
- Update to 2.39.91
-
-* Tue Feb 18 2014 Richard Hughes <rhughes@redhat.com> - 2.39.90-1
- Update to 2.39.90
-
-* Tue Feb 04 2014 Richard Hughes <rhughes@redhat.com> - 2.39.4-1
- Update to 2.39.4
-
-* Tue Jan 14 2014 Richard Hughes <rhughes@redhat.com> - 2.39.3-1
- Update to 2.39.3
-
-* Sun Dec 22 2013 Richard W.M. Jones <rjones@redhat.com> - 2.39.2-2
- Re-add static subpackage so that we can build static qemu as
-  an AArch64 binfmt.
-
-* Tue Dec 17 2013 Richard Hughes <rhughes@redhat.com> - 2.39.2-1
- Update to 2.39.2
-
-* Mon Dec 09 2013 Richard Hughes <rhughes@redhat.com> - 2.39.1-2
- Backport a patch from master to stop gnome-settings-daemon crashing.
-
-* Thu Nov 14 2013 Richard Hughes <rhughes@redhat.com> - 2.39.1-1
- Update to 2.39.1
-
-* Mon Oct 28 2013 Richard Hughes <rhughes@redhat.com> - 2.39.0-1
- Update to 2.39.0
-
-* Tue Sep 24 2013 Kalev Lember <kalevlember@gmail.com> - 2.38.0-1
- Update to 2.38.0
-
-* Tue Sep 17 2013 Kalev Lember <kalevlember@gmail.com> - 2.37.93-1
- Update to 2.37.93
-
-* Mon Sep 02 2013 Kalev Lember <kalevlember@gmail.com> - 2.37.7-1
- Update to 2.37.7
-
-* Wed Aug 21 2013 Debarshi Ray <rishi@fedoraproject.org> - 2.37.6-1
- Update to 2.37.6
-
-* Sat Aug 03 2013 Petr Pisar <ppisar@redhat.com> - 2.37.5-2
- Perl 5.18 rebuild
-
-* Thu Aug  1 2013 Debarshi Ray <rishi@fedoraproject.org> - 2.37.5-1
- Update to 2.37.5
-
-* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 2.37.4-2
- Perl 5.18 rebuild
-
-* Tue Jul  9 2013 Matthias Clasen <mclasen@redhat.com> - 2.37.4-1
- Update to 2.37.4
-
-* Thu Jun 20 2013 Debarshi Ray <rishi@fedoraproject.org> - 2.37.2-1
- Update to 2.37.2
-
-* Tue May 28 2013 Matthias Clasen <mclasen@redhat.com> - 2.37.1-1
- Update to 2.37.1
- Add a tests subpackage
-
-* Sat May 04 2013 Kalev Lember <kalevlember@gmail.com> - 2.37.0-1
- Update to 2.37.0
-
-* Sat Apr 27 2013 Thorsten Leemhuis <fedora@leemhuis.info> - 2.36.1-2
- Fix pidgin freezes by applying patch from master (#956872)
-
-* Mon Apr 15 2013 Kalev Lember <kalevlember@gmail.com> - 2.36.1-1
- Update to 2.36.1
-
-* Mon Mar 25 2013 Kalev Lember <kalevlember@gmail.com> - 2.36.0-1
- Update to 2.36.0
-
-* Tue Mar 19 2013 Matthias Clasen <mclasen@redhat.com> - 2.35.9-1
- Update to 2.35.9
-
-* Thu Feb 21 2013 Kalev Lember <kalevlember@gmail.com> - 2.35.8-1
- Update to 2.35.8
-
-* Tue Feb 05 2013 Kalev Lember <kalevlember@gmail.com> - 2.35.7-1
- Update to 2.35.7
-
-* Tue Jan 15 2013 Matthias Clasen <mclasen@redhat.com> - 2.35.4-1
- Update to 2.35.4
-
-* Thu Dec 20 2012 Kalev Lember <kalevlember@gmail.com> - 2.35.3-1
- Update to 2.35.3
-
-* Sat Nov 24 2012 Kalev Lember <kalevlember@gmail.com> - 2.35.2-1
- Update to 2.35.2
-
-* Thu Nov 08 2012 Kalev Lember <kalevlember@gmail.com> - 2.35.1-1
- Update to 2.35.1
- Drop upstreamed codegen-in-datadir.patch
+%autochangelog
--- a/gnutls-hmac.patch
+++ b/gnutls-hmac.patch
@ -1,7 +1,7 @@
-From afb5735506e2ed1c638a8c916aa3748bf0615f32 Mon Sep 17 00:00:00 2001
+From 4fb2d2ba67cbf97a728ef5fe8b29e1f3df0a7f85 Mon Sep 17 00:00:00 2001
 From: Colin Walters <walters@verbum.org>
 Date: Fri, 7 Jun 2019 18:44:43 +0000
-Subject: [PATCH 1/2] ghmac: Split off wrapper functions into ghmac-utils.c
+Subject: [PATCH 1/4] ghmac: Split off wrapper functions into ghmac-utils.c

 Prep for adding a GnuTLS HMAC implementation; these are just
 utility functions that call the "core" API.
@ -164,11 +164,11 @@ index 000000000..a17359ff1
 +                                  (const guchar *) str, length);
 +}
 diff --git a/glib/ghmac.c b/glib/ghmac.c
-index 49fd272f0..4f181f21f 100644
+index 7ad28d6f0..516b01b24 100644
 --- a/glib/ghmac.c
 +++ b/glib/ghmac.c
-@@ -329,115 +329,3 @@ g_hmac_get_digest (GHmac  *hmac,
-   g_checksum_update (hmac->digesto, buffer, len);
+@@ -353,115 +353,3 @@ g_hmac_get_digest (GHmac  *hmac,
+   g_checksum_update (hmac->digesto, buffer, len_signed);
   g_checksum_get_digest (hmac->digesto, buffer, digest_len);
 }
 -
@ -284,10 +284,10 @@ index 49fd272f0..4f181f21f 100644
 -                                  (const guchar *) str, length);
 -}
 diff --git a/glib/meson.build b/glib/meson.build
-index aaf40a218..b3bf067c7 100644
+index 6062c11a1..6624dab48 100644
 --- a/glib/meson.build
 +++ b/glib/meson.build
-@@ -253,6 +253,7 @@ glib_sources = files(
+@@ -248,6 +248,7 @@ glib_sources = files(
   'ggettext.c',
   'ghash.c',
   'ghmac.c',
@ -296,13 +296,13 @@ index aaf40a218..b3bf067c7 100644
   'ghostutils.c',
   'giochannel.c',
 -- 
-2.28.0
+2.36.1


-From 703e63f9d8b3ea4f26f41f0d2287b301025a73cc Mon Sep 17 00:00:00 2001
+From 9df3337f963e2317ae23e7fc8dabf536c218c629 Mon Sep 17 00:00:00 2001
 From: Colin Walters <walters@verbum.org>
 Date: Fri, 7 Jun 2019 19:36:54 +0000
-Subject: [PATCH 2/2] Add a gnutls backend for GHmac
+Subject: [PATCH 2/4] Add a gnutls backend for GHmac

 For RHEL we want apps to use FIPS-certified crypto libraries,
 and HMAC apparently counts as "keyed" and hence needs to
@ -316,26 +316,55 @@ Most distributors ship glib-networking built with GnuTLS, and
 most apps use glib-networking, so this isn't a net-new library
 in most cases.

-mcatanzaro note: I've updated Colin's original patch to implement
-g_hmac_copy() using gnutls_hmac_copy(), which didn't exist when Colin
-developed this patch.
+=======================================================================
+
+mcatanzaro note:
+
+I've updated Colin's original patch with several enhancements:
+
+Implement g_hmac_copy() using gnutls_hmac_copy(), which didn't exist
+when Colin developed this patch.
+
+Removed use of GSlice
+
+Better error checking in g_hmac_new(). It is possible for
+gnutls_hmac_init() to fail if running in FIPS mode and an MD5 digest is
+requested. In this case, we should return NULL rather than returning a
+broken GHmac with a NULL gnutls_hmac_hd_t. This was leading to a later
+null pointer dereference inside gnutls_hmac_update(). Applications are
+responsible for checking to ensure the return value of g_hmac_new() is
+not NULL since it is annotated as nullable. Added documentation to
+indicate this possibility.
+
+Properly handle length -1 in g_hmac_update(). This means we've been
+given a NUL-terminated string and should use strlen(). GnuTLS doesn't
+accept -1, so let's call strlen() ourselves.
+
+Crash the application with g_error() if gnutls_hmac() fails for any
+reason. This is necessary because g_hmac_update() is not fallible, so we
+have no way to indicate error. Crashing seems better than returning the
+wrong result later when g_hmac_get_string() or g_hmac_get_digest() is
+later called. (Those functions are also not fallible.) Fortunately, I
+don't think this error should actually be hit in practice.
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/903
 ---
- glib/gchecksum.c        |   9 ++-
- glib/gchecksumprivate.h |  32 ++++++++
- glib/ghmac-gnutls.c     | 164 ++++++++++++++++++++++++++++++++++++++++
- glib/ghmac.c            |   3 +
+ glib/gchecksum.c        |   9 +-
+ glib/gchecksumprivate.h |  32 +++++++
+ glib/ghmac-gnutls.c     | 187 ++++++++++++++++++++++++++++++++++++++++
+ glib/ghmac.c            |  15 ++++
 glib/meson.build        |  10 ++-
 meson.build             |   7 ++
 meson_options.txt       |   5 ++
- 7 files changed, 224 insertions(+), 6 deletions(-)
+ 7 files changed, 259 insertions(+), 6 deletions(-)
 create mode 100644 glib/gchecksumprivate.h
 create mode 100644 glib/ghmac-gnutls.c

 diff --git a/glib/gchecksum.c b/glib/gchecksum.c
-index f8a3f9ab8..b391a6264 100644
+index fea7803cd..3c443840e 100644
 --- a/glib/gchecksum.c
 +++ b/glib/gchecksum.c
-@@ -20,7 +20,7 @@
+@@ -22,7 +22,7 @@
 
 #include <string.h>
 
@ -344,7 +373,7 @@ index f8a3f9ab8..b391a6264 100644
 
 #include "gslice.h"
 #include "gmem.h"
-@@ -173,9 +173,9 @@ sha_byte_reverse (guint32 *buffer,
+@@ -175,9 +175,9 @@ sha_byte_reverse (guint32 *buffer,
 }
 #endif /* G_BYTE_ORDER == G_BIG_ENDIAN */
 
@ -357,7 +386,7 @@ index f8a3f9ab8..b391a6264 100644
 {
   gsize i, len = digest_len * 2;
   gchar *retval;
-@@ -194,6 +194,7 @@ digest_to_string (guint8 *digest,
+@@ -196,6 +196,7 @@ digest_to_string (guint8 *digest,
 
   return retval;
 }
@ -406,10 +435,10 @@ index 000000000..86c7a3b61
 \ No newline at end of file
 diff --git a/glib/ghmac-gnutls.c b/glib/ghmac-gnutls.c
 new file mode 100644
-index 000000000..f1a74a849
+index 000000000..9fb775f89
 --- /dev/null
 +++ b/glib/ghmac-gnutls.c
-@@ -0,0 +1,164 @@
+@@ -0,0 +1,187 @@
 +/* ghmac.h - data hashing functions
 + *
 + * Copyright (C) 2011  Collabora Ltd.
@ -464,9 +493,11 @@ index 000000000..f1a74a849
 +            gsize          key_len)
 +{
 +  gnutls_mac_algorithm_t algo;
-+  GHmac *hmac = g_slice_new0 (GHmac);
+  GHmac *hmac = g_new0 (GHmac, 1);
+  int ret;
+
 +  hmac->ref_count = 1;
-+  hmac->digest_type = digest_type;  
+  hmac->digest_type = digest_type;
 +
 +  switch (digest_type)
 +    {
@ -486,10 +517,19 @@ index 000000000..f1a74a849
 +      algo = GNUTLS_MAC_SHA512;
 +      break;
 +    default:
+      g_free (hmac);
 +      g_return_val_if_reached (NULL);
 +    }
 +
-+  gnutls_hmac_init (&hmac->hmac, algo, key, key_len);
+  ret = gnutls_hmac_init (&hmac->hmac, algo, key, key_len);
+  if (ret != 0)
+    {
+      /* There is no way to report an error here, but one possible cause of
+       * failure is that the requested digest may be disabled by FIPS mode.
+       */
+      g_free (hmac);
+      return NULL;
+    }
 +
 +  return hmac;
 +}
@ -501,11 +541,15 @@ index 000000000..f1a74a849
 +
 +  g_return_val_if_fail (hmac != NULL, NULL);
 +
-+  copy = g_slice_new0 (GHmac);
+  copy = g_new0 (GHmac, 1);
 +  copy->ref_count = 1;
 +  copy->digest_type = hmac->digest_type;
 +  copy->hmac = gnutls_hmac_copy (hmac->hmac);
 +
+  /* g_hmac_copy is not allowed to fail, so we'll have to crash on error. */
+  if (!copy->hmac)
+    g_error ("gnutls_hmac_copy failed");
+
 +  return copy;
 +}
 +
@ -528,7 +572,7 @@ index 000000000..f1a74a849
 +    {
 +      gnutls_hmac_deinit (hmac->hmac, NULL);
 +      g_free (hmac->digest_str);
-+      g_slice_free (GHmac, hmac);
+      g_free (hmac);
 +    }
 +}
 +
@ -538,10 +582,18 @@ index 000000000..f1a74a849
 +               const guchar *data,
 +               gssize        length)
 +{
+  int ret;
+
 +  g_return_if_fail (hmac != NULL);
 +  g_return_if_fail (length == 0 || data != NULL);
 +
-+  gnutls_hmac (hmac->hmac, data, length);
+  if (length == -1)
+    length = strlen ((const char *)data);
+
+  /* g_hmac_update is not allowed to fail, so we'll have to crash on error. */
+  ret = gnutls_hmac (hmac->hmac, data, length);
+  if (ret != 0)
+    g_error ("gnutls_hmac failed: %s", gnutls_strerror (ret));
 +}
 +
 +const gchar *
@ -575,10 +627,10 @@ index 000000000..f1a74a849
 +  *digest_len = g_checksum_type_get_length (hmac->digest_type);
 +}
 diff --git a/glib/ghmac.c b/glib/ghmac.c
-index 4f181f21f..c62d9ce4e 100644
+index 516b01b24..a4851cc64 100644
 --- a/glib/ghmac.c
 +++ b/glib/ghmac.c
-@@ -33,6 +33,9 @@
+@@ -35,6 +35,9 @@
 #include "gtypes.h"
 #include "glibintl.h"
 
@ -588,11 +640,30 @@ index 4f181f21f..c62d9ce4e 100644
 
 /**
  * SECTION:hmac
+@@ -86,6 +89,18 @@ struct _GHmac
+  * Support for digests of type %G_CHECKSUM_SHA512 has been added in GLib 2.42.
+  * Support for %G_CHECKSUM_SHA384 was added in GLib 2.52.
+  *
+ * Note that #GHmac creation may fail, in which case this function will
+ * return %NULL. Since there is no error parameter, it is not possible
+ * to indicate why.
+ *
+ * In Fedora, CentOS Stream, and Red Hat Enterprise Linux, GLib is
+ * configured to use GnuTLS to implement #GHmac in order to support FIPS
+ * compliance. This introduces additional failure possibilities that are
+ * not present in upstream GLib. For example, the creation of a #GHmac
+ * will fail if @digest_type is %G_CHECKSUM_MD5 and the system is
+ * running in FIPS mode. #GHmac creation may also fail if GLib is unable
+ * to load GnuTLS.
+ *
+  * Returns: the newly created #GHmac, or %NULL.
+  *   Use g_hmac_unref() to free the memory allocated by it.
+  *
 diff --git a/glib/meson.build b/glib/meson.build
-index b3bf067c7..3cdc3b573 100644
+index 6624dab48..4e3365f61 100644
 --- a/glib/meson.build
 +++ b/glib/meson.build
-@@ -252,7 +252,6 @@ glib_sources = files(
+@@ -247,7 +247,6 @@ glib_sources = files(
   'gfileutils.c',
   'ggettext.c',
   'ghash.c',
@ -600,7 +671,7 @@ index b3bf067c7..3cdc3b573 100644
   'ghmac-utils.c',
   'ghook.c',
   'ghostutils.c',
-@@ -308,6 +307,7 @@ glib_sources = files(
+@@ -303,6 +302,7 @@ glib_sources = files(
   'guriprivate.h',
   'gutils.c',
   'gutilsprivate.h',
@ -608,7 +679,7 @@ index b3bf067c7..3cdc3b573 100644
   'guuid.c',
   'gvariant.c',
   'gvariant-core.c',
-@@ -352,6 +352,12 @@ else
+@@ -358,6 +358,12 @@ else
   glib_dtrace_hdr = []
 endif
 
@ -618,23 +689,23 @@ index b3bf067c7..3cdc3b573 100644
 +  glib_sources += files('ghmac.c')
 +endif
 +
- pcre_static_args = []
+ pcre2_static_args = []
 
- if use_pcre_static_flag
-@@ -378,7 +384,7 @@ libglib = library('glib-2.0',
-   # intl.lib is not compatible with SAFESEH
+ if use_pcre2_static_flag
+@@ -376,7 +382,7 @@ libglib = library('glib-2.0',
   link_args : [noseh_link_args, glib_link_flags, win32_ldflags],
   include_directories : configinc,
-  dependencies : pcre_deps + [thread_dep, librt] + libintl_deps + libiconv + platform_deps + gnulib_libm_dependency + [libsysprof_capture_dep],
-+  dependencies : pcre_deps + libgnutls_dep + [thread_dep, librt] + libintl_deps + libiconv + platform_deps + gnulib_libm_dependency + [libsysprof_capture_dep],
+   link_with: [charset_lib, gnulib_lib],
+-  dependencies : [pcre2, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep],
+  dependencies : [pcre2, thread_dep, librt] + libgnutls_dep + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep],
   c_args : glib_c_args,
   objc_args : glib_c_args,
 )
 diff --git a/meson.build b/meson.build
-index e0b308a25..70dd5355e 100644
+index b3dea2ea1..464e59e09 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2056,6 +2056,13 @@ if host_system == 'linux'
+@@ -2113,6 +2113,13 @@ if host_system == 'linux'
   glib_conf.set('HAVE_LIBMOUNT', libmount_dep.found())
 endif
 
@ -647,9 +718,9 @@ index e0b308a25..70dd5355e 100644
 +
 if host_system == 'windows'
   winsock2 = cc.find_library('ws2_32')
- endif
+ else
 diff --git a/meson_options.txt b/meson_options.txt
-index af9645eda..2c4b2c37e 100644
+index a52eed9d2..4eb577798 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
@@ -34,6 +34,11 @@ option('libmount',
@ -661,8 +732,359 @@ index af9645eda..2c4b2c37e 100644
 +       value : false,
 +       description : 'build with gnutls support')
 +
- option('internal_pcre',
+ option('man',
        type : 'boolean',
        value : false,
 -- 
-2.28.0
+2.36.1
+
+
+From 019c4323d379c80344a0146e1fee2008fd6d3b51 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Wed, 16 Jun 2021 20:35:00 -0500
+Subject: [PATCH 3/4] dlopen GnuTLS instead of linking directly
+
+I'd like to enable our GnuTLS GHmac patchset in Fedora in order to
+ensure it is receiving sufficient real-world testing, since we've
+discovered several bugs thus far. Problem is Fedora has one requirement
+that RHEL does not: it needs to build glib as a static lib. This is
+needed by QEMU in Fedora for complicated technical reasons that I don't
+understand. However, nothing in RHEL needs it. This means we failed to
+notice that glib2-static is broken in RHEL, because there is no
+gnutls-static! We could fix this by adding a gnutls-static package, but
+that seems like overkill, and adding more static libraries where they're
+not truly necessary is not the direction we want to move in anyway. So
+instead, let's just dlopen GnuTLS to sidestep this problem entirely.
+
+This would not be a good solution for upstream, but upstream has made
+clear that this patchset is already non-upstreamable, so it will be fine
+for our purposes.
+---
+ glib/ghmac-gnutls.c | 101 ++++++++++++++++++++++++++++++++++++++++++--
+ glib/ghmac.c        |   2 +-
+ glib/meson.build    |   2 +-
+ meson.build         |   6 +--
+ 4 files changed, 102 insertions(+), 9 deletions(-)
+
+diff --git a/glib/ghmac-gnutls.c b/glib/ghmac-gnutls.c
+index 9fb775f89..1800fc2e0 100644
+--- a/glib/ghmac-gnutls.c
+++ b/glib/ghmac-gnutls.c
+@@ -19,8 +19,8 @@
+ 
+ #include "config.h"
+ 
+#include <dlfcn.h>
+ #include <string.h>
+-#include <gnutls/crypto.h>
+ 
+ #include "ghmac.h"
+ 
+@@ -31,13 +31,16 @@
+ #include "gstrfuncs.h"
+ #include "gchecksumprivate.h"
+ #include "gtestutils.h"
+#include "gthread.h"
+ #include "gtypes.h"
+ #include "glibintl.h"
+ 
+-#ifndef HAVE_GNUTLS
+#ifndef USE_GNUTLS
+ #error "build configuration error"
+ #endif
+ 
+typedef gpointer gnutls_hmac_hd_t;
+
+ struct _GHmac
+ {
+   int ref_count;
+@@ -46,15 +49,107 @@ struct _GHmac
+   gchar *digest_str;
+ };
+ 
+typedef enum
+{
+  GNUTLS_MAC_MD5 = 2,
+  GNUTLS_MAC_SHA1 = 3,
+  GNUTLS_MAC_SHA256 = 6,
+  GNUTLS_MAC_SHA384 = 7,
+  GNUTLS_MAC_SHA512 = 8,
+} gnutls_mac_algorithm_t;
+
+/* Why are we dlopening GnuTLS instead of linking to it directly? Because we
+ * want to be able to build GLib as a static library without depending on a
+ * static build of GnuTLS. QEMU depends on static linking with GLib, but Fedora
+ * does not ship a static build of GnuTLS, and this allows us to avoid changing
+ * that.
+ */
+static int              (*gnutls_hmac_init)   (gnutls_hmac_hd_t *dig, gnutls_mac_algorithm_t algorithm, const void *key, size_t keylen);
+static gnutls_hmac_hd_t (*gnutls_hmac_copy)   (gnutls_hmac_hd_t handle);
+static void             (*gnutls_hmac_deinit) (gnutls_hmac_hd_t handle, void *digest);
+static int              (*gnutls_hmac)        (gnutls_hmac_hd_t handle, const void *ptext, size_t ptext_len);
+static void             (*gnutls_hmac_output) (gnutls_hmac_hd_t handle, void *digest);
+static const char *     (*gnutls_strerror)    (int error);
+
+static gsize gnutls_initialize_attempted = 0;
+static gboolean gnutls_initialize_successful = FALSE;
+
+static void
+initialize_gnutls (void)
+{
+  gpointer libgnutls;
+
+  libgnutls = dlopen ("libgnutls.so.30", RTLD_LAZY | RTLD_GLOBAL);
+  if (!libgnutls)
+    {
+      g_warning ("Cannot use GHmac: failed to load libgnutls.so.30: %s", dlerror ());
+      return;
+    }
+
+  gnutls_hmac_init = dlsym (libgnutls, "gnutls_hmac_init");
+  if (!gnutls_hmac_init)
+    {
+      g_warning ("Cannot use GHmac: failed to load gnutls_hmac_init: %s", dlerror ());
+      return;
+    }
+
+  gnutls_hmac_copy = dlsym (libgnutls, "gnutls_hmac_copy");
+  if (!gnutls_hmac_copy)
+    {
+      g_warning ("Cannot use GHmac: failed to load gnutls_hmac_copy: %s", dlerror ());
+      return;
+    }
+
+  gnutls_hmac_deinit = dlsym (libgnutls, "gnutls_hmac_deinit");
+  if (!gnutls_hmac_deinit)
+    {
+      g_warning ("Cannot use GHmac: failed to load gnutls_hmac_deinit: %s", dlerror ());
+      return;
+    }
+
+  gnutls_hmac = dlsym (libgnutls, "gnutls_hmac");
+  if (!gnutls_hmac)
+    {
+      g_warning ("Cannot use GHmac: failed to load gnutls_hmac: %s", dlerror ());
+      return;
+    }
+
+  gnutls_hmac_output = dlsym (libgnutls, "gnutls_hmac_output");
+  if (!gnutls_hmac_output)
+    {
+      g_warning ("Cannot use GHmac: failed to load gnutls_hmac_output: %s", dlerror ());
+      return;
+    }
+
+  gnutls_strerror = dlsym (libgnutls, "gnutls_strerror");
+  if (!gnutls_strerror)
+    {
+      g_warning ("Cannot use GHmac: failed to load gnutls_strerror: %s", dlerror ());
+      return;
+    }
+
+  gnutls_initialize_successful = TRUE;
+}
+
+ GHmac *
+ g_hmac_new (GChecksumType  digest_type,
+             const guchar  *key,
+             gsize          key_len)
+ {
+   gnutls_mac_algorithm_t algo;
+-  GHmac *hmac = g_new0 (GHmac, 1);
+  GHmac *hmac;
+   int ret;
+ 
+  if (g_once_init_enter (&gnutls_initialize_attempted))
+    {
+      initialize_gnutls ();
+      g_once_init_leave (&gnutls_initialize_attempted, 1);
+    }
+
+  if (!gnutls_initialize_successful)
+    return NULL;
+
+  hmac = g_new0 (GHmac, 1);
+   hmac->ref_count = 1;
+   hmac->digest_type = digest_type;
+ 
+diff --git a/glib/ghmac.c b/glib/ghmac.c
+index a4851cc64..20e64fd00 100644
+--- a/glib/ghmac.c
+++ b/glib/ghmac.c
+@@ -35,7 +35,7 @@
+ #include "gtypes.h"
+ #include "glibintl.h"
+ 
+-#ifdef HAVE_GNUTLS
+#ifdef USE_GNUTLS
+ #error "build configuration error"
+ #endif
+ 
+diff --git a/glib/meson.build b/glib/meson.build
+index 4e3365f61..3b2a246c4 100644
+--- a/glib/meson.build
+++ b/glib/meson.build
+@@ -382,7 +382,7 @@ libglib = library('glib-2.0',
+   link_args : [noseh_link_args, glib_link_flags, win32_ldflags],
+   include_directories : configinc,
+   link_with: [charset_lib, gnulib_lib],
+-  dependencies : [pcre2, thread_dep, librt] + libgnutls_dep + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep],
+  dependencies : [pcre2, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep] + [libdl_dep],
+   c_args : glib_c_args,
+   objc_args : glib_c_args,
+ )
+diff --git a/meson.build b/meson.build
+index 464e59e09..366c35fef 100644
+--- a/meson.build
+++ b/meson.build
+@@ -2113,11 +2113,9 @@ if host_system == 'linux'
+   glib_conf.set('HAVE_LIBMOUNT', libmount_dep.found())
+ endif
+ 
+-# gnutls is used optionally by ghmac
+-libgnutls_dep = []
+# gnutls is used optionally by GHmac
+ if get_option('gnutls')
+-  libgnutls_dep = [dependency('gnutls', version : '>=3.6.9', required : true)]
+-  glib_conf.set('HAVE_GNUTLS', 1)
+  glib_conf.set('USE_GNUTLS', 1)
+ endif
+ 
+ if host_system == 'windows'
+-- 
+2.36.1
+
+
+From 67f0f37e072b8629644efd4a657f73ce72da042b Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Wed, 16 Jun 2021 20:46:24 -0500
+Subject: [PATCH 4/4] Add test for GHmac in FIPS mode
+
+This will test a few problems that we hit recently:
+
+g_hmac_copy() is broken, https://bugzilla.redhat.com/show_bug.cgi?id=1786538
+
+Crash in g_hmac_update() in FIPS mode, https://bugzilla.redhat.com/show_bug.cgi?id=1971533
+
+Crash when passing -1 length to g_hmac_update() (discovered in #1971533)
+
+We'll also test to ensure MD5 fails, and stop compiling the other MD5
+tests.
+---
+ glib/tests/hmac.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 46 insertions(+)
+
+diff --git a/glib/tests/hmac.c b/glib/tests/hmac.c
+index 3ac3206df..2fa447984 100644
+--- a/glib/tests/hmac.c
+++ b/glib/tests/hmac.c
+@@ -1,7 +1,10 @@
+#include "config.h"
+
+ #include <glib.h>
+ #include <string.h>
+ #include <stdlib.h>
+ 
+#ifndef USE_GNUTLS
+ /* HMAC-MD5 test vectors as per RFC 2202 */
+ 
+ /* Test 1 */
+@@ -81,6 +84,7 @@ guint8 key_md5_test7[] = {
+ guint8 result_md5_test7[] = {
+     0x6f, 0x63, 0x0f, 0xad, 0x67, 0xcd, 0xa0, 0xee, 0x1f, 0xb1,
+     0xf5, 0x62, 0xdb, 0x3a, 0xa5, 0x3e };
+#endif
+ 
+ /* HMAC-SHA1, HMAC-SHA256, HMAC-SHA384 and HMAC-SHA512 test vectors
+  * as per RFCs 2202 and 4868.
+@@ -299,6 +303,7 @@ typedef struct {
+   gconstpointer result;
+ } HmacCase;
+ 
+#ifndef USE_GNUTLS
+ HmacCase hmac_md5_tests[] = {
+   { G_CHECKSUM_MD5, key_md5_test1, 16, "Hi There", 8, result_md5_test1 },
+   { G_CHECKSUM_MD5, "Jefe", 4, "what do ya want for nothing?", 28,
+@@ -317,6 +322,7 @@ HmacCase hmac_md5_tests[] = {
+       73, result_md5_test7 },
+   { -1, NULL, 0, NULL, 0, NULL },
+ };
+#endif
+ 
+ HmacCase hmac_sha1_tests[] = {
+   { G_CHECKSUM_SHA1, key_sha_test1, 20, "Hi There", 8, result_sha1_test1 },
+@@ -493,11 +499,45 @@ test_hmac_for_bytes (void)
+   g_bytes_unref (data);
+ }
+ 
+#ifdef USE_GNUTLS
+static void
+test_gnutls_fips_mode (void)
+{
+  GHmac *hmac;
+  GHmac *copy;
+
+  /* No MD5 in FIPS mode. */
+  hmac = g_hmac_new (G_CHECKSUM_MD5, (guchar *)"abc123", sizeof ("abc123"));
+  g_assert_null (hmac);
+
+  /* SHA-256 should be good. */
+  hmac = g_hmac_new (G_CHECKSUM_SHA256, (guchar *)"abc123", sizeof ("abc123"));
+  g_assert_nonnull (hmac);
+
+  /* Ensure g_hmac_update() does not crash when called with -1. */
+  g_hmac_update (hmac, (guchar *)"You win again, gravity!", -1);
+
+  /* Ensure g_hmac_copy() does not crash. */
+  copy = g_hmac_copy (hmac);
+  g_assert_nonnull (hmac);
+  g_hmac_unref (hmac);
+
+  g_assert_cmpstr (g_hmac_get_string (copy), ==, "795ba6900bcb22e8ce65c2ec02db4e85697da921deb960ee3143bf88a4a60f83");
+  g_hmac_unref (copy);
+}
+#endif
+
+ int
+ main (int argc,
+     char **argv)
+ {
+   int i;
+
+#ifdef USE_GNUTLS
+  /* This has to happen before GnuTLS is dlopened. */
+  g_setenv ("GNUTLS_FORCE_FIPS_MODE", "1", FALSE);
+#endif
+
+   g_test_init (&argc, &argv, NULL);
+ 
+   for (i = 0 ; hmac_sha1_tests[i].key_len > 0 ; i++)
+@@ -532,6 +572,7 @@ main (int argc,
+       g_free (name);
+     }
+ 
+#ifndef USE_GNUTLS
+   for (i = 0 ; hmac_md5_tests[i].key_len > 0 ; i++)
+     {
+       gchar *name = g_strdup_printf ("/hmac/md5-%d", i + 1);
+@@ -539,6 +580,7 @@ main (int argc,
+         (void (*)(const void *)) test_hmac);
+       g_free (name);
+     }
+#endif
+ 
+   g_test_add_func ("/hmac/ref-unref", test_hmac_ref_unref);
+   g_test_add_func ("/hmac/copy", test_hmac_copy);
+@@ -546,5 +588,9 @@ main (int argc,
+   g_test_add_func ("/hmac/for-string", test_hmac_for_string);
+   g_test_add_func ("/hmac/for-bytes", test_hmac_for_bytes);
+ 
+#ifdef USE_GNUTLS
+  g_test_add_func ("/hmac/gnutls-fips-mode", test_gnutls_fips_mode);
+#endif
+
+   return g_test_run ();
+ }
+-- 
+2.36.1
+
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -0,0 +1,17 @@
+---
+annocheck:
+    ignore:
+        - /usr/libexec/installed-tests/glib/mem-overflow
+        - /usr/libexec/installed-tests/glib/resources
+elf:
+    ignore:
+        - /usr/libexec/installed-tests/glib/resources
+inspections:
+    # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2097
+    badfuncs: off
+runpath:
+    allowed_paths:
+        - /usr/libexec/installed-tests/glib
+xml:
+    ignore:
+        - /usr/libexec/installed-tests/glib/bookmarks/fail-*.xbel
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (glib-2.67.0.tar.xz) = 82d562bc80885c7e516e38f17a8830596b32b1e1a4b58454ca589be79e6ab27e0a2fe0a108cb02da21981c75474abed0263c0aa38c71ead45a68db675a1d2f80
+SHA512 (glib-2.74.0.tar.xz) = 5cdadd2f4568c0c3d45083b4d39699abf651e42e020f7bc880cce3ff33d28943118388d17a0632777e843f48009c1f97d5634fde3cb8c69c7c7f35b278ac8225
Author	SHA1	Message	Date
David Abdurachmanov	3fe4d4fe1d	Disable LTO on riscv64 [..] /usr/bin/ld: /tmp/cctkGP8Z.ltrans0.ltrans.o:(.note.stapsdt+0x24): undefined reference to `glib_rcbox__acquire_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans0.ltrans.o:(.note.stapsdt+0x70): undefined reference to `glib_rcbox__release_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans0.ltrans.o:(.note.stapsdt+0xbc): undefined reference to `glib_rcbox__free_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x24): undefined reference to `glib_main__context_before_query_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x7c): undefined reference to `glib_main__context_after_query_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0xe4): undefined reference to `glib_source__set_callback_indirect_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x158): undefined reference to `glib_source__set_ready_time_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x1ac): undefined reference to `glib_main__loop_quit_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x1f4): undefined reference to `glib_source__new_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x260): undefined reference to `glib_main__context_new_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x2a8): undefined reference to `glib_main__context_default_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x2f4): undefined reference to `glib_main__loop_new_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x340): undefined reference to `glib_main__context_wakeup_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x38c): undefined reference to `glib_source__set_priority_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x3e4): undefined reference to `glib_main__context_acquire_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x438): undefined reference to `glib_main__context_acquire_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x48c): undefined reference to `glib_main__context_push_thread_default_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x4e4): undefined reference to `glib_main__source_attach_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x540): undefined reference to `glib_source__add_child_source_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x594): undefined reference to `glib_source__set_callback_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x5f0): undefined reference to `glib_source__set_name_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x63c): undefined reference to `glib_source__before_free_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x694): undefined reference to `glib_main__source_destroy_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x6ec): undefined reference to `glib_idle__add_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x748): undefined reference to `glib_idle__dispatch_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x7a8): undefined reference to `glib_main__context_release_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x7f4): undefined reference to `glib_main__context_free_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x840): undefined reference to `glib_main__context_pop_thread_default_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x898): undefined reference to `glib_main__context_before_prepare_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x8ec): undefined reference to `glib_main__context_after_prepare_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x94c): undefined reference to `glib_main__after_prepare_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x9a8): undefined reference to `glib_main__context_before_dispatch_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0x9fc): undefined reference to `glib_main__context_after_dispatch_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0xa50): undefined reference to `glib_main__before_dispatch_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0xab8): undefined reference to `glib_main__after_dispatch_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0xb14): undefined reference to `glib_main__context_before_check_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0xb78): undefined reference to `glib_main__context_after_check_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0xbd0): undefined reference to `glib_main__context_after_check_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0xc28): undefined reference to `glib_main__after_check_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0xc7c): undefined reference to `glib_main__context_wakeup_acknowledge_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans4.ltrans.o:(.note.stapsdt+0xcd4): undefined reference to `glib_timeout__dispatch_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x24): undefined reference to `glib_mem__free_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x64): undefined reference to `glib_mem__alloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0xb4): undefined reference to `glib_mem__realloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x108): undefined reference to `glib_mem__alloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x158): undefined reference to `glib_mem__alloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x1a8): undefined reference to `glib_mem__alloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x1f8): undefined reference to `glib_mem__alloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x248): undefined reference to `glib_mem__realloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x29c): undefined reference to `glib_mem__realloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x2f0): undefined reference to `glib_quark__new_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x338): undefined reference to `glib_quark__new_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x380): undefined reference to `glib_quark__new_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x3c8): undefined reference to `glib_mem__alloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans5.ltrans.o:(.note.stapsdt+0x418): undefined reference to `glib_mem__alloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans6.ltrans.o:(.note.stapsdt+0x24): undefined reference to `glib_rcbox__release_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans6.ltrans.o:(.note.stapsdt+0x70): undefined reference to `glib_rcbox__free_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans6.ltrans.o:(.note.stapsdt+0xb4): undefined reference to `glib_rcbox__acquire_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans7.ltrans.o:(.note.stapsdt+0x24): undefined reference to `glib_slice__free_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans7.ltrans.o:(.note.stapsdt+0x6c): undefined reference to `glib_slice__alloc_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans8.ltrans.o:(.note.stapsdt+0x24): undefined reference to `glib_thread__spawned_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans12.ltrans.o:(.note.stapsdt+0x24): undefined reference to `glib_timeout__add_semaphore' /usr/bin/ld: /tmp/cctkGP8Z.ltrans12.ltrans.o:(.note.stapsdt+0x88): undefined reference to `glib_rcbox__alloc_semaphore' collect2: error: ld returned 1 exit status [..] Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>	2022-09-18 14:19:31 +03:00
Kalev Lember	79ae42083e	Update to 2.74.0	2022-09-18 10:45:57 +02:00
Kalev Lember	af8ca54e28	Rebuild ... so that we can include it in the GNOME 43.rc mega-update as various updates in there depend on new glib.	2022-09-06 18:54:36 +02:00
Michael Catanzaro	f0c206cd64	gio-launch-desktop is back	2022-08-26 14:25:53 -05:00
Michael Catanzaro	c192e13ce7	Update to 2.73.3 and drop gdesktopappinfo patch Unfortunatenly, the gdesktopappinfo patch rebase requires some effort. This patch will need to be integrated upstream rather than carried in Fedora indefinitely.	2022-08-26 13:31:06 -05:00
Kalev Lember	aba250710a	Backport an upstream patch to fix an FD leak (rhbz#2109145)	2022-08-15 14:50:44 +02:00
Kalev Lember	17a834805e	Backport another GRegex upstream fix Thanks again to Mamoru TASAKA <mtasaka@fedoraproject.org>! https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2838	2022-07-27 12:36:53 +02:00
Kalev Lember	7ebd5f8509	Backport an upstream patch to fix GRegex on s390x Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org> for fixing this! https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2840	2022-07-26 23:00:37 +02:00
Kalev Lember	5653dff181	Add missing requires to glib2-static subpackage Add pcre2-static and sysprof-capture-static requires that are needed for linking with the static subpackage. Pointed out by Paolo Bonzini <pbonzini@redhat.com> on Fedora devel mailing list.	2022-07-26 10:04:13 +02:00
Fedora Release Engineering	c69dfde736	Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-07-21 06:26:03 +00:00
Michael Catanzaro	13797423c1	No unexpected soname bumps Upstream would not likely be brave enough to ever do this, but just in case....	2022-07-18 14:45:10 -05:00
Michael Catanzaro	75642e63a7	Fix gnutls-hmac.patch	2022-07-14 18:03:02 -05:00
Kalev Lember	34b203d549	Update to 2.73.2 - Rebase gnutls-hmac.patch - Rebase gdesktopappinfo.patch - Drop 2784.patch as it's been fixed upstream - Build with pcre2 instead of pcre	2022-07-14 15:11:18 +02:00
Adam Williamson	5cfc8d9d4f	Backport PR #2784 to fix `weak_locations != NULL` crashes	2022-06-28 16:54:11 -07:00
David King	d160263355	Update to 2.73.1 Refresh hmac patch. Remove unnecessary chrpath usage.	2022-06-21 22:02:13 +01:00
David King	a6c06e2d2b	Update to 2.72.2	2022-05-30 16:04:45 +01:00
David King	32b9ac77a3	Update to 2.72.1	2022-04-14 16:07:59 +01:00
David King	7f37d24794	Update to 2.72.0	2022-03-18 09:59:11 +00:00
David King	78380de737	Update to 2.71.3	2022-03-07 10:11:09 +00:00
David King	a7cdd72798	Update to 2.71.2	2022-02-15 14:39:23 +00:00
David King	7685a27c40	Update to 2.71.1	2022-01-30 12:28:59 +00:00
Bastien Nocera	12966f03f4	Fix gspawn hangs in CI runners	2022-01-26 15:28:55 +01:00
Fedora Release Engineering	72ee9d5eec	- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-01-20 06:11:47 +00:00
David King	55d1b00f41	Update to 2.71.0	2022-01-10 14:50:32 +00:00
Miro Hrončok	df270abbbe	Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34	2022-01-08 11:11:49 +01:00
Michael Catanzaro	32c229cf98	Update annocheck policy	2021-12-06 13:45:12 -06:00
Michael Catanzaro	9849a2ff0e	Add gspawn patchset	2021-12-06 09:58:23 -06:00
Kalev Lember	1349f02b26	Update to 2.70.2	2021-12-06 14:05:36 +01:00
Kalev Lember	af936f9e98	Update to 2.70.1	2021-10-28 15:00:29 +02:00
Kalev Lember	a2b6df263a	Fix network state monitoring to work with NetworkManager 1.32 (#1991075 )	2021-10-15 12:20:55 +02:00
Miro Hrončok	947d874c70	Produce bit-by-bit identical .pyc files across different architectures, to avoid multilib conflicts Resolves rhbz#2008912	2021-10-05 22:50:09 +02:00
Michael Catanzaro	a4640c18cd	Remove workaround for gnome-keyring We'll use this workaround to ship Fedora 35 Beta, and we might even leave it in F35 indefinitely since there is no particularly urgent reason to remove it, but let's not carry it in rawhide. I have done a new gnome-keyring build that should avoid the need for this workaround, so it should no longer be needed to avoid breakage in rawhide.	2021-09-22 13:38:50 -05:00
Adam Williamson	f799bfd9f2	Re-enable a workaround to fix g-i-s/gnome-keyring (#2005625 ) This re-enables a workaround which upstream recently disabled for security reasons, but which is still currently needed for gnome-keyring to function properly during gnome-initial-setup. This should fix several bugs that were all consequences of gnome-keyring not working correctly: https://bugzilla.redhat.com/show_bug.cgi?id=2004565 https://bugzilla.redhat.com/show_bug.cgi?id=2005625 https://bugzilla.redhat.com/show_bug.cgi?id=2006314	2021-09-21 12:17:10 -07:00
Kalev Lember	a624ff5a03	Update to 2.70.0	2021-09-17 12:43:44 +02:00
Kalev Lember	e215d0f37a	Update to 2.69.3	2021-09-08 19:03:03 +02:00
Kalev Lember	bce7213a56	Update to 2.69.2	2021-08-21 12:13:37 +02:00
Michael Catanzaro	7aafbaff5d	Upgrade to 2.69.0 Also, add patch for #1984625 FTBFS	2021-07-21 15:39:18 -05:00
Michael Catanzaro	8b0678d3f0	Note: all those previous empty commits accomplished nothing Hi there! If you see all those ugly empty commits I just pushed, please know that they were entirely futile. The release flag is expected to be -1 when executing 'fedpkg build' for now and we are just supposed to use 'fedpkg build --skip-nvr-check'. See: https://docs.pagure.org/fedora-infra.rpmautospec/peculiarities.html#release-and-changelog-differ-between-local-build-and-koji	2021-07-12 15:56:58 -05:00
Michael Catanzaro	26a02bde53	Empty commit for rpmautospec -5	2021-07-12 15:53:47 -05:00
Michael Catanzaro	480cddb989	Empty commit for rpmautospec -4	2021-07-12 15:53:39 -05:00
Michael Catanzaro	90f2c1f74e	Empty commit for rpmautospec -3	2021-07-12 15:53:33 -05:00
Michael Catanzaro	6a25c638e2	Empty commit for rpmautospec -2	2021-07-12 15:53:23 -05:00
Michael Catanzaro	9c6c2dcdc1	Adopt rpmautospec	2021-07-12 15:42:05 -05:00
Michael Catanzaro	d93143e54c	Forgot to link to libdl... I got away with this because it's no longer required in rawhide, but let's do it anyway.	2021-07-01 16:19:03 -05:00
Michael Catanzaro	aaaeb2d8a2	Refresh gnutls-hmac patchset to fix leaks in error path	2021-07-01 15:46:08 -05:00
Michael Catanzaro	38303953f0	Drop Recommends: shared-mime-info (#1947897 ) Remove old Conflicts: gcr < 3.28.1	2021-06-28 13:28:30 -05:00
Michael Catanzaro	7a7a3ffec6	Really fix incorrect comment in gnutls-hmac.patch	2021-06-23 08:55:05 -05:00
Michael Catanzaro	c2b4525c73	Fix incorrect comment in gnutls-hmac.patch	2021-06-23 08:47:55 -05:00
Michael Catanzaro	74d1364a34	Drop check-rpath hack, no longer required	2021-06-23 08:27:14 -05:00
Kalev Lember	a14b3a2891	Update to 2.68.3	2021-06-21 15:20:36 +02:00
Stephen Gallagher	d9cced2944	Fix the requirement for 32-bit libgnutls.so.30 The automatically-generated Provides for 32-bit libraries does not include the trailing (). Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>	2021-06-17 16:55:12 -04:00
Michael Catanzaro	cd6f9cf9a9	Check if __isa_bits is defined so we don't fail when building the SRPM I tested this with a local mockbuild, but koji has a separate stage for building the RPM where __isa_bits is not defined.	2021-06-17 10:59:07 -05:00
Michael Catanzaro	1f79f05203	Enable GnuTLS-based GHmac in Fedora and reenable glib2-static in RHEL Consolidate GDesktopAppInfo changes into gdesktopappinfo.patch Disable check-rpath since it seems to be broken	2021-06-17 10:45:30 -05:00
Michael Catanzaro	ba26123977	Improve rpminspect.yaml	2021-05-19 16:27:31 -05:00
Kalev Lember	217273da5e	Update to 2.68.2	2021-05-11 13:26:25 +02:00
Michael Catanzaro	e9a3cabc1a	Add rpminspect gating configuration	2021-05-10 16:22:26 -05:00
Michael Catanzaro	029172473e	Add missing bundled provides	2021-05-05 08:37:39 -05:00
Michael Catanzaro	910cd73d47	Refresh GDesktopAppInfo patchset	2021-04-28 10:02:04 -05:00
Kalev Lember	997be95b61	Update to 2.68.1	2021-04-08 16:51:29 +02:00
Kalev Lember	c075d3d9bd	Rebuild to fix sysprof-capture symbols leaking into libraries consuming it	2021-03-26 10:36:17 +01:00
Kalev Lember	b7af369edc	Update to 2.68.0	2021-03-18 17:49:45 +01:00
Petr Písař	dfa01c8fba	Disable debugging glib	2021-03-18 09:09:00 +01:00
Kalev Lember	4c72bdb1fe	Update to 2.67.6	2021-03-11 23:26:44 +01:00
Kalev Lember	5400dc6f20	Update to 2.67.5	2021-03-02 12:26:04 +01:00
Kalev Lember	6f01bd7f06	Enable sysprof capture support	2021-02-24 11:23:09 +01:00
Kalev Lember	bb9051cec9	Move all patches together in spec file	2021-02-19 19:38:31 +01:00
Kalev Lember	2fb38bd0f0	Backport a fix for gsubprocesslauncher regression	2021-02-19 19:38:18 +01:00
Kalev Lember	05ea881906	Update to 2.67.4	2021-02-16 20:25:18 +01:00
Benjamin Berg	56c964dd92	Add patches to move applications into systemd scopes Doing this means we get more applications into their own cgroup/systemd unit. This is important for systemd-oomd to work properly, as it tends to work on a cgroup level.	2021-02-09 13:29:16 +01:00
Kalev Lember	646c601be3	Fix gtk-doc directory ownership	2021-02-04 21:30:48 +01:00
Kalev Lember	3a5973966c	Make gnutls-hmac.patch RHEL-only	2021-02-04 21:28:20 +01:00
Kalev Lember	2165f81e6b	Update to 2.67.3 ... and rebase gnutls-hmac.patch	2021-02-04 21:22:15 +01:00
Fedora Release Engineering	9892f62bcf	- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2021-01-26 08:15:28 +00:00
Peter Robinson	485a4ccc12	Drop dependency on gamin	2021-01-22 13:23:38 +00:00
Kevin Fenzi	c71d2f1ddf	Add already upstream patch to fix gdm crasher.	2020-12-19 15:20:03 -08:00
Kalev Lember	f60cba3ae7	Update to 2.67.1	2020-12-19 03:06:46 +01:00
Ondrej Holy	341fea0648	Explicitly create modules dir to fix ELN build	2020-12-04 13:39:15 +01:00
Michael Catanzaro	4d9a5aaf01	Adjust conditionals that disable glib2-fam	2020-12-01 09:52:14 -06:00
Ondrej Holy	c64ee0c537	Disable FAM support in RHEL FAM support in GLib requires Gamin component, which has various issues and is unmaintained for years. GLib is the only component that requires it in RHEL. So let's do not build the optional glib2-fam subpackage on RHEL so Gamin can be dropped out from there. I am not doing the same change for Fedora as there are more components that require Gamin. So the subpackage can be held there yet for some time. The only reason why this change hasn't been done earlier is the fact that FAM support was needed for DConf functionality when the home directory is on NFS. But this shouldn't be a problem nowadays thanks to the following commit: https://gitlab.gnome.org/GNOME/glib/-/commit/7427bb71.	2020-12-01 09:43:53 +01:00