diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-11-19 03:03:00 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-11-19 03:03:00 +0000 |
commit | f2e359c456b051f95efc92e21299d55a302e58ed (patch) | |
tree | 9d844c8fa1373b6f4244c1cfbe55eea7cdf62701 /dev-libs/ell | |
parent | f9f6fa91738181ebe9aca71b75d157d8b5df5335 (diff) |
gentoo auto-resync : 19:11:2024 - 03:03:00
Diffstat (limited to 'dev-libs/ell')
6 files changed, 281 insertions, 0 deletions
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest index f6d51999d060..2a4fca8adbda 100644 --- a/dev-libs/ell/Manifest +++ b/dev-libs/ell/Manifest @@ -1,6 +1,11 @@ +AUX 0.70/0001-settings-fix-std-c23-build-failure.patch 1477 BLAKE2B 70bba3a8082630fd6555a444acf8f1b9917fc99243eb0f1f47b56a6cdc74b1f7b412ba80922143f45c866b31511411fd1d878640d594161a02665438cd900037 SHA512 03cdc8262f0c1c5e0c7252d2751adbd6ae89d7fb4143ea3ad4c4bfa494a1abb5128732295a236862509d8c48d19003d954f13ada259d48925f6062a33cf24305 +AUX 0.70/0002-cert-fix-std-c23-build-failure.patch 2125 BLAKE2B c4f0d18855a490764cdda5bbf31a2e4a012c790083ef3096126a5cea19cb4754b01f29568d88f02612578a9f09a16b3ece4798a8733c741b45dbce7ad01ccd7c SHA512 001509eec2393fb1631790e1e5bf891b50442a8214b755c7ff157698d7a290e16dec22fcb0c9905597e46f05f271eddb4ac2af4d7c5020c518e0d6282be8b034 +AUX 0.70/0003-dbus-fix-std-c23-build-failure.patch 1504 BLAKE2B 622532f77ac5342fb814f946577f43849f51b464d6d73eaaa8484ee19f1898d28cbd9b5181a995f6daad1fbdecc5df07e54347d541cde06be48cacb56ccbbb2a SHA512 5eacf707ca8b71a6125bd3a48eec2b54071ba0d3e1d3d81c427fdefc41bd94f6c8b03fbac6dddc4c6fbd3bfeb195fef1c0bd822640f7ee3c886a18e5ba68242d +AUX 0.70/0004-test-rtnl-fix-std-c23-build-failure.patch 1816 BLAKE2B 452b4e09ffc2bfd40cb653d1258b11a55aaddb3261c84cc627338edc781ad2e10ad647cde6b76f5ed461c5d890bf4299599971fcdcde3c375194c321f4a19b05 SHA512 ceeb9a29c79ca718c1150f3d5738ade94aa52c92d6a88eb33d481a136c3f627312c8c2f291123ace72c277ed1417722969c214746a48d2677d19fe8b45e2aeec DIST ell-0.69.tar.xz 574172 BLAKE2B 3d28392b6cb378a8512667172598ec3cf9b5eeb5f68c65b43a939636a23a03d8f168b500171c4e1224e97bc072e88e9d57e5f02a9d5cbf489d684537070cfeef SHA512 9631b364ba48f984b104cf1091a4dbf10f675b04f58b555f55249d3fec6610c3ccf6e1b0197e807e843b179a39f22c33b8e2a58c4dbcff91bb8c6ce628618f65 DIST ell-0.70.tar.xz 574184 BLAKE2B eee4c9a6bb3a7f2f04c91cca732a1f6aea86eef2006f22bf6e418fbe0ad2301cdead991cd9e46e8ca75178a5fcc7d7db5430dad2dfabe68490def77e0e51ed90 SHA512 9f6613ccd4bc54e75227863adf213d96068305b22bb47049b97ff801b468c8cd828be350f2b8edb27a2fee33a76cba563e53ce17af181ca483917503e9a1932c EBUILD ell-0.69.ebuild 1296 BLAKE2B 7e4c0ceaf74a57f4b836d660faa7a4aef7f034c1a5155da65118a0de788c4601de9e0207a6f84ce9390a1191eab5639bd4dcc8c537da3bbacb094bc81f3c02a1 SHA512 3adcd7393a5ffac5058332a606d12726462b5dce125845fbf170e5b2ec5770d2298261d618026ba4d29f725d4ba9f92d0ff7d6712635e792841e7719dc679ebe +EBUILD ell-0.70-r1.ebuild 1335 BLAKE2B eb098818e5b4e008653578635d681b4a6a440804561ad8775d094fc7c041819bb54530fea89ba0cee55a04d068211ed5a49a624c764ab1c850e23dcee54b2b70 SHA512 52899d05f2ea1fd7c2d593df8d4c358073ae4858ae812a2babd3b5c38a497e134030d176abed23aa0f666aac90fd4a563beb31356e9100d925bec1edcf4a36c5 EBUILD ell-0.70.ebuild 1302 BLAKE2B 9b757deb5c5cd80cee0bbd102f69025b115323e5da2e0724210c8ba36c2d46c01b0a9ef07e0a833e06d4594885608ecac5d428c9de4631bf5e58351e0523f550 SHA512 feed44637824b5de817a7dd7f541f03684a29f2a87d608ddb4b19b99f7e199fa42fc0cf5ad2d53238042bb325d08b5bbd039f6d966011c276ed2035ddbea9575 EBUILD ell-9999.ebuild 1205 BLAKE2B e1dd3bc3e8d0da0757b52ef4af94cb63b2336f5a1524198532e757f10f2825c5d2663c6b5ea431c8a9d75344dbacd5536786867243292c434a136a4f92380753 SHA512 1d8d958b73087fb3dea18458fb72c08fa4ad7dce7e9173183ceef10a80f1a4186a3c9c62ebfccf4b6f622069570f69c473c46d5474a4fc834060952c160b3c29 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f diff --git a/dev-libs/ell/ell-0.70-r1.ebuild b/dev-libs/ell/ell-0.70-r1.ebuild new file mode 100644 index 000000000000..458f682ec04f --- /dev/null +++ b/dev-libs/ell/ell-0.70-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic linux-info + +DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" +HOMEPAGE="https://git.kernel.org/pub/scm/libs/ell/ell.git" +if [[ "${PV}" == *9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" +else + SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi +LICENSE="LGPL-2.1+" +SLOT="0" + +IUSE="pie test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( sys-apps/dbus )" + +CONFIG_CHECK=" + ~TIMERFD + ~EVENTFD + ~CRYPTO_USER_API + ~CRYPTO_USER_API_HASH + ~CRYPTO_MD5 + ~CRYPTO_SHA1 + ~KEY_DH_OPERATIONS +" + +PATCHES=( + "${FILESDIR}"/0.70 +) + +src_prepare() { + default + sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \ + unit/test-dbus*.c unit/dbus.conf || die + [[ "${PV}" == *9999 ]] && eautoreconf +} + +src_configure() { + append-cflags "-fsigned-char" #662694 + local myeconfargs=( + $(use_enable pie) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${ED}" -name "*.la" -delete || die +} + +src_test() { + # New dbus tests fail with >3 jobs, this should get fixed soon + emake -j1 check +} diff --git a/dev-libs/ell/files/0.70/0001-settings-fix-std-c23-build-failure.patch b/dev-libs/ell/files/0.70/0001-settings-fix-std-c23-build-failure.patch new file mode 100644 index 000000000000..7adbb003267a --- /dev/null +++ b/dev-libs/ell/files/0.70/0001-settings-fix-std-c23-build-failure.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/943704 +https://lore.kernel.org/all/20241117001814.2149181-2-slyich@gmail.com/T/#m1770e7c457dbb58d6950ee981c68cdd39a996724 + +From fdfed58104edd309431f738eaf3a7b5361ff9c86 Mon Sep 17 00:00:00 2001 +Message-ID: <fdfed58104edd309431f738eaf3a7b5361ff9c86.1731907744.git.sam@gentoo.org> +From: Sergei Trofimovich <slyich@gmail.com> +Date: Sun, 17 Nov 2024 00:18:11 +0000 +Subject: [PATCH 1/4] settings: fix -std=c23 build failure + +gcc-15 switched to -std=c23 by default: + + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212 + +As a result `ell` fails the build as: + + ell/settings.c: In function 'l_settings_get_embedded_value': + ell/settings.c:1521:24: error: incompatible types when returning type '_Bool' but 'const char *' was expected + 1521 | return false; + | ^~~~~ + +The change uses poiter instead of a bool to return the zero value. +--- + ell/settings.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ell/settings.c b/ell/settings.c +index a5f17d1..b46d00b 100644 +--- a/ell/settings.c ++++ b/ell/settings.c +@@ -1518,7 +1518,7 @@ LIB_EXPORT const char *l_settings_get_embedded_value( + struct embedded_group_data *group; + + if (unlikely(!settings)) +- return false; ++ return NULL; + + group = l_queue_find(settings->embedded_groups, + embedded_group_match, group_name); + +base-commit: 373b828093fd48e5f33558bfba9fceaed311486c +-- +2.47.0 + diff --git a/dev-libs/ell/files/0.70/0002-cert-fix-std-c23-build-failure.patch b/dev-libs/ell/files/0.70/0002-cert-fix-std-c23-build-failure.patch new file mode 100644 index 000000000000..85b95a845834 --- /dev/null +++ b/dev-libs/ell/files/0.70/0002-cert-fix-std-c23-build-failure.patch @@ -0,0 +1,67 @@ +https://bugs.gentoo.org/943704 +https://lore.kernel.org/all/20241117001814.2149181-2-slyich@gmail.com/T/#m1770e7c457dbb58d6950ee981c68cdd39a996724 + +From f06bcc6e1b08563ef9a8c8837ad39aaa4357ee43 Mon Sep 17 00:00:00 2001 +Message-ID: <f06bcc6e1b08563ef9a8c8837ad39aaa4357ee43.1731907744.git.sam@gentoo.org> +In-Reply-To: <fdfed58104edd309431f738eaf3a7b5361ff9c86.1731907744.git.sam@gentoo.org> +References: <fdfed58104edd309431f738eaf3a7b5361ff9c86.1731907744.git.sam@gentoo.org> +From: Sergei Trofimovich <slyich@gmail.com> +Date: Sun, 17 Nov 2024 00:18:12 +0000 +Subject: [PATCH 2/4] cert: fix -std=c23 build failure + +gcc-15 switched to -std=c23 by default: + + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff +259b06c212 + +As a result `ell` fails the build as: + + 390 | return false; + | ^~~~~ + +ell/cert.c:390:32: error: incompatible types when returning type '_Bool' but 'const uint8_t *' {aka 'const unsigned char *'} was expected +--- + ell/cert.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/ell/cert.c b/ell/cert.c +index 38bb01a..19a6556 100644 +--- a/ell/cert.c ++++ b/ell/cert.c +@@ -387,13 +387,13 @@ const uint8_t *cert_get_extension(struct l_cert *cert, + + seq = asn1_der_find_elem(ext, end - ext, 0, &tag, &len); + if (unlikely(!seq || tag != ASN1_ID_SEQUENCE)) +- return false; ++ return NULL; + + ext = seq + len; + + oid = asn1_der_find_elem(seq, len, 0, &tag, &oid_len); + if (unlikely(!oid || tag != ASN1_ID_OID)) +- return false; ++ return NULL; + + if (!asn1_oid_eq(ext_id, oid_len, oid)) + continue; +@@ -403,7 +403,7 @@ const uint8_t *cert_get_extension(struct l_cert *cert, + + if (data && tag == ASN1_ID_BOOLEAN) { + if (data_len != 1) +- return false; ++ return NULL; + + critical = *data != 0; /* Tolerate BER booleans */ + +@@ -411,7 +411,7 @@ const uint8_t *cert_get_extension(struct l_cert *cert, + } + + if (unlikely(!data || tag != ASN1_ID_OCTET_STRING)) +- return false; ++ return NULL; + + if (out_critical) + *out_critical = critical; +-- +2.47.0 + diff --git a/dev-libs/ell/files/0.70/0003-dbus-fix-std-c23-build-failure.patch b/dev-libs/ell/files/0.70/0003-dbus-fix-std-c23-build-failure.patch new file mode 100644 index 000000000000..d320a7ba7ab0 --- /dev/null +++ b/dev-libs/ell/files/0.70/0003-dbus-fix-std-c23-build-failure.patch @@ -0,0 +1,45 @@ +https://bugs.gentoo.org/943704 +https://lore.kernel.org/all/20241117001814.2149181-2-slyich@gmail.com/T/#m1770e7c457dbb58d6950ee981c68cdd39a996724 + +From 4aebc7cd5b40df939532bcf4c15e0407e2748750 Mon Sep 17 00:00:00 2001 +Message-ID: <4aebc7cd5b40df939532bcf4c15e0407e2748750.1731907744.git.sam@gentoo.org> +In-Reply-To: <fdfed58104edd309431f738eaf3a7b5361ff9c86.1731907744.git.sam@gentoo.org> +References: <fdfed58104edd309431f738eaf3a7b5361ff9c86.1731907744.git.sam@gentoo.org> +From: Sergei Trofimovich <slyich@gmail.com> +Date: Sun, 17 Nov 2024 00:18:13 +0000 +Subject: [PATCH 3/4] dbus: fix -std=c23 build failure + +gcc-15 switched to -std=c23 by default: + + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212 + +As a result `ell` fails the build as: + + 1700 | return false; + | ^~~~~ + +ell/dbus.c:1700:24: error: incompatible types when returning type '_Bool' but 'void *' was expected +--- + ell/dbus.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ell/dbus.c b/ell/dbus.c +index bd6e1b8..1ab4ded 100644 +--- a/ell/dbus.c ++++ b/ell/dbus.c +@@ -1697,10 +1697,10 @@ LIB_EXPORT void *l_dbus_object_get_data(struct l_dbus *dbus, const char *object, + const char *interface) + { + if (unlikely(!dbus)) +- return false; ++ return NULL; + + if (unlikely(!dbus->tree)) +- return false; ++ return NULL; + + return _dbus_object_tree_get_interface_data(dbus->tree, object, + interface); +-- +2.47.0 + diff --git a/dev-libs/ell/files/0.70/0004-test-rtnl-fix-std-c23-build-failure.patch b/dev-libs/ell/files/0.70/0004-test-rtnl-fix-std-c23-build-failure.patch new file mode 100644 index 000000000000..a170e2475b0c --- /dev/null +++ b/dev-libs/ell/files/0.70/0004-test-rtnl-fix-std-c23-build-failure.patch @@ -0,0 +1,58 @@ +https://bugs.gentoo.org/943704 +https://lore.kernel.org/all/20241117001814.2149181-2-slyich@gmail.com/T/#m1770e7c457dbb58d6950ee981c68cdd39a996724 + +From f5048a5412a0f046c58e1566569dfcc31cd5b5d6 Mon Sep 17 00:00:00 2001 +Message-ID: <f5048a5412a0f046c58e1566569dfcc31cd5b5d6.1731907744.git.sam@gentoo.org> +In-Reply-To: <fdfed58104edd309431f738eaf3a7b5361ff9c86.1731907744.git.sam@gentoo.org> +References: <fdfed58104edd309431f738eaf3a7b5361ff9c86.1731907744.git.sam@gentoo.org> +From: Sergei Trofimovich <slyich@gmail.com> +Date: Sun, 17 Nov 2024 00:18:14 +0000 +Subject: [PATCH 4/4] test-rtnl: fix -std=c23 build failure + +gcc-15 switched to -std=c23 by default: + + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212 + +As a result `ell` fails the build as: + + passing argument 1 of 'l_idle_oneshot' from incompatible pointer type [-Wincompatible-pointer-types] + 501 | l_idle_oneshot(test_next, NULL, NULL); + | ^~~~~~~~~ + | | + | void (*)(void) + +unit/test-rtnl.c: In function 'test_run': +unit/test-rtnl.c:501:24: error: +--- + unit/test-rtnl.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/unit/test-rtnl.c b/unit/test-rtnl.c +index 59d8492..6fbac9e 100644 +--- a/unit/test-rtnl.c ++++ b/unit/test-rtnl.c +@@ -358,6 +358,12 @@ static void test_next() + test->start(rtnl, test->data); + } + ++static void test_next_cb(void * unused) ++{ ++ (void)unused; ++ test_next(); ++} ++ + #define test_assert(cond) \ + do { \ + if (!(cond)) { \ +@@ -498,7 +504,7 @@ static void test_run(void) + { + success = false; + +- l_idle_oneshot(test_next, NULL, NULL); ++ l_idle_oneshot(test_next_cb, NULL, NULL); + l_main_run_with_signal(signal_handler, NULL); + } + +-- +2.47.0 + |