| 1 |
commit: 2aa2ecb7efed1fe7ea4f236c63013ecf99270b63 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 23 14:40:02 2021 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 23 14:55:36 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aa2ecb7 |
| 7 |
|
| 8 |
sys-apps/iproute2: Synced live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.15, Repoman-3.0.2 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/iproute2/iproute2-9999.ebuild | 28 ++++++++++++++++++++-------- |
| 14 |
1 file changed, 20 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild |
| 17 |
index 7dcb54c51f5..52d0ebd7e41 100644 |
| 18 |
--- a/sys-apps/iproute2/iproute2-9999.ebuild |
| 19 |
+++ b/sys-apps/iproute2/iproute2-9999.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2020 Gentoo Authors |
| 22 |
+# Copyright 1999-2021 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=7 |
| 26 |
@@ -18,18 +18,19 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" |
| 27 |
|
| 28 |
LICENSE="GPL-2" |
| 29 |
SLOT="0" |
| 30 |
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux" |
| 31 |
+IUSE="atm berkdb bpf caps elf +iptables ipv6 libbsd minimal selinux" |
| 32 |
|
| 33 |
# We could make libmnl optional, but it's tiny, so eh |
| 34 |
RDEPEND=" |
| 35 |
!net-misc/arpd |
| 36 |
- dev-libs/libbsd |
| 37 |
!minimal? ( net-libs/libmnl ) |
| 38 |
+ atm? ( net-dialup/linux-atm ) |
| 39 |
+ berkdb? ( sys-libs/db:= ) |
| 40 |
+ bpf? ( dev-libs/libbpf ) |
| 41 |
caps? ( sys-libs/libcap ) |
| 42 |
elf? ( virtual/libelf ) |
| 43 |
iptables? ( >=net-firewall/iptables-1.4.20:= ) |
| 44 |
- berkdb? ( sys-libs/db:= ) |
| 45 |
- atm? ( net-dialup/linux-atm ) |
| 46 |
+ libbsd? ( dev-libs/libbsd ) |
| 47 |
selinux? ( sys-libs/libselinux ) |
| 48 |
" |
| 49 |
# We require newer linux-headers for ipset support #549948 and some defines #553876 |
| 50 |
@@ -46,8 +47,9 @@ BDEPEND=" |
| 51 |
|
| 52 |
PATCHES=( |
| 53 |
"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 |
| 54 |
- "${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722 |
| 55 |
- "${FILESDIR}"/${PN}-5.1.0-portability.patch |
| 56 |
+ "${FILESDIR}"/${PN}-5.11.0-configure-nomagic.patch # bug 643722 |
| 57 |
+ #"${FILESDIR}"/${PN}-5.1.0-portability.patch |
| 58 |
+ "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch |
| 59 |
) |
| 60 |
|
| 61 |
src_prepare() { |
| 62 |
@@ -59,6 +61,14 @@ src_prepare() { |
| 63 |
|
| 64 |
default |
| 65 |
|
| 66 |
+ # Fix version if necessary |
| 67 |
+ local versionfile="include/version.h" |
| 68 |
+ if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then |
| 69 |
+ elog "Fixing version string" |
| 70 |
+ sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ |
| 71 |
+ -i ${versionfile} || die |
| 72 |
+ fi |
| 73 |
+ |
| 74 |
# echo -n is not POSIX compliant |
| 75 |
sed 's@echo -n@printf@' -i configure || die |
| 76 |
|
| 77 |
@@ -92,6 +102,7 @@ src_configure() { |
| 78 |
popd >/dev/null |
| 79 |
|
| 80 |
# run "configure" script first which will create "config.mk"... |
| 81 |
+ LIBBPF_FORCE="$(usex bpf on off)" \ |
| 82 |
econf |
| 83 |
|
| 84 |
# ...now switch on/off requested features via USE flags |
| 85 |
@@ -109,7 +120,8 @@ src_configure() { |
| 86 |
HAVE_SELINUX := $(usex selinux y n) |
| 87 |
IP_CONFIG_SETNS := ${setns} |
| 88 |
# Use correct iptables dir, #144265 #293709 |
| 89 |
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) |
| 90 |
+ IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) |
| 91 |
+ HAVE_LIBBSD := $(usex libbsd y n) |
| 92 |
EOF |
| 93 |
} |
Archives