From b2c59335bfbeb25c5644f32172e1e9b23c447710 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 22 Dec 2022 01:55:45 +0000 Subject: gentoo auto-resync : 22:12:2022 - 01:55:45 --- dev-libs/libnl/Manifest | 6 - .../libnl/files/libnl-3.6.0-static-tests.patch | 37 ----- .../files/libnl-3.6.0-test-fixes-sandbox.patch | 160 --------------------- dev-libs/libnl/libnl-3.5.0.ebuild | 99 ------------- dev-libs/libnl/libnl-3.6.0-r1.ebuild | 108 -------------- 5 files changed, 410 deletions(-) delete mode 100644 dev-libs/libnl/files/libnl-3.6.0-static-tests.patch delete mode 100644 dev-libs/libnl/files/libnl-3.6.0-test-fixes-sandbox.patch delete mode 100644 dev-libs/libnl/libnl-3.5.0.ebuild delete mode 100644 dev-libs/libnl/libnl-3.6.0-r1.ebuild (limited to 'dev-libs/libnl') diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest index 75b0894965a7..5387b2904a5e 100644 --- a/dev-libs/libnl/Manifest +++ b/dev-libs/libnl/Manifest @@ -1,10 +1,4 @@ -AUX libnl-3.6.0-static-tests.patch 1100 BLAKE2B 1542484bd0e87fa20587f3f8507d9d1b9ee44b0aceecfb1358eb737140f42ac34c519da0585e65773d3bca27b6e4f73fc28d19cab6698c51178e9b73dfe8629e SHA512 eaf3f6cd77179cd4e6e0890443cb6fc6d572c71db1c48ce61729a06c6555bff414e1a5bf771eab01634e61686e9ebf7fa20ade6f9f1e96a3290345c95da6ca23 -AUX libnl-3.6.0-test-fixes-sandbox.patch 5394 BLAKE2B 96f4c5f9f0eab96f164aa04a68a28941962e0e25444c5731e1d040680b2466d440beaeab7831b658f72ff2b1b4d9779f75b9700891bbe79618d3f23cd2d34c17 SHA512 e09340c6a3a8a2e95582d474b56736db379cb72318906a97aa1d15e573c31d005cca6879680f121df5d28faa7c670803099fd29d22fc58a016ee6fb0f20fc664 -DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c -DIST libnl-3.6.0.tar.gz 981921 BLAKE2B 4fbc1f6284dfbf0aaa855dfc3bb9774327254718257cf162c14574ece6b0da20f03a587830b21a2481d1da6e9c90482d71d8f9308f1eeafa605c90d0847a838c SHA512 7d1190ce94f43f5b18b1f7909221ca034d4ea5c8ed5735dbd27224d03e7f95d3c4e8ccdb611e33b58007729a21bfc0e23adc8758b112c712355664d87a81ce1b DIST libnl-3.7.0.tar.gz 1000913 BLAKE2B 22c418ea520416d79ee4552ab6bc5ba99239b29e074c840d31b0ec4171a0403ea9d2c1afcbf1b3428564dd371cadd99bc062ae7540e7496f970c4fb98f967e84 SHA512 80fbbc079299c90afd2a5eda62e4d4f98bf4ef23958c3ce5101f4ed4d81d783af733213bb3bab15f218555d8460bc2394898f909f4ac024fc27281faec86a041 -EBUILD libnl-3.5.0.ebuild 2381 BLAKE2B e054756ad522c3cfe593baf45854e6e4a8e669d26ec2027adf30cb537442f14d77b06493fdab911503d4e08045b1c2c9c4302ce9f892e17e221e77d82eabf2b5 SHA512 c99854fbf768e9e5f140fa8f4c88a1549272ba3c9a8200318016b1dbcaa03502527caeb1d26ed917c38958216eb0f3141a722bfc543c9a969e477fc7febd68a1 -EBUILD libnl-3.6.0-r1.ebuild 2637 BLAKE2B 147ee4f4e9e1aa98757c25118761bb2ca9910ee0b07c3452c026d177c0e4a71ac70a55fca49fe77b6d3ff6d1c9074277e1116593ce4a9bc9d349ab58da0111c5 SHA512 e926f00e85bdfa2f115a55ec22f8de09f842dad726c8b0298c445258fb173f2e66c3d54bd7ede5266f248b33037c9b19c0a08ad01fb2a0d61ba3947d78bd1d7c EBUILD libnl-3.7.0.ebuild 2599 BLAKE2B 304a52e251f6d072346272151ec761a7ed999b47fbe801038b90df2a84713f8713265e224b88455e4170017483db350b0defd59ac96a9c75cf1b09ef462c2f8b SHA512 7b8d3b257b5a5d1bfa73992843189921dc6e95e62f7975e47d1d80388ea4082bc26ce2c2030125def635c9eddf86ed2e504d709b275fd9ab433b04ba61926a1c EBUILD libnl-9999.ebuild 2607 BLAKE2B f4d5f69c8af1a98fea70bb64e5e425471beef0c656bf24d81610c85273884eeb7eabed8b4c223947d3c7fb7576085003d7585e208dc9b61af5653ffc454f29ba SHA512 dd742d30232c0c2937d971ad6bbcb02ae2a27c93bc48067dfa9b2aa2ad6ff13ec48d0a26c36c31f946615d1d1b0eebccf9130d25603b92947944d5b3a0354569 MISC metadata.xml 525 BLAKE2B 62918f4b184a0636f9dbe24a31978ceccf354610b2b8d6db040440f5b519f5a7d710861b94671fd1c684da40e2a9df8563093509e7de9318c891e7c93567b7bf SHA512 076a06cff6803de3775cb295688cbe61831e79e3fa2d7a7e53b376a2c0a5137b349db153692b4cfa22ce6121d9e0579253dee06056076e9aec6f09aaf7a41387 diff --git a/dev-libs/libnl/files/libnl-3.6.0-static-tests.patch b/dev-libs/libnl/files/libnl-3.6.0-static-tests.patch deleted file mode 100644 index be406705e1d7..000000000000 --- a/dev-libs/libnl/files/libnl-3.6.0-static-tests.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Thomas Haller -Date: Fri, 15 Apr 2022 13:29:49 +0200 -Subject: [PATCH] build: avoid building check-direct with --disable-static - -"check-direct" needs to statically link with the libraries, because -it wants to test internal ABI, which is hidden in the share libraries. -When configuring with "--disable-static", static libs are not build -and the test tool cannot be build. - -Just skip the test in that case. - -https://github.com/thom311/libnl/issues/306 ---- a/Makefile.am -+++ b/Makefile.am -@@ -984,8 +984,10 @@ tests_check_all_LDADD = \ - $(NULL) - - if WITH_CHECK -+if ENABLE_STATIC - check_programs += tests/check-direct - endif -+endif - - tests_check_direct_SOURCES = \ - tests/check-direct.c \ ---- a/configure.ac -+++ b/configure.ac -@@ -107,6 +107,8 @@ else - AC_CHECK_LIB([pthread], [pthread_mutex_lock], [], AC_MSG_ERROR([libpthread is required])) - fi - -+AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" != "no"]) -+ - AC_ARG_ENABLE([debug], - AS_HELP_STRING([--disable-debug], [Do not include debugging statements]), - [enable_debug="$enableval"], [enable_debug="yes"]) - diff --git a/dev-libs/libnl/files/libnl-3.6.0-test-fixes-sandbox.patch b/dev-libs/libnl/files/libnl-3.6.0-test-fixes-sandbox.patch deleted file mode 100644 index deb60069955c..000000000000 --- a/dev-libs/libnl/files/libnl-3.6.0-test-fixes-sandbox.patch +++ /dev/null @@ -1,160 +0,0 @@ -https://github.com/thom311/libnl/issues/308 -https://github.com/thom311/libnl/commit/85e3c5d423a0ab8f8414f892998323c886484725 -https://github.com/thom311/libnl/commit/ec712a4514e667b6f7fc3a54a10d4d4f65d1b5c7 -https://github.com/thom311/libnl/commit/7577266c03ddbf42257f6c43f42e5837a2671038 - -From 85e3c5d423a0ab8f8414f892998323c886484725 Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Thu, 21 Apr 2022 08:39:51 +0200 -Subject: [PATCH] tests: add _assert_nltst_netns() helper - ---- a/tests/nl-test-util.c -+++ b/tests/nl-test-util.c -@@ -25,6 +25,14 @@ struct nltst_netns { - - /*****************************************************************************/ - -+#define _assert_nltst_netns(nsdata) \ -+ do { \ -+ const struct nltst_netns *_nsdata = (nsdata); \ -+ \ -+ ck_assert_ptr_nonnull(_nsdata); \ -+ ck_assert_int_eq(_nsdata->canary, _CANARY); \ -+ } while (0) -+ - static struct { - struct nltst_netns *nsdata; - } _netns_fixture_global; -@@ -34,12 +42,12 @@ void nltst_netns_fixture_setup(void) - ck_assert(!_netns_fixture_global.nsdata); - - _netns_fixture_global.nsdata = nltst_netns_enter(); -- ck_assert(_netns_fixture_global.nsdata); -+ _assert_nltst_netns(_netns_fixture_global.nsdata); - } - - void nltst_netns_fixture_teardown(void) - { -- ck_assert(_netns_fixture_global.nsdata); -+ _assert_nltst_netns(_netns_fixture_global.nsdata); - _nl_clear_pointer(&_netns_fixture_global.nsdata, nltst_netns_leave); - } - -From ec712a4514e667b6f7fc3a54a10d4d4f65d1b5c7 Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Thu, 21 Apr 2022 08:41:03 +0200 -Subject: [PATCH] tests: cleanup unshare_user() and use _nltst_fclose() - ---- a/tests/nl-test-util.c -+++ b/tests/nl-test-util.c -@@ -65,24 +65,27 @@ static void unshare_user(void) - _nltst_assert_errno(r == 0); - - /* Since Linux 3.19 we have to disable setgroups() in order to map users. -- * Just proceed if the file is not there. */ -+ * Just proceed if the file is not there. */ - f = fopen("/proc/self/setgroups", "we"); - if (f) { -- fprintf(f, "deny"); -- fclose(f); -+ r = fprintf(f, "deny"); -+ _nltst_assert_errno(r > 0); -+ _nltst_fclose(f); - } - - /* Map current UID to root in NS to be created. */ - f = fopen("/proc/self/uid_map", "we"); -- ck_assert(f); -- fprintf(f, "0 %d 1", uid); -- fclose(f); -+ _nltst_assert_errno(f); -+ r = fprintf(f, "0 %d 1", uid); -+ _nltst_assert_errno(r > 0); -+ _nltst_fclose(f); - - /* Map current GID to root in NS to be created. */ - f = fopen("/proc/self/gid_map", "we"); -- ck_assert(f); -- fprintf(f, "0 %d 1", gid); -- fclose(f); -+ _nltst_assert_errno(f); -+ r = fprintf(f, "0 %d 1", gid); -+ _nltst_assert_errno(r > 0); -+ _nltst_fclose(f); - } - - struct nltst_netns *nltst_netns_enter(void) ---- a/tests/nl-test-util.h -+++ b/tests/nl-test-util.h -@@ -34,6 +34,14 @@ - _nltst_assert_errno(_r == 0); \ - } while (0) - -+#define _nltst_fclose(f) \ -+ do { \ -+ int _r; \ -+ \ -+ _r = fclose((f)); \ -+ _nltst_assert_errno(_r == 0); \ -+ } while (0) -+ - /*****************************************************************************/ - - void nltst_netns_fixture_setup(void); -From 7577266c03ddbf42257f6c43f42e5837a2671038 Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Thu, 21 Apr 2022 08:42:35 +0200 -Subject: [PATCH] tests: silently ignore EACCES for setting uid_map for test - namespace - -Seems this can happen, but we probably can just continue with the -unit test. Just ignore the error. - -https://github.com/thom311/libnl/issues/ ## 308 ---- a/tests/nl-test-util.c -+++ b/tests/nl-test-util.c -@@ -53,7 +53,7 @@ void nltst_netns_fixture_teardown(void) - - /*****************************************************************************/ - --static void unshare_user(void) -+static bool unshare_user(void) - { - const uid_t uid = geteuid(); - const gid_t gid = getegid(); -@@ -75,7 +75,11 @@ static void unshare_user(void) - - /* Map current UID to root in NS to be created. */ - f = fopen("/proc/self/uid_map", "we"); -- _nltst_assert_errno(f); -+ if (!f) { -+ if (errno == EACCES) -+ return false; -+ _nltst_assert_errno(f); -+ } - r = fprintf(f, "0 %d 1", uid); - _nltst_assert_errno(r > 0); - _nltst_fclose(f); -@@ -86,6 +90,7 @@ static void unshare_user(void) - r = fprintf(f, "0 %d 1", gid); - _nltst_assert_errno(r > 0); - _nltst_fclose(f); -+ return true; - } - - struct nltst_netns *nltst_netns_enter(void) -@@ -96,8 +101,12 @@ struct nltst_netns *nltst_netns_enter(void) - nsdata = calloc(1, sizeof(struct nltst_netns)); - ck_assert(nsdata); - -- nsdata->canary = _CANARY; -+ *nsdata = (struct nltst_netns){ -+ .canary = _CANARY, -+ }; - -+ /* unshare_user() might fail to set uid_map/gid_map due to sandboxing. -+ * We ignore that error and proceed. The test will possibly still work. */ - unshare_user(); - - r = unshare(CLONE_NEWNET | CLONE_NEWNS); - 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 c2a2a0db143b..000000000000 --- a/dev-libs/libnl/libnl-3.5.0.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -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="https://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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="+debug python test utils" -RESTRICT="!test? ( test )" - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND}" -BDEPEND=" - ${RDEPEND} - python? ( dev-lang/swig ) - test? ( dev-libs/check ) - 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 \ - --disable-static \ - $(multilib_native_use_enable utils cli) \ - $(use_enable debug) -} - -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/libnl-3.6.0-r1.ebuild b/dev-libs/libnl/libnl-3.6.0-r1.ebuild deleted file mode 100644 index 9d5b621e07b0..000000000000 --- a/dev-libs/libnl/libnl-3.6.0-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -DISTUTILS_OPTIONAL=1 -inherit autotools distutils-r1 multilib-minimal - -LIBNL_P=${P/_/-} -LIBNL_DIR=${PV/_/} -LIBNL_DIR=${LIBNL_DIR//./_} - -DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces" -HOMEPAGE="https://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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+debug python test utils" -RESTRICT="!test? ( test )" - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND}" -BDEPEND="${RDEPEND} - sys-devel/bison - sys-devel/flex - python? ( dev-lang/swig ) - test? ( dev-libs/check )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -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/mdb.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 -) - -PATCHES=( - "${FILESDIR}"/${P}-static-tests.patch - "${FILESDIR}"/${P}-test-fixes-sandbox.patch -) - -src_prepare() { - default - - eautoreconf - - if use python; then - pushd "${S}"/python > /dev/null || die - distutils-r1_src_prepare - popd > /dev/null || die - fi -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(multilib_native_use_enable utils cli) \ - $(use_enable debug) -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use python ; then - pushd python > /dev/null || die - distutils-r1_src_compile - popd > /dev/null || die - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use python ; then - # Unset DOCS= since distutils-r1.eclass interferes - local DOCS=() - - pushd python > /dev/null || die - - distutils-r1_src_install - - # For no obvious reason this is not done automatically - python_foreach_impl python_optimize - - popd > /dev/null || die - fi -} - -multilib_src_install_all() { - DOCS=( ChangeLog ) - - einstalldocs - - find "${ED}" -name '*.la' -delete || die -} -- cgit v1.2.3