diff options
Diffstat (limited to 'source')
-rwxr-xr-x | source/ap/vim/vim-gvim.SlackBuild | 2 | ||||
-rwxr-xr-x | source/ap/vim/vim.SlackBuild | 2 | ||||
-rw-r--r-- | source/installer/ChangeLog.txt | 7 | ||||
-rwxr-xr-x | source/installer/build_installer.sh | 10 | ||||
-rwxr-xr-x | source/installer/sources/initrd/etc/rc.d/rc.S | 4 | ||||
-rwxr-xr-x | source/l/poppler/poppler.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/ncftp/ncftp.SlackBuild | 2 | ||||
-rw-r--r-- | source/n/ncftp/slack-desc | 2 |
8 files changed, 17 insertions, 14 deletions
diff --git a/source/ap/vim/vim-gvim.SlackBuild b/source/ap/vim/vim-gvim.SlackBuild index de12fbad2..3e0b94778 100755 --- a/source/ap/vim/vim-gvim.SlackBuild +++ b/source/ap/vim/vim-gvim.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=vim-gvim -VIMBRANCH=9.0 +VIMBRANCH=9.1 VERSION=$(echo vim-${VIMBRANCH}*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) BUILD=${BUILD:-1} diff --git a/source/ap/vim/vim.SlackBuild b/source/ap/vim/vim.SlackBuild index b0d569096..76ec2f06f 100755 --- a/source/ap/vim/vim.SlackBuild +++ b/source/ap/vim/vim.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=vim -VIMBRANCH=9.0 +VIMBRANCH=9.1 CTAGSVER=5.8 BUILD=${BUILD:-1} diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index f6715af36..600af2d24 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,10 @@ +Tue Jan 2 09:03:56 UTC 2024 + build_installer.sh: Switch /sbin/modinfo from BusyBox's implementation to + kmod's, as the busybox implementation doesn't work. + Switch /bin/grep to the GNU implementation for a richer feature set. + Use the /bin/{e,f}grep shell wrappers, aligned with the OS. + /etc/rc.d/rc.S: Call /bin/grep rather than /bin/grep.bin ++--------------------------+ Mon Dec 11 20:24:00 UTC 2023 build_installer.sh: On x86, don't try to use a kernel with an -smp LOCALVERSION as it's no longer built. The regularly-named kernels are now diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh index 8c4588382..86e580a02 100755 --- a/source/installer/build_installer.sh +++ b/source/installer/build_installer.sh @@ -1,9 +1,7 @@ #!/bin/bash set +o posix -# $Id: build_installer.sh,v 1.129 2011/04/13 23:03:07 eha Exp eha $ -# -# Copyright 2005-2023 Stuart Winter, Surrey, England, UK +# Copyright 2005-2024 Stuart Winter, Surrey, England, UK # Copyright 2008, 2009, 2010, 2011, 2017 Eric Hameleers, Eindhoven, Netherlands # Copyright 2011-2020 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. @@ -587,9 +585,6 @@ rm -rf $TMP/extract-packages # Re-create essential symlinks ln -sf sbin/init init -( cd bin; ln -sf grep.bin grep ) -( cd bin; ln -sf grep.bin egrep ) -( cd bin; ln -sf grep.bin fgrep ) ( cd bin; ln -sf gzip zcat ) ( cd bin; ln -sf /usr/bin/compress compress ) ( cd usr/bin; ln -sf ../../bin/gzip zcat ) @@ -1065,6 +1060,7 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_BIN} \ dircolors \ findmnt \ gzip \ + grep egrep fgrep pgrep \ ipmask \ ls \ lsblk \ @@ -1086,7 +1082,6 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_BIN} \ $(readlink -s setterm 1>/dev/null) || \ cp --remove-destination -fa${VERBOSE1} setterm \ $PKG/$ARCH-installer-filesystem/bin/ -cp --remove-destination -fa${VERBOSE1} grep $PKG/$ARCH-installer-filesystem/bin/grep.bin cd $TMP/extract-packages/usr/bin cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_USRBIN} \ bash \ @@ -1163,6 +1158,7 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_SBIN} \ mkfs.* \ mklost+found \ mkswap \ + modinfo \ modprobe \ mount \ mdadm \ diff --git a/source/installer/sources/initrd/etc/rc.d/rc.S b/source/installer/sources/initrd/etc/rc.d/rc.S index dec350d0a..0e69d7349 100755 --- a/source/installer/sources/initrd/etc/rc.d/rc.S +++ b/source/installer/sources/initrd/etc/rc.d/rc.S @@ -20,8 +20,8 @@ fi # Note: this does not configure the OS root password. # Passwords should be set as follows within the Kernel cmdline: # instrootpw=yourpassword -if grep.bin -qoP 'instrootpw=\K\S+' /proc/cmdline ; then - /bin/echo "root:$( grep.bin -oP 'instrootpw=\K\S+' /proc/cmdline )" | /bin/busybox chpasswd +if grep -qoP 'instrootpw=\K\S+' /proc/cmdline ; then + /bin/echo "root:$( grep -oP 'instrootpw=\K\S+' /proc/cmdline )" | /bin/busybox chpasswd fi # Activate swap: diff --git a/source/l/poppler/poppler.SlackBuild b/source/l/poppler/poppler.SlackBuild index 11cd7abf9..3778b048e 100755 --- a/source/l/poppler/poppler.SlackBuild +++ b/source/l/poppler/poppler.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=poppler VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} QT6OPT=${QT6OPT:--DENABLE_QT6=OFF} # Automatically determine the architecture we're building on: diff --git a/source/n/ncftp/ncftp.SlackBuild b/source/n/ncftp/ncftp.SlackBuild index 935e16a00..a749c0eb2 100755 --- a/source/n/ncftp/ncftp.SlackBuild +++ b/source/n/ncftp/ncftp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ncftp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 2 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/ncftp/slack-desc b/source/n/ncftp/slack-desc index ca35f9bd6..c13a7b2bc 100644 --- a/source/n/ncftp/slack-desc +++ b/source/n/ncftp/slack-desc @@ -13,7 +13,7 @@ ncftp: Protocol. This program allows a user to transfer files to and from a ncftp: remote network site, and offers additional features that are not found ncftp: in the standard interface for ftp. ncftp: -ncftp: Homepage: http://www.ncftp.com/ncftp/ +ncftp: Homepage: https://www.ncftp.com/ ncftp: ncftp: ncftp: |