Fri Jun 15 04:12:46 UTC 2018

a/efibootmgr-16-x86_64-2.txz:  Rebuilt.
a/efivar-35-x86_64-1.txz:  Upgraded.
  Switch to efivar-35, since 36 seems to have problems. Thanks to _RDS_.
ap/slackpkg-2.83.0-noarch-3.txz:  Rebuilt.
  Don't remove ChangeLog.txt upon upgrade/reinstall.
  Use CHECKSUMS.md5.asc to determine if ChangeLog.txt is unchanged.
  Remove dead bjtu.edu.cn mirrors from the sample mirrors files.
isolinux/initrd.img:  Rebuilt.
  Include libefivar.so.1 on the installer (needed by efibootmgr).
usb-and-pxe-installers/usbboot.img:  Rebuilt.
  Include libefivar.so.1 on the installer (needed by efibootmgr).

13 files changed, 79 insertions, 31 deletions

diff --git a/ChangeLog.txt.old b/ChangeLog.txt.old
index 52a7d8090..4aac1c75c 100644
--- a/ChangeLog.txt.old
+++ b/ChangeLog.txt.old
@@ -1,3 +1,23 @@
+Fri Jun 15 00:03:49 UTC 2018
+a/dcron-4.5-x86_64-8.txz:  Rebuilt.
+  rc.crond: match the running process more accurately.
+a/glibc-zoneinfo-2018e-noarch-3.txz:  Rebuilt.
+  Don't emit an error if the /etc/localtime-copied-from is not present when
+  the package is initially installed.
+a/libcgroup-0.41-x86_64-5.txz:  Rebuilt.
+  Added /etc/cgconfig.d/ directory.
+a/pkgtools-15.0-noarch-19.txz:  Rebuilt.
+  installpkg, makebootdisk, removepkg, upgradepkg: don't try to remove admin
+  directories (supposedly "in case" they are a symlink).
+a/sysvinit-scripts-2.1-noarch-12.txz:  Rebuilt.
+  rc.6: stop haveged
+  rc.S: start rc.cgconfig and rc.cgred
+ap/at-3.1.20-x86_64-5.txz:  Rebuilt.
+  rc.atd: match the running process more accurately.
+ap/slackpkg-2.83.0-noarch-2.txz:  Rebuilt.
+  Patched to handle the case where /var/log/packages is a symlink.
+l/gsl-2.5-x86_64-1.txz:  Upgraded.
++--------------------------+
 Wed Jun 13 21:55:19 UTC 2018
 a/etc-15.0-x86_64-5.txz:  Rebuilt.
   Don't hardcode passwd/shadow/group additions in doinst.sh - get them from
diff --git a/slackware64-current/ChangeLog.txt b/slackware64-current/ChangeLog.txt
index 4aac1c75c..cd6b1a3d7 100644
--- a/slackware64-current/ChangeLog.txt
+++ b/slackware64-current/ChangeLog.txt
@@ -1,3 +1,16 @@
+Fri Jun 15 04:12:46 UTC 2018
+a/efibootmgr-16-x86_64-2.txz:  Rebuilt.
+a/efivar-35-x86_64-1.txz:  Upgraded.
+  Switch to efivar-35, since 36 seems to have problems. Thanks to _RDS_.
+ap/slackpkg-2.83.0-noarch-3.txz:  Rebuilt.
+  Don't remove ChangeLog.txt upon upgrade/reinstall.
+  Use CHECKSUMS.md5.asc to determine if ChangeLog.txt is unchanged.
+  Remove dead bjtu.edu.cn mirrors from the sample mirrors files.
+isolinux/initrd.img:  Rebuilt.
+  Include libefivar.so.1 on the installer (needed by efibootmgr).
+usb-and-pxe-installers/usbboot.img:  Rebuilt.
+  Include libefivar.so.1 on the installer (needed by efibootmgr).
++--------------------------+
 Fri Jun 15 00:03:49 UTC 2018
 a/dcron-4.5-x86_64-8.txz:  Rebuilt.
   rc.crond: match the running process more accurately.
diff --git a/slackware64-current/source/CHECKSUMS.md5 b/slackware64-current/source/CHECKSUMS.md5
index 3320158ca..9c4221856 100644
--- a/slackware64-current/source/CHECKSUMS.md5
+++ b/slackware64-current/source/CHECKSUMS.md5
@@ -10,8 +10,8 @@ tail +13 CHECKSUMS.md5 | md5sum -c --quiet - | less
 /pub/gnu, or at any GNU mirror site.
 
 MD5 message digest                Filename
-4caf5e4d81e0fbd2ea6777b3c2345441  ./FILE_LIST
-1d5cf09bcdeb8dbad3842f475b1fae94  ./MANIFEST.bz2
+89e7abc0ef80cbd869dbaf1a947180cf  ./FILE_LIST
+a6f37c28f4ddf10bb088abad0af717a5  ./MANIFEST.bz2
 842fe24ea4cecdae8e72ccac18b6e1b5  ./README.TXT
 1a8b769d7f42ff59a066ca4e8200377e  ./a/FTBFSlog
 f76a41cb2b7df6c0a9941392b3d9fd18  ./a/aaa_base/_aaa_base.tar.gz
@@ -185,9 +185,9 @@ db34994511ed0acc506f49291781f33b  ./a/ed/ed-1.14.2.tar.lz.sig
 f34e8a6fac6f6c7e2ac5705d9fd7ab6e  ./a/ed/ed.SlackBuild
 223984ac0680cd46a892981d9437d3d8  ./a/ed/slack-desc
 cedd77bcdce048856e4327c2e1a97d57  ./a/efibootmgr/efibootmgr-16.tar.lz
-19773e9966fe2e71ee6e5bf7c48629e0  ./a/efibootmgr/efibootmgr.SlackBuild
+c99724f1e9702c8251c9deaf08436c44  ./a/efibootmgr/efibootmgr.SlackBuild
 bd9c58337428395297581d7050a6486b  ./a/efibootmgr/slack-desc
-04eab41390209d92767e4d4ba9bebf2a  ./a/efivar/efivar-36.tar.lz
+f3d33c0a6ce0617fd14a4ae1b9720673  ./a/efivar/efivar-35.tar.lz
 139fa120c65e72b3be0759b097718499  ./a/efivar/efivar.SlackBuild
 ddf54fd4c6b282916710a6fba7c1ede6  ./a/efivar/slack-desc
 1c7073b6bf30613134abb7a2934484db  ./a/elilo/elilo-3.16-all.tar.xz
@@ -1115,7 +1115,8 @@ bf35f60de3b12630607405c2a6d96c14  ./ap/seejpeg/seejpeg-1.10.lsm
 78ce5d35d75549ab7cc93d0da87d3a48  ./ap/seejpeg/seejpeg.SlackBuild
 20d7e5cbd2e667f60ef246313ea2a89e  ./ap/seejpeg/slack-desc
 8e9f88664b457fb614a7727cde2e0e63  ./ap/slackpkg/0001-Fix-for-var_log_packages-being-a-symlink.patch.gz
-70da0b10c1bd14d86aeb4a61c8b62102  ./ap/slackpkg/doinst.sh.gz
+21a38a8c24a7cd18fb15b0142087d5ac  ./ap/slackpkg/0003-mirrors-x86-.sample-Remove-bjtu.edu.cn-mirror.patch.gz
+b5b40cdc3dbfc571a2bdc01f331c5338  ./ap/slackpkg/doinst.sh.gz
 6d7ce7aecfaaa160355725f01ce10cd4  ./ap/slackpkg/files/ChangeLog.gz
 4ca5b9ab2d415cc1d552bbcb9e290e79  ./ap/slackpkg/files/GPL.gz
 adaddb503304cdf39452e3f6fe924921  ./ap/slackpkg/files/README.gz
@@ -1137,7 +1138,7 @@ bcb4a534326b9a8b5286f1d91a90eae6  ./ap/slackpkg/files/pkglist.awk.gz
 95d6e967141458f048ab5eca48bddc56  ./ap/slackpkg/files/slackpkg.gz
 9d1d8ce9d3d79fe62e898186cc5afa1c  ./ap/slackpkg/manpages-l10n.tar.xz
 fea693c49fc12386542f57cdc2aad256  ./ap/slackpkg/slack-desc
-c44aca9ff39889493246afe557eeb166  ./ap/slackpkg/slackpkg.SlackBuild
+fa083d02d4092ce7f9c8c7d2b69ca850  ./ap/slackpkg/slackpkg.SlackBuild
 6bf755fb140abe6e12319532e6797b51  ./ap/soma/ChangeLog.txt
 a0edf763985c40596cdddad9a3f552e5  ./ap/soma/README
 930eea2c02b48e9729f0d163e9df1d5b  ./ap/soma/doinst.sh.gz
diff --git a/slackware64-current/source/CHECKSUMS.md5.asc b/slackware64-current/source/CHECKSUMS.md5.asc
index 31f5d1fc7..d8c6b5116 100644
--- a/slackware64-current/source/CHECKSUMS.md5.asc
+++ b/slackware64-current/source/CHECKSUMS.md5.asc
@@ -1,6 +1,6 @@
 -----BEGIN PGP SIGNATURE-----
 
-iEYEABECAAYFAlsjBc8ACgkQakRjwEAQIjMQxwCfU5VOf30iQhPaboRUCL0sFO7E
-ghsAn2SA4tDtL1aaY6vHjPp0TTg3Sfcn
-=Rar0
+iEYEABECAAYFAlsjPwAACgkQakRjwEAQIjMIhACgjpFRtft1r0LTVbNB5LUmbNe/
+lxQAn23c9iP+pp0TO0gkpcFkletWCkkC
+=7hpn
 -----END PGP SIGNATURE-----
diff --git a/slackware64-current/source/FILE_LIST b/slackware64-current/source/FILE_LIST
index bb6c42c18..5e1ceb0c5 100644
--- a/slackware64-current/source/FILE_LIST
+++ b/slackware64-current/source/FILE_LIST
@@ -1,15 +1,15 @@
-Fri Jun 15 00:17:59 UTC 2018
+Fri Jun 15 04:22:03 UTC 2018
 
 Here is the file list for this directory.  If you are using a 
 mirror site and find missing or extra files in the disk 
 subdirectories, please have the archive administrator refresh
 the mirror.
 
-drwxr-xr-x  19 root root      4096 2018-06-15 00:17 .
--rw-r--r--   1 root root    452534 2018-06-13 22:09 ./CHECKSUMS.md5
--rw-r--r--   1 root root       163 2018-06-13 22:09 ./CHECKSUMS.md5.asc
--rw-r--r--   1 root root    640495 2018-06-13 22:09 ./FILE_LIST
--rw-r--r--   1 root root  14765937 2018-06-15 00:17 ./MANIFEST.bz2
+drwxr-xr-x  19 root root      4096 2018-06-15 04:22 .
+-rw-r--r--   1 root root    452637 2018-06-15 00:18 ./CHECKSUMS.md5
+-rw-r--r--   1 root root       163 2018-06-15 00:18 ./CHECKSUMS.md5.asc
+-rw-r--r--   1 root root    640616 2018-06-15 00:17 ./FILE_LIST
+-rw-r--r--   1 root root  14778011 2018-06-15 04:22 ./MANIFEST.bz2
 -rw-r--r--   1 root root      1314 2006-10-02 04:40 ./README.TXT
 drwxr-xr-x 110 root root      4096 2018-06-14 19:02 ./a
 -rw-r--r--   1 root root       567 2018-03-13 18:43 ./a/FTBFSlog
@@ -209,10 +209,10 @@ drwxr-xr-x   2 root root      4096 2018-04-23 17:20 ./a/ed
 -rw-r--r--   1 root root       800 2018-02-27 06:13 ./a/ed/slack-desc
 drwxr-xr-x   2 root root      4096 2018-06-12 19:49 ./a/efibootmgr
 -rw-r--r--   1 root root     34084 2018-04-09 20:44 ./a/efibootmgr/efibootmgr-16.tar.lz
--rwxr-xr-x   1 root root      3806 2018-06-12 19:55 ./a/efibootmgr/efibootmgr.SlackBuild
+-rwxr-xr-x   1 root root      3806 2018-06-15 03:36 ./a/efibootmgr/efibootmgr.SlackBuild
 -rw-r--r--   1 root root       953 2018-06-12 19:48 ./a/efibootmgr/slack-desc
-drwxr-xr-x   2 root root      4096 2018-06-12 19:32 ./a/efivar
--rw-r--r--   1 root root    101631 2018-06-08 19:19 ./a/efivar/efivar-36.tar.lz
+drwxr-xr-x   2 root root      4096 2018-06-15 03:34 ./a/efivar
+-rw-r--r--   1 root root     91475 2018-04-09 18:55 ./a/efivar/efivar-35.tar.lz
 -rwxr-xr-x   1 root root      3617 2018-06-12 19:33 ./a/efivar/efivar.SlackBuild
 -rw-r--r--   1 root root       798 2018-06-12 19:27 ./a/efivar/slack-desc
 drwxr-xr-x   2 root root      4096 2018-06-12 19:02 ./a/elilo
@@ -1311,9 +1311,11 @@ drwxr-xr-x   2 root root      4096 2018-04-23 17:20 ./ap/seejpeg
 -rw-r--r--   1 root root     46550 1999-11-09 00:03 ./ap/seejpeg/seejpeg-1.10.tgz
 -rwxr-xr-x   1 root root      2919 2018-04-23 17:20 ./ap/seejpeg/seejpeg.SlackBuild
 -rw-r--r--   1 root root       907 2018-02-27 06:12 ./ap/seejpeg/slack-desc
-drwxr-xr-x   3 root root      4096 2018-06-14 21:36 ./ap/slackpkg
+drwxr-xr-x   3 root root      4096 2018-06-15 03:42 ./ap/slackpkg
 -rw-r--r--   1 root root      1283 2018-06-14 21:35 ./ap/slackpkg/0001-Fix-for-var_log_packages-being-a-symlink.patch.gz
--rw-r--r--   1 root root       469 2016-05-11 03:43 ./ap/slackpkg/doinst.sh.gz
+-rw-r--r--   1 root root      1002 2018-06-15 01:54 ./ap/slackpkg/0002-Use-CHECKSUMS.md5.asc-to-determine-ChangeLog-newness.patch.gz
+-rw-r--r--   1 root root       562 2018-06-15 01:54 ./ap/slackpkg/0003-mirrors-x86-.sample-Remove-bjtu.edu.cn-mirror.patch.gz
+-rw-r--r--   1 root root       457 2018-06-15 03:41 ./ap/slackpkg/doinst.sh.gz
 drwxr-xr-x   2 root root      4096 2018-05-29 20:54 ./ap/slackpkg/files
 -rw-r--r--   1 root root     18548 2018-05-24 07:24 ./ap/slackpkg/files/ChangeLog.gz
 -rw-r--r--   1 root root      6849 2010-05-01 23:10 ./ap/slackpkg/files/GPL.gz
@@ -1336,7 +1338,7 @@ drwxr-xr-x   2 root root      4096 2018-05-29 20:54 ./ap/slackpkg/files
 -rw-r--r--   1 root root      4477 2018-01-06 23:55 ./ap/slackpkg/files/slackpkg.gz
 -rw-r--r--   1 root root     82664 2018-05-29 20:52 ./ap/slackpkg/manpages-l10n.tar.xz
 -rw-r--r--   1 root root      1007 2018-04-28 19:32 ./ap/slackpkg/slack-desc
--rwxr-xr-x   1 root root      4569 2018-06-14 21:36 ./ap/slackpkg/slackpkg.SlackBuild
+-rwxr-xr-x   1 root root      4977 2018-06-15 03:50 ./ap/slackpkg/slackpkg.SlackBuild
 drwxr-xr-x   2 root root      4096 2018-06-05 04:50 ./ap/soma
 -rw-r--r--   1 root root      4517 2018-03-06 05:58 ./ap/soma/ChangeLog.txt
 -rw-r--r--   1 root root      1950 2017-11-30 17:00 ./ap/soma/README
diff --git a/slackware64-current/source/MANIFEST.bz2 b/slackware64-current/source/MANIFEST.bz2
index f28a546a4..4bfe5853f 100644
--- a/slackware64-current/source/MANIFEST.bz2
+++ b/slackware64-current/source/MANIFEST.bz2
@@ -1 +1 @@
-d42d260111932173d1acff5ab9ed56a93ef89c9a
+f8cafe16d9c0012707b98b4a2366482cda489c8f
diff --git a/slackware64-current/source/a/efibootmgr/efibootmgr.SlackBuild b/slackware64-current/source/a/efibootmgr/efibootmgr.SlackBuild
index e91b25fd9..9671a6e21 100755
--- a/slackware64-current/source/a/efibootmgr/efibootmgr.SlackBuild
+++ b/slackware64-current/source/a/efibootmgr/efibootmgr.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=efibootmgr
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/slackware64-current/source/a/efivar/efivar-35.tar.lz b/slackware64-current/source/a/efivar/efivar-35.tar.lz
new file mode 100644
index 000000000..af9cf282d
--- /dev/null
+++ b/slackware64-current/source/a/efivar/efivar-35.tar.lz
@@ -0,0 +1 @@
+95bae2000222e11b11d2444d2633911afc66dc91
diff --git a/slackware64-current/source/a/efivar/efivar-36.tar.lz b/slackware64-current/source/a/efivar/efivar-36.tar.lz
deleted file mode 100644
index dff315701..000000000
--- a/slackware64-current/source/a/efivar/efivar-36.tar.lz
+++ /dev/null
@@ -1 +0,0 @@
-05dc8f75097ef16040faa14940f9f48435f6001b
diff --git a/slackware64-current/source/ap/slackpkg/0002-Use-CHECKSUMS.md5.asc-to-determine-ChangeLog-newness.patch.gz b/slackware64-current/source/ap/slackpkg/0002-Use-CHECKSUMS.md5.asc-to-determine-ChangeLog-newness.patch.gz
new file mode 100644
index 000000000..29d5e45b5
--- /dev/null
+++ b/slackware64-current/source/ap/slackpkg/0002-Use-CHECKSUMS.md5.asc-to-determine-ChangeLog-newness.patch.gz
@@ -0,0 +1 @@
+e52a61f37905955779eca9b6b109fa19c6c90967
diff --git a/slackware64-current/source/ap/slackpkg/0003-mirrors-x86-.sample-Remove-bjtu.edu.cn-mirror.patch.gz b/slackware64-current/source/ap/slackpkg/0003-mirrors-x86-.sample-Remove-bjtu.edu.cn-mirror.patch.gz
new file mode 100644
index 000000000..3743f4e75
--- /dev/null
+++ b/slackware64-current/source/ap/slackpkg/0003-mirrors-x86-.sample-Remove-bjtu.edu.cn-mirror.patch.gz
@@ -0,0 +1 @@
+4ba7ed1b4f0bf61bbe6cf3fa47ed8c87530f8193
diff --git a/slackware64-current/source/ap/slackpkg/doinst.sh.gz b/slackware64-current/source/ap/slackpkg/doinst.sh.gz
index e41557262..c666a4e05 100644
--- a/slackware64-current/source/ap/slackpkg/doinst.sh.gz
+++ b/slackware64-current/source/ap/slackpkg/doinst.sh.gz
@@ -1 +1 @@
-34673dd81cdd1b8058b9d08d0bb5a03f880bcb3e
+7484a01336d637cc4fef27e93e0d876c51c471f1
diff --git a/slackware64-current/source/ap/slackpkg/slackpkg.SlackBuild b/slackware64-current/source/ap/slackpkg/slackpkg.SlackBuild
index 7dc1949d5..2d6fe94c8 100755
--- a/slackware64-current/source/ap/slackpkg/slackpkg.SlackBuild
+++ b/slackware64-current/source/ap/slackpkg/slackpkg.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=slackpkg
 VERSION=${VERSION:-2.83.0}
 ARCH="noarch"
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
 # the name of the created package would be, and then exit. This information
@@ -76,11 +76,6 @@ gzip -d $PKG/usr/libexec/slackpkg/functions.d/*
 chmod 755 $PKG/usr/libexec/slackpkg/functions.d/*
 chown root:root $PKG/usr/libexec/slackpkg/functions.d/*
 
-# Apply patch in case /var/log/packages is a symlink:
-( cd $PKG/usr/libexec/slackpkg
-  zcat $CWD/0001-Fix-for-var_log_packages-being-a-symlink.patch.gz | patch -p1 || exit 1
-) || exit 1
-
 # Install man pages:
 mkdir -pv $PKG/usr/man/man5
 cp -av slackpkg.conf.5.gz $PKG/usr/man/man5
@@ -124,6 +119,21 @@ gzip -d $PKG/usr/doc/slackpkg-$VERSION/*
 mkdir -pv $PKG/var/lib/slackpkg
 mkdir -pv $PKG/var/cache/packages
 
+# Apply patch in case /var/log/packages is a symlink:
+( cd $PKG/usr/libexec/slackpkg
+  zcat $CWD/0001-Fix-for-var_log_packages-being-a-symlink.patch.gz | patch -p1 --verbose || exit 1
+) || exit 1
+
+# Check for new Changelog.txt by checking CHECKSUMS.md5.asc first:
+( cd $PKG/usr/libexec/slackpkg
+  zcat $CWD/0002-Use-CHECKSUMS.md5.asc-to-determine-ChangeLog-newness.patch.gz | patch -p2 --verbose || exit 1
+) || exit 1
+
+# Remove dead mirrors:
+( cd $PKG/usr/doc/slackpkg-$VERSION
+  zcat $CWD/0003-mirrors-x86-.sample-Remove-bjtu.edu.cn-mirror.patch.gz | patch -p2 --verbose || exit 1
+) || exit 1
+
 mkdir -p $PKG/install
 zcat $CWD/doinst.sh.gz | sed -e "s/@VERSION@/$VERSION/g" > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc