Mon Jan 27 00:48:51 UTC 2020

a/aaa_elflibs-15.0-x86_64-21.txz:  Rebuilt.
  Upgraded:  libisl.so.22.0.1.
  Added:  libkeyutils.so.1.9.
a/kernel-generic-5.4.15-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.4.15-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.4.15-x86_64-1.txz:  Upgraded.
a/pciutils-3.6.4-x86_64-1.txz:  Upgraded.
a/shadow-4.8.1-x86_64-1.txz:  Upgraded.
d/check-0.14.0-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.4.15-x86-1.txz:  Upgraded.
d/make-4.2.1-x86_64-5.txz:  Rebuilt.
  Drop back to make-4.2.1 since make-4.3 is breaking a few builds. We'll
  revisit it later after sources have caught up to it or regressions have
  been patched upstream.
d/python-pip-20.0.2-x86_64-1.txz:  Upgraded.
k/kernel-source-5.4.15-noarch-1.txz:  Upgraded.
l/imagemagick-7.0.9_18-x86_64-1.txz:  Upgraded.
l/python-packaging-20.1-x86_64-1.txz:  Upgraded.
n/php-7.4.2-x86_64-3.txz:  Rebuilt.
  php.ini: Added extension=gd and extension=zip. Thanks to avian.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

8 files changed, 19 insertions, 11 deletions

diff --git a/slackware64-current/source/d/make/b552b05251980f693c729e251f93f5225b400714.patch.gz b/slackware64-current/source/d/make/b552b05251980f693c729e251f93f5225b400714.patch.gz
new file mode 100644
index 000000000..717325234
--- /dev/null
+++ b/slackware64-current/source/d/make/b552b05251980f693c729e251f93f5225b400714.patch.gz
@@ -0,0 +1 @@
+e57237c2ce26141fcab1529f9d0a19686cdddf4d
diff --git a/slackware64-current/source/d/make/make-4.2.1.tar.bz2.sig b/slackware64-current/source/d/make/make-4.2.1.tar.bz2.sig
new file mode 100644
index 000000000..9e57cf2a1
--- /dev/null
+++ b/slackware64-current/source/d/make/make-4.2.1.tar.bz2.sig
@@ -0,0 +1 @@
+f7f07910f37abc352a86e9d330f04bbce7e84653
diff --git a/slackware64-current/source/d/make/make-4.3.tar.lz b/slackware64-current/source/d/make/make-4.3.tar.lz
deleted file mode 100644
index 5fdcf1186..000000000
--- a/slackware64-current/source/d/make/make-4.3.tar.lz
+++ /dev/null
@@ -1 +0,0 @@
-c72bc87715fcdf8c1e2efab84c254aac69615f7b
diff --git a/slackware64-current/source/d/make/make-4.3.tar.lz.sig b/slackware64-current/source/d/make/make-4.3.tar.lz.sig
deleted file mode 100644
index a179ca76f..000000000
--- a/slackware64-current/source/d/make/make-4.3.tar.lz.sig
+++ /dev/null
@@ -1 +0,0 @@
-80426cde4086db534d914c193edf3006e5cac7c8
diff --git a/slackware64-current/source/d/make/make.SlackBuild b/slackware64-current/source/d/make/make.SlackBuild
index 770e972ae..0ea16d1d0 100755
--- a/slackware64-current/source/d/make/make.SlackBuild
+++ b/slackware64-current/source/d/make/make.SlackBuild
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=make
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-5}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -68,7 +68,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf make-$VERSION
-tar xvf $CWD/make-$VERSION.tar.?z || exit 1
+tar xvf $CWD/make-$VERSION.tar.bz2 || exit 1
 cd make-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -77,6 +77,12 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+zcat $CWD/make.guile30.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/make.glibc-2.27.glob.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/b552b05251980f693c729e251f93f5225b400714.patch.gz | patch -p1 --verbose || exit 1
+
+autoreconf -vif
+
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -127,7 +133,7 @@ fi
 
 mkdir -p $PKG/usr/doc/make-$VERSION
 cp -a \
-  AUTHORS* COPYING* ChangeLog NEWS* README* \
+  AUTHORS COPYING* ChangeLog NEWS README* \
   $PKG/usr/doc/make-$VERSION/
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/slackware64-current/source/d/make/make.glibc-2.27.glob.diff.gz b/slackware64-current/source/d/make/make.glibc-2.27.glob.diff.gz
new file mode 100644
index 000000000..56b80fc94
--- /dev/null
+++ b/slackware64-current/source/d/make/make.glibc-2.27.glob.diff.gz
@@ -0,0 +1 @@
+0681e135940f0b4690c9622d03ced2af3d2cfffe
diff --git a/slackware64-current/source/d/make/make.guile30.diff.gz b/slackware64-current/source/d/make/make.guile30.diff.gz
new file mode 100644
index 000000000..3ecebb4e4
--- /dev/null
+++ b/slackware64-current/source/d/make/make.guile30.diff.gz
@@ -0,0 +1 @@
+971182f979df7c9892a8243769fa8dbf03799148
diff --git a/slackware64-current/source/d/make/slack-desc b/slackware64-current/source/d/make/slack-desc
index dd71f84a5..883506fb4 100644
--- a/slackware64-current/source/d/make/slack-desc
+++ b/slackware64-current/source/d/make/slack-desc
@@ -9,11 +9,11 @@
 make: make (GNU make utility to maintain groups of programs)
 make:
 make: This is the GNU implementation of make, which was written by Richard
-make: Stallman and Roland McGrath with later development handled by Paul D.
-make: Smith. The purpose of the make utility is to determine automatically
-make: which pieces of a large program need to be recompiled, and issue the
-make: commands to recompile them. 
+make: Stallman and Roland McGrath. The purpose of the make utility is to
+make: determine automatically which pieces of a large program need to be 
+make: recompiled, and issue the commands to recompile them. 
 make:
-make: Homepage: https://savannah.gnu.org/projects/make/
+make: This is needed to compile just about any major C program, including
+make: the Linux kernel.
 make:
 make: