commit: 31bbdb905ea71cafecf3520aa371b243bb3655fc Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Tue Dec 1 14:23:05 2020 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Tue Dec 1 15:26:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31bbdb90
dev-libs/ell: bump to 0.35 This release needed a couple of extra fixes for musl, they are already in upstream git. These fixes should be removed on next bump. Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> dev-libs/ell/Manifest | 1 + dev-libs/ell/ell-0.35.ebuild | 68 ++++++++++++++++++++++ ...l-0.35-add-missing-include-in-dhcp-server.patch | 24 ++++++++ .../ell-0.35-add-rawmemchr-to-missing-h.patch | 44 ++++++++++++++ 4 files changed, 137 insertions(+) diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest index cea893a53b4..5d8012185b3 100644 --- a/dev-libs/ell/Manifest +++ b/dev-libs/ell/Manifest @@ -2,3 +2,4 @@ DIST ell-0.28.tar.xz 474880 BLAKE2B 2c571f952056c9f4e3e8c245b2b57645c4baa2935fdb DIST ell-0.31.tar.xz 478860 BLAKE2B f8f8d109605bf62396da001bd3d9b48fd6b7a6fc94ab890ab5a56fc8afb07a216b884fdf4b624ac8f39c3196de8149c7b32790da03262400aac6f8cd8b3fb56b SHA512 e304cc3bb1355fc0671412e793530503c83b1a036bfa3dd5b0cc36cfb28684b780293dc3d81a5727e0030743529882f71ac28d3c735860f6d46477e8ccf6a6e8 DIST ell-0.32.tar.xz 479012 BLAKE2B 909c63f590ba45e5e9aabf0e7c5ce1c44ee5b5235472071ec16c4e160eddfd38dc5383103a684c4d43e325e832965cdade5d8465990ed4c2a2aa44b52d60869b SHA512 13712ac4ff7165b749b8e2dcd5cad4cd8170600c3dca7304eb4068ee916c1187207bc24ffa5d64c9d33253d4a8f56c63b627ad0783d5ca38d78f625211fdc315 DIST ell-0.33.tar.xz 490180 BLAKE2B fc0f558a54bd57d7866c77ba3fdd97e0f35c33fd7ca79f6209c097824b303e69924ee9eb758af3a1881e8e87ac3ad84bea20767cd824cb8366a080eacac8b4be SHA512 4f0960b757c5cae55bf46a10aabb52280a76eda2a2d55ecc92f2a1321b72e936cab47102995597e985072d032f10379fdfc4f56360e535eeac444dab8b171ded +DIST ell-0.35.tar.xz 506400 BLAKE2B 694df293ce5fd31581cbdd9c2f6f3806a07a23ffb76cf04d6c13f1eebc8af5228ab030f3f1f6d68e1f234c4f1c55a6a1c41e93c41957c19ffc57255e86a78b26 SHA512 a61fc6e8b16627920a24a4bc271549863042ba27489039311009b7e16fe04bb88debcdcd239603cb471b78674a57851ee5ab8ee16229ebdf77850e0945410179 diff --git a/dev-libs/ell/ell-0.35.ebuild b/dev-libs/ell/ell-0.35.ebuild new file mode 100644 index 00000000000..707fc0db4ef --- /dev/null +++ b/dev-libs/ell/ell-0.35.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic linux-info multilib-minimal + +DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" +HOMEPAGE="https://01.org/ell"; +if [[ "${PV}" == *9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"; +else + #remove on next bump + inherit autotools + SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +fi +LICENSE="LGPL-2.1" +SLOT="0" + +IUSE="glib pie test" +RESTRICT="!test? ( test )" + +RDEPEND=" + glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) +" +DEPEND=" + ${RDEPEND} + test? ( sys-apps/dbus ) +" + +CONFIG_CHECK=" + ~TIMERFD + ~EVENTFD + ~CRYPTO_USER_API + ~CRYPTO_USER_API_HASH + ~CRYPTO_MD5 + ~CRYPTO_SHA1 + ~KEY_DH_OPERATIONS +" + +#remove on next bump +PATCHES=( "${FILESDIR}/ell-0.35-add-rawmemchr-to-missing-h.patch" + "${FILESDIR}/ell-0.35-add-missing-include-in-dhcp-server.patch" ) + +src_prepare() { + default + #remove on next bump + eautoreconf + [[ "${PV}" == *9999 ]] && eautoreconf +} + +multilib_src_configure() { + append-cflags "-fsigned-char" #662694 + local myeconfargs=( + $(use_enable glib) + $(use_enable pie) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + local DOCS=( ChangeLog README ) + einstalldocs + + find "${ED}" -name "*.la" -delete || die +} diff --git a/dev-libs/ell/files/ell-0.35-add-missing-include-in-dhcp-server.patch b/dev-libs/ell/files/ell-0.35-add-missing-include-in-dhcp-server.patch new file mode 100644 index 00000000000..788985ccd6f --- /dev/null +++ b/dev-libs/ell/files/ell-0.35-add-missing-include-in-dhcp-server.patch @@ -0,0 +1,24 @@ +From 6dfff19d4716ba216de1a3298ed0f667d7782810 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=89rico=20Nogueira?= <eric...@disroot.org> +Date: Mon, 30 Nov 2020 18:40:33 -0300 +Subject: ell: add missing include in dhcp-server. + +--- + ell/dhcp-server.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ell/dhcp-server.c b/ell/dhcp-server.c +index c983ed4..144e83e 100644 +--- a/ell/dhcp-server.c ++++ b/ell/dhcp-server.c +@@ -24,6 +24,7 @@ + #include <config.h> + #endif + ++#include <linux/types.h> + #include <net/ethernet.h> + #include <sys/socket.h> + #include <arpa/inet.h> +-- +cgit 1.2.3-1.el7 + diff --git a/dev-libs/ell/files/ell-0.35-add-rawmemchr-to-missing-h.patch b/dev-libs/ell/files/ell-0.35-add-rawmemchr-to-missing-h.patch new file mode 100644 index 00000000000..2008b27d56a --- /dev/null +++ b/dev-libs/ell/files/ell-0.35-add-rawmemchr-to-missing-h.patch @@ -0,0 +1,44 @@ +From 3916c1cc32be205e185a8a56de5cde1b9ec60e81 Mon Sep 17 00:00:00 2001 +From: Denis Kenzior <denk...@gmail.com> +Date: Mon, 30 Nov 2020 13:00:11 -0600 +Subject: build: Add rawmemchr to missing.h + +For those systems (i.e. musl) that do not support this +--- + configure.ac | 1 + + ell/missing.h | 10 ++++++++++ + 2 files changed, 11 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 1e5ead9..f34add1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -98,6 +98,7 @@ AC_ARG_ENABLE(ubsan, AC_HELP_STRING([--enable-ubsan], + ]) + + AC_CHECK_FUNCS(explicit_bzero) ++AC_CHECK_FUNCS(rawmemchr) + + AC_CHECK_FUNC(signalfd, dummy=yes, + AC_MSG_ERROR(signalfd support is required)) +diff --git a/ell/missing.h b/ell/missing.h +index 6b9b0fd..2a3e647 100644 +--- a/ell/missing.h ++++ b/ell/missing.h +@@ -67,3 +67,13 @@ static inline void explicit_bzero(void *s, size_t n) + #ifndef SO_BINDTOIFINDEX + #define SO_BINDTOIFINDEX 62 + #endif ++ ++#ifndef HAVE_RAWMEMCHR ++static inline void *rawmemchr(const void *s, int c) ++{ ++_Pragma("GCC diagnostic push") ++_Pragma("GCC diagnostic ignored \"-Wstringop-overflow=\"") ++ return memchr(s, c, (size_t) -1); ++_Pragma("GCC diagnostic pop") ++} ++#endif +-- +cgit 1.2.3-1.el7 +
