2 changed files with 94 additions and 32 deletions
--- a/SOURCES/patch-configure-c99.patch
+++ b/SOURCES/patch-configure-c99.patch
@ -0,0 +1,31 @@
+Avoid an implicit declaration of mkdir in the fchownat probe.  Fixed
+in gnulib upstream via:
+
+commit 3c136a2cc38d71083f123231a8b9ad4b01930789
+Author: Bruno Haible <bruno@clisp.org>
+Date:   Thu Jan 24 23:51:11 2019 +0100
+
+    fchownat: Fix compilation error on Android 4.3.
+    
+    * lib/unistd.in.h: Include <sys/stat.h> when module 'fchownat' is in
+    use.
+    * m4/fchownat.m4 (gl_FUNC_FCHOWNAT_DEREF_BUG,
+    gl_FUNC_FCHOWNAT_EMPTY_FILENAME_BUG): Include also <sys/stat.h>.
+    * doc/posix-functions/fchownat.texi: Mention the issue.
+
+The patched filed is not included in the upstream Git repository for
+patch, so presumably the next upstream release will sync the file from
+gnulib and get the fix this way.
+
+diff --git a/m4/fchownat.m4 b/m4/fchownat.m4
+index 54c670c7037246a4..b1a1287f80c297a0 100644
+--- a/m4/fchownat.m4
+++ b/m4/fchownat.m4
+@@ -86,6 +86,7 @@ AC_DEFUN([gl_FUNC_FCHOWNAT_EMPTY_FILENAME_BUG],
+        [AC_LANG_PROGRAM(
+           [[#include <unistd.h>
+             #include <fcntl.h>
+	    #include <sys/stat.h>
+           ]],
+           [[int fd;
+             int ret;
--- a/SPECS/patch.spec
+++ b/SPECS/patch.spec
@ -3,8 +3,8 @@
 Summary: Utility for modifying/upgrading files
 Name: patch
 Version: 2.7.6
-Release: 16%{?dist}
-License: GPLv3+
+Release: 25%{?dist}
+License: GPL-3.0-or-later
 URL: https://savannah.gnu.org/projects/patch/
 Source: https://ftp.gnu.org/gnu/patch/patch-%{version}.tar.xz
 Patch0: patch-2.7.6-avoid-set_file_attributes-sign-conversion-warnings.patch
@ -32,6 +32,7 @@ Patch21: patch-2.7.6-avoid-invalid-memory-access-in-context-format-diffs.patch
 Patch22: patch-2.7.6-CVE-2018-17942.patch
 Patch23: patch-2.7.6-failed_assertion.patch
 Patch100: patch-selinux.patch
+Patch101: patch-configure-c99.patch

 BuildRequires: make
 BuildRequires: gcc
@ -56,34 +57,35 @@ applications.

 %prep
 %setup -q
-%patch0 -p1 -b .avoid-set_file_attributes-sign-conversion-warnings
-%patch1 -p1 -b .test-suite-compatibility-fixes
-%patch2 -p1 -b .fix-korn-shell-incompatibility
-%patch3 -p1 -b .fix-segfault-with-mangled-rename-patch
-%patch4 -p1 -b .allow-input-files-to-be-missing-for-ed-style-patches
+%patch 0 -p1 -b .avoid-set_file_attributes-sign-conversion-warnings
+%patch 1 -p1 -b .test-suite-compatibility-fixes
+%patch 2 -p1 -b .fix-korn-shell-incompatibility
+%patch 3 -p1 -b .fix-segfault-with-mangled-rename-patch
+%patch 4 -p1 -b .allow-input-files-to-be-missing-for-ed-style-patches
 # CVE-2018-1000156, Malicious patch files cause ed to execute arbitrary commands
-%patch5 -p1 -b .CVE-2018-1000156
-%patch6 -p1 -b .CVE-2019-13638-invoked-ed-directly-instead-of-using-the-shell
-%patch7 -p1 -b .switch-from-fork-execlp-to-execute
-%patch8 -p1 -b .cleanups-in-do_ed_script
-%patch9 -p1 -b .avoid-warnings-gcc8
-%patch10 -p1 -b .check-of-return-value-of-fwrite
-%patch11 -p1 -b .fix-ed-style-test-failure
-%patch12 -p1 -b .dont-leak-temporary-file-on-failed-ed-style-patch
-%patch13 -p1 -b .dont-leak-temporary-file-on-failed-multi-file-ed-style-patch
-%patch14 -p1 -b .make-debug-output-more-useful
-%patch15 -p1 -b .CVE-2018-6952-fix-swapping-fake-lines-in-pch_swap
-%patch16 -p1 -b .improve_support_for_memory_leak_detection
-%patch17 -p1 -b .skip-ed-test-when-the-ed-utility-is-not-installed
-%patch18 -p1 -b .abort_when_cleaning_up_fails
-%patch19 -p1 -b .crash-RLIMIT_NOFILE
-%patch20 -p1 -b .CVE-2019-13636-symlinks
-%patch21 -p1 -b .avoid-invalid-memory-access-in-context-format-diffs
+%patch 5 -p1 -b .CVE-2018-1000156
+%patch 6 -p1 -b .CVE-2019-13638-invoked-ed-directly-instead-of-using-the-shell
+%patch 7 -p1 -b .switch-from-fork-execlp-to-execute
+%patch 8 -p1 -b .cleanups-in-do_ed_script
+%patch 9 -p1 -b .avoid-warnings-gcc8
+%patch 10 -p1 -b .check-of-return-value-of-fwrite
+%patch 11 -p1 -b .fix-ed-style-test-failure
+%patch 12 -p1 -b .dont-leak-temporary-file-on-failed-ed-style-patch
+%patch 13 -p1 -b .dont-leak-temporary-file-on-failed-multi-file-ed-style-patch
+%patch 14 -p1 -b .make-debug-output-more-useful
+%patch 15 -p1 -b .CVE-2018-6952-fix-swapping-fake-lines-in-pch_swap
+%patch 16 -p1 -b .improve_support_for_memory_leak_detection
+%patch 17 -p1 -b .skip-ed-test-when-the-ed-utility-is-not-installed
+%patch 18 -p1 -b .abort_when_cleaning_up_fails
+%patch 19 -p1 -b .crash-RLIMIT_NOFILE
+%patch 20 -p1 -b .CVE-2019-13636-symlinks
+%patch 21 -p1 -b .avoid-invalid-memory-access-in-context-format-diffs
 # CVE-2018-17942 gnulib: heap-based buffer overflow
-%patch22 -p1 -b .CVE-2018-17942-gnulib_buffer_overflow
-%patch23 -p1 -b .failed_assertion
+%patch 22 -p1 -b .CVE-2018-17942-gnulib_buffer_overflow
+%patch 23 -p1 -b .failed_assertion
 # SELinux support.
-%patch100 -p1 -b .selinux
+%patch 100 -p1 -b .selinux
+%patch 101 -p1

 %build
 CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
@ -107,12 +109,41 @@ make check
 %{_mandir}/*/*

 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.7.6-16
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.7.6-25
+- Rebuilt for MSVSphere 10

-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.7.6-15
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.7.6-25
+- Bump release for June 2024 mass rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.6-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.6-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.6-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Mar 28 2023 Than Ngo <than@redhat.com> - 2.7.6-21
+- Fix deprecated patch macro
+
+* Tue Feb 21 2023 Than Ngo <than@redhat.com> - 2.7.6-20
+- migrated to SPDX license
+
+* Thu Feb 02 2023 Florian Weimer <fweimer@redhat.com> - 2.7.6-19
+- Port configure script to C99
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.6-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.6-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.6-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.6-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.6-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild