[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/, 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/, 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/, 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/, 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/, 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/, sys-apps/iproute2/files/

2022-01-13 Thread Sam James 
commit: 405e55107265eada57895caab0c39d0b17b5a270
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 13 08:08:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 13 08:10:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=405e5510

sys-apps/iproute2: fix build on musl

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

 ...route2-5.16.0-fix-ax25.h-include-for-musl.patch | 23 ++
 sys-apps/iproute2/iproute2-5.16.0.ebuild   |  1 +
 2 files changed, 24 insertions(+)

diff --git 
a/sys-apps/iproute2/files/iproute2-5.16.0-fix-ax25.h-include-for-musl.patch 
b/sys-apps/iproute2/files/iproute2-5.16.0-fix-ax25.h-include-for-musl.patch
new file mode 100644
index ..8644a93ba115
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-5.16.0-fix-ax25.h-include-for-musl.patch
@@ -0,0 +1,23 @@
+From: Sam James 
+Date: Thu, 13 Jan 2022 08:05:33 +
+Subject: [PATCH] Fix ax25.h include for musl
+
+ax25.h isn't guaranteed to be avilable in netax25/*;
+it's dependent on our choice of libc (it's not available
+on musl at least) [0].
+
+Let's use the version from linux-headers.
+
+[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers
+Bug: https://bugs.gentoo.org/831102
+--- a/lib/ax25_ntop.c
 b/lib/ax25_ntop.c
+@@ -2,7 +2,7 @@
+ 
+ #include 
+ #include 
+-#include 
++#include 
+ 
+ #include "utils.h"
+ 

diff --git a/sys-apps/iproute2/iproute2-5.16.0.ebuild 
b/sys-apps/iproute2/iproute2-5.16.0.ebuild
index c26a054ac839..a86a737045cb 100644
--- a/sys-apps/iproute2/iproute2-5.16.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.16.0.ebuild
@@ -50,6 +50,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}-5.16.0-fix-ax25.h-include-for-musl.patch
 )
 
 doecho() {

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

2021-02-23 Thread Lars Wendler 
commit: 7ee8c2f8e9f83cb62171ee9d37827c08db1b23bc
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Feb 23 14:36:32 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Feb 23 14:55:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ee8c2f8

sys-apps/iproute2: Bump to version 5.11.0

Dropped keywords until dev-libs/libbpf has synced keywords

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/iproute2/Manifest |   1 +
 .../files/iproute2-5.11.0-configure-nomagic.patch  | 235 +
 sys-apps/iproute2/iproute2-5.11.0.ebuild   | 170 +++
 sys-apps/iproute2/metadata.xml |   2 +
 4 files changed, 408 insertions(+)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index e8d4aadc7e0..f91943551f4 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,2 +1,3 @@
 DIST iproute2-5.10.0.tar.xz 798776 BLAKE2B 
8c17e65f03427f45b71dc17b289b272545549a6687257498676a23e4fdc4a590a7215bfdba3c7ac4b1ccde6c38ba8e3eb222eea2532374fa9680633aa198d347
 SHA512 
a468eefa797898b6de452212aa432c0a931434defacae5fb4335754c1292c5d86a8c8dbf3017f90cec266d71a2a17ae469aac17e1a85a5cbddc70814313e4c13
+DIST iproute2-5.11.0.tar.xz 822044 BLAKE2B 
e52e2334a4f6271a23e9393a3b11fc7e8e070ecff178bda1cf87705a55b59018edc8c28751e4fc6a7d877c19e6da772765afbdc5944800f98bf176513595e5bb
 SHA512 
f592728ec819fc34cba04b1c04275e783aed86084fe31948e1776e6e473c8c1416aaf8101c19b51ddb4044af1cd2157827c0f91546b33badb448466eae9a2fda
 DIST iproute2-5.7.0.tar.xz 764436 BLAKE2B 
842229730139f8931c4ff3d548fe56c7c86b6bb7be5cc1a7dd896ddce34c039467fb90d0c258cdc91276edc59b9b19f53c39a36c79b54b15a78436b44c595eed
 SHA512 
d5ef68e0eb8e84fbff68c2e7dd4097b9ceb438c928d17ede4130876802dfeafe8bf08d82b4fd39005314e0679c0b261aaa3d6a0a2ff364074a43a043a855a634

diff --git a/sys-apps/iproute2/files/iproute2-5.11.0-configure-nomagic.patch 
b/sys-apps/iproute2/files/iproute2-5.11.0-configure-nomagic.patch
new file mode 100644
index 000..8ccd02a10e2
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-5.11.0-configure-nomagic.patch
@@ -0,0 +1,235 @@
+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 

+
+--- iproute2-5.11.0/bridge/Makefile
 iproute2-5.11.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.11.0/config.include
 iproute2-5.11.0/config.include
+@@ -0,0 +1,32 @@
++# 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
++ifeq ($(HAVE_LIBBSD),y)
++  CFLAGS += $(HAVE_LIBBSD_CFLAGS)
++  LDLIBS += $(HAVE_LIBBSD_LDLIBS)
++else
++  CFLAGS += -DNEED_STRLCPY
++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.11.0/configure
 iproute2-5.11.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` >>

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

2020-08-09 Thread Lars Wendler 
commit: 38028475fc979ef549bb9c94ed4c1a82d8d1f08b
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Aug  9 09:38:16 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Aug  9 09:38:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38028475

sys-apps/iproute2: Removed old

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/iproute2/Manifest |   2 -
 .../iproute2/files/iproute2-4.11.0-no-ipv6.patch   |  37 
 .../files/iproute2-4.17.0-configure-nomagic.patch  | 207 -
 .../iproute2-5.2.0-fix-sys-queue-h-on-musl.patch   |  83 -
 sys-apps/iproute2/iproute2-5.2.0-r1.ebuild | 163 
 sys-apps/iproute2/iproute2-5.6.0.ebuild| 164 
 6 files changed, 656 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 8ac2dfb271b..33005e6d740 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,5 +1,3 @@
-DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 
72d082b4f39b6b9f0040149ea14d3c5c6d999eb4955b708ef49a3276f3c574eab757e2c81f10a11e2ce5f709c7849bbf6556e40c7f261fc72d498046f73eade4
 SHA512 
82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1
 DIST iproute2-5.4.0.tar.xz 741328 BLAKE2B 
8c7b74aa64526180e793165eb3d0f1ee07d4589fa982aa91e4e0775595c096d73677e85bb7f073cbe14e6de6b166d31efba94554f8c7df3320b168341818fcba
 SHA512 
26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051
-DIST iproute2-5.6.0.tar.xz 754812 BLAKE2B 
5232c206052dcbc489284cb5a4169bf2555f9bdf7c122e23be07f7a5a18e0c828f5b4f3bb4afb6d33919919d211c67a20626ad10556e4ae41f90619d6eed445f
 SHA512 
e52c6c8b676ab79401ae815fe3f80268c1edb490c0a00826e0f7181a816e9bf6549df9e77a40b0d56855db8ad312179b3a40002a2dd6f66c807039cff0cdfb6c
 DIST iproute2-5.7.0.tar.xz 764436 BLAKE2B 
842229730139f8931c4ff3d548fe56c7c86b6bb7be5cc1a7dd896ddce34c039467fb90d0c258cdc91276edc59b9b19f53c39a36c79b54b15a78436b44c595eed
 SHA512 
d5ef68e0eb8e84fbff68c2e7dd4097b9ceb438c928d17ede4130876802dfeafe8bf08d82b4fd39005314e0679c0b261aaa3d6a0a2ff364074a43a043a855a634
 DIST iproute2-5.8.0.tar.xz 780612 BLAKE2B 
5d86af8d981f5e9582d5eb0aaffbe15891964a86f3a1da408ce2f46101b1bb6beac8d4492dab1865391c212ef596c9256b680bdcb346d440e38cbb636a23cdc1
 SHA512 
f2a3f7dcf5cb39ca7cd14f0e40e45641eccf4b93427c527a09fd789ac8621c5c3359769ca61fcc8bab7e915edd943c39b7c3e15cbfc497187aa6271eed0a9152

diff --git a/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch 
b/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch
deleted file mode 100644
index fc855dcf220..000
--- a/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
 iproute2-4.11.0/ip/ipmonitor.c
-+++ iproute2-4.11.0/ip/ipmonitor.c
-@@ -114,7 +114,6 @@
-   }
-   if (n->nlmsg_type == RTM_NEWPREFIX) {
-   print_headers(fp, "[PREFIX]", ctrl);
--  print_prefix(who, n, arg);
-   return 0;
-   }
-   if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) {
 iproute2-4.11.0/ip/iptunnel.c
-+++ iproute2-4.11.0/ip/iptunnel.c
-@@ -589,13 +589,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.11.0/ip/Makefile
-+++ iproute2-4.11.0/ip/Makefile
-@@ -1,6 +1,6 @@
- IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
--rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
--ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \
-+rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
-+ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \
- ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o iplink_dummy.o \
- iplink_ifb.o iplink_nlmon.o iplink_team.o iplink_vcan.o \
- iplink_vlan.o link_veth.o link_gre.o iplink_can.o iplink_xdp.o \

diff --git a/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch 
b/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch
deleted file mode 100644
index 30b5db3bc3c..000
--- a/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch
+++ /dev/null
@@ -1,207 +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

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

2020-06-15 Thread David Seifert 
commit: 54d131edd288aa09a6faaf079ec1b03cf9f293e4
Author: David Seifert  gentoo  org>
AuthorDate: Mon Jun 15 09:53:51 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Jun 15 09:53:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54d131ed

sys-apps/iproute2: Patch for missing #include 

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: David Seifert  gentoo.org>

 .../iproute2/files/iproute2-5.7.0-mix-signal.h-include.patch   | 10 ++
 sys-apps/iproute2/iproute2-5.7.0.ebuild|  1 +
 2 files changed, 11 insertions(+)

diff --git a/sys-apps/iproute2/files/iproute2-5.7.0-mix-signal.h-include.patch 
b/sys-apps/iproute2/files/iproute2-5.7.0-mix-signal.h-include.patch
new file mode 100644
index 000..be606c107fc
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-5.7.0-mix-signal.h-include.patch
@@ -0,0 +1,10 @@
+--- a/devlink/devlink.c
 b/devlink/devlink.c
+@@ -15,6 +15,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/sys-apps/iproute2/iproute2-5.7.0.ebuild 
b/sys-apps/iproute2/iproute2-5.7.0.ebuild
index 7dcb54c51f5..6a78d7f40fb 100644
--- a/sys-apps/iproute2/iproute2-5.7.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.7.0.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
"${FILESDIR}"/${PN}-4.20.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() {

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

2019-09-25 Thread Thomas Deutschmann 
commit: 07866a257c4ddf91baf828c5a02ac977d67ea855
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Sep 25 13:59:34 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Sep 25 13:59:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07866a25

sys-apps/iproute2: fix build on musl

Closes: https://bugs.gentoo.org/690486
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../iproute2-5.2.0-fix-sys-queue-h-on-musl.patch   | 83 ++
 sys-apps/iproute2/iproute2-5.2.0-r1.ebuild |  1 +
 2 files changed, 84 insertions(+)

diff --git 
a/sys-apps/iproute2/files/iproute2-5.2.0-fix-sys-queue-h-on-musl.patch 
b/sys-apps/iproute2/files/iproute2-5.2.0-fix-sys-queue-h-on-musl.patch
new file mode 100644
index 000..6bc129fa31f
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-5.2.0-fix-sys-queue-h-on-musl.patch
@@ -0,0 +1,83 @@
+From 33267017faf1a188d1286f5c423454a060517e39 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich 
+Date: Fri, 26 Jul 2019 22:01:05 +0100
+Subject: iproute2: devlink: port from sys/queue.h to list.h
+
+sys/queue.h does not exist on linux-musl targets and fails build as:
+
+devlink.c:28:10: fatal error: sys/queue.h: No such file or directory
+   28 | #include 
+  |  ^
+
+The change ports to list.h API and drops dependency of 'sys/queue.h'.
+The API maps one-to-one.
+
+Build-tested on linux-musl and linux-glibc.
+
+Bug: https://bugs.gentoo.org/690486
+CC: Stephen Hemminger 
+CC: net...@vger.kernel.org
+Signed-off-by: Sergei Trofimovich 
+Signed-off-by: Stephen Hemminger 
+---
+ devlink/devlink.c | 15 +++
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/devlink/devlink.c b/devlink/devlink.c
+index bb023c0c..0ea401ae 100644
+--- a/devlink/devlink.c
 b/devlink/devlink.c
+@@ -25,7 +25,6 @@
+ #include 
+ #include 
+ #include 
+-#include 
+ 
+ #include "SNAPSHOT.h"
+ #include "list.h"
+@@ -5981,13 +5980,13 @@ static int fmsg_value_show(struct dl *dl, int type, 
struct nlattr *nl_data)
+ 
+ struct nest_qentry {
+   int attr_type;
+-  TAILQ_ENTRY(nest_qentry) nest_entries;
++  struct list_head nest_entries;
+ };
+ 
+ struct fmsg_cb_data {
+   struct dl *dl;
+   uint8_t value_type;
+-  TAILQ_HEAD(, nest_qentry) qhead;
++  struct list_head qhead;
+ };
+ 
+ static int cmd_fmsg_nest_queue(struct fmsg_cb_data *fmsg_data,
+@@ -6001,13 +6000,13 @@ static int cmd_fmsg_nest_queue(struct fmsg_cb_data 
*fmsg_data,
+   return -ENOMEM;
+ 
+   entry->attr_type = *attr_value;
+-  TAILQ_INSERT_HEAD(_data->qhead, entry, nest_entries);
++  list_add(_data->qhead, >nest_entries);
+   } else {
+-  if (TAILQ_EMPTY(_data->qhead))
++  if (list_empty(_data->qhead))
+   return MNL_CB_ERROR;
+-  entry = TAILQ_FIRST(_data->qhead);
++  entry = list_first_entry(_data->qhead, struct nest_qentry, 
nest_entries);
+   *attr_value = entry->attr_type;
+-  TAILQ_REMOVE(_data->qhead, entry, nest_entries);
++  list_del(>nest_entries);
+   free(entry);
+   }
+   return MNL_CB_OK;
+@@ -6116,7 +6115,7 @@ static int cmd_health_object_common(struct dl *dl, 
uint8_t cmd, uint16_t flags)
+   return err;
+ 
+   data.dl = dl;
+-  TAILQ_INIT();
++  INIT_LIST_HEAD();
+   err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_fmsg_object_cb, );
+   return err;
+ }
+-- 
+cgit 1.2-0.3.lf.el7
+

diff --git a/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild 
b/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
index 5beda6e4bc4..a9648404f62 100644
--- a/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
"${FILESDIR}"/${PN}-5.1.0-portability.patch
+   "${FILESDIR}"/${PN}-5.2.0-fix-sys-queue-h-on-musl.patch
 )
 
 src_prepare() {

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

2019-01-08 Thread Lars Wendler 
commit: b7e2c129c2c3fdd467ddaccd85b5adcecbffefdc
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jan  8 10:51:58 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan  8 10:51:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7e2c129

sys-apps/iproute2: Bump to version 4.20.0

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/iproute2/Manifest |   1 +
 .../files/iproute2-4.20.0-configure-nomagic.patch  | 208 +
 .../iproute2/files/iproute2-4.20.0-no-ipv6.patch   |  38 
 sys-apps/iproute2/iproute2-4.20.0.ebuild   | 155 +++
 4 files changed, 402 insertions(+)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 0c3e61bbdad..683c8dc8668 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,3 +1,4 @@
 DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 
232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41
 SHA512 
e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c
 DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 
3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c
 SHA512 
ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5
 DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 
2d0ece5dd8f1beb7912d025c269a9edd2ecd87aea04971a28eca9f9b7ea82d0e4aa397c9338c0cb6cb463887678a541a5407644e82244ffbbae0eb8f6ac088e8
 SHA512 
47c750da2247705b1b1d1621f58987333e54370d0fff2f24106194022de793ff35dfd67fd1be127ce019008705702092d31dac49abf930a7c0dc5c7e7c0665b8
+DIST iproute2-4.20.0.tar.xz 707016 BLAKE2B 
d62c6b995c4c1f79617e2f8149ff2ed297d741965e81bffebfa475514f5e96f0c9300e65d12bdd14ab492ce66675677eb41af6816876d5e1360218e4f32f4bc8
 SHA512 
ed29638c864062e199152c7b3b24b6495987ca6f79cc9ab1b529dab37a8a840fa2b5858d5db2b94eeefa1c0d72ff666a790107e27d11a597b189bfb7a01a4b8b

diff --git a/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch 
b/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch
new file mode 100644
index 000..94df85017df
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch
@@ -0,0 +1,208 @@
+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 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 

+
+--- iproute2-4.20.0/bridge/Makefile
 iproute2-4.20.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-4.20.0/config.include
 iproute2-4.20.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-4.20.0/configure
 iproute2-4.20.0/configure
+@@ -188,7 +188,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
+@@ -231,8 +231,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'

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

2018-04-03 Thread Lars Wendler 
commit: a828c0687225ce4a3a310986c41160fd63576412
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Apr  3 10:23:26 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Apr  3 10:24:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a828c068

sys-apps/iproute2: Bump to version 4.16.0

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 sys-apps/iproute2/Manifest |   1 +
 .../files/iproute2-4.16.0-configure-nomagic.patch  | 191 +
 sys-apps/iproute2/iproute2-4.16.0.ebuild   | 152 
 3 files changed, 344 insertions(+)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index ad319ef1cd9..eedf9e981d9 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,6 +4,7 @@ DIST iproute2-4.12.0.tar.xz 662424 BLAKE2B 
6c6608d4a157e46932834c09e91d6a786a04c
 DIST iproute2-4.13.0.tar.xz 670340 BLAKE2B 
379072c0865e8960b46065454e9bdf3a9cb7af45b32a2fff8e89bef8d60e837419bea60df1343b4bb15db624feb3ce4acbe621b4c44405c43fa729e770bb04a3
 SHA512 
f96d2839aec1f439bfac504c8e3881c063dacbf4c67b15f0e3da9882d2fa013cba33c23602de3eab624e0eecbb911a13967d60bddcdf097f47a580a5a77b5e3a
 DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 
232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41
 SHA512 
e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c
 DIST iproute2-4.15.0.tar.xz 648836 BLAKE2B 
e7f3a027ec88de7c6ac82c5529b37fdf22311bc9290e71662bc3b1e32d4cb6a1845e2badb961a21b50b5ed1b9d23130e512a011767183f7df1b33eb05101044b
 SHA512 
bcc54b8dc83d7b0e759a2de77eb38fed483d7f7f82698f482e0259000f2f55ba79c556b721730eb999e85c865ad136fd7549304ebe936545e02e848ba7f698bc
+DIST iproute2-4.16.0.tar.xz 661336 BLAKE2B 
4efb08c88a60b1bbbeef807c0731e610032bfb11d022562c1df052d324eb43cb25b9523f49730d22a3f92eb06bd5037c70d8ed0b58276a0cf0854a0f82800b64
 SHA512 
a8fbc92665a8d4ca6ee1e894bfb27373cf6b16dac9e2ab3831e418fcc9b895acc7d6fc64efa0b0e37b3affd4ef8eacf4dae5715536138d6a05c65ad49a2becad
 DIST iproute2-4.4.0.tar.xz 528552 BLAKE2B 
cad90d2734647a5a5e90b0a8b1337656c6480471caa06beee54fb3abd9c3bc64fc21da349d9b8aa0decf6208de325dd37a9e02fd9e994b024f9142dcd229b87c
 SHA512 
48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69
 DIST iproute2-4.5.0.tar.xz 554500 BLAKE2B 
b64933bd0bf572796705ce2559b1c6cf7faf2f9ac11e1a94a09a428b0039216df8b2ce72a9783e84825a12baaa08526f724d385c6c7e5f6a0d86c3d1662ab822
 SHA512 
d12be24cf7a1102be8e449d1e95fa67b784d505e98fcf2f18caedf0136fb378dc439f74a75bc0d6ef5b2893e5ca1968e122054404c1f4d1a212aeb0fba1c5860
 DIST iproute2-4.6.0.tar.xz 570960 BLAKE2B 
e49dc56615490aa7d7cec20830b2866c3e00b08a25ab92bf94d30cc1d7e60e5f10982aa379502a0e5279748c9504e67603f0b947376b6d2991838516b55ef4c9
 SHA512 
1e3868ced65012da6724744eb15e6bb8e2c5bf8d7a46cf2b655526de1a9e1224c7b7e9bd4a88e40516b5648955987eb9001600ca5afbd507bc664f92b51ede9f

diff --git a/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch 
b/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch
new file mode 100644
index 000..01a1fe2d812
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch
@@ -0,0 +1,191 @@
+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 libelf & libmnl 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 

+
+--- iproute2-4.16.0/bridge/Makefile
 iproute2-4.16.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-4.16.0/config.include
 iproute2-4.16.0/config.include
+@@ -0,0 +1,22 @@
++# 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
++
++# Rules can only be declared after all variables in them are known.
++%.o: %.c
++

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

2018-01-09 Thread Mike Frysinger 
commit: 333b1e3a9086215ff466114e1762172ef3124ee3
Author: Mike Frysinger  chromium  org>
AuthorDate: Tue Jan  9 23:40:41 2018 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Jan  9 23:40:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=333b1e3a

sys-apps/iproute2: clean up scripts to use /bin/sh only

 .../files/iproute2-4.14.1-posix-shell.patch|  65 +
 sys-apps/iproute2/iproute2-4.14.1-r4.ebuild| 153 +
 2 files changed, 218 insertions(+)

diff --git a/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch 
b/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch
new file mode 100644
index 000..e5efc9068ce
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch
@@ -0,0 +1,65 @@
+https://marc.info/?l=linux-netdev=151554000532498=2
+
+From aec69bbc285e5498add5384b6018564355594233 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+Date: Tue, 9 Jan 2018 18:16:53 -0500
+Subject: [PATCH iproute2] ifcfg/rtpr: convert to POSIX shell
+
+These files are already mostly written in POSIX shell, so convert their
+shebangs to /bin/sh and tweak the few bashisms in here.
+
+URL: https://crbug.com/756559
+Reported-by: Pat Erley 
+Signed-off-by: Mike Frysinger 
+---
+ ip/ifcfg | 12 ++--
+ ip/rtpr  |  2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/ip/ifcfg b/ip/ifcfg
+index 851b9215ab63..5b34decd4480 100644
+--- a/ip/ifcfg
 b/ip/ifcfg
+@@ -1,3 +1,3 @@
+-#! /bin/bash
++#! /bin/sh
+ 
+ CheckForwarding () {
+@@ -7,7 +7,7 @@ CheckForwarding () {
+   fwd=0
+   if [ -d $sbase ]; then
+ for dir in $sbase/*/forwarding; do
+-  fwd=$[$fwd + `cat $dir`]
++  fwd=$(( fwd + $(cat "$dir") ))
+ done
+   else
+ fwd=2
+@@ -128,12 +128,12 @@ fi
+ arping -q -A -c 1 -I $dev $ipaddr
+ noarp=$?
+ ( sleep 2 ;
+-  arping -q -U -c 1 -I $dev $ipaddr ) >& /dev/null /dev/null 2>&1 & /dev/null
+-ip route add unreachable 255.255.255.255 >& /dev/null
++ip route add unreachable 224.0.0.0/24 >/dev/null 2>&1
++ip route add unreachable 255.255.255.255 >/dev/null 2>&1
+ if [ "`ip link ls $dev | grep -c MULTICAST`" -ge 1 ]; then
+-  ip route add 224.0.0.0/4 dev $dev scope global >& /dev/null
++  ip route add 224.0.0.0/4 dev $dev scope global >/dev/null 2>&1
+ fi
+ 
+ if [ $fwd -eq 0 ]; then
+diff --git a/ip/rtpr b/ip/rtpr
+index 192a476f817e..7e48674bcf53 100644
+--- a/ip/rtpr
 b/ip/rtpr
+@@ -1,3 +1,3 @@
+-#! /bin/bash
++#! /bin/sh
+ 
+ exec tr "[]" "[
+-- 
+2.15.1
+

diff --git a/sys-apps/iproute2/iproute2-4.14.1-r4.ebuild 
b/sys-apps/iproute2/iproute2-4.14.1-r4.ebuild
new file mode 100644
index 000..c9c21b326b4
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-4.14.1-r4.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "" ]] ; then
+   
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+   inherit git-r3
+else
+   SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb +iptables ipv6 minimal selinux"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+   !net-misc/arpd
+   !minimal? ( net-libs/libmnl virtual/libelf )
+   iptables? ( >=net-firewall/iptables-1.4.20:= )
+   berkdb? ( sys-libs/db:= )
+   atm? ( net-dialup/linux-atm )
+   selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support #549948 and some defines 
#553876
+DEPEND="
+   ${RDEPEND}
+   app-arch/xz-utils
+   iptables? ( virtual/pkgconfig )
+   >=sys-devel/bison-2.4
+   sys-devel/flex
+   >=sys-kernel/linux-headers-3.16
+   elibc_glibc? ( >=sys-libs/glibc-2.7 )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+   "${FILESDIR}"/${P}-fix-tc-actions.patch
+   "${FILESDIR}"/${P}-configure-nomagic.patch # bug 643722
+   "${FILESDIR}"/${P}-posix-shell.patch
+)
+
+src_prepare() {
+   if ! use ipv6 ; then
+   PATCHES+=(
+   "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
+   )
+   fi
+
+   default
+
+   sed -i \
+   -e '/^CC :\?=/d' \
+   -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+   -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
+   -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+   -e "/^WFLAGS/s:-Werror::" \
+   -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+   Makefile || die
+
+   # Use /run instead of

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

2017-12-15 Thread Thomas Deutschmann 
commit: 5eafd8616730adc6677072d82c2c9e48c351b507
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Dec 15 11:35:36 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Dec 15 11:48:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eafd861

sys-apps/iproute2: Rev bump

Closes: https://bugs.gentoo.org/640654
Bug: https://bugzilla.redhat.com/1514963
Package-Manager: Portage-2.3.18, Repoman-2.3.6

 .../files/iproute2-4.14.1-fix-tc-actions.patch | 222 +
 sys-apps/iproute2/iproute2-4.14.1-r2.ebuild| 146 ++
 2 files changed, 368 insertions(+)

diff --git a/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch 
b/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch
new file mode 100644
index 000..a8b7aaa9efe
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch
@@ -0,0 +1,222 @@
+From 3572e01a090a298e2f4c4f796bad6639b652e031 Mon Sep 17 00:00:00 2001
+From: Michal Privoznik 
+Date: Fri, 8 Dec 2017 11:18:07 +0100
+Subject: tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control()
+
+Not all callers want parse_action_control*() to advance the
+arguments. For instance act_parse_police() does the argument
+advancing itself.
+
+Fixes: e67aba559581 ("tc: actions: add helpers to parse and print control 
actions")
+Signed-off-by: Michal Privoznik 
+---
+ tc/m_bpf.c|  1 +
+ tc/m_connmark.c   |  1 +
+ tc/m_csum.c   |  1 +
+ tc/m_gact.c   | 10 +-
+ tc/m_ife.c|  1 +
+ tc/m_mirred.c |  4 +++-
+ tc/m_nat.c|  1 +
+ tc/m_pedit.c  |  1 +
+ tc/m_sample.c |  1 +
+ tc/m_skbedit.c|  1 +
+ tc/m_skbmod.c |  1 +
+ tc/m_tunnel_key.c |  1 +
+ tc/m_vlan.c   |  1 +
+ tc/tc_util.c  |  1 -
+ 14 files changed, 19 insertions(+), 7 deletions(-)
+
+diff --git a/tc/m_bpf.c b/tc/m_bpf.c
+index 1c1f71c..576f69c 100644
+--- a/tc/m_bpf.c
 b/tc/m_bpf.c
+@@ -129,6 +129,7 @@ opt_bpf:
+ 
+   parse_action_control_dflt(, , ,
+ false, TC_ACT_PIPE);
++  NEXT_ARG_FWD();
+ 
+   if (argc) {
+   if (matches(*argv, "index") == 0) {
+diff --git a/tc/m_connmark.c b/tc/m_connmark.c
+index 37d7185..47c7a8c 100644
+--- a/tc/m_connmark.c
 b/tc/m_connmark.c
+@@ -82,6 +82,7 @@ parse_connmark(struct action_util *a, int *argc_p, char 
***argv_p, int tca_id,
+   }
+ 
+   parse_action_control_dflt(, , , false, 
TC_ACT_PIPE);
++  NEXT_ARG_FWD();
+ 
+   if (argc) {
+   if (matches(*argv, "index") == 0) {
+diff --git a/tc/m_csum.c b/tc/m_csum.c
+index 7b15673..e1352c0 100644
+--- a/tc/m_csum.c
 b/tc/m_csum.c
+@@ -124,6 +124,7 @@ parse_csum(struct action_util *a, int *argc_p,
+   }
+ 
+   parse_action_control_dflt(, , , false, TC_ACT_OK);
++  NEXT_ARG_FWD();
+ 
+   if (argc) {
+   if (matches(*argv, "index") == 0) {
+diff --git a/tc/m_gact.c b/tc/m_gact.c
+index e7d91da..b30b042 100644
+--- a/tc/m_gact.c
 b/tc/m_gact.c
+@@ -87,14 +87,13 @@ parse_gact(struct action_util *a, int *argc_p, char 
***argv_p,
+   if (argc < 0)
+   return -1;
+ 
+-
+-  if (matches(*argv, "gact") == 0) {
+-  argc--;
+-  argv++;
+-  } else if (parse_action_control(, , , false) == -1) {
++  if (matches(*argv, "gact") != 0 &&
++  parse_action_control(, , , false) == -1) {
+   usage();/* does not return */
+   }
+ 
++  NEXT_ARG_FWD();
++
+ #ifdef CONFIG_GACT_PROB
+   if (argc > 0) {
+   if (matches(*argv, "random") == 0) {
+@@ -114,6 +113,7 @@ parse_gact(struct action_util *a, int *argc_p, char 
***argv_p,
+   if (parse_action_control(, ,
+, false) == -1)
+   usage();
++  NEXT_ARG_FWD();
+   if (get_u16(, *argv, 10)) {
+   fprintf(stderr,
+   "Illegal probability val 0x%x\n",
+diff --git a/tc/m_ife.c b/tc/m_ife.c
+index 205efc9..4647f6a 100644
+--- a/tc/m_ife.c
 b/tc/m_ife.c
+@@ -159,6 +159,7 @@ static int parse_ife(struct action_util *a, int *argc_p, 
char ***argv_p,
+ 
+   parse_action_control_dflt(, , , false, TC_ACT_PIPE);
+ 
++  NEXT_ARG_FWD();
+   if (argc) {
+   if (matches(*argv, "index") == 0) {
+   NEXT_ARG();
+diff --git a/tc/m_mirred.c b/tc/m_mirred.c
+index 3870d3a..aa7ce6d 100644
+--- a/tc/m_mirred.c
 b/tc/m_mirred.c
+@@ -202,8 +202,10 @@ parse_direction(struct action_util *a, int *argc_p, char 
***argv_p,
+   }
+ 
+ 
+-  if (p.eaction == TCA_EGRESS_MIRROR || p.eaction == TCA_INGRESS_MIRROR)
++  if (p.eaction == TCA_EGRESS_MIRROR || p.eaction == TCA_INGRESS_MIRROR) {
+   parse_action_control(, , , false);
++

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

2017-05-01 Thread Lars Wendler 
commit: f5fefd6f8988e4148f4e055c712fe4f8969bc1b5
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon May  1 17:29:17 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon May  1 17:29:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5fefd6f

sys-apps/iproute2: Bump to version 4.11.0

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-apps/iproute2/Manifest |   1 +
 .../iproute2/files/iproute2-4.11.0-no-ipv6.patch   |  37 ++
 sys-apps/iproute2/iproute2-4.11.0.ebuild   | 138 +
 3 files changed, 176 insertions(+)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index e867873b1c1..6b97f1a79bb 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,4 +1,5 @@
 DIST iproute2-4.10.0.tar.xz 626944 SHA256 
22b1e1c1fc704ad35837e5a66103739727b8b48ac90b48c13f79b7367ff0a9a8 SHA512 
e54477e167455e7ef5da4adc168d63eaa96091b63dc987fffe918cbb005eceed18a62283ca99ee2512dc0e960f47ae21b39ffbe399c1612fd9cea147c34c581b
 WHIRLPOOL 
7034f87835b13d275d2e065ee00d869060ae20c7dd325d8974da414db20328195e5968ede2f0b6925ddf67de3712b5945f54276c6ce5c8367ba28520c2adb859
+DIST iproute2-4.11.0.tar.xz 657100 SHA256 
72671028bda696d0cb8f48ec8e702581c3a501caeed33eec3a81d7041cbc8026 SHA512 
e6cc3dbe2779670a752ab346c1a432b496033448d1645aa0161b3f7b683b3f9939ab09db12199b794cc64dff257faaf0d151046feea9031a6139176e08b4f4fa
 WHIRLPOOL 
9bf25b018d3f392a2e2f4faf4c3877f52ec4b0aebb082d9c2e2c3e80c0c8f3885c122c5d211c4c6ef014506d786213b36938728f63b581079274a3116fc85581
 DIST iproute2-4.4.0.tar.xz 528552 SHA256 
bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 SHA512 
48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69
 WHIRLPOOL 
7e90c98805e12b28de284bb998e5a27cf524a78d0bd7632c0d49a7ddff8f11f5229ac6867076e9fea6f21b6b31360bddb21138673d94de766bdf7324a09bc013
 DIST iproute2-4.5.0.tar.xz 554500 SHA256 
3f15292f53e465cb5bd6652961343ca64eb6936309ae75be5d5a541435bc494a SHA512 
d12be24cf7a1102be8e449d1e95fa67b784d505e98fcf2f18caedf0136fb378dc439f74a75bc0d6ef5b2893e5ca1968e122054404c1f4d1a212aeb0fba1c5860
 WHIRLPOOL 
dc660bde36fed126b27fb69a59c02405b5299b92a6b519ebdce74d817f88be82114bb10217ca34bbc26a89e664ff243e606a84bcb00db41088bce824542def40
 DIST iproute2-4.6.0.tar.xz 570960 SHA256 
74fc6a8ad085be095a159f8158bbaf385b42af9e101619f233f1ae466829d406 SHA512 
1e3868ced65012da6724744eb15e6bb8e2c5bf8d7a46cf2b655526de1a9e1224c7b7e9bd4a88e40516b5648955987eb9001600ca5afbd507bc664f92b51ede9f
 WHIRLPOOL 
1b0ff7988d6d5567137aca9d41e2cc3183f3620f8b874113ff9e6ca9508349550e388e423c54b165e73ed54ccb7a366ef8d032a930f27722eccbd5ff6879032e

diff --git a/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch 
b/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch
new file mode 100644
index 000..fc855dcf220
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch
@@ -0,0 +1,37 @@
+--- iproute2-4.11.0/ip/ipmonitor.c
 iproute2-4.11.0/ip/ipmonitor.c
+@@ -114,7 +114,6 @@
+   }
+   if (n->nlmsg_type == RTM_NEWPREFIX) {
+   print_headers(fp, "[PREFIX]", ctrl);
+-  print_prefix(who, n, arg);
+   return 0;
+   }
+   if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) {
+--- iproute2-4.11.0/ip/iptunnel.c
 iproute2-4.11.0/ip/iptunnel.c
+@@ -589,13 +589,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.11.0/ip/Makefile
 iproute2-4.11.0/ip/Makefile
+@@ -1,6 +1,6 @@
+ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
+-rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
+-ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \
++rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
++ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \
+ ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o iplink_dummy.o \
+ iplink_ifb.o iplink_nlmon.o iplink_team.o iplink_vcan.o \
+ iplink_vlan.o link_veth.o link_gre.o iplink_can.o iplink_xdp.o \

diff --git a/sys-apps/iproute2/iproute2-4.11.0.ebuild 
b/sys-apps/iproute2/iproute2-4.11.0.ebuild
new file mode 100644
index 000..74f13e14182
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-4.11.0.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == ""

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

2016-12-17 Thread Mike Frysinger 
commit: fe680d5ff01dda55fae13a7942b7c220076fc968
Author: Mike Frysinger  gentoo  org>
AuthorDate: Sun Dec 18 00:07:38 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Sun Dec 18 00:13:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe680d5f

sys-apps/iproute2: drop old <4.4.0 versions

 sys-apps/iproute2/Manifest |   9 -
 .../iproute2/files/iproute2-2.6.26-ldflags.patch   |  15 -
 .../iproute2/files/iproute2-2.6.29.1-flush.patch   | 224 --
 .../iproute2/files/iproute2-2.6.29.1-hfsc.patch| 885 -
 .../files/iproute2-2.6.35-cached-routes.patch  |  34 -
 .../files/iproute2-2.6.35-no-iptables.patch|  15 -
 .../iproute2/files/iproute2-2.6.35-no-ipv6.patch   |  27 -
 .../iproute2/files/iproute2-2.6.35-xtables.patch   |  30 -
 .../files/iproute2-2.6.38-parallel-build.patch |  40 -
 .../iproute2/files/iproute2-3.1.0-no-ipv6.patch|  41 -
 .../iproute2/files/iproute2-3.10.0-no-ipv6.patch   |  41 -
 .../iproute2/files/iproute2-3.6.0-pkg-config.patch |  67 --
 sys-apps/iproute2/files/iproute2-3.7.0-clang.patch |  72 --
 sys-apps/iproute2/files/iproute2-3.7.0-man7.patch  |  55 --
 .../files/iproute2-3.8.0-old-mount-libc.patch  |  38 -
 .../iproute2-4.0.0-tc-show-buffer-overflow.patch   |  62 --
 sys-apps/iproute2/iproute2-2.6.38.ebuild   |  90 ---
 sys-apps/iproute2/iproute2-3.17.0.ebuild   | 124 ---
 sys-apps/iproute2/iproute2-3.19.0.ebuild   | 124 ---
 sys-apps/iproute2/iproute2-3.3.0.ebuild| 105 ---
 sys-apps/iproute2/iproute2-3.8.0.ebuild| 117 ---
 sys-apps/iproute2/iproute2-4.0.0-r2.ebuild | 129 ---
 sys-apps/iproute2/iproute2-4.1.1.ebuild| 131 ---
 sys-apps/iproute2/iproute2-4.2.0.ebuild| 131 ---
 sys-apps/iproute2/iproute2-4.3.0.ebuild| 129 ---
 25 files changed, 2735 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index b9c994c..a6c1e7c 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,12 +1,3 @@
-DIST iproute2-2.6.38.tar.bz2 390166 SHA256 
47629a4f547f21d94d8e823a87dd8e13042cadecefea2e2dc433e4134fa9aec4 SHA512 
b3a0c15c41184554da1b7f2521f5f0586ae0df1a62899afe2514d4adb93f05ecfd10fc964e027ec8f83a990586f5858b0c9fb24ea8c78477ec6c7c51593c54bd
 WHIRLPOOL 
bbd3a415c8396adf1ab63f2f3c91591c65809f8da12f6333f6ea66997cbca428ec2339759f53d0bcc41a1e9c85718e598efde0206a000d394560cacc9a78e8cc
-DIST iproute2-3.17.0.tar.xz 440188 SHA256 
09e406636e7598e46d5d4f7b928bf5db57049d65dbeb9a496005957ee16f6000 SHA512 
1bc261526b0c72fe79b792f0ae497420ac66641dc24a067c903275c63b51b257f540ca6fc6a3d60f93f416c5111841ea53ca28b038e51217a24783171ee4dacd
 WHIRLPOOL 
58bd417385272140260bbd56d379881f7218e789580b874dc9bed06931097a67286f5a63966a730362079aa83903c965dce84575283d656d47a665edbb9599c4
-DIST iproute2-3.19.0.tar.xz 455004 SHA256 
e2f9f8c36e166f2ba6c0e1e7a9ad84cdf7c1615b93df49dac44563d7b57fd7b0 SHA512 
fc533b6a526cfda234f043ac25302a3206a81ab2a740640b997b6bfb22e6f94ddc21b704191a358ea8721a327ba785e0224a4b4129111ef5008b4003379c3706
 WHIRLPOOL 
6a0aa1a948286d7dcb3663d787167c27760d756385295bf0ca631920aed50fbd984c19204247097116ef0d4e293c3c8dbe13b0b44c6ec83e7815a7461293c89f
-DIST iproute2-3.3.0.tar.bz2 416353 SHA256 
f328ec01bac64854f477b9440b0bbeae91895b4ba266821597ceac6bd1501c3b SHA512 
825b473e3fb17cf724bc389bb99dabbdabf9c5bfee89890f723027f3412a82a9c7f77ac8b792a218ff50dd552e31105206ccff1897b68fe201d83e5764032feb
 WHIRLPOOL 
7827cb8d447eb86d89dc14dedecb94d7e1a9fc9380ee2130d28047f834f5b96045226409448a8f159501f9bd20b1eebe7c32ae17d5687c4c071459ae9c807ebc
-DIST iproute2-3.8.0.tar.xz 407608 SHA256 
579145749f1aaf60e7c7a5de24b7f00fa2200a961094733c792b4ff139181e4f SHA512 
0d93070044f573055a7cc58bd006e476f5b0fcb75cb5d49a37417aa7583e637a92e460947434cef9b9449267e4529c655a23b5ed3d549a2aba128148cb8d4ade
 WHIRLPOOL 
bfb29c34953f205f7c801a86a38f58d9352b716504649e61665ced6dd48557291412de5fd8987dbab44fbd397dab4a6b55d6c371c7cbaaea3d6e29269df115df
-DIST iproute2-4.0.0.tar.xz 459364 SHA256 
5cd06eb1050b858b308b65705725042bb566fd261135e35a73dafb48cd632618 SHA512 
8e0587ed484a9697af99b4f37b460fddd28136b3c19898a11809b1e8ca9a75a18dcc83bc512f5b74361e6128732e69a3e66b3a62c38a5ae5f13c3e18af186be4
 WHIRLPOOL 
6abdf2b4587abd7a73d2b7692a4bb478ac379dc3a27f564ad78e34f25f06ae5dd9e0e4873c6510d30767a398375dcdcd2da777412c725885e0c3d4bd89c71a9b
-DIST iproute2-4.1.1.tar.xz 496388 SHA256 
73077a989efb934450bd655cbd9aaddaa747cb696c64d0c9a3323768a6a8e66f SHA512 
af2e4021faf931d17a67c242c66b4f6a6ce93a69cee5408dd3951d488da511c99d693534e91d0a317bd82dfdcb6a543605cecf2514d512004639db8d17afb93e
 WHIRLPOOL 
24542b56275675609aaad69ca68e89145d4da84ddb2429ae546179a249bcc1213f89168673657966122e01e992763fec053c118fbd69b7db1677ad7be97397b6
-DIST iproute2-4.2.0.tar.xz 506120 SHA256 
a4101e743e0da36b55f63353ff489699ddcd634ceca854a9a272346588f30f30 SHA512