commit: fa7525e13bb39e816ddd607891f875224327643c Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Aug 31 06:03:58 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Aug 31 06:04:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa7525e1
dev-libs/libnl: add 3.8.0 Closes: https://bugs.gentoo.org/912777 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/libnl/Manifest | 1 + .../libnl/files/libnl-3.8.0-printf-non-bash.patch | 22 ++++++++++++++++++++++ .../libnl-3.8.0-python-decorator-syntax.patch | 21 +++++++++++++++++++++ .../{libnl-9999.ebuild => libnl-3.8.0.ebuild} | 18 ++++++++++++++---- dev-libs/libnl/libnl-9999.ebuild | 17 +++++++++++++---- 5 files changed, 71 insertions(+), 8 deletions(-) diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest index da8654736030..18fd94dbe918 100644 --- a/dev-libs/libnl/Manifest +++ b/dev-libs/libnl/Manifest @@ -1 +1,2 @@ DIST libnl-3.7.0.tar.gz 1000913 BLAKE2B 22c418ea520416d79ee4552ab6bc5ba99239b29e074c840d31b0ec4171a0403ea9d2c1afcbf1b3428564dd371cadd99bc062ae7540e7496f970c4fb98f967e84 SHA512 80fbbc079299c90afd2a5eda62e4d4f98bf4ef23958c3ce5101f4ed4d81d783af733213bb3bab15f218555d8460bc2394898f909f4ac024fc27281faec86a041 +DIST libnl-3.8.0.tar.gz 1071113 BLAKE2B ff90d52e9b617ad8a53e4d42f43bee065b331ed919a3effc4a0f38c8e15b46f86c1eb153816499ed77dd99063500b1dc52951891034475a5bb81da1ad8004594 SHA512 a8da7e8464c5cab2807cd86f83fca53bc77f7c3bdefe43880db7be9caf5ba6bfca1b7e778b906c12fda1cf7e6f413f88cc7ad1dcc42fe8c050a8d28a6e656c02 diff --git a/dev-libs/libnl/files/libnl-3.8.0-printf-non-bash.patch b/dev-libs/libnl/files/libnl-3.8.0-printf-non-bash.patch new file mode 100644 index 000000000000..885f8fd750f3 --- /dev/null +++ b/dev-libs/libnl/files/libnl-3.8.0-printf-non-bash.patch @@ -0,0 +1,22 @@ +https://github.com/thom311/libnl/pull/360 + +From 32f84a052a4383299b9f30ad09d2a70c3b2cf2b3 Mon Sep 17 00:00:00 2001 +From: Sam James <s...@gentoo.org> +Date: Thu, 31 Aug 2023 06:59:59 +0100 +Subject: [PATCH] Makefile.am: avoid use of non-portable echo arguments + +This fixes tests with a non-bash shell as /bin/sh (in this case, dash) which +does not support `echo -e`. echo itself is portable, but not echo with any arguments. + +Use `printf` instead. +--- a/Makefile.am ++++ b/Makefile.am +@@ -1129,7 +1129,7 @@ EXTRA_DIST += \ + + %.build-headers-test.c: % + mkdir -p "$(dir $@)" +- echo -e "#include <$$(echo "$<" | sed 's|.*\<include/netlink/|netlink/|')>\nint main(int argc, char **argv) { return 0; }" > $@ ++ printf "#include <$$(echo "$<" | sed 's|.*\<include/netlink/|netlink/|')>\nint main(int argc, char **argv) { return 0; }" > $@ + + %.build-headers-test.o: %.build-headers-test.c + $(COMPILE) -Wall -Werror -Wno-error=cpp -I$(srcdir)/include -I$(builddir)/include -c -o $@ $< diff --git a/dev-libs/libnl/files/libnl-3.8.0-python-decorator-syntax.patch b/dev-libs/libnl/files/libnl-3.8.0-python-decorator-syntax.patch new file mode 100644 index 000000000000..d7d14962dab4 --- /dev/null +++ b/dev-libs/libnl/files/libnl-3.8.0-python-decorator-syntax.patch @@ -0,0 +1,21 @@ +https://github.com/thom311/libnl/commit/9aab12dff8e89b7da826c5c0826ef13c71963e28 + +From 9aab12dff8e89b7da826c5c0826ef13c71963e28 Mon Sep 17 00:00:00 2001 +From: David Ward <david.w...@ll.mit.edu> +Date: Tue, 29 Aug 2023 20:54:19 -0400 +Subject: [PATCH] python: Use correct decorator syntax in HTBQdisc + +Fixes: 87d370912ca8 ("netlink.nlattr re-implemented in more pythonic way") + +https://github.com/thom311/libnl/pull/359 +--- a/python/netlink/route/qdisc/htb.py ++++ b/python/netlink/route/qdisc/htb.py +@@ -28,7 +28,7 @@ def default_class(self, value): + capi.rtnl_htb_set_defcls(self._qdisc._rtnl_qdisc, int(value)) + + @property +- @netlink.nlattr("r2q", type=int) ++ @netlink.nlattr(type=int) + def r2q(self): + return capi.rtnl_htb_get_rate2quantum(self._qdisc._rtnl_qdisc) + diff --git a/dev-libs/libnl/libnl-9999.ebuild b/dev-libs/libnl/libnl-3.8.0.ebuild similarity index 89% copy from dev-libs/libnl/libnl-9999.ebuild copy to dev-libs/libnl/libnl-3.8.0.ebuild index 67eba8f4740d..19cb734e478a 100644 --- a/dev-libs/libnl/libnl-9999.ebuild +++ b/dev-libs/libnl/libnl-3.8.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_OPTIONAL=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit autotools distutils-r1 multilib-minimal LIBNL_P=${P/_/-} @@ -31,18 +31,20 @@ RESTRICT="!test? ( test )" RDEPEND="python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND}" -BDEPEND="${RDEPEND} +BDEPEND=" + ${RDEPEND} sys-devel/bison sys-devel/flex python? ( ${DISTUTILS_DEPS} dev-lang/swig ) - test? ( dev-libs/check )" + test? ( dev-libs/check ) +" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" MULTILIB_WRAPPED_HEADERS=( - # we do not install CLI stuff for non-native + # 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 @@ -58,6 +60,11 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/libnl3/netlink/cli/utils.h ) +PATCHES=( + "${FILESDIR}"/${P}-python-decorator-syntax.patch + "${FILESDIR}"/${PN}-3.8.0-printf-non-bash.patch +) + src_prepare() { default @@ -71,6 +78,9 @@ src_prepare() { } multilib_src_configure() { + # bug #884277 + export YACC=yacc.bison + ECONF_SOURCE="${S}" econf \ $(multilib_native_use_enable utils cli) \ $(use_enable debug) diff --git a/dev-libs/libnl/libnl-9999.ebuild b/dev-libs/libnl/libnl-9999.ebuild index 67eba8f4740d..b7e772377e97 100644 --- a/dev-libs/libnl/libnl-9999.ebuild +++ b/dev-libs/libnl/libnl-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_OPTIONAL=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit autotools distutils-r1 multilib-minimal LIBNL_P=${P/_/-} @@ -31,18 +31,20 @@ RESTRICT="!test? ( test )" RDEPEND="python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND}" -BDEPEND="${RDEPEND} +BDEPEND=" + ${RDEPEND} sys-devel/bison sys-devel/flex python? ( ${DISTUTILS_DEPS} dev-lang/swig ) - test? ( dev-libs/check )" + test? ( dev-libs/check ) +" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" MULTILIB_WRAPPED_HEADERS=( - # we do not install CLI stuff for non-native + # 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 @@ -58,6 +60,10 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/libnl3/netlink/cli/utils.h ) +PATCHES=( + "${FILESDIR}"/${PN}-3.8.0-printf-non-bash.patch +) + src_prepare() { default @@ -71,6 +77,9 @@ src_prepare() { } multilib_src_configure() { + # bug #884277 + export YACC=yacc.bison + ECONF_SOURCE="${S}" econf \ $(multilib_native_use_enable utils cli) \ $(use_enable debug)
