diff options
Diffstat (limited to 'source')
| -rwxr-xr-x | source/a/lilo/lilo.SlackBuild | 2 | ||||
| -rw-r--r-- | source/a/pkgtools/manpages/installpkg.8 | 9 | ||||
| -rwxr-xr-x | source/a/pkgtools/pkgtools.SlackBuild | 2 | ||||
| -rw-r--r-- | source/a/pkgtools/scripts/installpkg | 20 | ||||
| -rw-r--r-- | source/a/pkgtools/scripts/upgradepkg | 4 | ||||
| -rw-r--r-- | source/l/gnu-efi/gnu-efi.url | 2 |
6 files changed, 30 insertions, 9 deletions
diff --git a/source/a/lilo/lilo.SlackBuild b/source/a/lilo/lilo.SlackBuild index 6bae6e5a6..295a4abc9 100755 --- a/source/a/lilo/lilo.SlackBuild +++ b/source/a/lilo/lilo.SlackBuild @@ -93,7 +93,7 @@ chown root:root \ rm -rf $PKG/usr/doc/lilo-$VERSION mkdir -p $PKG/usr/doc/lilo-$VERSION -cp -a CHANGES COPYING COPYRIGHT INCOMPAT QuickInst READM* doc sample \ +cp -a CHANGELOG COPYING COPYRIGHT INCOMPAT QuickInst READM* doc sample \ $PKG/usr/doc/lilo-$VERSION for bootsplash in $CWD/*.bmp ; do cp -a $bootsplash $PKG/usr/doc/lilo-$VERSION/sample/$(basename $bootsplash) diff --git a/source/a/pkgtools/manpages/installpkg.8 b/source/a/pkgtools/manpages/installpkg.8 index 204cc841e..990e15942 100644 --- a/source/a/pkgtools/manpages/installpkg.8 +++ b/source/a/pkgtools/manpages/installpkg.8 @@ -45,6 +45,9 @@ installpkg \- install Slackware packages. [ .B \--threads <number> ] +[ +.B \--no-overwrite +] .BI packagename [ .B packagename2 ... @@ -102,6 +105,12 @@ For xz/plzip compressed packages, set the maximum number of threads to be used f decompression. Only has an effect if a multithreaded compressor was used, and then only on large packages. The default for plzip is the number of CPU threads available. The default for xz is 2. +.TP +.B \--no-overwrite +When extracting the package, do not overwrite existing files. Usually, this option +should not be used. It exists so that upgradepkg can use it for the second installation +pass. The first pass has already overwritten the previous package's files, and this will +catch the few corner cases without generating unnecessary writes. .SH EXAMPLES .TP .B Install a font package for X: diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild index 1b0614125..7c8dc9c09 100755 --- a/source/a/pkgtools/pkgtools.SlackBuild +++ b/source/a/pkgtools/pkgtools.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=pkgtools # *** UPDATE THESE WITH EACH BUILD: VERSION=15.0 ARCH=${ARCH:-noarch} -BUILD=${BUILD:-23} +BUILD=${BUILD:-24} # 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/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg index 2180016f5..f334728c6 100644 --- a/source/a/pkgtools/scripts/installpkg +++ b/source/a/pkgtools/scripts/installpkg @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 1994, 1998, 2000 Patrick Volkerding, Concord, CA, USA # Copyright 2001, 2003 Slackware Linux, Inc., Concord, CA, USA -# Copyright 2007, 2009, 2011, 2017, 2018 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2007, 2009, 2011, 2017, 2018, 2019 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,6 +21,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +# Fri Oct 4 06:04:39 UTC 2019 +# Add support for --no-overwrite so that upgradepkg can be kind to SSDs. +# # Mon Jun 4 21:17:58 UTC 2018 # Migrate the package database and directories from /var/log to # /var/lib/pkgtools. /var/log was never a good place for this data, as it is @@ -163,13 +166,19 @@ options: --warn (warn if files will be overwritten, but do not install) --tagfile /somedir/tagfile (specify a different file to use for package priorities. The default is "tagfile" in the package's directory) - --threads <number> For xz/plzip compressed packages, set the max + --threads <number> For xz/plzip compressed packages, set the max number of threads to be used for decompression. Only has an effect if a multithreaded compressor was used, and then only on large packages. For plzip, the default is equal to the number of CPU threads available on the machine. For xz, the default is equal to 2. --md5sum (record the package's md5sum in the metadata file) + --no-overwrite When extracting the package, do not overwrite + existing files. Usually, this option should not be used. + It exists so that upgradepkg can use it for the second + installation pass. The first pass has already overwritten + the previous package's files, and this will catch the few + corner cases without generating unnecessary writes. EOF } @@ -227,6 +236,9 @@ while [ 0 ]; do elif [ "$1" = "-ask" -o "$1" = "--ask" ]; then ALWAYSASK="yes" shift 1 + elif [ "$1" = "--no-overwrite" ]; then + NO_OVERWRITE=" --skip-old-files " + shift 1 elif [ "$1" = "-tagfile" -o "$1" = "--tagfile" ]; then if [ -r "$2" ]; then USERTAGFILE="$2" @@ -625,9 +637,9 @@ EOF fi echo "FILE LIST:" >> $ADM_DIR/packages/$shortname if [ "$INSTDIR" = "install" ]; then - ( cd $ROOT/ ; $packagecompression -dc | tar --acls --xattrs --xattrs-include='*' --keep-directory-symlink -xpvf - | LC_ALL=C sort ) < $package >> $TMP/$shortname 2> /dev/null + ( cd $ROOT/ ; $packagecompression -dc | tar --acls --xattrs --xattrs-include='*' --keep-directory-symlink $NO_OVERWRITE -xpvf - | LC_ALL=C sort ) < $package >> $TMP/$shortname 2> /dev/null else - ( cd $ROOT/ ; $packagecompression -dc | tar --transform "s,^install$,$INSTDIR," --transform "s,^install/,$INSTDIR/," --acls --xattrs --xattrs-include='*' --keep-directory-symlink -xpvf - | LC_ALL=C sort ) < $package >> $TMP/$shortname 2> /dev/null + ( cd $ROOT/ ; $packagecompression -dc | tar --transform "s,^install$,$INSTDIR," --transform "s,^install/,$INSTDIR/," --acls --xattrs --xattrs-include='*' --keep-directory-symlink $NO_OVERWRITE -xpvf - | LC_ALL=C sort ) < $package >> $TMP/$shortname 2> /dev/null fi if [ "$( grep '^\./' $TMP/$shortname | wc -l | tr -d ' ')" = "1" ]; then # Good. We have a package that meets the Slackware spec. diff --git a/source/a/pkgtools/scripts/upgradepkg b/source/a/pkgtools/scripts/upgradepkg index f53d21d99..f81d3c738 100644 --- a/source/a/pkgtools/scripts/upgradepkg +++ b/source/a/pkgtools/scripts/upgradepkg @@ -406,9 +406,9 @@ EOF # shift location, so we should always reinstall as the final step: if [ ! "$NOT_PARANOID" = "true" ]; then if ! [ $TERSE ]; then - /sbin/installpkg $INCOMINGDIR/$NNAME + /sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME else - /sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null + /sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME 1> /dev/null fi fi ! [ $TERSE ] && echo "Package $OLD upgraded with new package $INCOMINGDIR/$NNAME." diff --git a/source/l/gnu-efi/gnu-efi.url b/source/l/gnu-efi/gnu-efi.url index 50941d120..2c39025ea 100644 --- a/source/l/gnu-efi/gnu-efi.url +++ b/source/l/gnu-efi/gnu-efi.url @@ -1 +1 @@ -https://downloads.sourceforge.net/gnu-efi/gnu-efi-3.0.9.tar.bz2 +https://downloads.sourceforge.net/gnu-efi/gnu-efi-3.0.10.tar.bz2 |