.gitignore

@@ -1 +1 @@
-SOURCES/make-4.4.1.tar.gz
+SOURCES/make-4.3.tar.gz

.make.metadata

@@ -1 +1 @@
-5ca41d365c35a4ded07d616190baf38814c25f2a SOURCES/make-4.4.1.tar.gz
+3c40e5b49b893dbb14f1e2e1f8fe89b7298cc51d SOURCES/make-4.3.tar.gz

SOURCES/make-4.0-noclock_gettime.patch

@@ -1,12 +1,14 @@
-diff -rup a/configure b/configure
+diff -up make-3.82/configure\~ make-3.82/configure
---- a/configure	2022-10-31 02:23:40.000000000 -0400
+--- make-3.82/configure~	2010-07-28 07:41:51.000000000 +0200
-+++ b/configure	2022-11-01 17:25:35.970942563 -0400
++++ make-3.82/configure	2010-08-11 15:07:50.000000000 +0200
-@@ -12467,7 +12467,7 @@ return clock_gettime ();
+@@ -7215,7 +7215,7 @@ return clock_gettime ();
    return 0;
  }
  _ACEOF
--for ac_lib in '' rt posix4
+-for ac_lib in '' rt posix4; do
-+for ac_lib in '' posix4
++for ac_lib in '' posix4; do
- do
    if test -z "$ac_lib"; then
      ac_res="none required"
+   else
+
+Diff finished.  Wed Aug 11 15:07:59 2010

SOURCES/make-4.3-cloexec.patch

@@ -0,0 +1,36 @@
+From d79fe162c009788888faaf0317253b6f0cac7092 Mon Sep 17 00:00:00 2001
+From: Kevin Buettner <kevinb@redhat.com>
+Date: Thu, 23 Apr 2020 17:05:34 -0400
+Subject: [SV 58232] Disable inheritance of jobserver FDs for recursive make
+
+A parent make will invoke a sub-make with close-on-exec disabled for
+the jobserver pipe FDs.  Force close-on-exec to be to be enabled in
+the sub-make so the pipe is not always passed to child jobs.
+
+I have a test case which, when invoked with a suitable -j switch,
+will hang if the recipe inherits the jobserver pipe.  This test case
+was inspired by a real world case in which testing GDB on Fedora
+would hang due to some poorly written test GDB cases having been
+passed the jobserver file descriptors.
+
+* src/posixos.c (jobserver_parse_auth): Call fd_noinherit() for
+jobserver pipe descriptors.
+
+Copyright-paperwork-exempt: yes
+
+diff --git a/src/posixos.c b/src/posixos.c
+index 525f292c..eab175a4 100644
+--- a/src/posixos.c
++++ b/src/posixos.c
+@@ -145,6 +145,11 @@ jobserver_parse_auth (const char *auth)
+   /* When using pselect() we want the read to be non-blocking.  */
+   set_blocking (job_fds[0], 0);
+ 
++  /* By default we don't send the job pipe FDs to our children.
++     See jobserver_pre_child() and jobserver_post_child().  */
++  fd_noinherit (job_fds[0]);
++  fd_noinherit (job_fds[1]);
++
+   return 1;
+ }
+ 

SOURCES/make-4.3-getcwd.patch

@@ -1,12 +1,12 @@
-diff -rup a/src/makeint.h b/src/makeint.h
+diff -Nrup a/src/makeint.h b/src/makeint.h
---- a/src/makeint.h	2022-10-24 02:22:00.000000000 -0400
+--- a/src/makeint.h	2016-05-21 16:22:32.000000000 -0400
-+++ b/src/makeint.h	2022-11-01 17:20:24.764001510 -0400
++++ b/src/makeint.h	2016-09-22 16:12:38.606702160 -0400
-@@ -678,7 +678,7 @@ long int lseek ();
+@@ -596,7 +596,7 @@ long int lseek ();
  # endif
  
  # ifdef  HAVE_GETCWD
 -#  if !defined(VMS) && !defined(__DECC)
 +#  if !defined(VMS) && !defined(__DECC) && !defined(getcwd)
- char *getcwd (void);
+ char *getcwd ();
  #  endif
  # else

SOURCES/make-4.3-j8k.patch

@@ -1,7 +1,7 @@
-diff -rup a/src/main.c b/src/main.c
+diff -Nrup a/src/main.c b/src/main.c
---- a/src/main.c	2022-10-24 02:22:00.000000000 -0400
+--- a/src/main.c	2016-05-31 03:17:26.000000000 -0400
-+++ b/src/main.c	2022-11-01 17:31:41.072952404 -0400
++++ b/src/main.c	2016-09-22 16:18:52.283889265 -0400
-@@ -2195,6 +2195,21 @@ main (int argc, char **argv, char **envp
+@@ -2051,6 +2051,21 @@ main (int argc, char **argv, char **envp
      }
  #endif
  

SPECS/make.spec

@@ -1,33 +1,13 @@
 # -*- coding: utf-8 -*-
-# This decides the SRPM name.  Set to "make" for a rolling release
+Summary: A GNU tool which simplifies the build process for users
-# (like Fedora) or "make-latest" for a long term release that needs
-# optional versioned updates.
 Name: make
 Epoch: 1
-Version: 4.4.1
+Version: 4.3
-Release: 9%{?dist}
+Release: 7%{?dist}
-License: GPL-3.0-or-later AND LGPL-2.1-or-later AND GFDL-1.3-or-later AND FSFULLR
+License: GPLv3+
 URL: http://www.gnu.org/software/make/
 Source: ftp://ftp.gnu.org/gnu/make/make-%{version}.tar.gz
 
-%if "%{name}" != "make"
-# Set this to the sub-package base name, for "make-latest"
-%global make %(echo make%{version} | tr -d .)
-%if 0%{?rhel} > 0
-%global _prefix /opt/rh/%{make}
-%else
-# We intentionally do not define a case for Fedora, as it should not
-# need this functionality, and letting it error avoids accidents.
-%{error:"Each downstream must specify its own /opt namespace"}
-%endif
-Summary: Meta package to include latest version of make
-%else
-%global make %{name}
-Summary: A GNU tool which simplifies the build process for users
-Provides:   make-latest = %{version}-%{release}
-Provides:   %(echo make%{version} | tr -d .) = %{version}-%{release}
-%endif
-
 %if 0%{?rhel} > 0
 # This gives the user the option of saying --with guile, but defaults to WITHOUT
 %bcond_with guile
@@ -46,28 +26,22 @@ Patch1: make-4.0-noclock_gettime.patch
 # BZs #142691, #17374
 Patch2: make-4.3-j8k.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1827850
+# https://savannah.gnu.org/bugs/?58232
+# Remove on next make rebase
+Patch3: make-4.3-cloexec.patch
+
 # autoreconf
 BuildRequires: make
 BuildRequires: autoconf, automake, gettext-devel
 BuildRequires: procps
-BuildRequires: perl
+BuildRequires: perl-interpreter
 %if %{with guile}
-BuildRequires: pkgconfig(guile-3.0)
+BuildRequires: pkgconfig(guile-2.2)
 %endif
 BuildRequires: gcc
 
-%if "%{name}" != "make"
+%description
-# We're still on the make-latest package
-Requires: %{make}
-%description -n make-latest
-The latest GNU Make, with a version-specific install
-%files -n make-latest
-
-%package -n %{make}
-Summary: A GNU tool which simplifies the build process for users
-%endif
-
-%description -n %{make}
 A GNU tool for controlling the generation of executables and other
 non-source files of a program from the program's source files. Make
 allows users to build and install packages without any significant
@@ -75,14 +49,14 @@ knowledge about the details of the build process. The details about
 how the program should be built are provided for make in the program's
 makefile.
 
-%package -n %{make}-devel
+%package devel
 Summary: Header file for externally visible definitions
 
-%description -n %{make}-devel
+%description devel
-The %{make}-devel package contains gnumake.h.
+The make-devel package contains gnumake.h.
 
 %prep
-%autosetup -n make-%{version} -p1
+%autosetup -p1
 
 rm -f tests/scripts/features/parallelism.orig
 
@@ -104,94 +78,31 @@ ln -sf make ${RPM_BUILD_ROOT}/%{_bindir}/gmake
 ln -sf make.1 ${RPM_BUILD_ROOT}/%{_mandir}/man1/gmake.1
 rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir
 
-%if "%{name}" != "make"
+%find_lang %name
-install -d -m 755 ${RPM_BUILD_ROOT}/etc/scl/prefixes
-dirname %{_prefix} > %{make}.prefix
-install -p -m 644 %{make}.prefix ${RPM_BUILD_ROOT}/etc/scl/prefixes/%{make}
-
-echo "export PATH=%{_prefix}/bin:\$PATH" > enable.scl
-install -p -m 755 enable.scl ${RPM_BUILD_ROOT}/%{_prefix}/enable
-%endif
-
-%find_lang make
 
 %check
 echo ============TESTING===============
 /usr/bin/env LANG=C make check && true
 echo ============END TESTING===========
 
-%files -n %{make} -f make.lang
+%files  -f %{name}.lang
 %license COPYING
 %doc NEWS README AUTHORS
 %{_bindir}/*
 %{_mandir}/man*/*
 %{_infodir}/*.info*
 %{_includedir}/gnumake.h
-%if "%{name}" != "make"
-/etc/scl/prefixes/%{make}
-%{_prefix}/enable
-%endif
 
-%files -n %{make}-devel
+%files devel
 %{_includedir}/gnumake.h
 
 %changelog
-* Tue Nov 5 2024 DJ Delorie <dj@redhat.com> - 1:4.4.1-9
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:4.3-7
-- Ensure that we can upgrade from make-latest to make (RHEL-33540)
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-
+  Related: rhbz#1991688
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:4.4.1-8
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:4.4.1-7
-- Bump release for June 2024 mass rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.4.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.4.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Nov 01 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1:4.4.1-4
-- Use guile-3.0
-
-* Thu Jul 20 2023 DJ Delorie <dj@redhat.com> - 1:4.4.1-3
-- Migrate License field to SPDX identifiers for
-  https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.4.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Mar 31 2023 DJ Delorie <dj@redhat.com> - 1:4.4.1-1
-- Rebase to make 4.4
-
-* Mon Jan 30 2023 DJ Delorie <dj@redhat.com> - 1:4.4-3
-- Handle SIGPIPE as a fatal signal
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Nov 1 2022 DJ Delorie <dj@redhat.com> - 1:4.4-1
-- Rebase to make 4.4
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.3-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jul 14 2022 DJ Delorie <dj@redhat.com> - 1:4.3-10
-- Add SCL compatibility to LTS builds.
-
-* Wed Jun 29 2022 DJ Delorie <dj@redhat.com> - 1:4.3-9
-- Enable long-term supported builds.
-
-* Fri Apr 8 2022 DJ Delorie <dj@redhat.com> - 1:4.3-8
-- Rewrite filter/filter-out to avoid large stack usage. BZ #2010506
-- Require perl core modules for testsuite
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.3-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.3-6
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:4.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Fri Feb 19 2021 DJ Delorie <dj@redhat.com> - 1:4.3-5
 - Allow users to build with or without guile support as desired.