summaryrefslogtreecommitdiffstats
path: root/source/a/glibc-zoneinfo
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-10-12 18:55:06 +0000
committer Eric Hameleers <alien@slackware.com>2020-10-13 08:59:55 +0200
commit41e1f8f54707062fbb7b78bc45e58a17e47fd10b (patch)
treef2f52434bdb53197bc3a99e168803d0285b3ec98 /source/a/glibc-zoneinfo
parentc551462d5358a69161502c3acd1ea2e82f17590d (diff)
downloadcurrent-41e1f8f54707062fbb7b78bc45e58a17e47fd10b.tar.gz
current-41e1f8f54707062fbb7b78bc45e58a17e47fd10b.tar.xz
Mon Oct 12 18:55:06 UTC 202020201012185506
a/glibc-zoneinfo-2020b-noarch-2.txz: Rebuilt. Default to more bloated (but more compatible) "fat" format with zic. This was the default prior to tzcode2020b. ap/gphoto2-2.5.26-x86_64-1.txz: Upgraded. l/freetype-2.10.3-x86_64-1.txz: Upgraded. l/imagemagick-7.0.10_34-x86_64-1.txz: Upgraded. l/libgphoto2-2.5.26-x86_64-1.txz: Upgraded. l/libmtp-1.1.18-x86_64-1.txz: Upgraded. n/nmap-7.91-x86_64-1.txz: Upgraded. n/stunnel-5.57-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/glibc-zoneinfo')
-rwxr-xr-xsource/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild10
-rw-r--r--source/a/glibc-zoneinfo/zic.default.fat11
2 files changed, 18 insertions, 3 deletions
diff --git a/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild b/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild
index 42d3be947..1efc702d3 100755
--- a/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild
+++ b/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2015, 2016, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2015, 2016, 2018, 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=glibc-zoneinfo
ZONE_VERSIONS="$(echo tzdata* | cut -f1 -d . | cut -b7-11)"
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -84,8 +84,12 @@ cd $TMP
rm -rf tzcodedata-build
mkdir tzcodedata-build
cd tzcodedata-build
-tar xzf $CWD/tzdata?????.tar.gz || exit 1
tar xzf $CWD/tzcode?????.tar.gz || exit 1
+tar xzf $CWD/tzdata?????.tar.gz || exit 1
+
+# Default to more bloated (but more compatible) "fat" format with zic.
+# This was the default prior to tzcode2020b.
+zcat $CWD/zic.default.fat.gz | patch -p1 --verbose || exit 1
chown -R root:root .
find . \
diff --git a/source/a/glibc-zoneinfo/zic.default.fat b/source/a/glibc-zoneinfo/zic.default.fat
new file mode 100644
index 000000000..62832bb12
--- /dev/null
+++ b/source/a/glibc-zoneinfo/zic.default.fat
@@ -0,0 +1,11 @@
+--- ./zic.c.orig 2020-10-03 17:11:18.000000000 -0500
++++ ./zic.c 2020-10-12 13:03:20.086014967 -0500
+@@ -668,7 +668,7 @@
+ }
+
+ #ifndef ZIC_BLOAT_DEFAULT
+-# define ZIC_BLOAT_DEFAULT "slim"
++# define ZIC_BLOAT_DEFAULT "fat"
+ #endif
+
+ int