summaryrefslogtreecommitdiffstats
path: root/source/a/glibc-zoneinfo
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-06-15 00:03:49 +0000
committer Eric Hameleers <alien@slackware.com>2018-06-15 09:00:28 +0200
commit086112c734c9b6018855be83798bcdaf61505c14 (patch)
tree216ed35cf5359876953ca387954ef58607a436ca /source/a/glibc-zoneinfo
parent11b00957be9f8661c4248d52bb20cdacdd442615 (diff)
downloadcurrent-086112c734c9b6018855be83798bcdaf61505c14.tar.gz
current-086112c734c9b6018855be83798bcdaf61505c14.tar.xz
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/glibc-zoneinfo')
-rw-r--r--source/a/glibc-zoneinfo/doinst.sh2
-rwxr-xr-xsource/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/a/glibc-zoneinfo/doinst.sh b/source/a/glibc-zoneinfo/doinst.sh
index 3c86f65e4..05f1e990b 100644
--- a/source/a/glibc-zoneinfo/doinst.sh
+++ b/source/a/glibc-zoneinfo/doinst.sh
@@ -28,7 +28,7 @@
#
# If we see that the machine's localtime-copied-from symlink is pointing
# to US/Pacific-New, change it to point to US/Pacific instead.
-if [ "$(/bin/ls -l etc/localtime-copied-from | rev | cut -f 1,2 -d / | rev)" = "US/Pacific-New" ]; then
+if [ "$(/bin/ls -l etc/localtime-copied-from 2> /dev/null | rev | cut -f 1,2 -d / | rev)" = "US/Pacific-New" ]; then
( cd etc ; rm -rf localtime-copied-from )
( cd etc ; ln -sf /usr/share/zoneinfo/US/Pacific localtime-copied-from )
fi
diff --git a/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild b/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild
index fc83ee608..a3fd514e5 100755
--- a/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild
+++ b/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=glibc-zoneinfo
ZONE_VERSIONS="$(echo tzdata* | cut -f1 -d . | cut -b7-11)"
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then