From a05d012764d160aa8af62de4ac2b0efd110c59f78215b66308e43613e16545c4 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 15 Jun 2015 07:46:17 +0000 Subject: [PATCH] Accepting request 311959 from home:AndreasStieger:branches:Base:System timezone update 2015e [boo#934654] OBS-URL: https://build.opensuse.org/request/show/311959 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=162 --- timezone-java.changes | 10 ++ timezone-java.spec | 4 +- timezone.changes | 17 ++++ timezone.spec | 4 +- tzcode-zic-empty-comp.diff | 200 ------------------------------------- tzcode2015d.tar.gz | 3 - tzcode2015d.tar.gz.asc | 17 ---- tzcode2015e.tar.gz | 3 + tzcode2015e.tar.gz.asc | 17 ++++ tzdata2015d.tar.gz | 3 - tzdata2015d.tar.gz.asc | 17 ---- tzdata2015e.tar.gz | 3 + tzdata2015e.tar.gz.asc | 17 ++++ 13 files changed, 69 insertions(+), 246 deletions(-) delete mode 100644 tzcode-zic-empty-comp.diff delete mode 100644 tzcode2015d.tar.gz delete mode 100644 tzcode2015d.tar.gz.asc create mode 100644 tzcode2015e.tar.gz create mode 100644 tzcode2015e.tar.gz.asc delete mode 100644 tzdata2015d.tar.gz delete mode 100644 tzdata2015d.tar.gz.asc create mode 100644 tzdata2015e.tar.gz create mode 100644 tzdata2015e.tar.gz.asc diff --git a/timezone-java.changes b/timezone-java.changes index 475edbb..0db5396 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Jun 14 15:22:29 UTC 2015 - astieger@suse.com + +- timezone update 2015e [boo#934654] + * Morocco will suspend DST from 2015-06-14 03:00 through + 2015-07-19 02:00, not 06-13 and 07-18 as guessed. + * Assume Cayman Islands will observe DST starting next year, + using US rules. + * The file 'iso3166.tab' now uses UTF-8 + ------------------------------------------------------------------- Tue May 19 11:02:27 UTC 2015 - lchiquitto@suse.com diff --git a/timezone-java.spec b/timezone-java.spec index 84faeef..7c29906 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -25,7 +25,7 @@ License: BSD-3-Clause and SUSE-Public-Domain Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2015d +Version: 2015e Release: 0 Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz @@ -40,7 +40,6 @@ Patch2: tzcode-fromname.patch Patch3: iso3166-uk.diff Patch4: tzcode-link.diff Patch5: tzcode-symlink.patch -Patch6: tzcode-zic-empty-comp.diff # COMMON-END # COMMON-END Url: http://www.gnu.org/software/libc/libc.html @@ -64,7 +63,6 @@ package is intended for Java Virtual Machine based on OpenJDK. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch6 -p1 %if 0%{?suse_version} < 1220 %patch4 -p1 %else diff --git a/timezone.changes b/timezone.changes index 475edbb..dfb6624 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Sun Jun 14 15:32:39 UTC 2015 - astieger@suse.com + +- timezone update 2015e [boo#934654] + * Morocco will suspend DST from 2015-06-14 03:00 through + 2015-07-19 02:00, not 06-13 and 07-18 as guessed. + * Assume Cayman Islands will observe DST starting next year, + using US rules. + * The file 'iso3166.tab' now uses UTF-8 + * When displaying data, tzselect converts it to the current + locale's encoding if the iconv command works. + * tzselect no longer mishandles Dominica, fixing a bug introduced + in Release 2014f. + * zic -l no longer fails when compiled with + -DTZDEFAULT=\"/etc/localtime\", regression from 2014f. + Dropping upstreamed tzcode-zic-empty-comp.diff + ------------------------------------------------------------------- Tue May 19 11:02:27 UTC 2015 - lchiquitto@suse.com diff --git a/timezone.spec b/timezone.spec index 536f322..1888995 100644 --- a/timezone.spec +++ b/timezone.spec @@ -23,7 +23,7 @@ Group: System/Base Url: http://www.iana.org/time-zones PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2015d +Version: 2015e Release: 0 Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz @@ -38,7 +38,6 @@ Patch2: tzcode-fromname.patch Patch3: iso3166-uk.diff Patch4: tzcode-link.diff Patch5: tzcode-symlink.patch -Patch6: tzcode-zic-empty-comp.diff # COMMON-END BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,7 +57,6 @@ can select an appropriate time zone for your system with YaST. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch6 -p1 %if 0%{?suse_version} < 1220 %patch4 -p1 %else diff --git a/tzcode-zic-empty-comp.diff b/tzcode-zic-empty-comp.diff deleted file mode 100644 index 1fbdb5c..0000000 --- a/tzcode-zic-empty-comp.diff +++ /dev/null @@ -1,200 +0,0 @@ -commit fc861a9e137c63e1b0d562ad09d0dd5f4d8e798f -Author: Paul Eggert -Date: Tue May 19 01:24:30 2015 -0700 - - Fix zic -l problem with /etc/localtime - - Problem reported by Leonardo Chiquitto in: - http://mm.icann.org/pipermail/tz/2015-May/022276.html - Apparently his zic was built with -DTZDEFAULT=\"/etc/localtime\". - * NEWS: Document this. - * zic.c (verror): Don't dump core if filename is NULL. - (main, infile, mkdirs): Omit unnecessary trailing \n in diagnostic. - (componentcheck, namecheck): Now returns bool. All callers changed. - (componentcheck): Make the diagnostics more understandable. - Don't exit on error, so that the user can see multiple errors. - (dolink, writezone): Don't namecheck here. - (inzsub, inlink): Do it here instead. - This generates better diagnostics, and avoids the bug, since - it doesn't apply namecheck to TZDEFAULT or to TZDEFRULES. - -Index: timezone-2015d/NEWS -=================================================================== ---- timezone-2015d.orig/NEWS -+++ timezone-2015d/NEWS -@@ -25,6 +25,10 @@ Release 2015d - 2015-04-24 08:09:46 -070 - - zic has some minor performance improvements. - -+ zic -l no longer fails when compiled with -DTZDEFAULT=\"/etc/localtime\". -+ This fixes a bug introduced in Release 2014f. -+ (Problem reported by Leonardo Chiquitto.) -+ - - Release 2015c - 2015-04-11 08:55:55 -0700 - -Index: timezone-2015d/zic.c -=================================================================== ---- timezone-2015d.orig/zic.c -+++ timezone-2015d/zic.c -@@ -443,7 +443,8 @@ verror(const char *const string, va_list - ** zic ... 2>&1 | error -t "*" -v - ** on BSD systems. - */ -- fprintf(stderr, _("\"%s\", line %d: "), filename, linenum); -+ if (filename) -+ fprintf(stderr, _("\"%s\", line %d: "), filename, linenum); - vfprintf(stderr, string, args); - if (rfilename != NULL) - fprintf(stderr, _(" (rule from \"%s\", line %d)"), -@@ -595,7 +596,7 @@ _("%s: More than one -L option specified - noise = true; - break; - case 's': -- warning(_("-s ignored\n")); -+ warning(_("-s ignored")); - break; - } - if (optind == argc - 1 && strcmp(argv[optind], "=") == 0) -@@ -648,36 +649,43 @@ _("%s: More than one -L option specified - return errors ? EXIT_FAILURE : EXIT_SUCCESS; - } - --static void -+static bool - componentcheck(char const *name, char const *component, - char const *component_end) - { - enum { component_len_max = 14 }; - size_t component_len = component_end - component; - if (component_len == 0) { -- fprintf(stderr, _("%s: file name '%s' contains empty component"), -- progname, name); -- exit(EXIT_FAILURE); -+ if (!*name) -+ error (_("empty file name")); -+ else -+ error (_(component == name -+ ? "file name '%s' begins with '/'" -+ : *component_end -+ ? "file name '%s' contains '//'" -+ : "file name '%s' ends with '/'"), -+ name); -+ return false; - } - if (0 < component_len && component_len <= 2 - && component[0] == '.' && component_end[-1] == '.') { -- fprintf(stderr, _("%s: file name '%s' contains" -- " '%.*s' component"), -- progname, name, (int) component_len, component); -- exit(EXIT_FAILURE); -+ error(_("file name '%s' contains '%.*s' component"), -+ name, (int) component_len, component); -+ return false; - } -- if (!noise) -- return; -- if (0 < component_len && component[0] == '-') -- warning(_("file name '%s' component contains leading '-'"), -- name); -- if (component_len_max < component_len) -- warning(_("file name '%s' contains overlength component" -- " '%.*s...'"), -- name, component_len_max, component); -+ if (noise) { -+ if (0 < component_len && component[0] == '-') -+ warning(_("file name '%s' component contains leading '-'"), -+ name); -+ if (component_len_max < component_len) -+ warning(_("file name '%s' contains overlength component" -+ " '%.*s...'"), -+ name, component_len_max, component); -+ } -+ return true; - } - --static void -+static bool - namecheck(const char *name) - { - register char const *cp; -@@ -701,14 +709,14 @@ namecheck(const char *name) - ? _("file name '%s' contains byte '%c'") - : _("file name '%s' contains byte '\\%o'")), - name, c); -- return; - } - if (c == '/') { -- componentcheck(name, component, cp); -+ if (!componentcheck(name, component, cp)) -+ return false; - component = cp + 1; - } - } -- componentcheck(name, component, cp); -+ return componentcheck(name, component, cp); - } - - static char * -@@ -733,7 +741,6 @@ dolink(const char *const fromfield, cons - register char * toname; - register int fromisdir; - -- namecheck(tofield); - fromname = relname(directory, fromfield); - toname = relname(directory, tofield); - /* -@@ -1022,9 +1029,9 @@ infile(const char *name) - break; - case LC_LEAP: - if (name != leapsec) -- warning( --_("%s: Leap line in non leap seconds file %s\n"), -- progname, name); -+ warning(_("%s: Leap line in non leap" -+ " seconds file %s"), -+ progname, name); - else inleap(fields, nfields); - wantcont = false; - break; -@@ -1180,7 +1187,9 @@ inzsub(char **fields, int nfields, bool - i_untilday = ZFC_TILDAY; - i_untiltime = ZFC_TILTIME; - z.z_name = NULL; -- } else { -+ } else if (!namecheck(fields[ZF_NAME])) -+ return false; -+ else { - i_gmtoff = ZF_GMTOFF; - i_rule = ZF_RULE; - i_format = ZF_FORMAT; -@@ -1356,10 +1365,8 @@ inlink(register char **const fields, con - error(_("blank FROM field on Link line")); - return; - } -- if (*fields[LF_TO] == '\0') { -- error(_("blank TO field on Link line")); -- return; -- } -+ if (! namecheck(fields[LF_TO])) -+ return; - l.l_filename = filename; - l.l_linenum = linenum; - l.l_from = ecpyalloc(fields[LF_FROM]); -@@ -1589,7 +1596,6 @@ writezone(const char *const name, const - void *typesptr = ats + timecnt; - unsigned char *types = typesptr; - -- namecheck(name); - /* - ** Sort. - */ -@@ -2954,7 +2960,7 @@ mkdirs(char *argname) - if (itsdir(name) <= 0) { - char const *e = strerror(err); - warning(_("%s: Can't create directory" -- " %s: %s\n"), -+ " %s: %s"), - progname, name, e); - free(name); - return false; diff --git a/tzcode2015d.tar.gz b/tzcode2015d.tar.gz deleted file mode 100644 index f9b8292..0000000 --- a/tzcode2015d.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:221af54ec5c42eaf0101159ffe1256a883d1c14c46228d42774c656a56317128 -size 184178 diff --git a/tzcode2015d.tar.gz.asc b/tzcode2015d.tar.gz.asc deleted file mode 100644 index 911c5d5..0000000 --- a/tzcode2015d.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJVOl3RAAoJEO2X6Q5iqn40BtMP/1opNPVcTRK/GFw7wQXpegzS -mGM4R1LXua2txG1P8gEkeNHimRqeDWixI/crg4sOoKAb10wvkf70lAI3cVRCMHS+ -F4zL3JQJktj/LXBJGmNOwonTdz0mBQASF7DnxX8mL+/QpyKZSy4pTRQDIBKhzlKM -PuIpVT6HYXLzi+L2jim2W3EU/7Ja0pOB0pFJNGoJ2SGhja2jvj3Ae3hzfsyXbcQI -kQ4Eo7k6hCu0FP7YtGg8D2CqGvXTrErUNI8gTIvT2mV8aDy9j6SbAl0XrTz1UASU -lrzwQ/GgGhLeYFMriCCo5zf+H8pjm4+N4JniEf30lIB06CGspQg3ZhchdrexHfWM -j+exPhzadR+qQMEdQ95oiY/J5u4N1ykE9WGdianFUlINklCqejImYYKAzMWzFQSs -GACVxBp9WWZ1VEAU3eag6TyVKJGiQMtpaGolpVnCaU1JTcFAxpFmOZ55BosS8J/w -c+cqke7zTtFfaPJhuylSOca95lAEd14HP+nAFxvGwIhX8z3FbM8pRlOW+rV2wIYH -UUAPrSKu+QFTvOl1+TnrydE9cHjbmDC2Vknz1SGel7e2USXTEB4UvgzVyr5E7qf6 -ckKB7l6LRIfIXlJSojcF06P2Xz4UJlIbzwA1oXpaK7g9H4YZMGDqIB5HhBRVZx6p -KG2eiGYTmCnJt3Gk6SY2 -=cvHz ------END PGP SIGNATURE----- diff --git a/tzcode2015e.tar.gz b/tzcode2015e.tar.gz new file mode 100644 index 0000000..b86223f --- /dev/null +++ b/tzcode2015e.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5a217b55847fb56f470a7738939c36f3a520d6cc12342d965cfcf848e59ada0 +size 185129 diff --git a/tzcode2015e.tar.gz.asc b/tzcode2015e.tar.gz.asc new file mode 100644 index 0000000..a29c334 --- /dev/null +++ b/tzcode2015e.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJVfG8zAAoJEO2X6Q5iqn4014YP/jGiiK7VYqstDoQNm33/pOwx +WlwTSkzByrhx0whaaAlTQ+j61q2MdZaDlpdDd4CEGN1vWaiI26MOEbZEKVpW5ogm +xKGL9esGltoc3jelmWJTVf0e03l+k0+zDcnBq+58Pi5rkgM/WVFyZBDyCT5HGLq+ +NPaHLHU4dlWtwpyd9Mr4eMb6DPEM4zbTK2NbHh/uf+ODG8F1VW8FP63N/hqq4Y/q +4H+ngf9jJxw73pBri/WBmidSxLWhhc+woezhKqbCThto4Jhoehlp3txIqBmAoN3G +AwppaGiHV6PYheLqloCDmdxABMoS95tznuk8eL2FF69IP541kaOchHvKCnbEf6gu +Sdr388Ayli/C98ZQknwzNWVlfKKW+d+nidS5iGyEHRpI/42RPemGh5kgYmZucZpH +DRIbujsi9usxjrazWC8oGf7WH6D6ZmsUusl7pj071YnU0gpXyVSk9GUoMWIp3Wxc +CSHJWxF6lkxOmHDqZFHhcVyyKlPHXFpWpDUPhu/QTi7oiSQeXRoP9BQAz07oN8WS +69JUSxCvkFANkFxnx6knsDBwduFUqiZ209WwV0R72DI/7Gi6OuubXUvgcQfJOHab +wOyEInI32uHRKxEaQuDmu1PSzlur0iNGH3PtuQzgwLlMM0KXsRbLBhOO5zP2BgQ6 +zVgFQ9FGlnExUxsBcnTf +=BRRd +-----END PGP SIGNATURE----- diff --git a/tzdata2015d.tar.gz b/tzdata2015d.tar.gz deleted file mode 100644 index 53e16f3..0000000 --- a/tzdata2015d.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b9f5008277f09e251e97dba7813f56168d691115bda90ade4638d72f296d531 -size 296131 diff --git a/tzdata2015d.tar.gz.asc b/tzdata2015d.tar.gz.asc deleted file mode 100644 index d208a22..0000000 --- a/tzdata2015d.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJVOl3RAAoJEO2X6Q5iqn401YgP/igT318zjaLcBATJ2pQ7aMj1 -WrtkZ+m/Urt5pkgtNxtx608eXKTZbs5g9YeJHFS3eN74y8JIrTfNaBiPWNeG0x8m -nc83Jvs++B9A8JFjAAjhZVl2TbGTpD5r9FGqQXmIX4qKsB5W1b+OGW3OtXM9vNGK -ZVC6TEp/wEuqt3dmjhirLihmdj1W/+2aowlm7PAPhJY9R3QdYJ2dRh8WRvGRSxtc -EIorFKgfNOWJJnKCk+YPeK4xPxivNw43nYAy6UnavJYPjTpHxaAx47533R7nm6Cy -b2JMdpQSRv4TZrnfz0OzXV/qhJskZNxgf6LR0/3uMSzX1VBO1Wywpmg2wIuij5qo -POG8dJr+TsVL3O539DTQ1nYqV0kCzfWirTML9ipF/jwEeG/EFBjkNM6g5eyJLrZp -7Ej4dTbiqmde/Ajh5ECW4AdNQqTaR35BBLtj2PR415dBGhiFMxR30TyX16rbGVWX -Mb5abkkS1v4NxLtvi5mtJJl5JNLrYEW/nOqwrIeEEBY2BvvZdeJVqHlXWeBoY9P+ -vSQoN9/gCFSQd5olmVVnuP+mqwzyipG8UUsyr7IAyeRc4bRPRyHkC8FdXy+lmrfP -HJaPVcPDm6ZFW7BAFw/fqJC6DJj7I48qzKnHb7O9qtkzXjL+wW8kR6SidxANcMa/ -6lJlIHLlXKjj57lVsQHt -=zE0V ------END PGP SIGNATURE----- diff --git a/tzdata2015e.tar.gz b/tzdata2015e.tar.gz new file mode 100644 index 0000000..0911732 --- /dev/null +++ b/tzdata2015e.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffc9b5d38abda8277aa479e3f75aa7668819d0977cd1a0c8ef3b09128334ba6f +size 296773 diff --git a/tzdata2015e.tar.gz.asc b/tzdata2015e.tar.gz.asc new file mode 100644 index 0000000..8052fbb --- /dev/null +++ b/tzdata2015e.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJVfG8/AAoJEO2X6Q5iqn40ed0P/jn6lgG6tH+C2Xv2DYz5buRK +CMDoGidznyzDuPSNgSPRaDetoKQ/6iVzEIgHYwBxBtmKmPXUgSY8rJPCabSLNKWK +T3o7f8aREnIcfexmct/4DEeUOXePUIbSHnX6Noy3AmSvIsKT8ZahEpnELKgWFQD8 +0EEOlck1rTTpEi9G2RATUwr430ii1OguIt0sKYycTvT1VFdihKWoFhgV9ydgaMh2 +88he3Ornt4xd4/b278IJl3GI0WWVbVl2A+ziRPAkl3AH7iW7mTcv+/8i3u7txVW+ +zB47UHOfV9jpiecLUQDw42KZJTlS+AkbgCitrpL++bZz1WQHWP9JkpgvAR8bdkBf +WPNvcPXiG0I6Vtl2ZZrc2WXi9L22m0xIJA2so4vpBwBIMkTnaFa6VthLGy9UgHpA +wteG6OogfdNm7fv+GhuRUNuHtd5TP5HdywhWMrMtGqgOvkEm/lF6tRMd12Wm57IW +u72Gv3RrJILBuOvBvWPZJMNsjc8Uj1U+dhKa8Z51VHA85ZyiRM3mQr8g+1WETH/E +sjnj8NgKkh7TL/N5vWJH1M3g1XZ3uofPL1Cbyqg04BGrMytxGAjigzIDbbg5pky+ +yFUqR3qm12d9QPlm1xh35qxqYYDXcbiQkXENwGukLRzcc0jdU4BrFpDc1tVgukUg +TmCC2ALEcxWWPEc1vtUG +=gO91 +-----END PGP SIGNATURE-----