Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/
Date: Wed, 24 Oct 2018 07:35:48
Message-Id: 1540366516.89e321c62aaf9413649531274af3165d840415df.polynomial-c@gentoo
1 commit: 89e321c62aaf9413649531274af3165d840415df
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 24 07:24:19 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 24 07:35:16 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89e321c6
7
8 sys-apps/iproute2: Bump to version 4.19.0
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 sys-apps/iproute2/Manifest | 1 +
14 sys-apps/iproute2/iproute2-4.19.0.ebuild | 151 +++++++++++++++++++++++++++++++
15 2 files changed, 152 insertions(+)
16
17 diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
18 index 376df83e778..da65ca3058c 100644
19 --- a/sys-apps/iproute2/Manifest
20 +++ b/sys-apps/iproute2/Manifest
21 @@ -1,4 +1,5 @@
22 DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c
23 DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c SHA512 ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5
24 DIST iproute2-4.18.0.tar.xz 692868 BLAKE2B ad40a5fa0aecb7c5eb98c3ee2b3a8da212c4b970ceb5f3781dcf961da249a70424a7c760f0f1a0a7fb2348efc9ac9ab3a9ac28fda3692d26001e2b3521493072 SHA512 c7c8e8e76c78faf63548da641769cf9f51811a308cd8eeec171f5f46423f116ff123033f11a554609825aba6d078c95dbbe36aa7ab23bd8d87b3a0d5100be1a9
25 +DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd87aea04971a28eca9f9b7ea82d0e4aa397c9338c0cb6cb463887678a541a5407644e82244ffbbae0eb8f6ac088e8 SHA512 47c750da2247705b1b1d1621f58987333e54370d0fff2f24106194022de793ff35dfd67fd1be127ce019008705702092d31dac49abf930a7c0dc5c7e7c0665b8
26 DIST iproute2-4.4.0.tar.xz 528552 BLAKE2B cad90d2734647a5a5e90b0a8b1337656c6480471caa06beee54fb3abd9c3bc64fc21da349d9b8aa0decf6208de325dd37a9e02fd9e994b024f9142dcd229b87c SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69
27
28 diff --git a/sys-apps/iproute2/iproute2-4.19.0.ebuild b/sys-apps/iproute2/iproute2-4.19.0.ebuild
29 new file mode 100644
30 index 00000000000..e35ecc5e6ec
31 --- /dev/null
32 +++ b/sys-apps/iproute2/iproute2-4.19.0.ebuild
33 @@ -0,0 +1,151 @@
34 +# Copyright 1999-2018 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=6
38 +
39 +inherit toolchain-funcs flag-o-matic multilib
40 +
41 +if [[ ${PV} == "9999" ]] ; then
42 + EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
43 + inherit git-r3
44 +else
45 + SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
46 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
47 +fi
48 +
49 +DESCRIPTION="kernel routing and traffic control utilities"
50 +HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
51 +
52 +LICENSE="GPL-2"
53 +SLOT="0"
54 +IUSE="atm berkdb elf +iptables ipv6 minimal selinux"
55 +
56 +# We could make libmnl optional, but it's tiny, so eh
57 +RDEPEND="
58 + !net-misc/arpd
59 + !minimal? ( net-libs/libmnl )
60 + elf? ( virtual/libelf )
61 + iptables? ( >=net-firewall/iptables-1.4.20:= )
62 + berkdb? ( sys-libs/db:= )
63 + atm? ( net-dialup/linux-atm )
64 + selinux? ( sys-libs/libselinux )
65 +"
66 +# We require newer linux-headers for ipset support #549948 and some defines #553876
67 +DEPEND="
68 + ${RDEPEND}
69 + app-arch/xz-utils
70 + iptables? ( virtual/pkgconfig )
71 + >=sys-devel/bison-2.4
72 + sys-devel/flex
73 + >=sys-kernel/linux-headers-3.16
74 + elibc_glibc? ( >=sys-libs/glibc-2.7 )
75 +"
76 +
77 +PATCHES=(
78 + "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
79 + "${FILESDIR}"/${PN}-4.16.0-configure-nomagic.patch # bug 643722
80 +)
81 +
82 +src_prepare() {
83 + if ! use ipv6 ; then
84 + PATCHES+=(
85 + "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
86 + )
87 + fi
88 +
89 + default
90 +
91 + sed -i \
92 + -e '/^CC :\?=/d' \
93 + -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
94 + -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
95 + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
96 + -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
97 + Makefile || die
98 +
99 + # Use /run instead of /var/run.
100 + sed -i \
101 + -e 's:/var/run:/run:g' \
102 + include/namespace.h \
103 + man/man8/ip-netns.8 || die
104 +
105 + # build against system headers
106 + rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
107 + sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
108 +
109 + use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
110 +}
111 +
112 +src_configure() {
113 + tc-export AR CC PKG_CONFIG
114 +
115 + # This sure is ugly. Should probably move into toolchain-funcs at some point.
116 + local setns
117 + pushd "${T}" >/dev/null
118 + printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
119 + ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
120 + echo 'int main(){return 0;}' > test.c
121 + ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
122 + popd >/dev/null
123 +
124 + # run "configure" script first which will create "config.mk"...
125 + econf
126 +
127 + # ...now switch on/off requested features via USE flags
128 + # this is only useful if the test did not set other things, per bug #643722
129 + cat <<-EOF >> config.mk
130 + TC_CONFIG_ATM := $(usex atm y n)
131 + TC_CONFIG_XT := $(usex iptables y n)
132 + TC_CONFIG_NO_XT := $(usex iptables n y)
133 + # We've locked in recent enough kernel headers #549948
134 + TC_CONFIG_IPSET := y
135 + HAVE_BERKELEY_DB := $(usex berkdb y n)
136 + HAVE_MNL := $(usex minimal n y)
137 + HAVE_ELF := $(usex elf y n)
138 + HAVE_SELINUX := $(usex selinux y n)
139 + IP_CONFIG_SETNS := ${setns}
140 + # Use correct iptables dir, #144265 #293709
141 + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
142 + EOF
143 +}
144 +
145 +src_compile() {
146 + emake V=1
147 +}
148 +
149 +src_install() {
150 + if use minimal ; then
151 + into /
152 + dosbin tc/tc
153 + dobin ip/ip
154 + return 0
155 + fi
156 +
157 + emake \
158 + DESTDIR="${D}" \
159 + LIBDIR="${EPREFIX%/}"/$(get_libdir) \
160 + SBINDIR="${EPREFIX%/}"/sbin \
161 + CONFDIR="${EPREFIX%/}"/etc/iproute2 \
162 + DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
163 + MANDIR="${EPREFIX%/}"/usr/share/man \
164 + ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
165 + install
166 +
167 + dodir /bin
168 + mv "${ED%/}"/{s,}bin/ip || die #330115
169 +
170 + dolib.a lib/libnetlink.a
171 + insinto /usr/include
172 + doins include/libnetlink.h
173 + # This local header pulls in a lot of linux headers it
174 + # doesn't directly need. Delete this header that requires
175 + # linux-headers-3.8 until that goes stable. #467716
176 + sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
177 +
178 + if use berkdb ; then
179 + dodir /var/lib/arpd
180 + # bug 47482, arpd doesn't need to be in /sbin
181 + dodir /usr/bin
182 + mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
183 + fi
184 +}