From ac49706030be921153cf4395148ce0e16acb42f0 Mon Sep 17 00:00:00 2001 From: mashir43 Date: Mon, 22 Jan 2018 10:27:26 +0900 Subject: [PATCH] tzcode: Update to 2018b --- tzcode/PKGBUILD | 31 ++++------- tzcode/tzcode-makefile-exe-extensions.patch | 36 +++++++------ tzcode/tzcode-makefile.patch | 57 ++++++-------------- tzcode/tzcode-man1.patch | 31 ----------- tzcode/tzcode-man3.patch | 60 --------------------- tzcode/tzcode-man8.patch | 22 -------- tzcode/tzcode-tzfile.patch | 11 ---- 7 files changed, 46 insertions(+), 202 deletions(-) delete mode 100644 tzcode/tzcode-man1.patch delete mode 100644 tzcode/tzcode-man3.patch delete mode 100644 tzcode/tzcode-man8.patch delete mode 100644 tzcode/tzcode-tzfile.patch diff --git a/tzcode/PKGBUILD b/tzcode/PKGBUILD index d266fb8f..eb994b03 100644 --- a/tzcode/PKGBUILD +++ b/tzcode/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=tzcode -_ver=2017b +_ver=2018b # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=1 @@ -13,22 +13,17 @@ options=('!emptydirs') groups=('base') depends=('coreutils' 'gawk' 'sed') source=( - https://www.iana.org/time-zones/repository/releases/tzdata${_ver}.tar.gz - https://www.iana.org/time-zones/repository/releases/${pkgname}${_ver}.tar.gz + https://www.iana.org/time-zones/repository/releases/tzdata${_ver}.tar.gz{,.asc} + https://www.iana.org/time-zones/repository/releases/${pkgname}${_ver}.tar.gz{,.asc} tzcode-makefile.patch - tzcode-makefile-exe-extensions.patch - tzcode-tzfile.patch - tzcode-man1.patch - tzcode-man3.patch - tzcode-man8.patch) -sha256sums=('f8242a522ea3496b0ce4ff4f2e75a049178da21001a08b8e666d8cbe07d18086' - '4d1735bb54e22b8d7443d4d1f1a13d007ae11be79a35e51f8e8322fb8e292d40' - 'e04b27832ff14af0d10526a33de9138c1b978713bf23a44bc389abcf9f81b13b' - '96ab15be155fd382366aff571d87f8616891509ef575a4b41f7c49f82576c170' - 'cefc765ca2c471590f433cb4927553ba0c9467f3d3857c55028d42149eae8b7f' - '2ccfcf8e4392905c7f00165921ea60663112e8e8500a1b100a24fdac69e2f111' - '5f69e8b81ea43d67b8f50b1f0d39c1014fee213097a7049331241a15faa14513' - '79d2e53258fdf728980d850eaa296684c9eb67a86484f4e04e232b7977eddc8a') + tzcode-makefile-exe-extensions.patch) +sha256sums=('f87540b9050e1b0d772d19058fcb62f54baa505ecebf392ea825713c33bd9848' + 'SKIP' + '74d102507fd1098688d4cce8179caf09097245fe01a6fb0d672a9abe9154ab22' + 'SKIP' + '93d047fcf6151a67f676f16888c34f82b5dfabca6a51d90e123dc197ef649003' + 'faf73eb5f07c56b019b540005f4262f33927a4ff2acf3752a055e8530decd749') +validpgpkeys=('7E3792A9D8ACF7D633BC1588ED97E90E62AA7E34') timezones=('africa' 'antarctica' 'asia' 'australasia' 'europe' 'northamerica' 'southamerica' @@ -40,10 +35,6 @@ prepare() { patch -p1 -i ${srcdir}/tzcode-makefile.patch patch -p1 -i ${srcdir}/tzcode-makefile-exe-extensions.patch - patch -p1 -i ${srcdir}/tzcode-tzfile.patch - patch -p1 -i ${srcdir}/tzcode-man1.patch - patch -p1 -i ${srcdir}/tzcode-man3.patch - patch -p1 -i ${srcdir}/tzcode-man8.patch } diff --git a/tzcode/tzcode-makefile-exe-extensions.patch b/tzcode/tzcode-makefile-exe-extensions.patch index 69a5395f..f42ecc84 100644 --- a/tzcode/tzcode-makefile-exe-extensions.patch +++ b/tzcode/tzcode-makefile-exe-extensions.patch @@ -1,20 +1,22 @@ ---- src/Makefile.orig 2014-09-09 12:56:58.023649200 +0900 -+++ src/Makefile 2014-09-09 13:00:19.092405500 +0900 -@@ -379,7 +379,7 @@ - $(ZIC) -y $(YEARISTYPE) \ - -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) - cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/. -- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. -+ cp tzselect zic.exe zdump.exe $(DESTDIR)$(ETCDIR)/ - cp libtz.a $(DESTDIR)$(LIBDIR)/. - $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a - cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/. -@@ -388,7 +388,7 @@ +--- src/Makefile.orig 2018-01-19 17:32:15.381368700 +0900 ++++ src/Makefile 2018-01-19 17:34:31.100373600 +0900 +@@ -513,8 +513,8 @@ + -t '$(DESTDIR)$(TZDEFAULT)' + cp -f $(TABDATA) '$(DESTDIR)$(TZDIR)/.' + cp tzselect '$(DESTDIR)$(BINDIR)/.' +- cp zdump '$(DESTDIR)$(ZDUMPDIR)/.' +- cp zic '$(DESTDIR)$(ZICDIR)/.' ++ cp zdump.exe '$(DESTDIR)$(ZDUMPDIR)/.' ++ cp zic.exe '$(DESTDIR)$(ZICDIR)/.' + cp libtz.a '$(DESTDIR)$(LIBDIR)/.' + $(RANLIB) '$(DESTDIR)$(LIBDIR)/libtz.a' + cp -f newctime.3 newtzset.3 '$(DESTDIR)$(MANDIR)/man3/.' +@@ -523,7 +523,7 @@ INSTALL: ALL install date.1 - mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 -- cp date $(DESTDIR)$(BINDIR)/. -+ cp date.exe $(DESTDIR)$(BINDIR)/. - cp -f date.1 $(DESTDIR)$(MANDIR)/man1/. + mkdir -p '$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1' +- cp date '$(DESTDIR)$(BINDIR)/.' ++ cp date.exe '$(DESTDIR)$(BINDIR)/.' + cp -f date.1 '$(DESTDIR)$(MANDIR)/man1/.' - version.h: + version: $(VERSION_DEPS) diff --git a/tzcode/tzcode-makefile.patch b/tzcode/tzcode-makefile.patch index 761d5324..e28bf1ab 100644 --- a/tzcode/tzcode-makefile.patch +++ b/tzcode/tzcode-makefile.patch @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2014-08-29 04:32:04.000000000 +0900 -+++ src/Makefile 2014-09-09 12:55:02.881446900 +0900 +--- src/Makefile.orig 2018-01-17 18:05:36.000000000 +0900 ++++ src/Makefile 2018-01-19 17:58:12.857248200 +0900 @@ -19,7 +19,7 @@ # make zonenames # to get a list of the values you can use for LOCALTIME. @@ -9,51 +9,26 @@ # If you want something other than Eastern United States time as a template # for handling POSIX-style time zone environment variables, -@@ -44,21 +44,21 @@ +@@ -88,7 +88,7 @@ + ZDUMPDIR = $(BINDIR) - # Everything gets put in subdirectories of. . . - --TOPDIR= /usr/local -+TOPDIR= /usr - - # "Compiled" time zone information is placed in the "TZDIR" directory - # (and subdirectories). - # Use an absolute path name for TZDIR unless you're just testing the software. - - TZDIR_BASENAME= zoneinfo --TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME) -+TZDIR= $(TOPDIR)/share/$(TZDIR_BASENAME) - - # Types to try, as an alternative to time_t. int64_t should be first. - TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t - - # The "tzselect", "zic", and "zdump" commands get installed in. . . - --ETCDIR= $(TOPDIR)/etc -+ETCDIR= $(TOPDIR)/bin - - # If you "make INSTALL", the "date" command gets installed in. . . - -@@ -66,7 +66,7 @@ + # The "zic" command goes in: +-ZICDIR = $(TOPDIR)/$(USRDIR)/sbin ++ZICDIR = $(TOPDIR)/$(USRDIR)/bin # Manual pages go in subdirectories of. . . - --MANDIR= $(TOPDIR)/man -+MANDIR= $(TOPDIR)/share/man - - # Library functions are put in an archive in LIBDIR. - -@@ -233,7 +233,7 @@ - # before the first Monday in January when a "%V" format is used and January 1 + MANDIR = $(TOPDIR)/$(USRSHAREDIR)/man +@@ -322,7 +322,7 @@ + # January's first Monday when a "%V" format is used and January 1 # falls on a Friday, Saturday, or Sunday. -CFLAGS= +CFLAGS+= -DHAVE_ADJTIME=0 # Linker flags. Default to $(LFLAGS) for backwards compatibility - # to tzcode2012h and earlier. -@@ -246,7 +246,7 @@ - ZFLAGS= + # to release 2012h and earlier. +@@ -346,7 +346,7 @@ + ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS) # The name of a Posix-compliant 'awk' on your system. -AWK= awk @@ -61,12 +36,12 @@ # The full path name of a Posix-compliant shell, preferably one that supports # the Korn shell's 'select' statement as an extension. -@@ -321,7 +321,7 @@ +@@ -425,7 +425,7 @@ - ############################################################################### + #MAKE= make -cc= cc +cc= gcc - CC= $(cc) -DTZDIR=\"$(TZDIR)\" + CC= $(cc) -DTZDIR='"$(TZDIR)"' AR= ar diff --git a/tzcode/tzcode-man1.patch b/tzcode/tzcode-man1.patch deleted file mode 100644 index 8d02bf77..00000000 --- a/tzcode/tzcode-man1.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- origsrc/date.1 2012-07-19 02:30:38.000000000 +0200 -+++ src/date.1 2012-09-05 20:10:41.437500000 +0200 -@@ -167,21 +167,21 @@ - the adjustment is made by changing the rate at which time advances; - on System-V-based systems, the adjustment is made by changing the time. - .SH FILES --.ta \w'/usr/local/etc/zoneinfo/posixrules\0\0'u -+.ta \w'/usr/share/zoneinfo/posixrules\0\0'u - /usr/lib/locale/\f2L\fP/LC_TIME description of time locale \f2L\fP - .br --/usr/local/etc/zoneinfo time zone information directory -+/usr/share/zoneinfo time zone information directory - .br --/usr/local/etc/zoneinfo/localtime local time zone file -+/usr/share/zoneinfo/localtime local time zone file - .br --/usr/local/etc/zoneinfo/posixrules used with POSIX-style TZ's -+/usr/share/zoneinfo/posixrules used with POSIX-style TZ's - .br --/usr/local/etc/zoneinfo/GMT for UTC leap seconds -+/usr/share/zoneinfo/GMT for UTC leap seconds - .sp - If --.B /usr/local/etc/zoneinfo/GMT -+.B /usr/share/zoneinfo/GMT - is absent, - UTC leap seconds are loaded from --.BR /usr/local/etc/zoneinfo/posixrules . -+.BR /usr/share/zoneinfo/posixrules . - .\" This file is in the public domain, so clarified as of - .\" 2009-05-17 by Arthur David Olson. diff --git a/tzcode/tzcode-man3.patch b/tzcode/tzcode-man3.patch deleted file mode 100644 index bb25ce1f..00000000 --- a/tzcode/tzcode-man3.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- origsrc/newctime.3 2011-06-15 12:43:12.000000000 +0200 -+++ src/newctime.3 2012-03-19 15:33:47.593750000 +0100 -@@ -197,20 +197,20 @@ - of the Prime Meridian. - The field's name is derived from Greenwich Mean Time, a precursor of UT. - .SH FILES --.ta \w'/usr/local/etc/zoneinfo/posixrules\0\0'u --/usr/local/etc/zoneinfo time zone information directory -+.ta \w'/usr/share/zoneinfo/posixrules\0\0'u -+/usr/share/zoneinfo time zone information directory - .br --/usr/local/etc/zoneinfo/localtime local time zone file -+/usr/share/zoneinfo/localtime local time zone file - .br --/usr/local/etc/zoneinfo/posixrules used with POSIX-style TZ's -+/usr/share/zoneinfo/posixrules used with POSIX-style TZ's - .br --/usr/local/etc/zoneinfo/GMT for UTC leap seconds -+/usr/share/zoneinfo/GMT for UTC leap seconds - .sp - If --.B /usr/local/etc/zoneinfo/GMT -+.B /usr/share/zoneinfo/GMT - is absent, - UTC leap seconds are loaded from --.BR /usr/local/etc/zoneinfo/posixrules . -+.BR /usr/share/zoneinfo/posixrules . - .SH SEE ALSO - getenv(3), - newstrftime(3), ---- origsrc/newtzset.3 2011-06-15 12:43:12.000000000 +0200 -+++ src/newtzset.3 2012-03-19 15:33:47.593750000 +0100 -@@ -262,20 +262,20 @@ - and cannot be interpreted as a direct specification, - UTC is used. - .SH FILES --.ta \w'/usr/local/etc/zoneinfo/posixrules\0\0'u --/usr/local/etc/zoneinfo time zone information directory -+.ta \w'/usr/share/zoneinfo/posixrules\0\0'u -+/usr/share/zoneinfo time zone information directory - .br --/usr/local/etc/zoneinfo/localtime local time zone file -+/usr/share/zoneinfo/localtime local time zone file - .br --/usr/local/etc/zoneinfo/posixrules used with POSIX-style TZ's -+/usr/share/zoneinfo/posixrules used with POSIX-style TZ's - .br --/usr/local/etc/zoneinfo/GMT for UTC leap seconds -+/usr/share/zoneinfo/GMT for UTC leap seconds - .sp - If --.B /usr/local/etc/zoneinfo/GMT -+.B /usr/share/zoneinfo/GMT - is absent, - UTC leap seconds are loaded from --.BR /usr/local/etc/zoneinfo/posixrules . -+.BR /usr/share/zoneinfo/posixrules . - .SH SEE ALSO - getenv(3), - newctime(3), diff --git a/tzcode/tzcode-man8.patch b/tzcode/tzcode-man8.patch deleted file mode 100644 index c38b125d..00000000 --- a/tzcode/tzcode-man8.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- origsrc/tzselect.8 2011-06-15 12:43:12.000000000 +0200 -+++ src/tzselect.8 2012-03-19 15:33:47.593750000 +0100 -@@ -91,7 +91,7 @@ - .TP - \f3TZDIR\fP - Name of the directory containing time zone data files (default: --.BR /usr/local/etc/zoneinfo ). -+.BR /usr/share/zoneinfo ). - .SH FILES - .TP - \f2TZDIR\fP\f3/iso3166.tab\fP ---- origsrc/zic.8 2011-06-15 12:43:12.000000000 +0200 -+++ src/zic.8 2012-03-19 15:33:47.593750000 +0100 -@@ -520,7 +520,7 @@ - use multiple zone continuation lines - specifying transition instants using universal time. - .SH FILE --/usr/local/etc/zoneinfo standard directory used for created files -+/usr/share/zoneinfo standard directory used for created files - .SH "SEE ALSO" - newctime(3), tzfile(5), zdump(8) - .\" This file is in the public domain, so clarified as of diff --git a/tzcode/tzcode-tzfile.patch b/tzcode/tzcode-tzfile.patch deleted file mode 100644 index 31f242f5..00000000 --- a/tzcode/tzcode-tzfile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/tzfile.h.orig 2013-09-11 13:42:07.000000000 +0400 -+++ src/tzfile.h 2013-11-05 11:42:57.378200000 +0400 -@@ -20,7 +20,7 @@ - */ - - #ifndef TZDIR --#define TZDIR "/usr/local/etc/zoneinfo" /* Time zone object file directory */ -+#define TZDIR "/usr/share/zoneinfo" /* Time zone object file directory */ - #endif /* !defined TZDIR */ - - #ifndef TZDEFAULT