From 6b933047f46efec1aa747570f945344254227457 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Dec 2017 17:25:28 +0000 Subject: gentoo resync : 15.12.2017 --- sys-apps/iproute2/Manifest | 4 +- .../files/iproute2-4.14.1-fix-tc-actions.patch | 222 +++++++++++++++++++++ sys-apps/iproute2/iproute2-4.14.1-r1.ebuild | 2 +- sys-apps/iproute2/iproute2-4.14.1-r2.ebuild | 146 ++++++++++++++ 4 files changed, 372 insertions(+), 2 deletions(-) create mode 100644 sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch create mode 100644 sys-apps/iproute2/iproute2-4.14.1-r2.ebuild (limited to 'sys-apps/iproute2') diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index 87c93cd21d57..2d0f94a71c8f 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -1,6 +1,7 @@ AUX iproute2-3.1.0-mtu.patch 1649 BLAKE2B cbecd9770391ca7c7f25b860a95bb5b2783073b333084874b18de85f5a9072ab3922e083f726ab1e6f58f0334b515968b1e3651abcd7fc6f603def0492da79cb SHA512 5479c2085b4aca958a89d3e265ebc3763c9e7cb273bd4046d7b7585209739f75ff04cc9b84d8eb9e3afae821ff788f0f0c7ab443260ab07943b6fad6946403e1 AUX iproute2-4.11.0-no-ipv6.patch 1360 BLAKE2B 43881c76622159e6ae7f7499eddfc251b0cf1e0a8fa077d3099c509706b056c51685c3dff66e3381a2ca0839dd32d1534a310dff4acf329836ddd1bec6eb8241 SHA512 8e548f19079eea1d3a5a91bb657bba961c9e9206147e0e0aea1aaf04d74b46e2687c906b78561d939f53f4a33ecb9e08ad8237f401068076df5842c78bc3b577 AUX iproute2-4.12.0-uclibc-ng-add-ipproto_mh.patch 1178 BLAKE2B e00d87fc26faa8433116e8d610a3197991a692951664238cf09228ce6e369417f82cc737ef56087fd8bdd3e50d11f9486dee3c858be9b60f4295039cc7b0bd7c SHA512 e433276513faabad15939fe7b716d8677211ff739a6b791c3bd4aa0014aae053a89395545fd55534f2fc16502d8d84bfc6b0ccf0154497a03e30947e4070f3af +AUX iproute2-4.14.1-fix-tc-actions.patch 6665 BLAKE2B e2ff926f2122973bcbe61e16717b8a1c51b6b76a774b6ce03126b7664fc5beb47e4f38672910e822b19aadd5c369d00553b2e6b6c30c012e03ad37b023cac4f7 SHA512 cdde7bb5a0cb49471472a8412758023529976dcafefc6a759ce758fba1b0420c046ca6faf084df81ac11e7153ac820909b1b9ec41c04f643208b9db456cfda28 AUX iproute2-4.2.0-no-ipv6.patch 1336 BLAKE2B bafb155e6bbd902eb0fff7d8875cc4ef7956de0071273dd373ebd09ef46ba23eb22f4226a044585faa2a00c9e4c2854e57e0e06eb1ac735edea9dce2721cadcc SHA512 f4219a094f367c9f8fac089beeffca31abbbc5d4ade1681e23a92f3dd2e1a95f331322938936b0b1771ea5a56224e0f14008f4d38a8708357a5d2b2b70efbbd5 AUX iproute2-4.5.0-no-iptables.patch 1022 BLAKE2B 5e073c3e78491ae86b137ecbea2362c25c98011121cd7b59b8791227638918ad34c417f1ecd48459ef1901c7ff015463f15e5f8343d46d4b56e5555311e3c8d8 SHA512 3a3e7a66f1528dc8d03fc6a13f363ce890d0c23c2ab8df966144d8764e95cafca168bdb7dd79cf1a8dd1e54be36939f2e6465ca6176e3bfedd222eb29901f98e DIST iproute2-4.10.0.tar.xz 626944 BLAKE2B 8d37ae67785cd4a3110f989b0ac635c1cbdc8258afeba5894b58dfcee49fdd9a4c86d8c1693ee5c5a933ce54396dbfed054dbf7fb4888c08563c36c13c282a65 SHA512 e54477e167455e7ef5da4adc168d63eaa96091b63dc987fffe918cbb005eceed18a62283ca99ee2512dc0e960f47ae21b39ffbe399c1612fd9cea147c34c581b @@ -20,7 +21,8 @@ EBUILD iproute2-4.11.0.ebuild 3986 BLAKE2B 0103b40fa4c1104421e3fac2d002cb8422498 EBUILD iproute2-4.12.0.ebuild 4212 BLAKE2B 8b40329be710f3d8461429dd94a5a4d4d29cff3b2bdec2a69870e4b24db9726f81885dac49e9afe3aecbca99d9039077a5553e87f5558c91cfb08ed903adfaca SHA512 d66105200c18892f642ab4c43fe3d72ab8cbfd7b1c212eb2b6d04b2e16f8389a1b5244abed85fbbefe4da90bf2604c57f6a0e13601b268b04609cf31c73da897 EBUILD iproute2-4.13.0.ebuild 4213 BLAKE2B 4a238544e35502f785f0916ec5bd255787b01fe5368d169d380778a5d514bd39784968073bcfaf2a2a7abaaf14c0fe85ec46f5374b204b46be887f750c823d62 SHA512 9e3d7ac9347a9e92ece5f6d737b688bd76136600264c888e449e0738c53a58de45a3459b1bd94f150bf2147f5232a8fefe571985bc2227f0d29322f8657d1039 EBUILD iproute2-4.14.0.ebuild 4150 BLAKE2B 2c218117921dbae1ac920bd3eaede84faf2e6983fdc26c158b4e8405ee0cc9620eb1fdba31aeae169a813e080edbba57fae958bd9429fd0e804a8245cdcfe195 SHA512 1a1c39f742febf5b064bd471e0ea3ed018f81018895833962e110c60d00b3f85351dbb9db5557ad43b3f1988dff0e5bbad69d307ccc6fe1ea637a24e171dc690 -EBUILD iproute2-4.14.1-r1.ebuild 3927 BLAKE2B 354f64cac9e23521bd927734647eba6cb7cca80d82f05e6484d3c455b70c72ba248174e3dbd05e0010534909e35e546b29ca3d29c4ce75944794c9b75adae964 SHA512 6962ae316c88925a233f830c7737db9a20baf49cb360fa2864b2da04a05b795915838c69a24f5ace91097a44be2127f80bd6b64084ba9b9ac9f0931471d6788f +EBUILD iproute2-4.14.1-r1.ebuild 3922 BLAKE2B c0fcd01bd73a71e460c4f760c5497d1db14997c31c5f6a0a8ea939acba001135861387486d67221fcc131126e02416f4dfee4ae0fbdbbcf6e0f240de21573c3e SHA512 a78d8387e2c67518136d19c982bd20c521b36c76b963a9e7565488648cc8ba18135e298b1252827af1a7c97ea553a33d66144f977d52ed50e1cafaf2ac64efe7 +EBUILD iproute2-4.14.1-r2.ebuild 4105 BLAKE2B 53696cd740d0090aa8e8d9cd9b8dbf8caba2a11a1e635cd4b1c2e8eb05321c420ae8736f8a67fe58a86d39146ab3eafca7038d1314c15c893aa80e556595a213 SHA512 a2a78e69860661289dc2343732ab0478b26d16b440ce874b263e701c132d04699a456c7fc975bd43a731085cd7b747ed8ea1ea5bf12d4a8df6310a73ad1955b4 EBUILD iproute2-4.14.1.ebuild 3928 BLAKE2B 62ebf9cb809f16249dc923faa766c4ee5e907ae12f056184fb6e125a681ce20a644f6d59a2c3d0391fc2eae8c1e5da0de5bf36ba140994ad569297f0659400dd SHA512 1ea1ae406f9c86e119abcba8e4d0109643dea7c26c710531710234dd36babd862b5d6db9c4cb47fabebca5d3683bacc9e68f3fd40b37b45968965130a6084c59 EBUILD iproute2-4.4.0.ebuild 3874 BLAKE2B 38518bb4f4610a04231e03a0068b0cd232477202c2efeeab9c42883a155707d74535e7398347316bff6d4c7833ebe6893fcac246fc756780febd6e4b61f0a486 SHA512 d21f5f77a404fc3ecd70728c64af64a24080044a4634cb68078699e628120c1cba2c2b508cd34ad92e9202ccdac01596a6e988635b5c1a1e0113815d893a217a EBUILD iproute2-4.5.0.ebuild 3887 BLAKE2B 6788057f29e49ba641f790c571035d2a489a238a2821b3b5fe12c0973fa4c2aeef703826379944defe3b9997b889c071ce51f7ffe0ab5eeff68b644ced49faeb SHA512 a5d957f6660e3d1444a46511f8040f0bc7eb7a489a087e49e90a4e1d356f5346cb39a5dfdc98411d5e3eb1d6aca9e6d88f815ea133d501e5a640e099ef8e9ecc diff --git a/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch b/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch new file mode 100644 index 000000000000..a8b7aaa9efe0 --- /dev/null +++ b/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch @@ -0,0 +1,222 @@ +From 3572e01a090a298e2f4c4f796bad6639b652e031 Mon Sep 17 00:00:00 2001 +From: Michal Privoznik +Date: Fri, 8 Dec 2017 11:18:07 +0100 +Subject: tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control() + +Not all callers want parse_action_control*() to advance the +arguments. For instance act_parse_police() does the argument +advancing itself. + +Fixes: e67aba559581 ("tc: actions: add helpers to parse and print control actions") +Signed-off-by: Michal Privoznik +--- + tc/m_bpf.c | 1 + + tc/m_connmark.c | 1 + + tc/m_csum.c | 1 + + tc/m_gact.c | 10 +++++----- + tc/m_ife.c | 1 + + tc/m_mirred.c | 4 +++- + tc/m_nat.c | 1 + + tc/m_pedit.c | 1 + + tc/m_sample.c | 1 + + tc/m_skbedit.c | 1 + + tc/m_skbmod.c | 1 + + tc/m_tunnel_key.c | 1 + + tc/m_vlan.c | 1 + + tc/tc_util.c | 1 - + 14 files changed, 19 insertions(+), 7 deletions(-) + +diff --git a/tc/m_bpf.c b/tc/m_bpf.c +index 1c1f71c..576f69c 100644 +--- a/tc/m_bpf.c ++++ b/tc/m_bpf.c +@@ -129,6 +129,7 @@ opt_bpf: + + parse_action_control_dflt(&argc, &argv, &parm.action, + false, TC_ACT_PIPE); ++ NEXT_ARG_FWD(); + + if (argc) { + if (matches(*argv, "index") == 0) { +diff --git a/tc/m_connmark.c b/tc/m_connmark.c +index 37d7185..47c7a8c 100644 +--- a/tc/m_connmark.c ++++ b/tc/m_connmark.c +@@ -82,6 +82,7 @@ parse_connmark(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, + } + + parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_PIPE); ++ NEXT_ARG_FWD(); + + if (argc) { + if (matches(*argv, "index") == 0) { +diff --git a/tc/m_csum.c b/tc/m_csum.c +index 7b15673..e1352c0 100644 +--- a/tc/m_csum.c ++++ b/tc/m_csum.c +@@ -124,6 +124,7 @@ parse_csum(struct action_util *a, int *argc_p, + } + + parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_OK); ++ NEXT_ARG_FWD(); + + if (argc) { + if (matches(*argv, "index") == 0) { +diff --git a/tc/m_gact.c b/tc/m_gact.c +index e7d91da..b30b042 100644 +--- a/tc/m_gact.c ++++ b/tc/m_gact.c +@@ -87,14 +87,13 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p, + if (argc < 0) + return -1; + +- +- if (matches(*argv, "gact") == 0) { +- argc--; +- argv++; +- } else if (parse_action_control(&argc, &argv, &p.action, false) == -1) { ++ if (matches(*argv, "gact") != 0 && ++ parse_action_control(&argc, &argv, &p.action, false) == -1) { + usage(); /* does not return */ + } + ++ NEXT_ARG_FWD(); ++ + #ifdef CONFIG_GACT_PROB + if (argc > 0) { + if (matches(*argv, "random") == 0) { +@@ -114,6 +113,7 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p, + if (parse_action_control(&argc, &argv, + &pp.paction, false) == -1) + usage(); ++ NEXT_ARG_FWD(); + if (get_u16(&pp.pval, *argv, 10)) { + fprintf(stderr, + "Illegal probability val 0x%x\n", +diff --git a/tc/m_ife.c b/tc/m_ife.c +index 205efc9..4647f6a 100644 +--- a/tc/m_ife.c ++++ b/tc/m_ife.c +@@ -159,6 +159,7 @@ static int parse_ife(struct action_util *a, int *argc_p, char ***argv_p, + + parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_mirred.c b/tc/m_mirred.c +index 3870d3a..aa7ce6d 100644 +--- a/tc/m_mirred.c ++++ b/tc/m_mirred.c +@@ -202,8 +202,10 @@ parse_direction(struct action_util *a, int *argc_p, char ***argv_p, + } + + +- if (p.eaction == TCA_EGRESS_MIRROR || p.eaction == TCA_INGRESS_MIRROR) ++ if (p.eaction == TCA_EGRESS_MIRROR || p.eaction == TCA_INGRESS_MIRROR) { + parse_action_control(&argc, &argv, &p.action, false); ++ NEXT_ARG_FWD(); ++ } + + if (argc) { + if (iok && matches(*argv, "index") == 0) { +diff --git a/tc/m_nat.c b/tc/m_nat.c +index 1e4ff51..f5de4d4 100644 +--- a/tc/m_nat.c ++++ b/tc/m_nat.c +@@ -116,6 +116,7 @@ parse_nat(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, struct + + parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_OK); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_pedit.c b/tc/m_pedit.c +index 26549ee..dc57f14 100644 +--- a/tc/m_pedit.c ++++ b/tc/m_pedit.c +@@ -672,6 +672,7 @@ int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, + + parse_action_control_dflt(&argc, &argv, &sel.sel.action, false, TC_ACT_OK); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_sample.c b/tc/m_sample.c +index ff5ee6b..31774c0 100644 +--- a/tc/m_sample.c ++++ b/tc/m_sample.c +@@ -100,6 +100,7 @@ static int parse_sample(struct action_util *a, int *argc_p, char ***argv_p, + + parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_skbedit.c b/tc/m_skbedit.c +index aa374fc..c41a7bb 100644 +--- a/tc/m_skbedit.c ++++ b/tc/m_skbedit.c +@@ -123,6 +123,7 @@ parse_skbedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, + parse_action_control_dflt(&argc, &argv, &sel.action, + false, TC_ACT_PIPE); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_skbmod.c b/tc/m_skbmod.c +index 561b73f..bc268df 100644 +--- a/tc/m_skbmod.c ++++ b/tc/m_skbmod.c +@@ -124,6 +124,7 @@ static int parse_skbmod(struct action_util *a, int *argc_p, char ***argv_p, + + parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_tunnel_key.c b/tc/m_tunnel_key.c +index 1cdd035..2dc9187 100644 +--- a/tc/m_tunnel_key.c ++++ b/tc/m_tunnel_key.c +@@ -175,6 +175,7 @@ static int parse_tunnel_key(struct action_util *a, int *argc_p, char ***argv_p, + parse_action_control_dflt(&argc, &argv, &parm.action, + false, TC_ACT_PIPE); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_vlan.c b/tc/m_vlan.c +index 161759f..edae0d1 100644 +--- a/tc/m_vlan.c ++++ b/tc/m_vlan.c +@@ -131,6 +131,7 @@ static int parse_vlan(struct action_util *a, int *argc_p, char ***argv_p, + parse_action_control_dflt(&argc, &argv, &parm.action, + false, TC_ACT_PIPE); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/tc_util.c b/tc/tc_util.c +index 1887905..ee9a70a 100644 +--- a/tc/tc_util.c ++++ b/tc/tc_util.c +@@ -586,7 +586,6 @@ static int __parse_action_control(int *argc_p, char ***argv_p, int *result_p, + } + result |= jump_cnt; + } +- NEXT_ARG_FWD(); + *argc_p = argc; + *argv_p = argv; + *result_p = result; +-- +cgit v1.1 + diff --git a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild index e0476f1e13ac..e84d53c46cd9 100644 --- a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild +++ b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86" fi DESCRIPTION="kernel routing and traffic control utilities" diff --git a/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild new file mode 100644 index 000000000000..ab9012f964c5 --- /dev/null +++ b/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs flag-o-matic multilib + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" + inherit git-r3 +else + SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +fi + +DESCRIPTION="kernel routing and traffic control utilities" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" + +LICENSE="GPL-2" +SLOT="0" +IUSE="atm berkdb +iptables ipv6 minimal selinux" + +# We could make libmnl optional, but it's tiny, so eh +RDEPEND=" + !net-misc/arpd + !minimal? ( net-libs/libmnl virtual/libelf ) + iptables? ( >=net-firewall/iptables-1.4.20:= ) + berkdb? ( sys-libs/db:= ) + atm? ( net-dialup/linux-atm ) + selinux? ( sys-libs/libselinux ) +" +# We require newer linux-headers for ipset support #549948 and some defines #553876 +DEPEND=" + ${RDEPEND} + app-arch/xz-utils + iptables? ( virtual/pkgconfig ) + >=sys-devel/bison-2.4 + sys-devel/flex + >=sys-kernel/linux-headers-3.16 + elibc_glibc? ( >=sys-libs/glibc-2.7 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 + "${FILESDIR}"/${P}-fix-tc-actions.patch +) + +src_prepare() { + if ! use ipv6 ; then + PATCHES+=( + "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849 + ) + fi + + default + + sed -i \ + -e '/^CC :\?=/d' \ + -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ + -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ + -e "/^WFLAGS/s:-Werror::" \ + -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ + Makefile || die + + # Use /run instead of /var/run. + sed -i \ + -e 's:/var/run:/run:g' \ + include/namespace.h \ + man/man8/ip-netns.8 || die + + # build against system headers + rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc + sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die + + use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile +} + +src_configure() { + tc-export AR CC PKG_CONFIG + + # This sure is ugly. Should probably move into toolchain-funcs at some point. + local setns + pushd "${T}" >/dev/null + printf '#include \nint main(){return setns(0, 0);}\n' > test.c + ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n + echo 'int main(){return 0;}' > test.c + ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile + popd >/dev/null + + # run "configure" script first which will create "config.mk"... + default + + # ...now switch on/off requested features via USE flags + cat <<-EOF >> config.mk + TC_CONFIG_ATM := $(usex atm y n) + TC_CONFIG_XT := $(usex iptables y n) + TC_CONFIG_NO_XT := $(usex iptables n y) + # We've locked in recent enough kernel headers #549948 + TC_CONFIG_IPSET := y + HAVE_BERKELEY_DB := $(usex berkdb y n) + HAVE_MNL := $(usex minimal n y) + HAVE_ELF := $(usex minimal n y) + HAVE_SELINUX := $(usex selinux y n) + IP_CONFIG_SETNS := ${setns} + # Use correct iptables dir, #144265 #293709 + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + EOF +} + +src_install() { + if use minimal ; then + into / + dosbin tc/tc + dobin ip/ip + return 0 + fi + + emake \ + DESTDIR="${D}" \ + LIBDIR="${EPREFIX%/}"/$(get_libdir) \ + SBINDIR="${EPREFIX%/}"/sbin \ + CONFDIR="${EPREFIX%/}"/etc/iproute2 \ + DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \ + MANDIR="${EPREFIX%/}"/usr/share/man \ + ARPDDIR="${EPREFIX%/}"/var/lib/arpd \ + install + + dodir /bin + mv "${ED%/}"/{s,}bin/ip || die #330115 + + dolib.a lib/libnetlink.a + insinto /usr/include + doins include/libnetlink.h + # This local header pulls in a lot of linux headers it + # doesn't directly need. Delete this header that requires + # linux-headers-3.8 until that goes stable. #467716 + sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die + + if use berkdb ; then + dodir /var/lib/arpd + # bug 47482, arpd doesn't need to be in /sbin + dodir /usr/bin + mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die + fi +} -- cgit v1.2.3