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, 04 Nov 2015 09:57:02
Message-Id: 1446630999.3a422a5b2085a59d6d1db4605375f1e428c26d0a.polynomial-c@gentoo
1 commit: 3a422a5b2085a59d6d1db4605375f1e428c26d0a
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 4 09:56:39 2015 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 4 09:56:39 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a422a5b
7
8 sys-apps/iproute2: Bump to version 4.3.0
9
10 Package-Manager: portage-2.2.23
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-apps/iproute2/Manifest | 1 +
14 sys-apps/iproute2/iproute2-4.3.0.ebuild | 129 ++++++++++++++++++++++++++++++++
15 2 files changed, 130 insertions(+)
16
17 diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
18 index 8aa32d2..f5f177d 100644
19 --- a/sys-apps/iproute2/Manifest
20 +++ b/sys-apps/iproute2/Manifest
21 @@ -6,3 +6,4 @@ DIST iproute2-3.8.0.tar.xz 407608 SHA256 579145749f1aaf60e7c7a5de24b7f00fa2200a9
22 DIST iproute2-4.0.0.tar.xz 459364 SHA256 5cd06eb1050b858b308b65705725042bb566fd261135e35a73dafb48cd632618 SHA512 8e0587ed484a9697af99b4f37b460fddd28136b3c19898a11809b1e8ca9a75a18dcc83bc512f5b74361e6128732e69a3e66b3a62c38a5ae5f13c3e18af186be4 WHIRLPOOL 6abdf2b4587abd7a73d2b7692a4bb478ac379dc3a27f564ad78e34f25f06ae5dd9e0e4873c6510d30767a398375dcdcd2da777412c725885e0c3d4bd89c71a9b
23 DIST iproute2-4.1.1.tar.xz 496388 SHA256 73077a989efb934450bd655cbd9aaddaa747cb696c64d0c9a3323768a6a8e66f SHA512 af2e4021faf931d17a67c242c66b4f6a6ce93a69cee5408dd3951d488da511c99d693534e91d0a317bd82dfdcb6a543605cecf2514d512004639db8d17afb93e WHIRLPOOL 24542b56275675609aaad69ca68e89145d4da84ddb2429ae546179a249bcc1213f89168673657966122e01e992763fec053c118fbd69b7db1677ad7be97397b6
24 DIST iproute2-4.2.0.tar.xz 506120 SHA256 a4101e743e0da36b55f63353ff489699ddcd634ceca854a9a272346588f30f30 SHA512 a2580cab92ee4c3e78e52bd8b742e9a1f2097815022a392241136b5589dd1de2ff1def9f608e4b5464c57d8f3d50c4361897271db2058683dfdc6984172784c5 WHIRLPOOL f6ae4537cafc2dd70640f602195f509e58613787f82b26dd909d7c36f09e6b256abee5fc6772e6129cfd023d95248ce66b2c6bd223186861203ebcbe2965e43c
25 +DIST iproute2-4.3.0.tar.xz 525364 SHA256 f03b1188dd6c039512424de82ff7a8f3b446680bd4e908ff42a7b9b137422995 SHA512 14736158e76cef3dfc3af1a881faf97901bce6dcc9ffe52de92c8a64ae466f2c8ceaa32349553215dbe371115e7cd5cedcbf9922a0d72da9e7ebe3a73fac3687 WHIRLPOOL cd772090f20bbb50e4556c609f28a07acc60ff344989f2ad112c13e1dbc6f60b09e9f5bc6bd29322b1b1635b6266d70aff1aa8f5c37ed458ae569697b7401c0e
26
27 diff --git a/sys-apps/iproute2/iproute2-4.3.0.ebuild b/sys-apps/iproute2/iproute2-4.3.0.ebuild
28 new file mode 100644
29 index 0000000..b62de4d
30 --- /dev/null
31 +++ b/sys-apps/iproute2/iproute2-4.3.0.ebuild
32 @@ -0,0 +1,129 @@
33 +# Copyright 1999-2015 Gentoo Foundation
34 +# Distributed under the terms of the GNU General Public License v2
35 +# $Id$
36 +
37 +EAPI="5"
38 +
39 +inherit eutils 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-2
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="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
51 +
52 +LICENSE="GPL-2"
53 +SLOT="0"
54 +IUSE="atm berkdb +iptables ipv6 minimal selinux"
55 +
56 +# We could make libmnl optional, but it's tiny, so eh
57 +RDEPEND="!net-misc/arpd
58 + !minimal? ( net-libs/libmnl )
59 + iptables? ( >=net-firewall/iptables-1.4.20:= )
60 + berkdb? ( sys-libs/db:= )
61 + atm? ( net-dialup/linux-atm )
62 + selinux? ( sys-libs/libselinux )"
63 +# We require newer linux-headers for ipset support #549948 and some defines #553876
64 +DEPEND="${RDEPEND}
65 + app-arch/xz-utils
66 + iptables? ( virtual/pkgconfig )
67 + sys-devel/bison
68 + sys-devel/flex
69 + >=sys-kernel/linux-headers-3.16
70 + elibc_glibc? ( >=sys-libs/glibc-2.7 )"
71 +
72 +src_prepare() {
73 + epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
74 + use ipv6 || epatch "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849
75 +
76 + sed -i \
77 + -e '/^CC =/d' \
78 + -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
79 + -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
80 + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
81 + -e "/^WFLAGS/s:-Werror::" \
82 + -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
83 + Makefile || die
84 +
85 + # Use /run instead of /var/run.
86 + sed -i \
87 + -e 's:/var/run:/run:g' \
88 + include/namespace.h \
89 + man/man8/ip-netns.8 || die
90 +
91 + # build against system headers
92 + rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
93 + sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
94 +
95 + use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
96 +}
97 +
98 +src_configure() {
99 + tc-export AR CC PKG_CONFIG
100 +
101 + # This sure is ugly. Should probably move into toolchain-funcs at some point.
102 + local setns
103 + pushd "${T}" >/dev/null
104 + echo 'main(){return setns();};' > test.c
105 + ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
106 + echo 'main(){};' > test.c
107 + ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
108 + popd >/dev/null
109 +
110 + cat <<-EOF > Config
111 + TC_CONFIG_ATM := $(usex atm y n)
112 + TC_CONFIG_XT := $(usex iptables y n)
113 + # We've locked in recent enough kernel headers #549948
114 + TC_CONFIG_IPSET := y
115 + HAVE_BERKELEY_DB := $(usex berkdb y n)
116 + HAVE_MNL := $(usex minimal n y)
117 + HAVE_SELINUX := $(usex selinux y n)
118 + IP_CONFIG_SETNS := ${setns}
119 + # Use correct iptables dir, #144265 #293709
120 + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
121 + EOF
122 +}
123 +
124 +src_install() {
125 + if use minimal ; then
126 + into /
127 + dosbin tc/tc
128 + dobin ip/ip
129 + return 0
130 + fi
131 +
132 + emake \
133 + DESTDIR="${D}" \
134 + LIBDIR="${EPREFIX}"/$(get_libdir) \
135 + SBINDIR="${EPREFIX}"/sbin \
136 + CONFDIR="${EPREFIX}"/etc/iproute2 \
137 + DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
138 + MANDIR="${EPREFIX}"/usr/share/man \
139 + ARPDDIR="${EPREFIX}"/var/lib/arpd \
140 + install
141 +
142 + rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
143 +
144 + dodir /bin
145 + mv "${ED}"/{s,}bin/ip || die #330115
146 +
147 + dolib.a lib/libnetlink.a
148 + insinto /usr/include
149 + doins include/libnetlink.h
150 + # This local header pulls in a lot of linux headers it
151 + # doesn't directly need. Delete this header that requires
152 + # linux-headers-3.8 until that goes stable. #467716
153 + sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
154 +
155 + if use berkdb ; then
156 + dodir /var/lib/arpd
157 + # bug 47482, arpd doesn't need to be in /sbin
158 + dodir /usr/bin
159 + mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
160 + fi
161 +}