diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-12-02 08:55:38 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-02 08:55:38 +0000 |
commit | 5a1e5a6812ca9c9555657cce48fe09d2ffa44401 (patch) | |
tree | 5c040bbee9184b24f26b05031a2448e62f6df38a /sys-libs/timezone-data | |
parent | 2c4066122b66fa1eb3e37846f9a6e14529a553d8 (diff) |
gentoo auto-resync : 02:12:2022 - 08:55:37
Diffstat (limited to 'sys-libs/timezone-data')
-rw-r--r-- | sys-libs/timezone-data/Manifest | 3 | ||||
-rw-r--r-- | sys-libs/timezone-data/files/timezone-data-2022g-c23.patch | 279 | ||||
-rw-r--r-- | sys-libs/timezone-data/timezone-data-2022g.ebuild | 4 |
3 files changed, 285 insertions, 1 deletions
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest index a6e68211e116..8406c750e733 100644 --- a/sys-libs/timezone-data/Manifest +++ b/sys-libs/timezone-data/Manifest @@ -1,9 +1,10 @@ AUX timezone-data-2022f-musl.patch 6278 BLAKE2B 3d05353a3c93766e36c2e54be39ecbd44e499b9455ae896182f39de8cdbb9e96714631b38705f9845ef00cabc38fdeaeffec0b6fd7815d422749027f7076387a SHA512 9c861038af92866627071cef20745fe0dc169046cbb04922838c194ca5e4f3a4cd151b7628838d927318a23d88a21127988a5a71b14cc81c1f515bd3d61751bf +AUX timezone-data-2022g-c23.patch 8221 BLAKE2B cb410a463fc411b1dd4d322e07a7e26067d088eeb405c8d198a0062b81ebb55413d8bd2623b8982c0e2510deb367865d288b778bb3c192c8cc6ac14815503ed1 SHA512 9ba487e1b87e3c9214bfc0c491a96d56ab0193145efb951e7d7e13f1466f0f4be0d60b74fc10862fd1e97436a08fa5830b5a3919726cf3b06224037e6fcdf71a DIST tzcode2022f.tar.gz 284816 BLAKE2B 3bfcc25323edbdd41aadcbb5c8b0d9179a809a87b22afc9dda88a53c6daab742778956af7aa30722429d34601fb2ad3c4222c48497e0a429926cd05b79b9acfb SHA512 3e2ef91b972f1872e3e8da9eae9d1c4638bfdb32600f164484edd7147be45a116db80443cd5ae61b5c34f8b841e4362f4beefd957633f6cc9b7def543ed6752b DIST tzcode2022g.tar.gz 287901 BLAKE2B b67bb2020913c57cc6bc68d231c53ba645b95305256065e2645bce3b0d71adfaea865ed9bf40f1ec3b4a73aad7e6c48f5ecd0895de6e2d69bed6113d6b579e26 SHA512 5188edd8d05238a88da734cf78fadfb57640d4db3e7a0a9dddd70e3071e16b6eebc2e2ab17109b7dafafae68abfbc857df481cfdc3ffe63f7eb1569ea0b5997a DIST tzdata2022f.tar.gz 436352 BLAKE2B 8081972005ac84034957bb85013b373df67937c3f811e33c44fad7ecee0f504b946766fdb1f525d0512b9a8d8e727ee3d8d44640ff55bed3fcd1f3fb3c464c17 SHA512 72d05d05be999075cdf57b896c0f4238b1b862d4d0ed92cc611736592a4ada14d47bd7f0fc8be39e7938a7f5940a903c8af41e87859482bcfab787d889d429f6 DIST tzdata2022g.tar.gz 439731 BLAKE2B 582b79cc2317d27f3883042cbca25801397d9e2808ad8d3a340017d635372ef20316ce646a25a43b0ea5d4024841b54925ecc4510613295c39c28647989645cb SHA512 7f79394295e00e3a24ebdbf9af3bc454a65f432a93b517e7e96c7f9db9949f6f5fdae9892a9d3789ff44ae0eb1bfe4744d36976b4624659af951d26414f94e65 EBUILD timezone-data-2022f-r1.ebuild 5404 BLAKE2B 79f29b58dd33dc80b5a9307f39c4cb8797d37b5e4281e5bd6b0f566744932f06f196ecbaa1349f63eb5bc965a8363a4807ac07e263b034b0d3a8c11838c6b978 SHA512 e3da2dffffbec3cb0bc6e0a866ea274a7a247285d8a269941bad131cc46ee157ce545c5bf76343b681317e6ab85ebf32ca5dbdf904787ad270a3daefbc14ba67 EBUILD timezone-data-2022f.ebuild 5360 BLAKE2B b5de4f3fa1dd5597588b77417beb804b93993d541e518257c67e48c82891dad4a9fe23b991d817267ffd2ae61680818e2d8879ef3d0e5c799a35e36b663302a0 SHA512 c0053d962645131ebebe8d8053c2f7f1a80bbb3842a18e60b3ef8a563a377e0d5a4153335d6135f969207c90ab85ef17e122f209b27cab27769ed29e2a5265bf -EBUILD timezone-data-2022g.ebuild 5368 BLAKE2B 4e442e464552356b906d9df9de0e685c293a3b01003131332c6084955d833e400397b47ddeef9b225dd41566169e2e4ce26abda933b7e78507a006f6e2a59ac1 SHA512 404691c964f8735e2764643518e36925442f2b041731d4935cc13b4b377823d275c1753af2b55d9a9667d14b97f182a2a7d48c35e1ba5cbb91a02a33532ccece +EBUILD timezone-data-2022g.ebuild 5411 BLAKE2B b2a93fe1d4253b75970a3e2a058ab33517e2e3ea87684fe12451dd11b1e220d419dc7d1523615fe097fe54b91a4c4339189b35ac0e3f3e208da01ebc785952aa SHA512 1260cd05c1c83d1b31e08230c4fef605d3294dd5ba3f4cf21e9ad25c246c1b9dffc001846fb4ec5790519f9b046e29d743786eab9ad742f794dc22da665c4fe4 MISC metadata.xml 807 BLAKE2B 24b09c4228c232b607e6e6c165a20e364136d77aa970e72c70124636a038cd3b672bad16ddd68c0b75373be6a09f969e59bc38f7e451bb2869cd46c521e2ca82 SHA512 0b95b32d79651493a04032f175f3320d8975cea714b43fa56aa528f10f51a7c52b58a934828f98a770855485af6f8db048bd2bfa3010802cff8c26ae05bb16e2 diff --git a/sys-libs/timezone-data/files/timezone-data-2022g-c23.patch b/sys-libs/timezone-data/files/timezone-data-2022g-c23.patch new file mode 100644 index 000000000000..2665841e5aa5 --- /dev/null +++ b/sys-libs/timezone-data/files/timezone-data-2022g-c23.patch @@ -0,0 +1,279 @@ +https://github.com/eggert/tz/commit/9cfe9507fcc22cd4a0c4da486ea1c7f0de6b075f +but minus the NEWS changes + +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Thu, 1 Dec 2022 10:28:04 -0800 +Subject: [PATCH] Fix C23-related conformance bug +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Houge Langley for ‘gcc -std=gnu99’ in: +https://bugs.gentoo.org/show_bug.cgi?id=883719 +* NEWS: Mention this. +* date.c, localtime.c, private.h, zdump.c, zic.c: +Use ATTRIBUTE_* at the start of function declarations, +not later (such as after the keyword ‘static’). +This is required for strict conformance to C23. +--- 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[]) +--- a/localtime.c ++++ b/localtime.c +@@ -843,7 +843,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; +@@ -864,7 +864,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; +--- a/private.h ++++ b/private.h +@@ -646,7 +646,7 @@ DEPRECATED_IN_C23 char *asctime(struct tm const *); + char *asctime_r(struct tm const *restrict, char *restrict); + DEPRECATED_IN_C23 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 +@@ -765,10 +765,10 @@ timezone_t tzalloc(char const *); + void tzfree(timezone_t); + # if 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 +--- 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); +@@ -916,7 +916,7 @@ showextrema(timezone_t tz, char *zone, time_t lo, struct tm *lotmp, time_t hi) + # include <stdarg.h> + + /* 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; +--- 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 diff --git a/sys-libs/timezone-data/timezone-data-2022g.ebuild b/sys-libs/timezone-data/timezone-data-2022g.ebuild index 190c46867d53..4ef50b87e84f 100644 --- a/sys-libs/timezone-data/timezone-data-2022g.ebuild +++ b/sys-libs/timezone-data/timezone-data-2022g.ebuild @@ -23,6 +23,10 @@ RDEPEND=" !sys-libs/glibc[vanilla(+)] " +PATCHES=( + "${FILESDIR}"/${P}-c23.patch +) + src_unpack() { mkdir "${S}" && cd "${S}" || die default |