commit: bdaac62203e4a3b80cd219a18d616106a63fc301
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 17:02:58 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 17:02:58 2015 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=bdaac622
sys-apps/iproute2: cleanup.
Package-Manager: portage-2.2.18
Manifest-Sign-Key: 0xF52D4BBA
sys-apps/iproute2/Manifest | 8 ++---
sys-apps/iproute2/iproute2-3.19.0-r99.ebuild | 3 +-
sys-apps/iproute2/iproute2-4.0.0-r99.ebuild | 12 ++++---
...-3.8.0-r99.ebuild => iproute2-4.1.1-r99.ebuild} | 40 +++++++++++++++-------
4 files changed, 40 insertions(+), 23 deletions(-)
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index c960141..c20549f 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -7,9 +7,9 @@ AUX iproute2-3.8.0-old-mount-libc.patch 871 SHA256
dc9fc407b09763f79663dbad62796
AUX iproute2-4.0.0-fix-build-with-musl.patch 586 SHA256
e617316ce2803b6ad0dca43426a7a6c8762809f8e1e984da8c935bcff4db8e34 SHA512
2473432adbc02f0085be7b689af00527bc87f3ee89e313425dbc3a02e1a4569b1c397fc7160a2b26907c5edff3fdd5bd38d7e27043a9bebfbc36d714c8281953
WHIRLPOOL
a6b451b38bb977a0b52fa904905c599922693c425537d5173c981dc2082d6c55f9a0d01514405e57c5719c376357f4759333ea3ad5dea849f4cef9df76d12181
AUX iproute2-4.0.0-tc-show-buffer-overflow.patch 1717 SHA256
2ddb5ea744185f5ebff79961a054570b166ad1a5f3df0b91b59927d1b86c7aa3 SHA512
f5b507ce9d9a2cf4b86c0c2e2a18c5295226707df707eb229ec2f880b0fee64740a039fe5aa334c1dfc2d04faec4200cdb27dfaf631119a8705dd698f2767a77
WHIRLPOOL
801e25b3f6984b59d95eb494dfa63502e2c32551c8f5376ab6109a6bf5b9401f1b7bf6a0e0456dc68abb207d9505b5dbade675ea39e709e27a839357a431c444
DIST iproute2-3.19.0.tar.xz 455004 SHA256
e2f9f8c36e166f2ba6c0e1e7a9ad84cdf7c1615b93df49dac44563d7b57fd7b0 SHA512
fc533b6a526cfda234f043ac25302a3206a81ab2a740640b997b6bfb22e6f94ddc21b704191a358ea8721a327ba785e0224a4b4129111ef5008b4003379c3706
WHIRLPOOL
6a0aa1a948286d7dcb3663d787167c27760d756385295bf0ca631920aed50fbd984c19204247097116ef0d4e293c3c8dbe13b0b44c6ec83e7815a7461293c89f
-DIST iproute2-3.8.0.tar.xz 407608 SHA256
579145749f1aaf60e7c7a5de24b7f00fa2200a961094733c792b4ff139181e4f SHA512
0d93070044f573055a7cc58bd006e476f5b0fcb75cb5d49a37417aa7583e637a92e460947434cef9b9449267e4529c655a23b5ed3d549a2aba128148cb8d4ade
WHIRLPOOL
bfb29c34953f205f7c801a86a38f58d9352b716504649e61665ced6dd48557291412de5fd8987dbab44fbd397dab4a6b55d6c371c7cbaaea3d6e29269df115df
DIST iproute2-4.0.0.tar.xz 459364 SHA256
5cd06eb1050b858b308b65705725042bb566fd261135e35a73dafb48cd632618 SHA512
8e0587ed484a9697af99b4f37b460fddd28136b3c19898a11809b1e8ca9a75a18dcc83bc512f5b74361e6128732e69a3e66b3a62c38a5ae5f13c3e18af186be4
WHIRLPOOL
6abdf2b4587abd7a73d2b7692a4bb478ac379dc3a27f564ad78e34f25f06ae5dd9e0e4873c6510d30767a398375dcdcd2da777412c725885e0c3d4bd89c71a9b
-EBUILD iproute2-3.19.0-r99.ebuild 3638 SHA256
db56d0742f3a2e0808395a958118e36062e7f56b35a36d9c534f1caa6459bb3d SHA512
a5dfffef35a7c459def9dcf57a92af5caf11b84e6c0f76b81b6035bc053bb9b09c8e8f735a8009bb405fd596a6c8f08561d6ce00fd1f8c03871527dcd209248f
WHIRLPOOL
3fbba0222b33ef1a8f250e10208a7a71dca90217869f86b552536bc47bbdbcbbdc616aad31ca0d387e40b7872e0e92b3a828348f5fefed3db5d810d45fa7e67a
-EBUILD iproute2-3.8.0-r99.ebuild 3492 SHA256
c301203fe02eca67fb1a7cd4a7ad2d76eca17e2a2f0bfc8e877bf75260a253fb SHA512
aaa8305610842a4f87aee1512c5185a44d1fcf572a7cb21e3a6e4e1dd36c1d55efac7126a126f982e404c495a74934e9ca0048a707d9ed685719b467094ea5ab
WHIRLPOOL
09b2e6783302c4fb2f61cd5641dd6dcbf9281adc13b3f13d414117beadf763ce9922bb86517ebdf47b79a82cdd42f0762b34ae486d3f0471644672a1ceb42248
-EBUILD iproute2-4.0.0-r99.ebuild 3723 SHA256
898e0da7fc5887d8f25fcaaa13b98afb53279ea2a7574f66b322d1bc0c5f3fc6 SHA512
3b6b7509e6f769e5fb005d6740c8914d1556027e4d9eafcea74c2e4d29e42e12c9da1388146fcaa50a0bd3eb81d917fc401dea695d5ee74e7e02f887e0376171
WHIRLPOOL
ffe9b8168e081a89265c879d7899ffb1c4f6f0f9fc98cb581660440dcd60c9eab115737e3b0f6c5d0f9352233093dc989a60217425701b1f367d3912a5135b76
+DIST iproute2-4.1.1.tar.xz 496388 SHA256
73077a989efb934450bd655cbd9aaddaa747cb696c64d0c9a3323768a6a8e66f SHA512
af2e4021faf931d17a67c242c66b4f6a6ce93a69cee5408dd3951d488da511c99d693534e91d0a317bd82dfdcb6a543605cecf2514d512004639db8d17afb93e
WHIRLPOOL
24542b56275675609aaad69ca68e89145d4da84ddb2429ae546179a249bcc1213f89168673657966122e01e992763fec053c118fbd69b7db1677ad7be97397b6
+EBUILD iproute2-3.19.0-r99.ebuild 3644 SHA256
d1eda6889896c713d00287caf8f70e153c6cad42df6fdcf9d9151bbd0e395ec7 SHA512
2b580227865156261987fe03eb12569817488098a05f2627afdc2f1ef0e40924128dabedbb7eefb13894b3168cf2d647cc5c31d53304c4ac0eafca506b5aea6a
WHIRLPOOL
b816908a2c8bcb731669303da45c9aa378e6f4d4bdbf3f5057313b6d003d7c4a79458c76d5e4c15dff0f98e1fb93eadb37dbdb8c9ed12fc7f5fb7a361b1a237b
+EBUILD iproute2-4.0.0-r99.ebuild 3867 SHA256
e87ce20beee93a16efc68a9eafb13b666465121e344615f8152c6b039a017d22 SHA512
5a81a56bd880012c309bebb20d55e97b0d19ced6e6ff69711f4dfa78892417f55131cd14fc285a146bf7fd75e9e4a094ab1dc584d921a49ea0f7087fd642ecc1
WHIRLPOOL
3abcb67e2fbd6b6a85095d3cbc4daa0ec1d534a67ccbbc86b0d6f540b00252fbe66a4af76b79ed2d77029580216ede5f32726f8afe5ba1d676860d3e53deef00
+EBUILD iproute2-4.1.1-r99.ebuild 4004 SHA256
0bb7fe762de032771f0c46eaf77284bfd5b0120115315ba607099b11e8ebe671 SHA512
f55d0a4004eb626678acb3aed712cc31ace1f00274b9cabdd1ea111dc6be2e5f1dd01b5d3be3304d01cd37c7c61f522511d0ff3a2e5ec628b5a089aba87c4a65
WHIRLPOOL
dc2334cf12d4efe1a73c853b1c339fc7665df493552b6bc659dca623b8cea980fe5ed27daada02a93a9efa5749184a5f1a557fac3e816b08259e3497f9310a3c
MISC metadata.xml 317 SHA256
45312a0c8b9363b8eaa97110513ca39053ffcd967af978900ee0a01aa81c00aa SHA512
2e6ed50522276dd0b09a61ba0c68ccc226ff33b64da2af87e92e349354f379cae040eb753961aeedc2a894eb65415fba7763541efe21bf328fe0a69706aeb872
WHIRLPOOL
73003e9201c29cba545b3245b53da9c36dc4b3c209ece693a9401b954896f6db5d29b209318fb7dd1c33db8920d01e097feaa88ef4ec0cb07590e850803bce09
diff --git a/sys-apps/iproute2/iproute2-3.19.0-r99.ebuild
b/sys-apps/iproute2/iproute2-3.19.0-r99.ebuild
index 08c29de..3638122 100644
--- a/sys-apps/iproute2/iproute2-3.19.0-r99.ebuild
+++ b/sys-apps/iproute2/iproute2-3.19.0-r99.ebuild
@@ -37,7 +37,6 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.0-no-ipv6.patch #326849
-
epatch "${FILESDIR}"/${PN}-3.19.0-musl.patch
sed -i \
@@ -52,7 +51,7 @@ src_prepare() {
# Use /run instead of /var/run.
sed -i \
-e 's:/var/run:/run:g' \
- ip/ipnetns.c \
+ include/namespace.h \
man/man8/ip-netns.8 || die
# build against system headers
diff --git a/sys-apps/iproute2/iproute2-4.0.0-r99.ebuild
b/sys-apps/iproute2/iproute2-4.0.0-r99.ebuild
index c9ef072..eb20fe4 100644
--- a/sys-apps/iproute2/iproute2-4.0.0-r99.ebuild
+++ b/sys-apps/iproute2/iproute2-4.0.0-r99.ebuild
@@ -23,15 +23,16 @@ IUSE="atm berkdb +iptables ipv6 minimal selinux"
RDEPEND="!net-misc/arpd
iptables? ( >=net-firewall/iptables-1.4.20:= )
- !minimal? ( berkdb? ( sys-libs/db:= ) )
+ berkdb? ( sys-libs/db:= )
atm? ( net-dialup/linux-atm )
selinux? ( sys-libs/libselinux )"
+# We require newer linux-headers for ipset support #549948
DEPEND="${RDEPEND}
app-arch/xz-utils
iptables? ( virtual/pkgconfig )
sys-devel/bison
sys-devel/flex
- >=sys-kernel/linux-headers-2.6.27
+ >=sys-kernel/linux-headers-3.7
elibc_glibc? ( >=sys-libs/glibc-2.7 )"
src_prepare() {
@@ -52,7 +53,7 @@ src_prepare() {
# Use /run instead of /var/run.
sed -i \
-e 's:/var/run:/run:g' \
- ip/ipnetns.c \
+ include/namespace.h \
man/man8/ip-netns.8 || die
# build against system headers
@@ -62,7 +63,7 @@ src_prepare() {
# don't build arpd if USE=-berkdb #81660
use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile
+ use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
}
src_configure() {
@@ -80,6 +81,8 @@ src_configure() {
cat <<-EOF > Config
TC_CONFIG_ATM := $(usex atm y n)
TC_CONFIG_XT := $(usex iptables y n)
+ # We've locked in recent enough kernel headers #549948
+ TC_CONFIG_IPSET := y
HAVE_SELINUX := $(usex selinux y n)
IP_CONFIG_SETNS := ${setns}
# Use correct iptables dir, #144265 #293709
@@ -91,6 +94,7 @@ src_install() {
if use minimal ; then
into /
dosbin tc/tc
+ dobin ip/ip
return 0
fi
diff --git a/sys-apps/iproute2/iproute2-3.8.0-r99.ebuild
b/sys-apps/iproute2/iproute2-4.1.1-r99.ebuild
similarity index 71%
rename from sys-apps/iproute2/iproute2-3.8.0-r99.ebuild
rename to sys-apps/iproute2/iproute2-4.1.1-r99.ebuild
index cae49ff..5e9ea5d 100644
--- a/sys-apps/iproute2/iproute2-3.8.0-r99.ebuild
+++ b/sys-apps/iproute2/iproute2-4.1.1-r99.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.8.0.ebuild,v
1.18 2014/01/18 11:02:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-4.1.1.ebuild,v
1.1 2015/07/07 16:07:02 vapier Exp $
-EAPI="4"
+EAPI="5"
inherit eutils toolchain-funcs flag-o-matic multilib
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-2
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 arm ~mips ppc x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
@@ -19,25 +19,28 @@
HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iprou
LICENSE="GPL-2"
SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal"
+IUSE="atm berkdb +iptables ipv6 minimal selinux"
+# We could make libmnl optional, but it's tiny, so eh
RDEPEND="!net-misc/arpd
- iptables? ( >=net-firewall/iptables-1.4.16 )
- !minimal? ( berkdb? ( sys-libs/db ) )
- atm? ( net-dialup/linux-atm )"
+ !minimal? ( net-libs/libmnl )
+ 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
sys-devel/flex
- >=sys-kernel/linux-headers-2.6.27
+ >=sys-kernel/linux-headers-3.16
elibc_glibc? ( >=sys-libs/glibc-2.7 )"
src_prepare() {
epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
- epatch "${FILESDIR}"/${P}-old-mount-libc.patch #468120
- epatch "${FILESDIR}"/${P}-musl-headers.patch
- use ipv6 || epatch "${FILESDIR}"/${PN}-3.1.0-no-ipv6.patch #326849
+ use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.0-no-ipv6.patch #326849
+ epatch "${FILESDIR}"/${PN}-4.0.0-fix-build-with-musl.patch
sed -i \
-e '/^CC =/d' \
@@ -48,6 +51,12 @@ src_prepare() {
-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
@@ -55,7 +64,7 @@ src_prepare() {
# don't build arpd if USE=-berkdb #81660
use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile
+ use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
}
src_configure() {
@@ -73,6 +82,10 @@ src_configure() {
cat <<-EOF > Config
TC_CONFIG_ATM := $(usex atm y n)
TC_CONFIG_XT := $(usex iptables y n)
+ # We've locked in recent enough kernel headers #549948
+ TC_CONFIG_IPSET := y
+ HAVE_MNL := $(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)
@@ -83,6 +96,7 @@ src_install() {
if use minimal ; then
into /
dosbin tc/tc
+ dobin ip/ip
return 0
fi
