diff options
Diffstat (limited to '')
-rwxr-xr-x | source/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-x | source/a/libcgroup/libcgroup.SlackBuild | 2 | ||||
-rw-r--r-- | source/a/libpwquality/doinst.sh (renamed from testing/source/PAM/a/libpwquality/doinst.sh) | 0 | ||||
-rwxr-xr-x | source/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-x | source/a/lilo/lilo.SlackBuild | 2 | ||||
-rw-r--r-- | source/a/lilo/liloconfig | 92 | ||||
-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-x | source/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-x | source/a/shadow/shadow.SlackBuild | 2 | ||||
-rw-r--r-- | source/a/utempter/slack-desc | 2 | ||||
-rwxr-xr-x | source/a/utempter/utempter.SlackBuild | 6 | ||||
-rw-r--r-- | source/a/utempter/utempter.url | 2 | ||||
-rwxr-xr-x | source/a/util-linux/util-linux.SlackBuild | 2 | ||||
-rwxr-xr-x | source/a/xfsprogs/xfsprogs.SlackBuild | 2 | ||||
-rwxr-xr-x | source/ap/at/at.SlackBuild | 2 | ||||
-rwxr-xr-x | source/ap/cups/cups.SlackBuild | 2 | ||||
-rwxr-xr-x | source/ap/hplip/hplip.SlackBuild | 2 | ||||
-rwxr-xr-x | source/ap/mariadb/mariadb.SlackBuild | 2 | ||||
-rwxr-xr-x | source/ap/screen/screen.SlackBuild | 2 | ||||
-rw-r--r-- | source/ap/soma/ChangeLog.txt | 203 | ||||
-rw-r--r-- | source/ap/soma/README | 5 | ||||
-rw-r--r-- | source/ap/soma/slack-desc.diff | 22 | ||||
-rwxr-xr-x | source/ap/soma/soma.SlackBuild | 2 | ||||
-rw-r--r-- | source/ap/soma/soma.info | 8 | ||||
-rwxr-xr-x | source/ap/sqlite/sqlite.SlackBuild | 2 | ||||
-rwxr-xr-x | source/ap/sudo/sudo.SlackBuild | 2 | ||||
-rw-r--r-- | source/installer/ChangeLog.txt | 3 | ||||
-rwxr-xr-x | source/installer/build_installer.sh | 15 | ||||
-rw-r--r-- | source/kde/build/calligra | 2 | ||||
-rw-r--r-- | source/kde/build/kde-workspace | 2 | ||||
-rwxr-xr-x | source/l/ConsoleKit2/ConsoleKit2.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/boost/boost.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/gnome-keyring/gnome-keyring.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/harfbuzz/harfbuzz.SlackBuild | 2 | ||||
-rw-r--r-- | source/l/icu4c/icu4c.url | 2 | ||||
-rwxr-xr-x | source/l/libcap/libcap.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/libical/libical.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/libvisio/libvisio.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/polkit/polkit.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/qt/qt-nowebkit.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/qt5-webkit/qt5-webkit.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/qt5/qt5.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/raptor2/raptor2.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/system-config-printer/system-config-printer.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/vte/vte.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/cifs-utils/cifs-utils.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/cyrus-sasl/cyrus-sasl.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/dovecot/dovecot.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/netatalk/netatalk.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/netkit-rsh/netkit-rsh.SlackBuild | 2 | ||||
-rw-r--r-- | source/n/nss-pam-ldapd/1025d5de336d8c9585b79df3154b5649da344281.patch (renamed from testing/source/PAM/n/nss-pam-ldapd/1025d5de336d8c9585b79df3154b5649da344281.patch) | 0 | ||||
-rw-r--r-- | source/n/nss-pam-ldapd/548efe5333b56a0a042843a044e0348317f80065.patch (renamed from testing/source/PAM/n/nss-pam-ldapd/548efe5333b56a0a042843a044e0348317f80065.patch) | 0 | ||||
-rw-r--r-- | source/n/nss-pam-ldapd/b33551895b3c02dc7082363c6aae13f8e336f4e5.patch (renamed from testing/source/PAM/n/nss-pam-ldapd/b33551895b3c02dc7082363c6aae13f8e336f4e5.patch) | 0 | ||||
-rw-r--r-- | source/n/nss-pam-ldapd/doinst.sh (renamed from testing/source/PAM/n/nss-pam-ldapd/doinst.sh) | 0 | ||||
-rw-r--r-- | source/n/nss-pam-ldapd/fea0f5ed287b04406afca0835b1a333bd1fe617b.patch (renamed from testing/source/PAM/n/nss-pam-ldapd/fea0f5ed287b04406afca0835b1a333bd1fe617b.patch) | 0 | ||||
-rwxr-xr-x | source/n/nss-pam-ldapd/nss-pam-ldapd.SlackBuild (renamed from testing/source/PAM/n/nss-pam-ldapd/nss-pam-ldapd.SlackBuild) | 0 | ||||
-rw-r--r-- | source/n/nss-pam-ldapd/nss-pam-ldapd.url (renamed from testing/source/PAM/n/nss-pam-ldapd/nss-pam-ldapd.url) | 0 | ||||
-rw-r--r-- | source/n/nss-pam-ldapd/rc.nss-pam-ldapd (renamed from testing/source/PAM/n/nss-pam-ldapd/rc.nss-pam-ldapd) | 0 | ||||
-rw-r--r-- | source/n/nss-pam-ldapd/slack-desc (renamed from testing/source/PAM/n/nss-pam-ldapd/slack-desc) | 0 | ||||
-rwxr-xr-x | source/n/openssh/openssh.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/openvpn/openvpn.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/pam-krb5/pam-krb5.SlackBuild (renamed from testing/source/PAM/n/pam-krb5/pam-krb5.SlackBuild) | 0 | ||||
-rw-r--r-- | source/n/pam-krb5/pam-krb5.url (renamed from testing/source/PAM/n/pam-krb5/pam-krb5.url) | 0 | ||||
-rw-r--r-- | source/n/pam-krb5/slack-desc (renamed from testing/source/PAM/n/pam-krb5/slack-desc) | 0 | ||||
-rw-r--r-- | source/n/pam-krb5/system-auth.krb5 (renamed from testing/source/PAM/n/pam-krb5/system-auth.krb5) | 0 | ||||
-rwxr-xr-x | source/n/php/php.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/popa3d/popa3d.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/ppp/ppp.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/proftpd/proftpd.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/samba/samba.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/tin/tin.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/vsftpd/vsftpd.SlackBuild | 2 | ||||
-rwxr-xr-x | source/t/texlive/texlive.SlackBuild | 2 | ||||
-rwxr-xr-x | source/x/vulkan-sdk/fetch-sources.sh | 4 | ||||
-rw-r--r-- | source/x/x11/build/xdm | 2 | ||||
-rw-r--r-- | source/x/x11/build/xisxwayland | 1 | ||||
-rw-r--r-- | source/x/x11/configure/xisxwayland | 17 | ||||
-rw-r--r-- | source/x/x11/make/xisxwayland | 6 | ||||
-rw-r--r-- | source/x/x11/modularize | 1 | ||||
-rw-r--r-- | source/x/x11/slack-desc/xisxwayland | 19 | ||||
-rwxr-xr-x | source/xap/sane/sane.SlackBuild | 18 | ||||
-rw-r--r-- | source/xap/sane/sane.url | 1 | ||||
-rw-r--r-- | source/xap/sane/slack-desc | 2 | ||||
-rwxr-xr-x | source/xap/xlockmore/xlockmore.SlackBuild | 2 | ||||
-rwxr-xr-x | source/xap/xscreensaver/xscreensaver.SlackBuild | 2 |
112 files changed, 188 insertions, 339 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 diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index 3d504073b..2d749cfd8 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,6 @@ +Sun May 17 19:57:48 UTC 2020 + Added PAM libraries, security modules, and config files. ++--------------------------+ Tue Mar 31 18:02:13 UTC 2020 In series selection menu, don't (falsely) mention Qt being in the KDE series. +--------------------------+ diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh index 284c79288..c26bdfbbd 100755 --- a/source/installer/build_installer.sh +++ b/source/installer/build_installer.sh @@ -883,6 +883,7 @@ a/mdadm \ a/ncompress \ a/openssl-solibs \ a/os-prober \ +a/pam \ a/pciutils \ a/plzip \ a/pkgtools \ @@ -1119,6 +1120,19 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_USRBIN} \ usb-devices \ $PKG/$ARCH-installer-filesystem/usr/bin/ +# Copy PAM's security directory: +cd $TMP/extract-packages/lib${LIBDIRSUFFIX} +cp -a security $PKG/$ARCH-installer-filesystem/lib${LIBDIRSUFFIX} + +# Copy PAM's config files: +cd $TMP/extract-packages/etc +cp -a pam.d $PKG/$ARCH-installer-filesystem/etc +( cd $PKG/$ARCH-installer-filesystem/etc/pam.d + for file in *.new ; do + mv $file $(basename $file .new) + done +) + # Grab a couple of terminus fonts that we'll need to prevent # blindness from microscopic KMS terminal fonts: cd $TMP/extract-packages/usr/share/kbd/consolefonts @@ -1216,6 +1230,7 @@ cp -fa${VERBOSE1} \ libkrb5support.so* \ liblzma*so* \ libmount.so* \ + libpam*.so* \ libpcre.so* \ libpopt*.so* \ libsmartcols.so* \ diff --git a/source/kde/build/calligra b/source/kde/build/calligra index 8f92bfdd4..7facc8993 100644 --- a/source/kde/build/calligra +++ b/source/kde/build/calligra @@ -1 +1 @@ -35 +36 diff --git a/source/kde/build/kde-workspace b/source/kde/build/kde-workspace index 1e8b31496..7f8f011eb 100644 --- a/source/kde/build/kde-workspace +++ b/source/kde/build/kde-workspace @@ -1 +1 @@ -6 +7 diff --git a/source/l/ConsoleKit2/ConsoleKit2.SlackBuild b/source/l/ConsoleKit2/ConsoleKit2.SlackBuild index bb0d80524..1c5c07a28 100755 --- a/source/l/ConsoleKit2/ConsoleKit2.SlackBuild +++ b/source/l/ConsoleKit2/ConsoleKit2.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ConsoleKit2 VERSION=${VERSION:-1.2.1} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Maximum storage quota for XDG_RUNTIME_DIR: XDG_RUNTIME_QUOTA=${XDG_RUNTIME_QUOTA:-size=100M} diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild index 0ed7d87f5..80d32a63e 100755 --- a/source/l/boost/boost.SlackBuild +++ b/source/l/boost/boost.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=boost VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d _)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} PKG_VERSION=$(echo $VERSION | tr _ .) # Leave this alone NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/gnome-keyring/gnome-keyring.SlackBuild b/source/l/gnome-keyring/gnome-keyring.SlackBuild index 3eaade879..ffda50439 100755 --- a/source/l/gnome-keyring/gnome-keyring.SlackBuild +++ b/source/l/gnome-keyring/gnome-keyring.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gnome-keyring VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/harfbuzz/harfbuzz.SlackBuild b/source/l/harfbuzz/harfbuzz.SlackBuild index 07d9ddaff..2f8ba30b0 100755 --- a/source/l/harfbuzz/harfbuzz.SlackBuild +++ b/source/l/harfbuzz/harfbuzz.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=harfbuzz 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/l/icu4c/icu4c.url b/source/l/icu4c/icu4c.url index 947519766..45fce69fe 100644 --- a/source/l/icu4c/icu4c.url +++ b/source/l/icu4c/icu4c.url @@ -1 +1 @@ -http://download.icu-project.org/files/icu4c +http://site.icu-project.org/download diff --git a/source/l/libcap/libcap.SlackBuild b/source/l/libcap/libcap.SlackBuild index d31535d35..6a0f45638 100755 --- a/source/l/libcap/libcap.SlackBuild +++ b/source/l/libcap/libcap.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libcap VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Building Go support is currently disabled until something actually needs it: GOSUPPORT=${GOSUPPORT:-no} diff --git a/source/l/libical/libical.SlackBuild b/source/l/libical/libical.SlackBuild index 9fea6a541..56d880002 100755 --- a/source/l/libical/libical.SlackBuild +++ b/source/l/libical/libical.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libical 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/l/libvisio/libvisio.SlackBuild b/source/l/libvisio/libvisio.SlackBuild index 7c07894ef..1e3caad9f 100755 --- a/source/l/libvisio/libvisio.SlackBuild +++ b/source/l/libvisio/libvisio.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libvisio VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/polkit/polkit.SlackBuild b/source/l/polkit/polkit.SlackBuild index 0a01494c9..6501e1f6f 100755 --- a/source/l/polkit/polkit.SlackBuild +++ b/source/l/polkit/polkit.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=polkit VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/qt/qt-nowebkit.SlackBuild b/source/l/qt/qt-nowebkit.SlackBuild index 1b72d99d1..b29a32a2c 100755 --- a/source/l/qt/qt-nowebkit.SlackBuild +++ b/source/l/qt/qt-nowebkit.SlackBuild @@ -43,7 +43,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt VERSION=$(ls qt-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BUILD=${BUILD:-15} +BUILD=${BUILD:-16} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/qt5-webkit/qt5-webkit.SlackBuild b/source/l/qt5-webkit/qt5-webkit.SlackBuild index c54430e77..db8fd9140 100755 --- a/source/l/qt5-webkit/qt5-webkit.SlackBuild +++ b/source/l/qt5-webkit/qt5-webkit.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=qt5-webkit SRCNAM=qtwebkit SRCVER=${SRCVER:-5.212.0-alpha4} VERSION=$(echo $SRCVER | tr - _) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/qt5/qt5.SlackBuild b/source/l/qt5/qt5.SlackBuild index 0821b2ae5..60f6bf8b4 100755 --- a/source/l/qt5/qt5.SlackBuild +++ b/source/l/qt5/qt5.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt5 VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} PKGSRC=$(echo $VERSION | cut -d - -f 1) PKGVER=$(echo $VERSION | tr - _) diff --git a/source/l/raptor2/raptor2.SlackBuild b/source/l/raptor2/raptor2.SlackBuild index 98b4a1aad..18cd705a5 100755 --- a/source/l/raptor2/raptor2.SlackBuild +++ b/source/l/raptor2/raptor2.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=raptor2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-8} +BUILD=${BUILD:-9} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/system-config-printer/system-config-printer.SlackBuild b/source/l/system-config-printer/system-config-printer.SlackBuild index 4153529ce..5fa4a72d3 100755 --- a/source/l/system-config-printer/system-config-printer.SlackBuild +++ b/source/l/system-config-printer/system-config-printer.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=system-config-printer VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/vte/vte.SlackBuild b/source/l/vte/vte.SlackBuild index 9937c9789..2b6d20762 100755 --- a/source/l/vte/vte.SlackBuild +++ b/source/l/vte/vte.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=vte 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/n/cifs-utils/cifs-utils.SlackBuild b/source/n/cifs-utils/cifs-utils.SlackBuild index dbf860edf..a8bcb035c 100755 --- a/source/n/cifs-utils/cifs-utils.SlackBuild +++ b/source/n/cifs-utils/cifs-utils.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cifs-utils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/cyrus-sasl/cyrus-sasl.SlackBuild b/source/n/cyrus-sasl/cyrus-sasl.SlackBuild index 0be565e26..8b355e00b 100755 --- a/source/n/cyrus-sasl/cyrus-sasl.SlackBuild +++ b/source/n/cyrus-sasl/cyrus-sasl.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cyrus-sasl VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -f 3- -d - | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/dovecot/dovecot.SlackBuild b/source/n/dovecot/dovecot.SlackBuild index 7993a195e..1c5dfaff9 100755 --- a/source/n/dovecot/dovecot.SlackBuild +++ b/source/n/dovecot/dovecot.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dovecot VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/n/netatalk/netatalk.SlackBuild b/source/n/netatalk/netatalk.SlackBuild index 7295fdd25..b5bfa85ef 100755 --- a/source/n/netatalk/netatalk.SlackBuild +++ b/source/n/netatalk/netatalk.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=netatalk VERSION=${VERSION:-$(echo netatalk-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/netkit-rsh/netkit-rsh.SlackBuild b/source/n/netkit-rsh/netkit-rsh.SlackBuild index d4f78e0a3..7152f7696 100755 --- a/source/n/netkit-rsh/netkit-rsh.SlackBuild +++ b/source/n/netkit-rsh/netkit-rsh.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=netkit-rsh VERSION=0.17 -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/testing/source/PAM/n/nss-pam-ldapd/1025d5de336d8c9585b79df3154b5649da344281.patch b/source/n/nss-pam-ldapd/1025d5de336d8c9585b79df3154b5649da344281.patch index b21ab09ee..b21ab09ee 100644 --- a/testing/source/PAM/n/nss-pam-ldapd/1025d5de336d8c9585b79df3154b5649da344281.patch +++ b/source/n/nss-pam-ldapd/1025d5de336d8c9585b79df3154b5649da344281.patch diff --git a/testing/source/PAM/n/nss-pam-ldapd/548efe5333b56a0a042843a044e0348317f80065.patch b/source/n/nss-pam-ldapd/548efe5333b56a0a042843a044e0348317f80065.patch index d03f1552d..d03f1552d 100644 --- a/testing/source/PAM/n/nss-pam-ldapd/548efe5333b56a0a042843a044e0348317f80065.patch +++ b/source/n/nss-pam-ldapd/548efe5333b56a0a042843a044e0348317f80065.patch diff --git a/testing/source/PAM/n/nss-pam-ldapd/b33551895b3c02dc7082363c6aae13f8e336f4e5.patch b/source/n/nss-pam-ldapd/b33551895b3c02dc7082363c6aae13f8e336f4e5.patch index 127243e0e..127243e0e 100644 --- a/testing/source/PAM/n/nss-pam-ldapd/b33551895b3c02dc7082363c6aae13f8e336f4e5.patch +++ b/source/n/nss-pam-ldapd/b33551895b3c02dc7082363c6aae13f8e336f4e5.patch diff --git a/testing/source/PAM/n/nss-pam-ldapd/doinst.sh b/source/n/nss-pam-ldapd/doinst.sh index d483abce2..d483abce2 100644 --- a/testing/source/PAM/n/nss-pam-ldapd/doinst.sh +++ b/source/n/nss-pam-ldapd/doinst.sh diff --git a/testing/source/PAM/n/nss-pam-ldapd/fea0f5ed287b04406afca0835b1a333bd1fe617b.patch b/source/n/nss-pam-ldapd/fea0f5ed287b04406afca0835b1a333bd1fe617b.patch index 13b0ace7f..13b0ace7f 100644 --- a/testing/source/PAM/n/nss-pam-ldapd/fea0f5ed287b04406afca0835b1a333bd1fe617b.patch +++ b/source/n/nss-pam-ldapd/fea0f5ed287b04406afca0835b1a333bd1fe617b.patch diff --git a/testing/source/PAM/n/nss-pam-ldapd/nss-pam-ldapd.SlackBuild b/source/n/nss-pam-ldapd/nss-pam-ldapd.SlackBuild index 204e96030..204e96030 100755 --- a/testing/source/PAM/n/nss-pam-ldapd/nss-pam-ldapd.SlackBuild +++ b/source/n/nss-pam-ldapd/nss-pam-ldapd.SlackBuild diff --git a/testing/source/PAM/n/nss-pam-ldapd/nss-pam-ldapd.url b/source/n/nss-pam-ldapd/nss-pam-ldapd.url index 2644c0ebd..2644c0ebd 100644 --- a/testing/source/PAM/n/nss-pam-ldapd/nss-pam-ldapd.url +++ b/source/n/nss-pam-ldapd/nss-pam-ldapd.url diff --git a/testing/source/PAM/n/nss-pam-ldapd/rc.nss-pam-ldapd b/source/n/nss-pam-ldapd/rc.nss-pam-ldapd index 7a4252a38..7a4252a38 100644 --- a/testing/source/PAM/n/nss-pam-ldapd/rc.nss-pam-ldapd +++ b/source/n/nss-pam-ldapd/rc.nss-pam-ldapd diff --git a/testing/source/PAM/n/nss-pam-ldapd/slack-desc b/source/n/nss-pam-ldapd/slack-desc index fed065b20..fed065b20 100644 --- a/testing/source/PAM/n/nss-pam-ldapd/slack-desc +++ b/source/n/nss-pam-ldapd/slack-desc diff --git a/source/n/openssh/openssh.SlackBuild b/source/n/openssh/openssh.SlackBuild index 3a423c91f..9465bbb7a 100755 --- a/source/n/openssh/openssh.SlackBuild +++ b/source/n/openssh/openssh.SlackBuild @@ -30,7 +30,7 @@ PKG=$TMP/package-openssh PKGNAM=openssh VERSION=${VERSION:-$(echo openssh-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/n/openvpn/openvpn.SlackBuild b/source/n/openvpn/openvpn.SlackBuild index 21406b8b4..7390d1d64 100755 --- a/source/n/openvpn/openvpn.SlackBuild +++ b/source/n/openvpn/openvpn.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=openvpn 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/testing/source/PAM/n/pam-krb5/pam-krb5.SlackBuild b/source/n/pam-krb5/pam-krb5.SlackBuild index e2ba9a036..e2ba9a036 100755 --- a/testing/source/PAM/n/pam-krb5/pam-krb5.SlackBuild +++ b/source/n/pam-krb5/pam-krb5.SlackBuild diff --git a/testing/source/PAM/n/pam-krb5/pam-krb5.url b/source/n/pam-krb5/pam-krb5.url index 08a19c593..08a19c593 100644 --- a/testing/source/PAM/n/pam-krb5/pam-krb5.url +++ b/source/n/pam-krb5/pam-krb5.url diff --git a/testing/source/PAM/n/pam-krb5/slack-desc b/source/n/pam-krb5/slack-desc index 1cbb0356d..1cbb0356d 100644 --- a/testing/source/PAM/n/pam-krb5/slack-desc +++ b/source/n/pam-krb5/slack-desc diff --git a/testing/source/PAM/n/pam-krb5/system-auth.krb5 b/source/n/pam-krb5/system-auth.krb5 index 04fa299be..04fa299be 100644 --- a/testing/source/PAM/n/pam-krb5/system-auth.krb5 +++ b/source/n/pam-krb5/system-auth.krb5 diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild index 2205ffe65..097ea470c 100755 --- a/source/n/php/php.SlackBuild +++ b/source/n/php/php.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=php VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} ALPINE=2.22 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/popa3d/popa3d.SlackBuild b/source/n/popa3d/popa3d.SlackBuild index 511b8aa98..8dd9422ca 100755 --- a/source/n/popa3d/popa3d.SlackBuild +++ b/source/n/popa3d/popa3d.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=popa3d VERSION=1.0.3 -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/ppp/ppp.SlackBuild b/source/n/ppp/ppp.SlackBuild index c4f4f5566..2b2ba60ec 100755 --- a/source/n/ppp/ppp.SlackBuild +++ b/source/n/ppp/ppp.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=ppp VERSION=2.4.8 RADVER=1.1.7 PPPVER=1.98 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/n/proftpd/proftpd.SlackBuild b/source/n/proftpd/proftpd.SlackBuild index 2d436ceaf..53eba37b1 100755 --- a/source/n/proftpd/proftpd.SlackBuild +++ b/source/n/proftpd/proftpd.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=proftpd VERSION=1.3.6c DIRVER=1.3.6c -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild index 854483e34..8c09f50cf 100755 --- a/source/n/samba/samba.SlackBuild +++ b/source/n/samba/samba.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=samba VERSION=${VERSION:-$(echo samba-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -e $CWD/machine.conf ]; then . $CWD/machine.conf ] diff --git a/source/n/tin/tin.SlackBuild b/source/n/tin/tin.SlackBuild index 53e983eeb..0fa8b83c6 100755 --- a/source/n/tin/tin.SlackBuild +++ b/source/n/tin/tin.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=tin VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | 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/n/vsftpd/vsftpd.SlackBuild b/source/n/vsftpd/vsftpd.SlackBuild index 2f7f12094..91af9cbe8 100755 --- a/source/n/vsftpd/vsftpd.SlackBuild +++ b/source/n/vsftpd/vsftpd.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=vsftpd VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/t/texlive/texlive.SlackBuild b/source/t/texlive/texlive.SlackBuild index a6eaf8f1f..92e1f9085 100755 --- a/source/t/texlive/texlive.SlackBuild +++ b/source/t/texlive/texlive.SlackBuild @@ -33,7 +33,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=texlive SOURCEVERSION=${SOURCEVERSION:-20190410} VERSION=${VERSION:-2019.190626} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TMP=${TMP:-/tmp} PKG=$TMP/package-texlive diff --git a/source/x/vulkan-sdk/fetch-sources.sh b/source/x/vulkan-sdk/fetch-sources.sh index 8d557bbe6..daa83a632 100755 --- a/source/x/vulkan-sdk/fetch-sources.sh +++ b/source/x/vulkan-sdk/fetch-sources.sh @@ -27,8 +27,8 @@ # # Example: VERSION=1.1.92.1 ./fetch-sources.sh -VERSION=${VERSION:-1.2.131.2} -BRANCH=${BRANCH:-sdk-1.2.131} +VERSION=${VERSION:-1.2.135.0} +BRANCH=${BRANCH:-sdk-1.2.135} rm -rf Vulkan-*-*.tar.?z glslang* SPIRV-Tools* SPIRV-Headers* \ Vulkan-Headers-sdk-${VERSION}* \ diff --git a/source/x/x11/build/xdm b/source/x/x11/build/xdm index ec635144f..f599e28b8 100644 --- a/source/x/x11/build/xdm +++ b/source/x/x11/build/xdm @@ -1 +1 @@ -9 +10 diff --git a/source/x/x11/build/xisxwayland b/source/x/x11/build/xisxwayland new file mode 100644 index 000000000..d00491fd7 --- /dev/null +++ b/source/x/x11/build/xisxwayland @@ -0,0 +1 @@ +1 diff --git a/source/x/x11/configure/xisxwayland b/source/x/x11/configure/xisxwayland new file mode 100644 index 000000000..cd149401c --- /dev/null +++ b/source/x/x11/configure/xisxwayland @@ -0,0 +1,17 @@ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir build +cd build +meson setup \ + --prefix=/usr \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir /usr/libexec \ + --bindir /usr/bin \ + --sbindir /usr/sbin \ + --includedir /usr/include \ + --datadir /usr/share \ + --mandir /usr/man \ + --sysconfdir /etc \ + --localstatedir /var \ + --buildtype=release \ + .. || exit 1 diff --git a/source/x/x11/make/xisxwayland b/source/x/x11/make/xisxwayland new file mode 100644 index 000000000..b22bc0de1 --- /dev/null +++ b/source/x/x11/make/xisxwayland @@ -0,0 +1,6 @@ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +cd build + ninja || exit 1 + DESTDIR=$PKG ninja install || exit 1 +cd .. diff --git a/source/x/x11/modularize b/source/x/x11/modularize index 94d7fe7c3..077288f2b 100644 --- a/source/x/x11/modularize +++ b/source/x/x11/modularize @@ -233,6 +233,7 @@ xhost xineramaproto xinit xinput +xisxwayland xkbcomp xkbevd xkbprint diff --git a/source/x/x11/slack-desc/xisxwayland b/source/x/x11/slack-desc/xisxwayland new file mode 100644 index 000000000..b155cfe5a --- /dev/null +++ b/source/x/x11/slack-desc/xisxwayland @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# 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 +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xisxwayland: xisxwayland (determine if Xwayland is in use) +xisxwayland: +xisxwayland: xisxwayland is a tool to be used within shell scripts to determine +xisxwayland: whether the X server in use is Xwayland. It exits with status 0 if +xisxwayland: the server is an Xwayland server and 1 otherwise. Any error results +xisxwayland: in an exit code of 3. +xisxwayland: +xisxwayland: +xisxwayland: +xisxwayland: +xisxwayland: diff --git a/source/xap/sane/sane.SlackBuild b/source/xap/sane/sane.SlackBuild index 301ec1b67..641a50c19 100755 --- a/source/xap/sane/sane.SlackBuild +++ b/source/xap/sane/sane.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2018, 2019 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2018, 2019, 2020 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sane -VERSION=1.0.29 -BACKVER=1.0.29 +VERSION=1.0.30 +BACKVER=1.0.30 FRONTVER=1.0.14 BUILD=${BUILD:-1} @@ -120,6 +120,14 @@ cat tools/udev/libsane.rules \ install -D -m644 tools/sane-backends.pc \ $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/sane-backends.pc +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + # Now let's build the frontends: cd $TMP rm -rf sane-frontends-$FRONTVER @@ -182,10 +190,12 @@ if [ -d $PKG/usr/man ]; then ) fi +# Do not include ancient ChangeLogs: +rm -rf $PKG/usr/doc/${PKGNAM}-$VERSION/ChangeLogs + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/sane-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/xap/sane/sane.url b/source/xap/sane/sane.url new file mode 100644 index 000000000..a5d74eaa5 --- /dev/null +++ b/source/xap/sane/sane.url @@ -0,0 +1 @@ +http://www.sane-project.org/source.html diff --git a/source/xap/sane/slack-desc b/source/xap/sane/slack-desc index 44ef6348e..b123e8bfd 100644 --- a/source/xap/sane/slack-desc +++ b/source/xap/sane/slack-desc @@ -13,7 +13,7 @@ sane: access to any raster image scanner hardware, such as flatbed scanners, sane: hand-held scanners, video and still cameras, frame-grabbers, and other sane: similar devices. sane: -sane: +sane: Homepage: http://www.sane-project.org sane: sane: sane: diff --git a/source/xap/xlockmore/xlockmore.SlackBuild b/source/xap/xlockmore/xlockmore.SlackBuild index 25322d6c6..68d9e2984 100755 --- a/source/xap/xlockmore/xlockmore.SlackBuild +++ b/source/xap/xlockmore/xlockmore.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xlockmore VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | 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/xap/xscreensaver/xscreensaver.SlackBuild b/source/xap/xscreensaver/xscreensaver.SlackBuild index cb9c10cdb..5fbbcd92e 100755 --- a/source/xap/xscreensaver/xscreensaver.SlackBuild +++ b/source/xap/xscreensaver/xscreensaver.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xscreensaver VERSION=${VERSION:-$(echo xscreensaver-*.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 |