mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-04 19:56:32 +02:00
sys-apps/iproute2: Sync with Gentoo
It's from Gentoo commit 02ba1ab26a4a4809c3ed7ca94923f9110b6e46a3.
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
03b6e2d29d
commit
fb0acc2acc
@ -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
|
||||
|
||||
@ -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"
|
||||
@ -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 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 <robbat2@gentoo.org>
|
||||
|
||||
Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
Added libcap to v4.17.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
Forward-ported from v4.20.0 to v5.11.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
Forward-ported from v5.11.0 to v5.12.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
|
||||
Update 2023-09-05: Removed libbsd enforcement from config.include for bug #911727
|
||||
by Holger Hoffstätte <holger@applied-asynchrony.com>
|
||||
|
||||
--- 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} libbsd --cflags` >>$CONFIG
|
||||
- echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
|
||||
+ 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
|
||||
@@ -428,8 +428,8 @@
|
||||
echo "HAVE_CAP:=y" >>$CONFIG
|
||||
echo "yes"
|
||||
|
||||
- echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
|
||||
- echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
|
||||
+ echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
|
||||
+ echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
@@ -512,7 +512,3 @@
|
||||
|
||||
echo -n "libcap support: "
|
||||
check_cap
|
||||
-
|
||||
-echo >> $CONFIG
|
||||
-echo "%.o: %.c" >> $CONFIG
|
||||
-echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG
|
||||
--- iproute2-5.12.0/dcb/Makefile
|
||||
+++ iproute2-5.12.0/dcb/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
TARGETS :=
|
||||
|
||||
--- iproute2-5.12.0/devlink/Makefile
|
||||
+++ iproute2-5.12.0/devlink/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
TARGETS :=
|
||||
|
||||
--- iproute2-5.12.0/genl/Makefile
|
||||
+++ iproute2-5.12.0/genl/Makefile
|
||||
@@ -2,6 +2,7 @@
|
||||
GENLOBJ=genl.o
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
SHARED_LIBS ?= y
|
||||
|
||||
CFLAGS += -fno-strict-aliasing
|
||||
--- iproute2-5.12.0/ip/Makefile
|
||||
+++ iproute2-5.12.0/ip/Makefile
|
||||
@@ -16,6 +16,7 @@
|
||||
RTMONOBJ=rtmon.o
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
ALLOBJ=$(IPOBJ) $(RTMONOBJ)
|
||||
SCRIPTS=ifcfg rtpr routel routef
|
||||
--- iproute2-5.12.0/lib/Makefile
|
||||
+++ iproute2-5.12.0/lib/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
CFLAGS += -fPIC
|
||||
|
||||
--- iproute2-5.12.0/misc/Makefile
|
||||
+++ iproute2-5.12.0/misc/Makefile
|
||||
@@ -5,6 +5,7 @@
|
||||
TARGETS=ss nstat ifstat rtacct lnstat
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
ifeq ($(HAVE_BERKELEY_DB),y)
|
||||
TARGETS += arpd
|
||||
--- iproute2-5.12.0/netem/Makefile
|
||||
+++ iproute2-5.12.0/netem/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
DISTGEN = maketable normal pareto paretonormal
|
||||
DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
|
||||
--- iproute2-5.12.0/rdma/Makefile
|
||||
+++ iproute2-5.12.0/rdma/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
TARGETS :=
|
||||
|
||||
--- iproute2-5.12.0/tc/Makefile
|
||||
+++ iproute2-5.12.0/tc/Makefile
|
||||
@@ -4,6 +4,7 @@
|
||||
emp_ematch.tab.o emp_ematch.lex.o
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
SHARED_LIBS ?= y
|
||||
|
||||
--- iproute2-5.12.0/tipc/Makefile
|
||||
+++ iproute2-5.12.0/tipc/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
TARGETS :=
|
||||
|
||||
--- iproute2-5.12.0/vdpa/Makefile
|
||||
+++ iproute2-5.12.0/vdpa/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
TARGETS :=
|
||||
|
||||
@ -1,245 +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 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 <robbat2@gentoo.org>
|
||||
|
||||
Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
Added libcap to v4.17.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
Forward-ported from v4.20.0 to v5.11.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
Forward-ported from v5.11.0 to v5.12.0 by Lars Wendler <polynomial-c@gentoo.org>
|
||||
|
||||
--- 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,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.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} libbsd --cflags` >>$CONFIG
|
||||
- echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
|
||||
+ 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
|
||||
@@ -428,8 +428,8 @@
|
||||
echo "HAVE_CAP:=y" >>$CONFIG
|
||||
echo "yes"
|
||||
|
||||
- echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
|
||||
- echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
|
||||
+ echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
|
||||
+ echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
@@ -512,7 +512,3 @@
|
||||
|
||||
echo -n "libcap support: "
|
||||
check_cap
|
||||
-
|
||||
-echo >> $CONFIG
|
||||
-echo "%.o: %.c" >> $CONFIG
|
||||
-echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG
|
||||
--- iproute2-5.12.0/dcb/Makefile
|
||||
+++ iproute2-5.12.0/dcb/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
TARGETS :=
|
||||
|
||||
--- iproute2-5.12.0/devlink/Makefile
|
||||
+++ iproute2-5.12.0/devlink/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
TARGETS :=
|
||||
|
||||
--- iproute2-5.12.0/genl/Makefile
|
||||
+++ iproute2-5.12.0/genl/Makefile
|
||||
@@ -2,6 +2,7 @@
|
||||
GENLOBJ=genl.o
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
SHARED_LIBS ?= y
|
||||
|
||||
CFLAGS += -fno-strict-aliasing
|
||||
--- iproute2-5.12.0/ip/Makefile
|
||||
+++ iproute2-5.12.0/ip/Makefile
|
||||
@@ -16,6 +16,7 @@
|
||||
RTMONOBJ=rtmon.o
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
ALLOBJ=$(IPOBJ) $(RTMONOBJ)
|
||||
SCRIPTS=ifcfg rtpr routel routef
|
||||
--- iproute2-5.12.0/lib/Makefile
|
||||
+++ iproute2-5.12.0/lib/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
CFLAGS += -fPIC
|
||||
|
||||
--- iproute2-5.12.0/misc/Makefile
|
||||
+++ iproute2-5.12.0/misc/Makefile
|
||||
@@ -5,6 +5,7 @@
|
||||
TARGETS=ss nstat ifstat rtacct lnstat
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
ifeq ($(HAVE_BERKELEY_DB),y)
|
||||
TARGETS += arpd
|
||||
--- iproute2-5.12.0/netem/Makefile
|
||||
+++ iproute2-5.12.0/netem/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
DISTGEN = maketable normal pareto paretonormal
|
||||
DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
|
||||
--- iproute2-5.12.0/rdma/Makefile
|
||||
+++ iproute2-5.12.0/rdma/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
TARGETS :=
|
||||
|
||||
--- iproute2-5.12.0/tc/Makefile
|
||||
+++ iproute2-5.12.0/tc/Makefile
|
||||
@@ -4,6 +4,7 @@
|
||||
emp_ematch.tab.o emp_ematch.lex.o
|
||||
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
SHARED_LIBS ?= y
|
||||
|
||||
--- iproute2-5.12.0/tipc/Makefile
|
||||
+++ iproute2-5.12.0/tipc/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
TARGETS :=
|
||||
|
||||
--- iproute2-5.12.0/vdpa/Makefile
|
||||
+++ iproute2-5.12.0/vdpa/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
include ../config.mk
|
||||
+include ../config.include
|
||||
|
||||
TARGETS :=
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
From https://github.com/shemminger/iproute2/pull/69/commits/030013c4b9ba032869f72b766e28eaf8c8099f36 Mon Sep 17 00:00:00 2001
|
||||
From: Violet Purcell <vimproved@inventati.org>
|
||||
Date: Tue, 27 Jun 2023 18:58:05 +0000
|
||||
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 <vimproved@inventati.org>
|
||||
--- a/bridge/mdb.c
|
||||
+++ b/bridge/mdb.c
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <string.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <netdb.h>
|
||||
+#include <limits.h>
|
||||
|
||||
#include "libnetlink.h"
|
||||
#include "utils.h"
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
https://lore.kernel.org/netdev/20231202024705.1375296-1-sam@gentoo.org/T/#u
|
||||
|
||||
From 3dc0bf34c1571429c08a8d0c08a69502e3e4575c Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Sat, 2 Dec 2023 02:46:05 +0000
|
||||
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 <sam@gentoo.org>
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -445,6 +445,7 @@ EOF
|
||||
check_strlcpy()
|
||||
{
|
||||
cat >$TMPDIR/strtest.c <<EOF
|
||||
+#define _GNU_SOURCE
|
||||
#include <string.h>
|
||||
int main(int argc, char **argv) {
|
||||
char dst[10];
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -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 <aclaudi@redhat.com>
|
||||
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 <luca.boccassi@gmail.com>
|
||||
Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
|
||||
Acked-by: Luca Boccassi <bluca@debian.org>
|
||||
Reviewed-by: Simon Horman <horms@kernel.org>
|
||||
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
||||
---
|
||||
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
|
||||
@ -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 <bluca@debian.org>
|
||||
Date: Mon, 6 Nov 2023 00:14:10 +0000
|
||||
Subject: Revert "Makefile: ensure CONF_USR_DIR honours the libdir config"
|
||||
|
||||
LIBDIR in Debian and derivatives is not /usr/lib/, it's
|
||||
/usr/lib/<architecture triplet>/, 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 <bluca@debian.org>
|
||||
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
||||
---
|
||||
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
|
||||
@ -1,220 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit edo toolchain-funcs
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; 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
|
||||
"${FILESDIR}"/${PN}-6.4.0-add-missing-limits.h-include.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Fix version if necessary
|
||||
local versionfile="include/version.h"
|
||||
if [[ ${PV} != 9999 ]] && ! 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 <sched.h>\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 || die
|
||||
fi
|
||||
|
||||
if use minimal ; then
|
||||
sed -i -e '/HAVE_MNL/d' config.mk || die
|
||||
fi
|
||||
|
||||
if ! use elf ; then
|
||||
sed -i -e '/HAVE_ELF/d' config.mk || die
|
||||
fi
|
||||
|
||||
if ! use nfs ; then
|
||||
sed -i -e '/HAVE_RPC/d' config.mk || die
|
||||
fi
|
||||
|
||||
if ! use selinux ; then
|
||||
sed -i -e '/HAVE_SELINUX/d' config.mk || die
|
||||
fi
|
||||
|
||||
if ! use libbsd ; then
|
||||
sed -i -e '/HAVE_LIBBSD/d' config.mk || die
|
||||
fi
|
||||
|
||||
# ...Now switch on/off requested features via USE flags
|
||||
# this is only useful if the test did not set other things, per bug #643722
|
||||
# Keep in sync with ifs above, or refactor to be unified.
|
||||
cat <<-EOF >> config.mk
|
||||
TC_CONFIG_ATM := $(usex atm y n)
|
||||
TC_CONFIG_XT := $(usex iptables y n)
|
||||
TC_CONFIG_NO_XT := $(usex iptables n y)
|
||||
# We've locked in recent enough kernel headers, bug #549948
|
||||
TC_CONFIG_IPSET := y
|
||||
HAVE_BERKELEY_DB := $(usex berkdb y n)
|
||||
HAVE_CAP := $(usex caps y n)
|
||||
HAVE_MNL := $(usex minimal n y)
|
||||
HAVE_ELF := $(usex elf y n)
|
||||
HAVE_RPC := $(usex nfs y n)
|
||||
HAVE_SELINUX := $(usex selinux y n)
|
||||
IP_CONFIG_SETNS := ${setns}
|
||||
# Use correct iptables dir, bug #144265, bug #293709
|
||||
IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
|
||||
HAVE_LIBBSD := $(usex libbsd y n)
|
||||
EOF
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1 NETNS_RUN_DIR=/run/netns
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use minimal ; then
|
||||
into /
|
||||
dosbin tc/tc
|
||||
dobin ip/ip
|
||||
return 0
|
||||
fi
|
||||
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
PREFIX="${EPREFIX}/usr" \
|
||||
LIBDIR="${EPREFIX}"/$(get_libdir) \
|
||||
SBINDIR="${EPREFIX}"/sbin \
|
||||
CONFDIR="${EPREFIX}"/etc/iproute2 \
|
||||
DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
|
||||
MANDIR="${EPREFIX}"/usr/share/man \
|
||||
ARPDDIR="${EPREFIX}"/var/lib/arpd \
|
||||
install
|
||||
|
||||
dodir /bin
|
||||
mv "${ED}"/{s,}bin/ip || die # bug #330115
|
||||
|
||||
dolib.a lib/libnetlink.a
|
||||
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
|
||||
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
|
||||
dodir /usr/bin
|
||||
mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
|
||||
elif [[ -d "${ED}"/var/lib/arpd ]]; then
|
||||
rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
|
||||
fi
|
||||
}
|
||||
@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; 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"
|
||||
@ -52,6 +52,7 @@ PATCHES=(
|
||||
"${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() {
|
||||
@ -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,11 +48,13 @@ 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-add-missing-limits.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-revert-CONF_USR_DIR.patch
|
||||
"${FILESDIR}"/${PN}-6.6.0-makefile-use-usr-share-config.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
@ -62,12 +64,12 @@ src_prepare() {
|
||||
local versionfile="include/version.h"
|
||||
if [[ ${PV} != 9999 ]] && ! 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' \
|
||||
@ -188,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
|
||||
@ -197,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
|
||||
@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; 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"
|
||||
|
||||
@ -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
|
||||
|
||||
@ -10,7 +10,6 @@
|
||||
<flag name="bpf">Use <pkg>dev-libs/libbpf</pkg></flag>
|
||||
<flag name="elf">support loading eBPF programs from ELFs (e.g. LLVM's eBPF backend)</flag>
|
||||
<flag name="iptables">include support for iptables filtering</flag>
|
||||
<flag name="libbsd">Use <pkg>dev-libs/libbsd</pkg> instead of internal funcs</flag>
|
||||
<flag name="minimal">only install ip and tc programs, without eBPF support</flag>
|
||||
<flag name="nfs">Support RPC lookups via <pkg>net-libs/libtirpc</pkg> in ss</flag>
|
||||
</use>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user