From b1fc41d1a24456ae208e90cbc54bb6f5030b3bef4a1d84a2e6244c351961566e Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Thu, 23 Mar 2023 10:38:45 +0000 Subject: [PATCH 1/3] Accepting request 1073946 from home:dspinella:branches:Base:System - timezone update 2023a: * Egypt now uses DST again, from April through October. * This year Morocco springs forward April 23, not April 30. * Palestine delays the start of DST this year. * Much of Greenland still uses DST from 2024 on. * America/Yellowknife now links to America/Edmonton. * tzselect can now use current time to help infer timezone. * The code now defaults to C99 or later. - Refresh tzdata-china.diff - Remove upstreamed patch gcc13-fix.patch - timezone update 2023a: * Egypt now uses DST again, from April through October. * This year Morocco springs forward April 23, not April 30. * Palestine delays the start of DST this year. * Much of Greenland still uses DST from 2024 on. * America/Yellowknife now links to America/Edmonton. * tzselect can now use current time to help infer timezone. * The code now defaults to C99 or later. - Refresh tzdata-china.diff - Remove upstreamed patch gcc13-fix.patch OBS-URL: https://build.opensuse.org/request/show/1073946 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=298 --- timezone-java.changes | 14 ++++++++++++++ timezone-java.spec | 4 +--- timezone.changes | 14 ++++++++++++++ timezone.spec | 4 +--- tzcode2022g.tar.gz | 3 --- tzcode2022g.tar.gz.asc | 16 ---------------- tzcode2023a.tar.gz | 3 +++ tzcode2023a.tar.gz.asc | 16 ++++++++++++++++ tzdata-china.diff | 24 ++++++++++++------------ tzdata2022g.tar.gz | 3 --- tzdata2022g.tar.gz.asc | 16 ---------------- tzdata2023a.tar.gz | 3 +++ tzdata2023a.tar.gz.asc | 16 ++++++++++++++++ 13 files changed, 80 insertions(+), 56 deletions(-) delete mode 100644 tzcode2022g.tar.gz delete mode 100644 tzcode2022g.tar.gz.asc create mode 100644 tzcode2023a.tar.gz create mode 100644 tzcode2023a.tar.gz.asc delete mode 100644 tzdata2022g.tar.gz delete mode 100644 tzdata2022g.tar.gz.asc create mode 100644 tzdata2023a.tar.gz create mode 100644 tzdata2023a.tar.gz.asc diff --git a/timezone-java.changes b/timezone-java.changes index 777a5dd..be10176 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Mar 23 10:28:18 UTC 2023 - Danilo Spinella + +- timezone update 2023a: + * Egypt now uses DST again, from April through October. + * This year Morocco springs forward April 23, not April 30. + * Palestine delays the start of DST this year. + * Much of Greenland still uses DST from 2024 on. + * America/Yellowknife now links to America/Edmonton. + * tzselect can now use current time to help infer timezone. + * The code now defaults to C99 or later. +- Refresh tzdata-china.diff +- Remove upstreamed patch gcc13-fix.patch + ------------------------------------------------------------------- Tue Mar 7 09:34:28 UTC 2023 - Martin Liška diff --git a/timezone-java.spec b/timezone-java.spec index a2a1412..8dd533c 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: 2022g +Version: 2023a Release: 0 Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz Source1: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz @@ -37,7 +37,6 @@ Patch0: tzdata-china.diff Patch3: iso3166-uk.diff Patch4: timezone-2018f-bsc1112310.patch Patch5: fat.patch -Patch6: gcc13-fix.patch # COMMON-END # COMMON-END URL: https://www.iana.org/time-zones @@ -59,7 +58,6 @@ package is intended for Java Virtual Machine based on OpenJDK. %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358] # COMMON-PREP-END # COMMON-PREP-END diff --git a/timezone.changes b/timezone.changes index 777a5dd..be10176 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Mar 23 10:28:18 UTC 2023 - Danilo Spinella + +- timezone update 2023a: + * Egypt now uses DST again, from April through October. + * This year Morocco springs forward April 23, not April 30. + * Palestine delays the start of DST this year. + * Much of Greenland still uses DST from 2024 on. + * America/Yellowknife now links to America/Edmonton. + * tzselect can now use current time to help infer timezone. + * The code now defaults to C99 or later. +- Refresh tzdata-china.diff +- Remove upstreamed patch gcc13-fix.patch + ------------------------------------------------------------------- Tue Mar 7 09:34:28 UTC 2023 - Martin Liška diff --git a/timezone.spec b/timezone.spec index c72588d..2e85413 100644 --- a/timezone.spec +++ b/timezone.spec @@ -22,7 +22,7 @@ License: BSD-3-Clause AND SUSE-Public-Domain Group: System/Base URL: http://www.iana.org/time-zones # COMMON-BEGIN -Version: 2022g +Version: 2023a Release: 0 Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz Source1: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz @@ -34,7 +34,6 @@ Patch0: tzdata-china.diff Patch3: iso3166-uk.diff Patch4: timezone-2018f-bsc1112310.patch Patch5: fat.patch -Patch6: gcc13-fix.patch # COMMON-END BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,7 +51,6 @@ can select an appropriate time zone for your system with YaST. %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358] # COMMON-PREP-END diff --git a/tzcode2022g.tar.gz b/tzcode2022g.tar.gz deleted file mode 100644 index 951103e..0000000 --- a/tzcode2022g.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9610bb0b9656ff404c361a41f3286da53064b5469d84f00c9cb2314c8614da74 -size 287901 diff --git a/tzcode2022g.tar.gz.asc b/tzcode2022g.tar.gz.asc deleted file mode 100644 index 62f808e..0000000 --- a/tzcode2022g.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmOGOvAACgkQ7ZfpDmKq -fjSI4w/+PkVPCILI34+QeXIm6LLPhEPLxtb7q3rvfoBXk/qyottcPJvQXSAsqX/c -Hus6lCNK0COyICVn48rf3ss+GNxLev/ZTMVLUBkH8WrgSe+5lPDjmaZjkbzIGPs8 -L9TqE60K8DyeLNnZPf4Pkpx6o5r7uO3iQSN5qFyj5H82mDJ4vcQLZSNvDIA4+sRm -+qmsBcn6Gk3EU3u3/YrxhuEY0ymUrJvm5LSG62CqLwA1Pd+REF70Ir5LdO4yJoUS -blWe/CLUcnRfzMEK9/NGa1z3GtkisPYBCPnYJ93m2n4ASvFQ+R3t7NCEY2W+96ce -3kSPIX5W2g0/gcDTi1bxdLnQkO4RxtSQnlCjCae58dQNUgOa2X8mdRniRjjYC059 -JY35VUzmX9wCPpcuq0iMbpOEWXeWga0ZDRmlZtZCwPKxkw+AhoJQVp5jxGNa4kwZ -CZDjQga3ObvN8aQqMi9TpabJ4m2ZdN1yHQ7OTN80N67tHYMAbW0aY3J0JRIVjTHo -P+8Y6FaCLzJA73BgnR7faiILXIPtXE54X+koo8x2Uwtrl8/wHsaPTippq96ts6Y6 -3Zdr3EAQgAPhYtUgtHoIbLFBLjmyL5sUXOTwG/gMkUYXVkDpeBnc+BHrkv0Sjaw7 -Vzz5HthhnSblP9bLB3KPTbbM0t+aypsSOYOSZWnIK8ANI9BdrNQ= -=tSyt ------END PGP SIGNATURE----- diff --git a/tzcode2023a.tar.gz b/tzcode2023a.tar.gz new file mode 100644 index 0000000..1e93693 --- /dev/null +++ b/tzcode2023a.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6dcccd26a13a4b71c53e573a0bf32b98de467aa3316b82dfd25fffdb6c9fc46a +size 292438 diff --git a/tzcode2023a.tar.gz.asc b/tzcode2023a.tar.gz.asc new file mode 100644 index 0000000..0a48c10 --- /dev/null +++ b/tzcode2023a.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmQbXA8ACgkQ7ZfpDmKq +fjSDXRAAjfD1GMYAFHDvXOlCCitgTsTjBBuPHPbrQ7gTWno9uX8bvss3aXCUslHv +sfzCHMKhJqMXGLzSQQ5jEP/k4fOjNJyIQbVlrY9XljpdGeOdYa1E0zr95dIf4/ta +NUY9XxzFnd3hwQuc6LY77MOv2Xyy/5RAGajD2DTpYTLjE0ffMFK371efs//GcLqe +aCIWBdet1rJyih6CoyzfNvl6QHQOxZLSlE2E3DYu430fTi/UhmTcaATW8gRNulL5 +kXamzD9l45/cGOx/jHP6CkJIqFTFV4W1/W/VyjIEgRE0KGbuQO3LV0avohjhmmwm +hS6H6RJYfgeF+vwmo3unN+vUwPLhkPUiz2NO/Uf0n22AVQlUOrEP0XVXYW8aRd3H +ewDrlvDCMkvmKqEb8k0jqbmjqTgeblKoqeS7gIShhVmrIli8oN4mguWg5WaeRWF/ +l3uYtBXOg/DJMwENrB+4u0+PRWuR2T5OW/E4NvaKIu58qzozP7WEmlEwv9KWZB+z +ffmNaVgXqSCz50K6gvhoDKLn5YBgpB9kXDd+YrcqPUAyD0sDWhBC2Hx9HHePOfQl +dFB+ijja5HB8aZD/rX0iLrSwp/Ndt4l2QjXY9SMjTiWx4SgGGmGCANQqCDZGD31a +C8bdEMH4qQeOPZ/NsPB6KaJsqALNroF07YeINu0YfWkw89ZF/r4= +=mRAo +-----END PGP SIGNATURE----- diff --git a/tzdata-china.diff b/tzdata-china.diff index b33b510..447a399 100644 --- a/tzdata-china.diff +++ b/tzdata-china.diff @@ -1,7 +1,7 @@ -Index: timezone-2022f/asia +Index: timezone-2023a/asia =================================================================== ---- timezone-2022f.orig/asia -+++ timezone-2022f/asia +--- timezone-2023a.orig/asia ++++ timezone-2023a/asia @@ -653,6 +653,8 @@ Rule PRC 1987 1991 - Apr Sun>=11 2:00 1 Zone Asia/Shanghai 8:05:43 - LMT 1901 8:00 Shang C%sT 1949 May 28 @@ -11,11 +11,11 @@ Index: timezone-2022f/asia # Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi # / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.) # Vostok base in Antarctica matches this since 1970. -Index: timezone-2022f/zone.tab +Index: timezone-2023a/zone.tab =================================================================== ---- timezone-2022f.orig/zone.tab -+++ timezone-2022f/zone.tab -@@ -144,6 +144,7 @@ CL -3327-07040 America/Santiago Chile (m +--- timezone-2023a.orig/zone.tab ++++ timezone-2023a/zone.tab +@@ -142,6 +142,7 @@ CL -3327-07040 America/Santiago most of CL -5309-07055 America/Punta_Arenas Region of Magallanes CL -2709-10926 Pacific/Easter Easter Island CM +0403+00942 Africa/Douala @@ -23,12 +23,12 @@ Index: timezone-2022f/zone.tab CN +3114+12128 Asia/Shanghai Beijing Time CN +4348+08735 Asia/Urumqi Xinjiang Time CO +0436-07405 America/Bogota -Index: timezone-2022f/zone1970.tab +Index: timezone-2023a/zone1970.tab =================================================================== ---- timezone-2022f.orig/zone1970.tab -+++ timezone-2022f/zone1970.tab -@@ -124,6 +124,7 @@ CK -2114-15946 Pacific/Rarotonga - CL -3327-07040 America/Santiago Chile (most areas) +--- timezone-2023a.orig/zone1970.tab ++++ timezone-2023a/zone1970.tab +@@ -125,6 +125,7 @@ CK -2114-15946 Pacific/Rarotonga + CL -3327-07040 America/Santiago most of Chile CL -5309-07055 America/Punta_Arenas Region of Magallanes CL -2709-10926 Pacific/Easter Easter Island +CN +3955+11626 Asia/Beijing China Standard Time diff --git a/tzdata2022g.tar.gz b/tzdata2022g.tar.gz deleted file mode 100644 index a172830..0000000 --- a/tzdata2022g.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4491db8281ae94a84d939e427bdd83dc389f26764d27d9a5c52d782c16764478 -size 439731 diff --git a/tzdata2022g.tar.gz.asc b/tzdata2022g.tar.gz.asc deleted file mode 100644 index 3dfb9da..0000000 --- a/tzdata2022g.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmOGOvAACgkQ7ZfpDmKq -fjSedhAAu8XkzqB8NmXDYfEurBCUPe7zCBxBe7yqdt5W+tDA9snOtab3d8Oq7Lsb -vNZfh4qHIxNbEYpoXOc0Qce3XKXGgyKDmZeFYQJ0ziqoZXetNLQEmg7T/H2m3GHl -eo7K3w2hvyBB26FuDtimE5pzuJo9qJLXDp2SbOAbKa1w5HibyvZBOfcQozZ4CBmE -mBc8LzyFY3zOhiy7CGYskqOzatNa0Eid95RkK2RXXTnN965N1qdyOz3z9SkJFH9h -MR84VGYBmk0UGdPGmp1imkGmIrO/8AFny19ECCe4F74o2DFSPzANOaEh+i3fIP3d -GNR96la9GGopmna+VNQt6zxdw4DHRoNkAupnJ2NVM0lbAMOG0mmwCFkCzW4gzTVm -7NdAtZyH+HjiKYPdQNIHbsvl0K1qIo1yXrb4jTd8eXaxA65msCOOwjqWk7a8ZjrJ -NrLNmGeLow9svofEAeLpc9BUgwF90JGIlb+tPYovyj/xSU9vhQl1ZEmFYYdaN781 -rGZ5jKtwBZWoAxW1Copf8S3jcxleSVMFo6MTEU+K+svZLd8SH5BnETa0fYWSTzKA -uh2Y4V6pFe0/JVVC15mYkytbP6TC6prRmi44jRHtVRDtizGd7FFxYacIApkhBVi2 -Qb8Qy+oZySwL+dbRlu+bA9nHIdACtxRouVEWpAecCBLaK3kBb7I= -=6g+2 ------END PGP SIGNATURE----- diff --git a/tzdata2023a.tar.gz b/tzdata2023a.tar.gz new file mode 100644 index 0000000..600c853 --- /dev/null +++ b/tzdata2023a.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2a27edb7af5a384cfcefdae9defad6a7ed23f3f2cfdaf3d5394c1e8299710bc +size 442875 diff --git a/tzdata2023a.tar.gz.asc b/tzdata2023a.tar.gz.asc new file mode 100644 index 0000000..5ac54a5 --- /dev/null +++ b/tzdata2023a.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmQbXA8ACgkQ7ZfpDmKq +fjRngg/8D8E5sJIt412pmR7yIQYnsG44nSiELNpiewG+SF4DofW7quQDQEjDMdVn +seLU9okE1/l+1SN6eibMJgvho/6HWkU9kWLzYCY29sljTVYqEu6vLo1IY1OJIkjC +9yieL33oLkN4LIeSMzR4QOCkRfusYNRYq3uryVtMu7R6HP2PgMlmmJf/imV192tj +ONJXNA4Y30EvJ3lHuXMbr7fNg9hXSLjRy1NPKjp5OVZ3jZVXPljrC+egAfhLjZdQ +uB5a3uGjAX+KjemCHwTmrrmmcUlaHxFxlfN5gX5cNIXuyrYtz0PAhy+MhBM5F9iY +erYWg6EfBr7IfSyS1JcDZ1ypwZ66EpKxXfWZNm+HFA4dDdnWgvlM4n1OyKjw03Dq +4/agYr34cUDhfBUS57dtpZSibtdpbh8oiqxc+wXV3KZcHXVpX3XRyGTH1UVINfnF +nXArC09JKUt7Tjol83TPH0jDXJAxabkgUDJHfpeQ5A8r3GNW1PQ/OF25ieRb+AFQ +jWFbiEIxSXmUwnRc6wHiLX/gU0TT7vVMokN5erx9IGwrDEQAljuEJoj2bYFT/q9D +8jFA+48r/nK2r33+OBrz6aryoMNptquuMG0XR4aSr6KO3e622+vuF4nSN7hg2sAM +/bMLSlzOGUEmOZ2D7hP5MDdWw5L0WQAjX7/8xKzdlMhqkx4Mc9Q= +=OxWX +-----END PGP SIGNATURE----- From c9c492dfb0da227bc9e565209e8f180b7849046fdd435b649b6e2c5083dd3db9 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Thu, 23 Mar 2023 13:53:25 +0000 Subject: [PATCH 2/3] Accepting request 1073977 from home:dspinella:branches:Base:System OBS-URL: https://build.opensuse.org/request/show/1073977 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=299 --- gcc13-fix.patch | 272 ------------------------------------------------ 1 file changed, 272 deletions(-) delete mode 100644 gcc13-fix.patch diff --git a/gcc13-fix.patch b/gcc13-fix.patch deleted file mode 100644 index 9c4d540..0000000 --- a/gcc13-fix.patch +++ /dev/null @@ -1,272 +0,0 @@ -diff --git a/date.c b/date.c -index 11c5e5f..97df6ab 100644 ---- a/date.c -+++ b/date.c -@@ -42,7 +42,7 @@ static void display(const char *, time_t); - static void dogmt(void); - static void errensure(void); - static void timeout(FILE *, const char *, const struct tm *); --static ATTRIBUTE_NORETURN void usage(void); -+ATTRIBUTE_NORETURN static void usage(void); - - int - main(const int argc, char *argv[]) -diff --git a/localtime.c b/localtime.c -index 1d22d35..3bf1b91 100644 ---- a/localtime.c -+++ b/localtime.c -@@ -838,7 +838,7 @@ is_digit(char c) - ** Return a pointer to that character. - */ - --static ATTRIBUTE_REPRODUCIBLE const char * -+ATTRIBUTE_REPRODUCIBLE static const char * - getzname(register const char *strp) - { - register char c; -@@ -859,7 +859,7 @@ getzname(register const char *strp) - ** We don't do any checking here; checking is done later in common-case code. - */ - --static ATTRIBUTE_REPRODUCIBLE const char * -+ATTRIBUTE_REPRODUCIBLE static const char * - getqzname(register const char *strp, const int delim) - { - register int c; -diff --git a/private.h b/private.h -index 7a73eff..ae52298 100644 ---- a/private.h -+++ b/private.h -@@ -628,7 +628,7 @@ char *asctime(struct tm const *); - char *asctime_r(struct tm const *restrict, char *restrict); - char *ctime(time_t const *); - char *ctime_r(time_t const *, char *); --double difftime(time_t, time_t) ATTRIBUTE_UNSEQUENCED; -+ATTRIBUTE_UNSEQUENCED double difftime(time_t, time_t); - size_t strftime(char *restrict, size_t, char const *restrict, - struct tm const *restrict); - # if HAVE_STRFTIME_L -@@ -740,10 +740,10 @@ timezone_t tzalloc(char const *); - void tzfree(timezone_t); - # ifdef STD_INSPIRED - # if TZ_TIME_T || !defined posix2time_z --time_t posix2time_z(timezone_t, time_t) ATTRIBUTE_REPRODUCIBLE; -+ATTRIBUTE_REPRODUCIBLE time_t posix2time_z(timezone_t, time_t); - # endif - # if TZ_TIME_T || !defined time2posix_z --time_t time2posix_z(timezone_t, time_t) ATTRIBUTE_REPRODUCIBLE; -+ATTRIBUTE_REPRODUCIBLE time_t time2posix_z(timezone_t, time_t); - # endif - # endif - #endif -diff --git a/zdump.c b/zdump.c -index 7acb3e2..3e482ba 100644 ---- a/zdump.c -+++ b/zdump.c -@@ -89,7 +89,7 @@ static bool warned; - static bool errout; - - static char const *abbr(struct tm const *); --static intmax_t delta(struct tm *, struct tm *) ATTRIBUTE_REPRODUCIBLE; -+ATTRIBUTE_REPRODUCIBLE static intmax_t delta(struct tm *, struct tm *); - static void dumptime(struct tm const *); - static time_t hunt(timezone_t, time_t, time_t, bool); - static void show(timezone_t, char *, time_t, bool); -@@ -97,7 +97,7 @@ static void showextrema(timezone_t, char *, time_t, struct tm *, time_t); - static void showtrans(char const *, struct tm const *, time_t, char const *, - char const *); - static const char *tformat(void); --static time_t yeartot(intmax_t) ATTRIBUTE_REPRODUCIBLE; -+ATTRIBUTE_REPRODUCIBLE static time_t yeartot(intmax_t); - - /* Is C an ASCII digit? */ - static bool -@@ -125,7 +125,7 @@ is_alpha(char a) - } - } - --static ATTRIBUTE_NORETURN void -+ATTRIBUTE_NORETURN static void - size_overflow(void) - { - fprintf(stderr, _("%s: size overflow\n"), progname); -@@ -134,7 +134,7 @@ size_overflow(void) - - /* Return A + B, exiting if the result would overflow either ptrdiff_t - or size_t. */ --static ATTRIBUTE_REPRODUCIBLE ptrdiff_t -+ATTRIBUTE_REPRODUCIBLE static ptrdiff_t - sumsize(size_t a, size_t b) - { - #ifdef ckd_add -@@ -151,7 +151,7 @@ sumsize(size_t a, size_t b) - - /* Return a pointer to a newly allocated buffer of size SIZE, exiting - on failure. SIZE should be nonzero. */ --static void * ATTRIBUTE_MALLOC -+ATTRIBUTE_MALLOC static void * - xmalloc(size_t size) - { - void *p = malloc(size); -@@ -920,7 +920,7 @@ showextrema(timezone_t tz, char *zone, time_t lo, struct tm *lotmp, time_t hi) - # include - - /* A substitute for snprintf that is good enough for zdump. */ --static int ATTRIBUTE_FORMAT((printf, 3, 4)) -+ATTRIBUTE_FORMAT((printf, 3, 4)) static int - my_snprintf(char *s, size_t size, char const *format, ...) - { - int n; -diff --git a/zic.c b/zic.c -index 892414a..f143fce 100644 ---- a/zic.c -+++ b/zic.c -@@ -459,20 +459,20 @@ static char roll[TZ_MAX_LEAPS]; - ** Memory allocation. - */ - --static ATTRIBUTE_NORETURN void -+ATTRIBUTE_NORETURN static void - memory_exhausted(const char *msg) - { - fprintf(stderr, _("%s: Memory exhausted: %s\n"), progname, msg); - exit(EXIT_FAILURE); - } - --static ATTRIBUTE_NORETURN void -+ATTRIBUTE_NORETURN static void - size_overflow(void) - { - memory_exhausted(_("size overflow")); - } - --static ATTRIBUTE_REPRODUCIBLE ptrdiff_t -+ATTRIBUTE_REPRODUCIBLE static ptrdiff_t - size_sum(size_t a, size_t b) - { - #ifdef ckd_add -@@ -487,7 +487,7 @@ size_sum(size_t a, size_t b) - size_overflow(); - } - --static ATTRIBUTE_REPRODUCIBLE ptrdiff_t -+ATTRIBUTE_REPRODUCIBLE static ptrdiff_t - size_product(ptrdiff_t nitems, ptrdiff_t itemsize) - { - #ifdef ckd_mul -@@ -502,7 +502,7 @@ size_product(ptrdiff_t nitems, ptrdiff_t itemsize) - size_overflow(); - } - --static ATTRIBUTE_REPRODUCIBLE ptrdiff_t -+ATTRIBUTE_REPRODUCIBLE static ptrdiff_t - align_to(ptrdiff_t size, ptrdiff_t alignment) - { - ptrdiff_t lo_bits = alignment - 1, sum = size_sum(size, lo_bits); -@@ -526,7 +526,7 @@ memcheck(void *ptr) - return ptr; - } - --static void * ATTRIBUTE_MALLOC -+ATTRIBUTE_MALLOC static void * - emalloc(size_t size) - { - return memcheck(malloc(size)); -@@ -538,7 +538,7 @@ erealloc(void *ptr, size_t size) - return memcheck(realloc(ptr, size)); - } - --static char * ATTRIBUTE_MALLOC -+ATTRIBUTE_MALLOC static char * - estrdup(char const *str) - { - return memcheck(strdup(str)); -@@ -608,7 +608,7 @@ eat(int fnum, lineno num) - eats(fnum, num, 0, -1); - } - --static void ATTRIBUTE_FORMAT((printf, 1, 0)) -+ATTRIBUTE_FORMAT((printf, 1, 0)) static void - verror(const char *const string, va_list args) - { - /* -@@ -626,7 +626,7 @@ verror(const char *const string, va_list args) - fprintf(stderr, "\n"); - } - --static void ATTRIBUTE_FORMAT((printf, 1, 2)) -+ATTRIBUTE_FORMAT((printf, 1, 2)) static void - error(const char *const string, ...) - { - va_list args; -@@ -636,7 +636,7 @@ error(const char *const string, ...) - errors = true; - } - --static void ATTRIBUTE_FORMAT((printf, 1, 2)) -+ATTRIBUTE_FORMAT((printf, 1, 2)) static void - warning(const char *const string, ...) - { - va_list args; -@@ -666,7 +666,7 @@ close_file(FILE *stream, char const *dir, char const *name, - } - } - --static ATTRIBUTE_NORETURN void -+ATTRIBUTE_NORETURN static void - usage(FILE *stream, int status) - { - fprintf(stream, -@@ -3597,7 +3597,7 @@ lowerit(char a) - } - - /* case-insensitive equality */ --static ATTRIBUTE_REPRODUCIBLE bool -+ATTRIBUTE_REPRODUCIBLE static bool - ciequal(register const char *ap, register const char *bp) - { - while (lowerit(*ap) == lowerit(*bp++)) -@@ -3606,7 +3606,7 @@ ciequal(register const char *ap, register const char *bp) - return false; - } - --static ATTRIBUTE_REPRODUCIBLE bool -+ATTRIBUTE_REPRODUCIBLE static bool - itsabbr(register const char *abbr, register const char *word) - { - if (lowerit(*abbr) != lowerit(*word)) -@@ -3622,7 +3622,7 @@ itsabbr(register const char *abbr, register const char *word) - - /* Return true if ABBR is an initial prefix of WORD, ignoring ASCII case. */ - --static ATTRIBUTE_REPRODUCIBLE bool -+ATTRIBUTE_REPRODUCIBLE static bool - ciprefix(char const *abbr, char const *word) - { - do -@@ -3725,14 +3725,14 @@ getfields(char *cp, char **array, int arrayelts) - return nsubs; - } - --static ATTRIBUTE_NORETURN void -+ATTRIBUTE_NORETURN static void - time_overflow(void) - { - error(_("time overflow")); - exit(EXIT_FAILURE); - } - --static ATTRIBUTE_REPRODUCIBLE zic_t -+ATTRIBUTE_REPRODUCIBLE static zic_t - oadd(zic_t t1, zic_t t2) - { - #ifdef ckd_add -@@ -3746,7 +3746,7 @@ oadd(zic_t t1, zic_t t2) - time_overflow(); - } - --static ATTRIBUTE_REPRODUCIBLE zic_t -+ATTRIBUTE_REPRODUCIBLE static zic_t - tadd(zic_t t1, zic_t t2) - { - #ifdef ckd_add From 6ed33c3cf1e90af193fb9b6dc3ae7b05a1d3d310b36dd365abebfcdf7f2074b2 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Fri, 24 Mar 2023 11:22:44 +0000 Subject: [PATCH 3/3] Accepting request 1074081 from home:AndreasStieger:branches:Base:System 2023b OBS-URL: https://build.opensuse.org/request/show/1074081 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=300 --- timezone-java.changes | 6 ++++++ timezone-java.spec | 2 +- timezone-java.spec.in | 2 +- timezone.changes | 6 ++++++ timezone.spec | 2 +- tzcode2023a.tar.gz | 3 --- tzcode2023a.tar.gz.asc | 16 ---------------- tzcode2023b.tar.gz | 3 +++ tzcode2023b.tar.gz.asc | 16 ++++++++++++++++ tzdata2023a.tar.gz | 3 --- tzdata2023a.tar.gz.asc | 16 ---------------- tzdata2023b.tar.gz | 3 +++ tzdata2023b.tar.gz.asc | 16 ++++++++++++++++ 13 files changed, 53 insertions(+), 41 deletions(-) delete mode 100644 tzcode2023a.tar.gz delete mode 100644 tzcode2023a.tar.gz.asc create mode 100644 tzcode2023b.tar.gz create mode 100644 tzcode2023b.tar.gz.asc delete mode 100644 tzdata2023a.tar.gz delete mode 100644 tzdata2023a.tar.gz.asc create mode 100644 tzdata2023b.tar.gz create mode 100644 tzdata2023b.tar.gz.asc diff --git a/timezone-java.changes b/timezone-java.changes index be10176..96925c8 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 24 07:23:40 UTC 2023 - Andreas Stieger + +- timezone update 2023b: + * In 2032 Lebanon springs forward April 20/21 not March 25/26 + ------------------------------------------------------------------- Thu Mar 23 10:28:18 UTC 2023 - Danilo Spinella diff --git a/timezone-java.spec b/timezone-java.spec index 8dd533c..15b116c 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: 2023a +Version: 2023b Release: 0 Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz Source1: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz diff --git a/timezone-java.spec.in b/timezone-java.spec.in index 8370c2a..52516e1 100644 --- a/timezone-java.spec.in +++ b/timezone-java.spec.in @@ -1,7 +1,7 @@ # # spec file for package timezone-java # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/timezone.changes b/timezone.changes index be10176..96925c8 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 24 07:23:40 UTC 2023 - Andreas Stieger + +- timezone update 2023b: + * In 2032 Lebanon springs forward April 20/21 not March 25/26 + ------------------------------------------------------------------- Thu Mar 23 10:28:18 UTC 2023 - Danilo Spinella diff --git a/timezone.spec b/timezone.spec index 2e85413..8e2ef84 100644 --- a/timezone.spec +++ b/timezone.spec @@ -22,7 +22,7 @@ License: BSD-3-Clause AND SUSE-Public-Domain Group: System/Base URL: http://www.iana.org/time-zones # COMMON-BEGIN -Version: 2023a +Version: 2023b Release: 0 Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz Source1: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz diff --git a/tzcode2023a.tar.gz b/tzcode2023a.tar.gz deleted file mode 100644 index 1e93693..0000000 --- a/tzcode2023a.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6dcccd26a13a4b71c53e573a0bf32b98de467aa3316b82dfd25fffdb6c9fc46a -size 292438 diff --git a/tzcode2023a.tar.gz.asc b/tzcode2023a.tar.gz.asc deleted file mode 100644 index 0a48c10..0000000 --- a/tzcode2023a.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmQbXA8ACgkQ7ZfpDmKq -fjSDXRAAjfD1GMYAFHDvXOlCCitgTsTjBBuPHPbrQ7gTWno9uX8bvss3aXCUslHv -sfzCHMKhJqMXGLzSQQ5jEP/k4fOjNJyIQbVlrY9XljpdGeOdYa1E0zr95dIf4/ta -NUY9XxzFnd3hwQuc6LY77MOv2Xyy/5RAGajD2DTpYTLjE0ffMFK371efs//GcLqe -aCIWBdet1rJyih6CoyzfNvl6QHQOxZLSlE2E3DYu430fTi/UhmTcaATW8gRNulL5 -kXamzD9l45/cGOx/jHP6CkJIqFTFV4W1/W/VyjIEgRE0KGbuQO3LV0avohjhmmwm -hS6H6RJYfgeF+vwmo3unN+vUwPLhkPUiz2NO/Uf0n22AVQlUOrEP0XVXYW8aRd3H -ewDrlvDCMkvmKqEb8k0jqbmjqTgeblKoqeS7gIShhVmrIli8oN4mguWg5WaeRWF/ -l3uYtBXOg/DJMwENrB+4u0+PRWuR2T5OW/E4NvaKIu58qzozP7WEmlEwv9KWZB+z -ffmNaVgXqSCz50K6gvhoDKLn5YBgpB9kXDd+YrcqPUAyD0sDWhBC2Hx9HHePOfQl -dFB+ijja5HB8aZD/rX0iLrSwp/Ndt4l2QjXY9SMjTiWx4SgGGmGCANQqCDZGD31a -C8bdEMH4qQeOPZ/NsPB6KaJsqALNroF07YeINu0YfWkw89ZF/r4= -=mRAo ------END PGP SIGNATURE----- diff --git a/tzcode2023b.tar.gz b/tzcode2023b.tar.gz new file mode 100644 index 0000000..c3c7fd6 --- /dev/null +++ b/tzcode2023b.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:115482e3ba66dcb651c88f2cda79c571036acf9b63873178d6a0442cd3be13d2 +size 292492 diff --git a/tzcode2023b.tar.gz.asc b/tzcode2023b.tar.gz.asc new file mode 100644 index 0000000..82136bb --- /dev/null +++ b/tzcode2023b.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmQdELYACgkQ7ZfpDmKq +fjQpIQ//eOaHIqWDFcotP/ntWHses+E1PaalrArGe6uoGJYR3Aql9GBIM/BrhBZH +oiCeRxxsLLoU4ZoJdrEh3Q4q4a3g/j5NGL3oi1ktlwHz1dnJFd2UQ+XlK2mv2/Lb +o+cwaM0RV8SZojClxXF/ditXgsJ+EGbSX7WYKX7XfCxdWwFw+ZZPPcYvmXvenFCl +wtJWjgo11a3V7OpKk4kfX/EuoNoHTF7uOIr943Id96JFM0z7LET1zaoKzObMs0+l +Afyi1Rl0bxO6rlPH+HRJb41cac1YXMcoRkz0rzvaZalEA4FYFYIsA4nbuVB1DGIW +xzQLErGgBg9NFLSIQJmocS7V3T3KpSeIXAfUMN3XMUMVfOwv9Fm0ZdzgPEH3/Xhr +h/6C1a18Q+xeicqaB7Hm+nybH51sFxajx9xoGcr+Ij+1ze1W4Rk7LnHC6+tsqQ/D +N+P1fBEcb33C3/T8G2s+OWNMRInotcqAnZYUqLkFTmNbWEC1xdWdUZGxY+0PxDSX +c7UGAgj7E9G4JS684AkcpVgIJUwz0XyQIZkJHudg7FyEjW7U7qIycXUwC+RCVtWb +tnJX9TxzP01/kD3R3C8CALByCJW4OTlpwcETqACjUF6JBpAHHbFWGY1znBs/zsDa +PSMozhoQ3moWHRBsW3PU7XBsxOf6kDMrqUxWTo1oKVv0Jy5xfO0= +=UybO +-----END PGP SIGNATURE----- diff --git a/tzdata2023a.tar.gz b/tzdata2023a.tar.gz deleted file mode 100644 index 600c853..0000000 --- a/tzdata2023a.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2a27edb7af5a384cfcefdae9defad6a7ed23f3f2cfdaf3d5394c1e8299710bc -size 442875 diff --git a/tzdata2023a.tar.gz.asc b/tzdata2023a.tar.gz.asc deleted file mode 100644 index 5ac54a5..0000000 --- a/tzdata2023a.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmQbXA8ACgkQ7ZfpDmKq -fjRngg/8D8E5sJIt412pmR7yIQYnsG44nSiELNpiewG+SF4DofW7quQDQEjDMdVn -seLU9okE1/l+1SN6eibMJgvho/6HWkU9kWLzYCY29sljTVYqEu6vLo1IY1OJIkjC -9yieL33oLkN4LIeSMzR4QOCkRfusYNRYq3uryVtMu7R6HP2PgMlmmJf/imV192tj -ONJXNA4Y30EvJ3lHuXMbr7fNg9hXSLjRy1NPKjp5OVZ3jZVXPljrC+egAfhLjZdQ -uB5a3uGjAX+KjemCHwTmrrmmcUlaHxFxlfN5gX5cNIXuyrYtz0PAhy+MhBM5F9iY -erYWg6EfBr7IfSyS1JcDZ1ypwZ66EpKxXfWZNm+HFA4dDdnWgvlM4n1OyKjw03Dq -4/agYr34cUDhfBUS57dtpZSibtdpbh8oiqxc+wXV3KZcHXVpX3XRyGTH1UVINfnF -nXArC09JKUt7Tjol83TPH0jDXJAxabkgUDJHfpeQ5A8r3GNW1PQ/OF25ieRb+AFQ -jWFbiEIxSXmUwnRc6wHiLX/gU0TT7vVMokN5erx9IGwrDEQAljuEJoj2bYFT/q9D -8jFA+48r/nK2r33+OBrz6aryoMNptquuMG0XR4aSr6KO3e622+vuF4nSN7hg2sAM -/bMLSlzOGUEmOZ2D7hP5MDdWw5L0WQAjX7/8xKzdlMhqkx4Mc9Q= -=OxWX ------END PGP SIGNATURE----- diff --git a/tzdata2023b.tar.gz b/tzdata2023b.tar.gz new file mode 100644 index 0000000..a13ae8e --- /dev/null +++ b/tzdata2023b.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b78fd264f95611fe987a95721456cd5aac9f55e6915be4a9ca2997bc7ce0e6c +size 443019 diff --git a/tzdata2023b.tar.gz.asc b/tzdata2023b.tar.gz.asc new file mode 100644 index 0000000..4b11962 --- /dev/null +++ b/tzdata2023b.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmQdELYACgkQ7ZfpDmKq +fjQJpg//cdQED6jsk1BnqHOCL1/PPUxJsl1SmDlcAoO4o7Odt5AlTFq6P6zGzRze +F+P1P6k9mD09IyiQC3m3wQaROoyAoaErPeuzwmoDT/rBVNRraSE0t8xy2jDytkne +CH3f1TMYYqQOWpQnDxzMKByypkNCG9o0ryzhTMWRI9BNnLZqwRnyRFWPdLYM5O7/ +DxFk3YbtoB9IoO2LR32dqYxrrKKb6cjr7exTGI+0WQNwQEK0HV/62bImDmparUei +8BZKc9fk41xNYJJxdew81pSAmRK6TMHPOG5cvs8KPLIb/lKfG21wJXL0wDr0U4wy +L15riEQlkRckzG2IIV2OB5F+5MY7NWNHubuJ0YEBDJkPMQKfBPSkZM1xkvosiend +8BBgHPBH4HiZ9z/ZvrRXyIjOOpYuko9wyiqtRpqSp4OimB2RMV6VG8oSD+OG3YCj +VhF2+KlZwLj9mG9sOeslDuBnp4h4eyCvVoILQNE0qYjeHGY4WTkqP/l29ZI2+rQW +cfcOk8atl4ojmekmsLcoz3EnJLtDIgtLtchHTIKsDQgZnVNASnvpaZXU3l8T6fZf +0PitHf90Qj2WWkuiMkNBbS0q4D/CknH7pqy1TY8/IWQRrvPp9deLDEMs+TcSleOk +1HZ1bxgCL1lgqQGiqC66Ybyy794bG6g3CclFkSHGGB8UcC1hkg8= +=o96Z +-----END PGP SIGNATURE-----