* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
@ 2017-12-10 21:00 Anthony G. Basile
0 siblings, 0 replies; 18+ messages in thread
From: Anthony G. Basile @ 2017-12-10 21:00 UTC (permalink / raw
To: gentoo-commits
commit: 5fd9189d79e590112505d33c9ab23b65b1a132e8
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 20:59:24 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 20:59:42 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5fd9189d
sys-apps/iproute2: 4.14.1-r1 stable on all musl arches
Package-Manager: Portage-2.3.13, Repoman-2.3.3
sys-apps/iproute2/iproute2-4.14.1-r1.ebuild | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
index b8a34e6..9341b81 100644
--- a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="amd64 arm ~mips ppc x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
@@ -52,14 +52,6 @@ src_prepare() {
)
fi
- # Local uclibc-ng compat fix until uclibc-ng upstream can sync
- # netinet/in.h with glibc. Resolves #626546.
- if use elibc_uclibc ; then
- PATCHES+=(
- "${FILESDIR}"/${PN}-4.12.0-uclibc-ng-add-ipproto_mh.patch
- )
- fi
-
default
sed -i \
^ permalink raw reply related [flat|nested] 18+ messages in thread* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
@ 2020-01-30 7:42 Georgy Yakovlev
0 siblings, 0 replies; 18+ messages in thread
From: Georgy Yakovlev @ 2020-01-30 7:42 UTC (permalink / raw
To: gentoo-commits
commit: 0a865f89eff32b3a59c1d988147eed55c56e85fa
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 30 05:43:33 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 05:43:33 2020 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=0a865f89
sys-apps/iproute2: restore ppc64 keyword
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
sys-apps/iproute2/iproute2-4.17.0-r1.ebuild | 4 ++--
sys-apps/iproute2/iproute2-4.17.0.ebuild | 4 ++--
sys-apps/iproute2/iproute2-4.20.0.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild
index ee49133..5c01038 100644
--- a/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 arm arm64 ~mips ppc x86"
+ KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/iproute2/iproute2-4.17.0.ebuild b/sys-apps/iproute2/iproute2-4.17.0.ebuild
index 3796d2a..7c90076 100644
--- a/sys-apps/iproute2/iproute2-4.17.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 arm ~arm64 ~mips ppc x86"
+ KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/iproute2/iproute2-4.20.0.ebuild b/sys-apps/iproute2/iproute2-4.20.0.ebuild
index bfce3d1..5b654d9 100644
--- a/sys-apps/iproute2/iproute2-4.20.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
^ permalink raw reply related [flat|nested] 18+ messages in thread* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
@ 2019-07-25 3:09 Jory Pratt
0 siblings, 0 replies; 18+ messages in thread
From: Jory Pratt @ 2019-07-25 3:09 UTC (permalink / raw
To: gentoo-commits
commit: ffcbb093bcf4eef2f3429d186ca5d266e7bc27d7
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 03:09:04 2019 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 03:09:04 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=ffcbb093
sys-apps/iproute2: Fix queue dep in 5.2.0
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
sys-apps/iproute2/Manifest | 2 +-
sys-apps/iproute2/{iproute2-5.1.0.ebuild => iproute2-5.2.0.ebuild} | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 5c72039..761d0f0 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,3 +1,3 @@
DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c SHA512 ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5
DIST iproute2-4.20.0.tar.xz 707016 BLAKE2B d62c6b995c4c1f79617e2f8149ff2ed297d741965e81bffebfa475514f5e96f0c9300e65d12bdd14ab492ce66675677eb41af6816876d5e1360218e4f32f4bc8 SHA512 ed29638c864062e199152c7b3b24b6495987ca6f79cc9ab1b529dab37a8a840fa2b5858d5db2b94eeefa1c0d72ff666a790107e27d11a597b189bfb7a01a4b8b
-DIST iproute2-5.1.0.tar.xz 722412 BLAKE2B 06330b636d661df5e2128a87bb63455bcbb5c8cda0faab96928e2068bb23b3bc3b2e5a0daa68d2d112e66fa58d7b3360791c7d5a0d679fc01cecb3ca9ad8ea4d SHA512 5c8319b040bd0ba98cf1225b2a77efafc662741344c53877ee38cf108ca01906b03328e4f9b00b7557e301c6e64bca4e42e92af477b4d657bcbff5120c0c4e87
+DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999eb4955b708ef49a3276f3c574eab757e2c81f10a11e2ce5f709c7849bbf6556e40c7f261fc72d498046f73eade4 SHA512 82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1
diff --git a/sys-apps/iproute2/iproute2-5.1.0.ebuild b/sys-apps/iproute2/iproute2-5.2.0.ebuild
similarity index 98%
rename from sys-apps/iproute2/iproute2-5.1.0.ebuild
rename to sys-apps/iproute2/iproute2-5.2.0.ebuild
index beb936e..53ac972 100644
--- a/sys-apps/iproute2/iproute2-5.1.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.2.0.ebuild
@@ -60,6 +60,9 @@ src_prepare() {
default
+ # echo -n is not POSIX compliant
+ sed 's@echo -n@printf@' -i configure || die
+
sed -i \
-e '/^CC :\?=/d' \
-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
^ permalink raw reply related [flat|nested] 18+ messages in thread* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
@ 2019-07-03 3:08 Jory Pratt
0 siblings, 0 replies; 18+ messages in thread
From: Jory Pratt @ 2019-07-03 3:08 UTC (permalink / raw
To: gentoo-commits
commit: c04656f45e66a29ab7f9284c31059644d426c1ec
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 3 03:08:39 2019 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 03:08:39 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c04656f4
sys-apps/iproute2: add missing sys-libs/queue-standalone dep
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
sys-apps/iproute2/iproute2-5.1.0.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys-apps/iproute2/iproute2-5.1.0.ebuild b/sys-apps/iproute2/iproute2-5.1.0.ebuild
index f2771e5..beb936e 100644
--- a/sys-apps/iproute2/iproute2-5.1.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.1.0.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
berkdb? ( sys-libs/db:= )
atm? ( net-dialup/linux-atm )
selinux? ( sys-libs/libselinux )
+ elibc_musl? ( sys-libs/queue-standalone )
"
# We require newer linux-headers for ipset support #549948 and some defines #553876
DEPEND="
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
@ 2019-02-11 11:44 Anthony G. Basile
0 siblings, 0 replies; 18+ messages in thread
From: Anthony G. Basile @ 2019-02-11 11:44 UTC (permalink / raw
To: gentoo-commits
commit: 961dc57610c2cf5227ce400bb5493b91e6a70065
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 11 11:44:38 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Feb 11 11:44:38 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=961dc576
sys-apps/iproute2: drop to just arches supported on musl
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
sys-apps/iproute2/iproute2-4.20.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/iproute2/iproute2-4.20.0.ebuild b/sys-apps/iproute2/iproute2-4.20.0.ebuild
index 713141e..bfce3d1 100644
--- a/sys-apps/iproute2/iproute2-4.20.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.20.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
^ permalink raw reply related [flat|nested] 18+ messages in thread* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
@ 2018-12-29 18:52 Anthony G. Basile
0 siblings, 0 replies; 18+ messages in thread
From: Anthony G. Basile @ 2018-12-29 18:52 UTC (permalink / raw
To: gentoo-commits
commit: a2cb5c5d9eb127fbd92fff48640f4680eb3cd540
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 18:52:50 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 18:52:50 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a2cb5c5d
sys-apps/iproute2: stable on arm64
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
sys-apps/iproute2/iproute2-4.17.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild
index b5554e6..ee49133 100644
--- a/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 arm ~arm64 ~mips ppc x86"
+ KEYWORDS="amd64 arm arm64 ~mips ppc x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
^ permalink raw reply related [flat|nested] 18+ messages in thread* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
@ 2018-10-31 23:58 Anthony G. Basile
0 siblings, 0 replies; 18+ messages in thread
From: Anthony G. Basile @ 2018-10-31 23:58 UTC (permalink / raw
To: gentoo-commits
commit: eee068e79a3abfef5450603cf1fb526843e1c888
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 31 23:57:56 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Oct 31 23:57:56 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=eee068e7
sys-apps/iproute2: version 4.17.0-r1 stable on all arches
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
sys-apps/iproute2/iproute2-4.17.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild
index 397fdab..b5554e6 100644
--- a/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+ KEYWORDS="amd64 arm ~arm64 ~mips ppc x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
^ permalink raw reply related [flat|nested] 18+ messages in thread* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
@ 2018-10-29 11:39 Anthony G. Basile
0 siblings, 0 replies; 18+ messages in thread
From: Anthony G. Basile @ 2018-10-29 11:39 UTC (permalink / raw
To: gentoo-commits
commit: 092ce9df92fe7fe921298b8a9d67212df36e6eec
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sat Oct 27 17:00:03 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Oct 29 11:38:04 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=092ce9df
sys-apps/iproute2: remove old
sys-apps/iproute2/Manifest | 1 -
sys-apps/iproute2/iproute2-4.15.0.ebuild | 152 -------------------------------
2 files changed, 153 deletions(-)
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 74ab904..8df37a8 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,4 +1,3 @@
DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c
-DIST iproute2-4.15.0.tar.xz 648836 BLAKE2B e7f3a027ec88de7c6ac82c5529b37fdf22311bc9290e71662bc3b1e32d4cb6a1845e2badb961a21b50b5ed1b9d23130e512a011767183f7df1b33eb05101044b SHA512 bcc54b8dc83d7b0e759a2de77eb38fed483d7f7f82698f482e0259000f2f55ba79c556b721730eb999e85c865ad136fd7549304ebe936545e02e848ba7f698bc
DIST iproute2-4.16.0.tar.xz 661336 BLAKE2B 4efb08c88a60b1bbbeef807c0731e610032bfb11d022562c1df052d324eb43cb25b9523f49730d22a3f92eb06bd5037c70d8ed0b58276a0cf0854a0f82800b64 SHA512 a8fbc92665a8d4ca6ee1e894bfb27373cf6b16dac9e2ab3831e418fcc9b895acc7d6fc64efa0b0e37b3affd4ef8eacf4dae5715536138d6a05c65ad49a2becad
DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c SHA512 ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5
diff --git a/sys-apps/iproute2/iproute2-4.15.0.ebuild b/sys-apps/iproute2/iproute2-4.15.0.ebuild
deleted file mode 100644
index 89b5e4d..0000000
--- a/sys-apps/iproute2/iproute2-4.15.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
- inherit git-r3
-else
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb elf +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
- !net-misc/arpd
- !minimal? ( net-libs/libmnl )
- elf? ( virtual/libelf )
- 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-2.4
- sys-devel/flex
- >=sys-kernel/linux-headers-3.16
- elibc_glibc? ( >=sys-libs/glibc-2.7 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
- "${FILESDIR}"/${PN}-4.14.1-configure-nomagic.patch # bug 643722
- "${FILESDIR}"/${PN}-4.15.0-musl.patch
-)
-
-src_prepare() {
- if ! use ipv6 ; then
- PATCHES+=(
- "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
- )
- fi
-
- default
-
- sed -i \
- -e '/^CC :\?=/d' \
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
- -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -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
-
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
-}
-
-src_configure() {
- tc-export AR CC PKG_CONFIG
-
- # This sure is ugly. Should probably move into toolchain-funcs at some point.
- local setns
- pushd "${T}" >/dev/null
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- echo 'int main(){return 0;}' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
- popd >/dev/null
-
- # run "configure" script first which will create "config.mk"...
- econf
-
- # ...now switch on/off requested features via USE flags
- # this is only useful if the test did not set other things, per bug #643722
- cat <<-EOF >> config.mk
- 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)
- HAVE_MNL := $(usex minimal n y)
- HAVE_ELF := $(usex elf y n)
- 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)
- EOF
-}
-
-src_compile() {
- emake V=1
-}
-
-src_install() {
- if use minimal ; then
- into /
- dosbin tc/tc
- dobin ip/ip
- return 0
- fi
-
- emake \
- DESTDIR="${D}" \
- LIBDIR="${EPREFIX%/}"/$(get_libdir) \
- SBINDIR="${EPREFIX%/}"/sbin \
- CONFDIR="${EPREFIX%/}"/etc/iproute2 \
- DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
- MANDIR="${EPREFIX%/}"/usr/share/man \
- ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
- install
-
- dodir /bin
- mv "${ED%/}"/{s,}bin/ip || die #330115
-
- dolib.a lib/libnetlink.a
- insinto /usr/include
- doins include/libnetlink.h
- # This local header pulls in a lot of linux headers it
- # doesn't directly need. Delete this header that requires
- # linux-headers-3.8 until that goes stable. #467716
- sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
-
- if use berkdb ; then
- dodir /var/lib/arpd
- # bug 47482, arpd doesn't need to be in /sbin
- dodir /usr/bin
- mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
- fi
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
@ 2018-09-23 18:29 Anthony G. Basile
0 siblings, 0 replies; 18+ messages in thread
From: Anthony G. Basile @ 2018-09-23 18:29 UTC (permalink / raw
To: gentoo-commits
commit: 3e88951776e315d3ec666bcf3e7c4fbe6c09cabd
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 23 18:29:32 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Sep 23 18:29:32 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3e889517
sys-apps/iproute2: stabilize on all musl supported arches
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sys-apps/iproute2/iproute2-4.17.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/iproute2/iproute2-4.17.0.ebuild b/sys-apps/iproute2/iproute2-4.17.0.ebuild
index bbe612b..3796d2a 100644
--- a/sys-apps/iproute2/iproute2-4.17.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.17.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+ KEYWORDS="amd64 arm ~arm64 ~mips ppc x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
^ permalink raw reply related [flat|nested] 18+ messages in thread* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
@ 2018-06-11 17:29 Aric Belsito
0 siblings, 0 replies; 18+ messages in thread
From: Aric Belsito @ 2018-06-11 17:29 UTC (permalink / raw
To: gentoo-commits
commit: 7d569be74440f3c69bbc3156a94a9798dc0fbbfb
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Jun 11 17:29:15 2018 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Jun 11 17:29:15 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7d569be7
sys-apps/iproute2: version bump to 4.17.0
sys-apps/iproute2/Manifest | 1 +
sys-apps/iproute2/{iproute2-4.16.0.ebuild => iproute2-4.17.0.ebuild} | 0
2 files changed, 1 insertion(+)
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 769cee9..74ab904 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,3 +1,4 @@
DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c
DIST iproute2-4.15.0.tar.xz 648836 BLAKE2B e7f3a027ec88de7c6ac82c5529b37fdf22311bc9290e71662bc3b1e32d4cb6a1845e2badb961a21b50b5ed1b9d23130e512a011767183f7df1b33eb05101044b SHA512 bcc54b8dc83d7b0e759a2de77eb38fed483d7f7f82698f482e0259000f2f55ba79c556b721730eb999e85c865ad136fd7549304ebe936545e02e848ba7f698bc
DIST iproute2-4.16.0.tar.xz 661336 BLAKE2B 4efb08c88a60b1bbbeef807c0731e610032bfb11d022562c1df052d324eb43cb25b9523f49730d22a3f92eb06bd5037c70d8ed0b58276a0cf0854a0f82800b64 SHA512 a8fbc92665a8d4ca6ee1e894bfb27373cf6b16dac9e2ab3831e418fcc9b895acc7d6fc64efa0b0e37b3affd4ef8eacf4dae5715536138d6a05c65ad49a2becad
+DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c SHA512 ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5
diff --git a/sys-apps/iproute2/iproute2-4.16.0.ebuild b/sys-apps/iproute2/iproute2-4.17.0.ebuild
similarity index 100%
rename from sys-apps/iproute2/iproute2-4.16.0.ebuild
rename to sys-apps/iproute2/iproute2-4.17.0.ebuild
^ permalink raw reply related [flat|nested] 18+ messages in thread* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
@ 2017-12-22 3:28 Anthony G. Basile
0 siblings, 0 replies; 18+ messages in thread
From: Anthony G. Basile @ 2017-12-22 3:28 UTC (permalink / raw
To: gentoo-commits
commit: 404b226b26e4670ea6fb5ee2ad3deb405e62e1a9
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 03:11:37 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 03:28:15 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=404b226b
sys-apps/iproute2: 4.14.1-r2 stable on all musl arches
Package-Manager: Portage-2.3.13, Repoman-2.3.3
sys-apps/iproute2/iproute2-4.14.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild
index 854bdd9..07bfa51 100644
--- a/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+ KEYWORDS="amd64 arm ~mips ppc x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
^ permalink raw reply related [flat|nested] 18+ messages in thread* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
@ 2017-11-29 19:01 Aric Belsito
0 siblings, 0 replies; 18+ messages in thread
From: Aric Belsito @ 2017-11-29 19:01 UTC (permalink / raw
To: gentoo-commits
commit: b9f7156c27af59f3871f3f5c7c1b5440782893e2
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed Nov 29 19:00:49 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Nov 29 19:00:49 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b9f7156c
sys-apps/iproute2: version bump to 4.14.1-r1
.../{iproute2-4.14.1.ebuild => iproute2-4.14.1-r1.ebuild} | 7 ++++---
sys-apps/iproute2/iproute2-4.4.0.ebuild | 9 +++++----
sys-apps/iproute2/metadata.xml | 2 +-
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/sys-apps/iproute2/iproute2-4.14.1.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
similarity index 96%
rename from sys-apps/iproute2/iproute2-4.14.1.ebuild
rename to sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
index 48f244b..b8a34e6 100644
--- a/sys-apps/iproute2/iproute2-4.14.1.ebuild
+++ b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
@@ -23,7 +23,7 @@ IUSE="atm berkdb +iptables ipv6 minimal selinux"
# We could make libmnl optional, but it's tiny, so eh
RDEPEND="
!net-misc/arpd
- !minimal? ( net-libs/libmnl )
+ !minimal? ( net-libs/libmnl virtual/libelf )
iptables? ( >=net-firewall/iptables-1.4.20:= )
berkdb? ( sys-libs/db:= )
atm? ( net-dialup/linux-atm )
@@ -34,7 +34,7 @@ DEPEND="
${RDEPEND}
app-arch/xz-utils
iptables? ( virtual/pkgconfig )
- sys-devel/bison
+ >=sys-devel/bison-2.4
sys-devel/flex
>=sys-kernel/linux-headers-3.16
elibc_glibc? ( >=sys-libs/glibc-2.7 )
@@ -63,7 +63,7 @@ src_prepare() {
default
sed -i \
- -e '/^CC :=/d' \
+ -e '/^CC :\?=/d' \
-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
@@ -104,6 +104,7 @@ src_configure() {
TC_CONFIG_IPSET := y
HAVE_BERKELEY_DB := $(usex berkdb y n)
HAVE_MNL := $(usex minimal n y)
+ HAVE_ELF := $(usex minimal n y)
HAVE_SELINUX := $(usex selinux y n)
IP_CONFIG_SETNS := ${setns}
# Use correct iptables dir, #144265 #293709
diff --git a/sys-apps/iproute2/iproute2-4.4.0.ebuild b/sys-apps/iproute2/iproute2-4.4.0.ebuild
index 3741d1f..4e5b37c 100644
--- a/sys-apps/iproute2/iproute2-4.4.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -22,7 +22,7 @@ IUSE="atm berkdb +iptables ipv6 minimal selinux"
# We could make libmnl optional, but it's tiny, so eh
RDEPEND="!net-misc/arpd
- !minimal? ( net-libs/libmnl )
+ !minimal? ( net-libs/libmnl virtual/libelf )
iptables? ( >=net-firewall/iptables-1.4.20:= )
berkdb? ( sys-libs/db:= )
atm? ( net-dialup/linux-atm )
@@ -31,7 +31,7 @@ RDEPEND="!net-misc/arpd
DEPEND="${RDEPEND}
app-arch/xz-utils
iptables? ( virtual/pkgconfig )
- sys-devel/bison
+ >=sys-devel/bison-2.4
sys-devel/flex
>=sys-kernel/linux-headers-3.16
elibc_glibc? ( >=sys-libs/glibc-2.7 )"
@@ -44,7 +44,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-4.4.0-missing-limits_h.patch
sed -i \
- -e '/^CC =/d' \
+ -e '/^CC :\?=/d' \
-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
@@ -84,6 +84,7 @@ src_configure() {
TC_CONFIG_IPSET := y
HAVE_BERKELEY_DB := $(usex berkdb y n)
HAVE_MNL := $(usex minimal n y)
+ HAVE_ELF := $(usex minimal n y)
HAVE_SELINUX := $(usex selinux y n)
IP_CONFIG_SETNS := ${setns}
# Use correct iptables dir, #144265 #293709
diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml
index 0fa0b4c..2605d5f 100644
--- a/sys-apps/iproute2/metadata.xml
+++ b/sys-apps/iproute2/metadata.xml
@@ -8,6 +8,6 @@
<use>
<flag name="berkdb">build programs that use berkdb (just arpd)</flag>
<flag name="iptables">include support for iptables filtering</flag>
- <flag name="minimal">only install ip and tc programs</flag>
+ <flag name="minimal">only install ip and tc programs, without eBPF support</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 18+ messages in thread* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
@ 2017-11-21 18:55 Aric Belsito
0 siblings, 0 replies; 18+ messages in thread
From: Aric Belsito @ 2017-11-21 18:55 UTC (permalink / raw
To: gentoo-commits
commit: 6d049025dd32ededa0f810190b62b4c2a504cfbb
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Nov 21 18:53:54 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Nov 21 18:53:54 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=6d049025
sys-apps/iproute2: version bump 4.14.1
sys-apps/iproute2/Manifest | 2 +-
sys-apps/iproute2/{iproute2-4.14.0.ebuild => iproute2-4.14.1.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 415e1f8..aab6559 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,2 +1,2 @@
-DIST iproute2-4.14.0.tar.xz 636872 SHA256 fee001307b3c018462cb010e3aa19b38017de26168d5777c05ee73a21d60fcd0 SHA512 dda8b7881d82d6d38449d69df362bd3eedde6c7f4dd315d6eaf7969673805faf82675e1df04d7dc35a826b0df429a400a3f8ac0e998c1de0d6ca500e722f058e WHIRLPOOL 62ce4fa8ba1bb84678277401c07097b26490767cd55a66f2be743dc1fec4610033437517c44339dc4cc95ffe0d255d804c25cdd6e77640eb15453160abe87f78
+DIST iproute2-4.14.1.tar.xz 636876 SHA256 d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c WHIRLPOOL 42ee7611f3fb1ceb922c606bf11cd4d72cf71020a73f96f5130f07a9cab08f1dbc973cb5924f6a15cf4613dac5b60a3a97583c0e801db960f5039d6d8c0ef095
DIST iproute2-4.4.0.tar.xz 528552 SHA256 bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69 WHIRLPOOL 7e90c98805e12b28de284bb998e5a27cf524a78d0bd7632c0d49a7ddff8f11f5229ac6867076e9fea6f21b6b31360bddb21138673d94de766bdf7324a09bc013
diff --git a/sys-apps/iproute2/iproute2-4.14.0.ebuild b/sys-apps/iproute2/iproute2-4.14.1.ebuild
similarity index 100%
rename from sys-apps/iproute2/iproute2-4.14.0.ebuild
rename to sys-apps/iproute2/iproute2-4.14.1.ebuild
^ permalink raw reply related [flat|nested] 18+ messages in thread* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
@ 2017-09-06 16:09 Aric Belsito
0 siblings, 0 replies; 18+ messages in thread
From: Aric Belsito @ 2017-09-06 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 91fcd69ba7627db9aff64e67799e46fec407df19
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed Sep 6 16:08:54 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Sep 6 16:08:54 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=91fcd69b
sys-apps/iproute2: version bump to 4.13.0
sys-apps/iproute2/Manifest | 4 +--
...route2-4.12.0.ebuild => iproute2-4.13.0.ebuild} | 36 +++++++++++++---------
2 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 4313b95..c84b697 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -5,8 +5,8 @@ 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
-DIST iproute2-4.12.0.tar.xz 662424 SHA256 2e0a4c4262d9f6c169885a6e16c4c5c5f1ef6fd57b6a0e7b41f42be5bb6ebd7d SHA512 275147f71e7c4698654f0d6d0981ab42f6f108066508c15cfcd5d9e0d3aaf8d33291968d9f06cb03f5494d801cfabf8d53308aaf56fc4fa92c52b137e970a3b0 WHIRLPOOL 590cc191e96ff0b777373603186e4416f064931d529878ec783759f31fd99e1119bb0604e8a89dc98d350f80eca2bfef05a13bca7ce24302408072002c0b17b2
+DIST iproute2-4.13.0.tar.xz 670340 SHA256 9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50 SHA512 f96d2839aec1f439bfac504c8e3881c063dacbf4c67b15f0e3da9882d2fa013cba33c23602de3eab624e0eecbb911a13967d60bddcdf097f47a580a5a77b5e3a WHIRLPOOL 757247f1356eef49b299019f6d1809e5d781471665daedce885201b7034a6138def73c84ba2f0453f2f0f5d55cc2edf778992b3d79d06e01364c511373ea4644
DIST iproute2-4.4.0.tar.xz 528552 SHA256 bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69 WHIRLPOOL 7e90c98805e12b28de284bb998e5a27cf524a78d0bd7632c0d49a7ddff8f11f5229ac6867076e9fea6f21b6b31360bddb21138673d94de766bdf7324a09bc013
-EBUILD iproute2-4.12.0.ebuild 3968 SHA256 e4469ecf058e8d1b1f37b7d3b6a43603771a2b0d00823c4f4cfeede3ea04ec16 SHA512 4371fd9e5163c18ba45171aa6872e11ab05d6cd5c5d67fb4318eaa385d52fd8315dace35698bce25f4a376c98c25188ac80590c339cb756dbab2bd753e2a5157 WHIRLPOOL fd6b4acf3f505a90d96b9710c6bd904c4dee1487fc79e1c4fe638a3262cd98a000f01519fb7f5b294029076347fd87045a0126b6686b98ba20f909c51c35fda1
+EBUILD iproute2-4.13.0.ebuild 4191 SHA256 91f34dd029d1492c66f210edb8c1fea0b6b8a203379601a378dc7be14a526a79 SHA512 8f5f74183153c6ea7d812d1efd8b053d0592eb8a0f9ab1d3eb6421fd62354ca6b43b599b6a3fe7a01b022c511865b3ec09e18f4ca23b790df51eae98ec723d5f WHIRLPOOL 53d5e3f495248958cae0ac3939672ad2d406c4024d62927d92abb9beeaa3009c76346a7be044cd919d9a3a57f15b2f479b0d995d904e30a9fc03afbc307b982e
EBUILD iproute2-4.4.0.ebuild 3970 SHA256 8bacd413dcba29e38c745a676751d54cf22b59a625af45e440983a9442583484 SHA512 98ab9c6418a2ff22625c9c86d02681262e2ec581bd974eeac062e55963f211c46ecff42f4275d53befe4d5f94da1280b7525c0e9158225fef3a3be9f23fe72e8 WHIRLPOOL b5476358ab6dfebfd7a70a822f3998521d83e729df226dfa7007a58cb2788035a0f6ec2663f462e89b8e1f9b1fd6567c53356cf76bbefc768fecf72ec32995fa
MISC metadata.xml 467 SHA256 54932243a153c9130ca1862f0dce70ac6fff517e9b5c22f10e6d044ac3679e86 SHA512 34c134b1a8ee152382b9fe9872df3d15d32ec3822ba215c8b21e948b8313e2e3d045468b873b7958681e92265d57ce25455e03f4d8e6be4e882943e54331cd7c WHIRLPOOL 188528c73a6a8b90a0e69bab32d24a05e41c6695f559da91ead84be331769f47864ca6e88a7f1a31619da51e53b7fdd8a23735ff576098998eac6f1a9d24feb1
diff --git a/sys-apps/iproute2/iproute2-4.12.0.ebuild b/sys-apps/iproute2/iproute2-4.13.0.ebuild
similarity index 81%
rename from sys-apps/iproute2/iproute2-4.12.0.ebuild
rename to sys-apps/iproute2/iproute2-4.13.0.ebuild
index 0d9b891..53a6289 100644
--- a/sys-apps/iproute2/iproute2-4.12.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.13.0.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit eutils toolchain-funcs flag-o-matic multilib
+inherit toolchain-funcs flag-o-matic multilib
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
- inherit git-2
+ inherit git-r3
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -52,7 +52,15 @@ src_prepare() {
)
fi
- epatch "${PATCHES[@]}"
+ # Local uclibc-ng compat fix until uclibc-ng upstream can sync
+ # netinet/in.h with glibc. Resolves #626546.
+ if use elibc_uclibc ; then
+ PATCHES+=(
+ "${FILESDIR}"/${PN}-4.12.0-uclibc-ng-add-ipproto_mh.patch
+ )
+ fi
+
+ default
sed -i \
-e '/^CC :=/d' \
@@ -113,18 +121,18 @@ src_install() {
emake \
DESTDIR="${D}" \
- LIBDIR="${EPREFIX}"/$(get_libdir) \
- SBINDIR="${EPREFIX}"/sbin \
- CONFDIR="${EPREFIX}"/etc/iproute2 \
- DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
- MANDIR="${EPREFIX}"/usr/share/man \
- ARPDDIR="${EPREFIX}"/var/lib/arpd \
+ LIBDIR="${EPREFIX%/}"/$(get_libdir) \
+ SBINDIR="${EPREFIX%/}"/sbin \
+ CONFDIR="${EPREFIX%/}"/etc/iproute2 \
+ DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
+ MANDIR="${EPREFIX%/}"/usr/share/man \
+ ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
install
- rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
+ rm "${ED%/}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
dodir /bin
- mv "${ED}"/{s,}bin/ip || die #330115
+ mv "${ED%/}"/{s,}bin/ip || die #330115
dolib.a lib/libnetlink.a
insinto /usr/include
@@ -132,12 +140,12 @@ src_install() {
# This local header pulls in a lot of linux headers it
# doesn't directly need. Delete this header that requires
# linux-headers-3.8 until that goes stable. #467716
- sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
+ sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
if use berkdb ; then
dodir /var/lib/arpd
# bug 47482, arpd doesn't need to be in /sbin
dodir /usr/bin
- mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
+ mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
fi
}
^ permalink raw reply related [flat|nested] 18+ messages in thread* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
@ 2017-02-21 20:39 Aric Belsito
0 siblings, 0 replies; 18+ messages in thread
From: Aric Belsito @ 2017-02-21 20:39 UTC (permalink / raw
To: gentoo-commits
commit: 3b2e5677b6d219914806f65426073cbd6c8b192d
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Feb 21 20:39:18 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Feb 21 20:39:18 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3b2e5677
sys-apps/iproute2: fix manifest
sys-apps/iproute2/Manifest | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 3497319..77e2dcc 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,5 +1,5 @@
AUX iproute2-3.1.0-mtu.patch 1649 SHA256 d8d1d3b81a3fd5674e6c9e202bce9e84f41b579ba2c6a554df3346f4642715af SHA512 5479c2085b4aca958a89d3e265ebc3763c9e7cb273bd4046d7b7585209739f75ff04cc9b84d8eb9e3afae821ff788f0f0c7ab443260ab07943b6fad6946403e1 WHIRLPOOL b813f1d9dcdbfb525fb07a462f7faf1c13117dd3e9e584b1a033cb69f3dad9d4b8e5120f8512185f24769e6be0aabd6635ad3996342dc210ff513866e7638502
-AUX iproute2-4.10.0-musl.patch 16411 SHA256 e578258aed86cc951174dccee109fa0eb34f6bf73cb0995f41832692c60fb9ba SHA512 8316c93baac8b8be185cbe03ef402965d5a69c26ae50a2da00c1d341d3bee34203712a13e6d470ffc6d3272fb2f1e14d0f49d6a2206b7876a8549e7f6cc086e9 WHIRLPOOL 31fb9ae4079a377047d469517b8d0f6b8e434db106f1ffa2ff38ad825ec90c0f38fdf9818fc66dd31faf1dec775cb26d627b0c33960f54808878f4c8c0d8a2ad
+AUX iproute2-4.10.0-musl.patch 15514 SHA256 c9da583db199833b4fb3f4a57f3c7905ab194ebb928bc267915ef8fec9a19c9e SHA512 7145498b46531e60d7dc5d7d149e5af790c24f2297d0ab91d87627a677e31324617fbfd8713d6ac160c64b2898c41682a673005a53b9342193688ab3227263e2 WHIRLPOOL 78ca358b52d712bf149c71ba049a99f09aa34408d538962217eb9c872b51786517445c91fba0281a7dac6c3b5bb15eb0a291cc8e7728875bc1d03fe79ac3ddc1
AUX iproute2-4.2.0-no-ipv6.patch 1336 SHA256 b352b11d22e922038adb2b1ae083b6e47b89744f94d6de732bb85abd9cfa80e6 SHA512 f4219a094f367c9f8fac089beeffca31abbbc5d4ade1681e23a92f3dd2e1a95f331322938936b0b1771ea5a56224e0f14008f4d38a8708357a5d2b2b70efbbd5 WHIRLPOOL 35faf6227ad1b4409b6742cb754b6570c25f65bd6a63e2237fd9613075827811bd1b9e86dd5d099b061e14906f752ef5aecea8ccbe95748d98f892d111a3a0b7
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
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
@ 2017-02-21 18:25 Aric Belsito
0 siblings, 0 replies; 18+ messages in thread
From: Aric Belsito @ 2017-02-21 18:25 UTC (permalink / raw
To: gentoo-commits
commit: e25406d3b4365bb9aa424500990d53c4eda1887a
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Feb 21 18:25:13 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Feb 21 18:25:13 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e25406d3
sys-apps/iproute2: version bump to 4.10.0
drop 4.3.0: no longer in tree
sys-apps/iproute2/Manifest | 8 +-
...proute2-4.9.0.ebuild => iproute2-4.10.0.ebuild} | 10 +-
sys-apps/iproute2/iproute2-4.3.0.ebuild | 131 ---------------------
sys-apps/iproute2/iproute2-4.4.0.ebuild | 10 +-
4 files changed, 13 insertions(+), 146 deletions(-)
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index a26ff8c..25bf29d 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,10 +4,8 @@ AUX iproute2-4.3.0-musl-noiptables.patch 1166 SHA256 1910d28fe0aa89ba71cd30bb38b
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.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.10.0.tar.xz 626944 SHA256 22b1e1c1fc704ad35837e5a66103739727b8b48ac90b48c13f79b7367ff0a9a8 SHA512 e54477e167455e7ef5da4adc168d63eaa96091b63dc987fffe918cbb005eceed18a62283ca99ee2512dc0e960f47ae21b39ffbe399c1612fd9cea147c34c581b WHIRLPOOL 7034f87835b13d275d2e065ee00d869060ae20c7dd325d8974da414db20328195e5968ede2f0b6925ddf67de3712b5945f54276c6ce5c8367ba28520c2adb859
DIST iproute2-4.4.0.tar.xz 528552 SHA256 bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69 WHIRLPOOL 7e90c98805e12b28de284bb998e5a27cf524a78d0bd7632c0d49a7ddff8f11f5229ac6867076e9fea6f21b6b31360bddb21138673d94de766bdf7324a09bc013
-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.9.0.ebuild 3888 SHA256 a376521f4eb3791fd147e8f2eb658b10feef8c2ff12ddbaf2a44c4420e759d18 SHA512 16cb1871e79782a62699eeecf3672b39a3c9002bb6bcfc27cc61677a24fda7f952def8c2ffa68067ac07177c603c8446befd6176c14d760c32b6446681588fd8 WHIRLPOOL 6eb389f280f9bcbedbdb57fcfb9f93ae821a8885cf2aa511f1e989546d9bd6a5f3ec7882e0d868fb1ed3798593e4f09ed44f5ae298344457180e692df4256164
+EBUILD iproute2-4.10.0.ebuild 3969 SHA256 2eb3503dcfa35bb65220555c5a5d278c74b41bc909b5c2208f475a904d7a72f6 SHA512 16d20a55011d6f768182a561103eeb30f8d013105593556bedab3695cbea874903e3b6534b8bcf1c665469678d1bcdbf861949955c39eab4634c211180592a21 WHIRLPOOL d0814f70dbb854d7a210607549fcf93bd9ae797fe88bb4f8b7c6a7949ce169a16e7a48a5cbc24e12a4de0b93f063c2df6df3fb0280e049d1cdc56e7a7a312d00
+EBUILD iproute2-4.4.0.ebuild 3977 SHA256 e845c0f75b338afaa27b767181d8199e8f7179e703a5073a0d4c882e86ba73d3 SHA512 155be7eb501328d00459e1bfeec22a56387f48b7bdf0c16359839b9df15c2d7979341c6daae9494c5da321223f8add67cc1c000ee16c484148e907b12abb04d7 WHIRLPOOL 47918d2b0346662c8a676c83f1c89d0ba3070fd6d52ac5d5593ea07e250314bd5577f698011e4f963afe81fc6c3fd9e80278e61b7cdcc457ebc4e197fc7cc310
MISC metadata.xml 467 SHA256 54932243a153c9130ca1862f0dce70ac6fff517e9b5c22f10e6d044ac3679e86 SHA512 34c134b1a8ee152382b9fe9872df3d15d32ec3822ba215c8b21e948b8313e2e3d045468b873b7958681e92265d57ce25455e03f4d8e6be4e882943e54331cd7c WHIRLPOOL 188528c73a6a8b90a0e69bab32d24a05e41c6695f559da91ead84be331769f47864ca6e88a7f1a31619da51e53b7fdd8a23735ff576098998eac6f1a9d24feb1
diff --git a/sys-apps/iproute2/iproute2-4.9.0.ebuild b/sys-apps/iproute2/iproute2-4.10.0.ebuild
similarity index 90%
rename from sys-apps/iproute2/iproute2-4.9.0.ebuild
rename to sys-apps/iproute2/iproute2-4.10.0.ebuild
index d84e3b9..943d8cd 100644
--- a/sys-apps/iproute2/iproute2-4.9.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -79,10 +79,10 @@ src_configure() {
# This sure is ugly. Should probably move into toolchain-funcs at some point.
local setns
pushd "${T}" >/dev/null
- echo 'main(){return setns();};' > test.c
- ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- echo 'main(){};' > test.c
- ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+ printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
+ ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+ echo 'int main(){return 0;}' > test.c
+ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
popd >/dev/null
cat <<-EOF > Config
diff --git a/sys-apps/iproute2/iproute2-4.3.0.ebuild b/sys-apps/iproute2/iproute2-4.3.0.ebuild
deleted file mode 100644
index 0685b63..0000000
--- a/sys-apps/iproute2/iproute2-4.3.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
- inherit git-2
-else
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="!net-misc/arpd
- !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-3.16
- elibc_glibc? ( >=sys-libs/glibc-2.7 )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
- use ipv6 || epatch "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849
- epatch "${FILESDIR}"/${PN}-4.3.0-musl.patch
- epatch "${FILESDIR}"/${PN}-4.3.0-musl-noiptables.patch
-
- sed -i \
- -e '/^CC =/d' \
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
- -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^WFLAGS/s:-Werror::" \
- -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
-
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
-}
-
-src_configure() {
- tc-export AR CC PKG_CONFIG
-
- # This sure is ugly. Should probably move into toolchain-funcs at some point.
- local setns
- pushd "${T}" >/dev/null
- echo 'main(){return setns();};' > test.c
- ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- echo 'main(){};' > test.c
- ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
- popd >/dev/null
-
- 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_BERKELEY_DB := $(usex berkdb y n)
- 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)
- EOF
-}
-
-src_install() {
- if use minimal ; then
- into /
- dosbin tc/tc
- dobin ip/ip
- return 0
- fi
-
- emake \
- DESTDIR="${D}" \
- LIBDIR="${EPREFIX}"/$(get_libdir) \
- SBINDIR="${EPREFIX}"/sbin \
- CONFDIR="${EPREFIX}"/etc/iproute2 \
- DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
- MANDIR="${EPREFIX}"/usr/share/man \
- ARPDDIR="${EPREFIX}"/var/lib/arpd \
- install
-
- rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
-
- dodir /bin
- mv "${ED}"/{s,}bin/ip || die #330115
-
- dolib.a lib/libnetlink.a
- insinto /usr/include
- doins include/libnetlink.h
- # This local header pulls in a lot of linux headers it
- # doesn't directly need. Delete this header that requires
- # linux-headers-3.8 until that goes stable. #467716
- sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
- if use berkdb ; then
- dodir /var/lib/arpd
- # bug 47482, arpd doesn't need to be in /sbin
- dodir /usr/bin
- mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
- fi
-}
diff --git a/sys-apps/iproute2/iproute2-4.4.0.ebuild b/sys-apps/iproute2/iproute2-4.4.0.ebuild
index 350906e..4f98a02 100644
--- a/sys-apps/iproute2/iproute2-4.4.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.4.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-2
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
@@ -72,10 +72,10 @@ src_configure() {
# This sure is ugly. Should probably move into toolchain-funcs at some point.
local setns
pushd "${T}" >/dev/null
- echo 'main(){return setns();};' > test.c
- ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- echo 'main(){};' > test.c
- ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+ printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
+ ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+ echo 'int main(){return 0;}' > test.c
+ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
popd >/dev/null
cat <<-EOF > Config
^ permalink raw reply related [flat|nested] 18+ messages in thread* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
@ 2016-01-03 16:26 Jory Pratt
0 siblings, 0 replies; 18+ messages in thread
From: Jory Pratt @ 2016-01-03 16:26 UTC (permalink / raw
To: gentoo-commits
commit: 5d88f43664d7b2eae94b3c7043ffae9281e3e1bc
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 3 16:25:12 2016 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Jan 3 16:25:12 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5d88f436
iproute2 - include sys/types.h when building with -iptables
sys-apps/iproute2/Manifest | 3 ++-
sys-apps/iproute2/iproute2-3.19.0-r99.ebuild | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index c20549f..4810bcb 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -6,10 +6,11 @@ AUX iproute2-3.8.0-musl-headers.patch 2701 SHA256 3d6c6ff432f68ab76bc818aee6228e
AUX iproute2-3.8.0-old-mount-libc.patch 871 SHA256 dc9fc407b09763f79663dbad627961f8a3446881737cc666f0cb67235f160d51 SHA512 cda73ce07c21d18c68fcff08e282e87a2d4b53cf7779e8a1ef669d7275974c8f3638ca530031aafcfc7eb4885264ceb7abb308b9da6f5568889a84cb4c7df1f9 WHIRLPOOL d2057e6bad82dce7844886d551d70af9207e111494b9cc23abc433857741afa48f30671091c8821a60aaa07ca621f243fbeee10322da11ac44d02f4f588b88bf
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
+AUX iproute2-4.3.0-musl-noiptables.patch 1166 SHA256 1910d28fe0aa89ba71cd30bb38b43119414102ce323dc47eee8bec290e5f52e7 SHA512 f1b988c5ae5b5d159d1a2bedec678b8680b3358a6ea3a9d581b642cd706cfd1cb31c7cd590e1fe8969c3d3bebb2912fb5fa8011cfc39d2a17a4092617ae15766 WHIRLPOOL 87ee199c0f06b8c750412625e204b10261945954c07fade452ea2cf956405d7094d02357e1ed92f1aafcc9d34c7e7109cb10ee1aed31adf0e94989f2701bd877
DIST iproute2-3.19.0.tar.xz 455004 SHA256 e2f9f8c36e166f2ba6c0e1e7a9ad84cdf7c1615b93df49dac44563d7b57fd7b0 SHA512 fc533b6a526cfda234f043ac25302a3206a81ab2a740640b997b6bfb22e6f94ddc21b704191a358ea8721a327ba785e0224a4b4129111ef5008b4003379c3706 WHIRLPOOL 6a0aa1a948286d7dcb3663d787167c27760d756385295bf0ca631920aed50fbd984c19204247097116ef0d4e293c3c8dbe13b0b44c6ec83e7815a7461293c89f
DIST iproute2-4.0.0.tar.xz 459364 SHA256 5cd06eb1050b858b308b65705725042bb566fd261135e35a73dafb48cd632618 SHA512 8e0587ed484a9697af99b4f37b460fddd28136b3c19898a11809b1e8ca9a75a18dcc83bc512f5b74361e6128732e69a3e66b3a62c38a5ae5f13c3e18af186be4 WHIRLPOOL 6abdf2b4587abd7a73d2b7692a4bb478ac379dc3a27f564ad78e34f25f06ae5dd9e0e4873c6510d30767a398375dcdcd2da777412c725885e0c3d4bd89c71a9b
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-3.19.0-r99.ebuild 3700 SHA256 552f58b5f02887a93c347450df11fd236fb1bb49cb82962c0fbc75863b9750bd SHA512 a1fee8a1268ec96a6e90b5c5bc40a0d7a6cd23d4ecb8bf5617d0145b1db0a62bef85bbd37719e86997f8103feb09c98b025fb82b1bbae885cc5b6f6a3b346d39 WHIRLPOOL 73209031bf4ccebda47195632c09fc4f017854723c734f51e4bfa9f20bfd284f1272d891b4c8f22b25e6b28e12cc0289e28c78a765d0c71ce5bcbdce2b925363
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 3638122..0fe6cdc 100644
--- a/sys-apps/iproute2/iproute2-3.19.0-r99.ebuild
+++ b/sys-apps/iproute2/iproute2-3.19.0-r99.ebuild
@@ -38,6 +38,7 @@ 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
+ epatch "${FILESDIR}"/${PN}-4.3.0-musl-noiptables.patch
sed -i \
-e '/^CC =/d' \
^ permalink raw reply related [flat|nested] 18+ messages in thread* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/
@ 2015-07-15 17:00 Anthony G. Basile
0 siblings, 0 replies; 18+ messages in thread
From: Anthony G. Basile @ 2015-07-15 17:00 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2020-01-30 7:42 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-10 21:00 [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2020-01-30 7:42 Georgy Yakovlev
2019-07-25 3:09 Jory Pratt
2019-07-03 3:08 Jory Pratt
2019-02-11 11:44 Anthony G. Basile
2018-12-29 18:52 Anthony G. Basile
2018-10-31 23:58 Anthony G. Basile
2018-10-29 11:39 Anthony G. Basile
2018-09-23 18:29 Anthony G. Basile
2018-06-11 17:29 Aric Belsito
2017-12-22 3:28 Anthony G. Basile
2017-11-29 19:01 Aric Belsito
2017-11-21 18:55 Aric Belsito
2017-09-06 16:09 Aric Belsito
2017-02-21 20:39 Aric Belsito
2017-02-21 18:25 Aric Belsito
2016-01-03 16:26 Jory Pratt
2015-07-15 17:00 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox