summaryrefslogtreecommitdiffstats
path: root/source/a
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-05-18 19:17:21 +0000
committer Eric Hameleers <alien@slackware.com>2020-05-18 23:25:14 +0200
commitffef56590d68c334819ecf26118a257bdafccf6b (patch)
tree6681fac1801c4a0569147ba9a731f323b38dff15 /source/a
parenteba2e5b781702a60ac9f9613c9b8456c1594215c (diff)
downloadcurrent-ffef56590d68c334819ecf26118a257bdafccf6b.tar.gz
current-ffef56590d68c334819ecf26118a257bdafccf6b.tar.xz
Mon May 18 19:17:21 UTC 202020200518191721
Greetings! After three months in /testing, the PAM merge into the main tree is now complete. When updating, be sure to install the new pam, cracklib, and libpwquality packages or you may find yourself locked out of your machine. Otherwise, these changes should be completely transparent and you shouldn't notice any obvious operational differences. Be careful if you make any changes in /etc/pam.d/ - leaving an extra console logged in while testing PAM config changes is a recommended standard procedure. Thanks again to Robby Workman, Vincent Batts, Phantom X, and ivandi for help implementing this. It's not done yet and there will be more fine-tuning of the config files, but now we can move on to build some other updates. Enjoy! a/cracklib-2.9.7-x86_64-1.txz: Added. a/kernel-firmware-20200517_f8d32e4-noarch-1.txz: Upgraded. a/libcgroup-0.41-x86_64-7.txz: Rebuilt. Rebuilt to add PAM support. a/libpwquality-1.4.2-x86_64-1.txz: Added. a/lilo-24.2-x86_64-9.txz: Rebuilt. Enable the "compact" option by default. liloconfig: correctly set the root partition. a/pam-1.3.1-x86_64-1.txz: Added. a/shadow-4.8.1-x86_64-7.txz: Rebuilt. Rebuilt to add PAM support. a/utempter-1.2.0-x86_64-1.txz: Upgraded. a/util-linux-2.35.1-x86_64-6.txz: Rebuilt. Rebuilt to add PAM support. a/xfsprogs-5.6.0-x86_64-2.txz: Rebuilt. Recompiled against icu4c-67.1. ap/at-3.2.1-x86_64-2.txz: Rebuilt. Rebuilt to add PAM support. ap/cups-2.3.3-x86_64-2.txz: Rebuilt. Rebuilt to add PAM support. ap/hplip-3.20.5-x86_64-2.txz: Rebuilt. Rebuilt to add PAM support. ap/mariadb-10.4.13-x86_64-2.txz: Rebuilt. Rebuilt to add PAM support. ap/screen-4.8.0-x86_64-2.txz: Rebuilt. Rebuilt to add PAM support. ap/soma-3.3.0-noarch-1.txz: Upgraded. Thanks to David Woodfall. ap/sqlite-3.31.1-x86_64-2.txz: Rebuilt. Recompiled against icu4c-67.1. ap/sudo-1.9.0-x86_64-2.txz: Rebuilt. Rebuilt to add PAM support. ap/vim-8.2.0788-x86_64-1.txz: Upgraded. d/bison-3.6.2-x86_64-1.txz: Upgraded. d/meson-0.54.2-x86_64-1.txz: Upgraded. d/python-setuptools-46.4.0-x86_64-1.txz: Upgraded. d/vala-0.48.6-x86_64-1.txz: Upgraded. kde/calligra-2.9.11-x86_64-36.txz: Rebuilt. Recompiled against icu4c-67.1. kde/kde-workspace-4.11.22-x86_64-7.txz: Rebuilt. Rebuilt to add PAM support. l/ConsoleKit2-1.2.1-x86_64-4.txz: Rebuilt. Rebuilt to add PAM support. l/boost-1.73.0-x86_64-2.txz: Rebuilt. Recompiled against icu4c-67.1. l/gnome-keyring-3.36.0-x86_64-2.txz: Rebuilt. Rebuilt to add PAM support. l/harfbuzz-2.6.6-x86_64-2.txz: Rebuilt. Recompiled against icu4c-67.1. l/icu4c-67.1-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/imagemagick-7.0.10_13-x86_64-1.txz: Upgraded. l/libcap-2.34-x86_64-2.txz: Rebuilt. Rebuilt to add PAM support. l/libical-3.0.8-x86_64-2.txz: Rebuilt. Recompiled against icu4c-67.1. l/libuv-1.38.0-x86_64-1.txz: Upgraded. l/libvisio-0.1.7-x86_64-3.txz: Rebuilt. Recompiled against icu4c-67.1. l/polkit-0.116-x86_64-3.txz: Rebuilt. Rebuilt to add PAM support. l/qt-4.8.7-x86_64-16.txz: Rebuilt. Recompiled against icu4c-67.1. l/qt5-5.13.2-x86_64-4.txz: Rebuilt. Recompiled against icu4c-67.1. l/qt5-webkit-5.212.0_alpha4-x86_64-2.txz: Rebuilt. Recompiled against icu4c-67.1. l/raptor2-2.0.15-x86_64-9.txz: Rebuilt. Recompiled against icu4c-67.1. l/system-config-printer-1.5.12-x86_64-4.txz: Rebuilt. Rebuilt to add PAM support. l/vte-0.60.2-x86_64-2.txz: Rebuilt. Recompiled against icu4c-67.1. n/cifs-utils-6.10-x86_64-4.txz: Rebuilt. Rebuilt to add PAM support. n/cyrus-sasl-2.1.27-x86_64-4.txz: Rebuilt. Rebuilt to add PAM support. n/dovecot-2.3.10.1-x86_64-1.txz: Upgraded. Rebuilt to add PAM support. Compiled against icu4c-67.1. This update fixes several denial-of-service vulnerabilities. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-10957 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-10958 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-10967 (* Security fix *) n/mutt-1.14.1-x86_64-1.txz: Upgraded. n/netatalk-3.1.12-x86_64-3.txz: Rebuilt. Rebuilt to add PAM support. n/netkit-rsh-0.17-x86_64-3.txz: Rebuilt. Rebuilt to add PAM support. n/nss-pam-ldapd-0.9.11-x86_64-1.txz: Added. n/openssh-8.2p1-x86_64-3.txz: Rebuilt. Rebuilt to add PAM support. n/openvpn-2.4.9-x86_64-2.txz: Rebuilt. Rebuilt to add PAM support. n/pam-krb5-4.9-x86_64-1.txz: Added. n/php-7.4.6-x86_64-2.txz: Rebuilt. Recompiled against icu4c-67.1. n/popa3d-1.0.3-x86_64-4.txz: Rebuilt. Rebuilt to add PAM support. n/postfix-3.5.2-x86_64-1.txz: Upgraded. Compiled against icu4c-67.1. n/ppp-2.4.8-x86_64-2.txz: Rebuilt. Rebuilt to add PAM support. n/proftpd-1.3.6c-x86_64-2.txz: Rebuilt. Rebuilt to add PAM support. n/samba-4.12.2-x86_64-2.txz: Rebuilt. Rebuilt to add PAM support. Recompiled against icu4c-67.1. n/tin-2.4.4-x86_64-2.txz: Rebuilt. Recompiled against icu4c-67.1. n/vsftpd-3.0.3-x86_64-6.txz: Rebuilt. Rebuilt to add PAM support. t/texlive-2019.190626-x86_64-4.txz: Rebuilt. Recompiled against icu4c-67.1. x/vulkan-sdk-1.2.135.0-x86_64-1.txz: Upgraded. x/xdm-1.1.11-x86_64-10.txz: Rebuilt. Rebuilt to add PAM support. x/xisxwayland-1-x86_64-1.txz: Added. xap/sane-1.0.30-x86_64-1.txz: Upgraded. This update fixes several security issues. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-12867 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-12862 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-12863 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-12865 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-12866 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-12861 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-12864 (* Security fix *) xap/vim-gvim-8.2.0788-x86_64-1.txz: Upgraded. xap/xlockmore-5.63-x86_64-2.txz: Rebuilt. Rebuilt to add PAM support. xap/xscreensaver-5.44-x86_64-2.txz: Rebuilt. Rebuilt to add PAM support. extra/brltty/brltty-6.1-x86_64-2.txz: Rebuilt. Recompiled against icu4c-67.1. extra/pure-alsa-system/qt5-5.13.2-x86_64-4_alsa.txz: Rebuilt. Recompiled against icu4c-67.1. isolinux/initrd.img: Rebuilt. Added PAM libraries, security modules, and config files. usb-and-pxe-installers/usbboot.img: Rebuilt. Added PAM libraries, security modules, and config files.
Diffstat (limited to '')
-rwxr-xr-xsource/a/cracklib/cracklib.SlackBuild (renamed from testing/source/PAM/a/cracklib/cracklib.SlackBuild)0
-rw-r--r--source/a/cracklib/cracklib.url (renamed from testing/source/PAM/a/cracklib/cracklib.url)0
-rw-r--r--source/a/cracklib/slack-desc (renamed from testing/source/PAM/a/cracklib/slack-desc)0
-rwxr-xr-xsource/a/libcgroup/libcgroup.SlackBuild2
-rw-r--r--source/a/libpwquality/doinst.sh (renamed from testing/source/PAM/a/libpwquality/doinst.sh)0
-rwxr-xr-xsource/a/libpwquality/libpwquality.SlackBuild (renamed from testing/source/PAM/a/libpwquality/libpwquality.SlackBuild)2
-rw-r--r--source/a/libpwquality/libpwquality.url (renamed from testing/source/PAM/a/libpwquality/libpwquality.url)0
-rw-r--r--source/a/libpwquality/slack-desc (renamed from testing/source/PAM/a/libpwquality/slack-desc)0
-rwxr-xr-xsource/a/lilo/lilo.SlackBuild2
-rw-r--r--source/a/lilo/liloconfig92
-rw-r--r--source/a/pam/doinst.sh (renamed from testing/source/PAM/a/pam/doinst.sh)0
-rw-r--r--source/a/pam/fedora-patches/pam-1.1.3-nouserenv.patch (renamed from testing/source/PAM/a/pam/fedora-patches/pam-1.1.3-nouserenv.patch)0
-rw-r--r--source/a/pam/fedora-patches/pam-1.1.6-limits-user.patch (renamed from testing/source/PAM/a/pam/fedora-patches/pam-1.1.6-limits-user.patch)0
-rw-r--r--source/a/pam/fedora-patches/pam-1.1.8-audit-user-mgmt.patch (renamed from testing/source/PAM/a/pam/fedora-patches/pam-1.1.8-audit-user-mgmt.patch)0
-rw-r--r--source/a/pam/fedora-patches/pam-1.1.8-full-relro.patch (renamed from testing/source/PAM/a/pam/fedora-patches/pam-1.1.8-full-relro.patch)0
-rw-r--r--source/a/pam/fedora-patches/pam-1.3.0-pwhistory-helper.patch (renamed from testing/source/PAM/a/pam/fedora-patches/pam-1.3.0-pwhistory-helper.patch)0
-rw-r--r--source/a/pam/fedora-patches/pam-1.3.0-unix-nomsg.patch (renamed from testing/source/PAM/a/pam/fedora-patches/pam-1.3.0-unix-nomsg.patch)0
-rw-r--r--source/a/pam/fedora-patches/pam-1.3.1-coverity.patch (renamed from testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-coverity.patch)0
-rw-r--r--source/a/pam/fedora-patches/pam-1.3.1-motd-multiple-paths.patch (renamed from testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-motd-multiple-paths.patch)0
-rw-r--r--source/a/pam/fedora-patches/pam-1.3.1-noflex.patch (renamed from testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-noflex.patch)0
-rw-r--r--source/a/pam/fedora-patches/pam-1.3.1-redhat-modules.patch (renamed from testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-redhat-modules.patch)0
-rw-r--r--source/a/pam/fedora-patches/pam-1.3.1-unix-bcrypt_b.patch (renamed from testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-bcrypt_b.patch)0
-rw-r--r--source/a/pam/fedora-patches/pam-1.3.1-unix-checksalt_syslog.patch (renamed from testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-checksalt_syslog.patch)0
-rw-r--r--source/a/pam/fedora-patches/pam-1.3.1-unix-crypt_checksalt.patch (renamed from testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-crypt_checksalt.patch)0
-rw-r--r--source/a/pam/fedora-patches/pam-1.3.1-unix-fix_checksalt_syslog.patch (renamed from testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-fix_checksalt_syslog.patch)0
-rw-r--r--source/a/pam/fedora-patches/pam-1.3.1-unix-gensalt-autoentropy.patch (renamed from testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-gensalt-autoentropy.patch)0
-rw-r--r--source/a/pam/fedora-patches/pam-1.3.1-unix-no-fallback.patch (renamed from testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-no-fallback.patch)0
-rw-r--r--source/a/pam/fedora-patches/pam-1.3.1-unix-remove-obsolete-_unix_read_password-prototype.patch (renamed from testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-remove-obsolete-_unix_read_password-prototype.patch)0
-rw-r--r--source/a/pam/fedora-patches/pam-1.3.1-unix-yescrypt.patch (renamed from testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-yescrypt.patch)0
-rwxr-xr-xsource/a/pam/pam.SlackBuild (renamed from testing/source/PAM/a/pam/pam.SlackBuild)2
-rw-r--r--source/a/pam/pam.url (renamed from testing/source/PAM/a/pam/pam.url)0
-rw-r--r--source/a/pam/patches/pam.etc.environment.better.comments.diff (renamed from testing/source/PAM/a/pam/patches/pam.etc.environment.better.comments.diff)0
-rw-r--r--source/a/pam/patches/pam.pam_tally2.no.fsync.patch (renamed from testing/source/PAM/a/pam/patches/pam.pam_tally2.no.fsync.patch)0
-rw-r--r--source/a/pam/patches/pam.pam_tally2.slackware.diff (renamed from testing/source/PAM/a/pam/patches/pam.pam_tally2.slackware.diff)0
-rw-r--r--source/a/pam/slack-desc (renamed from testing/source/PAM/a/pam/slack-desc)0
-rwxr-xr-xsource/a/shadow/shadow.SlackBuild2
-rw-r--r--source/a/utempter/slack-desc2
-rwxr-xr-xsource/a/utempter/utempter.SlackBuild6
-rw-r--r--source/a/utempter/utempter.url2
-rwxr-xr-xsource/a/util-linux/util-linux.SlackBuild2
-rwxr-xr-xsource/a/xfsprogs/xfsprogs.SlackBuild2
-rwxr-xr-xsource/ap/at/at.SlackBuild2
-rwxr-xr-xsource/ap/cups/cups.SlackBuild2
-rwxr-xr-xsource/ap/hplip/hplip.SlackBuild2
-rwxr-xr-xsource/ap/mariadb/mariadb.SlackBuild2
-rwxr-xr-xsource/ap/screen/screen.SlackBuild2
-rw-r--r--source/ap/soma/ChangeLog.txt203
-rw-r--r--source/ap/soma/README5
-rw-r--r--source/ap/soma/slack-desc.diff22
-rwxr-xr-xsource/ap/soma/soma.SlackBuild2
-rw-r--r--source/ap/soma/soma.info8
-rwxr-xr-xsource/ap/sqlite/sqlite.SlackBuild2
-rwxr-xr-xsource/ap/sudo/sudo.SlackBuild2
53 files changed, 73 insertions, 297 deletions
diff --git a/testing/source/PAM/a/cracklib/cracklib.SlackBuild b/source/a/cracklib/cracklib.SlackBuild
index e58c28d79..e58c28d79 100755
--- a/testing/source/PAM/a/cracklib/cracklib.SlackBuild
+++ b/source/a/cracklib/cracklib.SlackBuild
diff --git a/testing/source/PAM/a/cracklib/cracklib.url b/source/a/cracklib/cracklib.url
index c7afd5ecc..c7afd5ecc 100644
--- a/testing/source/PAM/a/cracklib/cracklib.url
+++ b/source/a/cracklib/cracklib.url
diff --git a/testing/source/PAM/a/cracklib/slack-desc b/source/a/cracklib/slack-desc
index 071678612..071678612 100644
--- a/testing/source/PAM/a/cracklib/slack-desc
+++ b/source/a/cracklib/slack-desc
diff --git a/source/a/libcgroup/libcgroup.SlackBuild b/source/a/libcgroup/libcgroup.SlackBuild
index 32d00ea93..d10b3f84d 100755
--- a/source/a/libcgroup/libcgroup.SlackBuild
+++ b/source/a/libcgroup/libcgroup.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libcgroup
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-6}
+BUILD=${BUILD:-7}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/testing/source/PAM/a/libpwquality/doinst.sh b/source/a/libpwquality/doinst.sh
index 044ad84c5..044ad84c5 100644
--- a/testing/source/PAM/a/libpwquality/doinst.sh
+++ b/source/a/libpwquality/doinst.sh
diff --git a/testing/source/PAM/a/libpwquality/libpwquality.SlackBuild b/source/a/libpwquality/libpwquality.SlackBuild
index c41045852..c68b8cadd 100755
--- a/testing/source/PAM/a/libpwquality/libpwquality.SlackBuild
+++ b/source/a/libpwquality/libpwquality.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libpwquality
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/testing/source/PAM/a/libpwquality/libpwquality.url b/source/a/libpwquality/libpwquality.url
index fe741a807..fe741a807 100644
--- a/testing/source/PAM/a/libpwquality/libpwquality.url
+++ b/source/a/libpwquality/libpwquality.url
diff --git a/testing/source/PAM/a/libpwquality/slack-desc b/source/a/libpwquality/slack-desc
index 0334b2ca7..0334b2ca7 100644
--- a/testing/source/PAM/a/libpwquality/slack-desc
+++ b/source/a/libpwquality/slack-desc
diff --git a/source/a/lilo/lilo.SlackBuild b/source/a/lilo/lilo.SlackBuild
index 22fcf50eb..fec935540 100755
--- a/source/a/lilo/lilo.SlackBuild
+++ b/source/a/lilo/lilo.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=lilo
VERSION=${VERSION:-24.2}
-BUILD=${BUILD:-8}
+BUILD=${BUILD:-9}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/a/lilo/liloconfig b/source/a/lilo/liloconfig
index 81ad2ca02..2129c6e1a 100644
--- a/source/a/lilo/liloconfig
+++ b/source/a/lilo/liloconfig
@@ -2,7 +2,7 @@
#
# Copyright 1994, 1998, 1999 Patrick Volkerding, Moorhead, Minnesota USA
# Copyright 2002, 2003 Slackware Linux, Inc, Concord, CA
-# Copyright 2007, 2008, 2011, 2013, 2018 Patrick Volkerding, Sebeka, Minnesota, USA
+# Copyright 2007, 2008, 2011, 2013, 2018, 2020 Patrick Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -45,7 +45,7 @@ LILO designed to work with EFI/UEFI systems." \
if [ $? = 1 -o $? = 255 ]; then
exit
fi
- REPLY="`cat $TMP/reply`"
+ REPLY="$(cat $TMP/reply)"
rm -f $TMP/reply
if [ "$REPLY" = "skip" ]; then
exit
@@ -191,7 +191,7 @@ or the standard Linux console?" 0 0 0 \
# "1024x768x16m" "Frame buffer console, 1024x768x16.8m" \
# "1280x1024x16m" "Frame buffer console, 1280x1024x16.8m" \
# "1600x1200x16m" "Frame buffer console, 1600x1200x16.8m"
- CONSOLETYPE="`cat $TMP/reply`"
+ CONSOLETYPE="$(cat $TMP/reply)"
if [ "$CONSOLETYPE" = "1600x1200x16m" ]; then
CONSOLENUM=799
elif [ "$CONSOLETYPE" = "1600x1200x64k" ]; then
@@ -260,7 +260,7 @@ simplelilo()
if [ $? = 1 -o $? = 255 ]; then
APPEND=""
fi
- APPEND="`cat $TMP/reply`"
+ APPEND="$(cat $TMP/reply)"
# If we got here, we either don't have boot manager or don't want to use it
# Note 3/2018: or OS/2 Boot Manager cruft was removed ;-)
@@ -284,7 +284,7 @@ Which option would you like?" \
if [ $? = 1 -o $? = 255 ]; then
exit
fi
- TG="`cat $TMP/reply`"
+ TG="$(cat $TMP/reply)"
rm -r $TMP/reply
dialog --infobox "\nScanning partitions and generating /etc/lilo.conf..." 5 57
sleep 1
@@ -292,8 +292,8 @@ Which option would you like?" \
MBR_TARGET=/dev/sda
echo $MBR_TARGET > $TMP/LILOMBR
cat /proc/partitions | while read LINE ; do
- MAJOR="`echo $LINE | cut -f 1 -d ' '`"
- MINOR="`echo $LINE | cut -f 2 -d ' '`"
+ MAJOR="$(echo $LINE | cut -f 1 -d ' ')"
+ MINOR="$(echo $LINE | cut -f 2 -d ' ')"
if [ ! "$MINOR" = "0" -a ! "$MINOR" = "64" ]; then # ignore whole devices to weed out CD drives
if [ "$MAJOR" = "3" ]; then
MBR_TARGET=/dev/hda
@@ -321,9 +321,9 @@ Which option would you like?" \
fi
fi
done
- LILO_TARGET=`cat $TMP/LILOMBR`
+ LILO_TARGET=$(cat $TMP/LILOMBR)
elif [ "$TG" = "Root" ]; then
- LILO_TARGET=`echo $ROOT_DEVICE`
+ LILO_TARGET=$(echo $ROOT_DEVICE)
elif [ "$TG" = "Floppy" ]; then
LILO_TARGET="/dev/fd0"
fi
@@ -344,7 +344,8 @@ EOF
fi
cat << EOF >> $T_PX/etc/lilo.conf
boot = $LILO_TARGET
-#compact # faster, but won't work on all systems.
+# This option loads the kernel and initrd much faster:
+compact
# Boot BMP Image.
# Bitmap in BMP format: 640x480x8
@@ -434,10 +435,10 @@ W95
FAT12
FAT16
HPFS" | grep -v "Ext'd" | grep -v "Extend" | sort )"
- DOSP="`echo $DOSP | cut -f 1 -d ' '`"
+ DOSP="$(echo $DOSP | cut -f 1 -d ' ')"
fi
if [ ! "$DOSP" = "" ]; then
- TABLE="`echo $DOSP | cut -b1-8`"
+ TABLE="$(echo $DOSP | cut -b1-8)"
cat << EOF >> $T_PX/etc/lilo.conf
# Windows bootable partition config begins
other = $DOSP
@@ -448,8 +449,8 @@ EOF
echo "Windows - (Windows FAT/NTFS partition)" >> $T_PX/boot/boot_message.txt
fi
# Next, we search for Linux partitions:
- LNXP="`PROBE -l | grep "Linux$"`"
- LNXP="`echo $LNXP | cut -f 1 -d ' ' | sort`"
+ LNXP="$(PROBE -l | grep "Linux$")"
+ LNXP="$(echo $LNXP | cut -f 1 -d ' ' | sort)"
if [ ! "$LNXP" = "" ]; then
cat << EOF >> $T_PX/etc/lilo.conf
# Linux bootable partition config begins
@@ -463,10 +464,10 @@ EOF
fi
# DEAD CODE, BUT IN CASE OS/2 MAKES A COMEBACK!
# # OK, hopefully we can remember how to deal with OS/2 :^)
-# OS2P="`PROBE -l | grep "HPFS"`"
-# OS2P="`echo $OS2P | cut -f 1 -d ' ' | sort`"
+# OS2P="$(PROBE -l | grep "HPFS")"
+# OS2P="$(echo $OS2P | cut -f 1 -d ' ' | sort)"
# if [ ! "$OS2P" = "" ]; then
-# TABLE="`echo $OS2P | cut -b1-8`"
+# TABLE="$(echo $OS2P | cut -b1-8)"
# if [ "$TABLE" = "/dev/hda" ]; then
# cat << EOF >> $T_PX/etc/lilo.conf
## OS/2 bootable partition config begins
@@ -635,13 +636,13 @@ EOF
# 'probe()' borrowed from LILO QuickInst.
probe()
{
- [ ! -z "`dd if=$1 bs=1 count=1 2>/dev/null | tr '\0' x`" ]
+ [ ! -z "$(dd if=$1 bs=1 count=1 2>/dev/null | tr '\0' x)" ]
return
}
# Figure out if we're installing from the hard drive
if [ -r $TMP/SeTT_PX ]; then
- T_PX="`cat $TMP/SeTT_PX`"
+ T_PX="$(cat $TMP/SeTT_PX)"
else
if [ "$T_PX" = "" -a ! "$1" = "" ]; then
T_PX=$1
@@ -658,9 +659,9 @@ LNX="no" # this means no Linux partition has been defined as bootable
ROOT_DEVICE=$2
if [ "$ROOT_DEVICE" = "" ]; then
if [ -r $TMP/SeTrootdev ]; then
- ROOT_DEVICE="`cat $TMP/SeTrootdev`"
+ ROOT_DEVICE="$(cat $TMP/SeTrootdev)"
else
- ROOT_DEVICE="`mount | cut -f 1 -d " " | sed -n "1 p"`"
+ ROOT_DEVICE="$(mount | grep " on $T_PX " | cut -f 1 -d " " | head -n 1)"
fi
fi
# Figure out where the kernel is:
@@ -707,7 +708,7 @@ it later with the 'liloconfig' command. Which option would you like?" \
if [ $? = 1 -o $? = 255 ]; then
exit
fi
- REPLY="`cat $TMP/reply`"
+ REPLY="$(cat $TMP/reply)"
rm -f $TMP/reply
if [ "$REPLY" = "skip" ]; then
exit
@@ -737,7 +738,7 @@ Which option would you like?" 21 73 8 \
if [ $? = 1 -o $? = 255 ]; then
REPLY="Skip"
else
- REPLY="`cat $TMP/reply`"
+ REPLY="$(cat $TMP/reply)"
fi
rm -r $TMP/reply
if [ "$REPLY" = "Begin" ]; then
@@ -747,7 +748,7 @@ Which option would you like?" 21 73 8 \
HDR="no"
continue;
else
- APPEND="`cat $TMP/reply`"
+ APPEND="$(cat $TMP/reply)"
fi
#ask_utf;
#if [ $? = 1 -o $? = 255 ]; then
@@ -772,15 +773,15 @@ selection. Please pick a target location:" 15 65 3 \
continue;
else
LNX="no"
- TG="`cat $TMP/reply`"
+ TG="$(cat $TMP/reply)"
fi
rm -r $TMP/reply
if [ "$TG" = "MBR" ]; then
MBR_TARGET=/dev/sda
echo $MBR_TARGET > $TMP/LILOMBR
cat /proc/partitions | while read LINE ; do
- MAJOR="`echo $LINE | cut -f 1 -d ' '`"
- MINOR="`echo $LINE | cut -f 2 -d ' '`"
+ MAJOR="$(echo $LINE | cut -f 1 -d ' ')"
+ MINOR="$(echo $LINE | cut -f 2 -d ' ')"
if [ ! "$MINOR" = "0" -a ! "$MINOR" = "64" ]; then # ignore whole devices to weed out CD drives
if [ "$MAJOR" = "3" ]; then
MBR_TARGET=/dev/hda
@@ -797,17 +798,17 @@ selection. Please pick a target location:" 15 65 3 \
fi
fi
done
- LILO_TARGET=`cat $TMP/LILOMBR`
+ LILO_TARGET=$(cat $TMP/LILOMBR)
dialog --title "CONFIRM LOCATION TO INSTALL LILO" --inputbox \
"The auto-detected location to install the LILO boot block is shown below. \
If you need to make any changes, you can make them below. Otherwise, hit \
ENTER to accept the target location shown." 11 60 $LILO_TARGET 2> $TMP/reply
if [ $? = 0 ]; then
- LILO_TARGET="`cat $TMP/reply`"
+ LILO_TARGET="$(cat $TMP/reply)"
fi
rm -f $TMP/reply
elif [ "$TG" = "Root" ]; then
- LILO_TARGET=`echo $ROOT_DEVICE`
+ LILO_TARGET=$(echo $ROOT_DEVICE)
elif [ "$TG" = "Floppy" ]; then
LILO_TARGET="/dev/fd0"
else
@@ -826,7 +827,7 @@ default." 13 74 4 \
HDR="no"
continue;
else
- TIMEOUT="`cat $TMP/reply`"
+ TIMEOUT="$(cat $TMP/reply)"
fi
rm -r $TMP/reply
if [ "$TIMEOUT" = "None" ]; then
@@ -852,7 +853,8 @@ default." 13 74 4 \
# Start LILO global section
boot = $LILO_TARGET
-#compact # faster, but won't work on all systems.
+# This option loads the kernel and initrd much faster:
+compact
EOF
# Boot splash
@@ -954,7 +956,7 @@ EOF
continue
fi
rm $TMP/tmpmsg
- LINUX_PART="`cat $TMP/reply`"
+ LINUX_PART="$(cat $TMP/reply)"
checkp_dialog $LINUX_PART
if [ ! $? = 0 ]; then
continue;
@@ -967,7 +969,7 @@ SINGLE WORD." 11 60 2> $TMP/reply
if [ $? = 1 -o $? = 255 ]; then
continue
fi
- LABEL="`cat $TMP/reply`"
+ LABEL="$(cat $TMP/reply)"
cat << EOF >> $TMP/lilo.conf
# Linux bootable partition config begins
image = $KERNEL
@@ -995,13 +997,13 @@ partitions unless you start over with a new LILO header." 6 60
echo >> $TMP/tmpmsg
echo "Which one would you like LILO to boot?" >> $TMP/tmpmsg
dialog --title "SELECT OS/2 PARTITION" --no-collapse --inputbox \
-"`cat $TMP/tmpmsg`" 20 74 2> $TMP/reply
+"$(cat $TMP/tmpmsg)" 20 74 2> $TMP/reply
if [ $? = 1 -o $? = 255 ]; then
rm $TMP/tmpmsg
continue
fi
rm $TMP/tmpmsg
- OS_2_PART="`cat $TMP/reply`"
+ OS_2_PART="$(cat $TMP/reply)"
checkp_dialog $OS_2_PART
if [ ! $? = 0 ]; then
continue;
@@ -1014,9 +1016,9 @@ SINGLE WORD." 11 60 2> $TMP/reply
if [ $? = 1 -o $? = 255 ]; then
continue
fi
- LABEL="`cat $TMP/reply`"
- TABLE="`echo $OS_2_PART | cut -b1-8`"
- if [ "`echo $TABLE | cut -b6-8`" = "hda" ]; then
+ LABEL="$(cat $TMP/reply)"
+ TABLE="$(echo $OS_2_PART | cut -b1-8)"
+ if [ "$(echo $TABLE | cut -b6-8)" = "hda" ]; then
cat << EOF >> $TMP/lilo.conf
# OS/2 bootable partition config begins
other = $OS_2_PART
@@ -1061,13 +1063,13 @@ HPFS" | grep -v "Ext'd" | grep -v "Extend" | sort | grep "$($OSPROBER 2> /dev/nu
echo >> $TMP/tmpmsg
echo "Which one would you like LILO to boot?" >> $TMP/tmpmsg
dialog --title "SELECT WINDOWS PARTITION" --no-collapse --inputbox \
-"`cat $TMP/tmpmsg`" 20 74 2> $TMP/reply
+"$(cat $TMP/tmpmsg)" 20 74 2> $TMP/reply
if [ $? = 1 -o $? = 255 ]; then
rm $TMP/tmpmsg
continue
fi
rm $TMP/tmpmsg
- DOSPART="`cat $TMP/reply`"
+ DOSPART="$(cat $TMP/reply)"
checkp_dialog $DOSPART
if [ ! $? = 0 ]; then
continue;
@@ -1080,13 +1082,13 @@ SINGLE WORD." 11 60 2> $TMP/reply
if [ $? = 1 -o $? = 255 ]; then
continue
fi
- LABEL="`cat $TMP/reply`"
+ LABEL="$(cat $TMP/reply)"
unset USE_LOADER
- TABLE="`echo $DOSPART | cut -b1-8`"
- if [ "`echo $TABLE | cut -b6-8`" = "hda" ]; then
+ TABLE="$(echo $DOSPART | cut -b1-8)"
+ if [ "$(echo $TABLE | cut -b6-8)" = "hda" ]; then
USE_LOADER="no"
fi
- if [ "`echo $TABLE | cut -b6-8`" = "sda" ]; then
+ if [ "$(echo $TABLE | cut -b6-8)" = "sda" ]; then
if probe /dev/hda; then
USE_LOADER="yes"
else
diff --git a/testing/source/PAM/a/pam/doinst.sh b/source/a/pam/doinst.sh
index e96721a14..e96721a14 100644
--- a/testing/source/PAM/a/pam/doinst.sh
+++ b/source/a/pam/doinst.sh
diff --git a/testing/source/PAM/a/pam/fedora-patches/pam-1.1.3-nouserenv.patch b/source/a/pam/fedora-patches/pam-1.1.3-nouserenv.patch
index f3a742c8d..f3a742c8d 100644
--- a/testing/source/PAM/a/pam/fedora-patches/pam-1.1.3-nouserenv.patch
+++ b/source/a/pam/fedora-patches/pam-1.1.3-nouserenv.patch
diff --git a/testing/source/PAM/a/pam/fedora-patches/pam-1.1.6-limits-user.patch b/source/a/pam/fedora-patches/pam-1.1.6-limits-user.patch
index 3c17b781a..3c17b781a 100644
--- a/testing/source/PAM/a/pam/fedora-patches/pam-1.1.6-limits-user.patch
+++ b/source/a/pam/fedora-patches/pam-1.1.6-limits-user.patch
diff --git a/testing/source/PAM/a/pam/fedora-patches/pam-1.1.8-audit-user-mgmt.patch b/source/a/pam/fedora-patches/pam-1.1.8-audit-user-mgmt.patch
index 277a5699f..277a5699f 100644
--- a/testing/source/PAM/a/pam/fedora-patches/pam-1.1.8-audit-user-mgmt.patch
+++ b/source/a/pam/fedora-patches/pam-1.1.8-audit-user-mgmt.patch
diff --git a/testing/source/PAM/a/pam/fedora-patches/pam-1.1.8-full-relro.patch b/source/a/pam/fedora-patches/pam-1.1.8-full-relro.patch
index b2d8526f9..b2d8526f9 100644
--- a/testing/source/PAM/a/pam/fedora-patches/pam-1.1.8-full-relro.patch
+++ b/source/a/pam/fedora-patches/pam-1.1.8-full-relro.patch
diff --git a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.0-pwhistory-helper.patch b/source/a/pam/fedora-patches/pam-1.3.0-pwhistory-helper.patch
index 554e5c8f8..554e5c8f8 100644
--- a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.0-pwhistory-helper.patch
+++ b/source/a/pam/fedora-patches/pam-1.3.0-pwhistory-helper.patch
diff --git a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.0-unix-nomsg.patch b/source/a/pam/fedora-patches/pam-1.3.0-unix-nomsg.patch
index 33c226773..33c226773 100644
--- a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.0-unix-nomsg.patch
+++ b/source/a/pam/fedora-patches/pam-1.3.0-unix-nomsg.patch
diff --git a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-coverity.patch b/source/a/pam/fedora-patches/pam-1.3.1-coverity.patch
index cecf768f6..cecf768f6 100644
--- a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-coverity.patch
+++ b/source/a/pam/fedora-patches/pam-1.3.1-coverity.patch
diff --git a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-motd-multiple-paths.patch b/source/a/pam/fedora-patches/pam-1.3.1-motd-multiple-paths.patch
index a0b069815..a0b069815 100644
--- a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-motd-multiple-paths.patch
+++ b/source/a/pam/fedora-patches/pam-1.3.1-motd-multiple-paths.patch
diff --git a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-noflex.patch b/source/a/pam/fedora-patches/pam-1.3.1-noflex.patch
index c65d22537..c65d22537 100644
--- a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-noflex.patch
+++ b/source/a/pam/fedora-patches/pam-1.3.1-noflex.patch
diff --git a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-redhat-modules.patch b/source/a/pam/fedora-patches/pam-1.3.1-redhat-modules.patch
index 4d3f37414..4d3f37414 100644
--- a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-redhat-modules.patch
+++ b/source/a/pam/fedora-patches/pam-1.3.1-redhat-modules.patch
diff --git a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-bcrypt_b.patch b/source/a/pam/fedora-patches/pam-1.3.1-unix-bcrypt_b.patch
index bff9d47ea..bff9d47ea 100644
--- a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-bcrypt_b.patch
+++ b/source/a/pam/fedora-patches/pam-1.3.1-unix-bcrypt_b.patch
diff --git a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-checksalt_syslog.patch b/source/a/pam/fedora-patches/pam-1.3.1-unix-checksalt_syslog.patch
index 5cbc35b03..5cbc35b03 100644
--- a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-checksalt_syslog.patch
+++ b/source/a/pam/fedora-patches/pam-1.3.1-unix-checksalt_syslog.patch
diff --git a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-crypt_checksalt.patch b/source/a/pam/fedora-patches/pam-1.3.1-unix-crypt_checksalt.patch
index 0a74e940e..0a74e940e 100644
--- a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-crypt_checksalt.patch
+++ b/source/a/pam/fedora-patches/pam-1.3.1-unix-crypt_checksalt.patch
diff --git a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-fix_checksalt_syslog.patch b/source/a/pam/fedora-patches/pam-1.3.1-unix-fix_checksalt_syslog.patch
index 41733ae04..41733ae04 100644
--- a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-fix_checksalt_syslog.patch
+++ b/source/a/pam/fedora-patches/pam-1.3.1-unix-fix_checksalt_syslog.patch
diff --git a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-gensalt-autoentropy.patch b/source/a/pam/fedora-patches/pam-1.3.1-unix-gensalt-autoentropy.patch
index 8ae4abfd8..8ae4abfd8 100644
--- a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-gensalt-autoentropy.patch
+++ b/source/a/pam/fedora-patches/pam-1.3.1-unix-gensalt-autoentropy.patch
diff --git a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-no-fallback.patch b/source/a/pam/fedora-patches/pam-1.3.1-unix-no-fallback.patch
index 8755cf602..8755cf602 100644
--- a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-no-fallback.patch
+++ b/source/a/pam/fedora-patches/pam-1.3.1-unix-no-fallback.patch
diff --git a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-remove-obsolete-_unix_read_password-prototype.patch b/source/a/pam/fedora-patches/pam-1.3.1-unix-remove-obsolete-_unix_read_password-prototype.patch
index 14f285deb..14f285deb 100644
--- a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-remove-obsolete-_unix_read_password-prototype.patch
+++ b/source/a/pam/fedora-patches/pam-1.3.1-unix-remove-obsolete-_unix_read_password-prototype.patch
diff --git a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-yescrypt.patch b/source/a/pam/fedora-patches/pam-1.3.1-unix-yescrypt.patch
index f04a59ce7..f04a59ce7 100644
--- a/testing/source/PAM/a/pam/fedora-patches/pam-1.3.1-unix-yescrypt.patch
+++ b/source/a/pam/fedora-patches/pam-1.3.1-unix-yescrypt.patch
diff --git a/testing/source/PAM/a/pam/pam.SlackBuild b/source/a/pam/pam.SlackBuild
index 41a321079..23aad8bc5 100755
--- a/testing/source/PAM/a/pam/pam.SlackBuild
+++ b/source/a/pam/pam.SlackBuild
@@ -27,7 +27,7 @@ SRCNAM=Linux-PAM
PKGNAM=pam
PAMRHVER=${PAMRHVER:-$(echo pam-redhat-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/testing/source/PAM/a/pam/pam.url b/source/a/pam/pam.url
index 07dfcb99b..07dfcb99b 100644
--- a/testing/source/PAM/a/pam/pam.url
+++ b/source/a/pam/pam.url
diff --git a/testing/source/PAM/a/pam/patches/pam.etc.environment.better.comments.diff b/source/a/pam/patches/pam.etc.environment.better.comments.diff
index 6899e4c14..6899e4c14 100644
--- a/testing/source/PAM/a/pam/patches/pam.etc.environment.better.comments.diff
+++ b/source/a/pam/patches/pam.etc.environment.better.comments.diff
diff --git a/testing/source/PAM/a/pam/patches/pam.pam_tally2.no.fsync.patch b/source/a/pam/patches/pam.pam_tally2.no.fsync.patch
index 15b40115d..15b40115d 100644
--- a/testing/source/PAM/a/pam/patches/pam.pam_tally2.no.fsync.patch
+++ b/source/a/pam/patches/pam.pam_tally2.no.fsync.patch
diff --git a/testing/source/PAM/a/pam/patches/pam.pam_tally2.slackware.diff b/source/a/pam/patches/pam.pam_tally2.slackware.diff
index 8ab853210..8ab853210 100644
--- a/testing/source/PAM/a/pam/patches/pam.pam_tally2.slackware.diff
+++ b/source/a/pam/patches/pam.pam_tally2.slackware.diff
diff --git a/testing/source/PAM/a/pam/slack-desc b/source/a/pam/slack-desc
index 7c0bcbbd9..7c0bcbbd9 100644
--- a/testing/source/PAM/a/pam/slack-desc
+++ b/source/a/pam/slack-desc
diff --git a/source/a/shadow/shadow.SlackBuild b/source/a/shadow/shadow.SlackBuild
index c7c33a836..21d4d875e 100755
--- a/source/a/shadow/shadow.SlackBuild
+++ b/source/a/shadow/shadow.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=shadow
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-6}
+BUILD=${BUILD:-7}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/a/utempter/slack-desc b/source/a/utempter/slack-desc
index 5c490b91b..3e57078fe 100644
--- a/source/a/utempter/slack-desc
+++ b/source/a/utempter/slack-desc
@@ -12,7 +12,7 @@ utempter: The utempter package provides a utility and shared library that
utempter: allows terminal applications such as xterm and screen to update
utempter: /var/run/utmp and /var/log/wtmp without requiring root privileges.
utempter:
-utempter:
+utempter: Homepage: https://github.com/altlinux/libutempter
utempter:
utempter:
utempter:
diff --git a/source/a/utempter/utempter.SlackBuild b/source/a/utempter/utempter.SlackBuild
index 09d244e87..8cef68aa4 100755
--- a/source/a/utempter/utempter.SlackBuild
+++ b/source/a/utempter/utempter.SlackBuild
@@ -27,8 +27,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=utempter
-VERSION=1.1.6
-BUILD=${BUILD:-3}
+VERSION=1.2.0
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -69,7 +69,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG/usr
cd $TMP
rm -rf libutempter-$VERSION
-tar xvf $CWD/libutempter-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/libutempter-$VERSION.tar.?z || exit 1
cd libutempter-$VERSION || exit 1
chown -R root:root .
find . \
diff --git a/source/a/utempter/utempter.url b/source/a/utempter/utempter.url
new file mode 100644
index 000000000..305d4756c
--- /dev/null
+++ b/source/a/utempter/utempter.url
@@ -0,0 +1,2 @@
+https://github.com/altlinux/libutempter
+ftp://ftp.altlinux.org/pub/people/ldv/utempter
diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild
index 381c89d19..52f86384d 100755
--- a/source/a/util-linux/util-linux.SlackBuild
+++ b/source/a/util-linux/util-linux.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=util-linux
VERSION=${VERSION:-$(echo util-linux*.tar.xz | cut -d - -f 3 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
ADJTIMEXVERS=1.29
SETSERIALVERS=2.17
diff --git a/source/a/xfsprogs/xfsprogs.SlackBuild b/source/a/xfsprogs/xfsprogs.SlackBuild
index fe5d5e8f9..1fbf978d3 100755
--- a/source/a/xfsprogs/xfsprogs.SlackBuild
+++ b/source/a/xfsprogs/xfsprogs.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xfsprogs
VERSION=${VERSION:-$(echo xfsprogs-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/ap/at/at.SlackBuild b/source/ap/at/at.SlackBuild
index caf048316..2c8b93acf 100755
--- a/source/ap/at/at.SlackBuild
+++ b/source/ap/at/at.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=at
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/source/ap/cups/cups.SlackBuild b/source/ap/cups/cups.SlackBuild
index 60ff31fce..4a9f85ac1 100755
--- a/source/ap/cups/cups.SlackBuild
+++ b/source/ap/cups/cups.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=cups
VERSION=${VERSION:-$(echo $PKGNAM-*-source.tar.?z | cut -f 2 -d -)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/ap/hplip/hplip.SlackBuild b/source/ap/hplip/hplip.SlackBuild
index 4d4f143e7..a68820407 100755
--- a/source/ap/hplip/hplip.SlackBuild
+++ b/source/ap/hplip/hplip.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=hplip
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild
index 473b90e8d..9aefaca01 100755
--- a/source/ap/mariadb/mariadb.SlackBuild
+++ b/source/ap/mariadb/mariadb.SlackBuild
@@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mariadb
VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# To reduce the package size, the embedded server may be omitted. Currently
# only amarok uses this. To build without embedded support, set this to NO.
diff --git a/source/ap/screen/screen.SlackBuild b/source/ap/screen/screen.SlackBuild
index ee5b24aed..d21b0af28 100755
--- a/source/ap/screen/screen.SlackBuild
+++ b/source/ap/screen/screen.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=screen
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/source/ap/soma/ChangeLog.txt b/source/ap/soma/ChangeLog.txt
deleted file mode 100644
index a51b7c0ee..000000000
--- a/source/ap/soma/ChangeLog.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-==============================================================================
-Thu 28 Feb 02:13:19 UTC 2019
-3.2.3
-Fixed the Intergalactic FM stations.
-==============================================================================
-Wed 27 Feb 23:49:44 UTC 2020
-3.2.2
-Add alpha sorting to lists.
-Stop hitting escape, and some keys that contain escape, to exit the main menu.
-==============================================================================
-Thu 27 Dec 14:06:02 UTC 2018
-3.2.1
-Remove debugging helper line.
-==============================================================================
-Sun 18 Nov 05:42:15 UTC 2018
-3.2.0
-Add proxy support.
-==============================================================================
-Fri 16 Nov 00:05:05 UTC 2018
-3.1.1
-Update README
-==============================================================================
-Wed 14 Nov 22:51:50 UTC 2018
-3.1.0
-Improve timeout check.
-==============================================================================
-Version 3.0.8
-Precreate 'soma-status'.
-Fix indentation. Vim was confused.
-Fix killing of orphaned mencoder process if recording failed.
-==============================================================================
-Version 3.0.7
-Precreate 'soma-playing'.
-==============================================================================
-Version 3.0.6
-Rename options.conf/stations.conf -> .new
-==============================================================================
-Version 3.0.5
-
-Bugs fixed:
-
-Finally fixed the flashing window bug with newer versions of dialog. Hopefully.
-Sometimes menus were broken after choosing a station from the local genre list.
-
-Added:
-
-Recording. See RECORDING.txt or 'soma --record-info | less' for detailed info.
-
-Changes:
-
-Some new stations added and dead ones removed.
-Removed TAG from the SlackBuild.
-Added the doinst.sh.gz from Slackware -current and adjusted the SlackBuild
-according to the diff that Pat uses.
-==============================================================================
-Version 3.0.4
-Somebody stole the ChangeLog.
-==============================================================================
-Version 3.0.3
-Add check for empty input in text input box.
-==============================================================================
-Version 3.0.2
-Edit purge files function slightly.
-==============================================================================
-Version 3.0.1
-Add new theme.
-Edit purge files function slightly to make it safer.
-==============================================================================
-Version 3.0.0
-Fixed BBC Radio 4 and BBC Radio 4 Extra URLs.
-Add menu options for genres, bookmarks and themes.
-Add schedules and volume indicators.
-Add more options for timeformat, caret etc.
-==============================================================================
-Version 2.13.2
-Fixes for new dialog in -current.
-==============================================================================
-Version 2.13.1
-Bugfix where sometimes station list is broken.
-==============================================================================
-Version 2.13.0
-Fix another scheduler bug.
-Add genre support.
-Move Theme option to main menu.
-Add time format option.
-Updated all broken BBC URLs.
-Removed some broken URLs.
-==============================================================================
-Version 2.12.3
-Fix scheduler bug.
-==============================================================================
-Version 2.12.2
-Fixed some options that were zeroing out if 'back' was
-pressed.
-==============================================================================
-Version 2.12.1
-Fixed missing output devices bug.
-==============================================================================
-Version 2.12.0
-
-Stations added:
-Kisstory
-ABC Classic FM
-Heart
-Radio X
-Capital
-CapitalXtra
-
-New options:
-New options menu item in main menu. This is to edit
-the config variables and then reread the config.
-'t' shortcut to change theme from status window.
-'o' shortcut to go to options menu.
-The 'Theme' option lists everything in ~/.soma/themes
-Added tfonz's turbo theme.
-
-Removed:
-TERM environment setting. Now soma overrides this.
-Took out the initial typing of device detection because it
-starts up so fast now that you just see a flicker.
-
-Enhancements:
-A vast improvement in loading speed due to new method
-of loading station list.
-==============================================================================
-Version 2.11.3
-Added:
-ABC Oldies,http://orion.shoutca.st:8569
-ABC 60s,http://149.56.23.7:20314/stream
-ABC 70s,http://149.56.23.7:20258/stream
-ABC 80s,http://cabhs31.sonixcast.com:20168
-Flower Power Radio,http://50.7.129.122:8433/stream
-KZRO,http://war.str3am.com:7930
-Morcegão FM,http://69.64.34.198:8000/morcegao
-Floyd,http://archlinux.uk:9001
-Floyd Too,http://cirrus.turtil.net:9001
-
-Major code overhaul.
-Added more themes + themes directory.
-==============================================================================
-Version 2.11.2
-Added:
-Radio Swing
-1920s Radio
-Smooth Jazz
-Big Blue
-KCEA
-WITR 89.7
-KKJZ FM
-4625 KHz
-The Buzzer
-==============================================================================
-Version 2.11.1
-Add 3WK and Krypton stations.
-==============================================================================
-Version 2.11.0
-Add SAVE_LIST_AT_QUIT option.
-==============================================================================
-Version 2.10.8
-Set default CACHE is blank..
-==============================================================================
-Version 2.10.7
-Add CACHE option.
-==============================================================================
-Version 2.10.6
-Add HD BBC stations.
-Support for .m3u8 URLs.
-==============================================================================
-Version 2.10.5
-Add function to add SETVOL to config.
-==============================================================================
-Version 2.10.4
-Clean up Name finding code.
-==============================================================================
-Version 2.10.3
-Fix Names containing colons.
-==============================================================================
-Version 2.10.2
-Tidy menu.
-==============================================================================
-Version 2.10.1
-Fix bug in mixer selection.
-==============================================================================
-Version 2.10.0
-Changed dialog theme back to original way.
-Added a 'greenrc' theme.
-==============================================================================
-Version 2.9.2
-Update stations URLS. Remove dead.
-==============================================================================
-Version 2.9.1
-Better station parsing.
-==============================================================================
-Version 2.9.0
-Add keyboard sortcuts for volume:
-keys 1-0 = 10% 20% ... 100%
-This volume is saved and reapplied on startup.
-Added a few new somafm stations and a couple of talk radio stations
-==============================================================================
-Version 2.8.9
-Use ~/.soma/dialogrc-$VERSION.
-Some fixes to the station 'tuner' function.
-==============================================================================
diff --git a/source/ap/soma/README b/source/ap/soma/README
index 20299b6f7..cb60a62c6 100644
--- a/source/ap/soma/README
+++ b/source/ap/soma/README
@@ -30,7 +30,8 @@ Startup Flags:
Key commands supported in status window:
1 - 0 Volume 10% - 100% () Volume -5/+5
- Space Pause ` Volume 0
+ F1-F12 Bookmarks ` Volume 0
+ Space Pause
a Add schedule A Toggle audio codec info
b Station browser (genre) B Station browser (all)
d Disconnect/Reconnect/Play/Stop D Toggle debug mode
@@ -98,5 +99,3 @@ attrcolor b ".I"
You might want to comment it out and try again as it seems to turn off the bold
attribute. See the screen man page for more info.
-
-Please mail me at dave@dawoodfall.net for new radio urls or bug reports etc.
diff --git a/source/ap/soma/slack-desc.diff b/source/ap/soma/slack-desc.diff
deleted file mode 100644
index b8eeefa35..000000000
--- a/source/ap/soma/slack-desc.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- slack-desc.orig 2019-02-27 21:33:45.000000000 -0600
-+++ slack-desc 2018-11-28 16:37:00.644976546 -0600
-@@ -1,14 +1,14 @@
- # HOW TO EDIT THIS FILE:
--# The "handy ruler" below makes it easier to edit a package description. Line
-+# The "handy ruler" below makes it easier to edit a package description. Line
- # up the first '|' above the ':' following the base package name, and the '|'
--# on the right side marks the last column you can put a character in. You must
--# make exactly 11 lines for the formatting to be correct. It's also
-+# on the right side marks the last column you can put a character in. You must
-+# make exactly 11 lines for the formatting to be correct. It's also
- # customary to leave one space after the ':'.
-
- |-----handy-ruler------------------------------------------------------|
--soma: Soma - a dialog/mplayer internet radio player and recorder.
-+soma: soma (a dialog/MPlayer internet radio player and recorder)
- soma:
--soma: Soma handles playing any internet audio stream supported by mplayer.
-+soma: Soma handles playing any internet audio stream supported by MPlayer.
- soma: It also supports playlists such as pls,m3u and ram.
- soma:
- soma: Homepage: http://tty1.uk/slackbuilds/noversion/soma
diff --git a/source/ap/soma/soma.SlackBuild b/source/ap/soma/soma.SlackBuild
index be4a41394..af32a201b 100755
--- a/source/ap/soma/soma.SlackBuild
+++ b/source/ap/soma/soma.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=soma
-VERSION=${VERSION:-3.2.3}
+VERSION=${VERSION:-3.3.0}
ARCH=noarch
BUILD=${BUILD:-1}
diff --git a/source/ap/soma/soma.info b/source/ap/soma/soma.info
index 4eeb7176a..7fc398ce8 100644
--- a/source/ap/soma/soma.info
+++ b/source/ap/soma/soma.info
@@ -1,10 +1,8 @@
PRGNAM="soma"
-VERSION="3.2.3"
+VERSION="3.3.0"
HOMEPAGE="http://tty1.uk/slackbuilds/noversion/soma/"
-DOWNLOAD="http://git.tty1.uk/cgit.cgi/soma/snapshot/soma-3.2.3.tar.gz"
-MD5SUM="1b3b8dc0e0b60b4f2eede63bdfb39e32"
+DOWNLOAD="http://git.tty1.uk/cgit.cgi/soma/snapshot/soma-3.3.0.tar.gz"
+MD5SUM="783296fbd79ac0626e55ac326526e9e1"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@tty1.uk"
diff --git a/source/ap/sqlite/sqlite.SlackBuild b/source/ap/sqlite/sqlite.SlackBuild
index 6e4df6f07..781f7d40a 100755
--- a/source/ap/sqlite/sqlite.SlackBuild
+++ b/source/ap/sqlite/sqlite.SlackBuild
@@ -26,7 +26,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sqlite
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# First, convert the .zip file if needed:
if ls *.zip 1> /dev/null 2> /dev/null ; then
diff --git a/source/ap/sudo/sudo.SlackBuild b/source/ap/sudo/sudo.SlackBuild
index a47e63e6a..984c7e0bd 100755
--- a/source/ap/sudo/sudo.SlackBuild
+++ b/source/ap/sudo/sudo.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sudo
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