Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/glib2.git#f60cba3ae7dd3216f1c8feb8824b1c0272e2c7ba

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
-

glib2.spec

@@ -1,6 +1,6 @@
 Name: glib2
-Version: 2.67.0
+Version: 2.67.1
-Release: 7%{?dist}
+Release: 1%{?dist}
 Summary: A library of handy utility functions
 
 License: LGPLv2+
@@ -11,13 +11,6 @@ Source0: http://download.gnome.org/sources/glib/2.67/glib-%{version}.tar.xz
 # 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)
 
@@ -243,6 +236,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/installed-tests
 
 %changelog
+* 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
 

sources

@@ -1 +1 @@
-SHA512 (glib-2.67.0.tar.xz) = 82d562bc80885c7e516e38f17a8830596b32b1e1a4b58454ca589be79e6ab27e0a2fe0a108cb02da21981c75474abed0263c0aa38c71ead45a68db675a1d2f80
+SHA512 (glib-2.67.1.tar.xz) = f7a576ab454633e6ad6ea00153a57f2f9d6bb20ec2c200fad43fe743192e3b912a7d4774e8c99594e3c53fa32853741c32a7df6c396226ea18c822e872c006dc