rpm/timezone
SHA256
1
0
Fork 0
forked from pool/timezone
Code Pull Requests Activity

Accepting request 247454 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/247454
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/timezone?expand=0&rev=89
This commit is contained in:
Stephan Kulow 2014-09-07 09:11:41 +00:00 committed by Git OBS Bridge
parent 93e1e57ae2
commit 0cac23803c
14 changed files with 163 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
iso3166-uk.diff
View File

@ -1,5 +1,7 @@
--- timezone-2013g.orig/iso3166.tab
+++ timezone-2013g/iso3166.tab
Index: timezone-2014g/iso3166.tab
===================================================================
--- timezone-2014g.orig/iso3166.tab
+++ timezone-2014g/iso3166.tab
@@ -100,7 +100,7 @@ FM Micronesia
FO Faroe Islands
FR France

27
timezone-java.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Wed Sep 3 13:03:39 UTC 2014 - lchiquitto@suse.com
- update to 2014g (bnc#894862):
* Turks & Caicos are switching from US eastern time to UTC-4
year-round, modeled as a switch from EST/EDT to AST on
2014-11-02 at 02:00.
* Many past time stamps were changed for correctness.
* Many performance enhancements and fixes in the time zone
manipulation utilities.
- iso3166-uk.diff, tzcode-fromname.patch, tzcode-zic.diff,
tzdata-china.diff: refresh.
- tzcode-symlink.patch: rebase.
-------------------------------------------------------------------
Wed Sep 3 12:43:19 UTC 2014 - lchiquitto@suse.com
- update to 2014f (bnc#890921, bnc#892843):
* Russia will subtract an hour from most of its time zones on
2014-10-26 at 02:00 local time.
* Many time zone abbreviations were adjusted or fixed.
* Many past time stamps were changed for correctness.
* A new file 'zone1970.tab' was added. The new file's extended
format allows multiple country codes per zone. New applications
should use the new file.
* Some fixes in 'localtime', 'zic', 'mktime' and 'yearistype'.
-------------------------------------------------------------------
Fri Jun 13 19:23:34 UTC 2014 - lchiquitto@suse.com

2
timezone-java.spec
View File

@ -25,7 +25,7 @@ License: BSD-3-Clause and SUSE-Public-Domain
Group: System/Base
# COMMON-BEGIN
# COMMON-BEGIN
Version: 2014e
Version: 2014g
Release: 0
Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz
Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz

27
timezone.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Wed Sep 3 13:03:39 UTC 2014 - lchiquitto@suse.com
- update to 2014g (bnc#894862):
* Turks & Caicos are switching from US eastern time to UTC-4
year-round, modeled as a switch from EST/EDT to AST on
2014-11-02 at 02:00.
* Many past time stamps were changed for correctness.
* Many performance enhancements and fixes in the time zone
manipulation utilities.
- iso3166-uk.diff, tzcode-fromname.patch, tzcode-zic.diff,
tzdata-china.diff: refresh.
- tzcode-symlink.patch: rebase.
-------------------------------------------------------------------
Wed Sep 3 12:43:19 UTC 2014 - lchiquitto@suse.com
- update to 2014f (bnc#890921, bnc#892843):
* Russia will subtract an hour from most of its time zones on
2014-10-26 at 02:00 local time.
* Many time zone abbreviations were adjusted or fixed.
* Many past time stamps were changed for correctness.
* A new file 'zone1970.tab' was added. The new file's extended
format allows multiple country codes per zone. New applications
should use the new file.
* Some fixes in 'localtime', 'zic', 'mktime' and 'yearistype'.
-------------------------------------------------------------------
Fri Jun 13 19:23:34 UTC 2014 - lchiquitto@suse.com

3
timezone.spec
View File

@ -23,7 +23,7 @@ Group: System/Base
Url: http://www.iana.org/time-zones
PreReq: filesystem, coreutils
# COMMON-BEGIN
Version: 2014e
Version: 2014g
Release: 0
Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz
Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz
@ -88,6 +88,7 @@ cp -fp %{buildroot}%{_prefix}/share/zoneinfo/%{AREA}/%{ZONE} %{buildroot}/etc/lo
ln -sf /etc/localtime %{buildroot}%{_prefix}/share/zoneinfo/posixrules
install -m 644 iso3166.tab %{buildroot}%{_prefix}/share/zoneinfo/iso3166.tab
install -m 644 zone.tab %{buildroot}%{_prefix}/share/zoneinfo/zone.tab
install -m 644 zone1970.tab %{buildroot}%{_prefix}/share/zoneinfo/zone1970.tab
install -D -m 755 tzselect %{buildroot}%{_bindir}/tzselect
install -D -m 755 zdump %{buildroot}%{_sbindir}/zdump
install -D -m 755 zic %{buildroot}%{_sbindir}/zic

8
tzcode-fromname.patch
View File

@ -1,8 +1,8 @@
Index: timezone-2014b/zic.c
Index: timezone-2014g/zic.c
===================================================================
--- timezone-2014b.orig/zic.c
+++ timezone-2014b/zic.c
@@ -656,17 +656,17 @@ dolink(const char *const fromfield, cons
--- timezone-2014g.orig/zic.c
+++ timezone-2014g/zic.c
@@ -729,17 +729,17 @@ dolink(const char *const fromfield, cons
result = link(fromname, toname);
if (result != 0) {

29
tzcode-link.diff
View File

@ -1,9 +1,26 @@
Index: timezone-2013g/zic.c
This patch is used on openSUSE versions older than 12.2.
Back then, /etc/localtime was either a hard link to a zone
file in /usr/share/zoneinfo or a copy of it.
By default, zic tries the following approaches to create
/etc/localtime:
1. Hard link
2. Symbolic link
3. File copy
This patch changes the order to:
1. Hard link
2. File copy
3. Symbolic link
Index: timezone-2014g/zic.c
===================================================================
--- timezone-2013g.orig/zic.c
+++ timezone-2013g/zic.c
@@ -593,6 +593,23 @@ _("%s: More than one -L option specified
return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
--- timezone-2014g.orig/zic.c
+++ timezone-2014g/zic.c
@@ -686,6 +686,23 @@ namecheck(const char *name)
componentcheck(name, component, cp);
}
+static int
@ -26,7 +43,7 @@ Index: timezone-2013g/zic.c
static void
dolink(const char *const fromfield, const char *const tofield)
{
@@ -627,6 +644,8 @@ dolink(const char *const fromfield, cons
@@ -728,6 +745,8 @@ dolink(const char *const fromfield, cons
exit(EXIT_FAILURE);
result = link(fromname, toname);

72
tzcode-symlink.patch
View File

@ -1,38 +1,55 @@
Index: timezone-2014b/zic.c
This patch is used on openSUSE 12.2 or newer. Nowadays,
/etc/localtime is by default a symbolic link to a zone
file in /usr/share/zoneinfo.
By default, zic tries the following approaches to create
/etc/localtime:
1. Hard link
2. Symbolic link
3. File copy
This patch changes the logic slightly: keep using symbolic
links if /etc/localtime is already one. If it isn't, use
the default order as listed above.
Index: timezone-2014g/zic.c
===================================================================
--- timezone-2014b.orig/zic.c
+++ timezone-2014b/zic.c
@@ -120,7 +120,7 @@ static int addtype(zic_t gmtoff, const c
static void leapadd(zic_t t, int positive, int rolling, int count);
--- timezone-2014g.orig/zic.c
+++ timezone-2014g/zic.c
@@ -106,7 +106,7 @@ static int addtype(zic_t, char const *,
static void leapadd(zic_t, bool, int, int);
static void adjleap(void);
static void associate(void);
-static void dolink(const char * fromfield, const char * tofield);
+static void dolink(const char * fromfield, const char * tofield, int defaultsymlink);
static char ** getfields(char * buf);
static zic_t gethms(const char * string, const char * errstrng,
int signable);
@@ -603,7 +603,7 @@ _("%s: More than one -L option specified
static zic_t gethms(const char * string, const char * errstring,
bool);
@@ -608,7 +608,7 @@ _("%s: More than one -L option specified
*/
for (i = 0; i < nlinks; ++i) {
eat(links[i].l_filename, links[i].l_linenum);
- dolink(links[i].l_from, links[i].l_to);
+ dolink(links[i].l_from, links[i].l_to, FALSE);
+ dolink(links[i].l_from, links[i].l_to, false);
if (noise)
for (j = 0; j < nlinks; ++j)
if (strcmp(links[i].l_to,
@@ -612,18 +612,19 @@ _("%s: More than one -L option specified
@@ -617,11 +617,11 @@ _("%s: More than one -L option specified
}
if (lcltime != NULL) {
eat("command line", 1);
eat(_("command line"), 1);
- dolink(lcltime, TZDEFAULT);
+ dolink(lcltime, TZDEFAULT, TRUE);
+ dolink(lcltime, TZDEFAULT, true);
}
if (psxrules != NULL) {
eat("command line", 1);
eat(_("command line"), 1);
- dolink(psxrules, TZDEFRULES);
+ dolink(psxrules, TZDEFRULES, FALSE);
+ dolink(psxrules, TZDEFRULES, false);
}
return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
if (warnings && (ferror(stderr) || fclose(stderr) != 0))
return EXIT_FAILURE;
@@ -687,8 +687,9 @@ namecheck(const char *name)
}
static void
@ -42,34 +59,33 @@ Index: timezone-2014b/zic.c
+ struct stat st;
register char * fromname;
register char * toname;
@@ -634,6 +635,10 @@ dolink(const char *const fromfield, cons
register int fromisdir;
@@ -701,6 +702,10 @@ dolink(const char *const fromfield, cons
fromname = ecatalloc(fromname, "/");
fromname = ecatalloc(fromname, fromfield);
}
+
+ if (lstat(fromname, &st) == 0 && S_ISLNK(st.st_mode))
+ defaultsymlink = TRUE;
+ defaultsymlink = true;
+
if (tofield[0] == '/')
toname = ecpyalloc(tofield);
else {
@@ -647,15 +652,16 @@ dolink(const char *const fromfield, cons
*/
if (!itsdir(toname))
(void) remove(toname);
- if (link(fromname, toname) != 0
+ if (defaultsymlink || link(fromname, toname) != 0
&& access(fromname, F_OK) == 0 && !itsdir(fromname)) {
@@ -721,14 +726,15 @@ dolink(const char *const fromfield, cons
}
if (itsdir(toname) <= 0)
remove(toname);
- if (link(fromname, toname) != 0) {
+ if (defaultsymlink || link(fromname, toname) != 0) {
int result;
if (mkdirs(toname) != 0)
if (! mkdirs(toname))
exit(EXIT_FAILURE);
- result = link(fromname, toname);
- if (result != 0) {
+ if (!defaultsymlink) result = link(fromname, toname);
+
+ if (!defaultsymlink)
+ result = link(fromname, toname);
+ if ((defaultsymlink || (!defaultsymlink && result != 0))) {
const char *s = fromname;
const char *t;

8
tzcode-zic.diff
View File

@ -1,8 +1,8 @@
Index: timezone-2014b/zic.c
Index: timezone-2014g/zic.c
===================================================================
--- timezone-2014b.orig/zic.c
+++ timezone-2014b/zic.c
@@ -674,8 +674,10 @@ dolink(const char *const fromfield, cons
--- timezone-2014g.orig/zic.c
+++ timezone-2014g/zic.c
@@ -747,8 +747,10 @@ dolink(const char *const fromfield, cons
"../");
symlinkcontents = ecatalloc(symlinkcontents, t);
result = symlink(symlinkcontents, toname);

3
tzcode2014e.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:43ebc426ab4911e222a4487f24289adfd2bc5eb09363a5e77cdabf56374a8c1c
size 177124

3
tzcode2014g.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:df555fa4ad57cc7394812941d6d037b8c7ecea55e9916eaf4cd2adcb3403af7a
size 178215

58
tzdata-china.diff
View File

@ -1,22 +1,23 @@
Index: timezone-2014b/asia
Index: timezone-2014g/asia
===================================================================
--- timezone-2014b.orig/asia
+++ timezone-2014b/asia
@@ -489,6 +489,9 @@ Zone Asia/Kashgar 5:03:56 - LMT 1928 # o
--- timezone-2014g.orig/asia
+++ timezone-2014g/asia
@@ -523,6 +523,10 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1:
Zone Asia/Shanghai 8:05:43 - LMT 1901
8:00 Shang C%sT 1949
8:00 PRC C%sT
+
+# Nowadays, China Standard Time is known as "Beijing Time"
+Zone Asia/Beijing 8:00 PRC C%sT
+
# Hong Kong (Xianggang)
# Milne gives 7:36:41.7; round this.
Index: timezone-2014b/backward
# Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi
# / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.)
Zone Asia/Urumqi 5:50:20 - LMT 1928
Index: timezone-2014g/backward
===================================================================
--- timezone-2014b.orig/backward
+++ timezone-2014b/backward
@@ -89,14 +89,13 @@ Link America/Mexico_City Mexico/General
--- timezone-2014g.orig/backward
+++ timezone-2014g/backward
@@ -92,7 +92,7 @@ Link America/Mexico_City Mexico/General
Link Pacific/Auckland NZ
Link Pacific/Chatham NZ-CHAT
Link America/Denver Navajo
@ -25,32 +26,15 @@ Index: timezone-2014b/backward
Link Pacific/Pohnpei Pacific/Ponape
Link Pacific/Pago_Pago Pacific/Samoa
Link Pacific/Chuuk Pacific/Truk
Link Pacific/Chuuk Pacific/Yap
Link Europe/Warsaw Poland
Link Europe/Lisbon Portugal
-Link Asia/Taipei ROC
Link Asia/Seoul ROK
Link Asia/Singapore Singapore
Link Europe/Istanbul Turkey
Index: timezone-2014b/zone.tab
Index: timezone-2014g/zone.tab
===================================================================
--- timezone-2014b.orig/zone.tab
+++ timezone-2014b/zone.tab
@@ -155,11 +155,12 @@ CK -2114-15946 Pacific/Rarotonga
--- timezone-2014g.orig/zone.tab
+++ timezone-2014g/zone.tab
@@ -143,6 +143,7 @@ CK -2114-15946 Pacific/Rarotonga
CL -3327-07040 America/Santiago most locations
CL -2709-10926 Pacific/Easter Easter Island & Sala y Gomez
CL -2709-10926 Pacific/Easter Easter Island
CM +0403+00942 Africa/Douala
-CN +3114+12128 Asia/Shanghai east China - Beijing, Guangdong, Shanghai, etc.
-CN +4545+12641 Asia/Harbin Heilongjiang (except Mohe), Jilin
-CN +2934+10635 Asia/Chongqing central China - Sichuan, Yunnan, Guangxi, Shaanxi, Guizhou, etc.
-CN +4348+08735 Asia/Urumqi most of Tibet & Xinjiang
-CN +3929+07559 Asia/Kashgar west Tibet & Xinjiang
+CN +3955+11626 Asia/Beijing China Standard Time
+CN +3114+12128 Asia/Shanghai China east
+CN +4545+12641 Asia/Harbin China north
+CN +2934+10635 Asia/Chongqing China mountains
+CN +4348+08735 Asia/Urumqi China Xinjiang-Tibet
+CN +3929+07559 Asia/Kashgar China west Xinjiang
CN +3114+12128 Asia/Shanghai Beijing Time
CN +4348+08735 Asia/Urumqi Xinjiang Time
CO +0436-07405 America/Bogota
CR +0956-08405 America/Costa_Rica
CU +2308-08222 America/Havana

3
tzdata2014e.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:08e243a79051f838d86ac1311a78b74047951302d448024e823b5b7aa71f86c5
size 221587

3
tzdata2014g.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5547d5b7a982f7f53fffe68cb2a13692553f591a17d58c8ef15b20679d82a270
size 284889