Mon Feb 8 05:13:26 UTC 202120210208051326

a/aaa_elflibs-15.0-x86_64-30.txz:  Removed.
  Renamed to aaa_libraries.
a/aaa_glibc-solibs-2.32-x86_64-2.txz:  Added.
  This package has been renamed from glibc-solibs, which helps avoid trouble
  if someone upgrades using "upgradepkg --install-new */*.txz" by upgrading
  this package before aaa_libraries. Otherwise, if aaa_libraries is upgraded
  first any libraries in it that are linked against a newer version of glibc
  than the one installed on the system would refuse to load.
a/aaa_libraries-15.0-x86_64-1.txz:  Added.
  This package has been renamed from aaa_elflibs to insure that it will come
  after aaa_glibc-solibs when upgraded in alphabetical order.
  Upgraded: libcap.so.2.48, libelf-0.183.so, libglib-2.0.so.0.6600.6,
  libgmodule-2.0.so.0.6600.6, libgobject-2.0.so.0.6600.6,
  libgthread-2.0.so.0.6600.6.
  Added: libtirpc.so.3.0.0.
a/btrfs-progs-5.10.1-x86_64-1.txz:  Upgraded.
a/glibc-solibs-2.32-x86_64-1.txz:  Removed.
  Renamed to aaa_glibc-solibs.
a/kernel-generic-5.10.14-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.10.14-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.10.14-x86_64-1.txz:  Upgraded.
ap/slackpkg-15.0-noarch-1.txz:  Upgraded.
  These are some of the important changes (see the ChangeLog for more):
  Note that this slackpkg release contains a backwards-incompatible change to
  the blacklisting syntax (e.g. glibc ---> glibc-*). This changes the prior
  behavior of the blacklist function; previously, adding "glibc" to the
  blacklist would cause glibc, glibc-profile, glibc-zoneinfo, et al to be
  ignored by slackpkg. The new behavior is that *only* the glibc package is
  ignored. If you want to blacklist all packages whose names begin with glibc,
  you would need to add "glibc.*" to the blacklist now. Also note that any
  special characters, e.g. "+", will need to be escaped in the blacklist file.
  To blacklist entire package sets, a trailing slash is now required: e.g. kde/
  Another backwards-incompatibility warning: check-updates will now return 1 if
  there are updates available - this will make it easier to use this feature
  with cron (thanks to Peter Hyman).
  Added support for Slackware-AArch64 (thanks to Stuart Winter).
  Added aaa_glibc-solibs and aaa_libraries to the "do these first" routine.
  Thanks to Robby Workman for the new slackpkg release!
ap/soma-3.3.7-noarch-1.txz:  Upgraded.
  Thanks to David Woodfall.
ap/xorriso-1.5.4.pl02-x86_64-1.txz:  Upgraded.
d/help2man-1.48.1-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.10.14-x86-1.txz:  Upgraded.
k/kernel-source-5.10.14-noarch-1.txz:  Upgraded.
l/elfutils-0.183-x86_64-1.txz:  Upgraded.
l/glibc-2.32-x86_64-2.txz:  Rebuilt.
l/glibc-i18n-2.32-x86_64-2.txz:  Rebuilt.
l/glibc-profile-2.32-x86_64-2.txz:  Rebuilt.
l/lcms2-2.12-x86_64-1.txz:  Upgraded.
l/libburn-1.5.4-x86_64-1.txz:  Upgraded.
x/xf86-input-wacom-0.40.0-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

1 files changed, 29 insertions, 58 deletions

diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild
index 1584e9cca..db3774348 100755
--- a/source/ap/slackpkg/slackpkg.SlackBuild
+++ b/source/ap/slackpkg/slackpkg.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2016, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2016, 2018, 2021  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,9 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=slackpkg
-VERSION=${VERSION:-2.83.0}
+VERSION=${VERSION:-15.0}
 ARCH="noarch"
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-1}
 
 # 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
@@ -49,101 +49,72 @@ cd $CWD/files
 
 # Install main script:
 mkdir -pv $PKG/usr/sbin
-cp -av slackpkg.gz $PKG/usr/sbin
-gzip -d $PKG/usr/sbin/slackpkg.gz
+cp -av slackpkg $PKG/usr/sbin
 chmod 755 $PKG/usr/sbin/slackpkg
 chown root:root $PKG/usr/sbin/slackpkg
 
 # Prepare /etc directory:
 mkdir -pv $PKG/etc/slackpkg
-cp -av blacklist.new.gz slackpkg.conf.new.gz $PKG/etc/slackpkg
-gzip -d $PKG/etc/slackpkg/*
+cp -av blacklist.new slackpkg.conf.new $PKG/etc/slackpkg
 chmod 644 $PKG/etc/slackpkg/*
 chown root:root $PKG/etc/slackpkg/*
 mkdir -pv $PKG/etc/slackpkg/templates
 
 # Install support scripts in /usr/libexec/slackpkg:
 mkdir -pv $PKG/usr/libexec/slackpkg
-cp -av core-functions.sh.gz cutpkg.awk.gz filelist.awk.gz install-new.awk.gz pkglist.awk.gz \
+cp -av core-functions.sh cutpkg.awk filelist.awk install-new.awk pkglist.awk \
   $PKG/usr/libexec/slackpkg
-gzip -d $PKG/usr/libexec/slackpkg/*
 chmod 755 $PKG/usr/libexec/slackpkg/*
 chown root:root $PKG/usr/libexec/slackpkg/*
 mkdir -pv $PKG/usr/libexec/slackpkg/functions.d
-cp -av dialog-functions.sh.gz post-functions.sh.gz \
+cp -av dialog-functions.sh post-functions.sh \
   $PKG/usr/libexec/slackpkg/functions.d
-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/*
 
 # Install man pages:
 mkdir -pv $PKG/usr/man/man5
-cp -av slackpkg.conf.5.gz $PKG/usr/man/man5
-chmod 644 $PKG/usr/man/man5/slackpkg.conf.5.gz
-chown root:root $PKG/usr/man/man5/slackpkg.conf.5.gz
+cp -av slackpkg.conf.5 $PKG/usr/man/man5
+chmod 644 $PKG/usr/man/man5/slackpkg.conf.5
+chown root:root $PKG/usr/man/man5/slackpkg.conf.5
 mkdir -pv $PKG/usr/man/man8
-cp -av slackpkg.8.gz $PKG/usr/man/man8
-chmod 644 $PKG/usr/man/man8/slackpkg.8.gz
-chown root:root $PKG/usr/man/man8/slackpkg.8.gz
+cp -av slackpkg.8 $PKG/usr/man/man8
+chmod 644 $PKG/usr/man/man8/slackpkg.8
+chown root:root $PKG/usr/man/man8/slackpkg.8
 
 # Install internationalized man pages from
 # http://slint.fr/forSlackware/man_l10n/slackpkg/
-( cd $PKG/usr/man
-  tar xf $CWD/manpages-l10n.tar.xz
-  for page in manpages-l10n/*slackpkg.conf ; do
-    manpage=$(basename $page)
-    mkdir -p ${manpage%%.*}/man5
-    mv $page ${manpage%%.*}/man5/${page#*.}.5
-  done
-  for page in manpages-l10n/* ; do
-    manpage=$(basename $page)
-    mkdir -p ${manpage%%.*}/man8
-    mv $page ${manpage%%.*}/man8/${page#*.}.8
-  done
-  gzip -9 */man?/*.?
-  rmdir manpages-l10n
-)
+for page in manpages-l10n/*slackpkg.conf ; do
+  manpage=$(basename $page)
+  mkdir -p $PKG/usr/man/${manpage%%.*}/man5
+  cp -av $page $PKG/usr/man/${manpage%%.*}/man5/${page#*.}.5
+done
+for page in manpages-l10n/*slackpkg ; do
+  manpage=$(basename $page)
+  mkdir -p $PKG/usr/man/${manpage%%.*}/man8
+  cp -av $page $PKG/usr/man/${manpage%%.*}/man8/${page#*.}.8
+done
+chown -R root:root $PKG/usr/man
+
+# Compress manual pages
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 # Update version number:
 sed -i "s/@VERSION@/$VERSION/g" $PKG/usr/sbin/slackpkg
 
 # Prepare documentation directory:
 mkdir -pv $PKG/usr/doc/slackpkg-$VERSION
-cp -av ChangeLog.gz GPL.gz README.gz mirrors* \
+cp -av ChangeLog GPL README mirrors* \
   $PKG/usr/doc/slackpkg-$VERSION
 chown root:root $PKG/usr/doc/slackpkg-$VERSION/*
 chmod 644 $PKG/usr/doc/slackpkg-$VERSION/*
-gzip -d $PKG/usr/doc/slackpkg-$VERSION/*
 
 # Create additional directories needed by slackpkg:
 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
-
-( cd $PKG/usr/libexec/slackpkg/functions.d
-  zcat $CWD/0005-Clarify-that-a-press-of-Enter-is-needed-to-confirm-k.patch.gz | patch -p2 --verbose || exit 1
-) || exit 1
-
-( cd $PKG/usr/libexec/slackpkg
-  zcat $CWD/0006-Mention-possible-stale-mirror-if-CHECKSUMS.md5-gpg-v.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/doinst.sh | sed -e "s/@VERSION@/$VERSION/g" > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG