From e4325044a8839cd09f34e5fd73e7f0ce01fcd986 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 2 Jan 2020 21:15:46 +0000 Subject: Thu Jan 2 21:15:46 UTC 2020 a/dialog-1.3_20191210-x86_64-1.txz: Upgraded. a/shadow-4.8-x86_64-2.txz: Rebuilt. Don't ship /etc/environment.new since sudo is no longer complaining about it. ap/lxc-2.0.11_fad08f383-x86_64-4.txz: Rebuilt. Make sure all initial devices are properly created. Fix accidental handling of rc.lxc as a modified-for-lxc init script. Thanks to crts. d/python-setuptools-44.0.0-x86_64-1.txz: Upgraded. l/libedit-20191231_3.1-x86_64-1.txz: Upgraded. l/python-pillow-7.0.0-x86_64-1.txz: Upgraded. --- source/a/dialog/dialog.SlackBuild | 17 +++++--- source/a/dialog/dialog.all.use_height.diff | 48 ++++++++++++++++++++++ .../dialog/dialog.no.aspect.ratio.autoajust.patch | 31 ++++++++++++++ source/a/shadow/doinst.sh | 2 - source/a/shadow/environment | 6 --- source/a/shadow/shadow.SlackBuild | 8 +--- source/ap/lxc/lxc-slackware.in | 15 +++++-- source/ap/lxc/lxc.SlackBuild | 2 +- source/l/python-pillow/python-pillow.SlackBuild | 11 +---- 9 files changed, 107 insertions(+), 33 deletions(-) create mode 100644 source/a/dialog/dialog.all.use_height.diff create mode 100644 source/a/dialog/dialog.no.aspect.ratio.autoajust.patch delete mode 100644 source/a/shadow/environment (limited to 'source') diff --git a/source/a/dialog/dialog.SlackBuild b/source/a/dialog/dialog.SlackBuild index e7e94a382..261e73010 100755 --- a/source/a/dialog/dialog.SlackBuild +++ b/source/a/dialog/dialog.SlackBuild @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -35,10 +35,13 @@ PKGNAM=dialog # that uses dialog and found to work, and you've already gotten any needed # patches accepted upstream... well... I like this version. If it's got bugs, # they aren't bugs that I'm running into often. -#VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)} -VERSION=1.3-20170509 +# +# Update: dialog-1.3-20191210 actually passes the formatting tests here (with a +# couple of patches), so we will take our first dialog upgrade in quite a while. +#VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)} +VERSION=1.3-20191210 -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -85,10 +88,14 @@ fi cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 cd ${PKGNAM}-$VERSION || exit 1 +# These patches take care of the formatting issues that were preventing +# us from moving to a more recent version of dialog: +zcat $CWD/dialog.all.use_height.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/dialog.smaller.min.height.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/dialog.no.aspect.ratio.autoajust.patch.gz | patch -p1 --verbose || exit 1 # Make sure ownerships and permissions are sane: chown -R root:root . diff --git a/source/a/dialog/dialog.all.use_height.diff b/source/a/dialog/dialog.all.use_height.diff new file mode 100644 index 000000000..9eb1952c7 --- /dev/null +++ b/source/a/dialog/dialog.all.use_height.diff @@ -0,0 +1,48 @@ +--- ./menubox.c.orig 2019-11-10 19:41:15.000000000 -0600 ++++ ./menubox.c 2019-12-06 13:16:39.400865476 -0600 +@@ -433,7 +433,8 @@ + * After displaying the prompt, we know how much space we really have. + * Limit the list to avoid overwriting the ok-button. + */ +- all.menu_height = height - MIN_HIGH - cur_y; ++ if (all.menu_height + MIN_HIGH > height - cur_y) ++ all.menu_height = height - MIN_HIGH - cur_y; + if (all.menu_height <= 0) + all.menu_height = 1; + +--- ./buildlist.c.orig 2019-11-10 19:41:43.000000000 -0600 ++++ ./buildlist.c 2019-12-06 13:16:39.402865476 -0600 +@@ -653,7 +653,8 @@ + * After displaying the prompt, we know how much space we really have. + * Limit the list to avoid overwriting the ok-button. + */ +- all.use_height = height - MIN_HIGH - cur_y; ++ if (all.use_height + MIN_HIGH > height - cur_y) ++ all.use_height = height - MIN_HIGH - cur_y; + if (all.use_height <= 0) + all.use_height = 1; + +--- ./checklist.c.orig 2019-11-10 19:26:35.000000000 -0600 ++++ ./checklist.c 2019-12-06 13:16:39.404865476 -0600 +@@ -304,7 +304,8 @@ + * After displaying the prompt, we know how much space we really have. + * Limit the list to avoid overwriting the ok-button. + */ +- all.use_height = height - MIN_HIGH - cur_y; ++ if (all.use_height + MIN_HIGH > height - cur_y) ++ all.use_height = height - MIN_HIGH - cur_y; + if (all.use_height <= 0) + all.use_height = 1; + +--- ./treeview.c.orig 2019-11-10 19:38:22.000000000 -0600 ++++ ./treeview.c 2019-12-06 13:17:35.604866677 -0600 +@@ -291,7 +291,8 @@ + * After displaying the prompt, we know how much space we really have. + * Limit the list to avoid overwriting the ok-button. + */ +- use_height = height - MIN_HIGH - cur_y; ++ if (use_height + MIN_HIGH > height - cur_y) ++ use_height = height - MIN_HIGH - cur_y; + if (use_height <= 0) + use_height = 1; + diff --git a/source/a/dialog/dialog.no.aspect.ratio.autoajust.patch b/source/a/dialog/dialog.no.aspect.ratio.autoajust.patch new file mode 100644 index 000000000..7bce97b80 --- /dev/null +++ b/source/a/dialog/dialog.no.aspect.ratio.autoajust.patch @@ -0,0 +1,31 @@ +--- ./util.c.orig 2019-11-10 17:20:58.000000000 -0600 ++++ ./util.c 2019-12-07 14:40:23.404722986 -0600 +@@ -1237,28 +1237,6 @@ + justify_text((WINDOW *) 0, prompt, max_y, max_x, &high, &wide); + car = (float) (wide / high); + +- /* +- * If the aspect ratio is greater than it should be, then decrease the +- * width proportionately. +- */ +- if (car > ar) { +- float diff = car / (float) ar; +- max_x = (int) ((float) wide / diff + 4); +- justify_text((WINDOW *) 0, prompt, max_y, max_x, &high, &wide); +- car = (float) wide / (float) high; +- } +- +- /* +- * If the aspect ratio is too small after decreasing the width, then +- * incrementally increase the width until the aspect ratio is equal to or +- * greater than the specified aspect ratio. +- */ +- while (car < ar && max_x < max_width) { +- max_x += 4; +- justify_text((WINDOW *) 0, prompt, max_y, max_x, &high, &wide); +- car = (float) (wide / high); +- } +- + *height = high; + *width = wide; + } diff --git a/source/a/shadow/doinst.sh b/source/a/shadow/doinst.sh index b5fcee426..a7bf2ee4a 100644 --- a/source/a/shadow/doinst.sh +++ b/source/a/shadow/doinst.sh @@ -11,9 +11,7 @@ config() { } config etc/default/useradd.new -config etc/environment.new config etc/login.access.new config etc/login.defs.new config var/log/faillog.new rm -f var/log/faillog.new - diff --git a/source/a/shadow/environment b/source/a/shadow/environment deleted file mode 100644 index 9e96a54ce..000000000 --- a/source/a/shadow/environment +++ /dev/null @@ -1,6 +0,0 @@ -# /etc/environment -# This file may contain environment variable settings that should be used -# system-wide. Please note that it is not a script file and should only -# contain assignment expressions, one per line. -# The environment variables in this file will be loaded before those in other -# files such as: /etc/profile, /etc/profile.d/*, ~/.profile, etc. diff --git a/source/a/shadow/shadow.SlackBuild b/source/a/shadow/shadow.SlackBuild index fd184bb94..d3fd6d14b 100755 --- a/source/a/shadow/shadow.SlackBuild +++ b/source/a/shadow/shadow.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2005-2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -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:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -137,10 +137,6 @@ find $PKG -name groups.1 -exec rm {} \+ rm -f $PKG/etc/login.defs zcat $CWD/login.defs.gz > $PKG/etc/login.defs.new -# Install /etc/environment (referenced in login.defs and used by sudo and -# other utilities): -zcat $CWD/environment.gz > $PKG/etc/environment.new - mv $PKG/etc/login.access $PKG/etc/login.access.new # I don't think this works well enough to recommend it. diff --git a/source/ap/lxc/lxc-slackware.in b/source/ap/lxc/lxc-slackware.in index c49366ac6..c362e95d8 100644 --- a/source/ap/lxc/lxc-slackware.in +++ b/source/ap/lxc/lxc-slackware.in @@ -90,8 +90,15 @@ cp $rootfs/etc/HOSTNAME $rootfs/etc/hostname # http://www.vislab.uq.edu.au/howto/lxc/MAKEDEV.sh DEV=$rootfs/dev mkdir -p ${DEV} -# Make sure ${DEV}/null isn't accidentally a file by deleting it first: -rm -f ${DEV}/null +# Remove any existing "devices" first, as these might be files +# created by package install scripts: +for clear_device in ${DEV}/null ${DEV}/zero ${DEV}/random ${DEV}/urandom \ + ${DEV}/tty ${DEV}/console ${DEV}/tty0 ${DEV}/tty1 ${DEV}/tty2 ${DEV}/tty3 \ + ${DEV}/tty4 ${DEV}/tty5 ${DEV}/full ${DEV}/initctl ${DEV}/loop0 \ + ${DEV}/loop1 ; do + rm -f $clear_device +done +# Create initial set of devices: mknod -m 666 ${DEV}/null c 1 3 mknod -m 666 ${DEV}/zero c 1 5 mknod -m 666 ${DEV}/random c 1 8 @@ -126,8 +133,8 @@ EOF # Back up the existing init scripts and install the lxc versions: ( cd $rootfs/etc/rc.d cp -a /usr/share/lxc/scripts/slackware/* . - chmod 755 *.lxc - for file in *.lxc ; do + chmod 755 rc.*.lxc + for file in rc.*.lxc ; do cp -a $(basename $file .lxc) $(basename $file .lxc).orig cp -a $file $(basename $file .lxc) done diff --git a/source/ap/lxc/lxc.SlackBuild b/source/ap/lxc/lxc.SlackBuild index c6fb1c278..d44f5a883 100755 --- a/source/ap/lxc/lxc.SlackBuild +++ b/source/ap/lxc/lxc.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=lxc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | rev | cut -f 2- -d -)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/python-pillow/python-pillow.SlackBuild b/source/l/python-pillow/python-pillow.SlackBuild index 6817cfd5c..84127f415 100755 --- a/source/l/python-pillow/python-pillow.SlackBuild +++ b/source/l/python-pillow/python-pillow.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2009, 2010, 2013, 2014, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2013, 2014, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA # Copyright 2014 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-pillow VERSION=${VERSION:-$(echo Pillow-*.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 @@ -59,7 +59,6 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi -PYTHONINC=$( python -c 'from distutils.sysconfig import get_python_inc; print(get_python_inc())' ) PYTHON3INC=$( python3 -c 'from distutils.sysconfig import get_python_inc; print(get_python_inc())' ) TMP=${TMP:-/tmp} @@ -79,12 +78,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -python setup.py install --root=$PKG || exit 1 - -# install headers -mkdir -p ${PKG}$PYTHONINC/Imaging -install -m 644 src/libImaging/*.h ${PKG}$PYTHONINC/Imaging - python3 setup.py install --root=$PKG || exit 1 # install headers -- cgit v1.2.3