commit: ad424ad46a7b1de7fdc83bdcd85325b0c27b1f0e Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com> AuthorDate: Sat Mar 13 13:55:47 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 13 21:02:39 2021 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=ad424ad4
dev-libs/libnl: remove from overlay Package-Manager: Portage-3.0.17, Repoman-3.0.2 RepoMan-Options: --force Manifest-Sign-Key: 0xA1919C830E9498E0 Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com> Closes: https://github.com/gentoo/musl/pull/412 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/libgamin/Manifest | 29 ++++++- dev-libs/libnl/Manifest | 2 - dev-libs/libnl/files/libnl-3.3.0_rc1-musl.patch | 103 ----------------------- dev-libs/libnl/libnl-3.4.0.ebuild | 107 ------------------------ dev-libs/libnl/libnl-3.5.0.ebuild | 98 ---------------------- dev-libs/libnl/metadata.xml | 15 ---- 6 files changed, 25 insertions(+), 329 deletions(-) diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest index 2553ad8..7a05560 100644 --- a/dev-libs/libgamin/Manifest +++ b/dev-libs/libgamin/Manifest @@ -1,4 +1,25 @@ -DIST gamin-0.1.10.tar.bz2 452194 SHA256 a59948b20ce2f14136c013f155abb8c8d51db2ea167c063ff33461e453fec10a SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306 WHIRLPOOL 49ca0e192d8f5e28d6ffbb201b98b0f2c736554447b37c50eaa6e76e499ab77d696cf585c96c6a38f94c2589c634e694daf2e4969ffddbbb245b07b8a6e7b2d8 -DIST gamin-0.1.9-freebsd.patch.bz2 4635 SHA256 fcd1a6655d1c7cd86db6102931a4da1c22bc85f1c4692959c1a966fec5231723 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b WHIRLPOOL 462173a33e8f804b71c6991aa5925a5c9a6ee83f80b13967369c5c45721069e629c052e5daebfc3fb03bbad4d3054b523afb6e430db997581f3ff942f7da3180 -DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 SHA256 9cb1bde5a34888ce4de4c4894c7d31dbfdbfb3279007b9eddf2da35510f6a9b5 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004 WHIRLPOOL 3efbf3781a55f44f383e573db4a3b3df731e9f77608d73db4ff3027eae0bda6abb6eae022c094735c0d8d2a85e224a980436d8557f9350bb1558b40d99280701 -DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fbab69f2417cc089b050a7e245d89701b0703a0916d6dc08a706785ee509ee4feed0375107f777fdf4248ff5f93b SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306 +DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b +DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 BLAKE2B a7c8466fbe9f6613108a6a1b450c47c69018f9f252c17647b07591cf9fba2ba3a08cc344ca54f4647a9c809cecaa18b42bf9f2eff9e253749518b68565024b48 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004 +DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 +-----BEGIN PGP SIGNATURE----- + +iQKTBAEBCAB9FiEEZdLCSnfk9z83VSkfsaMsEcx8U7oFAmBMxFRfFIAAAAAALgAo +aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY1 +RDJDMjRBNzdFNEY3M0YzNzU1MjkxRkIxQTMyQzExQ0M3QzUzQkEACgkQsaMsEcx8 +U7pZ4g/8D/9GaMPPy3CHUTWjurzOTi/xzLHYj4KkhgZsTJzpw2QoxTUS90F0vbIn +GrzCCO9Pk/4trclsk4iQ5S0XNv9eR59r4fEJZ/JMQg5otOH/Y2skZH7F84E0fQG4 +ymcz/rjvbfNceFweQZSPD2pd1XLTYurgNe1oFYaW/kI0D1vodyCMjOtvCO6rHlMu +OFQJpriN/yfQo8ddwTdNyvN/cbIH3DNZk7WIv31Mh0DmtKAdTWdZw2kFoGz1xAyA +jclJx9+sMBshhpXosLIT4DXFu5QQ7SVUjjGkB0A806gP6qw6jTm7r+H0VKVE17lm +RoUXjqAxC6lNLhe9EsdTTXMBi+Q5S87tcd+RPcWvkCPfx6PPUuec/axtP6gQWSpV +clDiuBZaai91nnPdRja0vt2fiICyoe3aR0p/yL4YWaNTfbawVkT3zwkVxLfO7Hbb +d9NX+jhsgHW0gX1wxgIq4lQ7w6rfjMaHA9vhmGEF/VHADpTaxO1/7VB7UXX3qqUV +xhwlEXmF5AnqQwBmFDpp363PCFTbv7f8+wFe0pBXgD81D1+TXBYGzhJvwlzaRnT+ +4ziep5r8tDGDRKlb61tS3sCMF0B9EbdUhm8cXRmRJpBCyzR13ZAbbOHd7hCS7WUJ +yYv/KCRKVp3eHVIphWdBa7cSKrA8KS5W1kt8/0SY6HsoC7PUVk4= +=Yi40 +-----END PGP SIGNATURE----- diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest deleted file mode 100644 index 677386b..0000000 --- a/dev-libs/libnl/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST libnl-3.4.0.tar.gz 933443 BLAKE2B 735da9f800277c48a5deceb78084f510f56f7017b1184e91b2bb45ba61a2e95355e7a3f5d0a74bdaf7ae003393a6c7556d5b201d0d0052dfc66042aa9e137986 SHA512 6336e5c55c79ff2638de9c812cc1842871769236bad7f65c547dec35fafd91988b257fceab144a0cc133c4b29f61172f6552c53aa9fc723bdc783079c2b1851e -DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c diff --git a/dev-libs/libnl/files/libnl-3.3.0_rc1-musl.patch b/dev-libs/libnl/files/libnl-3.3.0_rc1-musl.patch deleted file mode 100644 index e62653a..0000000 --- a/dev-libs/libnl/files/libnl-3.3.0_rc1-musl.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff -Naur libnl-3.3.0_rc1.orig/include/linux-private/linux/if_ether.h libnl-3.3.0_rc1/include/linux-private/linux/if_ether.h ---- libnl-3.3.0_rc1.orig/include/linux-private/linux/if_ether.h 2017-03-08 19:56:31.824516933 -0800 -+++ libnl-3.3.0_rc1/include/linux-private/linux/if_ether.h 2017-03-08 20:07:01.938237767 -0800 -@@ -22,6 +22,7 @@ - #define _LINUX_IF_ETHER_H - - #include <linux/types.h> -+#include <linux/libc-compat.h> - - /* - * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble -@@ -117,10 +118,12 @@ - * This is an Ethernet frame header. - */ - -+#if __UAPI_DEF_ETHHDR - struct ethhdr { - unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ - unsigned char h_source[ETH_ALEN]; /* source ether addr */ - __be16 h_proto; /* packet type ID field */ - } __attribute__((packed)); -+#endif - - #endif /* _LINUX_IF_ETHER_H */ -diff -Naur libnl-3.3.0_rc1.orig/include/linux-private/linux/libc-compat.h libnl-3.3.0_rc1/include/linux-private/linux/libc-compat.h ---- libnl-3.3.0_rc1.orig/include/linux-private/linux/libc-compat.h 2017-03-08 19:56:31.823516923 -0800 -+++ libnl-3.3.0_rc1/include/linux-private/linux/libc-compat.h 2017-03-08 20:12:30.376843489 -0800 -@@ -48,10 +48,18 @@ - #ifndef _LIBC_COMPAT_H - #define _LIBC_COMPAT_H - --/* We have included glibc headers... */ --#if defined(__GLIBC__) -+/* We're used from userspace... */ -+#if !defined(__KERNEL__) - --/* Coordinate with glibc netinet/in.h header. */ -+/* Coordinate with libc netinet/if_ether.h */ -+#ifdef _NETINET_IF_ETHER_H /* musl */ -+#define __UAPI_DEF_ETHHDR 0 -+#else -+/* glibc uses __NETINET_IF_ETHER_H, and uses the uapi header. */ -+#define __UAPI_DEF_ETHHDR 1 -+#endif -+ -+/* Coordinate with libc netinet/in.h header. */ - #if defined(_NETINET_IN_H) - - /* GLIBC headers included first so don't define anything -@@ -64,15 +72,7 @@ - #define __UAPI_DEF_IN_CLASS 0 - - #define __UAPI_DEF_IN6_ADDR 0 --/* The exception is the in6_addr macros which must be defined -- * if the glibc code didn't define them. This guard matches -- * the guard in glibc/inet/netinet/in.h which defines the -- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */ --#if defined(__USE_MISC) || defined (__USE_GNU) - #define __UAPI_DEF_IN6_ADDR_ALT 0 --#else --#define __UAPI_DEF_IN6_ADDR_ALT 1 --#endif - #define __UAPI_DEF_SOCKADDR_IN6 0 - #define __UAPI_DEF_IPV6_MREQ 0 - #define __UAPI_DEF_IPPROTO_V6 0 -@@ -83,7 +83,7 @@ - #else - - /* Linux headers included first, and we must define everything -- * we need. The expectation is that glibc will check the -+ * we need. The expectation is that libc will check the - * __UAPI_DEF_* defines and adjust appropriately. */ - #define __UAPI_DEF_IN_ADDR 1 - #define __UAPI_DEF_IN_IPPROTO 1 -@@ -93,7 +93,7 @@ - #define __UAPI_DEF_IN_CLASS 1 - - #define __UAPI_DEF_IN6_ADDR 1 --/* We unconditionally define the in6_addr macros and glibc must -+/* We unconditionally define the in6_addr macros and libc must - * coordinate. */ - #define __UAPI_DEF_IN6_ADDR_ALT 1 - #define __UAPI_DEF_SOCKADDR_IN6 1 -@@ -115,7 +115,10 @@ - /* If we did not see any headers from any supported C libraries, - * or we are being included in the kernel, then define everything - * that we need. */ --#else /* !defined(__GLIBC__) */ -+#else /* defined(__KERNEL__) */ -+ -+/* Definitions for if/ether.h */ -+#define __UAPI_DEF_ETHHDR 1 - - /* Definitions for in.h */ - #define __UAPI_DEF_IN_ADDR 1 -@@ -138,6 +141,6 @@ - /* Definitions for xattr.h */ - #define __UAPI_DEF_XATTR 1 - --#endif /* __GLIBC__ */ -+#endif /* defined(__KERNEL__) */ - - #endif /* _LIBC_COMPAT_H */ diff --git a/dev-libs/libnl/libnl-3.4.0.ebuild b/dev-libs/libnl/libnl-3.4.0.ebuild deleted file mode 100644 index 18eabb8..0000000 --- a/dev-libs/libnl/libnl-3.4.0.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_OPTIONAL=1 -inherit distutils-r1 eutils libtool multilib multilib-minimal - -LIBNL_P=${P/_/-} -LIBNL_DIR=${PV/_/} -LIBNL_DIR=${LIBNL_DIR//./_} - -DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces" -HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl" -SRC_URI=" - https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz -" -LICENSE="LGPL-2.1 utils? ( GPL-2 )" -SLOT="3" -KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86" -IUSE="+debug static-libs python +threads utils" - -RDEPEND=" - python? ( ${PYTHON_DEPS} ) -" -DEPEND=" - ${RDEPEND} - python? ( dev-lang/swig ) - sys-devel/bison - sys-devel/flex -" -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) -" -DOCS=( - ChangeLog -) - -PATCHES=( "${FILESDIR}"/${PN}-3.3.0_rc1-musl.patch ) - -S=${WORKDIR}/${LIBNL_P} - -MULTILIB_WRAPPED_HEADERS=( - # we do not install CLI stuff for non-native - /usr/include/libnl3/netlink/cli/addr.h - /usr/include/libnl3/netlink/cli/class.h - /usr/include/libnl3/netlink/cli/cls.h - /usr/include/libnl3/netlink/cli/ct.h - /usr/include/libnl3/netlink/cli/exp.h - /usr/include/libnl3/netlink/cli/link.h - /usr/include/libnl3/netlink/cli/neigh.h - /usr/include/libnl3/netlink/cli/qdisc.h - /usr/include/libnl3/netlink/cli/route.h - /usr/include/libnl3/netlink/cli/rule.h - /usr/include/libnl3/netlink/cli/tc.h - /usr/include/libnl3/netlink/cli/utils.h -) - -src_prepare() { - default - - elibtoolize - - if use python; then - cd "${S}"/python || die - distutils-r1_src_prepare - fi - - # out-of-source build broken - # https://github.com/thom311/libnl/pull/58 - multilib_copy_sources -} - -multilib_src_configure() { - econf \ - $(multilib_native_use_enable utils cli) \ - $(use_enable debug) \ - $(use_enable static-libs static) \ - $(use_enable threads) \ - --disable-silent-rules -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use python; then - cd python || die - distutils-r1_src_compile - fi -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use python; then - # Unset DOCS= since distutils-r1.eclass interferes - local DOCS=() - cd python || die - distutils-r1_src_install - fi -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files --modules -} diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild deleted file mode 100644 index 07f21ae..0000000 --- a/dev-libs/libnl/libnl-3.5.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_OPTIONAL=1 -inherit distutils-r1 libtool multilib-minimal - -LIBNL_P=${P/_/-} -LIBNL_DIR=${PV/_/} -LIBNL_DIR=${LIBNL_DIR//./_} - -DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces" -HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl" -SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz" -S="${WORKDIR}/${LIBNL_P}" - -LICENSE="LGPL-2.1 utils? ( GPL-2 )" -SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+debug static-libs python +threads utils" - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND}" -BDEPEND=" - ${RDEPEND} - python? ( dev-lang/swig ) - sys-devel/bison - sys-devel/flex -" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS=( ChangeLog ) - -MULTILIB_WRAPPED_HEADERS=( - # we do not install CLI stuff for non-native - /usr/include/libnl3/netlink/cli/addr.h - /usr/include/libnl3/netlink/cli/class.h - /usr/include/libnl3/netlink/cli/cls.h - /usr/include/libnl3/netlink/cli/ct.h - /usr/include/libnl3/netlink/cli/exp.h - /usr/include/libnl3/netlink/cli/link.h - /usr/include/libnl3/netlink/cli/neigh.h - /usr/include/libnl3/netlink/cli/qdisc.h - /usr/include/libnl3/netlink/cli/route.h - /usr/include/libnl3/netlink/cli/rule.h - /usr/include/libnl3/netlink/cli/tc.h - /usr/include/libnl3/netlink/cli/utils.h -) - -src_prepare() { - default - - elibtoolize - - if use python; then - cd "${S}"/python || die - distutils-r1_src_prepare - fi - - # out-of-source build broken - # https://github.com/thom311/libnl/pull/58 - multilib_copy_sources -} - -multilib_src_configure() { - econf \ - $(multilib_native_use_enable utils cli) \ - $(use_enable debug) \ - $(use_enable static-libs static) \ - $(use_enable threads) -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use python; then - cd python || die - distutils-r1_src_compile - fi -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use python; then - # Unset DOCS= since distutils-r1.eclass interferes - local DOCS=() - cd python || die - distutils-r1_src_install - fi -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/libnl/metadata.xml b/dev-libs/libnl/metadata.xml deleted file mode 100644 index ec36f8d..0000000 --- a/dev-libs/libnl/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>net...@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <use> - <flag name="python">Install experimental <pkg>dev-lang/python</pkg> bindings</flag> - <flag name="utils">Install command line interface utils</flag> - </use> - <upstream> - <remote-id type="github">thom311/libnl</remote-id> - </upstream> -</pkgmetadata>