summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/util-linux/util-linux.SlackBuild3
-rw-r--r--source/n/alpine/doinst.sh.alpine2
-rwxr-xr-xsource/n/ca-certificates/ca-certificates.SlackBuild4
-rw-r--r--source/n/ca-certificates/certdata-20211005.txt (renamed from source/n/ca-certificates/certdata-20210924.txt)0
-rw-r--r--source/n/ca-certificates/doinst.sh6
5 files changed, 10 insertions, 5 deletions
diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild
index 033aa9ab6..7a552e0eb 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:-3}
+BUILD=${BUILD:-4}
ADJTIMEXVERS=1.29
SETSERIALVERS=2.17
@@ -195,6 +195,7 @@ rm $PKG/sbin/nologin $PKG/usr/man/man8/nologin.8 $PKG/sbin/sulogin $PKG/usr/man/
if [ "$SHIP_SU" = "NO" ]; then
rm -f $PKG/bin/su
rm -f $PKG/usr/man/man1/su.1
+ rm -f $PKG/usr/share/bash-completion/completions/runuser
rm -f $PKG/usr/share/bash-completion/completions/su
fi
diff --git a/source/n/alpine/doinst.sh.alpine b/source/n/alpine/doinst.sh.alpine
index 3a3694854..80660f873 100644
--- a/source/n/alpine/doinst.sh.alpine
+++ b/source/n/alpine/doinst.sh.alpine
@@ -13,6 +13,6 @@ config() {
config etc/pine.conf.new
# Prevent sticker shock
-if [ ! -e /usr/bin/pine ]; then
+if [ ! -e usr/bin/pine ]; then
( cd usr/bin ; ln -sf alpine pine )
fi
diff --git a/source/n/ca-certificates/ca-certificates.SlackBuild b/source/n/ca-certificates/ca-certificates.SlackBuild
index 752e56c06..6e06613ac 100755
--- a/source/n/ca-certificates/ca-certificates.SlackBuild
+++ b/source/n/ca-certificates/ca-certificates.SlackBuild
@@ -82,10 +82,10 @@ fi
mkdir -p $PKG/etc/ca-certificates/update.d
printf "# Automatically generated by $PKGNAM-$VERSION \n#\n" \
- > $PKG/etc/ca-certificates.conf.new
+ > $PKG/etc/ca-certificates.conf
( cd $PKG/usr/share/ca-certificates
find . -name '*.crt' | sort | cut -b3-
-) >> $PKG/etc/ca-certificates.conf.new
+) >> $PKG/etc/ca-certificates.conf
mkdir -p $PKG/usr/man/man8
gzip -9c sbin/update-ca-certificates.8 > \
diff --git a/source/n/ca-certificates/certdata-20210924.txt b/source/n/ca-certificates/certdata-20211005.txt
index dfaeceb89..dfaeceb89 100644
--- a/source/n/ca-certificates/certdata-20210924.txt
+++ b/source/n/ca-certificates/certdata-20211005.txt
diff --git a/source/n/ca-certificates/doinst.sh b/source/n/ca-certificates/doinst.sh
index cfd7d795e..9e50c5598 100644
--- a/source/n/ca-certificates/doinst.sh
+++ b/source/n/ca-certificates/doinst.sh
@@ -11,7 +11,11 @@ config() {
# Otherwise, we leave the .new copy for the admin to consider...
}
-config etc/ca-certificates.conf.new
+# Actually, with this being auto-generated and strongly tied to the
+# filelist in this package, it's not a good idea to try to preserve
+# this config file. For local certs, simply install them in the
+# /usr/local/share/ca-certificates directory.
+#config etc/ca-certificates.conf.new
if [ -x /usr/sbin/update-ca-certificates ]; then
/usr/sbin/update-ca-certificates --fresh 1> /dev/null 2> /dev/null