summaryrefslogtreecommitdiffstats
path: root/source/a/pkgtools/scripts/installpkg
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-04-02 06:07:52 +0000
committer Eric Hameleers <alien@slackware.com>2020-04-02 10:41:33 +0200
commit7bd3e8d27d710021f848ba0b9e9772443c65e597 (patch)
treef4d816f8faa399edbf48c0325630473d069a354f /source/a/pkgtools/scripts/installpkg
parent99c7cafd7376277cb010e2b7de0bf40de7ee6282 (diff)
downloadcurrent-7bd3e8d27d710021f848ba0b9e9772443c65e597.tar.gz
current-7bd3e8d27d710021f848ba0b9e9772443c65e597.tar.xz
Thu Apr 2 06:07:52 UTC 202020200402060752
a/hwdata-0.334-noarch-1.txz: Upgraded. a/kernel-generic-5.4.29-x86_64-1.txz: Upgraded. a/kernel-huge-5.4.29-x86_64-1.txz: Upgraded. a/kernel-modules-5.4.29-x86_64-1.txz: Upgraded. a/pkgtools-15.0-noarch-32.txz: Rebuilt. installpkg: handle the uninstall script packaged as /install/douninst.sh. removepkg: add --skip-douninst option to skip running the uninstall script. Save removed douninst.sh in /var/log/pkgtools/removed_uninstall_scripts. ap/groff-1.22.4-x86_64-2.txz: Rebuilt. Fixed docdir. Thanks to Xsane. d/gcc-9.3.0-x86_64-2.txz: Rebuilt. d/gcc-brig-9.3.0-x86_64-2.txz: Rebuilt. d/gcc-g++-9.3.0-x86_64-2.txz: Rebuilt. d/gcc-gdc-9.3.0-x86_64-2.txz: Rebuilt. d/gcc-gfortran-9.3.0-x86_64-2.txz: Rebuilt. Patched a compiler bug concerning assumed-shape vs. deferred-shape arrays. Thanks to Lockywolf. d/gcc-gnat-9.3.0-x86_64-2.txz: Rebuilt. d/gcc-go-9.3.0-x86_64-2.txz: Rebuilt. d/gcc-objc-9.3.0-x86_64-2.txz: Rebuilt. d/kernel-headers-5.4.29-x86-1.txz: Upgraded. d/ruby-2.7.1-x86_64-1.txz: Upgraded. This update fixes security issues: Unsafe Object Creation Vulnerability in JSON (Additional fix). Heap exposure vulnerability in the socket library. For more information, see: https://www.ruby-lang.org/en/news/2020/03/19/json-dos-cve-2020-10663/ https://www.ruby-lang.org/en/news/2020/03/31/heap-exposure-in-socket-cve-2020-10933/ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-10663 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-10933 (* Security fix *) k/kernel-source-5.4.29-noarch-1.txz: Upgraded. l/graphite2-1.3.14-x86_64-1.txz: Upgraded. l/librsvg-2.48.2-x86_64-1.txz: Upgraded. l/utf8proc-2.5.0-x86_64-1.txz: Upgraded. x/libva-2.7.0-x86_64-1.txz: Upgraded. x/libva-utils-2.7.1-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/a/pkgtools/scripts/installpkg')
-rw-r--r--source/a/pkgtools/scripts/installpkg18
1 files changed, 14 insertions, 4 deletions
diff --git a/source/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg
index f334728c6..f19cf59c0 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, 2019 Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2009, 2011, 2017, 2018, 2019, 2020 Patrick Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,6 +21,11 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
+# Wed Apr 1 21:59:41 UTC 2020
+# If the package contains /install/douninst.sh, copy the uninstall script to
+# $ADM_DIR/douninst.sh/$shortname and add the filename to the package list
+# in $ADM_DIR/packages/$shortname.
+#
# Fri Oct 4 06:04:39 UTC 2019
# Add support for --no-overwrite so that upgradepkg can be kind to SSDs.
#
@@ -281,7 +286,7 @@ ADM_DIR="$ROOT/var/lib/pkgtools"
LOG_DIR="$ROOT/var/log/pkgtools"
# If the directories don't exist, "initialize" the package database:
-for PKGDBDIR in packages scripts setup ; do
+for PKGDBDIR in douninst.sh packages scripts setup ; do
if [ ! -d $ADM_DIR/$PKGDBDIR ]; then
mkdir -p $ADM_DIR/$PKGDBDIR
chmod 755 $ADM_DIR/$PKGDBDIR
@@ -697,9 +702,14 @@ EOF
cp $ROOT/$INSTDIR/doinst.sh $ADM_DIR/scripts/$shortname
chmod 755 $ADM_DIR/scripts/$shortname
fi
- # /install/doinst.sh and /install/slack-* are reserved locations for the package system.
+ if [ -r $ROOT/$INSTDIR/douninst.sh ]; then
+ cp $ROOT/$INSTDIR/douninst.sh $ADM_DIR/douninst.sh/$shortname
+ chmod 755 $ADM_DIR/douninst.sh/$shortname
+ echo "$(echo $ADM_DIR | rev | cut -f 1-3 -d / | rev)/douninst.sh/$shortname" >> $ADM_DIR/packages/$shortname
+ fi
+ # /install/do*inst.sh and /install/slack-* are reserved locations for the package system.
# Heh, not any more with a recent tar :-)
- ( cd $ROOT/$INSTDIR ; rm -f doinst.sh slack-* 1> /dev/null 2>&1 )
+ ( cd $ROOT/$INSTDIR ; rm -f do*inst.sh slack-* 1> /dev/null 2>&1 )
rmdir $ROOT/$INSTDIR 1> /dev/null 2>&1
fi
# If we used a scan directory, get rid of it: