From bea4af160dc640549e07144b9a0dddf09b569861 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 13 Feb 2020 20:17:58 +0000 Subject: Thu Feb 13 20:17:58 UTC 2020 a/sysvinit-scripts-2.1-noarch-29.txz: Rebuilt. rc.S: make /var/run a bind mount to /run. Thanks to Robby Workman. rc.S: make a few adjustments to temporary file cleanup. rc.M: drop additional checks on starting rc.syslog. a/util-linux-2.35.1-x86_64-2.txz: Rebuilt. d/bison-3.5.2-x86_64-1.txz: Upgraded. l/pcre-8.44-x86_64-1.txz: Upgraded. l/sdl-1.2.15-x86_64-9.txz: Rebuilt. Replaced missing SDL_ttf docs. Thanks to Stuart Winter. n/krb5-1.18-x86_64-1.txz: Upgraded. x/mesa-19.3.4-x86_64-1.txz: Upgraded. testing/packages/PAM/util-linux-2.35.1-x86_64-2_pam.txz: Rebuilt. Added /etc/default/su containing 'ALWAYS_SET_PATH yes' to ensure that ENV_SUPATH from /etc/login.defs is used for the $PATH with plain 'su'. --- source/a/sysvinit-scripts/scripts/rc.M | 2 +- source/a/sysvinit-scripts/scripts/rc.S | 13 ++++++++----- source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild | 2 +- source/a/util-linux/doinst.sh | 3 +++ source/a/util-linux/su.default | 3 +++ source/a/util-linux/util-linux.SlackBuild | 7 ++++++- source/l/pcre/pcre.url | 3 ++- source/l/pcre/slack-desc | 2 +- source/l/qt/slack-desc | 0 source/l/sdl/sdl.SlackBuild | 8 ++++++-- 10 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 source/a/util-linux/su.default mode change 100755 => 100644 source/l/qt/slack-desc (limited to 'source') diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M index cfffb8ec4..c0424ebe9 100644 --- a/source/a/sysvinit-scripts/scripts/rc.M +++ b/source/a/sysvinit-scripts/scripts/rc.M @@ -75,7 +75,7 @@ if [ -x /etc/rc.d/rc.pcmcia ]; then fi # Start the system logger. -if [ -x /etc/rc.d/rc.syslog -a -x /usr/sbin/syslogd -a -d /var/log ]; then +if [ -x /etc/rc.d/rc.syslog ]; then /etc/rc.d/rc.syslog start fi diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S index 4162938f3..eb1765e10 100644 --- a/source/a/sysvinit-scripts/scripts/rc.S +++ b/source/a/sysvinit-scripts/scripts/rc.S @@ -367,6 +367,11 @@ else /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep " ${dev} " ; done fi +# This should be empty as it's just a mountpoint now: +rm -rf /var/run/* +# Bind mount /run to /var/run: +mount -o bind /run /var/run + # Enable swapping again. This is needed in case a swapfile is used, # as it can't be enabled until the filesystem it resides on has been # mounted read-write. @@ -384,16 +389,14 @@ if [ -x /etc/rc.d/rc.cgconfig -a -x /etc/rc.d/rc.cgred -a -d /sys/fs/cgroup ]; t fi # Clean up some temporary files: -rm -f /var/run/* /var/run/*/* /var/run/*/*/* /etc/nologin \ - /etc/dhcpc/*.pid /etc/forcefsck /etc/fastboot \ - /var/state/saslauthd/saslauthd.pid \ - /tmp/.Xauth* 1> /dev/null 2> /dev/null +rm -f /etc/nologin /etc/dhcpc/*.pid /etc/forcefsck /etc/fastboot \ + /var/state/saslauthd/saslauthd.pid /tmp/.Xauth* 1> /dev/null 2> /dev/null +rm -rf /tmp/{kde-[a-zA-Z]*,ksocket-[a-zA-Z]*,hsperfdata_[a-zA-Z]*,plugtmp*} if [ -d /var/lib/pkgtools/setup/tmp ]; then ( cd /var/lib/pkgtools/setup/tmp && rm -rf * ) elif [ -d /var/log/setup/tmp ]; then ( cd /var/log/setup/tmp && rm -rf * ) fi -( cd /tmp && rm -rf kde-[a-zA-Z]* ksocket-[a-zA-Z]* hsperfdata_[a-zA-Z]* plugtmp* ) # Clear /var/lock/subsys: if [ -d /var/lock/subsys ]; then diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild index 67beccea7..d3537dab4 100755 --- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild +++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sysvinit-scripts VERSION=${VERSION:-2.1} ARCH=noarch -BUILD=${BUILD:-28} +BUILD=${BUILD:-29} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information diff --git a/source/a/util-linux/doinst.sh b/source/a/util-linux/doinst.sh index f3010148b..da24e7435 100644 --- a/source/a/util-linux/doinst.sh +++ b/source/a/util-linux/doinst.sh @@ -22,3 +22,6 @@ config etc/rc.d/rc.serial.new config etc/rc.d/rc.setterm.new config etc/serial.conf.new +if [ -r etc/default/su.new ]; then + config etc/default/su.new +fi diff --git a/source/a/util-linux/su.default b/source/a/util-linux/su.default new file mode 100644 index 000000000..73fb50a0d --- /dev/null +++ b/source/a/util-linux/su.default @@ -0,0 +1,3 @@ +# Ensure that ENV_SUPATH from /etc/login.defs is used for the $PATH when +# 'su' is used. Otherwise /sbin paths will be missing unless 'su -' is used. +ALWAYS_SET_PATH yes diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild index 662eb75ce..1d101d46c 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:-1} +BUILD=${BUILD:-2} ADJTIMEXVERS=1.29 SETSERIALVERS=2.17 @@ -85,6 +85,11 @@ find . \ # Choose correct options depending on whether PAM is installed: if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then LOGIN_OPTIONS="" + # Add su default file to ensure using ENV_SUPATH with 'su': + mkdir -p $PKG/etc/default + cp -a $CWD/su.default $PKG/etc/default/su.new + chown root:root $PKG/etc/default/su.new + chmod 644 $PKG/etc/default/su.new else LOGIN_OPTIONS="--disable-login" fi diff --git a/source/l/pcre/pcre.url b/source/l/pcre/pcre.url index 249757b9c..2e0a9c866 100644 --- a/source/l/pcre/pcre.url +++ b/source/l/pcre/pcre.url @@ -1 +1,2 @@ -ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ +ftp://ftp.pcre.org/pub/pcre/ +#ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ diff --git a/source/l/pcre/slack-desc b/source/l/pcre/slack-desc index 010ce4875..1a5d8b06c 100644 --- a/source/l/pcre/slack-desc +++ b/source/l/pcre/slack-desc @@ -12,7 +12,7 @@ pcre: The PCRE library is a set of functions that implement regular pcre: expression pattern matching using the same syntax and semantics as pcre: Perl 5, with just a few differences (documented in the man page). pcre: -pcre: +pcre: Homepage: https://www.pcre.org pcre: pcre: pcre: diff --git a/source/l/qt/slack-desc b/source/l/qt/slack-desc old mode 100755 new mode 100644 diff --git a/source/l/sdl/sdl.SlackBuild b/source/l/sdl/sdl.SlackBuild index 1f79c32df..9fee91634 100755 --- a/source/l/sdl/sdl.SlackBuild +++ b/source/l/sdl/sdl.SlackBuild @@ -30,7 +30,7 @@ NET=${NET:-$(echo SDL_net-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev SOUND=${SOUND:-$(echo SDL_sound-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} TTF=${TTF:-$(echo SDL_ttf-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-8} +BUILD=${BUILD:-9} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -252,6 +252,11 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +mkdir -p $PKG/usr/doc/SDL_ttf-$TTF +cp -a \ + CHANGES COPYING README \ + $PKG/usr/doc/SDL_ttf-$TTF + # Add SDL_sound: cd $TMP rm -rf SDL_sound-$SOUND @@ -296,4 +301,3 @@ gzip -9 $PKG/usr/man/man?/*.? cd $PKG /sbin/makepkg -l y -c n $TMP/sdl-$VERSION-$ARCH-$BUILD.txz - -- cgit v1.2.3-79-gdb01