summaryrefslogtreecommitdiff
path: root/source/a/pkgtools
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-06-15 00:03:49 +0000
committerEric Hameleers <alien@slackware.com>2018-06-15 09:00:28 +0200
commit086112c734c9b6018855be83798bcdaf61505c14 (patch)
tree216ed35cf5359876953ca387954ef58607a436ca /source/a/pkgtools
parent11b00957be9f8661c4248d52bb20cdacdd442615 (diff)
downloadcurrent-086112c734c9b6018855be83798bcdaf61505c14.tar.gz
Fri Jun 15 00:03:49 UTC 201820180615000349
a/dcron-4.5-x86_64-8.txz: Rebuilt. rc.crond: match the running process more accurately. a/glibc-zoneinfo-2018e-noarch-3.txz: Rebuilt. Don't emit an error if the /etc/localtime-copied-from is not present when the package is initially installed. a/libcgroup-0.41-x86_64-5.txz: Rebuilt. Added /etc/cgconfig.d/ directory. a/pkgtools-15.0-noarch-19.txz: Rebuilt. installpkg, makebootdisk, removepkg, upgradepkg: don't try to remove admin directories (supposedly "in case" they are a symlink). a/sysvinit-scripts-2.1-noarch-12.txz: Rebuilt. rc.6: stop haveged rc.S: start rc.cgconfig and rc.cgred ap/at-3.1.20-x86_64-5.txz: Rebuilt. rc.atd: match the running process more accurately. ap/slackpkg-2.83.0-noarch-2.txz: Rebuilt. Patched to handle the case where /var/log/packages is a symlink. l/gsl-2.5-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/pkgtools')
-rwxr-xr-xsource/a/pkgtools/pkgtools.SlackBuild2
-rw-r--r--source/a/pkgtools/scripts/installpkg2
-rw-r--r--source/a/pkgtools/scripts/makebootdisk1
-rw-r--r--source/a/pkgtools/scripts/removepkg1
-rw-r--r--source/a/pkgtools/scripts/upgradepkg3
5 files changed, 2 insertions, 7 deletions
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index ec1c71cd..0937267d 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:-18}
+BUILD=${BUILD:-19}
# 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 16e2e47e..b777442a 100644
--- a/source/a/pkgtools/scripts/installpkg
+++ b/source/a/pkgtools/scripts/installpkg
@@ -258,7 +258,6 @@ ADM_DIR="$ROOT/var/log"
# If the directories don't exist, "initialize" the package database:
for PKGDBDIR in packages removed_packages removed_scripts scripts setup ; do
if [ ! -d $ADM_DIR/$PKGDBDIR ]; then
- rm -rf $ADM_DIR/$PKGDBDIR # make sure it's not a symlink or something stupid
mkdir -p $ADM_DIR/$PKGDBDIR
chmod 755 $ADM_DIR/$PKGDBDIR
fi
@@ -268,7 +267,6 @@ done
TMP=$ADM_DIR/setup/tmp
# If the $TMP directory doesn't exist, create it:
if [ ! -d $TMP ]; then
- rm -rf $TMP # make sure it's not a symlink or something stupid
mkdir -p $TMP
chmod 700 $TMP # no need to leave it open
fi
diff --git a/source/a/pkgtools/scripts/makebootdisk b/source/a/pkgtools/scripts/makebootdisk
index 93ccc5a9..e1c3cfb6 100644
--- a/source/a/pkgtools/scripts/makebootdisk
+++ b/source/a/pkgtools/scripts/makebootdisk
@@ -37,7 +37,6 @@ fi
TMP=/var/log/setup/tmp
# If the $TMP directory doesn't exist, create it:
if [ ! -d $TMP ]; then
- rm -rf $TMP # make sure it's not a symlink or something stupid
mkdir -p $TMP
chmod 700 $TMP # no need to leave it open
fi
diff --git a/source/a/pkgtools/scripts/removepkg b/source/a/pkgtools/scripts/removepkg
index 81b2a6be..6312353a 100644
--- a/source/a/pkgtools/scripts/removepkg
+++ b/source/a/pkgtools/scripts/removepkg
@@ -137,7 +137,6 @@ export LC_ALL=C
TMP=$ROOT/var/log/setup/tmp
# If the $TMP directory doesn't exist, create it:
if [ ! -d $TMP ]; then
- rm -rf $TMP # make sure it's not a symlink or something stupid
mkdir -p $TMP
chmod 700 $TMP # no need to leave it open
fi
diff --git a/source/a/pkgtools/scripts/upgradepkg b/source/a/pkgtools/scripts/upgradepkg
index 500a970a..3ee3c658 100644
--- a/source/a/pkgtools/scripts/upgradepkg
+++ b/source/a/pkgtools/scripts/upgradepkg
@@ -87,8 +87,7 @@ EOF
TMP=$ROOT/var/log/setup/tmp
# If the $TMP directory doesn't exist, create it:
if [ ! -d $TMP ]; then
- rm -rf $TMP # make sure it's not a symlink or something stupid
- mkdir $TMP
+ mkdir -p $TMP
chmod 700 $TMP # no need to leave it open
fi