[rpms/glib2] cve-2026-58016-f44: fix spec

[Matthias Clasen <mclasen@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/glib2
Branch : cve-2026-58016-f44
Commit : f51f344896252a17dbcda9ea14b6165b8142a371
Author : Matthias Clasen <mclasen@fedoraproject.org>
Date   : 2008-12-01T15:53:48+00:00
Stats  : +2/-321 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/glib2/c/f51f344896252a17dbcda9ea14b6165b8142a371?branch=cve-2026-58016-f44

Log:
fix spec

---
diff --git a/gio-2.18-always-pass-fuse-file-uri.patch b/gio-2.18-always-pass-fuse-file-uri.patch
deleted file mode 100644
index 2c3c350..0000000
--- a/gio-2.18-always-pass-fuse-file-uri.patch
+++ /dev/null
@@ -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);

diff --git a/glib-2.17.4-gio-guess-content-sync.patch b/glib-2.17.4-gio-guess-content-sync.patch
deleted file mode 100644
index ad10c35..0000000
--- a/glib-2.17.4-gio-guess-content-sync.patch
+++ /dev/null
@@ -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)

diff --git a/glib-2.18.2-no-generic-icons.patch b/glib-2.18.2-no-generic-icons.patch
deleted file mode 100644
index 9308297..0000000
--- a/glib-2.18.2-no-generic-icons.patch
+++ /dev/null
@@ -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);
-                     }
-                 }
- 

diff --git a/glib2.spec b/glib2.spec
index 1fc9af0..9790819 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.19.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -19,12 +19,6 @@ BuildRequires: libselinux-devel
 # for sys/inotify.h
 BuildRequires: glibc-devel
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=442835
-# http://bugzilla.gnome.org/show_bug.cgi?id=528670
-Patch2: gio-2.18-always-pass-fuse-file-uri.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=528320 (from svn)
-Patch3: glib-2.18.2-no-generic-icons.patch
-
 Patch4: glib-i386-atomic.patch
 
 # this patch requires autoreconf
@@ -61,8 +55,6 @@ of version 2 of the GLib library.
 
 %prep
 %setup -q -n glib-%{version}
-%patch2 -p1 -b .always-pass-fuse-file-uri
-%patch3 -p0 -b .no-generic-icons
 %patch4 -p1 -b .i386-atomic
 
 libtoolize --force --copy
@@ -141,7 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
-* Mon Dec  1 2008 Matthias Clasen <mclasen@redhat.com> - 2.19.1-1
+* Mon Dec  1 2008 Matthias Clasen <mclasen@redhat.com> - 2.19.1-2
 - Update to 2.19.1
 
 * Mon Oct 27 2008 Matthias Clasen <mclasen@redhat.com> - 2.18.2-3

diff --git a/statfs-check.patch b/statfs-check.patch
deleted file mode 100644
index 2119afb..0000000
--- a/statfs-check.patch
+++ /dev/null
@@ -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>