1 |
commit: 18be54ad86cf475d2634210526d1b98dba0d5f49 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 13 10:08:04 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 13 10:23:12 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18be54ad |
7 |
|
8 |
sys-apps/iproute2: Bump to version 4.14.0 |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
11 |
|
12 |
sys-apps/iproute2/Manifest | 1 + |
13 |
sys-apps/iproute2/iproute2-4.14.0.ebuild | 148 +++++++++++++++++++++++++++++++ |
14 |
2 files changed, 149 insertions(+) |
15 |
|
16 |
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest |
17 |
index e451a906893..a63dfa60ece 100644 |
18 |
--- a/sys-apps/iproute2/Manifest |
19 |
+++ b/sys-apps/iproute2/Manifest |
20 |
@@ -2,6 +2,7 @@ DIST iproute2-4.10.0.tar.xz 626944 SHA256 22b1e1c1fc704ad35837e5a66103739727b8b4 |
21 |
DIST iproute2-4.11.0.tar.xz 657100 SHA256 72671028bda696d0cb8f48ec8e702581c3a501caeed33eec3a81d7041cbc8026 SHA512 e6cc3dbe2779670a752ab346c1a432b496033448d1645aa0161b3f7b683b3f9939ab09db12199b794cc64dff257faaf0d151046feea9031a6139176e08b4f4fa WHIRLPOOL 9bf25b018d3f392a2e2f4faf4c3877f52ec4b0aebb082d9c2e2c3e80c0c8f3885c122c5d211c4c6ef014506d786213b36938728f63b581079274a3116fc85581 |
22 |
DIST iproute2-4.12.0.tar.xz 662424 SHA256 2e0a4c4262d9f6c169885a6e16c4c5c5f1ef6fd57b6a0e7b41f42be5bb6ebd7d SHA512 275147f71e7c4698654f0d6d0981ab42f6f108066508c15cfcd5d9e0d3aaf8d33291968d9f06cb03f5494d801cfabf8d53308aaf56fc4fa92c52b137e970a3b0 WHIRLPOOL 590cc191e96ff0b777373603186e4416f064931d529878ec783759f31fd99e1119bb0604e8a89dc98d350f80eca2bfef05a13bca7ce24302408072002c0b17b2 |
23 |
DIST iproute2-4.13.0.tar.xz 670340 SHA256 9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50 SHA512 f96d2839aec1f439bfac504c8e3881c063dacbf4c67b15f0e3da9882d2fa013cba33c23602de3eab624e0eecbb911a13967d60bddcdf097f47a580a5a77b5e3a WHIRLPOOL 757247f1356eef49b299019f6d1809e5d781471665daedce885201b7034a6138def73c84ba2f0453f2f0f5d55cc2edf778992b3d79d06e01364c511373ea4644 |
24 |
+DIST iproute2-4.14.0.tar.xz 636872 SHA256 fee001307b3c018462cb010e3aa19b38017de26168d5777c05ee73a21d60fcd0 SHA512 dda8b7881d82d6d38449d69df362bd3eedde6c7f4dd315d6eaf7969673805faf82675e1df04d7dc35a826b0df429a400a3f8ac0e998c1de0d6ca500e722f058e WHIRLPOOL 62ce4fa8ba1bb84678277401c07097b26490767cd55a66f2be743dc1fec4610033437517c44339dc4cc95ffe0d255d804c25cdd6e77640eb15453160abe87f78 |
25 |
DIST iproute2-4.4.0.tar.xz 528552 SHA256 bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69 WHIRLPOOL 7e90c98805e12b28de284bb998e5a27cf524a78d0bd7632c0d49a7ddff8f11f5229ac6867076e9fea6f21b6b31360bddb21138673d94de766bdf7324a09bc013 |
26 |
DIST iproute2-4.5.0.tar.xz 554500 SHA256 3f15292f53e465cb5bd6652961343ca64eb6936309ae75be5d5a541435bc494a SHA512 d12be24cf7a1102be8e449d1e95fa67b784d505e98fcf2f18caedf0136fb378dc439f74a75bc0d6ef5b2893e5ca1968e122054404c1f4d1a212aeb0fba1c5860 WHIRLPOOL dc660bde36fed126b27fb69a59c02405b5299b92a6b519ebdce74d817f88be82114bb10217ca34bbc26a89e664ff243e606a84bcb00db41088bce824542def40 |
27 |
DIST iproute2-4.6.0.tar.xz 570960 SHA256 74fc6a8ad085be095a159f8158bbaf385b42af9e101619f233f1ae466829d406 SHA512 1e3868ced65012da6724744eb15e6bb8e2c5bf8d7a46cf2b655526de1a9e1224c7b7e9bd4a88e40516b5648955987eb9001600ca5afbd507bc664f92b51ede9f WHIRLPOOL 1b0ff7988d6d5567137aca9d41e2cc3183f3620f8b874113ff9e6ca9508349550e388e423c54b165e73ed54ccb7a366ef8d032a930f27722eccbd5ff6879032e |
28 |
|
29 |
diff --git a/sys-apps/iproute2/iproute2-4.14.0.ebuild b/sys-apps/iproute2/iproute2-4.14.0.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..1e581bc9468 |
32 |
--- /dev/null |
33 |
+++ b/sys-apps/iproute2/iproute2-4.14.0.ebuild |
34 |
@@ -0,0 +1,148 @@ |
35 |
+# Copyright 1999-2017 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI=6 |
39 |
+ |
40 |
+inherit toolchain-funcs flag-o-matic multilib |
41 |
+ |
42 |
+if [[ ${PV} == "9999" ]] ; then |
43 |
+ EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" |
44 |
+ inherit git-r3 |
45 |
+else |
46 |
+ SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" |
47 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
48 |
+fi |
49 |
+ |
50 |
+DESCRIPTION="kernel routing and traffic control utilities" |
51 |
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" |
52 |
+ |
53 |
+LICENSE="GPL-2" |
54 |
+SLOT="0" |
55 |
+IUSE="atm berkdb +iptables ipv6 minimal selinux" |
56 |
+ |
57 |
+# We could make libmnl optional, but it's tiny, so eh |
58 |
+RDEPEND=" |
59 |
+ !net-misc/arpd |
60 |
+ !minimal? ( net-libs/libmnl ) |
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 |
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 |
+) |
80 |
+ |
81 |
+src_prepare() { |
82 |
+ if ! use ipv6 ; then |
83 |
+ PATCHES+=( |
84 |
+ "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849 |
85 |
+ ) |
86 |
+ fi |
87 |
+ |
88 |
+ # Local uclibc-ng compat fix until uclibc-ng upstream can sync |
89 |
+ # netinet/in.h with glibc. Resolves #626546. |
90 |
+ if use elibc_uclibc ; then |
91 |
+ PATCHES+=( |
92 |
+ "${FILESDIR}"/${PN}-4.12.0-uclibc-ng-add-ipproto_mh.patch |
93 |
+ ) |
94 |
+ fi |
95 |
+ |
96 |
+ default |
97 |
+ |
98 |
+ sed -i \ |
99 |
+ -e '/^CC :=/d' \ |
100 |
+ -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ |
101 |
+ -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ |
102 |
+ -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ |
103 |
+ -e "/^WFLAGS/s:-Werror::" \ |
104 |
+ -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ |
105 |
+ Makefile || die |
106 |
+ |
107 |
+ # Use /run instead of /var/run. |
108 |
+ sed -i \ |
109 |
+ -e 's:/var/run:/run:g' \ |
110 |
+ include/namespace.h \ |
111 |
+ man/man8/ip-netns.8 || die |
112 |
+ |
113 |
+ # build against system headers |
114 |
+ rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc |
115 |
+ sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die |
116 |
+ |
117 |
+ use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile |
118 |
+} |
119 |
+ |
120 |
+src_configure() { |
121 |
+ tc-export AR CC PKG_CONFIG |
122 |
+ |
123 |
+ # This sure is ugly. Should probably move into toolchain-funcs at some point. |
124 |
+ local setns |
125 |
+ pushd "${T}" >/dev/null |
126 |
+ printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c |
127 |
+ ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n |
128 |
+ echo 'int main(){return 0;}' > test.c |
129 |
+ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile |
130 |
+ popd >/dev/null |
131 |
+ |
132 |
+ cat <<-EOF > Config |
133 |
+ TC_CONFIG_ATM := $(usex atm y n) |
134 |
+ TC_CONFIG_XT := $(usex iptables y n) |
135 |
+ TC_CONFIG_NO_XT := $(usex iptables n y) |
136 |
+ # We've locked in recent enough kernel headers #549948 |
137 |
+ TC_CONFIG_IPSET := y |
138 |
+ HAVE_BERKELEY_DB := $(usex berkdb y n) |
139 |
+ HAVE_MNL := $(usex minimal n y) |
140 |
+ HAVE_SELINUX := $(usex selinux y n) |
141 |
+ IP_CONFIG_SETNS := ${setns} |
142 |
+ # Use correct iptables dir, #144265 #293709 |
143 |
+ IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) |
144 |
+ EOF |
145 |
+} |
146 |
+ |
147 |
+src_install() { |
148 |
+ if use minimal ; then |
149 |
+ into / |
150 |
+ dosbin tc/tc |
151 |
+ dobin ip/ip |
152 |
+ return 0 |
153 |
+ fi |
154 |
+ |
155 |
+ emake \ |
156 |
+ DESTDIR="${D}" \ |
157 |
+ LIBDIR="${EPREFIX%/}"/$(get_libdir) \ |
158 |
+ SBINDIR="${EPREFIX%/}"/sbin \ |
159 |
+ CONFDIR="${EPREFIX%/}"/etc/iproute2 \ |
160 |
+ DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \ |
161 |
+ MANDIR="${EPREFIX%/}"/usr/share/man \ |
162 |
+ ARPDDIR="${EPREFIX%/}"/var/lib/arpd \ |
163 |
+ install |
164 |
+ |
165 |
+ dodir /bin |
166 |
+ mv "${ED%/}"/{s,}bin/ip || die #330115 |
167 |
+ |
168 |
+ dolib.a lib/libnetlink.a |
169 |
+ insinto /usr/include |
170 |
+ doins include/libnetlink.h |
171 |
+ # This local header pulls in a lot of linux headers it |
172 |
+ # doesn't directly need. Delete this header that requires |
173 |
+ # linux-headers-3.8 until that goes stable. #467716 |
174 |
+ sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die |
175 |
+ |
176 |
+ if use berkdb ; then |
177 |
+ dodir /var/lib/arpd |
178 |
+ # bug 47482, arpd doesn't need to be in /sbin |
179 |
+ dodir /usr/bin |
180 |
+ mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die |
181 |
+ fi |
182 |
+} |