commit: 3da6b075f1c3a114bbee594e6d979d849de9e503
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed Dec 14 21:08:36 2016 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Dec 14 21:08:36 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3da6b075
sys-apps/iproute2: Version bump to 4.9.0
sys-apps/iproute2/Manifest | 5 ++-
.../files/iproute2-4.5.0-no-iptables.patch | 42 ----------------------
...iproute2-4.8.0.ebuild => iproute2-4.9.0.ebuild} | 2 +-
3 files changed, 3 insertions(+), 46 deletions(-)
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 3914086..a26ff8c 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -3,12 +3,11 @@ AUX iproute2-4.2.0-no-ipv6.patch 1336 SHA256
b352b11d22e922038adb2b1ae083b6e47b8
AUX iproute2-4.3.0-musl-noiptables.patch 1166 SHA256
1910d28fe0aa89ba71cd30bb38b43119414102ce323dc47eee8bec290e5f52e7 SHA512
f1b988c5ae5b5d159d1a2bedec678b8680b3358a6ea3a9d581b642cd706cfd1cb31c7cd590e1fe8969c3d3bebb2912fb5fa8011cfc39d2a17a4092617ae15766
WHIRLPOOL
87ee199c0f06b8c750412625e204b10261945954c07fade452ea2cf956405d7094d02357e1ed92f1aafcc9d34c7e7109cb10ee1aed31adf0e94989f2701bd877
AUX iproute2-4.3.0-musl.patch 2989 SHA256
bf10609ba7dcb04cb134745dd7af4c8c66d6b667400dd30abb3325ebdfd446fb SHA512
8cf23bca01b111e2dfa26e944de151b35d6278833066276e603cd567f8084c16ee5b0dd527dd0626828f3099ae5907bdef4783672bfe23605f43ce9c3b4c2182
WHIRLPOOL
40d5bdb8dcd84e43a6798584aba35a11d1b5a79e54dcf80da0f465041330c5a76c2c4297fd78aa2a272181954407b404030bb9cca4dc74e4f7b36b5f98775cd7
AUX iproute2-4.4.0-missing-limits_h.patch 385 SHA256
dbbb3b18da78d6747e67ef922d7fcbceb48877776efa5a6ca25c6facdb3d6d22 SHA512
a3c2c22c89323dedcfbe79a19fa5e211e8d66d84ada62937b091850e26d5976eedcc3c4ea0eea3372b19e3c15191ee9af696b3683d6f107d43b24a57e601a889
WHIRLPOOL
72be26a1f393ac5d7664c6b6a393efdfceb7d66720cafd2c6250e5480ac77033d0abfa0b616413d0f03d0c3cada22e5c7afa33e5ceb4910f41753d6ddf1fb74f
-AUX iproute2-4.5.0-no-iptables.patch 1022 SHA256
b6f69d8123e034d1be462d6672f8f59915f6e25b890c8d3068a1e0af658a85e1 SHA512
3a3e7a66f1528dc8d03fc6a13f363ce890d0c23c2ab8df966144d8764e95cafca168bdb7dd79cf1a8dd1e54be36939f2e6465ca6176e3bfedd222eb29901f98e
WHIRLPOOL
42351420125199e5149d321d583fcc967ec253f1aa7f338757c38849e841c9c89f7f8861f36803a3a849a0454c0fdc605d50549eeebaf97c1aba0fe770e6cd4e
AUX iproute2-4.8.0-musl.patch 3758 SHA256
737386e08312506528fda2e75410746acd282f00c9531e089bc1b06db79c1140 SHA512
fd35bd71fa26968ad5b1dd18597207d164a948999c3bf55a62054966cc95a0838c9ba5df0f7319672eec310bffd8f70101b7fd7c075aa20c77d4dc70490d8aff
WHIRLPOOL
1e84ccf8a537b20e58ef1a48afc548eb4b81decdae8f0a5b94e835416aaac1b2256fcffac3e288d5b848cfe4d48bb31a3e667f56ce711ed3f31b337371eeeef8
DIST iproute2-4.3.0.tar.xz 525364 SHA256
f03b1188dd6c039512424de82ff7a8f3b446680bd4e908ff42a7b9b137422995 SHA512
14736158e76cef3dfc3af1a881faf97901bce6dcc9ffe52de92c8a64ae466f2c8ceaa32349553215dbe371115e7cd5cedcbf9922a0d72da9e7ebe3a73fac3687
WHIRLPOOL
cd772090f20bbb50e4556c609f28a07acc60ff344989f2ad112c13e1dbc6f60b09e9f5bc6bd29322b1b1635b6266d70aff1aa8f5c37ed458ae569697b7401c0e
DIST iproute2-4.4.0.tar.xz 528552 SHA256
bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 SHA512
48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69
WHIRLPOOL
7e90c98805e12b28de284bb998e5a27cf524a78d0bd7632c0d49a7ddff8f11f5229ac6867076e9fea6f21b6b31360bddb21138673d94de766bdf7324a09bc013
-DIST iproute2-4.8.0.tar.xz 594636 SHA256
a30959c8421bc8ef42719bed41d14e1d7cfdbad80d7d70c5c42ad31f2c2cb389 SHA512
9b9db053e5d6ae2e7dd17870a3081ef61788a7eeb07473430e1a26c3c948123d33840bd6bb81b4a553ac6913ea89f02ac2a1b7d52ced65523a43991f03e84f49
WHIRLPOOL
83015c0bcfc6739ce688307a6824047910d453265883d4fbb9bec67c8720a5f478d2d72e5095ffc75191e64f3525a25f019032f20fc428b622e4a5c1b8fcbe3d
+DIST iproute2-4.9.0.tar.xz 613032 SHA256
c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4 SHA512
0d974d7c001eac75def0d90b628e432d9847024843d02a6cd27266ff30e3f7a9c874fa91115da74db5f321c2e815b486a847059ca6df3aa8ea49432ffa39a889
WHIRLPOOL
83c8d42ef43f42a58835ff3b1df7460c67db4de1ae9d5df775d8aa15bfe2c488a626dd40c4327c2772436ed88bea1a1f57a953cd6bf650955465e76aec9476a2
EBUILD iproute2-4.3.0.ebuild 3842 SHA256
df102b2068e6f82a8120065f798d3b7b7413f7c70da779dd667c9afeb409ffda SHA512
7577a7323f9cf24645045924a93287e1299b1b7a1abdeeec073178828d30da77b76ce477950c207e7bd819c5cfe390e14ff1d91c3ae7578400ca5a19e350b337
WHIRLPOOL
ea13875c2a5be3a07d7746ffd9444e8ec08d8bf921851f01cf76e13666fdd85dc65266e3cfc0466a8829e4ec81d7f03c2c79e35bbbbf90cfed68fde4df0fd058
EBUILD iproute2-4.4.0.ebuild 3900 SHA256
efa73fc5b273c607754c16104b48b6a3ca7415eaa639ec3f7a16d2e324bd1599 SHA512
cc92549fb467798cdfb3e068535f86acfd110ab23d58f6cbfedb615fe036cabb13ccaafcde4ab3b9b8d3d1c2a5c0bc1bb474e14ec1d51866068c51e2e32d2468
WHIRLPOOL
f61081bc113e6b0e42a59eafb53c6fe54ed9ed76efc6c6ff90837291439220044fe3c892accda3fa60a85b4ee26f72de89577fb8db6c80bfbc12918860ae3d10
-EBUILD iproute2-4.8.0.ebuild 3900 SHA256
71af7f07b9bbbc4a656a03a630ba9d17c81950ed530fccf764ec743fe5abb35c SHA512
999e00f04a620d4a9d37f13cbb02bfa8b25580e4b06c8c9d929617bde3d488952eb072877d9bf892fc65b17d0e9a207c8dc73633878111d353cde17c60e11077
WHIRLPOOL
67957931e8ee6a6d654de9cae05a4858136e424b0995fa6759293eb9df7c75312c3314ffff45ca13149dcd3faba64eeed273d4d29938262f86c197b0ed84fe8a
+EBUILD iproute2-4.9.0.ebuild 3888 SHA256
a376521f4eb3791fd147e8f2eb658b10feef8c2ff12ddbaf2a44c4420e759d18 SHA512
16cb1871e79782a62699eeecf3672b39a3c9002bb6bcfc27cc61677a24fda7f952def8c2ffa68067ac07177c603c8446befd6176c14d760c32b6446681588fd8
WHIRLPOOL
6eb389f280f9bcbedbdb57fcfb9f93ae821a8885cf2aa511f1e989546d9bd6a5f3ec7882e0d868fb1ed3798593e4f09ed44f5ae298344457180e692df4256164
MISC metadata.xml 467 SHA256
54932243a153c9130ca1862f0dce70ac6fff517e9b5c22f10e6d044ac3679e86 SHA512
34c134b1a8ee152382b9fe9872df3d15d32ec3822ba215c8b21e948b8313e2e3d045468b873b7958681e92265d57ce25455e03f4d8e6be4e882943e54331cd7c
WHIRLPOOL
188528c73a6a8b90a0e69bab32d24a05e41c6695f559da91ead84be331769f47864ca6e88a7f1a31619da51e53b7fdd8a23735ff576098998eac6f1a9d24feb1
diff --git a/sys-apps/iproute2/files/iproute2-4.5.0-no-iptables.patch
b/sys-apps/iproute2/files/iproute2-4.5.0-no-iptables.patch
deleted file mode 100644
index 7ed9dfb..0000000
--- a/sys-apps/iproute2/files/iproute2-4.5.0-no-iptables.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- iproute2-4.5.0/configure~ 2016-03-14 23:02:31.000000000 +0000
-+++ iproute2-4.5.0/configure 2016-03-17 13:24:17.634743197 +0000
-@@ -169,10 +169,25 @@
-
- check_ipt()
- {
-- if ! grep TC_CONFIG_XT Config > /dev/null
-+ if grep -q TC_CONFIG_XT Config
- then
-+ return
-+ fi
-+
-+ cat >$TMPDIR/ipttest.c <<EOF
-+#include <iptables.h>
-+int main() { return 0; }
-+EOF
-+
-+ if $CC -std=c90 -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c
$IPTL \
-+ $(${PKG_CONFIG} libiptc --cflags --libs 2>/dev/null) -ldl
>/dev/null 2>&1
-+ then
-+ echo "TC_CONFIG_IPT:=y" >>Config
- echo "using iptables"
-+ else
-+ echo "no"
- fi
-+ rm -f $TMPDIR/ipttest.c $TMPDIR/ipttest
- }
-
- check_ipt_lib_dir()
---- iproute2-4.5.0/tc/Makefile~ 2016-03-14 23:02:31.000000000 +0000
-+++ iproute2-4.5.0/tc/Makefile 2016-03-17 13:18:18.686689985 +0000
-@@ -88,7 +88,9 @@
- CFLAGS += -DTC_CONFIG_XT_H
- TCSO += m_xt_old.so
- else
-- TCMODULES += m_ipt.o
-+ ifeq ($(TC_CONFIG_IPT),y)
-+ TCMODULES += m_ipt.o
-+ endif
- endif
- endif
- endif
diff --git a/sys-apps/iproute2/iproute2-4.8.0.ebuild
b/sys-apps/iproute2/iproute2-4.9.0.ebuild
similarity index 98%
rename from sys-apps/iproute2/iproute2-4.8.0.ebuild
rename to sys-apps/iproute2/iproute2-4.9.0.ebuild
index b9cc218..d84e3b9 100644
--- a/sys-apps/iproute2/iproute2-4.8.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.9.0.ebuild
@@ -39,7 +39,6 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
- "${FILESDIR}"/${PN}-4.5.0-no-iptables.patch #577464
"${FILESDIR}"/${PN}-4.8.0-musl.patch
)
@@ -89,6 +88,7 @@ src_configure() {
cat <<-EOF > Config
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)
