Synchronize with Fedora Rawhide (For RHEL 10.0)

last_sync: aa46ef141ccd93701310ecff70c97a02cccd8d33
resolves: RHEL-73826
side-tag: c10s-build-side-3716-stack-gate

mingw-zlib.spec

@@ -1,8 +1,9 @@
+%global mingw_build_ucrt64 1
 %{?mingw_package_header}
 
 Name:           mingw-zlib
 Version:        1.3.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW Windows zlib compression library
 
 License:        Zlib
@@ -22,6 +23,9 @@ BuildRequires:  mingw32-gcc
 BuildRequires:  mingw64-filesystem >= 95
 BuildRequires:  mingw64-gcc
 
+BuildRequires:  ucrt64-filesystem >= 95
+BuildRequires:  ucrt64-gcc
+
 
 %description
 MinGW Windows zlib compression library.
@@ -58,6 +62,21 @@ Requires:       mingw64-zlib = %{version}-%{release}
 The mingw64-zlib-static package contains static library for mingw64-zlib development.
 
 
+# UCRT64
+%package -n ucrt64-zlib
+Summary:        MinGW Windows zlib compression library for the ucrt64 target
+
+%description -n ucrt64-zlib
+MinGW Windows zlib compression library for the ucrt64 target.
+
+%package -n ucrt64-zlib-static
+Summary:        Static libraries for ucrt64-zlib development
+Requires:       ucrt64-zlib = %{version}-%{release}
+
+%description -n ucrt64-zlib-static
+The ucrt64-zlib-static package contains static library for ucrt64-zlib development.
+
+
 %{?mingw_debug_package}
 
 
@@ -68,6 +87,7 @@ The mingw64-zlib-static package contains static library for mingw64-zlib develop
 %build
 MINGW32_CMAKE_ARGS=-DINSTALL_PKGCONFIG_DIR=%{mingw32_libdir}/pkgconfig \
 MINGW64_CMAKE_ARGS=-DINSTALL_PKGCONFIG_DIR=%{mingw64_libdir}/pkgconfig \
+UCRT64_CMAKE_ARGS=-DINSTALL_PKGCONFIG_DIR=%{ucrt64_libdir}/pkgconfig \
 %mingw_cmake
 %mingw_make_build
 %mingw_make_build
@@ -79,6 +99,7 @@ MINGW64_CMAKE_ARGS=-DINSTALL_PKGCONFIG_DIR=%{mingw64_libdir}/pkgconfig \
 # Drop the man pages
 rm -rf %{buildroot}%{mingw32_mandir}
 rm -rf %{buildroot}%{mingw64_mandir}
+rm -rf %{buildroot}%{ucrt64_mandir}
 
 
 # Win32
@@ -103,8 +124,22 @@ rm -rf %{buildroot}%{mingw64_mandir}
 %files -n mingw64-zlib-static
 %{mingw64_libdir}/libz.a
 
+# UCRT64
+%files -n ucrt64-zlib
+%{ucrt64_includedir}/zconf.h
+%{ucrt64_includedir}/zlib.h
+%{ucrt64_libdir}/libz.dll.a
+%{ucrt64_bindir}/zlib1.dll
+%{ucrt64_libdir}/pkgconfig/zlib.pc
+
+%files -n ucrt64-zlib-static
+%{ucrt64_libdir}/libz.a
 
 %changelog
+* Tue Jan 14 2025 Miroslav Rezanina <mrezanin@redhat.com> - 1.3.1-5
+- Synchronize with Fedora Rawhide
+  Resolves: RHEL-73826
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.3.1-4
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018

mingw32-zlib-1.2.7-autotools.patch

@@ -0,0 +1,76 @@
+diff -rupN --no-dereference zlib-1.2.11/configure.ac zlib-1.2.11-new/configure.ac
+--- zlib-1.2.11/configure.ac	1970-01-01 01:00:00.000000000 +0100
++++ zlib-1.2.11-new/configure.ac	2020-11-12 22:09:58.320508742 +0100
+@@ -0,0 +1,13 @@
++#                                               -*- Autoconf -*-
++# Process this file with autoconf to produce a configure script.
++
++AC_INIT([zlib], [1.2.11], [bugzilla.redhat.com])
++AC_CONFIG_SRCDIR([gzlib.c])
++AC_CONFIG_MACRO_DIR([m4])
++AM_INIT_AUTOMAKE([foreign subdir-objects])
++LT_INIT
++
++AC_SUBST([HAVE_UNISTD_H], [0])
++AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], [])
++AC_CONFIG_FILES([Makefile zlib.pc zconf.h:zconf.h.in])
++AC_OUTPUT
+diff -rupN --no-dereference zlib-1.2.11/Makefile.am zlib-1.2.11-new/Makefile.am
+--- zlib-1.2.11/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ zlib-1.2.11-new/Makefile.am	2020-11-12 22:09:58.320508742 +0100
+@@ -0,0 +1,37 @@
++ACLOCAL_AMFLAGS = -I m4 --install
++
++lib_LTLIBRARIES = libz.la
++
++libz_la_SOURCES = \
++	adler32.c \
++	compress.c \
++	crc32.c \
++	crc32.h \
++	gzclose.c \
++	gzlib.c \
++	gzread.c \
++	gzwrite.c \
++	uncompr.c \
++	deflate.c \
++	deflate.h \
++	trees.c \
++	trees.h \
++	zutil.c \
++	zutil.h \
++	inflate.c \
++	inflate.h \
++	infback.c \
++	inftrees.c \
++	inftrees.h \
++	inffast.c \
++	inffast.h \
++	infflate.h
++
++# Use -version-number to match the file name used before autoconfiscation.
++libz_la_LDFLAGS = -version-number 1:2:11 -no-undefined
++
++include_HEADERS = zlib.h
++nodist_include_HEADERS = zconf.h
++
++dist_man_MANS = zlib.3
++
+diff -rupN --no-dereference zlib-1.2.11/zlib.pc.in zlib-1.2.11-new/zlib.pc.in
+--- zlib-1.2.11/zlib.pc.in	2010-04-18 08:48:15.000000000 +0200
++++ zlib-1.2.11-new/zlib.pc.in	2020-11-12 22:09:58.320508742 +0100
+@@ -1,7 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-sharedlibdir=@sharedlibdir@
+ includedir=@includedir@
+ 
+ Name: zlib
+@@ -9,5 +8,5 @@ Description: zlib compression library
+ Version: @VERSION@
+ 
+ Requires:
+-Libs: -L${libdir} -L${sharedlibdir} -lz
++Libs: -L${libdir} -lz
+ Cflags: -I${includedir}

mingw32-zlib-create-zlib1-dll.patch

@@ -0,0 +1,10 @@
+--- ltmain.sh.orig	2010-10-13 23:11:05.164935359 +0200
++++ ltmain.sh	2010-10-13 23:33:31.572557755 +0200
+@@ -7431,6 +7431,7 @@
+ 	    eval test_cmds=\"$archive_expsym_cmds\"
+ 	    cmds=$archive_expsym_cmds
+ 	  else
++	    if test "$soname" = "libz-1.dll" ; then soname=zlib1.dll; fi
+ 	    eval test_cmds=\"$archive_cmds\"
+ 	    cmds=$archive_cmds
+ 	  fi

zlib-1.2.7-use-correct-def-file.patch

@@ -0,0 +1,8 @@
+diff -rupN --no-dereference zlib-1.2.11/win32/zlib.def zlib-1.2.11-new/win32/zlib.def
+--- zlib-1.2.11/win32/zlib.def	2017-01-01 08:37:10.000000000 +0100
++++ zlib-1.2.11-new/win32/zlib.def	2020-11-12 22:09:58.338508692 +0100
+@@ -1,3 +1,4 @@
++LIBRARY zlib1.dll
+ ; zlib data compression library
+ EXPORTS
+ ; basic functions