subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: sys\-apps\/iproute2\/"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-07-17 Thread Sam James

commit: f2e0ee7855c4a942bf2175c57edcbc575bd03421
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 17 06:10:58 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 17 06:11:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e0ee78

sys-apps/iproute2: add 6.10.0

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/Manifest |  1 +
 .../{iproute2-.ebuild => iproute2-6.10.0.ebuild}   | 13 +++--
 sys-apps/iproute2/iproute2-.ebuild | 14 --
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 2a9a6839c2a8..88ced78286e6 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,3 +1,4 @@
+DIST iproute2-6.10.0.tar.xz 920812 BLAKE2B 
66332ea333ab2cdc4a2c71000fa2d06fd87cfdf5237dae458aff60ce606155302eb9d0ffaf87107255ab04c02f2b773dc040abb08bb89afb53091396dfc8a3ad
 SHA512 
706479aa37a25fcf30c525c6abd85e0861e484d046e0636a28dbc52b958d45c9dba70b912f530dedd4b0b496e4b98969e2350141d3de50810bae014fcb41
 DIST iproute2-6.6.0.tar.xz 917964 BLAKE2B 
9d20f19c04c2bbde7a3ae53e61e4623b119570c8446f34b93ddadd64677caa432e00ee085498bc277e0842cc2124340c7100925106d0ef2c11dd8002aacac08f
 SHA512 
21c99a3ba8e1d0047933e99b48fb00901eef18899cd5854000ae910d9d84d13aeafa48b32184775531285782909f4d283d0784491691a1f10462dab147de359d
 DIST iproute2-6.8.0.tar.xz 913512 BLAKE2B 
d30cdff8522627c27c9165f068f42adbec38f15548a8f2cd31276f283880dc402e10c5989e7227e80cdc891bcc4a574b330d634ae550e689758b849c0506c31f
 SHA512 
54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0
 DIST iproute2-6.9.0.tar.xz 918144 BLAKE2B 
a7434a2537a55b4875db0e3cc35383dfe4d0c8a118a8a1102c4076bfb154c9c2ab0781dcff324fa18ce7cfde798bf332a9e0ff08003ff39acbb8129b597a93a6
 SHA512 
1cbb234cb8f94213c3529f0b74fed5a575ff1fb838e783b8d2b440643c2e91246eda42e9b26e9775897aadb8b8133d199b2851b8ea0df06a899dc02acf403325

diff --git a/sys-apps/iproute2/iproute2-.ebuild 
b/sys-apps/iproute2/iproute2-6.10.0.ebuild
similarity index 94%
copy from sys-apps/iproute2/iproute2-.ebuild
copy to sys-apps/iproute2/iproute2-6.10.0.ebuild
index bfc78c186a70..3d0c9ec799da 100644
--- a/sys-apps/iproute2/iproute2-.ebuild
+++ b/sys-apps/iproute2/iproute2-6.10.0.ebuild
@@ -18,7 +18,7 @@ 
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux split-usr"
+IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux"
 # Needs root
 RESTRICT="test"
 
@@ -48,9 +48,8 @@ BDEPEND="
 "
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-6.5.0-mtu.patch # bug #291907
+   "${FILESDIR}"/${PN}-6.9.0-mtu.patch # bug #291907
"${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug 
#643722 & #911727
-   "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
"${FILESDIR}"/${PN}-6.8.0-disable-libbsd-fallback.patch # bug #911727
 )
 
@@ -192,6 +191,7 @@ src_install() {
 
dodir /bin
mv "${ED}"/{s,}bin/ip || die # bug #330115
+   mv "${ED}"/{s,}bin/ss || die # bug #547264
 
dolib.a lib/libnetlink.a
insinto /usr/include
@@ -201,13 +201,6 @@ src_install() {
# https://bugs.gentoo.org/868321
mv "${ED}"/sbin/ifstat{,-iproute2} || die
 
-   if use split-usr ; then
-   # Can remove compatibility symlink in a year: 2023-05-28.
-   # bug #547264
-   mv "${ED}"/sbin/ss "${ED}"/bin/ss || die
-   dosym -r /bin/ss /sbin/ss
-   fi
-
if use berkdb ; then
keepdir /var/lib/arpd
# bug #47482, arpd doesn't need to be in /sbin

diff --git a/sys-apps/iproute2/iproute2-.ebuild 
b/sys-apps/iproute2/iproute2-.ebuild
index bfc78c186a70..94334695f4ff 100644
--- a/sys-apps/iproute2/iproute2-.ebuild
+++ b/sys-apps/iproute2/iproute2-.ebuild
@@ -18,7 +18,7 @@ 
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux split-usr"
+IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux"
 # Needs root
 RESTRICT="test"
 
@@ -48,10 +48,10 @@ BDEPEND="
 "
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-6.5.0-mtu.patch # bug #291907
+   "${FILESDIR}"/${PN}-6.9.0-mtu.patch # bug #291907
"${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug 
#643722 & #911727
-   "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
"${FILESDIR}"/${PN}-6.8.0-disable-libbsd-fallback.patch # bug #911727
+   "${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622 & #932617
 )
 
 src_prepare() {
@@ -192,6 +192,7 @@ src_install() {
 
dodir /bin
mv "${ED}"/{s,}bin/ip || die # bug #330115
+   mv "${ED}"/{s,}bin/ss || die # bug #547264
 
dolib.a

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-06-25 Thread Sam James

commit: 3bddc47bd3109f36e11c7513bfc803e3d59153c4
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 25 06:41:53 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 25 06:41:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bddc47b

sys-apps/iproute2: Stabilize 6.8.0-r2 sparc, #934869

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.8.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild 
b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
index 471ca02cfcc9..dd733559c8a1 100644
--- a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-06-25 Thread Sam James

commit: e92c7450b0fa6d97375ce254b34bae656ed3da7f
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 25 06:41:54 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 25 06:41:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e92c7450

sys-apps/iproute2: Stabilize 6.8.0-r2 ppc, #934869

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.8.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild 
b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
index dd733559c8a1..6c0325660d66 100644
--- a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-06-25 Thread Sam James

commit: 148dae515335031e5a9f455a476d115000998aa3
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 25 06:41:52 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 25 06:41:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=148dae51

sys-apps/iproute2: Stabilize 6.8.0-r2 amd64, #934869

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.8.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild 
b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
index 88e134545dfa..471ca02cfcc9 100644
--- a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-06-24 Thread Sam James

commit: 91388747bfda0eb01718dc0f5dea0912041bbe8e
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 25 04:39:21 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 25 04:39:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91388747

sys-apps/iproute2: Stabilize 6.8.0-r2 x86, #934869

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.8.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild 
b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
index 5bba0cdfa717..88e134545dfa 100644
--- a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-06-24 Thread Sam James

commit: 11b6e7236f927040083ae25d1f9a3db90cb77e34
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 25 04:39:20 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 25 04:39:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11b6e723

sys-apps/iproute2: Stabilize 6.8.0-r2 ppc64, #934869

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.8.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild 
b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
index d9214517d852..5bba0cdfa717 100644
--- a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-06-24 Thread Sam James

commit: 0667513f2464e4b5768bf570ab05e478728c1ac1
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 25 04:13:53 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 25 04:13:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0667513f

sys-apps/iproute2: Stabilize 6.8.0-r2 arm64, #934869

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.8.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild 
b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
index 929b8d25abc3..d9214517d852 100644
--- a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-06-24 Thread Sam James

commit: b2f1655aef3a3ceb69f6471e5244e9a106cb84d5
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 25 04:06:20 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 25 04:06:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2f1655a

sys-apps/iproute2: Stabilize 6.8.0-r2 arm, #934869

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.8.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild 
b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
index d74ccd7658b0..929b8d25abc3 100644
--- a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-05-27 Thread Sam James

commit: ab8bcf8ca7241b8d2218790f2f41fd6f0759d62b
Author: Gabi Falk  gmx  com>
AuthorDate: Sun May 26 08:00:00 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 28 01:53:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab8bcf8c

sys-apps/iproute2: 6.9.0: fix compilation on musl-based systems with C99

Closes: https://bugs.gentoo.org/932617
Signed-off-by: Gabi Falk  gmx.com>
Closes: https://github.com/gentoo/gentoo/pull/36830
Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.9.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-apps/iproute2/iproute2-6.9.0.ebuild 
b/sys-apps/iproute2/iproute2-6.9.0.ebuild
index 3d0c9ec799da..94334695f4ff 100644
--- a/sys-apps/iproute2/iproute2-6.9.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.9.0.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.9.0-mtu.patch # bug #291907
"${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug 
#643722 & #911727
"${FILESDIR}"/${PN}-6.8.0-disable-libbsd-fallback.patch # bug #911727
+   "${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622 & #932617
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/, sys-apps/iproute2/

2024-05-21 Thread Sam James

commit: f51d73e7859d3df6589908082be198bdc34e4871
Author: Gabi Falk  gmx  com>
AuthorDate: Sat May 11 09:00:00 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 21 11:48:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f51d73e7

sys-apps/iproute2: fix compilation on musl-based systems with modern C (C99)

Closes: https://bugs.gentoo.org/922622
Signed-off-by: Gabi Falk  gmx.com>
Closes: https://github.com/gentoo/gentoo/pull/36638
Signed-off-by: Sam James  gentoo.org>

 .../iproute2/files/iproute2-6.6.0-musl-c99.patch   | 75 ++
 sys-apps/iproute2/iproute2-6.6.0-r1.ebuild |  1 +
 sys-apps/iproute2/iproute2-6.6.0-r3.ebuild |  1 +
 sys-apps/iproute2/iproute2-6.6.0.ebuild|  1 +
 sys-apps/iproute2/iproute2-6.8.0-r2.ebuild |  1 +
 5 files changed, 79 insertions(+)

diff --git a/sys-apps/iproute2/files/iproute2-6.6.0-musl-c99.patch 
b/sys-apps/iproute2/files/iproute2-6.6.0-musl-c99.patch
new file mode 100644
index ..c277bd6d1128
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-6.6.0-musl-c99.patch
@@ -0,0 +1,75 @@
+From 12416003e4c691afc732d26f0a07c3890c24b396 Mon Sep 17 00:00:00 2001
+From: Gabi Falk 
+Date: Fri, 10 May 2024 14:36:12 +
+Subject: [PATCH] bridge/vlan.c: bridge/vlan.c: fix build with gcc 14 on musl
+ systems
+
+On glibc based systems the definition of 'struct timeval' is pulled in
+with inclusion of  header, but on musl based systems it
+doesn't work this way.  Missing definition triggers an
+incompatible-pointer-types error with gcc 14 (warning on previous
+versions of gcc):
+
+../include/json_print.h:80:30: warning: 'struct timeval' declared inside 
parameter list will not be visible outside of this definition or declaration
+   80 | _PRINT_FUNC(tv, const struct timeval *)
+  |  ^~~
+../include/json_print.h:50:37: note: in definition of macro '_PRINT_FUNC'
+   50 | type value);   
 \
+  | ^~~~
+../include/json_print.h:80:30: warning: 'struct timeval' declared inside 
parameter list will not be visible outside of this definition or declaration
+   80 | _PRINT_FUNC(tv, const struct timeval *)
+  |  ^~~
+../include/json_print.h:55:45: note: in definition of macro '_PRINT_FUNC'
+   55 | type value)
 \
+  | ^~~~
+../include/json_print.h: In function 'print_tv':
+../include/json_print.h:58:48: error: passing argument 5 of 'print_color_tv' 
from incompatible pointer type [-Wincompatible-pointer-types]
+   58 |value); 
 \
+  |^
+  ||
+  |const struct timeval *
+
+Link: 
https://lore.kernel.org/netdev/20240510143613.1531283-1-gabif...@gmx.com/T/#u
+Signed-off-by: Gabi Falk 
+---
+ bridge/vlan.c | 1 +
+ bridge/vni.c  | 1 +
+ vdpa/vdpa.c   | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/bridge/vlan.c b/bridge/vlan.c
+index 5352eb24..0a7e6c45 100644
+--- a/bridge/vlan.c
 b/bridge/vlan.c
+@@ -4,6 +4,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff --git a/bridge/vni.c b/bridge/vni.c
+index a7abe6de..e1f981fc 100644
+--- a/bridge/vni.c
 b/bridge/vni.c
+@@ -10,6 +10,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff --git a/vdpa/vdpa.c b/vdpa/vdpa.c
+index 6e4a9c11..43f87824 100644
+--- a/vdpa/vdpa.c
 b/vdpa/vdpa.c
+@@ -3,6 +3,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild
index f56e79070a8f..816d583a2935 100644
--- a/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild
@@ -53,6 +53,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
"${FILESDIR}"/${PN}-6.4.0-disable-libbsd-fallback.patch # bug #911727

"${FILESDIR}"/${PN}-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch
+   "${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622
 )
 
 src_prepare() {

diff --git a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
index fc029883a9e9..9a1ab6a3936e 100644
--- a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
@@ -55,6 +55,7 @@ PATCHES=(

"${FILESDIR}"/${PN}-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch
"${FILESDIR}"/${PN}-6.6.0-revert-CONF_USR_DIR.patch
"${FILESDIR}"/${PN}-6.6.0-makefile-use-usr-share-config.patch
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/

2024-05-13 Thread Patrick McLean

commit: 98a56c6f56e4d687a04807cf0ab190d21f822ec8
Author: Patrick McLean  gentoo  org>
AuthorDate: Mon May 13 17:35:22 2024 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Mon May 13 17:35:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98a56c6f

sys-apps/iproute2: add 6.9.0

Signed-off-by: Patrick McLean  gentoo.org>

 sys-apps/iproute2/Manifest   |   1 +
 sys-apps/iproute2/files/iproute2-6.9.0-mtu.patch |  32 
 sys-apps/iproute2/iproute2-6.9.0.ebuild  | 212 +++
 3 files changed, 245 insertions(+)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 3fdc9c03c957..2a9a6839c2a8 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,2 +1,3 @@
 DIST iproute2-6.6.0.tar.xz 917964 BLAKE2B 
9d20f19c04c2bbde7a3ae53e61e4623b119570c8446f34b93ddadd64677caa432e00ee085498bc277e0842cc2124340c7100925106d0ef2c11dd8002aacac08f
 SHA512 
21c99a3ba8e1d0047933e99b48fb00901eef18899cd5854000ae910d9d84d13aeafa48b32184775531285782909f4d283d0784491691a1f10462dab147de359d
 DIST iproute2-6.8.0.tar.xz 913512 BLAKE2B 
d30cdff8522627c27c9165f068f42adbec38f15548a8f2cd31276f283880dc402e10c5989e7227e80cdc891bcc4a574b330d634ae550e689758b849c0506c31f
 SHA512 
54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0
+DIST iproute2-6.9.0.tar.xz 918144 BLAKE2B 
a7434a2537a55b4875db0e3cc35383dfe4d0c8a118a8a1102c4076bfb154c9c2ab0781dcff324fa18ce7cfde798bf332a9e0ff08003ff39acbb8129b597a93a6
 SHA512 
1cbb234cb8f94213c3529f0b74fed5a575ff1fb838e783b8d2b440643c2e91246eda42e9b26e9775897aadb8b8133d199b2851b8ea0df06a899dc02acf403325

diff --git a/sys-apps/iproute2/files/iproute2-6.9.0-mtu.patch 
b/sys-apps/iproute2/files/iproute2-6.9.0-mtu.patch
new file mode 100644
index ..0e80ea122e06
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-6.9.0-mtu.patch
@@ -0,0 +1,32 @@
+diff --git a/tc/tc_core.c b/tc/tc_core.c
+index 37547e9b..58234c9f 100644
+--- a/tc/tc_core.c
 b/tc/tc_core.c
+@@ -188,12 +188,12 @@ int tc_calc_size_table(struct tc_sizespec *s, __u16 
**stab)
+   }
+ 
+   if (s->mtu == 0)
+-  s->mtu = 2047;
++  s->mtu = 2048;
+   if (s->tsize == 0)
+   s->tsize = 512;
+ 
+   s->cell_log = 0;
+-  while ((s->mtu >> s->cell_log) > s->tsize - 1)
++  while (((s->mtu - 1) >> s->cell_log) > s->tsize - 1)
+   s->cell_log++;
+ 
+   *stab = malloc(s->tsize * sizeof(__u16));
+diff --git a/tc/tc_stab.c b/tc/tc_stab.c
+index a7733726..f4ffd618 100644
+--- a/tc/tc_stab.c
 b/tc/tc_stab.c
+@@ -27,7 +27,7 @@ static void stab_help(void)
+   fprintf(stderr,
+   "Usage: ... stab [ mtu BYTES ] [ tsize SLOTS ] [ mpu BYTES ]\n"
+   "[ overhead BYTES ] [ linklayer TYPE ] ...\n"
+-  "   mtu   : max packet size we create rate map for {2047}\n"
++  "   mtu   : max packet size we create size table for 
{2048}\n"
+   "   tsize : how many slots should size table have {512}\n"
+   "   mpu   : minimum packet size used in rate computations\n"
+   "   overhead  : per-packet size overhead used in rate 
computations\n"

diff --git a/sys-apps/iproute2/iproute2-6.9.0.ebuild 
b/sys-apps/iproute2/iproute2-6.9.0.ebuild
new file mode 100644
index ..3d0c9ec799da
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-6.9.0.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs flag-o-matic
+
+if [[ ${PV} ==  ]] ; then
+   
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;
+   inherit git-r3
+else
+   SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~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 bpf caps elf +iptables minimal nfs selinux"
+# Needs root
+RESTRICT="test"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+   !net-misc/arpd
+   !minimal? ( net-libs/libmnl:= )
+   atm? ( net-dialup/linux-atm )
+   berkdb? ( sys-libs/db:= )
+   bpf? ( dev-libs/libbpf:= )
+   caps? ( sys-libs/libcap )
+   elf? ( virtual/libelf:= )
+   iptables? ( >=net-firewall/iptables-1.4.20:= )
+   nfs? ( net-libs/libtirpc:= )
+   selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support (bug #549948) and some 
defines (bug #553876)
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+   app-arch/xz-utils
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-04-12 Thread Patrick McLean

commit: f0ac63de535b1fa54978114ecc07deb1c2c6c17c
Author: Patrick McLean  gentoo  org>
AuthorDate: Fri Apr 12 19:10:26 2024 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Fri Apr 12 19:10:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ac63de

sys-apps/iproute2: Remove split-usr again

Was basing the 6.8.0 off the 6.6.0 ebuild, not the 6.6.0-r3.

Signed-off-by: Patrick McLean  gentoo.org>

 .../{iproute2-6.8.0-r1.ebuild => iproute2-6.8.0-r2.ebuild} | 10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/sys-apps/iproute2/iproute2-6.8.0-r1.ebuild 
b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
similarity index 95%
rename from sys-apps/iproute2/iproute2-6.8.0-r1.ebuild
rename to sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
index bfc78c186a70..c5ab1aee142e 100644
--- a/sys-apps/iproute2/iproute2-6.8.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild
@@ -18,7 +18,7 @@ 
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux split-usr"
+IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux"
 # Needs root
 RESTRICT="test"
 
@@ -192,6 +192,7 @@ src_install() {
 
dodir /bin
mv "${ED}"/{s,}bin/ip || die # bug #330115
+   mv "${ED}"/{s,}bin/ss || die # bug #547264
 
dolib.a lib/libnetlink.a
insinto /usr/include
@@ -201,13 +202,6 @@ src_install() {
# https://bugs.gentoo.org/868321
mv "${ED}"/sbin/ifstat{,-iproute2} || die
 
-   if use split-usr ; then
-   # Can remove compatibility symlink in a year: 2023-05-28.
-   # bug #547264
-   mv "${ED}"/sbin/ss "${ED}"/bin/ss || die
-   dosym -r /bin/ss /sbin/ss
-   fi
-
if use berkdb ; then
keepdir /var/lib/arpd
# bug #47482, arpd doesn't need to be in /sbin

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-04-12 Thread Patrick McLean

commit: fa4b2ce183709b43eb99927af4b18a2e4aede276
Author: Patrick McLean  gentoo  org>
AuthorDate: Fri Apr 12 17:46:13 2024 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Fri Apr 12 17:46:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa4b2ce1

sys-apps/iproute2: Sync  with 6.8.0-r1

Signed-off-by: Patrick McLean  gentoo.org>

 sys-apps/iproute2/iproute2-.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-.ebuild 
b/sys-apps/iproute2/iproute2-.ebuild
index f8e1ae63ceec..bfc78c186a70 100644
--- a/sys-apps/iproute2/iproute2-.ebuild
+++ b/sys-apps/iproute2/iproute2-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit edo toolchain-funcs
+inherit edo toolchain-funcs flag-o-matic
 
 if [[ ${PV} ==  ]] ; then

EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;
@@ -104,6 +104,11 @@ src_configure() {
fi
popd >/dev/null || die
 
+   # build system does not pass CFLAGS to LDFLAGS, as is recommended by 
GCC upstream
+   # https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html#index-flto
+   # https://bugs.gentoo.org/929233
+   append-ldflags ${CFLAGS}
+
# run "configure" script first which will create "config.mk"...
# Using econf breaks since 5.14.0 
(a9c3d70d902a0473ee5c13336317006a52ce8242)
edo ./configure --color=auto --libbpf_force $(usex bpf on off)

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-04-12 Thread Patrick McLean

commit: b9442bb7d4da6f324a2830b20269f930b4fb8ccb
Author: Patrick McLean  gentoo  org>
AuthorDate: Fri Apr 12 17:40:05 2024 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Fri Apr 12 17:41:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9442bb7

sys-apps/iproute2: Make sure that CFLAGS is in LDFLAGS

Upstream build system does not automatically add it, and GCC recommends that
CFLAGS always be in LDFLAGS.

Upstream GCC recommendation is here:
https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html#index-flto

Bug: https://bugs.gentoo.org/929233
Signed-off-by: Patrick McLean  gentoo.org>

 .../iproute2/{iproute2-6.8.0.ebuild => iproute2-6.8.0-r1.ebuild}   | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.8.0.ebuild 
b/sys-apps/iproute2/iproute2-6.8.0-r1.ebuild
similarity index 95%
rename from sys-apps/iproute2/iproute2-6.8.0.ebuild
rename to sys-apps/iproute2/iproute2-6.8.0-r1.ebuild
index f8e1ae63ceec..bfc78c186a70 100644
--- a/sys-apps/iproute2/iproute2-6.8.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.8.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit edo toolchain-funcs
+inherit edo toolchain-funcs flag-o-matic
 
 if [[ ${PV} ==  ]] ; then

EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;
@@ -104,6 +104,11 @@ src_configure() {
fi
popd >/dev/null || die
 
+   # build system does not pass CFLAGS to LDFLAGS, as is recommended by 
GCC upstream
+   # https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html#index-flto
+   # https://bugs.gentoo.org/929233
+   append-ldflags ${CFLAGS}
+
# run "configure" script first which will create "config.mk"...
# Using econf breaks since 5.14.0 
(a9c3d70d902a0473ee5c13336317006a52ce8242)
edo ./configure --color=auto --libbpf_force $(usex bpf on off)

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/, sys-apps/iproute2/

2024-04-12 Thread Patrick McLean

commit: c7120ac28e255ba135c0fa5b9808a66104e6d6b8
Author: Patrick McLean  gentoo  org>
AuthorDate: Fri Apr 12 17:07:10 2024 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Fri Apr 12 17:22:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7120ac2

sys-apps/iproute2: add 6.8.0

Signed-off-by: Patrick McLean  gentoo.org>

 sys-apps/iproute2/Manifest |   1 +
 ...iproute2-6.8.0-configure-nomagic-nolibbsd.patch | 243 +
 .../iproute2-6.8.0-disable-libbsd-fallback.patch   |  25 +++
 sys-apps/iproute2/iproute2-6.8.0.ebuild| 214 ++
 4 files changed, 483 insertions(+)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 2b69febe4c67..3fdc9c03c957 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1 +1,2 @@
 DIST iproute2-6.6.0.tar.xz 917964 BLAKE2B 
9d20f19c04c2bbde7a3ae53e61e4623b119570c8446f34b93ddadd64677caa432e00ee085498bc277e0842cc2124340c7100925106d0ef2c11dd8002aacac08f
 SHA512 
21c99a3ba8e1d0047933e99b48fb00901eef18899cd5854000ae910d9d84d13aeafa48b32184775531285782909f4d283d0784491691a1f10462dab147de359d
+DIST iproute2-6.8.0.tar.xz 913512 BLAKE2B 
d30cdff8522627c27c9165f068f42adbec38f15548a8f2cd31276f283880dc402e10c5989e7227e80cdc891bcc4a574b330d634ae550e689758b849c0506c31f
 SHA512 
54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0

diff --git 
a/sys-apps/iproute2/files/iproute2-6.8.0-configure-nomagic-nolibbsd.patch 
b/sys-apps/iproute2/files/iproute2-6.8.0-configure-nomagic-nolibbsd.patch
new file mode 100644
index ..04ef44ad826e
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-6.8.0-configure-nomagic-nolibbsd.patch
@@ -0,0 +1,243 @@
+The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
+a variable as well as modifying CFLAGS & LDLIBS.
+
+If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
+are still in place.
+
+Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
+are only passed when correctly needed.
+
+Prior Gentoo testcase for reproduction:
+USE=minimal ebuild ... compile.
+- Linking with libbsd, libelf, libmnl & libcap based only on presence.
+- Links based on libselinux based only on presence.
+
+Closes: https://bugs.gentoo.org/643722
+Signed-off-by: Robin H. Johnson 
+
+Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler 

+Added libcap to v4.17.0 by Lars Wendler 
+Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler 

+Forward-ported from v4.20.0 to v5.11.0 by Lars Wendler 

+Forward-ported from v5.11.0 to v5.12.0 by Lars Wendler 

+
+Update 2023-09-05: Removed libbsd enforcement from config.include for bug 
#911727
+by Holger Hoffstätte 
+
+--- a/config.include
 b/config.include
+@@ -0,0 +1,26 @@
++# We can only modify CFLAGS/LDLIBS after all the config options are known.
++ifeq ($(IP_CONFIG_SETNS),y)
++  CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
++endif
++ifeq ($(HAVE_ELF),y)
++  CFLAGS += $(HAVE_ELF_CFLAGS)
++  LDLIBS += $(HAVE_ELF_LDLIBS)
++endif
++ifeq ($(HAVE_SELINUX),y)
++  CFLAGS += $(HAVE_SELINUX_CFLAGS)
++  LDLIBS += $(HAVE_SELINUX_LDLIBS)
++endif
++ifeq ($(HAVE_MNL),y)
++  CFLAGS += $(HAVE_MNL_CFLAGS)
++  LDLIBS += $(HAVE_MNL_LDLIBS)
++endif
++ifeq ($(HAVE_CAP),y)
++  CFLAGS += $(HAVE_CAP_CFLAGS)
++  LDLIBS += $(HAVE_CAP_LDLIBS)
++endif
++
++# Rules can only be declared after all variables in them are known.
++%.o: %.c
++  $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<
++
++# vim: ft=make:
+
+--- a/bridge/Makefile
 b/bridge/Makefile
+@@ -2,6 +2,7 @@
+ BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o vni.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ all: bridge
+ 
+--- a/configure
 b/configure
+@@ -154,7 +154,7 @@ EOF
+ if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 
2>&1; then
+   echo "IP_CONFIG_SETNS:=y" >>$CONFIG
+   echo "yes"
+-  echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
++  echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
+ else
+   echo "no"
+ fi
+@@ -221,8 +221,8 @@ check_elf()
+   echo "HAVE_ELF:=y" >>$CONFIG
+   echo "yes"
+ 
+-  echo 'CFLAGS += -DHAVE_ELF' "$(${PKG_CONFIG} libelf --cflags)" >> 
$CONFIG
+-  echo 'LDLIBS += ' "$(${PKG_CONFIG} libelf --libs)" >>$CONFIG
++  echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' "$(${PKG_CONFIG} libelf --cflags)" 
>> $CONFIG
++  echo 'HAVE_ELF_LDLIBS += ' "$(${PKG_CONFIG} libelf --libs)" >>$CONFIG
+ else
+   echo "no"
+ fi
+@@ -340,8 +340,8 @@ check_selinux()
+   echo "HAVE_SELINUX:=y" >>$CONFIG
+   echo "yes"
+ 
+-  echo 'LDLIBS +=' "$(${PKG_CONFIG} --libs libselinux)" >>$CONFIG
+-  echo 'CFLAGS += -DHAVE_SELINUX' "$(${PKG_CONFIG} --cflags 
libselinux)" >>$CONFIG
++

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-04-12 Thread Patrick McLean

commit: 097997d99f602be5a785130ed5aa1bd5afe705af
Author: Patrick McLean  gentoo  org>
AuthorDate: Fri Apr 12 17:07:59 2024 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Fri Apr 12 17:22:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=097997d9

sys-apps/iproute2: Sync  with 6.8.0

Signed-off-by: Patrick McLean  gentoo.org>

 sys-apps/iproute2/iproute2-.ebuild | 16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/sys-apps/iproute2/iproute2-.ebuild 
b/sys-apps/iproute2/iproute2-.ebuild
index 0d61a15abbfe..f8e1ae63ceec 100644
--- a/sys-apps/iproute2/iproute2-.ebuild
+++ b/sys-apps/iproute2/iproute2-.ebuild
@@ -18,7 +18,7 @@ 
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux"
+IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux split-usr"
 # Needs root
 RESTRICT="test"
 
@@ -49,9 +49,9 @@ BDEPEND="
 
 PATCHES=(
"${FILESDIR}"/${PN}-6.5.0-mtu.patch # bug #291907
-   "${FILESDIR}"/${PN}-6.5.0-configure-nomagic-nolibbsd.patch # bug 
#643722 & #911727
+   "${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug 
#643722 & #911727
"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
-   "${FILESDIR}"/${PN}-6.4.0-disable-libbsd-fallback.patch # bug #911727
+   "${FILESDIR}"/${PN}-6.8.0-disable-libbsd-fallback.patch # bug #911727
 )
 
 src_prepare() {
@@ -106,7 +106,7 @@ src_configure() {
 
# run "configure" script first which will create "config.mk"...
# Using econf breaks since 5.14.0 
(a9c3d70d902a0473ee5c13336317006a52ce8242)
-   edo ./configure --libbpf_force $(usex bpf on off)
+   edo ./configure --color=auto --libbpf_force $(usex bpf on off)
 
# Remove the definitions made by configure and allow them to be 
overridden
# by USE flags below.
@@ -187,7 +187,6 @@ src_install() {
 
dodir /bin
mv "${ED}"/{s,}bin/ip || die # bug #330115
-   mv "${ED}"/{s,}bin/ss || die # bug #547264
 
dolib.a lib/libnetlink.a
insinto /usr/include
@@ -197,6 +196,13 @@ src_install() {
# https://bugs.gentoo.org/868321
mv "${ED}"/sbin/ifstat{,-iproute2} || die
 
+   if use split-usr ; then
+   # Can remove compatibility symlink in a year: 2023-05-28.
+   # bug #547264
+   mv "${ED}"/sbin/ss "${ED}"/bin/ss || die
+   dosym -r /bin/ss /sbin/ss
+   fi
+
if use berkdb ; then
keepdir /var/lib/arpd
# bug #47482, arpd doesn't need to be in /sbin

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-02-22 Thread Arthur Zamarin

commit: 1f3fda4a39e4454386cf673e5fb3dc2dd873fd0c
Author: Matoro Mahri  matoro  tk>
AuthorDate: Thu Feb 22 04:53:09 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Feb 22 20:32:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f3fda4a

sys-apps/iproute2: Stabilize 6.6.0-r3 hppa, #923860

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/iproute2/iproute2-6.6.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
index 146963fc9afa..fc029883a9e9 100644
--- a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-02-05 Thread Sam James

commit: 17a8eb0f274581b65c96b8bbf5cec0b13180384e
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 07:24:48 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 07:24:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17a8eb0f

sys-apps/iproute2: Stabilize 6.6.0-r3 sparc, #923860

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.6.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
index 52ae20064580..05f13e61df05 100644
--- a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-02-05 Thread Sam James

commit: d8fa250532e9cc64ca99175be973015bee968725
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 07:24:49 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 07:24:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8fa2505

sys-apps/iproute2: Stabilize 6.6.0-r3 arm, #923860

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.6.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
index 05f13e61df05..146963fc9afa 100644
--- a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-02-05 Thread Sam James

commit: c7e0a57eb1d2c7a1c0a3b796a996eedba5d2f06f
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 06:53:53 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 06:53:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7e0a57e

sys-apps/iproute2: Stabilize 6.6.0-r3 arm64, #923860

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.6.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
index dc562f27f51c..52ae20064580 100644
--- a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-02-05 Thread Sam James

commit: d1a5fd5326d4f532e5f082713939d7194b494a0b
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 06:47:08 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 06:47:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1a5fd53

sys-apps/iproute2: Stabilize 6.6.0-r3 ppc64, #923860

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.6.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
index 7bc648f5a920..6ae595dfae96 100644
--- a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-02-05 Thread Sam James

commit: 084bb3e12d760d2ba0b576f4ec382281b3bca0b4
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 06:47:09 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 06:47:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=084bb3e1

sys-apps/iproute2: Stabilize 6.6.0-r3 ppc, #923860

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.6.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
index 6ae595dfae96..dc562f27f51c 100644
--- a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-02-05 Thread Sam James

commit: bab7f3535cfed0d55f51c8a05023d22455b983f0
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 06:23:43 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 06:23:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bab7f353

sys-apps/iproute2: Stabilize 6.6.0-r3 x86, #923860

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.6.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
index a924d07f50fd..7bc648f5a920 100644
--- a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2024-02-05 Thread Sam James

commit: 3aa63bcaca290ceef09c7bf3f87c7e87dffa6957
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 06:16:29 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 06:16:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aa63bca

sys-apps/iproute2: Stabilize 6.6.0-r3 amd64, #923860

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.6.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
index 74cbbc79ddde..a924d07f50fd 100644
--- a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-12-31 Thread Sam James

commit: 735edc3bf64c10afba704da20a3af056d7ad73ba
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon Jan  1 01:42:25 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan  1 01:51:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=735edc3b

sys-apps/iproute2: drop old compat symlink and USE=split-usr hack

As promised in the ebuild comments, we can now remove the compatibility
symlink from /sbin -> /bin.

While we are at it, don't do the move conditional on split-usr. Arguably
only the symlink should have been conditionalized on this way back
when... we already move another binary too in the same way, but without
any conditional.

Bug: https://bugs.gentoo.org/547264
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../{iproute2-6.6.0-r2.ebuild => iproute2-6.6.0-r3.ebuild} | 10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/sys-apps/iproute2/iproute2-6.6.0-r2.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
similarity index 95%
rename from sys-apps/iproute2/iproute2-6.6.0-r2.ebuild
rename to sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
index 796a1c1367b1..5254f12bbe45 100644
--- a/sys-apps/iproute2/iproute2-6.6.0-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild
@@ -18,7 +18,7 @@ 
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux split-usr"
+IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux"
 # Needs root
 RESTRICT="test"
 
@@ -190,6 +190,7 @@ src_install() {
 
dodir /bin
mv "${ED}"/{s,}bin/ip || die # bug #330115
+   mv "${ED}"/{s,}bin/ss || die # bug #547264
 
dolib.a lib/libnetlink.a
insinto /usr/include
@@ -199,13 +200,6 @@ src_install() {
# https://bugs.gentoo.org/868321
mv "${ED}"/sbin/ifstat{,-iproute2} || die
 
-   if use split-usr ; then
-   # Can remove compatibility symlink in a year: 2023-05-28.
-   # bug #547264
-   mv "${ED}"/sbin/ss "${ED}"/bin/ss || die
-   dosym -r /bin/ss /sbin/ss
-   fi
-
if use berkdb ; then
keepdir /var/lib/arpd
# bug #47482, arpd doesn't need to be in /sbin

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-12-31 Thread Sam James

commit: 02ba1ab26a4a4809c3ed7ca94923f9110b6e46a3
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan  1 01:51:56 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan  1 01:51:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02ba1ab2

sys-apps/iproute2: sync live

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-.ebuild | 12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/sys-apps/iproute2/iproute2-.ebuild 
b/sys-apps/iproute2/iproute2-.ebuild
index d61eddc9d7ae..c57d9bd65cfd 100644
--- a/sys-apps/iproute2/iproute2-.ebuild
+++ b/sys-apps/iproute2/iproute2-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ 
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux split-usr"
+IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux"
 # Needs root
 RESTRICT="test"
 
@@ -187,6 +187,7 @@ src_install() {
 
dodir /bin
mv "${ED}"/{s,}bin/ip || die # bug #330115
+   mv "${ED}"/{s,}bin/ss || die # bug #547264
 
dolib.a lib/libnetlink.a
insinto /usr/include
@@ -196,13 +197,6 @@ src_install() {
# https://bugs.gentoo.org/868321
mv "${ED}"/sbin/ifstat{,-iproute2} || die
 
-   if use split-usr ; then
-   # Can remove compatibility symlink in a year: 2023-05-28.
-   # bug #547264
-   mv "${ED}"/sbin/ss "${ED}"/bin/ss || die
-   dosym -r /bin/ss /sbin/ss
-   fi
-
if use berkdb ; then
keepdir /var/lib/arpd
# bug #47482, arpd doesn't need to be in /sbin

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/

2023-12-27 Thread Sam James

commit: e3c47497d87f81047266c2eb95057ab8c57f7685
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 02:14:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 02:14:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3c47497

sys-apps/iproute2: drop 6.4.0, 6.4.0-r1, 6.5.0

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/Manifest |   2 -
 sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch   |  48 
 ...proute2-5.12.0-configure-nomagic-nolibbsd.patch | 242 
 .../files/iproute2-5.12.0-configure-nomagic.patch  | 245 -
 ...route2-6.4.0-add-missing-limits.h-include.patch |  22 --
 sys-apps/iproute2/iproute2-6.4.0-r1.ebuild | 215 --
 sys-apps/iproute2/iproute2-6.4.0.ebuild| 220 --
 sys-apps/iproute2/iproute2-6.5.0.ebuild| 214 --
 sys-apps/iproute2/metadata.xml |   1 -
 9 files changed, 1209 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 3f38b2833dde..2b69febe4c67 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,3 +1 @@
-DIST iproute2-6.4.0.tar.xz 922164 BLAKE2B 
76369d2a794afd13dba1a34ee9a7425775bb7b43c22164274749c01b18d061669aa5abd51d32a15d68f48e75f4837a887dfc28ea41e34d8e4c36b2ab865628dd
 SHA512 
42330be6e061302694ea301765ff8d3cbfaeca4b1d06e39778861e4390ed211c03cb2d41498190202b659f7f5647b1ca4857410ef8c16fd601a35e7162788d21
-DIST iproute2-6.5.0.tar.xz 925940 BLAKE2B 
537a956c2fb59df25e90d7899a981e5408c5ee029df2bb87461b899ecf8fe4424a1db5d1b1b67a67bdb2555f6cc4aaf099b0544a2c92ffc3843adc3d17defb96
 SHA512 
615ba6924becdf08af3f491d347d84897ff0198426d65b194c87146c4527b0856fc51688b59834abe1cb6f9a70b93c66ff7ade6b7c305c1ece0fd6a29df6bc54
 DIST iproute2-6.6.0.tar.xz 917964 BLAKE2B 
9d20f19c04c2bbde7a3ae53e61e4623b119570c8446f34b93ddadd64677caa432e00ee085498bc277e0842cc2124340c7100925106d0ef2c11dd8002aacac08f
 SHA512 
21c99a3ba8e1d0047933e99b48fb00901eef18899cd5854000ae910d9d84d13aeafa48b32184775531285782909f4d283d0784491691a1f10462dab147de359d

diff --git a/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch 
b/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch
deleted file mode 100644
index fa12dad2d79e..
--- a/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-http://bugs.gentoo.org/291907
-
-This patch was merged from two patches extracted from this thread:
-http://markmail.org/thread/qkd76gpdgefpjlfn
-
-tc_stab.c: small fixes to commandline help
-
-
-tc_core.c:
-As kernel part of things relies on cell align which is always set to -1,
-I also added it to userspace computation stage. This way if someone
-specified e.g. 2048 and 512 for mtu and tsize respectively, one wouldn't
-end with tsize supporting mtu 4096 suddenly, New default mtu is also set
-to 2048 (disregarding weirdness of setting mtu to such values).
-
-
-Unless I missed something, this is harmless and feels cleaner, but if it's
-not allowed, documentation will have to be changed back to 2047 + extra
-explanation as well.
-
 iproute2/tc/tc_core.c
-+++ iproute2/tc/tc_core.c
-@@ -155,12 +155,12 @@
-   }
- 
-   if (s->mtu == 0)
--  s->mtu = 2047;
-+  s->mtu = 2048;
-   if (s->tsize == 0)
-   s->tsize = 512;
- 
-   s->cell_log = 0;
--  while ((s->mtu >> s->cell_log) > s->tsize - 1)
-+  while ((s->mtu - 1 >> s->cell_log) > s->tsize - 1)
-   s->cell_log++;
- 
-   *stab = malloc(s->tsize * sizeof(__u16));
 iproute2/tc/tc_stab.c
-+++ iproute2/tc/tc_stab.c
-@@ -32,7 +32,7 @@
-   fprintf(stderr,
-   "Usage: ... stab [ mtu BYTES ] [ tsize SLOTS ] [ mpu BYTES ] \n"
-   "[ overhead BYTES ] [ linklayer TYPE ] ...\n"
--  "   mtu   : max packet size we create rate map for {2047}\n"
-+  "   mtu   : max packet size we create size table for 
{2048}\n"
-   "   tsize : how many slots should size table have {512}\n"
-   "   mpu   : minimum packet size used in rate computations\n"
-   "   overhead  : per-packet size overhead used in rate 
computations\n"

diff --git 
a/sys-apps/iproute2/files/iproute2-5.12.0-configure-nomagic-nolibbsd.patch 
b/sys-apps/iproute2/files/iproute2-5.12.0-configure-nomagic-nolibbsd.patch
deleted file mode 100644
index 4f88da3c20c5..
--- a/sys-apps/iproute2/files/iproute2-5.12.0-configure-nomagic-nolibbsd.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
-a variable as well as modifying CFLAGS & LDLIBS.
-
-If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
-are still in place.
-
-Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
-are only passed when correctly needed.
-
-Prior Gentoo

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/, sys-apps/iproute2/

2023-12-27 Thread Sam James

commit: 8bbe322a85ffd86df4af61222d677808ce5b2ee6
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 02:17:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 02:17:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bbe322a

sys-apps/iproute2: fix config location

Backport the suggested commits in the bug to install default configuration files
to /usr/share where they belong.

Closes: https://bugs.gentoo.org/920054
Signed-off-by: Sam James  gentoo.org>

 ...oute2-6.6.0-makefile-use-usr-share-config.patch |  57 ++
 .../files/iproute2-6.6.0-revert-CONF_USR_DIR.patch |  38 
 sys-apps/iproute2/iproute2-6.6.0-r2.ebuild | 217 +
 3 files changed, 312 insertions(+)

diff --git 
a/sys-apps/iproute2/files/iproute2-6.6.0-makefile-use-usr-share-config.patch 
b/sys-apps/iproute2/files/iproute2-6.6.0-makefile-use-usr-share-config.patch
new file mode 100644
index ..03c125accc8c
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-6.6.0-makefile-use-usr-share-config.patch
@@ -0,0 +1,57 @@
+https://bugs.gentoo.org/920054
+https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=962692356a1cc41932e43575f3c50927e455ab53
+
+From 962692356a1cc41932e43575f3c50927e455ab53 Mon Sep 17 00:00:00 2001
+From: Andrea Claudi 
+Date: Wed, 15 Nov 2023 18:25:35 +0100
+Subject: Makefile: use /usr/share/iproute2 for config files
+
+According to FHS:
+
+"/usr/lib includes object files and libraries. On some systems, it may
+also include internal binaries that are not intended to be executed
+directly by users or shell scripts."
+
+A better directory to store config files is /usr/share:
+
+"The /usr/share hierarchy is for all read-only architecture independent
+data files.
+
+This hierarchy is intended to be shareable among all architecture
+platforms of a given OS; thus, for example, a site with i386, Alpha, and
+PPC platforms might maintain a single /usr/share directory that is
+centrally-mounted."
+
+Accordingly, move configuration files to $(DATADIR)/iproute2.
+
+Fixes: 946753a4459b ("Makefile: ensure CONF_USR_DIR honours the libdir config")
+Reported-by: Luca Boccassi 
+Signed-off-by: Andrea Claudi 
+Acked-by: Luca Boccassi 
+Reviewed-by: Simon Horman 
+Signed-off-by: Stephen Hemminger 
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a24844cf0..8024d45ec 100644
+--- a/Makefile
 b/Makefile
+@@ -16,12 +16,12 @@ endif
+ 
+ PREFIX?=/usr
+ SBINDIR?=/sbin
+-CONF_ETC_DIR?=/etc/iproute2
+-CONF_USR_DIR?=$(PREFIX)/lib/iproute2
+ NETNS_RUN_DIR?=/var/run/netns
+ NETNS_ETC_DIR?=/etc/netns
+ DATADIR?=$(PREFIX)/share
+ HDRDIR?=$(PREFIX)/include/iproute2
++CONF_ETC_DIR?=/etc/iproute2
++CONF_USR_DIR?=$(DATADIR)/iproute2
+ DOCDIR?=$(DATADIR)/doc/iproute2
+ MANDIR?=$(DATADIR)/man
+ ARPDDIR?=/var/lib/arpd
+-- 
+cgit 1.2.3-korg

diff --git a/sys-apps/iproute2/files/iproute2-6.6.0-revert-CONF_USR_DIR.patch 
b/sys-apps/iproute2/files/iproute2-6.6.0-revert-CONF_USR_DIR.patch
new file mode 100644
index ..79be096af231
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-6.6.0-revert-CONF_USR_DIR.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/920054
+https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=deb66acabe44d103c8368b62a76ef37aa074748d
+
+From deb66acabe44d103c8368b62a76ef37aa074748d Mon Sep 17 00:00:00 2001
+From: Luca Boccassi 
+Date: Mon, 6 Nov 2023 00:14:10 +
+Subject: Revert "Makefile: ensure CONF_USR_DIR honours the libdir config"
+
+LIBDIR in Debian and derivatives is not /usr/lib/, it's
+/usr/lib//, which is different, and it's the
+wrong location where to install architecture-independent default
+configuration files, which should always go to /usr/lib/ instead.
+Installing these files to the per-architecture directory is not
+the right thing, hence revert the change.
+
+This reverts commit 946753a4459bd035132a27bb2eb87529c1979b90.
+
+Signed-off-by: Luca Boccassi 
+Signed-off-by: Stephen Hemminger 
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 5c559c8dc..a24844cf0 100644
+--- a/Makefile
 b/Makefile
+@@ -17,7 +17,7 @@ endif
+ PREFIX?=/usr
+ SBINDIR?=/sbin
+ CONF_ETC_DIR?=/etc/iproute2
+-CONF_USR_DIR?=$(LIBDIR)/iproute2
++CONF_USR_DIR?=$(PREFIX)/lib/iproute2
+ NETNS_RUN_DIR?=/var/run/netns
+ NETNS_ETC_DIR?=/etc/netns
+ DATADIR?=$(PREFIX)/share
+-- 
+cgit 1.2.3-korg

diff --git a/sys-apps/iproute2/iproute2-6.6.0-r2.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0-r2.ebuild
new file mode 100644
index ..796a1c1367b1
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-6.6.0-r2.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-12-17 Thread Arthur Zamarin

commit: d68cebd748b86ccac65e0bcd42fb3ba5d1f569e5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 19:12:03 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 19:12:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d68cebd7

sys-apps/iproute2: Stabilize 6.6.0 hppa, #919952

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/iproute2/iproute2-6.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.6.0.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0.ebuild
index 7621ddc6eb47..eaa31b09ac5a 100644
--- a/sys-apps/iproute2/iproute2-6.6.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-12-15 Thread Arthur Zamarin

commit: 0ff27cc3adbc5a31a47da591a450332fe5a10e88
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 15 12:53:09 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 15 12:53:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ff27cc3

sys-apps/iproute2: Stabilize 6.6.0 x86, #919952

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/iproute2/iproute2-6.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.6.0.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0.ebuild
index a9030cf0cd79..7621ddc6eb47 100644
--- a/sys-apps/iproute2/iproute2-6.6.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-12-15 Thread Sam James

commit: 23f20709a5b8c77cf3b22e9e51281413e42e6c5e
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 15 08:41:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 15 08:41:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23f20709

sys-apps/iproute2: Stabilize 6.6.0 amd64, #919952

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.6.0.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0.ebuild
index 8ef111876545..1b1c238ccdaa 100644
--- a/sys-apps/iproute2/iproute2-6.6.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-12-15 Thread Sam James

commit: 3970f05e31a32b987031878ca076c006574803cc
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 15 08:29:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 15 08:29:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3970f05e

sys-apps/iproute2: Stabilize 6.6.0 ppc64, #919952

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.6.0.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0.ebuild
index d60506a562fa..8ef111876545 100644
--- a/sys-apps/iproute2/iproute2-6.6.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-12-14 Thread Sam James

commit: 963dd40f6e17b93175da15f0ba4e1ded1b210b74
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 15 07:16:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 15 07:16:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=963dd40f

sys-apps/iproute2: Stabilize 6.6.0 arm64, #919952

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.6.0.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0.ebuild
index fad45225fafe..d60506a562fa 100644
--- a/sys-apps/iproute2/iproute2-6.6.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-12-14 Thread Sam James

commit: c6c15d48de95b9d1677695684e670419dfe626bc
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 15 07:13:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 15 07:13:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6c15d48

sys-apps/iproute2: Stabilize 6.6.0 arm, #919952

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.6.0.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0.ebuild
index e649f28d2c84..fad45225fafe 100644
--- a/sys-apps/iproute2/iproute2-6.6.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-12-14 Thread Sam James

commit: 960a273f07aaabd1726fa2ee7142a2094d8e5086
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 15 07:05:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 15 07:05:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=960a273f

sys-apps/iproute2: Stabilize 6.6.0 sparc, #919952

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.6.0.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0.ebuild
index d61eddc9d7ae..e649f28d2c84 100644
--- a/sys-apps/iproute2/iproute2-6.6.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/

2023-12-01 Thread Sam James

commit: 68de100047e59fb73d796848ef4c4735958a1651
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec  2 02:51:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec  2 03:28:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68de1000

sys-apps/iproute2: add strlcpy modern C configure patch

Bug: https://bugs.gentoo.org/911727
Signed-off-by: Sam James  gentoo.org>

 ...Add-_GNU_SOURCE-to-strlcpy-configure-test.patch |  25 +++
 sys-apps/iproute2/iproute2-6.6.0-r1.ebuild | 215 +
 2 files changed, 240 insertions(+)

diff --git 
a/sys-apps/iproute2/files/iproute2-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch
 
b/sys-apps/iproute2/files/iproute2-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch
new file mode 100644
index ..0969ff0a7ab9
--- /dev/null
+++ 
b/sys-apps/iproute2/files/iproute2-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch
@@ -0,0 +1,25 @@
+https://lore.kernel.org/netdev/20231202024705.1375296-1-...@gentoo.org/T/#u
+
+From 3dc0bf34c1571429c08a8d0c08a69502e3e4575c Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sat, 2 Dec 2023 02:46:05 +
+Subject: [PATCH] configure: Add _GNU_SOURCE to strlcpy configure test
+
+>=glibc-2.38 adds strlcpy but it's guarded under a feature-test macro. Just
+add _GNU_SOURCE to the configure test because we already pass _GNU_SOURCE 
unconditionally
+in the Makefiles when building iproute2.
+
+Signed-off-by: Sam James 
+--- a/configure
 b/configure
+@@ -445,6 +445,7 @@ EOF
+ check_strlcpy()
+ {
+ cat >$TMPDIR/strtest.c <
+ int main(int argc, char **argv) {
+   char dst[10];
+-- 
+2.43.0
+

diff --git a/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild
new file mode 100644
index ..e097dc28345f
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;
+   inherit git-r3
+else
+   SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~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 bpf caps elf +iptables minimal nfs selinux split-usr"
+# Needs root
+RESTRICT="test"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+   !net-misc/arpd
+   !minimal? ( net-libs/libmnl:= )
+   atm? ( net-dialup/linux-atm )
+   berkdb? ( sys-libs/db:= )
+   bpf? ( dev-libs/libbpf:= )
+   caps? ( sys-libs/libcap )
+   elf? ( virtual/libelf:= )
+   iptables? ( >=net-firewall/iptables-1.4.20:= )
+   nfs? ( net-libs/libtirpc:= )
+   selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support (bug #549948) and some 
defines (bug #553876)
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+   app-arch/xz-utils
+   >=sys-devel/bison-2.4
+   sys-devel/flex
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-6.5.0-mtu.patch # bug #291907
+   "${FILESDIR}"/${PN}-6.5.0-configure-nomagic-nolibbsd.patch # bug 
#643722 & #911727
+   "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+   "${FILESDIR}"/${PN}-6.4.0-disable-libbsd-fallback.patch # bug #911727
+   
"${FILESDIR}"/${PN}-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch
+)
+
+src_prepare() {
+   default
+
+   # Fix version if necessary
+   local versionfile="include/version.h"
+   if [[ ${PV} !=  ]] && ! grep -Fq "${PV}" ${versionfile} ; then
+   einfo "Fixing version string"
+   sed -i "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+   ${versionfile} || die
+   fi
+
+   # echo -n is not POSIX compliant
+   sed -i 's@echo -n@printf@' configure || die
+
+   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
+
+   # Build against system headers
+   rm -r include/netinet || die #include/linux 
include/ip{,6}tables{,_common}.h include/libiptc
+   sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+   if use minimal ; then
+   sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
+   fi
+}
+
+src_configure() {
+   tc-export AR CC PKG_CONFIG
+
+   # This sure is ugly. Should

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-11-05 Thread Sam James

commit: cdef2f549249396d4b25a1c5068c849eafa8ea6e
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov  5 18:53:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov  5 18:53:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdef2f54

sys-apps/iproute2: add 6.6.0

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/Manifest |  1 +
 .../iproute2/{iproute2-.ebuild => iproute2-6.6.0.ebuild}   | 10 +-
 sys-apps/iproute2/iproute2-.ebuild | 10 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 8e7ab5142549..3f38b2833dde 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,2 +1,3 @@
 DIST iproute2-6.4.0.tar.xz 922164 BLAKE2B 
76369d2a794afd13dba1a34ee9a7425775bb7b43c22164274749c01b18d061669aa5abd51d32a15d68f48e75f4837a887dfc28ea41e34d8e4c36b2ab865628dd
 SHA512 
42330be6e061302694ea301765ff8d3cbfaeca4b1d06e39778861e4390ed211c03cb2d41498190202b659f7f5647b1ca4857410ef8c16fd601a35e7162788d21
 DIST iproute2-6.5.0.tar.xz 925940 BLAKE2B 
537a956c2fb59df25e90d7899a981e5408c5ee029df2bb87461b899ecf8fe4424a1db5d1b1b67a67bdb2555f6cc4aaf099b0544a2c92ffc3843adc3d17defb96
 SHA512 
615ba6924becdf08af3f491d347d84897ff0198426d65b194c87146c4527b0856fc51688b59834abe1cb6f9a70b93c66ff7ade6b7c305c1ece0fd6a29df6bc54
+DIST iproute2-6.6.0.tar.xz 917964 BLAKE2B 
9d20f19c04c2bbde7a3ae53e61e4623b119570c8446f34b93ddadd64677caa432e00ee085498bc277e0842cc2124340c7100925106d0ef2c11dd8002aacac08f
 SHA512 
21c99a3ba8e1d0047933e99b48fb00901eef18899cd5854000ae910d9d84d13aeafa48b32184775531285782909f4d283d0784491691a1f10462dab147de359d

diff --git a/sys-apps/iproute2/iproute2-.ebuild 
b/sys-apps/iproute2/iproute2-6.6.0.ebuild
similarity index 95%
copy from sys-apps/iproute2/iproute2-.ebuild
copy to sys-apps/iproute2/iproute2-6.6.0.ebuild
index 04c74af7ff25..d61eddc9d7ae 100644
--- a/sys-apps/iproute2/iproute2-.ebuild
+++ b/sys-apps/iproute2/iproute2-6.6.0.ebuild
@@ -48,8 +48,8 @@ BDEPEND="
 "
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907
-   "${FILESDIR}"/${PN}-5.12.0-configure-nomagic-nolibbsd.patch # bug 
#643722 & 911727
+   "${FILESDIR}"/${PN}-6.5.0-mtu.patch # bug #291907
+   "${FILESDIR}"/${PN}-6.5.0-configure-nomagic-nolibbsd.patch # bug 
#643722 & #911727
"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
"${FILESDIR}"/${PN}-6.4.0-disable-libbsd-fallback.patch # bug #911727
 )
@@ -61,12 +61,12 @@ src_prepare() {
local versionfile="include/version.h"
if [[ ${PV} !=  ]] && ! grep -Fq "${PV}" ${versionfile} ; then
einfo "Fixing version string"
-   sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
-   -i ${versionfile} || die
+   sed -i "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+   ${versionfile} || die
fi
 
# echo -n is not POSIX compliant
-   sed 's@echo -n@printf@' -i configure || die
+   sed -i 's@echo -n@printf@' configure || die
 
sed -i \
-e '/^CC :\?=/d' \

diff --git a/sys-apps/iproute2/iproute2-.ebuild 
b/sys-apps/iproute2/iproute2-.ebuild
index 04c74af7ff25..d61eddc9d7ae 100644
--- a/sys-apps/iproute2/iproute2-.ebuild
+++ b/sys-apps/iproute2/iproute2-.ebuild
@@ -48,8 +48,8 @@ BDEPEND="
 "
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907
-   "${FILESDIR}"/${PN}-5.12.0-configure-nomagic-nolibbsd.patch # bug 
#643722 & 911727
+   "${FILESDIR}"/${PN}-6.5.0-mtu.patch # bug #291907
+   "${FILESDIR}"/${PN}-6.5.0-configure-nomagic-nolibbsd.patch # bug 
#643722 & #911727
"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
"${FILESDIR}"/${PN}-6.4.0-disable-libbsd-fallback.patch # bug #911727
 )
@@ -61,12 +61,12 @@ src_prepare() {
local versionfile="include/version.h"
if [[ ${PV} !=  ]] && ! grep -Fq "${PV}" ${versionfile} ; then
einfo "Fixing version string"
-   sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
-   -i ${versionfile} || die
+   sed -i "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+   ${versionfile} || die
fi
 
# echo -n is not POSIX compliant
-   sed 's@echo -n@printf@' -i configure || die
+   sed -i 's@echo -n@printf@' configure || die
 
sed -i \
-e '/^CC :\?=/d' \

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-10-26 Thread Sam James

commit: 35a7283535958cbbfdd6af0071f9e5601b580913
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 27 02:32:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 27 02:32:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35a72835

sys-apps/iproute2: Stabilize 6.5.0 ppc64, #916085

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.5.0.ebuild 
b/sys-apps/iproute2/iproute2-6.5.0.ebuild
index d8f2be72bc4e..7621ddc6eb47 100644
--- a/sys-apps/iproute2/iproute2-6.5.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.5.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-10-23 Thread Arthur Zamarin

commit: e6d45cbc6c2e6a7873bdca2ef746bfc8ca67321a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Oct 23 14:04:49 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Oct 23 14:04:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6d45cbc

sys-apps/iproute2: Stabilize 6.5.0 ppc, #916085

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/iproute2/iproute2-6.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.5.0.ebuild 
b/sys-apps/iproute2/iproute2-6.5.0.ebuild
index 463a171c26da..d8f2be72bc4e 100644
--- a/sys-apps/iproute2/iproute2-6.5.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.5.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-10-22 Thread Sam James

commit: b4b3b2e23fe5372b723888a738479df92545b0ad
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 22 12:22:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 22 12:22:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4b3b2e2

sys-apps/iproute2: Stabilize 6.5.0 arm, #916085

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.5.0.ebuild 
b/sys-apps/iproute2/iproute2-6.5.0.ebuild
index 09c890d2870a..463a171c26da 100644
--- a/sys-apps/iproute2/iproute2-6.5.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.5.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-10-22 Thread Sam James

commit: 8a346fbb4d6b0721772c8b8d4c3c1726c9a95b88
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 22 11:44:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 22 11:44:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a346fbb

sys-apps/iproute2: Stabilize 6.5.0 arm64, #916085

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.5.0.ebuild 
b/sys-apps/iproute2/iproute2-6.5.0.ebuild
index 0632551da465..09c890d2870a 100644
--- a/sys-apps/iproute2/iproute2-6.5.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.5.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-10-22 Thread Sam James

commit: 044e6e3a5fd1a9f4a2ccedc05e99fc4f4c62591f
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 22 11:38:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 22 11:38:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=044e6e3a

sys-apps/iproute2: Stabilize 6.5.0 sparc, #916085

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.5.0.ebuild 
b/sys-apps/iproute2/iproute2-6.5.0.ebuild
index 6c95f3ed79c0..c40b92d0b532 100644
--- a/sys-apps/iproute2/iproute2-6.5.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.5.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-10-22 Thread Sam James

commit: 876fbc22bfdfc60719067b24f85ffd2e5330512b
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 22 11:38:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 22 11:38:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=876fbc22

sys-apps/iproute2: Stabilize 6.5.0 amd64, #916085

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.5.0.ebuild 
b/sys-apps/iproute2/iproute2-6.5.0.ebuild
index c40b92d0b532..0632551da465 100644
--- a/sys-apps/iproute2/iproute2-6.5.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.5.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-10-22 Thread Sam James

commit: e5ee85bde664ca73e60e3e8abcd769ee36c1894c
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 22 11:38:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 22 11:38:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5ee85bd

sys-apps/iproute2: Stabilize 6.5.0 x86, #916085

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.5.0.ebuild 
b/sys-apps/iproute2/iproute2-6.5.0.ebuild
index d61eddc9d7ae..6c95f3ed79c0 100644
--- a/sys-apps/iproute2/iproute2-6.5.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.5.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-10-17 Thread Sam James

commit: 546f38382b591e9c9a9247209927664e7b888e7f
Author: Matija Skala  gmx  com>
AuthorDate: Tue Oct 17 16:59:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 17 17:01:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=546f3838

sys-apps/iproute2: fix for sed-bsd

Signed-off-by: Matija Skala  gmx.com>
Closes: https://github.com/gentoo/gentoo/pull/33380
Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.5.0.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-apps/iproute2/iproute2-6.5.0.ebuild 
b/sys-apps/iproute2/iproute2-6.5.0.ebuild
index 92b9a7188d80..d61eddc9d7ae 100644
--- a/sys-apps/iproute2/iproute2-6.5.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.5.0.ebuild
@@ -61,12 +61,12 @@ src_prepare() {
local versionfile="include/version.h"
if [[ ${PV} !=  ]] && ! grep -Fq "${PV}" ${versionfile} ; then
einfo "Fixing version string"
-   sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
-   -i ${versionfile} || die
+   sed -i "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+   ${versionfile} || die
fi
 
# echo -n is not POSIX compliant
-   sed 's@echo -n@printf@' -i configure || die
+   sed -i 's@echo -n@printf@' configure || die
 
sed -i \
-e '/^CC :\?=/d' \

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/, sys-apps/iproute2/

2023-09-16 Thread Sam James

commit: 41395a1bb3198b2934b87b665eb217251f59aef2
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 16 10:24:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 16 10:24:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41395a1b

sys-apps/iproute2: drop versions

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/Manifest |   5 -
 .../iproute2/files/iproute2-4.20.0-no-ipv6.patch   |  38 
 .../files/iproute2-6.1.0-strncpy-overlap.patch |  39 
 .../files/iproute2-default-color-auto.patch|   7 -
 sys-apps/iproute2/iproute2-5.15.0-r1.ebuild| 173 
 sys-apps/iproute2/iproute2-5.15.0.ebuild   | 175 
 sys-apps/iproute2/iproute2-6.0.0-r1.ebuild | 209 
 sys-apps/iproute2/iproute2-6.0.0.ebuild| 215 
 sys-apps/iproute2/iproute2-6.1.0-r1.ebuild | 216 
 sys-apps/iproute2/iproute2-6.1.0-r2.ebuild | 210 
 sys-apps/iproute2/iproute2-6.2.0-r1.ebuild | 220 -
 sys-apps/iproute2/iproute2-6.2.0-r2.ebuild | 214 
 sys-apps/iproute2/iproute2-6.3.0-r1.ebuild | 214 
 sys-apps/iproute2/iproute2-6.3.0.ebuild| 220 -
 14 files changed, 2155 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index ec8afae77391..8e7ab5142549 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,7 +1,2 @@
-DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B 
bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d
 SHA512 
e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22
-DIST iproute2-6.0.0.tar.xz 900312 BLAKE2B 
1cfb9b5a7892dec2b35e0eadbd957083e95fdc5077a1aa193329801ff25f9ed90a1fc4152756547be1fab8fe18d9a399001a4c3a61e951f64946156af6a90bae
 SHA512 
be30362b0df6906aa786f935d5f555b8b86c747fe05314066f4180ab2f7c952ae227b7cf04c15e75d8f99ca17bafb7c8dc0fb1c18f3a9e3222d98716bb449f7a
-DIST iproute2-6.1.0.tar.xz 905512 BLAKE2B 
38249703e0a9ba74405aebdb97560b286deefa959a9c3f0e0893962b6966f5da2da46199dda6a0f9584bb473f8ba529440643d97f66e9b7619df029e3091d163
 SHA512 
4e4d3b5e1e1a5444f42671c1e6caee072e80063e34e37386695f76f85a1ab662f4513050814006e5154426cbaadfba1d86b0be14e65978d5e670a16446047b28
-DIST iproute2-6.2.0.tar.xz 911588 BLAKE2B 
d3bfaecf33ffc7861e983e8db0d6a63f4767b6c01b5346e88f51c65ed6279c4be29412ed18b8f98ed54d60a84455b73fe7745142fd0fc0f3e327a29e8bcce986
 SHA512 
b24e0fdd0f51b8b78bc3bb681e3829af47d3011e93f3892289eb070b336709a6883728ecc7627ca37f6449720f8ed1349af321c0d04454894a7175b82f7de151
-DIST iproute2-6.3.0.tar.xz 914700 BLAKE2B 
a7b48c59c8a30f56ca810136f4d9f681fe3835c260227a6229b972ce70b233d2865a6543cf3f70ed586825f9191c22d459a9fc5cc8c7dbf3ab417064c8a7
 SHA512 
aec1d8ceb54c8849a075ec1ce079678638e05ccaec093e8b3cbc7243b5fafea2a8c11f10930fced3df82f52d6750aa325178e44f9058e37a556ab108d4a968bf
 DIST iproute2-6.4.0.tar.xz 922164 BLAKE2B 
76369d2a794afd13dba1a34ee9a7425775bb7b43c22164274749c01b18d061669aa5abd51d32a15d68f48e75f4837a887dfc28ea41e34d8e4c36b2ab865628dd
 SHA512 
42330be6e061302694ea301765ff8d3cbfaeca4b1d06e39778861e4390ed211c03cb2d41498190202b659f7f5647b1ca4857410ef8c16fd601a35e7162788d21
 DIST iproute2-6.5.0.tar.xz 925940 BLAKE2B 
537a956c2fb59df25e90d7899a981e5408c5ee029df2bb87461b899ecf8fe4424a1db5d1b1b67a67bdb2555f6cc4aaf099b0544a2c92ffc3843adc3d17defb96
 SHA512 
615ba6924becdf08af3f491d347d84897ff0198426d65b194c87146c4527b0856fc51688b59834abe1cb6f9a70b93c66ff7ade6b7c305c1ece0fd6a29df6bc54

diff --git a/sys-apps/iproute2/files/iproute2-4.20.0-no-ipv6.patch 
b/sys-apps/iproute2/files/iproute2-4.20.0-no-ipv6.patch
deleted file mode 100644
index 31733e99f72c..
--- a/sys-apps/iproute2/files/iproute2-4.20.0-no-ipv6.patch
+++ /dev/null
@@ -1,38 +0,0 @@
 iproute2-4.20.0/ip/ipmonitor.c
-+++ iproute2-4.20.0/ip/ipmonitor.c
-@@ -118,7 +118,6 @@
- 
-   case RTM_NEWPREFIX:
-   print_headers(fp, "[PREFIX]", ctrl);
--  print_prefix(n, arg);
-   return 0;
- 
-   case RTM_NEWRULE:
 iproute2-4.20.0/ip/iptunnel.c
-+++ iproute2-4.20.0/ip/iptunnel.c
-@@ -549,13 +549,6 @@
-   break;
-   case AF_INET:
-   break;
--  /*
--   * This is silly enough but we have no easy way to make it
--   * protocol-independent because of unarranged structure between
--   * IPv4 and IPv6.
--   */
--  case AF_INET6:
--  return do_ip6tunnel(argc, argv);
-   default:
-   fprintf(stderr, "Unsupported protocol family: %d\n", 
preferred_family);
-   exit(-1);
 iproute2-4.20.0/ip/Makefile
-+++ iproute2-4.20.0/ip/Makefile
-@@ -1,7 +1,7 @@
- #

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-09-16 Thread Sam James

commit: c7b6f5746b3fc5690a0d7542003d26f12780bb4c
Author: Holger Hoffstätte  applied-asynchrony  com>
AuthorDate: Tue Sep  5 17:28:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 16 10:13:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7b6f574

sys-apps/iproute2: remove libbsd IUSE and dependency

This removes libbsd from IUSE as it does nothing except create problems
due to another patch. It is also no longer needed since glibc-2.38;
for older glibc versions we can let configure fall back to iproute's
built-in strlcpy.

Closes: https://bugs.gentoo.org/911727
Signed-off-by: Holger Hoffstätte  applied-asynchrony.com>
Signed-off-by: Sam James  gentoo.org>

 ...oute2-.ebuild => iproute2-5.15.0-r1.ebuild} | 127 +++--
 ...route2-.ebuild => iproute2-6.0.0-r1.ebuild} |  21 +---
 ...route2-.ebuild => iproute2-6.1.0-r2.ebuild} |  22 +---
 ...route2-.ebuild => iproute2-6.2.0-r2.ebuild} |  14 +--
 ...route2-.ebuild => iproute2-6.3.0-r1.ebuild} |  16 +--
 ...route2-.ebuild => iproute2-6.4.0-r1.ebuild} |  15 +--
 sys-apps/iproute2/iproute2-.ebuild |  12 +-
 7 files changed, 68 insertions(+), 159 deletions(-)

diff --git a/sys-apps/iproute2/iproute2-.ebuild 
b/sys-apps/iproute2/iproute2-5.15.0-r1.ebuild
similarity index 54%
copy from sys-apps/iproute2/iproute2-.ebuild
copy to sys-apps/iproute2/iproute2-5.15.0-r1.ebuild
index 32423402a1c3..8bea2320b46f 100644
--- a/sys-apps/iproute2/iproute2-.ebuild
+++ b/sys-apps/iproute2/iproute2-5.15.0-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=7
 
-inherit edo toolchain-funcs
+inherit toolchain-funcs flag-o-matic multilib
 
-if [[ ${PV} ==  ]] ; then
+if [[ ${PV} == "" ]] ; then

EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
@@ -18,9 +18,7 @@ 
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm berkdb bpf caps elf +iptables libbsd minimal nfs selinux split-usr"
-# Needs root
-RESTRICT="test"
+IUSE="atm berkdb bpf caps elf +iptables ipv6 minimal selinux"
 
 # We could make libmnl optional, but it's tiny, so eh
 RDEPEND="
@@ -32,11 +30,9 @@ RDEPEND="
caps? ( sys-libs/libcap )
elf? ( virtual/libelf:= )
iptables? ( >=net-firewall/iptables-1.4.20:= )
-   libbsd? ( dev-libs/libbsd )
-   nfs? ( net-libs/libtirpc:= )
selinux? ( sys-libs/libselinux )
 "
-# We require newer linux-headers for ipset support (bug #549948) and some 
defines (bug #553876)
+# We require newer linux-headers for ipset support #549948 and some defines 
#553876
 DEPEND="
${RDEPEND}
>=sys-kernel/linux-headers-3.16
@@ -49,18 +45,29 @@ BDEPEND="
 "
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907
-   "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
-   #"${FILESDIR}"/${PN}-5.1.0-portability.patch
+   "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+   "${FILESDIR}"/${PN}-5.12.0-configure-nomagic-nolibbsd.patch # bug 
#643722 & #911727
"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+   "${FILESDIR}"/${PN}-6.4.0-disable-libbsd-fallback.patch # bug #911727
 )
 
+doecho() {
+   echo "${@}"
+   "${@}" || die
+}
+
 src_prepare() {
+   if ! use ipv6 ; then
+   PATCHES+=(
+   "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
+   )
+   fi
+
default
 
# Fix version if necessary
local versionfile="include/version.h"
-   if [[ ${PV} !=  ]] && ! grep -Fq "${PV}" ${versionfile} ; then
+   if [[ "${PV}" !=  ]] && ! grep -Fq "${PV}" ${versionfile} ; then
einfo "Fixing version string"
sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
-i ${versionfile} || die
@@ -77,7 +84,7 @@ src_prepare() {
-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
Makefile || die
 
-   # Build against system headers
+   # build against system headers
rm -r include/netinet || die #include/linux 
include/ip{,6}tables{,_common}.h include/libiptc
sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
 
@@ -89,78 +96,35 @@ src_prepare() {
 src_configure() {
tc-export AR CC PKG_CONFIG
 
-   # This sure is ugly. Should probably move into toolchain-funcs at some 
point.
+   # This sure is

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/

2023-09-16 Thread Sam James

commit: 5ab7e707e5f43a4d0a810219148fc47295a58e66
Author: Holger Hoffstätte  applied-asynchrony  com>
AuthorDate: Tue Sep  5 17:26:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 16 10:13:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ab7e707

sys-apps/iproute2: modify nomagic patch to no longer enforce libbsd

Signed-off-by: Holger Hoffstätte  applied-asynchrony.com>
Signed-off-by: Sam James  gentoo.org>

 ...proute2-5.12.0-configure-nomagic-nolibbsd.patch | 242 +
 1 file changed, 242 insertions(+)

diff --git 
a/sys-apps/iproute2/files/iproute2-5.12.0-configure-nomagic-nolibbsd.patch 
b/sys-apps/iproute2/files/iproute2-5.12.0-configure-nomagic-nolibbsd.patch
new file mode 100644
index ..4f88da3c20c5
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-5.12.0-configure-nomagic-nolibbsd.patch
@@ -0,0 +1,242 @@
+The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
+a variable as well as modifying CFLAGS & LDLIBS.
+
+If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
+are still in place.
+
+Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
+are only passed when correctly needed.
+
+Prior Gentoo testcase for reproduction:
+USE=minimal ebuild ... compile.
+- Linking with libbsd, libelf, libmnl & libcap based only on presence.
+- Links based on libselinux based only on presence.
+
+Closes: https://bugs.gentoo.org/643722
+Signed-off-by: Robin H. Johnson 
+
+Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler 

+Added libcap to v4.17.0 by Lars Wendler 
+Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler 

+Forward-ported from v4.20.0 to v5.11.0 by Lars Wendler 

+Forward-ported from v5.11.0 to v5.12.0 by Lars Wendler 

+
+Update 2023-09-05: Removed libbsd enforcement from config.include for bug 
#911727
+by Holger Hoffstätte 
+
+--- iproute2-5.12.0/bridge/Makefile
 iproute2-5.12.0/bridge/Makefile
+@@ -2,6 +2,7 @@
+ BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ all: bridge
+ 
+--- iproute2-5.12.0/config.include
 iproute2-5.12.0/config.include
+@@ -0,0 +1,26 @@
++# We can only modify CFLAGS/LDLIBS after all the config options are known.
++ifeq ($(IP_CONFIG_SETNS),y)
++  CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
++endif
++ifeq ($(HAVE_ELF),y)
++  CFLAGS += $(HAVE_ELF_CFLAGS)
++  LDLIBS += $(HAVE_ELF_LDLIBS)
++endif
++ifeq ($(HAVE_SELINUX),y)
++  CFLAGS += $(HAVE_SELINUX_CFLAGS)
++  LDLIBS += $(HAVE_SELINUX_LDLIBS)
++endif
++ifeq ($(HAVE_MNL),y)
++  CFLAGS += $(HAVE_MNL_CFLAGS)
++  LDLIBS += $(HAVE_MNL_LDLIBS)
++endif
++ifeq ($(HAVE_CAP),y)
++  CFLAGS += $(HAVE_CAP_CFLAGS)
++  LDLIBS += $(HAVE_CAP_LDLIBS)
++endif
++
++# Rules can only be declared after all variables in them are known.
++%.o: %.c
++  $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<
++
++# vim: ft=make:
+--- iproute2-5.12.0/configure
 iproute2-5.12.0/configure
+@@ -195,7 +195,7 @@
+ if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 
2>&1; then
+   echo "IP_CONFIG_SETNS:=y" >>$CONFIG
+   echo "yes"
+-  echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
++  echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
+ else
+   echo "no"
+ fi
+@@ -238,8 +238,8 @@
+   echo "HAVE_ELF:=y" >>$CONFIG
+   echo "yes"
+ 
+-  echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
+-  echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
++  echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> 
$CONFIG
++  echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
+ else
+   echo "no"
+ fi
+@@ -357,8 +357,8 @@
+   echo "HAVE_SELINUX:=y" >>$CONFIG
+   echo "yes"
+ 
+-  echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
+-  echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags 
libselinux` >>$CONFIG
++  echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} 
--cflags libselinux` >>$CONFIG
++  echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` 
>>$CONFIG
+   else
+   echo "no"
+   fi
+@@ -370,8 +370,8 @@
+   echo "HAVE_MNL:=y" >>$CONFIG
+   echo "yes"
+ 
+-  echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` 
>>$CONFIG
+-  echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
++  echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl 
--cflags` >>$CONFIG
++  echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> 
$CONFIG
+   else
+   echo "no"
+   fi
+@@ -411,8 +411,8 @@
+   echo "no"
+ else
+   if ${PKG_CONFIG} libbsd --exists; then
+-  echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/

2023-09-16 Thread Sam James

commit: c3c6d4e7b793d066a31e52d536aaa02dc370f2d4
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 16 10:23:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 16 10:23:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3c6d4e7

sys-apps/iproute2: rebase patches

Signed-off-by: Sam James  gentoo.org>

 ...iproute2-6.5.0-configure-nomagic-nolibbsd.patch | 246 +
 sys-apps/iproute2/files/iproute2-6.5.0-mtu.patch   |  50 +
 sys-apps/iproute2/iproute2-6.5.0.ebuild|   4 +-
 3 files changed, 298 insertions(+), 2 deletions(-)

diff --git 
a/sys-apps/iproute2/files/iproute2-6.5.0-configure-nomagic-nolibbsd.patch 
b/sys-apps/iproute2/files/iproute2-6.5.0-configure-nomagic-nolibbsd.patch
new file mode 100644
index ..4618fb9c94ef
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-6.5.0-configure-nomagic-nolibbsd.patch
@@ -0,0 +1,246 @@
+The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
+a variable as well as modifying CFLAGS & LDLIBS.
+
+If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
+are still in place.
+
+Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
+are only passed when correctly needed.
+
+Prior Gentoo testcase for reproduction:
+USE=minimal ebuild ... compile.
+- Linking with libbsd, libelf, libmnl & libcap based only on presence.
+- Links based on libselinux based only on presence.
+
+Closes: https://bugs.gentoo.org/643722
+Signed-off-by: Robin H. Johnson 
+
+Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler 

+Added libcap to v4.17.0 by Lars Wendler 
+Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler 

+Forward-ported from v4.20.0 to v5.11.0 by Lars Wendler 

+Forward-ported from v5.11.0 to v5.12.0 by Lars Wendler 

+
+Update 2023-09-05: Removed libbsd enforcement from config.include for bug 
#911727
+by Holger Hoffstätte 
+
+--- a/config.include
 b/config.include
+@@ -0,0 +1,26 @@
++# We can only modify CFLAGS/LDLIBS after all the config options are known.
++ifeq ($(IP_CONFIG_SETNS),y)
++  CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
++endif
++ifeq ($(HAVE_ELF),y)
++  CFLAGS += $(HAVE_ELF_CFLAGS)
++  LDLIBS += $(HAVE_ELF_LDLIBS)
++endif
++ifeq ($(HAVE_SELINUX),y)
++  CFLAGS += $(HAVE_SELINUX_CFLAGS)
++  LDLIBS += $(HAVE_SELINUX_LDLIBS)
++endif
++ifeq ($(HAVE_MNL),y)
++  CFLAGS += $(HAVE_MNL_CFLAGS)
++  LDLIBS += $(HAVE_MNL_LDLIBS)
++endif
++ifeq ($(HAVE_CAP),y)
++  CFLAGS += $(HAVE_CAP_CFLAGS)
++  LDLIBS += $(HAVE_CAP_LDLIBS)
++endif
++
++# Rules can only be declared after all variables in them are known.
++%.o: %.c
++  $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<
++
++# vim: ft=make:
+
+--- a/bridge/Makefile
 b/bridge/Makefile
+@@ -2,6 +2,7 @@
+ BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o vni.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ all: bridge
+ 
+--- a/configure
 b/configure
+@@ -202,7 +202,7 @@ EOF
+ if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 
2>&1; then
+   echo "IP_CONFIG_SETNS:=y" >>$CONFIG
+   echo "yes"
+-  echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
++  echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
+ else
+   echo "no"
+ fi
+@@ -269,8 +269,8 @@ check_elf()
+   echo "HAVE_ELF:=y" >>$CONFIG
+   echo "yes"
+ 
+-  echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
+-  echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
++  echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> 
$CONFIG
++  echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
+ else
+   echo "no"
+ fi
+@@ -388,8 +388,8 @@ check_selinux()
+   echo "HAVE_SELINUX:=y" >>$CONFIG
+   echo "yes"
+ 
+-  echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
+-  echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags 
libselinux` >>$CONFIG
++  echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} 
--cflags libselinux` >>$CONFIG
++  echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` 
>>$CONFIG
+   else
+   echo "no"
+   fi
+@@ -414,8 +414,8 @@ check_mnl()
+   echo "HAVE_MNL:=y" >>$CONFIG
+   echo "yes"
+ 
+-  echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` 
>>$CONFIG
+-  echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
++  echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl 
--cflags` >>$CONFIG
++  echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> 
$CONFIG
+   else
+   echo "no"
+   fi
+@@ -455,8 +455,8 @@ EOF
+   echo "no"
+ else
+   if ${PKG_CONFIG} libbsd --exists; then
+-  echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-09-16 Thread Sam James

commit: 047af18fe5b2a5daa9143e5390242d308f38776e
Author: Holger Hoffstätte  applied-asynchrony  com>
AuthorDate: Wed Sep  6 19:37:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 16 10:13:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=047af18f

sys-apps/iproute2: add 6.5.0

Signed-off-by: Holger Hoffstätte  applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/32636
Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/Manifest  |   1 +
 sys-apps/iproute2/iproute2-6.5.0.ebuild | 214 
 2 files changed, 215 insertions(+)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index d4f10b35a52f..ec8afae77391 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,3 +4,4 @@ DIST iproute2-6.1.0.tar.xz 905512 BLAKE2B 
38249703e0a9ba74405aebdb97560b286deefa
 DIST iproute2-6.2.0.tar.xz 911588 BLAKE2B 
d3bfaecf33ffc7861e983e8db0d6a63f4767b6c01b5346e88f51c65ed6279c4be29412ed18b8f98ed54d60a84455b73fe7745142fd0fc0f3e327a29e8bcce986
 SHA512 
b24e0fdd0f51b8b78bc3bb681e3829af47d3011e93f3892289eb070b336709a6883728ecc7627ca37f6449720f8ed1349af321c0d04454894a7175b82f7de151
 DIST iproute2-6.3.0.tar.xz 914700 BLAKE2B 
a7b48c59c8a30f56ca810136f4d9f681fe3835c260227a6229b972ce70b233d2865a6543cf3f70ed586825f9191c22d459a9fc5cc8c7dbf3ab417064c8a7
 SHA512 
aec1d8ceb54c8849a075ec1ce079678638e05ccaec093e8b3cbc7243b5fafea2a8c11f10930fced3df82f52d6750aa325178e44f9058e37a556ab108d4a968bf
 DIST iproute2-6.4.0.tar.xz 922164 BLAKE2B 
76369d2a794afd13dba1a34ee9a7425775bb7b43c22164274749c01b18d061669aa5abd51d32a15d68f48e75f4837a887dfc28ea41e34d8e4c36b2ab865628dd
 SHA512 
42330be6e061302694ea301765ff8d3cbfaeca4b1d06e39778861e4390ed211c03cb2d41498190202b659f7f5647b1ca4857410ef8c16fd601a35e7162788d21
+DIST iproute2-6.5.0.tar.xz 925940 BLAKE2B 
537a956c2fb59df25e90d7899a981e5408c5ee029df2bb87461b899ecf8fe4424a1db5d1b1b67a67bdb2555f6cc4aaf099b0544a2c92ffc3843adc3d17defb96
 SHA512 
615ba6924becdf08af3f491d347d84897ff0198426d65b194c87146c4527b0856fc51688b59834abe1cb6f9a70b93c66ff7ade6b7c305c1ece0fd6a29df6bc54

diff --git a/sys-apps/iproute2/iproute2-6.5.0.ebuild 
b/sys-apps/iproute2/iproute2-6.5.0.ebuild
new file mode 100644
index ..3549e2e4b8fe
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-6.5.0.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;
+   inherit git-r3
+else
+   SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~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 bpf caps elf +iptables minimal nfs selinux split-usr"
+# Needs root
+RESTRICT="test"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+   !net-misc/arpd
+   !minimal? ( net-libs/libmnl:= )
+   atm? ( net-dialup/linux-atm )
+   berkdb? ( sys-libs/db:= )
+   bpf? ( dev-libs/libbpf:= )
+   caps? ( sys-libs/libcap )
+   elf? ( virtual/libelf:= )
+   iptables? ( >=net-firewall/iptables-1.4.20:= )
+   nfs? ( net-libs/libtirpc:= )
+   selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support (bug #549948) and some 
defines (bug #553876)
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+   app-arch/xz-utils
+   >=sys-devel/bison-2.4
+   sys-devel/flex
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907
+   "${FILESDIR}"/${PN}-5.12.0-configure-nomagic-nolibbsd.patch # bug 
#643722 & #911727
+   "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+   "${FILESDIR}"/${PN}-6.4.0-disable-libbsd-fallback.patch # bug #911727
+)
+
+src_prepare() {
+   default
+
+   # Fix version if necessary
+   local versionfile="include/version.h"
+   if [[ ${PV} !=  ]] && ! grep -Fq "${PV}" ${versionfile} ; then
+   einfo "Fixing version string"
+   sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+   -i ${versionfile} || die
+   fi
+
+   # echo -n is not POSIX compliant
+   sed 's@echo -n@printf@' -i configure || die
+
+   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
+
+   # Build against system headers
+   rm

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/

2023-09-16 Thread Sam James

commit: 4df96bf773daff0d26fe04c4a6ac2e94a4b542a1
Author: Holger Hoffstätte  applied-asynchrony  com>
AuthorDate: Tue Sep  5 16:17:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 16 10:13:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df96bf7

sys-apps/iproute2: add patch to remove automagic fallback to libbsd

Signed-off-by: Holger Hoffstätte  applied-asynchrony.com>
Signed-off-by: Sam James  gentoo.org>

 .../iproute2-6.4.0-disable-libbsd-fallback.patch   | 25 ++
 1 file changed, 25 insertions(+)

diff --git 
a/sys-apps/iproute2/files/iproute2-6.4.0-disable-libbsd-fallback.patch 
b/sys-apps/iproute2/files/iproute2-6.4.0-disable-libbsd-fallback.patch
new file mode 100644
index ..888091387fe9
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-6.4.0-disable-libbsd-fallback.patch
@@ -0,0 +1,25 @@
+
+Disable the optional libbsd fallback in favor of iproute2's own
+strlcat/strlcpy routines. This prevents automagic linking and
+all sorts of other related problems.
+
+Bug: https://bugs.gentoo.org/911727
+Signed-off-by: Holger Hoffstätte 
+
+--- a/configure2023-09-05 16:20:48.0 +0200
 b/configure2023-09-05 16:29:15.850347415 +0200
+@@ -454,14 +454,8 @@ EOF
+ if $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1; 
then
+   echo "no"
+ else
+-  if ${PKG_CONFIG} libbsd --exists; then
+-  echo 'HAVE_LIBBSD_CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} 
libbsd --cflags` >>$CONFIG
+-  echo 'HAVE_LIBBSD_LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> 
$CONFIG
+-  echo "no"
+-  else
+   echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
+   echo "yes"
+-  fi
+ fi
+ rm -f $TMPDIR/strtest.c $TMPDIR/strtest
+ }

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-09-16 Thread Sam James

commit: 8e36c3c4aa347eaef614110ae4ab5acf2e68aef1
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 16 10:16:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 16 10:16:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e36c3c4

sys-apps/iproute2: fix copyright

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-5.15.0-r1.ebuild | 2 +-
 sys-apps/iproute2/iproute2-6.0.0-r1.ebuild  | 2 +-
 sys-apps/iproute2/iproute2-6.4.0-r1.ebuild  | 2 +-
 sys-apps/iproute2/iproute2-6.5.0.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/iproute2/iproute2-5.15.0-r1.ebuild 
b/sys-apps/iproute2/iproute2-5.15.0-r1.ebuild
index 8bea2320b46f..1468e3a0082f 100644
--- a/sys-apps/iproute2/iproute2-5.15.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-5.15.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

diff --git a/sys-apps/iproute2/iproute2-6.0.0-r1.ebuild 
b/sys-apps/iproute2/iproute2-6.0.0-r1.ebuild
index 46828e9019fc..60b15cfb3ed1 100644
--- a/sys-apps/iproute2/iproute2-6.0.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-6.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

diff --git a/sys-apps/iproute2/iproute2-6.4.0-r1.ebuild 
b/sys-apps/iproute2/iproute2-6.4.0-r1.ebuild
index 2c893c325bc9..f03d49fa174a 100644
--- a/sys-apps/iproute2/iproute2-6.4.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-6.4.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

diff --git a/sys-apps/iproute2/iproute2-6.5.0.ebuild 
b/sys-apps/iproute2/iproute2-6.5.0.ebuild
index 3549e2e4b8fe..aa192060459e 100644
--- a/sys-apps/iproute2/iproute2-6.5.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.5.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-08-20 Thread Sam James

commit: 6686f7885662bb1c4f89745b0f9c3544c8ba8b32
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 21 03:48:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 21 03:48:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6686f788

sys-apps/iproute2: Stabilize 6.4.0 amd64, #912567

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.4.0.ebuild 
b/sys-apps/iproute2/iproute2-6.4.0.ebuild
index f73dda609bdf..d897c4a4d038 100644
--- a/sys-apps/iproute2/iproute2-6.4.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.4.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-08-19 Thread Sam James

commit: e4a884f87336694afe88d27d5b250306fafebc52
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 19 09:23:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 19 09:23:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4a884f8

sys-apps/iproute2: Stabilize 6.4.0 ppc64, #912567

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.4.0.ebuild 
b/sys-apps/iproute2/iproute2-6.4.0.ebuild
index 3796db598b5a..a97239fd042a 100644
--- a/sys-apps/iproute2/iproute2-6.4.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.4.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-08-19 Thread Sam James

commit: ea9722000f7a8cf300d568ff175b144f7f5d5518
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 19 09:23:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 19 09:23:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea972200

sys-apps/iproute2: Stabilize 6.4.0 hppa, #912567

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.4.0.ebuild 
b/sys-apps/iproute2/iproute2-6.4.0.ebuild
index efc9592a9bc0..1569542fa62b 100644
--- a/sys-apps/iproute2/iproute2-6.4.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.4.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-08-19 Thread Sam James

commit: f0be6219ed91b085c1fe8e497d3d97c4fc820d01
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 19 09:23:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 19 09:23:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0be6219

sys-apps/iproute2: Stabilize 6.4.0 ppc, #912567

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.4.0.ebuild 
b/sys-apps/iproute2/iproute2-6.4.0.ebuild
index 1569542fa62b..3796db598b5a 100644
--- a/sys-apps/iproute2/iproute2-6.4.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.4.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-08-19 Thread Arthur Zamarin

commit: ccce2e95bf3b61c595d06f6e20bee8dd1825d278
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Aug 19 06:58:15 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Aug 19 06:58:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccce2e95

sys-apps/iproute2: Stabilize 6.4.0 sparc, #912567

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/iproute2/iproute2-6.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.4.0.ebuild 
b/sys-apps/iproute2/iproute2-6.4.0.ebuild
index 8628d9183767..efc9592a9bc0 100644
--- a/sys-apps/iproute2/iproute2-6.4.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.4.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-08-19 Thread Sam James

commit: bae6475678d8e19266dac2a58b1ed1649848994a
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 19 06:32:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 19 06:32:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae64756

sys-apps/iproute2: Stabilize 6.4.0 arm64, #912567

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.4.0.ebuild 
b/sys-apps/iproute2/iproute2-6.4.0.ebuild
index 1a167417ca7d..2e480abaf2a5 100644
--- a/sys-apps/iproute2/iproute2-6.4.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.4.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-08-19 Thread Sam James

commit: 9a8c39fa8a77444af4e325fa5fe8d71eaabd7ffa
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 19 06:32:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 19 06:32:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a8c39fa

sys-apps/iproute2: Stabilize 6.4.0 arm, #912567

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.4.0.ebuild 
b/sys-apps/iproute2/iproute2-6.4.0.ebuild
index 2e480abaf2a5..8628d9183767 100644
--- a/sys-apps/iproute2/iproute2-6.4.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.4.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/

2023-06-27 Thread Sam James

commit: 32765ef2ededce753ce94fe8568e4254a4cacdfd
Author: Violet Purcell  inventati  org>
AuthorDate: Tue Jun 27 19:07:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 27 19:53:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32765ef2

sys-apps/iproute2: Add missing limits.h include to bridge/mdb.c

Fixes build on musl.

Signed-off-by: Violet Purcell  inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/31646
Signed-off-by: Sam James  gentoo.org>

 ...route2-6.4.0-add-missing-limits.h-include.patch | 22 ++
 sys-apps/iproute2/iproute2-6.4.0.ebuild|  1 +
 2 files changed, 23 insertions(+)

diff --git 
a/sys-apps/iproute2/files/iproute2-6.4.0-add-missing-limits.h-include.patch 
b/sys-apps/iproute2/files/iproute2-6.4.0-add-missing-limits.h-include.patch
new file mode 100644
index ..63d1397d8d3b
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-6.4.0-add-missing-limits.h-include.patch
@@ -0,0 +1,22 @@
+From 
https://github.com/shemminger/iproute2/pull/69/commits/030013c4b9ba032869f72b766e28eaf8c8099f36
 Mon Sep 17 00:00:00 2001
+From: Violet Purcell 
+Date: Tue, 27 Jun 2023 18:58:05 +
+Subject: [PATCH] bridge: mdb: add missing limits.h include
+
+Adding limits.h include for USHRT_MAX and ULONG_MAX. Don't rely on it
+being transitively include (as it is not on musl).
+
+Signed-off-by: Violet Purcell 
+--- a/bridge/mdb.c
 b/bridge/mdb.c
+@@ -15,6 +15,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "libnetlink.h"
+ #include "utils.h"
+-- 
+2.41.0
+

diff --git a/sys-apps/iproute2/iproute2-6.4.0.ebuild 
b/sys-apps/iproute2/iproute2-6.4.0.ebuild
index 5281e47ca76a..1a167417ca7d 100644
--- a/sys-apps/iproute2/iproute2-6.4.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.4.0.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907
"${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+   "${FILESDIR}"/${PN}-6.4.0-add-missing-limits.h-include.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-06-26 Thread Sam James

commit: 075798c749e9bf5131c4f0bb077f21c6207ef138
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 27 02:23:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 27 02:23:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=075798c7

sys-apps/iproute2: add 6.4.0

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/Manifest  |   1 +
 sys-apps/iproute2/iproute2-6.4.0.ebuild | 219 
 2 files changed, 220 insertions(+)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 36392cb55060..d4f10b35a52f 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -3,3 +3,4 @@ DIST iproute2-6.0.0.tar.xz 900312 BLAKE2B 
1cfb9b5a7892dec2b35e0eadbd957083e95fdc
 DIST iproute2-6.1.0.tar.xz 905512 BLAKE2B 
38249703e0a9ba74405aebdb97560b286deefa959a9c3f0e0893962b6966f5da2da46199dda6a0f9584bb473f8ba529440643d97f66e9b7619df029e3091d163
 SHA512 
4e4d3b5e1e1a5444f42671c1e6caee072e80063e34e37386695f76f85a1ab662f4513050814006e5154426cbaadfba1d86b0be14e65978d5e670a16446047b28
 DIST iproute2-6.2.0.tar.xz 911588 BLAKE2B 
d3bfaecf33ffc7861e983e8db0d6a63f4767b6c01b5346e88f51c65ed6279c4be29412ed18b8f98ed54d60a84455b73fe7745142fd0fc0f3e327a29e8bcce986
 SHA512 
b24e0fdd0f51b8b78bc3bb681e3829af47d3011e93f3892289eb070b336709a6883728ecc7627ca37f6449720f8ed1349af321c0d04454894a7175b82f7de151
 DIST iproute2-6.3.0.tar.xz 914700 BLAKE2B 
a7b48c59c8a30f56ca810136f4d9f681fe3835c260227a6229b972ce70b233d2865a6543cf3f70ed586825f9191c22d459a9fc5cc8c7dbf3ab417064c8a7
 SHA512 
aec1d8ceb54c8849a075ec1ce079678638e05ccaec093e8b3cbc7243b5fafea2a8c11f10930fced3df82f52d6750aa325178e44f9058e37a556ab108d4a968bf
+DIST iproute2-6.4.0.tar.xz 922164 BLAKE2B 
76369d2a794afd13dba1a34ee9a7425775bb7b43c22164274749c01b18d061669aa5abd51d32a15d68f48e75f4837a887dfc28ea41e34d8e4c36b2ab865628dd
 SHA512 
42330be6e061302694ea301765ff8d3cbfaeca4b1d06e39778861e4390ed211c03cb2d41498190202b659f7f5647b1ca4857410ef8c16fd601a35e7162788d21

diff --git a/sys-apps/iproute2/iproute2-6.4.0.ebuild 
b/sys-apps/iproute2/iproute2-6.4.0.ebuild
new file mode 100644
index ..5281e47ca76a
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-6.4.0.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;
+   inherit git-r3
+else
+   SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~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 bpf caps elf +iptables libbsd minimal nfs selinux split-usr"
+# Needs root
+RESTRICT="test"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+   !net-misc/arpd
+   !minimal? ( net-libs/libmnl:= )
+   atm? ( net-dialup/linux-atm )
+   berkdb? ( sys-libs/db:= )
+   bpf? ( dev-libs/libbpf:= )
+   caps? ( sys-libs/libcap )
+   elf? ( virtual/libelf:= )
+   iptables? ( >=net-firewall/iptables-1.4.20:= )
+   libbsd? ( dev-libs/libbsd )
+   nfs? ( net-libs/libtirpc:= )
+   selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support (bug #549948) and some 
defines (bug #553876)
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+   app-arch/xz-utils
+   >=sys-devel/bison-2.4
+   sys-devel/flex
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907
+   "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
+   "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+)
+
+src_prepare() {
+   default
+
+   # Fix version if necessary
+   local versionfile="include/version.h"
+   if [[ ${PV} !=  ]] && ! grep -Fq "${PV}" ${versionfile} ; then
+   einfo "Fixing version string"
+   sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+   -i ${versionfile} || die
+   fi
+
+   # echo -n is not POSIX compliant
+   sed 's@echo -n@printf@' -i configure || die
+
+   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
+
+   # Build against system headers
+   rm -r include/netinet || die #include/linux 
include/ip{,6}tables{,_common}.h include/libiptc
+   sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+   if use minimal ; then
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-05-31 Thread Sam James

commit: 9747cb13ca073c2e6a8fbdfb4407ca740e1e7208
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 04:20:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 04:20:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9747cb13

sys-apps/iproute2: Stabilize 6.3.0 hppa, #907508

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.3.0.ebuild 
b/sys-apps/iproute2/iproute2-6.3.0.ebuild
index 297693d8ab81..c4f40478d73c 100644
--- a/sys-apps/iproute2/iproute2-6.3.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.3.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-05-31 Thread Sam James

commit: 09e94ff840b92f911425da2fcd8d0bce11b9c9c2
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 03:34:15 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 03:34:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e94ff8

sys-apps/iproute2: Stabilize 6.3.0 arm, #907508

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.3.0.ebuild 
b/sys-apps/iproute2/iproute2-6.3.0.ebuild
index 6bd462ef4ce0..297693d8ab81 100644
--- a/sys-apps/iproute2/iproute2-6.3.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.3.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-05-31 Thread Sam James

commit: 5a43c67b7f97c7c3573e066b7718630273e8d5c9
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 03:34:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 03:34:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a43c67b

sys-apps/iproute2: Stabilize 6.3.0 arm64, #907508

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.3.0.ebuild 
b/sys-apps/iproute2/iproute2-6.3.0.ebuild
index 91de3a8b5052..6bd462ef4ce0 100644
--- a/sys-apps/iproute2/iproute2-6.3.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.3.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-05-31 Thread Sam James

commit: 526b6aa71adaeb8d5617fb1b7f82076d82449ea6
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 03:28:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 03:28:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=526b6aa7

sys-apps/iproute2: Stabilize 6.3.0 ppc64, #907508

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.3.0.ebuild 
b/sys-apps/iproute2/iproute2-6.3.0.ebuild
index 3c1a8f86..91de3a8b5052 100644
--- a/sys-apps/iproute2/iproute2-6.3.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.3.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-05-31 Thread Sam James

commit: 8c955ab9761713c202dba5365bdb42507365eec5
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 03:28:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 03:28:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c955ab9

sys-apps/iproute2: Stabilize 6.3.0 x86, #907508

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.3.0.ebuild 
b/sys-apps/iproute2/iproute2-6.3.0.ebuild
index 32423402a1c3..b6c41b039b74 100644
--- a/sys-apps/iproute2/iproute2-6.3.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.3.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-05-31 Thread Sam James

commit: 7fbf650f885468409329ef186fdfbd48487ff099
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 03:28:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 03:28:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fbf650f

sys-apps/iproute2: Stabilize 6.3.0 amd64, #907508

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.3.0.ebuild 
b/sys-apps/iproute2/iproute2-6.3.0.ebuild
index b6c41b039b74..f634206f85ad 100644
--- a/sys-apps/iproute2/iproute2-6.3.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.3.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-05-31 Thread Sam James

commit: 12573d920cb2a9d998707044d720143612ca40f5
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 03:28:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 03:28:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12573d92

sys-apps/iproute2: Stabilize 6.3.0 ppc, #907508

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.3.0.ebuild 
b/sys-apps/iproute2/iproute2-6.3.0.ebuild
index f634206f85ad..3c1a8f86 100644
--- a/sys-apps/iproute2/iproute2-6.3.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.3.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-04-28 Thread Sam James

commit: 4427768576500ef5e534cc84a111c89a49308b1f
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 28 07:23:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 28 07:23:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44277685

sys-apps/iproute2: add 6.3.0

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/Manifest  |   1 +
 sys-apps/iproute2/iproute2-6.3.0.ebuild | 220 
 2 files changed, 221 insertions(+)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 17a83581df8e..36392cb55060 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -2,3 +2,4 @@ DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B 
bca20ac53e1b2b3ae06186f655ad5073a0e69
 DIST iproute2-6.0.0.tar.xz 900312 BLAKE2B 
1cfb9b5a7892dec2b35e0eadbd957083e95fdc5077a1aa193329801ff25f9ed90a1fc4152756547be1fab8fe18d9a399001a4c3a61e951f64946156af6a90bae
 SHA512 
be30362b0df6906aa786f935d5f555b8b86c747fe05314066f4180ab2f7c952ae227b7cf04c15e75d8f99ca17bafb7c8dc0fb1c18f3a9e3222d98716bb449f7a
 DIST iproute2-6.1.0.tar.xz 905512 BLAKE2B 
38249703e0a9ba74405aebdb97560b286deefa959a9c3f0e0893962b6966f5da2da46199dda6a0f9584bb473f8ba529440643d97f66e9b7619df029e3091d163
 SHA512 
4e4d3b5e1e1a5444f42671c1e6caee072e80063e34e37386695f76f85a1ab662f4513050814006e5154426cbaadfba1d86b0be14e65978d5e670a16446047b28
 DIST iproute2-6.2.0.tar.xz 911588 BLAKE2B 
d3bfaecf33ffc7861e983e8db0d6a63f4767b6c01b5346e88f51c65ed6279c4be29412ed18b8f98ed54d60a84455b73fe7745142fd0fc0f3e327a29e8bcce986
 SHA512 
b24e0fdd0f51b8b78bc3bb681e3829af47d3011e93f3892289eb070b336709a6883728ecc7627ca37f6449720f8ed1349af321c0d04454894a7175b82f7de151
+DIST iproute2-6.3.0.tar.xz 914700 BLAKE2B 
a7b48c59c8a30f56ca810136f4d9f681fe3835c260227a6229b972ce70b233d2865a6543cf3f70ed586825f9191c22d459a9fc5cc8c7dbf3ab417064c8a7
 SHA512 
aec1d8ceb54c8849a075ec1ce079678638e05ccaec093e8b3cbc7243b5fafea2a8c11f10930fced3df82f52d6750aa325178e44f9058e37a556ab108d4a968bf

diff --git a/sys-apps/iproute2/iproute2-6.3.0.ebuild 
b/sys-apps/iproute2/iproute2-6.3.0.ebuild
new file mode 100644
index ..32423402a1c3
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-6.3.0.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;
+   inherit git-r3
+else
+   SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~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 bpf caps elf +iptables libbsd minimal nfs selinux split-usr"
+# Needs root
+RESTRICT="test"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+   !net-misc/arpd
+   !minimal? ( net-libs/libmnl:= )
+   atm? ( net-dialup/linux-atm )
+   berkdb? ( sys-libs/db:= )
+   bpf? ( dev-libs/libbpf:= )
+   caps? ( sys-libs/libcap )
+   elf? ( virtual/libelf:= )
+   iptables? ( >=net-firewall/iptables-1.4.20:= )
+   libbsd? ( dev-libs/libbsd )
+   nfs? ( net-libs/libtirpc:= )
+   selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support (bug #549948) and some 
defines (bug #553876)
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+   app-arch/xz-utils
+   >=sys-devel/bison-2.4
+   sys-devel/flex
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907
+   "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
+   #"${FILESDIR}"/${PN}-5.1.0-portability.patch
+   "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+)
+
+src_prepare() {
+   default
+
+   # Fix version if necessary
+   local versionfile="include/version.h"
+   if [[ ${PV} !=  ]] && ! grep -Fq "${PV}" ${versionfile} ; then
+   einfo "Fixing version string"
+   sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+   -i ${versionfile} || die
+   fi
+
+   # echo -n is not POSIX compliant
+   sed 's@echo -n@printf@' -i configure || die
+
+   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
+
+   # Build against system headers
+   rm -r include/netinet || die #include/linux 
include/ip{,6}tables{,_common}.h include/libiptc
+   sed -i

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-03-13 Thread Arthur Zamarin

commit: 87ad8203f7ef1c965f9907ca9d7ec1cdd018864a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Mar 13 19:15:43 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Mar 13 19:15:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87ad8203

sys-apps/iproute2: Stabilize 6.2.0-r1 hppa, #899554

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/iproute2/iproute2-6.2.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.2.0-r1.ebuild 
b/sys-apps/iproute2/iproute2-6.2.0-r1.ebuild
index 589cf4148f28..dc076ef7f9cf 100644
--- a/sys-apps/iproute2/iproute2-6.2.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-6.2.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-03-09 Thread Mike Gilbert

commit: af7b77d3b451d7d8b58babb471902d07d20ca803
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Mar  9 19:55:07 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Mar  9 19:55:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af7b77d3

sys-apps/iproute2: drop iproute2-default-color-auto.patch

This diverges from upstream defaults for no good reason. Users can set
up a shell alias if they really want to enable colors by default.

Bug: https://bugs.gentoo.org/820236
Bug: https://bugs.gentoo.org/886187
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/iproute2/{iproute2-6.2.0.ebuild => iproute2-6.2.0-r1.ebuild} | 1 -
 sys-apps/iproute2/iproute2-.ebuild| 1 -
 2 files changed, 2 deletions(-)

diff --git a/sys-apps/iproute2/iproute2-6.2.0.ebuild 
b/sys-apps/iproute2/iproute2-6.2.0-r1.ebuild
similarity index 99%
rename from sys-apps/iproute2/iproute2-6.2.0.ebuild
rename to sys-apps/iproute2/iproute2-6.2.0-r1.ebuild
index 3ab5ef70a410..589cf4148f28 100644
--- a/sys-apps/iproute2/iproute2-6.2.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.2.0-r1.ebuild
@@ -53,7 +53,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
#"${FILESDIR}"/${PN}-5.1.0-portability.patch
"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
-   "${FILESDIR}"/${PN}-default-color-auto.patch
 )
 
 src_prepare() {

diff --git a/sys-apps/iproute2/iproute2-.ebuild 
b/sys-apps/iproute2/iproute2-.ebuild
index 831b5a3fbf14..32423402a1c3 100644
--- a/sys-apps/iproute2/iproute2-.ebuild
+++ b/sys-apps/iproute2/iproute2-.ebuild
@@ -53,7 +53,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
#"${FILESDIR}"/${PN}-5.1.0-portability.patch
"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
-   "${FILESDIR}"/${PN}-default-color-auto.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-03-04 Thread Arthur Zamarin

commit: f83261ff940a7f1ee220cb79a9cf488e96f0a564
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 14:36:09 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 14:36:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f83261ff

sys-apps/iproute2: Stabilize 6.2.0 ppc64, #899554

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/iproute2/iproute2-6.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.2.0.ebuild 
b/sys-apps/iproute2/iproute2-6.2.0.ebuild
index d0b365fcb234..3ab5ef70a410 100644
--- a/sys-apps/iproute2/iproute2-6.2.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.2.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-03-04 Thread Arthur Zamarin

commit: 4a6aa56b0996fc41c606c8fe6cd9efacc301d648
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 12:38:44 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 12:38:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a6aa56b

sys-apps/iproute2: Stabilize 6.2.0 ppc, #899554

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/iproute2/iproute2-6.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.2.0.ebuild 
b/sys-apps/iproute2/iproute2-6.2.0.ebuild
index 34c4f3d44705..d0b365fcb234 100644
--- a/sys-apps/iproute2/iproute2-6.2.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.2.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-03-04 Thread Arthur Zamarin

commit: 4670c7bbda751300a6bf223e46e3c9a852f29cce
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 12:02:00 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 12:02:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4670c7bb

sys-apps/iproute2: Stabilize 6.2.0 amd64, #899554

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/iproute2/iproute2-6.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.2.0.ebuild 
b/sys-apps/iproute2/iproute2-6.2.0.ebuild
index 1287ba25b605..34c4f3d44705 100644
--- a/sys-apps/iproute2/iproute2-6.2.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.2.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-03-04 Thread Arthur Zamarin

commit: 7f8c6273c5af31ecd99e8ad7b0b1e2fe3771b94f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 11:16:15 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 11:16:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f8c6273

sys-apps/iproute2: Stabilize 6.2.0 sparc, #899554

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/iproute2/iproute2-6.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.2.0.ebuild 
b/sys-apps/iproute2/iproute2-6.2.0.ebuild
index afbba3830e1b..1287ba25b605 100644
--- a/sys-apps/iproute2/iproute2-6.2.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.2.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-03-04 Thread Arthur Zamarin

commit: 09363b657a387adfdaf7489e577b65dcfe2a3e7e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 11:14:55 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 11:14:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09363b65

sys-apps/iproute2: Stabilize 6.2.0 arm64, #899554

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/iproute2/iproute2-6.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.2.0.ebuild 
b/sys-apps/iproute2/iproute2-6.2.0.ebuild
index eb11ad7c1f8b..afbba3830e1b 100644
--- a/sys-apps/iproute2/iproute2-6.2.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.2.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-03-04 Thread Arthur Zamarin

commit: 372b11ffbc02853a535ebb741ad7250cf7d8e868
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 11:13:36 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 11:13:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=372b11ff

sys-apps/iproute2: Stabilize 6.2.0 x86, #899554

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/iproute2/iproute2-6.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.2.0.ebuild 
b/sys-apps/iproute2/iproute2-6.2.0.ebuild
index 7d7e846ca977..eb11ad7c1f8b 100644
--- a/sys-apps/iproute2/iproute2-6.2.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.2.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-03-04 Thread Arthur Zamarin

commit: 4f2015dec7b56ede6a718ea68b1c58206e3f450f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 11:02:22 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 11:02:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f2015de

sys-apps/iproute2: Stabilize 6.2.0 arm, #899554

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/iproute2/iproute2-6.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.2.0.ebuild 
b/sys-apps/iproute2/iproute2-6.2.0.ebuild
index 831b5a3fbf14..7d7e846ca977 100644
--- a/sys-apps/iproute2/iproute2-6.2.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.2.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-02-22 Thread Sam James

commit: 915a015cb2b38e40a06e9d5588270e94fa11f05e
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 22 12:01:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 22 12:31:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=915a015c

sys-apps/iproute2: wire up (restricted) tests

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.2.0.ebuild | 6 ++
 sys-apps/iproute2/iproute2-.ebuild  | 8 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.2.0.ebuild 
b/sys-apps/iproute2/iproute2-6.2.0.ebuild
index 6c4318197517..831b5a3fbf14 100644
--- a/sys-apps/iproute2/iproute2-6.2.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.2.0.ebuild
@@ -19,6 +19,8 @@ 
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2;
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="atm berkdb bpf caps elf +iptables libbsd minimal nfs selinux split-usr"
+# Needs root
+RESTRICT="test"
 
 # We could make libmnl optional, but it's tiny, so eh
 RDEPEND="
@@ -167,6 +169,10 @@ src_compile() {
emake V=1 NETNS_RUN_DIR=/run/netns
 }
 
+src_test() {
+   emake check
+}
+
 src_install() {
if use minimal ; then
into /

diff --git a/sys-apps/iproute2/iproute2-.ebuild 
b/sys-apps/iproute2/iproute2-.ebuild
index 46297152d6c6..831b5a3fbf14 100644
--- a/sys-apps/iproute2/iproute2-.ebuild
+++ b/sys-apps/iproute2/iproute2-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,6 +19,8 @@ 
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2;
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="atm berkdb bpf caps elf +iptables libbsd minimal nfs selinux split-usr"
+# Needs root
+RESTRICT="test"
 
 # We could make libmnl optional, but it's tiny, so eh
 RDEPEND="
@@ -167,6 +169,10 @@ src_compile() {
emake V=1 NETNS_RUN_DIR=/run/netns
 }
 
+src_test() {
+   emake check
+}
+
 src_install() {
if use minimal ; then
into /

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-02-22 Thread Sam James

commit: 611d3de816fbad17d9e284a18821b2eeaee1611c
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 22 10:06:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 22 10:26:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=611d3de8

sys-apps/iproute2: add 6.2.0

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/Manifest  |   1 +
 sys-apps/iproute2/iproute2-6.2.0.ebuild | 215 
 2 files changed, 216 insertions(+)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 400bac3c4a10..17a83581df8e 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,3 +1,4 @@
 DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B 
bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d
 SHA512 
e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22
 DIST iproute2-6.0.0.tar.xz 900312 BLAKE2B 
1cfb9b5a7892dec2b35e0eadbd957083e95fdc5077a1aa193329801ff25f9ed90a1fc4152756547be1fab8fe18d9a399001a4c3a61e951f64946156af6a90bae
 SHA512 
be30362b0df6906aa786f935d5f555b8b86c747fe05314066f4180ab2f7c952ae227b7cf04c15e75d8f99ca17bafb7c8dc0fb1c18f3a9e3222d98716bb449f7a
 DIST iproute2-6.1.0.tar.xz 905512 BLAKE2B 
38249703e0a9ba74405aebdb97560b286deefa959a9c3f0e0893962b6966f5da2da46199dda6a0f9584bb473f8ba529440643d97f66e9b7619df029e3091d163
 SHA512 
4e4d3b5e1e1a5444f42671c1e6caee072e80063e34e37386695f76f85a1ab662f4513050814006e5154426cbaadfba1d86b0be14e65978d5e670a16446047b28
+DIST iproute2-6.2.0.tar.xz 911588 BLAKE2B 
d3bfaecf33ffc7861e983e8db0d6a63f4767b6c01b5346e88f51c65ed6279c4be29412ed18b8f98ed54d60a84455b73fe7745142fd0fc0f3e327a29e8bcce986
 SHA512 
b24e0fdd0f51b8b78bc3bb681e3829af47d3011e93f3892289eb070b336709a6883728ecc7627ca37f6449720f8ed1349af321c0d04454894a7175b82f7de151

diff --git a/sys-apps/iproute2/iproute2-6.2.0.ebuild 
b/sys-apps/iproute2/iproute2-6.2.0.ebuild
new file mode 100644
index ..6c4318197517
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-6.2.0.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;
+   inherit git-r3
+else
+   SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~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 bpf caps elf +iptables libbsd minimal nfs selinux split-usr"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+   !net-misc/arpd
+   !minimal? ( net-libs/libmnl:= )
+   atm? ( net-dialup/linux-atm )
+   berkdb? ( sys-libs/db:= )
+   bpf? ( dev-libs/libbpf:= )
+   caps? ( sys-libs/libcap )
+   elf? ( virtual/libelf:= )
+   iptables? ( >=net-firewall/iptables-1.4.20:= )
+   libbsd? ( dev-libs/libbsd )
+   nfs? ( net-libs/libtirpc:= )
+   selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support (bug #549948) and some 
defines (bug #553876)
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+   app-arch/xz-utils
+   >=sys-devel/bison-2.4
+   sys-devel/flex
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907
+   "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
+   #"${FILESDIR}"/${PN}-5.1.0-portability.patch
+   "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+   "${FILESDIR}"/${PN}-default-color-auto.patch
+)
+
+src_prepare() {
+   default
+
+   # Fix version if necessary
+   local versionfile="include/version.h"
+   if [[ ${PV} !=  ]] && ! grep -Fq "${PV}" ${versionfile} ; then
+   einfo "Fixing version string"
+   sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+   -i ${versionfile} || die
+   fi
+
+   # echo -n is not POSIX compliant
+   sed 's@echo -n@printf@' -i configure || die
+
+   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
+
+   # Build against system headers
+   rm -r include/netinet || die #include/linux 
include/ip{,6}tables{,_common}.h include/libiptc
+   sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+   if use minimal ; then
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2023-02-22 Thread Sam James

commit: 818a9f96877fde432fa712beafa7183436efd868
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 22 10:07:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 22 10:26:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=818a9f96

sys-apps/iproute2: drop 6.1.0

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.1.0.ebuild | 215 
 1 file changed, 215 deletions(-)

diff --git a/sys-apps/iproute2/iproute2-6.1.0.ebuild 
b/sys-apps/iproute2/iproute2-6.1.0.ebuild
deleted file mode 100644
index 46297152d6c6..
--- a/sys-apps/iproute2/iproute2-6.1.0.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo toolchain-funcs
-
-if [[ ${PV} ==  ]] ; then
-   
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;
-   inherit git-r3
-else
-   SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~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 bpf caps elf +iptables libbsd minimal nfs selinux split-usr"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
-   !net-misc/arpd
-   !minimal? ( net-libs/libmnl:= )
-   atm? ( net-dialup/linux-atm )
-   berkdb? ( sys-libs/db:= )
-   bpf? ( dev-libs/libbpf:= )
-   caps? ( sys-libs/libcap )
-   elf? ( virtual/libelf:= )
-   iptables? ( >=net-firewall/iptables-1.4.20:= )
-   libbsd? ( dev-libs/libbsd )
-   nfs? ( net-libs/libtirpc:= )
-   selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support (bug #549948) and some 
defines (bug #553876)
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-3.16
-"
-BDEPEND="
-   app-arch/xz-utils
-   >=sys-devel/bison-2.4
-   sys-devel/flex
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907
-   "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
-   #"${FILESDIR}"/${PN}-5.1.0-portability.patch
-   "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
-   "${FILESDIR}"/${PN}-default-color-auto.patch
-)
-
-src_prepare() {
-   default
-
-   # Fix version if necessary
-   local versionfile="include/version.h"
-   if [[ ${PV} !=  ]] && ! grep -Fq "${PV}" ${versionfile} ; then
-   einfo "Fixing version string"
-   sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
-   -i ${versionfile} || die
-   fi
-
-   # echo -n is not POSIX compliant
-   sed 's@echo -n@printf@' -i configure || die
-
-   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
-
-   # Build against system headers
-   rm -r include/netinet || die #include/linux 
include/ip{,6}tables{,_common}.h include/libiptc
-   sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-   if use minimal ; then
-   sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
-   fi
-}
-
-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 || die
-   printf '#include \nint main(){return setns(0, 0);}\n' > test.c 
|| die
-   if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c 
>&/dev/null ; then
-   setns=y
-   else
-   setns=n
-   fi
-
-   echo 'int main(){return 0;}' > test.c || die
-   if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null 
; then
-   sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die
-   fi
-   popd >/dev/null || die
-
-   # run "configure" script first which will create "config.mk"...
-   # Using econf breaks since 5.14.0 
(a9c3d70d902a0473ee5c13336317006a52ce8242)
-   edo ./configure --libbpf_force $(usex bpf on off)
-
-   # Remove the definitions made by configure and allow them to be 
overridden
-   # by USE flags below.
-   # We have to do the cheesy only-sed-if-disabled because otherwise
-   # the *_FLAGS etc stuff found by configure will be used but result
-   # in a broken build.
-   if ! use berkdb ; then
-   sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die
-   fi
-
-   if ! use caps ; then
-   sed -i -e '/HAVE_CAP/d' config.mk ||

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/, sys-apps/iproute2/

2023-02-12 Thread Sam James

commit: a3de456aa64d3ed171dd41ff5b867cf1389558c6
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 13 03:20:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 13 03:23:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3de456a

sys-apps/iproute2: fix UB in strncpy (e.g. truncated ip route output)

Fix overlapping buffers passed to strncpy which is UB. format_host_rta_r writes
to the buffer passed to it, so hostname (derived from b1) & b1 partly overlap.

This gets worse with sys-libs/glibc-2.37 where the ip route output can be 
truncated,
but it was UB anyway and you can see it occurring w/ glibc-2.36.

Bug: https://lore.kernel.org/netdev/0011AC38-4823-4D0A-8580-B108D08959C2  
gentoo.org/T/#u
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30112
Thanks-to: Doug Freed  mtu.edu>
Signed-off-by: Sam James  gentoo.org>

 .../files/iproute2-6.1.0-strncpy-overlap.patch |  39 
 sys-apps/iproute2/iproute2-6.1.0-r1.ebuild | 216 +
 2 files changed, 255 insertions(+)

diff --git a/sys-apps/iproute2/files/iproute2-6.1.0-strncpy-overlap.patch 
b/sys-apps/iproute2/files/iproute2-6.1.0-strncpy-overlap.patch
new file mode 100644
index ..8b4b0abbbc7d
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-6.1.0-strncpy-overlap.patch
@@ -0,0 +1,39 @@
+fix UB in strncpy (e.g. truncated ip route output)
+
+Fix overlapping buffers passed to strncpy which is UB. format_host_rta_r writes
+to the buffer passed to it, so hostname (derived from b1) & b1 partly overlap.
+
+This gets worse with sys-libs/glibc-2.37 where the ip route output can be 
truncated,
+but it was UB anyway and you can see it occurring w/ glibc-2.36.
+
+Bug: 
https://lore.kernel.org/netdev/0011ac38-4823-4d0a-8580-b108d0895...@gentoo.org/T/#u
+Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30112
+Thanks-to: Doug Freed 
+--- a/ip/iproute.c
 b/ip/iproute.c
+@@ -753,6 +753,7 @@ int print_route(struct nlmsghdr *n, void *arg)
+   int ret;
+ 
+   SPRINT_BUF(b1);
++  SPRINT_BUF(b2);
+ 
+   if (n->nlmsg_type != RTM_NEWROUTE && n->nlmsg_type != RTM_DELROUTE) {
+   fprintf(stderr, "Not a route: %08x %08x %08x\n",
+@@ -814,7 +815,7 @@ int print_route(struct nlmsghdr *n, void *arg)
+r->rtm_dst_len);
+   } else {
+   const char *hostname = format_host_rta_r(family, 
tb[RTA_DST],
+-b1, sizeof(b1));
++b2, sizeof(b2));
+   if (hostname)
+   strncpy(b1, hostname, sizeof(b1) - 1);
+   }
+@@ -837,7 +838,7 @@ int print_route(struct nlmsghdr *n, void *arg)
+r->rtm_src_len);
+   } else {
+   const char *hostname = format_host_rta_r(family, 
tb[RTA_SRC],
+-b1, sizeof(b1));
++b2, sizeof(b2));
+   if (hostname)
+   strncpy(b1, hostname, sizeof(b1) - 1);
+   }

diff --git a/sys-apps/iproute2/iproute2-6.1.0-r1.ebuild 
b/sys-apps/iproute2/iproute2-6.1.0-r1.ebuild
new file mode 100644
index ..72f3265dd8e0
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-6.1.0-r1.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;
+   inherit git-r3
+else
+   SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~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 bpf caps elf +iptables libbsd minimal nfs selinux split-usr"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+   !net-misc/arpd
+   !minimal? ( net-libs/libmnl:= )
+   atm? ( net-dialup/linux-atm )
+   berkdb? ( sys-libs/db:= )
+   bpf? ( dev-libs/libbpf:= )
+   caps? ( sys-libs/libcap )
+   elf? ( virtual/libelf:= )
+   iptables? ( >=net-firewall/iptables-1.4.20:= )
+   libbsd? ( dev-libs/libbsd )
+   nfs? ( net-libs/libtirpc:= )
+   selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support (bug #549948) and some 
defines (bug #553876)
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+   app-arch/xz-utils
+   >=sys-devel/bison-2.4
+   sys-devel/flex
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/, sys-apps/iproute2/

2022-12-20 Thread Sam James

commit: ce0dfb3cce25546092a9a6823bfc06e3093bdf53
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 21 00:07:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 21 00:08:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce0dfb3c

sys-apps/iproute2: drop 5.18.0-r1, 5.19.0-r3

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/Manifest |   2 -
 sys-apps/iproute2/files/iproute2-5.19.0-musl.patch |  48 -
 .../files/iproute2-5.19.0-setns-check.patch|  22 ---
 sys-apps/iproute2/iproute2-5.18.0-r1.ebuild| 210 
 sys-apps/iproute2/iproute2-5.19.0-r3.ebuild| 217 -
 5 files changed, 499 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 3c1eef3d4d4b..400bac3c4a10 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,5 +1,3 @@
 DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B 
bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d
 SHA512 
e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22
-DIST iproute2-5.18.0.tar.xz 880456 BLAKE2B 
21b15d84b07199d4ddd12cbf14d94806a073f4eda659958a8459ef2ca8becbef8638dac2550cc53893cd147888b6a3b738256dac074307b37ebec8dbb460e600
 SHA512 
7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068
-DIST iproute2-5.19.0.tar.xz 892696 BLAKE2B 
ee287065d7c33c0fa97f0fc130bb3a4a3ad5ac9417ad74ce8489e64ec146ff97749d79bb6563043c8835eab91a51631576441d450693cb50808ad0d37b2ea648
 SHA512 
eb0fffb153f7cecc89b5573b7fc211d67fb1c06789fd3b0aec75ba5032521d53c51ccc52db7367e41397993df50244af84763b0b1d5a76d9dfccf013c010131b
 DIST iproute2-6.0.0.tar.xz 900312 BLAKE2B 
1cfb9b5a7892dec2b35e0eadbd957083e95fdc5077a1aa193329801ff25f9ed90a1fc4152756547be1fab8fe18d9a399001a4c3a61e951f64946156af6a90bae
 SHA512 
be30362b0df6906aa786f935d5f555b8b86c747fe05314066f4180ab2f7c952ae227b7cf04c15e75d8f99ca17bafb7c8dc0fb1c18f3a9e3222d98716bb449f7a
 DIST iproute2-6.1.0.tar.xz 905512 BLAKE2B 
38249703e0a9ba74405aebdb97560b286deefa959a9c3f0e0893962b6966f5da2da46199dda6a0f9584bb473f8ba529440643d97f66e9b7619df029e3091d163
 SHA512 
4e4d3b5e1e1a5444f42671c1e6caee072e80063e34e37386695f76f85a1ab662f4513050814006e5154426cbaadfba1d86b0be14e65978d5e670a16446047b28

diff --git a/sys-apps/iproute2/files/iproute2-5.19.0-musl.patch 
b/sys-apps/iproute2/files/iproute2-5.19.0-musl.patch
deleted file mode 100644
index e907ba9454bf..
--- a/sys-apps/iproute2/files/iproute2-5.19.0-musl.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://bugs.gentoo.org/864771
-https://github.com/shemminger/iproute2/commit/cf6b60c504d4be5e1df2b2745e55d677967831d0
-https://github.com/shemminger/iproute2/commit/28c740473510cd911b97cc5d7d23bd809a0f200b
-
-From cf6b60c504d4be5e1df2b2745e55d677967831d0 Mon Sep 17 00:00:00 2001
-From: Changhyeok Bae 
-Date: Tue, 9 Aug 2022 04:01:05 +
-Subject: [PATCH] ipstats: Add param.h for musl
-
-Fix build error for musl
-| /usr/src/debug/iproute2/5.19.0-r0/iproute2-5.19.0/ip/ipstats.c:231: 
undefined reference to `MIN'
-
-Signed-off-by: Changhyeok Bae 
 a/ip/ipstats.c
-+++ b/ip/ipstats.c
-@@ -1,6 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0+
- #include 
- #include 
-+#include 
- 
- #include "list.h"
- #include "utils.h"
-
-From 28c740473510cd911b97cc5d7d23bd809a0f200b Mon Sep 17 00:00:00 2001
-From: Stephen Hemminger 
-Date: Tue, 9 Aug 2022 13:27:33 -0700
-Subject: [PATCH] ipstats: add missing headers
-
-IWYU reports several headers are not explicitly
-included by ipstats.
-
-Signed-off-by: Stephen Hemminger 
 a/ip/ipstats.c
-+++ b/ip/ipstats.c
-@@ -1,7 +1,11 @@
- // SPDX-License-Identifier: GPL-2.0+
-+#include 
- #include 
- #include 
-+#include 
-+#include 
- #include 
-+#include 
- 
- #include "list.h"
- #include "utils.h"
-

diff --git a/sys-apps/iproute2/files/iproute2-5.19.0-setns-check.patch 
b/sys-apps/iproute2/files/iproute2-5.19.0-setns-check.patch
deleted file mode 100644
index ff97d12195e2..
--- a/sys-apps/iproute2/files/iproute2-5.19.0-setns-check.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/shemminger/iproute2/commit/d5fe96ab70928508f072a47449e9b641e46de323
-
-From d5fe96ab70928508f072a47449e9b641e46de323 Mon Sep 17 00:00:00 2001
-From: Khem Raj 
-Date: Wed, 10 Aug 2022 22:34:40 -0700
-Subject: [PATCH] configure: Define _GNU_SOURCE when checking for setns
-
-glibc defines this function only as gnu extention
-
-Signed-off-by: Khem Raj 
-Signed-off-by: Stephen Hemminger 
 a/configure
-+++ b/configure
-@@ -191,6 +191,7 @@ check_ipt_lib_dir()
- check_setns()
- {
- cat >$TMPDIR/setnstest.c <
- int main(int argc, char **argv)
- {
-

diff --git a/sys-apps/iproute2/iproute2-5.18.0-r1.ebuild 
b/sys-apps/iproute2/iproute2-5.18.0-r1.ebuild
deleted file

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2022-12-14 Thread Sam James

commit: 5d235ad01d10801e229067ed7de352fa83b9c2d2
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 15 05:43:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 15 05:43:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d235ad0

sys-apps/iproute2: Stabilize 6.0.0 arm64, #886013

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.0.0.ebuild 
b/sys-apps/iproute2/iproute2-6.0.0.ebuild
index 7f8e5770bb01..657b99ca8e96 100644
--- a/sys-apps/iproute2/iproute2-6.0.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2022-12-14 Thread Sam James

commit: bd09dd73a9942ce687b9ef04ea7f6345cebb4ec7
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 15 05:43:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 15 05:43:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd09dd73

sys-apps/iproute2: Stabilize 6.0.0 sparc, #886013

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.0.0.ebuild 
b/sys-apps/iproute2/iproute2-6.0.0.ebuild
index 657b99ca8e96..0a8ceb953a7c 100644
--- a/sys-apps/iproute2/iproute2-6.0.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2022-12-14 Thread Sam James

commit: 549522866690ee5e5eaf11858902f8dc3fc63d23
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 15 05:43:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 15 05:43:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54952286

sys-apps/iproute2: Stabilize 6.0.0 hppa, #886013

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.0.0.ebuild 
b/sys-apps/iproute2/iproute2-6.0.0.ebuild
index 0a8ceb953a7c..b1a064050fbb 100644
--- a/sys-apps/iproute2/iproute2-6.0.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2022-12-14 Thread Sam James

commit: 871ad11ac4618a1baeb2bf2d8f94777556f34205
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 15 05:23:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 15 05:23:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=871ad11a

sys-apps/iproute2: Stabilize 6.0.0 ppc64, #886013

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.0.0.ebuild 
b/sys-apps/iproute2/iproute2-6.0.0.ebuild
index a69a4e7596a0..7f8e5770bb01 100644
--- a/sys-apps/iproute2/iproute2-6.0.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2022-12-14 Thread Sam James

commit: 42bdf13490f4f51df7980f847eac90150270f4d3
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 15 05:23:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 15 05:23:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42bdf134

sys-apps/iproute2: Stabilize 6.0.0 x86, #886013

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.0.0.ebuild 
b/sys-apps/iproute2/iproute2-6.0.0.ebuild
index bedc1cb9e21b..f5915692945e 100644
--- a/sys-apps/iproute2/iproute2-6.0.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2022-12-14 Thread Sam James

commit: 09e14d9fa6635eb57dfc7c2ecf36282afef42661
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 15 05:23:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 15 05:23:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e14d9f

sys-apps/iproute2: Stabilize 6.0.0 amd64, #886013

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.0.0.ebuild 
b/sys-apps/iproute2/iproute2-6.0.0.ebuild
index f5915692945e..a69a4e7596a0 100644
--- a/sys-apps/iproute2/iproute2-6.0.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2022-12-14 Thread Sam James

commit: 0282f258eaafb89ec3372eb919d75d65524e63ca
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 15 05:23:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 15 05:23:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0282f258

sys-apps/iproute2: Stabilize 6.0.0 arm, #886013

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.0.0.ebuild 
b/sys-apps/iproute2/iproute2-6.0.0.ebuild
index 46297152d6c6..d226b1ef463b 100644
--- a/sys-apps/iproute2/iproute2-6.0.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2022-12-14 Thread Sam James

commit: 4dfd81080f15b09710a915a9fb5e9e02ea2e216a
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 15 05:23:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 15 05:23:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dfd8108

sys-apps/iproute2: Stabilize 6.0.0 ppc, #886013

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/iproute2-6.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-6.0.0.ebuild 
b/sys-apps/iproute2/iproute2-6.0.0.ebuild
index d226b1ef463b..bedc1cb9e21b 100644
--- a/sys-apps/iproute2/iproute2-6.0.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2022-12-14 Thread Sam James

commit: 823a0f8573a0964e4f7f8a520022589f3db3c9a4
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 15 05:10:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 15 05:11:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=823a0f85

sys-apps/iproute2: add 6.1.0

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/Manifest  |   1 +
 sys-apps/iproute2/iproute2-6.1.0.ebuild | 215 
 2 files changed, 216 insertions(+)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 451a9b779cf6..3c1eef3d4d4b 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -2,3 +2,4 @@ DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B 
bca20ac53e1b2b3ae06186f655ad5073a0e69
 DIST iproute2-5.18.0.tar.xz 880456 BLAKE2B 
21b15d84b07199d4ddd12cbf14d94806a073f4eda659958a8459ef2ca8becbef8638dac2550cc53893cd147888b6a3b738256dac074307b37ebec8dbb460e600
 SHA512 
7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068
 DIST iproute2-5.19.0.tar.xz 892696 BLAKE2B 
ee287065d7c33c0fa97f0fc130bb3a4a3ad5ac9417ad74ce8489e64ec146ff97749d79bb6563043c8835eab91a51631576441d450693cb50808ad0d37b2ea648
 SHA512 
eb0fffb153f7cecc89b5573b7fc211d67fb1c06789fd3b0aec75ba5032521d53c51ccc52db7367e41397993df50244af84763b0b1d5a76d9dfccf013c010131b
 DIST iproute2-6.0.0.tar.xz 900312 BLAKE2B 
1cfb9b5a7892dec2b35e0eadbd957083e95fdc5077a1aa193329801ff25f9ed90a1fc4152756547be1fab8fe18d9a399001a4c3a61e951f64946156af6a90bae
 SHA512 
be30362b0df6906aa786f935d5f555b8b86c747fe05314066f4180ab2f7c952ae227b7cf04c15e75d8f99ca17bafb7c8dc0fb1c18f3a9e3222d98716bb449f7a
+DIST iproute2-6.1.0.tar.xz 905512 BLAKE2B 
38249703e0a9ba74405aebdb97560b286deefa959a9c3f0e0893962b6966f5da2da46199dda6a0f9584bb473f8ba529440643d97f66e9b7619df029e3091d163
 SHA512 
4e4d3b5e1e1a5444f42671c1e6caee072e80063e34e37386695f76f85a1ab662f4513050814006e5154426cbaadfba1d86b0be14e65978d5e670a16446047b28

diff --git a/sys-apps/iproute2/iproute2-6.1.0.ebuild 
b/sys-apps/iproute2/iproute2-6.1.0.ebuild
new file mode 100644
index ..46297152d6c6
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-6.1.0.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;
+   inherit git-r3
+else
+   SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~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 bpf caps elf +iptables libbsd minimal nfs selinux split-usr"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+   !net-misc/arpd
+   !minimal? ( net-libs/libmnl:= )
+   atm? ( net-dialup/linux-atm )
+   berkdb? ( sys-libs/db:= )
+   bpf? ( dev-libs/libbpf:= )
+   caps? ( sys-libs/libcap )
+   elf? ( virtual/libelf:= )
+   iptables? ( >=net-firewall/iptables-1.4.20:= )
+   libbsd? ( dev-libs/libbsd )
+   nfs? ( net-libs/libtirpc:= )
+   selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support (bug #549948) and some 
defines (bug #553876)
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+   app-arch/xz-utils
+   >=sys-devel/bison-2.4
+   sys-devel/flex
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907
+   "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
+   #"${FILESDIR}"/${PN}-5.1.0-portability.patch
+   "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+   "${FILESDIR}"/${PN}-default-color-auto.patch
+)
+
+src_prepare() {
+   default
+
+   # Fix version if necessary
+   local versionfile="include/version.h"
+   if [[ ${PV} !=  ]] && ! grep -Fq "${PV}" ${versionfile} ; then
+   einfo "Fixing version string"
+   sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+   -i ${versionfile} || die
+   fi
+
+   # echo -n is not POSIX compliant
+   sed 's@echo -n@printf@' -i configure || die
+
+   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
+
+   # Build against system headers
+   rm -r include/netinet || die #include/linux 
include/ip{,6}tables{,_common}.h include/libiptc
+   sed -i

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2022-10-09 Thread Sam James

commit: d5a4045a84c64e480c52497a9bc98ffac15a893a
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct  9 23:12:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct  9 23:12:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5a4045a

sys-apps/iproute2: add 6.0.0

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/Manifest  |   1 +
 sys-apps/iproute2/iproute2-6.0.0.ebuild | 215 
 2 files changed, 216 insertions(+)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 5e3eca8bba68..451a9b779cf6 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,3 +1,4 @@
 DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B 
bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d
 SHA512 
e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22
 DIST iproute2-5.18.0.tar.xz 880456 BLAKE2B 
21b15d84b07199d4ddd12cbf14d94806a073f4eda659958a8459ef2ca8becbef8638dac2550cc53893cd147888b6a3b738256dac074307b37ebec8dbb460e600
 SHA512 
7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068
 DIST iproute2-5.19.0.tar.xz 892696 BLAKE2B 
ee287065d7c33c0fa97f0fc130bb3a4a3ad5ac9417ad74ce8489e64ec146ff97749d79bb6563043c8835eab91a51631576441d450693cb50808ad0d37b2ea648
 SHA512 
eb0fffb153f7cecc89b5573b7fc211d67fb1c06789fd3b0aec75ba5032521d53c51ccc52db7367e41397993df50244af84763b0b1d5a76d9dfccf013c010131b
+DIST iproute2-6.0.0.tar.xz 900312 BLAKE2B 
1cfb9b5a7892dec2b35e0eadbd957083e95fdc5077a1aa193329801ff25f9ed90a1fc4152756547be1fab8fe18d9a399001a4c3a61e951f64946156af6a90bae
 SHA512 
be30362b0df6906aa786f935d5f555b8b86c747fe05314066f4180ab2f7c952ae227b7cf04c15e75d8f99ca17bafb7c8dc0fb1c18f3a9e3222d98716bb449f7a

diff --git a/sys-apps/iproute2/iproute2-6.0.0.ebuild 
b/sys-apps/iproute2/iproute2-6.0.0.ebuild
new file mode 100644
index ..46297152d6c6
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-6.0.0.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;
+   inherit git-r3
+else
+   SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~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 bpf caps elf +iptables libbsd minimal nfs selinux split-usr"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+   !net-misc/arpd
+   !minimal? ( net-libs/libmnl:= )
+   atm? ( net-dialup/linux-atm )
+   berkdb? ( sys-libs/db:= )
+   bpf? ( dev-libs/libbpf:= )
+   caps? ( sys-libs/libcap )
+   elf? ( virtual/libelf:= )
+   iptables? ( >=net-firewall/iptables-1.4.20:= )
+   libbsd? ( dev-libs/libbsd )
+   nfs? ( net-libs/libtirpc:= )
+   selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support (bug #549948) and some 
defines (bug #553876)
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+   app-arch/xz-utils
+   >=sys-devel/bison-2.4
+   sys-devel/flex
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907
+   "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
+   #"${FILESDIR}"/${PN}-5.1.0-portability.patch
+   "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+   "${FILESDIR}"/${PN}-default-color-auto.patch
+)
+
+src_prepare() {
+   default
+
+   # Fix version if necessary
+   local versionfile="include/version.h"
+   if [[ ${PV} !=  ]] && ! grep -Fq "${PV}" ${versionfile} ; then
+   einfo "Fixing version string"
+   sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+   -i ${versionfile} || die
+   fi
+
+   # echo -n is not POSIX compliant
+   sed 's@echo -n@printf@' -i configure || die
+
+   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
+
+   # Build against system headers
+   rm -r include/netinet || die #include/linux 
include/ip{,6}tables{,_common}.h include/libiptc
+   sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+   if use minimal ; then
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2022-10-09 Thread Sam James

commit: a6eba3eb654acab01f3aa795cfdf008312424899
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct  9 22:14:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct  9 23:10:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6eba3eb

sys-apps/iproute2: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/metadata.xml | 33 +
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml
index 10e4c7acb786..f4d408562814 100644
--- a/sys-apps/iproute2/metadata.xml
+++ b/sys-apps/iproute2/metadata.xml
@@ -1,20 +1,21 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   base-sys...@gentoo.org
-   Gentoo Base System
-
-
-   build programs that use berkdb (just arpd)
-   Use dev-libs/libbpf
-   support loading eBPF programs from ELFs (e.g. LLVM's 
eBPF backend)
-   include support for iptables filtering
-   Use dev-libs/libbsd instead of internal 
funcs
-   only install ip and tc programs, without eBPF 
support
-   Support RPC lookups via net-libs/libtirpc 
in ss
-
-
-   cpe:/a:iproute2_project:iproute2
-
+   
+   base-sys...@gentoo.org
+   Gentoo Base System
+   
+   
+   build programs that use berkdb (just 
arpd)
+   Use dev-libs/libbpf
+   support loading eBPF programs from ELFs (e.g. 
LLVM's eBPF backend)
+   include support for iptables 
filtering
+   Use dev-libs/libbsd instead of 
internal funcs
+   only install ip and tc programs, without 
eBPF support
+   Support RPC lookups via 
net-libs/libtirpc in ss
+   
+   
+   cpe:/a:iproute2_project:iproute2
+   shemminger/iproute2
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2022-10-08 Thread Mike Gilbert

commit: e9573614298a332abbdbec4eb7de90788a89c60c
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Oct  8 21:02:17 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Oct  8 21:02:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9573614

sys-apps/iproute2: rename ifstat command

Avoids a file collision with net-analyzer/ifstat.

Closes: https://bugs.gentoo.org/868321
Signed-off-by: Mike Gilbert  gentoo.org>

 .../iproute2/{iproute2-5.19.0-r2.ebuild => iproute2-5.19.0-r3.ebuild} | 4 
 sys-apps/iproute2/iproute2-.ebuild| 4 
 2 files changed, 8 insertions(+)

diff --git a/sys-apps/iproute2/iproute2-5.19.0-r2.ebuild 
b/sys-apps/iproute2/iproute2-5.19.0-r3.ebuild
similarity index 98%
rename from sys-apps/iproute2/iproute2-5.19.0-r2.ebuild
rename to sys-apps/iproute2/iproute2-5.19.0-r3.ebuild
index f0a6ca796fa7..a201d0f68938 100644
--- a/sys-apps/iproute2/iproute2-5.19.0-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-5.19.0-r3.ebuild
@@ -195,6 +195,10 @@ src_install() {
insinto /usr/include
doins include/libnetlink.h
 
+   # Collides with net-analyzer/ifstat
+   # https://bugs.gentoo.org/868321
+   mv "${ED}"/sbin/ifstat{,-iproute2} || die
+
if use split-usr ; then
# Can remove compatibility symlink in a year: 2023-05-28.
# bug #547264

diff --git a/sys-apps/iproute2/iproute2-.ebuild 
b/sys-apps/iproute2/iproute2-.ebuild
index 8aaa6cc859d8..46297152d6c6 100644
--- a/sys-apps/iproute2/iproute2-.ebuild
+++ b/sys-apps/iproute2/iproute2-.ebuild
@@ -193,6 +193,10 @@ src_install() {
insinto /usr/include
doins include/libnetlink.h
 
+   # Collides with net-analyzer/ifstat
+   # https://bugs.gentoo.org/868321
+   mv "${ED}"/sbin/ifstat{,-iproute2} || die
+
if use split-usr ; then
# Can remove compatibility symlink in a year: 2023-05-28.
# bug #547264

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/

2022-08-13 Thread Sam James

commit: 7be86a097533f3ec489851a31aa6cb749afca66f
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 13 13:53:24 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 13 13:53:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7be86a09

sys-apps/iproute2: backport setns check fix

Could have led to a build w/o setns support.

Signed-off-by: Sam James  gentoo.org>

 .../files/iproute2-5.19.0-setns-check.patch| 22 ++
 ...-5.19.0-r1.ebuild => iproute2-5.19.0-r2.ebuild} |  1 +
 2 files changed, 23 insertions(+)

diff --git a/sys-apps/iproute2/files/iproute2-5.19.0-setns-check.patch 
b/sys-apps/iproute2/files/iproute2-5.19.0-setns-check.patch
new file mode 100644
index ..ff97d12195e2
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-5.19.0-setns-check.patch
@@ -0,0 +1,22 @@
+https://github.com/shemminger/iproute2/commit/d5fe96ab70928508f072a47449e9b641e46de323
+
+From d5fe96ab70928508f072a47449e9b641e46de323 Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Wed, 10 Aug 2022 22:34:40 -0700
+Subject: [PATCH] configure: Define _GNU_SOURCE when checking for setns
+
+glibc defines this function only as gnu extention
+
+Signed-off-by: Khem Raj 
+Signed-off-by: Stephen Hemminger 
+--- a/configure
 b/configure
+@@ -191,6 +191,7 @@ check_ipt_lib_dir()
+ check_setns()
+ {
+ cat >$TMPDIR/setnstest.c <
+ int main(int argc, char **argv)
+ {
+

diff --git a/sys-apps/iproute2/iproute2-5.19.0-r1.ebuild 
b/sys-apps/iproute2/iproute2-5.19.0-r2.ebuild
similarity index 99%
rename from sys-apps/iproute2/iproute2-5.19.0-r1.ebuild
rename to sys-apps/iproute2/iproute2-5.19.0-r2.ebuild
index 2ff11fd9105b..f0a6ca796fa7 100644
--- a/sys-apps/iproute2/iproute2-5.19.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-5.19.0-r2.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
#"${FILESDIR}"/${PN}-5.1.0-portability.patch
"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
"${FILESDIR}"/${P}-musl.patch
+   "${FILESDIR}"/${P}-setns-check.patch
"${FILESDIR}"/${PN}-default-color-auto.patch
 )

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/

2022-08-12 Thread Patrick McLean

commit: 536cf403364a92aa6dbfb443da92ce5fe2e71277
Author: Patrick McLean  gentoo  org>
AuthorDate: Fri Aug 12 19:24:13 2022 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Fri Aug 12 19:24:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=536cf403

sys-apps/iproute2: Revbump, enable colour by default (bug #820236)

Also add patch to  ebuild.

Closes: https://bugs.gentoo.org/820236
Signed-off-by: Patrick McLean  gentoo.org>

 sys-apps/iproute2/files/iproute2-default-color-auto.patch  | 7 +++
 .../iproute2/{iproute2-5.19.0.ebuild => iproute2-5.19.0-r1.ebuild} | 1 +
 sys-apps/iproute2/iproute2-.ebuild | 1 +
 3 files changed, 9 insertions(+)

diff --git a/sys-apps/iproute2/files/iproute2-default-color-auto.patch 
b/sys-apps/iproute2/files/iproute2-default-color-auto.patch
new file mode 100644
index ..eb017ecd61c8
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-default-color-auto.patch
@@ -0,0 +1,7 @@
+diff --git a/ip/ip.c b/ip/ip.c
+index 40d2998a..454da1a3 100644
+--- a/ip/ip.c
 b/ip/ip.c
+@@ -169 +169 @@ int main(int argc, char **argv)
+-  int color = 0;
++  int color = COLOR_OPT_AUTO;

diff --git a/sys-apps/iproute2/iproute2-5.19.0.ebuild 
b/sys-apps/iproute2/iproute2-5.19.0-r1.ebuild
similarity index 99%
rename from sys-apps/iproute2/iproute2-5.19.0.ebuild
rename to sys-apps/iproute2/iproute2-5.19.0-r1.ebuild
index 0ad41a520dc0..2ff11fd9105b 100644
--- a/sys-apps/iproute2/iproute2-5.19.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.19.0-r1.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
#"${FILESDIR}"/${PN}-5.1.0-portability.patch
"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
"${FILESDIR}"/${P}-musl.patch
+   "${FILESDIR}"/${PN}-default-color-auto.patch
 )
 
 src_prepare() {

diff --git a/sys-apps/iproute2/iproute2-.ebuild 
b/sys-apps/iproute2/iproute2-.ebuild
index b3c0b0e984dc..8aaa6cc859d8 100644
--- a/sys-apps/iproute2/iproute2-.ebuild
+++ b/sys-apps/iproute2/iproute2-.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
#"${FILESDIR}"/${PN}-5.1.0-portability.patch
"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+   "${FILESDIR}"/${PN}-default-color-auto.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/

2022-08-10 Thread Sam James

commit: a92a9f6ab23a9b1eee9b8486a71455c1907c7e92
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 10 08:07:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 10 08:07:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a92a9f6a

sys-apps/iproute2: fix musl build

Closes: https://bugs.gentoo.org/864771
Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/files/iproute2-5.19.0-musl.patch | 48 ++
 sys-apps/iproute2/iproute2-5.19.0.ebuild   |  1 +
 2 files changed, 49 insertions(+)

diff --git a/sys-apps/iproute2/files/iproute2-5.19.0-musl.patch 
b/sys-apps/iproute2/files/iproute2-5.19.0-musl.patch
new file mode 100644
index ..e907ba9454bf
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-5.19.0-musl.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/864771
+https://github.com/shemminger/iproute2/commit/cf6b60c504d4be5e1df2b2745e55d677967831d0
+https://github.com/shemminger/iproute2/commit/28c740473510cd911b97cc5d7d23bd809a0f200b
+
+From cf6b60c504d4be5e1df2b2745e55d677967831d0 Mon Sep 17 00:00:00 2001
+From: Changhyeok Bae 
+Date: Tue, 9 Aug 2022 04:01:05 +
+Subject: [PATCH] ipstats: Add param.h for musl
+
+Fix build error for musl
+| /usr/src/debug/iproute2/5.19.0-r0/iproute2-5.19.0/ip/ipstats.c:231: 
undefined reference to `MIN'
+
+Signed-off-by: Changhyeok Bae 
+--- a/ip/ipstats.c
 b/ip/ipstats.c
+@@ -1,6 +1,7 @@
+ // SPDX-License-Identifier: GPL-2.0+
+ #include 
+ #include 
++#include 
+ 
+ #include "list.h"
+ #include "utils.h"
+
+From 28c740473510cd911b97cc5d7d23bd809a0f200b Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger 
+Date: Tue, 9 Aug 2022 13:27:33 -0700
+Subject: [PATCH] ipstats: add missing headers
+
+IWYU reports several headers are not explicitly
+included by ipstats.
+
+Signed-off-by: Stephen Hemminger 
+--- a/ip/ipstats.c
 b/ip/ipstats.c
+@@ -1,7 +1,11 @@
+ // SPDX-License-Identifier: GPL-2.0+
++#include 
+ #include 
+ #include 
++#include 
++#include 
+ #include 
++#include 
+ 
+ #include "list.h"
+ #include "utils.h"
+

diff --git a/sys-apps/iproute2/iproute2-5.19.0.ebuild 
b/sys-apps/iproute2/iproute2-5.19.0.ebuild
index b3c0b0e984dc..0ad41a520dc0 100644
--- a/sys-apps/iproute2/iproute2-5.19.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.19.0.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
#"${FILESDIR}"/${PN}-5.1.0-portability.patch
"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+   "${FILESDIR}"/${P}-musl.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2022-08-09 Thread Sam James

commit: 4d6e600711daf1caaea609d9346d7151257670e8
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug  9 19:18:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug  9 20:05:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d6e6007

sys-apps/iproute2: add 5.19.0

Signed-off-by: Sam James  gentoo.org>

 sys-apps/iproute2/Manifest | 1 +
 sys-apps/iproute2/{iproute2-.ebuild => iproute2-5.19.0.ebuild} | 6 +++---
 sys-apps/iproute2/iproute2-.ebuild | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 9a5276ea994f..5e3eca8bba68 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,2 +1,3 @@
 DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B 
bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d
 SHA512 
e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22
 DIST iproute2-5.18.0.tar.xz 880456 BLAKE2B 
21b15d84b07199d4ddd12cbf14d94806a073f4eda659958a8459ef2ca8becbef8638dac2550cc53893cd147888b6a3b738256dac074307b37ebec8dbb460e600
 SHA512 
7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068
+DIST iproute2-5.19.0.tar.xz 892696 BLAKE2B 
ee287065d7c33c0fa97f0fc130bb3a4a3ad5ac9417ad74ce8489e64ec146ff97749d79bb6563043c8835eab91a51631576441d450693cb50808ad0d37b2ea648
 SHA512 
eb0fffb153f7cecc89b5573b7fc211d67fb1c06789fd3b0aec75ba5032521d53c51ccc52db7367e41397993df50244af84763b0b1d5a76d9dfccf013c010131b

diff --git a/sys-apps/iproute2/iproute2-.ebuild 
b/sys-apps/iproute2/iproute2-5.19.0.ebuild
similarity index 98%
copy from sys-apps/iproute2/iproute2-.ebuild
copy to sys-apps/iproute2/iproute2-5.19.0.ebuild
index c0e45a9ec79e..b3c0b0e984dc 100644
--- a/sys-apps/iproute2/iproute2-.ebuild
+++ b/sys-apps/iproute2/iproute2-5.19.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit eapi8-dosym edo toolchain-funcs
+inherit edo toolchain-funcs
 
 if [[ ${PV} ==  ]] ; then

EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;
@@ -196,7 +196,7 @@ src_install() {
# Can remove compatibility symlink in a year: 2023-05-28.
# bug #547264
mv "${ED}"/sbin/ss "${ED}"/bin/ss || die
-   dosym8 -r /bin/ss /sbin/ss
+   dosym -r /bin/ss /sbin/ss
fi
 
if use berkdb ; then

diff --git a/sys-apps/iproute2/iproute2-.ebuild 
b/sys-apps/iproute2/iproute2-.ebuild
index c0e45a9ec79e..b3c0b0e984dc 100644
--- a/sys-apps/iproute2/iproute2-.ebuild
+++ b/sys-apps/iproute2/iproute2-.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit eapi8-dosym edo toolchain-funcs
+inherit edo toolchain-funcs
 
 if [[ ${PV} ==  ]] ; then

EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;
@@ -196,7 +196,7 @@ src_install() {
# Can remove compatibility symlink in a year: 2023-05-28.
# bug #547264
mv "${ED}"/sbin/ss "${ED}"/bin/ss || die
-   dosym8 -r /bin/ss /sbin/ss
+   dosym -r /bin/ss /sbin/ss
fi
 
if use berkdb ; then

[gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/

2022-06-21 Thread David Seifert

commit: 658e1de01d689eebeb751967af2f01ff4f775dc2
Author: David Seifert  gentoo  org>
AuthorDate: Tue Jun 21 09:40:39 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Jun 21 09:40:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=658e1de0

sys-apps/iproute2: drop 5.17.0

Signed-off-by: David Seifert  gentoo.org>

 sys-apps/iproute2/Manifest   |   1 -
 sys-apps/iproute2/iproute2-5.17.0.ebuild | 169 ---
 2 files changed, 170 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 2b683e35def6..9a5276ea994f 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,3 +1,2 @@
 DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B 
bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d
 SHA512 
e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22
-DIST iproute2-5.17.0.tar.xz 870908 BLAKE2B 
4310829ebbde7fd21ecc28856deddabfa93f26bf7937b3ef3c0e05e4e0bf925a9b167334efaefe3e275d196e7370a290679739ae8d8397dc6511f4da25dfd459
 SHA512 
fcffe96fb4819305ddf5c3764b100bd1d204069cf53a6bd776c2716144f574b4fc17963fc231a83ad253cce6a563814556eeb60b211ba9b0b87330186259b34d
 DIST iproute2-5.18.0.tar.xz 880456 BLAKE2B 
21b15d84b07199d4ddd12cbf14d94806a073f4eda659958a8459ef2ca8becbef8638dac2550cc53893cd147888b6a3b738256dac074307b37ebec8dbb460e600
 SHA512 
7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068

diff --git a/sys-apps/iproute2/iproute2-5.17.0.ebuild 
b/sys-apps/iproute2/iproute2-5.17.0.ebuild
deleted file mode 100644
index f9085bf91567..
--- a/sys-apps/iproute2/iproute2-5.17.0.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-if [[ ${PV} == "" ]] ; then
-   
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;
-   inherit git-r3
-else
-   SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~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 bpf caps elf +iptables libbsd minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
-   !net-misc/arpd
-   !minimal? ( net-libs/libmnl:= )
-   atm? ( net-dialup/linux-atm )
-   berkdb? ( sys-libs/db:= )
-   bpf? ( dev-libs/libbpf:= )
-   caps? ( sys-libs/libcap )
-   elf? ( virtual/libelf:= )
-   iptables? ( >=net-firewall/iptables-1.4.20:= )
-   libbsd? ( dev-libs/libbsd )
-   selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support #549948 and some defines 
#553876
-DEPEND="
-   ${RDEPEND}
-   >=sys-kernel/linux-headers-3.16
-"
-BDEPEND="
-   app-arch/xz-utils
-   >=sys-devel/bison-2.4
-   sys-devel/flex
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907
-   "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
-   #"${FILESDIR}"/${PN}-5.1.0-portability.patch
-   "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
-)
-
-doecho() {
-   echo "${@}"
-   "${@}" || die
-}
-
-src_prepare() {
-   default
-
-   # Fix version if necessary
-   local versionfile="include/version.h"
-   if [[ "${PV}" !=  ]] && ! grep -Fq "${PV}" ${versionfile} ; then
-   einfo "Fixing version string"
-   sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
-   -i ${versionfile} || die
-   fi
-
-   # echo -n is not POSIX compliant
-   sed 's@echo -n@printf@' -i configure || die
-
-   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
-
-   # Build against system headers
-   rm -r include/netinet || die #include/linux 
include/ip{,6}tables{,_common}.h include/libiptc
-   sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-   if use minimal ; then
-   sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
-   fi
-}
-
-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 || die
-   printf '#include \nint main(){return setns(0,

1 2 3 4 >

1 - 100 of 310 matches

Mail list logo