diff options
Diffstat (limited to 'app-metrics')
| -rw-r--r-- | app-metrics/Manifest.gz | bin | 6628 -> 6626 bytes | |||
| -rw-r--r-- | app-metrics/collectd/Manifest | 3 | ||||
| -rw-r--r-- | app-metrics/collectd/collectd-5.12.0-r8.ebuild (renamed from app-metrics/collectd/collectd-5.12.0-r7.ebuild) | 1 | ||||
| -rw-r--r-- | app-metrics/collectd/files/collectd-5.12.0-clang16-configure.patch | 127 |
4 files changed, 130 insertions, 1 deletions
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz Binary files differindex 6c5e3b0d309e..0ec1f4644d45 100644 --- a/app-metrics/Manifest.gz +++ b/app-metrics/Manifest.gz diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest index f0be473c661c..51423ad2d41f 100644 --- a/app-metrics/collectd/Manifest +++ b/app-metrics/collectd/Manifest @@ -1,9 +1,10 @@ AUX collectd-5.11.0-libsigrok-0.4+.patch 5447 BLAKE2B 6de12feb7226ae3a16a89f3282b54d363cc64e176fe4f9cc9a6bfef0874bca0447a8d21689f8d3c91b2840d12ba4abd3c6f38cfc0b4e885582cc42c81865a1f8 SHA512 a7c99664f632eaff35eef18a0bd8da5bfa39812d223eb6449acd0fa871c5d43a401ed48b1003275a2ae0362b92c69ab52b46af39fa69dd7e4cc2b2969dc4b2de +AUX collectd-5.12.0-clang16-configure.patch 3272 BLAKE2B 0586d4f412713bcf5c7136ef88294a63edb2bae8b83d98e3db383e04275c68ad8efe66ad85fbe8f55eca5fcd40eb181faacf3a421d6064b4207085766cd60e0f SHA512 a3f7c8641b35ce8855f38a2d47e76f2701acb49588e94937d73ddc9f3dfc8606046063654d14d1af060176cf227562b1f269d323e48b220611c597664febbf0a AUX collectd-5.12.0-python3_11.patch 1022 BLAKE2B 5317cd8f13eb7d657c1dc2041e23e3335a00f4ed781376cf942f74ffd7b57ca3be64e159b59bfeae2d7f3d7b76cf4ed9d9f1f71c890f6e3d86bb57399d31e03d SHA512 7a3b9d42910cd88ecc767a57c085410ee6c664f9e8c993591e2ef1a169723553dc1224b295623363af1a473b0d22cf2a937bee5d93d64c8c59651cff3f08a5e0 AUX collectd.confd-r2 2005 BLAKE2B 1f68f769d06b1f486c33f76060cf13f784d5b45ff7a04c209a6e23b8a9af94b3db54744532c74f8c95dae4fccb7f89a4e9a5f5353575c7099da0a2db3c1f8f37 SHA512 89fd2d60e1e0c7f4145d0791d65e29821e7f585015f1ba6bf94f80f47ffcefb7bdd75b2ba3e0acb18f0ee27f64100b3c4737ad30ce516785571d277a6923666f AUX collectd.initd-r3 1877 BLAKE2B 8e81c314abdd366a7583dd18bdad10c9d7da14589c030b9c3121090f9ee74b300f1bb919168117ce84aec3af6f0708f14fa6a71c5be049b099d5221656ac7dac SHA512 0dd1541bf6a17f7b26e8671ba236b11a599c07b30be6700d2e37ee2d6f59114d95c83b3ca8ddcb98d6a8e0d7321d994682411aff815c1b1f792314a6a17de4b5 AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d246c3e512c1733133fcc8da41b3ab2a0051b4da78c53e6629b2ad8085872dec1d4c28e397c88cafe3a90 SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f8d150c924201074c5edae22eea3990edf3a7837f1473193fe009a501645bf064638c532ec53a36cc SHA512 55fb70da9ece74b143c3e971b890954842230691039f8ad2240cc4c8d699e4e7a21efcbfd0b3cb2503e90af0bbdd0c7d886e09baf9fc86ec26c115a0bce6a668 DIST collectd-5.12.0.tar.bz2 1902756 BLAKE2B 9567c55b47c0ea5b7836c0d858c16a637c4a2054486a9d9ca6cd9951a92381bdf4f49d7dc0be0c9c9131802120d0af2e542a3997f01484c89ba135b3c46db795 SHA512 7a15e4c0ae587db4987d673a790a4f3bea1cab29ce24a506fb21fa7bd2f60bfec70867eaa1c1395cb5b0e0ae81a024fb6109b064da0ef50e7c146d2198871c70 -EBUILD collectd-5.12.0-r7.ebuild 19993 BLAKE2B 6af4b44ec95aa400574d89949c552929a222826964841b5083f6db468c16f50eb309eacafdc4b8d5e1bbeb387d47a4be9b49c56c3bdae0956fb9d8c30a5de739 SHA512 4e852d35f87ea1ca67cca0b7bb526d04b10600dda10c3cedebba5c1c658d522cee95d5b2d08a2eda4270038cccef0a1663ff95cb3c037320a7a99394d9b4fe99 +EBUILD collectd-5.12.0-r8.ebuild 20045 BLAKE2B 6775c6a7f5440b46eaff6e2e47c48070b85aa45c13cb45c53cc6ba7150ddacdc50b134e26a5fabc0f7ec3ce1415f73add13c24ba8f31cc883a84f9d2060ea787 SHA512 651344abc1dd88efc5eaf3c408e82ab64be62166b358e4796d77b88f1d9f7e43b343ff2016ea361ca2381a120b2d4ee3eb350c034f5717651f5e630953adc269 MISC metadata.xml 1515 BLAKE2B 318f796bfacb0e1facbd60f80fc9176e24f06661fc4dce4acda3a218aab10766231566a9ae58f9985770513fb53a52e9ea5e985aba0bcff62c042c75fb662c70 SHA512 4c886d89143d2862a3d915e5b0ef14382c76d758a306fa9971a762fdae400086175c470045e85775f028947156a4bb40a09bd9810c56dda08662e835cba3b45c diff --git a/app-metrics/collectd/collectd-5.12.0-r7.ebuild b/app-metrics/collectd/collectd-5.12.0-r8.ebuild index 9662889050c6..0c8c8c88baa4 100644 --- a/app-metrics/collectd/collectd-5.12.0-r7.ebuild +++ b/app-metrics/collectd/collectd-5.12.0-r8.ebuild @@ -173,6 +173,7 @@ REQUIRED_USE=" PATCHES=( "${FILESDIR}"/${PN}-5.11.0-libsigrok-0.4+.patch "${FILESDIR}"/${PN}-5.12.0-python3_11.patch + "${FILESDIR}"/${PN}-5.12.0-clang16-configure.patch ) # @FUNCTION: collectd_plugin_kernel_linux diff --git a/app-metrics/collectd/files/collectd-5.12.0-clang16-configure.patch b/app-metrics/collectd/files/collectd-5.12.0-clang16-configure.patch new file mode 100644 index 000000000000..578099579c47 --- /dev/null +++ b/app-metrics/collectd/files/collectd-5.12.0-clang16-configure.patch @@ -0,0 +1,127 @@ +https://bugs.gentoo.org/879633 +https://bugs.gentoo.org/900392 +https://github.com/collectd/collectd/pull/4106 + +From f23164e589502ff675b3b54fa598bd9efd1422ed Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Thu, 6 Apr 2023 19:00:08 +0200 +Subject: [PATCH] Fix glibc feature macro handling for timegm + +The way strptime is activated using feature macros, _DEFAULT_SOURCE +(successor to _BSD_SOURCE) is disabled implicitly, so timegm is +hidden. Defining _DEFAULT_SOURCE at the same time as the other +feature macros solves this, and removes the need for the +TIMEGM_NEEDS_BSD configure macro. + +This avoids an implicit declaration of timegm in src/bind.c, and build +failures with future compilers. +--- + configure.ac | 53 ++++++++++++---------------------------------------- + src/bind.c | 10 +++++----- + 2 files changed, 17 insertions(+), 46 deletions(-) + +diff --git a/configure.ac b/configure.ac +index bbe65a7e99..78bbff6624 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -974,6 +974,12 @@ if test "x$have_strptime" = "xyes" && test "x$c_cv_have_strptime_default" = "xno + #ifndef _XOPEN_SOURCE + # define _XOPEN_SOURCE 500 + #endif ++ # ifndef _BSD_SOURCE ++ # define _BSD_SOURCE ++ # endif ++ # ifndef _DEFAULT_SOURCE ++ # define _DEFAULT_SOURCE ++ # endif + #include <time.h> + ]], + [[ +@@ -1024,6 +1030,12 @@ AC_CACHE_CHECK([for timegm], + # ifndef _XOPEN_SOURCE + # define _XOPEN_SOURCE 500 + # endif ++# ifndef _BSD_SOURCE ++# define _BSD_SOURCE ++# endif ++# ifndef _DEFAULT_SOURCE ++# define _DEFAULT_SOURCE ++# endif + #endif + #include <time.h> + ]]], +@@ -1039,50 +1051,9 @@ AC_CACHE_CHECK([for timegm], + ) + ) + +-if test "x$c_cv_have_timegm" != "xyes" +-then +- AC_CACHE_CHECK([for timegm with _BSD_SOURCE], +- [c_cv_have_timegm_bsd], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM( +-[[[ +-#if STRPTIME_NEEDS_STANDARDS +-# ifndef _ISOC99_SOURCE +-# define _ISOC99_SOURCE 1 +-# endif +-# ifndef _POSIX_C_SOURCE +-# define _POSIX_C_SOURCE 200112L +-# endif +-# ifndef _XOPEN_SOURCE +-# define _XOPEN_SOURCE 500 +-# endif +-#endif +-#ifndef _BSD_SOURCE +-# define _BSD_SOURCE 1 +-#endif +-#include <time.h> +-]]], +-[[[ +- time_t t = timegm(&(struct tm){0}); +- if (t == ((time_t) -1)) { +- return 1; +- } +-]]] +- )], +- [c_cv_have_timegm_bsd="yes" +- c_cv_have_timegm="yes"], +- [c_cv_have_timegm_bsd="no"] +- ) +- ) +-fi +- + if test "x$c_cv_have_timegm" = "xyes" + then + AC_DEFINE(HAVE_TIMEGM, 1, [Define if the timegm(3) function is available.]) +- if test "x$c_cv_have_timegm_bsd" = "xyes" +- then +- AC_DEFINE(TIMEGM_NEEDS_BSD, 1, [Set to true if timegm is only exported in BSD mode.]) +- fi + fi + + CFLAGS="$SAVE_CFLAGS" +diff --git a/src/bind.c b/src/bind.c +index a246f1aacf..4a7c024253 100644 +--- a/src/bind.c ++++ b/src/bind.c +@@ -33,13 +33,13 @@ + #ifndef _XOPEN_SOURCE + #define _XOPEN_SOURCE 500 + #endif +-#endif /* STRPTIME_NEEDS_STANDARDS */ +- +-#if TIMEGM_NEEDS_BSD + #ifndef _BSD_SOURCE +-#define _BSD_SOURCE 1 ++#define _BSD_SOURCE + #endif +-#endif /* TIMEGM_NEEDS_BSD */ ++#ifndef _DEFAULT_SOURCE ++#define _DEFAULT_SOURCE ++#endif ++#endif /* STRPTIME_NEEDS_STANDARDS */ + + #include "collectd.h" + + |