[rpms/glib2] cve-2026-58016-f44: another attempt

[rpms/glib2] cve-2026-58016-f44: another attempt

[Matthias Clasen]

A new commit has been pushed.

Repo   : rpms/glib2
Branch : cve-2026-58016-f44
Commit : ba121059e7d79e3de7b82b69d90bea95f0f9ec8d
Author : Matthias Clasen <mclasen@fedoraproject.org>
Date   : 2006-05-25T17:45:07+00:00
Stats  : +10/-23 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/glib2/c/ba121059e7d79e3de7b82b69d90bea95f0f9ec8d?branch=cve-2026-58016-f44

Log:
another attempt

---
diff --git a/glib-2.11.1-libdir.patch b/glib-2.11.1-libdir.patch
index c0e0edf..ca79a39 100644
--- a/glib-2.11.1-libdir.patch
+++ b/glib-2.11.1-libdir.patch
@@ -1,29 +1,18 @@
---- glib-2.11.1/glib-2.0.pc.in.multilib	2006-05-25 10:17:11.000000000 -0400
-+++ glib-2.11.1/glib-2.0.pc.in	2006-05-25 10:17:27.000000000 -0400
-@@ -11,5 +11,5 @@
- Description: C Utility Library
- Version: @VERSION@
- Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@
--Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include 
-+Cflags: -I${includedir}/glib-2.0 -I${prefix}/lib/glib-2.0/include 
- 
---- glib-2.11.1/Makefile.am.multilib	2006-05-25 10:16:15.000000000 -0400
-+++ glib-2.11.1/Makefile.am	2006-05-25 10:17:00.000000000 -0400
-@@ -49,7 +49,7 @@
- 	config.h.win32		\
+--- glib-2.11.1/Makefile.in.libdir	2006-05-25 13:40:06.000000000 -0400
++++ glib-2.11.1/Makefile.in	2006-05-25 13:40:59.000000000 -0400
+@@ -287,13 +287,13 @@
  	gtk-doc.make
  
+ 
 -configexecincludedir = $(libdir)/glib-2.0/include
-+configexecincludedir = $(prefix)/lib/glib-2.0/include
- #configexecinclude_DATA = glibconfig.h
++configexecincludedir = $(prefix)$(libdir)/glib-2.0/include
+ 
+ CONFIGURE_DEPENDENCIES = acglib.m4
  
- install-exec-local: glibconfig.h
-@@ -71,7 +71,7 @@
- 	cd $(top_builddir) && $(SHELL) ./config.status glibconfig.h
- 	echo timestamp > stamp-gc-h
+ BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
  
 -pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/lib/pkgconfig
++pkgconfigdir = $(prefix)$(libdir)/pkgconfig
  pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gmodule-export-2.0.pc gmodule-no-export-2.0.pc gthread-2.0.pc
  
- $(pkgconfig_DATA): config.status
+ # install mkinstalldirs for glib-gettextize's benefit

diff --git a/glib2.spec b/glib2.spec
index 758086c..e6b66ef 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -44,8 +44,6 @@ version 2 of the GLib library.
 
 %build
 
-# .libdir touches .am 
-automake-1.7
 for i in config.guess config.sub ; do
 	test -f /usr/share/libtool/$i && cp /usr/share/libtool/$i .
 done