summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-01-06 20:03:14 +0000
committerEric Hameleers <alien@slackware.com>2019-01-07 08:59:45 +0100
commit4cc8e8065bec7cf7f1dfc8a8806a02075fa3c0f7 (patch)
tree4788dd7df9ff468a23062e5011fef8e735a46f26 /source
parent29982cb6ad8ed85e9ec2dc4b74f02b3f10b89d6a (diff)
downloadcurrent-4cc8e8065bec7cf7f1dfc8a8806a02075fa3c0f7.tar.gz
Sun Jan 6 20:03:14 UTC 201920190106200314
a/ncompress-4.2.4.5-x86_64-1.txz: Upgraded. ap/man-db-2.8.5-x86_64-1.txz: Upgraded. Added /etc/profile.d/man-db.{csh,sh} to pick a MANPAGER (defaults to 'most'). ap/powertop-2.10-x86_64-1.txz: Upgraded. d/scons-3.0.2-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/ncompress/ncompress.SlackBuild4
-rw-r--r--source/a/ncompress/ncompress.url1
-rw-r--r--source/ap/man-db/doinst.sh2
-rwxr-xr-xsource/ap/man-db/man-db.SlackBuild10
-rw-r--r--source/ap/man-db/man-db.csh5
-rw-r--r--source/ap/man-db/man-db.sh5
-rwxr-xr-xsource/ap/powertop/powertop.SlackBuild6
-rwxr-xr-xsource/d/scons/scons.SlackBuild2
-rw-r--r--source/installer/ChangeLog.txt4
-rwxr-xr-xsource/installer/sources/initrd/usr/lib/setup/SeTkernel15
10 files changed, 43 insertions, 11 deletions
diff --git a/source/a/ncompress/ncompress.SlackBuild b/source/a/ncompress/ncompress.SlackBuild
index 779641e6..cbd0dc93 100755
--- a/source/a/ncompress/ncompress.SlackBuild
+++ b/source/a/ncompress/ncompress.SlackBuild
@@ -23,8 +23,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=ncompress
-VERSION=4.2.4.4
-BUILD=${BUILD:-2}
+VERSION=4.2.4.5
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/a/ncompress/ncompress.url b/source/a/ncompress/ncompress.url
new file mode 100644
index 00000000..01d77998
--- /dev/null
+++ b/source/a/ncompress/ncompress.url
@@ -0,0 +1 @@
+https://github.com/vapier/ncompress
diff --git a/source/ap/man-db/doinst.sh b/source/ap/man-db/doinst.sh
index ed31b561..1c12bc80 100644
--- a/source/ap/man-db/doinst.sh
+++ b/source/ap/man-db/doinst.sh
@@ -12,6 +12,8 @@ config() {
# Otherwise, we leave the .new copy for the admin to consider...
}
config etc/man_db.conf.new
+config etc/profile.d/man-db.csh.new
+config etc/profile.d/man-db.sh.new
# Slackware change: commenting the stuff below out. We're not going to
# generate a database during a package installation... especially since
diff --git a/source/ap/man-db/man-db.SlackBuild b/source/ap/man-db/man-db.SlackBuild
index 4d8d4bf1..7a5e24dd 100755
--- a/source/ap/man-db/man-db.SlackBuild
+++ b/source/ap/man-db/man-db.SlackBuild
@@ -8,7 +8,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=man-db
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
MAN2HTML=${MAN2HTML:-20180101}
@@ -232,6 +232,14 @@ mkdir -p $PKG/var/cache/man
mkdir -p $PKG/etc/cron.daily
install -m0755 -oroot -groot $CWD/$PKGNAM.cron $PKG/etc/cron.daily/$PKGNAM
+# Choose a pager (defaults to 'most'):
+mkdir -p $PKG/etc/profile.d
+cp -a $CWD/man-db.sh $CWD/man-db.csh $PKG/etc/profile.d
+chown root:root $PKG/etc/profile.d/*
+chmod 755 $PKG/etc/profile.d/*
+mv $PKG/etc/profile.d/man-db.csh $PKG/etc/profile.d/man-db.csh.new
+mv $PKG/etc/profile.d/man-db.sh $PKG/etc/profile.d/man-db.sh.new
+
# modified default config, customized for Slackware. See the conf file for
# list of changes.
cat $CWD/man_db.conf.new \
diff --git a/source/ap/man-db/man-db.csh b/source/ap/man-db/man-db.csh
new file mode 100644
index 00000000..1759e237
--- /dev/null
+++ b/source/ap/man-db/man-db.csh
@@ -0,0 +1,5 @@
+#!/bin/csh
+# Choose a default for the system's manual pager:
+#setenv MANPAGER less
+#setenv MANPAGER more
+setenv MANPAGER most
diff --git a/source/ap/man-db/man-db.sh b/source/ap/man-db/man-db.sh
new file mode 100644
index 00000000..d3d9f0d0
--- /dev/null
+++ b/source/ap/man-db/man-db.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+# Choose a default for the system's manual pager:
+#export MANPAGER=less
+#export MANPAGER=more
+export MANPAGER=most
diff --git a/source/ap/powertop/powertop.SlackBuild b/source/ap/powertop/powertop.SlackBuild
index 3fc2904c..94c63640 100755
--- a/source/ap/powertop/powertop.SlackBuild
+++ b/source/ap/powertop/powertop.SlackBuild
@@ -28,7 +28,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=powertop
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev | tr -d 'v')}
BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
@@ -72,8 +72,8 @@ fi
cd $TMP
rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
-cd ${PKGNAM}-$VERSION || exit 1
+tar xvf $CWD/${PKGNAM}-v$VERSION.tar.?z || tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
+cd ${PKGNAM}-v$VERSION || ${PKGNAM}-v$VERSION || exit 1
# Make sure ownerships and permissions are sane:
chown -R root:root .
diff --git a/source/d/scons/scons.SlackBuild b/source/d/scons/scons.SlackBuild
index 68787861..88bd1ebb 100755
--- a/source/d/scons/scons.SlackBuild
+++ b/source/d/scons/scons.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=scons
VERSION=${VERSION:-$(echo scons-*.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/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index d45c552e..b14c77e4 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,7 @@
+Sun Jan 6 19:54:10 UTC 2019
+ Account for .x64 suffix on /boot/config-* files with x86_64 when installing
+ the config files and /boot/config symlink. Thanks to Edward Grattan.
++--------------------------+
Wed Nov 28 05:31:04 UTC 2018
Activate LVM volumes at boot, not only when setup is run.
Make /etc/mtab a symlink to /proc/mounts on the installer.
diff --git a/source/installer/sources/initrd/usr/lib/setup/SeTkernel b/source/installer/sources/initrd/usr/lib/setup/SeTkernel
index 6aa3091b..9def33c8 100755
--- a/source/installer/sources/initrd/usr/lib/setup/SeTkernel
+++ b/source/installer/sources/initrd/usr/lib/setup/SeTkernel
@@ -42,17 +42,24 @@ to continue." \
fi
}
+# Determine if we need the .x64 suffix for x86_64 config files:
+if [ "$(uname -m)" = "x86_64" ]; then
+ CONFIGSUFFIX=".x64"
+else
+ unset CONFIGSUFFIX
+fi
+
( cd boot
if [ "$SLACK_KERNEL" = "generic.s" ]; then
if [ -r vmlinuz-generic-$VERSION ]; then
ln -sf vmlinuz-generic-$VERSION vmlinuz
- ln -sf config-generic-$VERSION config
+ ln -sf config-generic-${VERSION}${CONFIGSUFFIX} config
ln -sf System.map-huge-$VERSION System.map
fi
elif [ "$SLACK_KERNEL" = "huge.s" ]; then
if [ -r vmlinuz-huge-$VERSION ]; then
ln -sf vmlinuz-huge-$VERSION vmlinuz
- ln -sf config-huge-$VERSION config
+ ln -sf config-huge-${VERSION}${CONFIGSUFFIX} config
ln -sf System.map-huge-$VERSION System.map
fi
elif [ "$SLACK_KERNEL" = "hugesmp.s" ]; then
@@ -86,13 +93,13 @@ before your system will be able to boot correctly." \
else
rm -f $T_PX/boot/vmlinuz $T_PX/boot/config $T_PX/boot/System.map
cp -a /$PLINK/kernels/$SLACK_KERNEL/bzImage $T_PX/boot/vmlinuz-$SLACK_KERNEL-$VERSION
- cp -a /$PLINK/kernels/$SLACK_KERNEL/config $T_PX/boot/config-$SLACK_KERNEL-$VERSION
+ cp -a /$PLINK/kernels/$SLACK_KERNEL/config $T_PX/boot/config-$SLACK_KERNEL-${VERSION}${CONFIGSUFFIX}
cp -a /$PLINK/kernels/$SLACK_KERNEL/System.map.gz $T_PX/boot
( cd $T_PX/boot
gzip -d System.map.gz
mv System.map System.map-$SLACK_KERNEL-$VERSION
ln -sf vmlinuz-$SLACK_KERNEL-$VERSION vmlinuz
- ln -sf config-$SLACK_KERNEL-$VERSION config
+ ln -sf config-$SLACK_KERNEL-${VERSION}${CONFIGSUFFIX} config
ln -sf System.map-$SLACK_KERNEL-$VERSION System.map
)
fi