Backport upstream patches to fix invalid use of volatile objects

This is needed for gcc 11.

.cvsignore

@@ -1 +0,0 @@
-glib-2.18.2.tar.bz2

.gitignore

@@ -0,0 +1 @@
+/glib-2.*.tar.xz

1728.patch

@@ -0,0 +1,32 @@
+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
+

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: glib2
-# $Id: Makefile,v 1.2 2005/11/15 18:51:53 mclasen Exp $
-NAME := glib2
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

gio-2.16-selinux-set-support.diff

@@ -1,120 +0,0 @@
-Index: gio/glocalfileinfo.c
-===================================================================
---- gio/glocalfileinfo.c	(revision 6871)
-+++ gio/glocalfileinfo.c	(working copy)
-@@ -1706,6 +1706,24 @@
- #endif
- 
- static gboolean
-+get_string (const GFileAttributeValue  *value,
-+	    const char                **val_out,
-+	    GError                    **error)
-+{
-+  if (value->type != G_FILE_ATTRIBUTE_TYPE_STRING)
-+    {
-+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-+		   _("Invalid attribute type (byte string expected)"));
-+      return FALSE;
-+    }
-+
-+  *val_out = value->u.string;
-+  
-+  return TRUE;
-+}
-+
-+
-+static gboolean
- set_unix_mode (char                       *filename,
- 	       const GFileAttributeValue  *value,
- 	       GError                    **error)
-@@ -1948,6 +1966,52 @@
- }
- #endif
- 
-+
-+static gboolean
-+set_selinux_context (char                       *filename,
-+		 const GFileAttributeValue  *value,
-+		 GError                    **error)
-+{
-+  const char *val;
-+
-+  if (!get_string (value, &val, error))
-+    return FALSE;
-+
-+  if (val == NULL)
-+  {
-+    g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-+               _("SELinux context must be non-NULL"));
-+    return FALSE;
-+  }
-+
-+#ifdef HAVE_SELINUX
-+  if (is_selinux_enabled ()) {
-+	security_context_t val_s;
-+	
-+	val_s = g_strdup (val);
-+	
-+	if (setfilecon_raw (filename, val_s) < 0)
-+	{
-+            int errsv = errno;
-+            
-+            g_set_error (error, G_IO_ERROR,
-+                         g_io_error_from_errno (errsv),
-+                	_("Error setting SELinux context: %s"),
-+                         g_strerror (errsv));
-+            return FALSE;
-+        }
-+        g_free (val_s);
-+  } else {
-+    g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-+               _("SELinux is not enabled on this system"));
-+    return FALSE;
-+  }
-+#endif 
-+                                                     
-+  return TRUE;
-+}
-+
-+
- gboolean
- _g_local_file_info_set_attribute (char                 *filename,
- 				  const char           *attribute,
-@@ -1993,6 +2057,11 @@
-   else if (g_str_has_prefix (attribute, "xattr-sys::"))
-     return set_xattr (filename, attribute, &value, error);
- #endif
-+
-+#ifdef HAVE_SELINUX 
-+  else if (strcmp (attribute, G_FILE_ATTRIBUTE_SELINUX_CONTEXT) == 0)
-+    return set_selinux_context (filename, &value, error);
-+#endif
-   
-   g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
- 	       _("Setting attribute %s not supported"), attribute);
-@@ -2110,5 +2179,25 @@
- 
-   /* xattrs are handled by default callback */
- 
-+
-+  /*  SELinux context */
-+#ifdef HAVE_SELINUX 
-+  if (is_selinux_enabled ()) {
-+    value = _g_file_info_get_attribute_value (info, G_FILE_ATTRIBUTE_SELINUX_CONTEXT);
-+    if (value)
-+    {
-+      if (!set_selinux_context (filename, value, error))
-+        {
-+          value->status = G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING;
-+          res = FALSE;
-+          /* Don't set error multiple times */
-+          error = NULL;
-+        }
-+      else
-+        value->status = G_FILE_ATTRIBUTE_STATUS_SET;
-+    }
-+  }
-+#endif
-+
-   return res;
- }

gio-2.18-always-pass-fuse-file-uri.patch

@@ -1,75 +0,0 @@
---- trunk/gio/gdesktopappinfo.c	2008/09/26 19:57:36	7554
-+++ trunk/gio/gdesktopappinfo.c	2008/10/01 17:46:57	7566
-@@ -530,9 +530,32 @@
- {
-   GList *uris = *uri_list;
-   char *expanded;
--  
-+  gboolean force_file_uri;
-+  char force_file_uri_macro;
-+
-   g_return_if_fail (exec != NULL);
--  
-+
-+  /* On %u and %U, pass POSIX file path pointing to the URI via
-+   * the FUSE mount in ~/.gvfs. Note that if the FUSE daemon isn't
-+   * running or the URI doesn't have a POSIX file path via FUSE
-+   * we'll just pass the URI.
-+   */
-+  switch (macro)
-+    {
-+    case 'u':
-+      force_file_uri_macro = 'f';
-+      force_file_uri = TRUE;
-+      break;
-+    case 'U':
-+      force_file_uri_macro = 'F';
-+      force_file_uri = TRUE;
-+      break;
-+    default:
-+      force_file_uri_macro = macro;
-+      force_file_uri = FALSE;
-+      break;
-+    }
-+
-   switch (macro)
-     {
-     case 'u':
-@@ -541,7 +564,17 @@
-     case 'n':
-       if (uris)
- 	{
--	  expanded = expand_macro_single (macro, uris->data);
-+          if (!force_file_uri)
-+            {
-+              expanded = expand_macro_single (macro, uris->data);
-+            }
-+          else
-+            {
-+              expanded = expand_macro_single (force_file_uri_macro, uris->data);
-+              if (expanded == NULL)
-+                expanded = expand_macro_single (macro, uris->data);
-+            }
-+
- 	  if (expanded)
- 	    {
- 	      g_string_append (exec, expanded);
-@@ -558,7 +591,17 @@
-     case 'N':
-       while (uris)
- 	{
--	  expanded = expand_macro_single (macro, uris->data);
-+          if (!force_file_uri)
-+            {
-+              expanded = expand_macro_single (macro, uris->data);
-+            }
-+          else
-+            {
-+              expanded = expand_macro_single (force_file_uri_macro, uris->data);
-+              if (expanded == NULL)
-+                expanded = expand_macro_single (macro, uris->data);
-+            }
-+
- 	  if (expanded)
- 	    {
- 	      g_string_append (exec, expanded);

glib-2.17.4-gio-guess-content-sync.patch

@@ -1,139 +0,0 @@
---- trunk/docs/reference/gio/gio-sections.txt	2008/07/24 01:13:33	7251
-+++ trunk/docs/reference/gio/gio-sections.txt	2008/07/24 21:21:22	7252
-@@ -816,6 +816,7 @@
- g_mount_eject_finish
- g_mount_guess_content_type
- g_mount_guess_content_type_finish
-+g_mount_guess_content_type_sync
- <SUBSECTION Standard>
- G_IS_MOUNT
- G_MOUNT
---- trunk/gio/gio.symbols	2008/07/24 01:13:33	7251
-+++ trunk/gio/gio.symbols	2008/07/24 21:21:22	7252
-@@ -718,6 +718,7 @@
- g_mount_remount_finish 
- g_mount_guess_content_type
- g_mount_guess_content_type_finish
-+g_mount_guess_content_type_sync
- #endif
- #endif
- 
---- trunk/gio/gmount.c	2008/07/24 01:13:33	7251
-+++ trunk/gio/gmount.c	2008/07/24 21:21:22	7252
-@@ -570,9 +570,10 @@
-  * memory cards. See the <ulink url="http://www.freedesktop.org/wiki/Specifications/shared-mime-info-spec">shared-mime-info</ulink>
-  * specification for more on x-content types.
-  *
-- * This is an asynchronous operation, and is finished by calling 
-- * g_mount_guess_content_type_finish() with the @mount and #GAsyncResult 
-- * data returned in the @callback. 
-+ * This is an asynchronous operation (see
-+ * g_mount_guess_content_type_sync() for the synchronous version), and
-+ * is finished by calling g_mount_guess_content_type_finish() with the
-+ * @mount and #GAsyncResult data returned in the @callback.
-  *
-  * Since: 2.18
-  */
-@@ -644,6 +645,55 @@
-   return (* iface->guess_content_type_finish) (mount, result, error);
- }
- 
-+/**
-+ * g_mount_guess_content_type_sync:
-+ * @mount: a #GMount
-+ * @force_rescan: Whether to force a rescan of the content.
-+ *     Otherwise a cached result will be used if available
-+ * @cancellable: optional #GCancellable object, %NULL to ignore
-+ * @error: a #GError location to store the error occuring, or %NULL to
-+ *     ignore
-+ *
-+ * Tries to guess the type of content stored on @mount. Returns one or
-+ * more textual identifiers of well-known content types (typically
-+ * prefixed with "x-content/"), e.g. x-content/image-dcf for camera 
-+ * memory cards. See the <ulink url="http://www.freedesktop.org/wiki/Specifications/shared-mime-info-spec">shared-mime-info</ulink>
-+ * specification for more on x-content types.
-+ *
-+ * This is an synchronous operation and as such may block doing IO;
-+ * see g_mount_guess_content_type() for the asynchronous version.
-+ *
-+ * Returns: a %NULL-terminated array of content types or %NULL on error.
-+ *     Caller should free this array with g_strfreev() when done with it.
-+ *
-+ * Since: 2.18
-+ */
-+char **
-+g_mount_guess_content_type_sync (GMount              *mount,
-+                                 gboolean             force_rescan,
-+                                 GCancellable        *cancellable,
-+                                 GError             **error)
-+{
-+  GMountIface *iface;
-+
-+  g_return_val_if_fail (G_IS_MOUNT (mount), NULL);
-+
-+  iface = G_MOUNT_GET_IFACE (mount);
-+
-+  if (iface->guess_content_type_sync == NULL)
-+    {
-+      g_set_error_literal (error,
-+                           G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-+                           /* Translators: This is an error
-+                            * message for mount objects that
-+                            * don't implement content type guessing. */
-+                           _("mount doesn't implement synchronous content type guessing"));
-+
-+      return NULL;
-+    }
-+
-+  return (* iface->guess_content_type_sync) (mount, force_rescan, cancellable, error);
-+}
- 
- #define __G_MOUNT_C__
- #include "gioaliasdef.c"
---- trunk/gio/gmount.h	2008/07/24 01:13:33	7251
-+++ trunk/gio/gmount.h	2008/07/24 21:21:22	7252
-@@ -119,6 +119,11 @@
-   gchar **           (*guess_content_type_finish) (GMount              *mount,
-                                                    GAsyncResult        *result,
-                                                     GError             **error); 
-+
-+  gchar **           (*guess_content_type_sync) (GMount              *mount,
-+                                                 gboolean             force_rescan,
-+                                                 GCancellable        *cancellable,
-+                                                 GError             **error);
- };
- 
- GType g_mount_get_type (void) G_GNUC_CONST;
-@@ -166,6 +171,11 @@
-                                                  GAsyncResult        *result,
-                                                  GError             **error);
- 
-+gchar **      g_mount_guess_content_type_sync (GMount              *mount,
-+                                               gboolean             force_rescan,
-+                                               GCancellable        *cancellable,
-+                                               GError             **error);
-+
- G_END_DECLS
- 
- #endif /* __G_MOUNT_H__ */
---- trunk/configure.in	2008/07/21 17:56:17	7234
-+++ trunk/configure.in	2008/07/21 18:07:55	7236
-@@ -23,7 +23,7 @@
- #
- m4_define([glib_major_version], [2])
- m4_define([glib_minor_version], [17])
--m4_define([glib_micro_version], [4])
-+m4_define([glib_micro_version], [5])
- m4_define([glib_interface_age], [0])
- m4_define([glib_binary_age],
-           [m4_eval(100 * glib_minor_version + glib_micro_version)])
---- trunk/tests/Makefile.am	2008/07/20 02:09:05	7209
-+++ trunk/tests/Makefile.am	2008/07/23 16:22:32	7243
-@@ -186,7 +186,6 @@
- module_test_LDFLAGS = $(G_MODULE_LDFLAGS)
- node_test_LDADD = $(progs_ldadd)
- onceinit_LDADD = $(thread_ldadd)
--option_test_LDADD = $(progs_ldadd)
- printf_test_LDADD = $(progs_ldadd)
- queue_test_LDADD = $(progs_ldadd)
- asyncqueue_test_LDADD = $(thread_ldadd)

glib-2.18.2-no-generic-icons.patch

@@ -1,19 +0,0 @@
-Index: gio/glocalfileinfo.c
-===================================================================
---- gio/glocalfileinfo.c	(revision 7620)
-+++ gio/glocalfileinfo.c	(revision 7621)
-@@ -1577,12 +1577,8 @@ _g_local_file_info_get (const char      
- 
-                       if (S_ISDIR (statbuf.st_mode)) 
-                         type_icon = "folder";
--                      else if (statbuf.st_mode & S_IXUSR)
--                        type_icon = "application-x-executable";
--                      else
--                        type_icon = "text-x-generic";
--
--                      g_themed_icon_append_name (G_THEMED_ICON (icon), type_icon);
-+                      if (type_icon)
-+                        g_themed_icon_append_name (G_THEMED_ICON (icon), type_icon);
-                     }
-                 }
- 

glib-i386-atomic.patch

@@ -1,15 +0,0 @@
-diff -up glib-2.16.6/configure.atomic glib-2.16.6/configure
---- glib-2.16.6/configure.atomic	2008-10-27 18:24:20.000000000 -0400
-+++ glib-2.16.6/configure	2008-10-27 18:24:31.000000000 -0400
-@@ -42742,11 +42742,6 @@ $as_echo_n "checking whether to use asse
- 
- if test x"$GCC" = xyes; then
-   case $host_cpu in
--    i386)
--      { $as_echo "$as_me:$LINENO: result: none" >&5
--$as_echo "none" >&6; }
--      glib_memory_barrier_needed=no
--      ;;
-     i?86)
-       { $as_echo "$as_me:$LINENO: result: i486" >&5
- $as_echo "i486" >&6; }

glib2.csh

@@ -1,6 +0,0 @@
-
-## This caused GLib2 applications to convert filenames from 
-## locale encoding to UTF-8. If the locale encoding is already
-## UTF-8 then it makes no difference.
-
-setenv G_BROKEN_FILENAMES 1

glib2.sh

@@ -1,6 +0,0 @@
-
-## This caused GLib2 applications to convert filenames from 
-## locale encoding to UTF-8. If the locale encoding is already
-## UTF-8 then it makes no difference.
-
-export G_BROKEN_FILENAMES=1

gnutls-hmac.patch

@@ -0,0 +1,668 @@
+From afb5735506e2ed1c638a8c916aa3748bf0615f32 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
+
+Prep for adding a GnuTLS HMAC implementation; these are just
+utility functions that call the "core" API.
+---
+ glib/ghmac-utils.c | 145 +++++++++++++++++++++++++++++++++++++++++++++
+ glib/ghmac.c       | 112 ----------------------------------
+ glib/meson.build   |   1 +
+ 3 files changed, 146 insertions(+), 112 deletions(-)
+ create mode 100644 glib/ghmac-utils.c
+
+diff --git a/glib/ghmac-utils.c b/glib/ghmac-utils.c
+new file mode 100644
+index 000000000..a17359ff1
+--- /dev/null
++++ b/glib/ghmac-utils.c
+@@ -0,0 +1,145 @@
++/* ghmac.h - data hashing functions
++ *
++ * Copyright (C) 2011  Collabora Ltd.
++ * Copyright (C) 2019  Red Hat, Inc.
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this library; if not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "config.h"
++
++#include <string.h>
++
++#include "ghmac.h"
++
++#include "glib/galloca.h"
++#include "gatomic.h"
++#include "gslice.h"
++#include "gmem.h"
++#include "gstrfuncs.h"
++#include "gtestutils.h"
++#include "gtypes.h"
++#include "glibintl.h"
++
++/**
++ * g_compute_hmac_for_data:
++ * @digest_type: a #GChecksumType to use for the HMAC
++ * @key: (array length=key_len): the key to use in the HMAC
++ * @key_len: the length of the key
++ * @data: (array length=length): binary blob to compute the HMAC of
++ * @length: length of @data
++ *
++ * Computes the HMAC for a binary @data of @length. This is a
++ * convenience wrapper for g_hmac_new(), g_hmac_get_string()
++ * and g_hmac_unref().
++ *
++ * The hexadecimal string returned will be in lower case.
++ *
++ * Returns: the HMAC of the binary data as a string in hexadecimal.
++ *   The returned string should be freed with g_free() when done using it.
++ *
++ * Since: 2.30
++ */
++gchar *
++g_compute_hmac_for_data (GChecksumType  digest_type,
++                         const guchar  *key,
++                         gsize          key_len,
++                         const guchar  *data,
++                         gsize          length)
++{
++  GHmac *hmac;
++  gchar *retval;
++
++  g_return_val_if_fail (length == 0 || data != NULL, NULL);
++
++  hmac = g_hmac_new (digest_type, key, key_len);
++  if (!hmac)
++    return NULL;
++
++  g_hmac_update (hmac, data, length);
++  retval = g_strdup (g_hmac_get_string (hmac));
++  g_hmac_unref (hmac);
++
++  return retval;
++}
++
++/**
++ * g_compute_hmac_for_bytes:
++ * @digest_type: a #GChecksumType to use for the HMAC
++ * @key: the key to use in the HMAC
++ * @data: binary blob to compute the HMAC of
++ *
++ * Computes the HMAC for a binary @data. This is a
++ * convenience wrapper for g_hmac_new(), g_hmac_get_string()
++ * and g_hmac_unref().
++ *
++ * The hexadecimal string returned will be in lower case.
++ *
++ * Returns: the HMAC of the binary data as a string in hexadecimal.
++ *   The returned string should be freed with g_free() when done using it.
++ *
++ * Since: 2.50
++ */
++gchar *
++g_compute_hmac_for_bytes (GChecksumType  digest_type,
++                          GBytes        *key,
++                          GBytes        *data)
++{
++  gconstpointer byte_data;
++  gsize length;
++  gconstpointer key_data;
++  gsize key_len;
++
++  g_return_val_if_fail (data != NULL, NULL);
++  g_return_val_if_fail (key != NULL, NULL);
++
++  byte_data = g_bytes_get_data (data, &length);
++  key_data = g_bytes_get_data (key, &key_len);
++  return g_compute_hmac_for_data (digest_type, key_data, key_len, byte_data, length);
++}
++
++
++/**
++ * g_compute_hmac_for_string:
++ * @digest_type: a #GChecksumType to use for the HMAC
++ * @key: (array length=key_len): the key to use in the HMAC
++ * @key_len: the length of the key
++ * @str: the string to compute the HMAC for
++ * @length: the length of the string, or -1 if the string is nul-terminated
++ *
++ * Computes the HMAC for a string.
++ *
++ * The hexadecimal string returned will be in lower case.
++ *
++ * Returns: the HMAC as a hexadecimal string.
++ *     The returned string should be freed with g_free()
++ *     when done using it.
++ *
++ * Since: 2.30
++ */
++gchar *
++g_compute_hmac_for_string (GChecksumType  digest_type,
++                           const guchar  *key,
++                           gsize          key_len,
++                           const gchar   *str,
++                           gssize         length)
++{
++  g_return_val_if_fail (length == 0 || str != NULL, NULL);
++
++  if (length < 0)
++    length = strlen (str);
++
++  return g_compute_hmac_for_data (digest_type, key, key_len,
++                                  (const guchar *) str, length);
++}
+diff --git a/glib/ghmac.c b/glib/ghmac.c
+index 49fd272f0..4f181f21f 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);
+   g_checksum_get_digest (hmac->digesto, buffer, digest_len);
+ }
+-
+-/**
+- * g_compute_hmac_for_data:
+- * @digest_type: a #GChecksumType to use for the HMAC
+- * @key: (array length=key_len): the key to use in the HMAC
+- * @key_len: the length of the key
+- * @data: (array length=length): binary blob to compute the HMAC of
+- * @length: length of @data
+- *
+- * Computes the HMAC for a binary @data of @length. This is a
+- * convenience wrapper for g_hmac_new(), g_hmac_get_string()
+- * and g_hmac_unref().
+- *
+- * The hexadecimal string returned will be in lower case.
+- *
+- * Returns: the HMAC of the binary data as a string in hexadecimal.
+- *   The returned string should be freed with g_free() when done using it.
+- *
+- * Since: 2.30
+- */
+-gchar *
+-g_compute_hmac_for_data (GChecksumType  digest_type,
+-                         const guchar  *key,
+-                         gsize          key_len,
+-                         const guchar  *data,
+-                         gsize          length)
+-{
+-  GHmac *hmac;
+-  gchar *retval;
+-
+-  g_return_val_if_fail (length == 0 || data != NULL, NULL);
+-
+-  hmac = g_hmac_new (digest_type, key, key_len);
+-  if (!hmac)
+-    return NULL;
+-
+-  g_hmac_update (hmac, data, length);
+-  retval = g_strdup (g_hmac_get_string (hmac));
+-  g_hmac_unref (hmac);
+-
+-  return retval;
+-}
+-
+-/**
+- * g_compute_hmac_for_bytes:
+- * @digest_type: a #GChecksumType to use for the HMAC
+- * @key: the key to use in the HMAC
+- * @data: binary blob to compute the HMAC of
+- *
+- * Computes the HMAC for a binary @data. This is a
+- * convenience wrapper for g_hmac_new(), g_hmac_get_string()
+- * and g_hmac_unref().
+- *
+- * The hexadecimal string returned will be in lower case.
+- *
+- * Returns: the HMAC of the binary data as a string in hexadecimal.
+- *   The returned string should be freed with g_free() when done using it.
+- *
+- * Since: 2.50
+- */
+-gchar *
+-g_compute_hmac_for_bytes (GChecksumType  digest_type,
+-                          GBytes        *key,
+-                          GBytes        *data)
+-{
+-  gconstpointer byte_data;
+-  gsize length;
+-  gconstpointer key_data;
+-  gsize key_len;
+-
+-  g_return_val_if_fail (data != NULL, NULL);
+-  g_return_val_if_fail (key != NULL, NULL);
+-
+-  byte_data = g_bytes_get_data (data, &length);
+-  key_data = g_bytes_get_data (key, &key_len);
+-  return g_compute_hmac_for_data (digest_type, key_data, key_len, byte_data, length);
+-}
+-
+-
+-/**
+- * g_compute_hmac_for_string:
+- * @digest_type: a #GChecksumType to use for the HMAC
+- * @key: (array length=key_len): the key to use in the HMAC
+- * @key_len: the length of the key
+- * @str: the string to compute the HMAC for
+- * @length: the length of the string, or -1 if the string is nul-terminated
+- *
+- * Computes the HMAC for a string.
+- *
+- * The hexadecimal string returned will be in lower case.
+- *
+- * Returns: the HMAC as a hexadecimal string.
+- *     The returned string should be freed with g_free()
+- *     when done using it.
+- *
+- * Since: 2.30
+- */
+-gchar *
+-g_compute_hmac_for_string (GChecksumType  digest_type,
+-                           const guchar  *key,
+-                           gsize          key_len,
+-                           const gchar   *str,
+-                           gssize         length)
+-{
+-  g_return_val_if_fail (length == 0 || str != NULL, NULL);
+-
+-  if (length < 0)
+-    length = strlen (str);
+-
+-  return g_compute_hmac_for_data (digest_type, key, key_len,
+-                                  (const guchar *) str, length);
+-}
+diff --git a/glib/meson.build b/glib/meson.build
+index aaf40a218..b3bf067c7 100644
+--- a/glib/meson.build
++++ b/glib/meson.build
+@@ -253,6 +253,7 @@ glib_sources = files(
+   'ggettext.c',
+   'ghash.c',
+   'ghmac.c',
++  'ghmac-utils.c',
+   'ghook.c',
+   'ghostutils.c',
+   'giochannel.c',
+-- 
+2.28.0
+
+
+From 703e63f9d8b3ea4f26f41f0d2287b301025a73cc 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
+
+For RHEL we want apps to use FIPS-certified crypto libraries,
+and HMAC apparently counts as "keyed" and hence needs to
+be validated.
+
+Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1630260
+Replaces: https://gitlab.gnome.org/GNOME/glib/merge_requests/897
+
+This is a build-time option that backs the GHmac API with GnuTLS.
+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.
+---
+ glib/gchecksum.c        |   9 ++-
+ glib/gchecksumprivate.h |  32 ++++++++
+ glib/ghmac-gnutls.c     | 164 ++++++++++++++++++++++++++++++++++++++++
+ glib/ghmac.c            |   3 +
+ glib/meson.build        |  10 ++-
+ meson.build             |   7 ++
+ meson_options.txt       |   5 ++
+ 7 files changed, 224 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
+--- a/glib/gchecksum.c
++++ b/glib/gchecksum.c
+@@ -20,7 +20,7 @@
+ 
+ #include <string.h>
+ 
+-#include "gchecksum.h"
++#include "gchecksumprivate.h"
+ 
+ #include "gslice.h"
+ #include "gmem.h"
+@@ -173,9 +173,9 @@ sha_byte_reverse (guint32 *buffer,
+ }
+ #endif /* G_BYTE_ORDER == G_BIG_ENDIAN */
+ 
+-static gchar *
+-digest_to_string (guint8 *digest,
+-                  gsize   digest_len)
++gchar *
++gchecksum_digest_to_string (guint8 *digest,
++                            gsize   digest_len)
+ {
+   gsize i, len = digest_len * 2;
+   gchar *retval;
+@@ -194,6 +194,7 @@ digest_to_string (guint8 *digest,
+ 
+   return retval;
+ }
++#define digest_to_string gchecksum_digest_to_string
+ 
+ /*
+  * MD5 Checksum
+diff --git a/glib/gchecksumprivate.h b/glib/gchecksumprivate.h
+new file mode 100644
+index 000000000..86c7a3b61
+--- /dev/null
++++ b/glib/gchecksumprivate.h
+@@ -0,0 +1,32 @@
++/* gstdioprivate.h - Private GLib stdio functions
++ *
++ * Copyright 2017 Руслан Ижбулатов
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this library; if not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef __G_CHECKSUMPRIVATE_H__
++#define __G_CHECKSUMPRIVATE_H__
++
++#include "gchecksum.h"
++
++G_BEGIN_DECLS
++
++gchar *
++gchecksum_digest_to_string (guint8 *digest,
++                            gsize   digest_len);
++
++G_END_DECLS
++
++#endif
+\ 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
+--- /dev/null
++++ b/glib/ghmac-gnutls.c
+@@ -0,0 +1,164 @@
++/* ghmac.h - data hashing functions
++ *
++ * Copyright (C) 2011  Collabora Ltd.
++ * Copyright (C) 2019  Red Hat, Inc.
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this library; if not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "config.h"
++
++#include <string.h>
++#include <gnutls/crypto.h>
++
++#include "ghmac.h"
++
++#include "glib/galloca.h"
++#include "gatomic.h"
++#include "gslice.h"
++#include "gmem.h"
++#include "gstrfuncs.h"
++#include "gchecksumprivate.h"
++#include "gtestutils.h"
++#include "gtypes.h"
++#include "glibintl.h"
++
++#ifndef HAVE_GNUTLS
++#error "build configuration error"
++#endif
++
++struct _GHmac
++{
++  int ref_count;
++  GChecksumType digest_type;
++  gnutls_hmac_hd_t hmac;
++  gchar *digest_str;
++};
++
++GHmac *
++g_hmac_new (GChecksumType  digest_type,
++            const guchar  *key,
++            gsize          key_len)
++{
++  gnutls_mac_algorithm_t algo;
++  GHmac *hmac = g_slice_new0 (GHmac);
++  hmac->ref_count = 1;
++  hmac->digest_type = digest_type;  
++
++  switch (digest_type)
++    {
++    case G_CHECKSUM_MD5:
++      algo = GNUTLS_MAC_MD5;
++      break;
++    case G_CHECKSUM_SHA1:
++      algo = GNUTLS_MAC_SHA1;
++      break;
++    case G_CHECKSUM_SHA256:
++      algo = GNUTLS_MAC_SHA256;
++      break;
++    case G_CHECKSUM_SHA384:
++      algo = GNUTLS_MAC_SHA384;
++      break;
++    case G_CHECKSUM_SHA512:
++      algo = GNUTLS_MAC_SHA512;
++      break;
++    default:
++      g_return_val_if_reached (NULL);
++    }
++
++  gnutls_hmac_init (&hmac->hmac, algo, key, key_len);
++
++  return hmac;
++}
++
++GHmac *
++g_hmac_copy (const GHmac *hmac)
++{
++  GHmac *copy;
++
++  g_return_val_if_fail (hmac != NULL, NULL);
++
++  copy = g_slice_new0 (GHmac);
++  copy->ref_count = 1;
++  copy->digest_type = hmac->digest_type;
++  copy->hmac = gnutls_hmac_copy (hmac->hmac);
++
++  return copy;
++}
++
++GHmac *
++g_hmac_ref (GHmac *hmac)
++{
++  g_return_val_if_fail (hmac != NULL, NULL);
++
++  g_atomic_int_inc (&hmac->ref_count);
++
++  return hmac;
++}
++
++void
++g_hmac_unref (GHmac *hmac)
++{
++  g_return_if_fail (hmac != NULL);
++
++  if (g_atomic_int_dec_and_test (&hmac->ref_count))
++    {
++      gnutls_hmac_deinit (hmac->hmac, NULL);
++      g_free (hmac->digest_str);
++      g_slice_free (GHmac, hmac);
++    }
++}
++
++
++void
++g_hmac_update (GHmac        *hmac,
++               const guchar *data,
++               gssize        length)
++{
++  g_return_if_fail (hmac != NULL);
++  g_return_if_fail (length == 0 || data != NULL);
++
++  gnutls_hmac (hmac->hmac, data, length);
++}
++
++const gchar *
++g_hmac_get_string (GHmac *hmac)
++{
++  guint8 *buffer;
++  gsize digest_len;
++
++  g_return_val_if_fail (hmac != NULL, NULL);
++
++  if (hmac->digest_str)
++    return hmac->digest_str;
++
++  digest_len = g_checksum_type_get_length (hmac->digest_type);
++  buffer = g_alloca (digest_len);
++
++  gnutls_hmac_output (hmac->hmac, buffer);
++  hmac->digest_str = gchecksum_digest_to_string (buffer, digest_len);
++  return hmac->digest_str;
++}
++
++
++void
++g_hmac_get_digest (GHmac  *hmac,
++                   guint8 *buffer,
++                   gsize  *digest_len)
++{
++  g_return_if_fail (hmac != NULL);
++
++  gnutls_hmac_output (hmac->hmac, buffer);
++  *digest_len = g_checksum_type_get_length (hmac->digest_type);
++}
+diff --git a/glib/ghmac.c b/glib/ghmac.c
+index 4f181f21f..c62d9ce4e 100644
+--- a/glib/ghmac.c
++++ b/glib/ghmac.c
+@@ -33,6 +33,9 @@
+ #include "gtypes.h"
+ #include "glibintl.h"
+ 
++#ifdef HAVE_GNUTLS
++#error "build configuration error"
++#endif
+ 
+ /**
+  * SECTION:hmac
+diff --git a/glib/meson.build b/glib/meson.build
+index b3bf067c7..3cdc3b573 100644
+--- a/glib/meson.build
++++ b/glib/meson.build
+@@ -252,7 +252,6 @@ glib_sources = files(
+   'gfileutils.c',
+   'ggettext.c',
+   'ghash.c',
+-  'ghmac.c',
+   'ghmac-utils.c',
+   'ghook.c',
+   'ghostutils.c',
+@@ -308,6 +307,7 @@ glib_sources = files(
+   'guriprivate.h',
+   'gutils.c',
+   'gutilsprivate.h',
++  'gchecksumprivate.h',
+   'guuid.c',
+   'gvariant.c',
+   'gvariant-core.c',
+@@ -352,6 +352,12 @@ else
+   glib_dtrace_hdr = []
+ endif
+ 
++if get_option('gnutls')
++  glib_sources += files('ghmac-gnutls.c')
++else
++  glib_sources += files('ghmac.c')
++endif
++
+ pcre_static_args = []
+ 
+ if use_pcre_static_flag
+@@ -378,7 +384,7 @@ libglib = library('glib-2.0',
+   # intl.lib is not compatible with SAFESEH
+   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],
+   c_args : glib_c_args,
+   objc_args : glib_c_args,
+ )
+diff --git a/meson.build b/meson.build
+index e0b308a25..70dd5355e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2056,6 +2056,13 @@ if host_system == 'linux'
+   glib_conf.set('HAVE_LIBMOUNT', libmount_dep.found())
+ endif
+ 
++# gnutls is used optionally by ghmac
++libgnutls_dep = []
++if get_option('gnutls')
++  libgnutls_dep = [dependency('gnutls', version : '>=3.6.9', required : true)]
++  glib_conf.set('HAVE_GNUTLS', 1)
++endif
++
+ if host_system == 'windows'
+   winsock2 = cc.find_library('ws2_32')
+ endif
+diff --git a/meson_options.txt b/meson_options.txt
+index af9645eda..2c4b2c37e 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -34,6 +34,11 @@ option('libmount',
+        value : 'auto',
+        description : 'build with libmount support')
+ 
++option('gnutls',
++       type : 'boolean',
++       value : false,
++       description : 'build with gnutls support')
++
+ option('internal_pcre',
+        type : 'boolean',
+        value : false,
+-- 
+2.28.0

sources

@@ -1 +1 @@
-d11a5cc5e08cff53349a3481816fdaff  glib-2.18.2.tar.bz2
+SHA512 (glib-2.67.0.tar.xz) = 82d562bc80885c7e516e38f17a8830596b32b1e1a4b58454ca589be79e6ab27e0a2fe0a108cb02da21981c75474abed0263c0aa38c71ead45a68db675a1d2f80

statfs-check.patch

@@ -1,78 +0,0 @@
-diff -up glib-2.17.4/configure.in.statfs-check glib-2.17.4/configure.in
---- glib-2.17.4/configure.in.statfs-check	2008-07-21 18:24:45.000000000 -0400
-+++ glib-2.17.4/configure.in	2008-07-21 18:25:19.000000000 -0400
-@@ -847,6 +847,7 @@ AC_CHECK_HEADERS([mntent.h sys/mnttab.h 
- AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct stat.st_atimensec, struct stat.st_atim.tv_nsec, struct stat.st_ctimensec, struct stat.st_ctim.tv_nsec])
- AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_blocks, struct statfs.f_fstypename, struct statfs.f_bavail],,, [#include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/statfs.h>
- #include <unistd.h>
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
-diff -up glib-2.17.4/configure.statfs-check glib-2.17.4/configure
---- glib-2.17.4/configure.statfs-check	2008-07-21 18:25:36.000000000 -0400
-+++ glib-2.17.4/configure	2008-07-21 18:25:47.000000000 -0400
-@@ -33300,6 +33300,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/statfs.h>
- #include <unistd.h>
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
-@@ -33349,6 +33350,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/statfs.h>
- #include <unistd.h>
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
-@@ -33421,6 +33423,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/statfs.h>
- #include <unistd.h>
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
-@@ -33470,6 +33473,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/statfs.h>
- #include <unistd.h>
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
-@@ -33542,6 +33546,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/statfs.h>
- #include <unistd.h>
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
-@@ -33591,6 +33596,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/statfs.h>
- #include <unistd.h>
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
-@@ -33663,6 +33669,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/statfs.h>
- #include <unistd.h>
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
-@@ -33712,6 +33719,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/statfs.h>
- #include <unistd.h>
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>