* [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/
@ 2019-08-10 14:52 Aaron Bauman
0 siblings, 0 replies; 8+ messages in thread
From: Aaron Bauman @ 2019-08-10 14:52 UTC (permalink / raw
To: gentoo-commits
commit: 53165f6b46bc423a5eee6e14665506f8f8a848f2
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Aug 1 16:55:02 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 14:44:26 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53165f6b
sys-apps/iproute2: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12594
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../files/iproute2-4.14.1-fix-tc-actions.patch | 222 ---------------------
1 file changed, 222 deletions(-)
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
deleted file mode 100644
index a8b7aaa9efe..00000000000
--- a/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-From 3572e01a090a298e2f4c4f796bad6639b652e031 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-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 <mprivozn@redhat.com>
----
- 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(&argc, &argv, &parm.action,
- 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(&argc, &argv, &sel.action, 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(&argc, &argv, &sel.action, 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(&argc, &argv, &p.action, false) == -1) {
-+ if (matches(*argv, "gact") != 0 &&
-+ parse_action_control(&argc, &argv, &p.action, 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(&argc, &argv,
- &pp.paction, false) == -1)
- usage();
-+ NEXT_ARG_FWD();
- if (get_u16(&pp.pval, *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(&argc, &argv, &p.action, 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(&argc, &argv, &p.action, false);
-+ NEXT_ARG_FWD();
-+ }
-
- if (argc) {
- if (iok && matches(*argv, "index") == 0) {
-diff --git a/tc/m_nat.c b/tc/m_nat.c
-index 1e4ff51..f5de4d4 100644
---- a/tc/m_nat.c
-+++ b/tc/m_nat.c
-@@ -116,6 +116,7 @@ parse_nat(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, struct
-
- parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_OK);
-
-+ NEXT_ARG_FWD();
- if (argc) {
- if (matches(*argv, "index") == 0) {
- NEXT_ARG();
-diff --git a/tc/m_pedit.c b/tc/m_pedit.c
-index 26549ee..dc57f14 100644
---- a/tc/m_pedit.c
-+++ b/tc/m_pedit.c
-@@ -672,6 +672,7 @@ int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id,
-
- parse_action_control_dflt(&argc, &argv, &sel.sel.action, false, TC_ACT_OK);
-
-+ NEXT_ARG_FWD();
- if (argc) {
- if (matches(*argv, "index") == 0) {
- NEXT_ARG();
-diff --git a/tc/m_sample.c b/tc/m_sample.c
-index ff5ee6b..31774c0 100644
---- a/tc/m_sample.c
-+++ b/tc/m_sample.c
-@@ -100,6 +100,7 @@ static int parse_sample(struct action_util *a, int *argc_p, char ***argv_p,
-
- parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE);
-
-+ NEXT_ARG_FWD();
- if (argc) {
- if (matches(*argv, "index") == 0) {
- NEXT_ARG();
-diff --git a/tc/m_skbedit.c b/tc/m_skbedit.c
-index aa374fc..c41a7bb 100644
---- a/tc/m_skbedit.c
-+++ b/tc/m_skbedit.c
-@@ -123,6 +123,7 @@ parse_skbedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id,
- parse_action_control_dflt(&argc, &argv, &sel.action,
- false, TC_ACT_PIPE);
-
-+ NEXT_ARG_FWD();
- if (argc) {
- if (matches(*argv, "index") == 0) {
- NEXT_ARG();
-diff --git a/tc/m_skbmod.c b/tc/m_skbmod.c
-index 561b73f..bc268df 100644
---- a/tc/m_skbmod.c
-+++ b/tc/m_skbmod.c
-@@ -124,6 +124,7 @@ static int parse_skbmod(struct action_util *a, int *argc_p, char ***argv_p,
-
- parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE);
-
-+ NEXT_ARG_FWD();
- if (argc) {
- if (matches(*argv, "index") == 0) {
- NEXT_ARG();
-diff --git a/tc/m_tunnel_key.c b/tc/m_tunnel_key.c
-index 1cdd035..2dc9187 100644
---- a/tc/m_tunnel_key.c
-+++ b/tc/m_tunnel_key.c
-@@ -175,6 +175,7 @@ static int parse_tunnel_key(struct action_util *a, int *argc_p, char ***argv_p,
- parse_action_control_dflt(&argc, &argv, &parm.action,
- false, TC_ACT_PIPE);
-
-+ NEXT_ARG_FWD();
- if (argc) {
- if (matches(*argv, "index") == 0) {
- NEXT_ARG();
-diff --git a/tc/m_vlan.c b/tc/m_vlan.c
-index 161759f..edae0d1 100644
---- a/tc/m_vlan.c
-+++ b/tc/m_vlan.c
-@@ -131,6 +131,7 @@ static int parse_vlan(struct action_util *a, int *argc_p, char ***argv_p,
- parse_action_control_dflt(&argc, &argv, &parm.action,
- false, TC_ACT_PIPE);
-
-+ NEXT_ARG_FWD();
- if (argc) {
- if (matches(*argv, "index") == 0) {
- NEXT_ARG();
-diff --git a/tc/tc_util.c b/tc/tc_util.c
-index 1887905..ee9a70a 100644
---- a/tc/tc_util.c
-+++ b/tc/tc_util.c
-@@ -586,7 +586,6 @@ static int __parse_action_control(int *argc_p, char ***argv_p, int *result_p,
- }
- result |= jump_cnt;
- }
-- NEXT_ARG_FWD();
- *argc_p = argc;
- *argv_p = argv;
- *result_p = result;
---
-cgit v1.1
-
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/
@ 2024-09-24 6:06 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2024-09-24 6:06 UTC (permalink / raw
To: gentoo-commits
commit: d0d19b4dc3d32cbd8631068b7721c3bee92bacdb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 24 06:05:09 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 24 06:05:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0d19b4d
sys-apps/iproute2: drop unnecessary const from forward typedecl in musl patch
See Holger's comment at https://github.com/gentoo/gentoo/pull/38710#issuecomment-2366830999.
Bug: https://bugs.gentoo.org/939811
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/iproute2/files/iproute2-6.11.0-musl-fixes.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/iproute2/files/iproute2-6.11.0-musl-fixes.patch b/sys-apps/iproute2/files/iproute2-6.11.0-musl-fixes.patch
index bc2f6a366e4d..cc1370a3a6af 100644
--- a/sys-apps/iproute2/files/iproute2-6.11.0-musl-fixes.patch
+++ b/sys-apps/iproute2/files/iproute2-6.11.0-musl-fixes.patch
@@ -28,7 +28,7 @@ From: Holger Hoffstätte <holger@applied-asynchrony.com>
#include "json_writer.h"
#include "color.h"
-+const struct timeval;
++struct timeval;
+
#define _IS_JSON_CONTEXT(type) (is_json_context() && (type & PRINT_JSON || type & PRINT_ANY))
#define _IS_FP_CONTEXT(type) (!is_json_context() && (type & PRINT_FP || type & PRINT_ANY))
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/
@ 2023-09-16 10:25 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-09-16 10:25 UTC (permalink / raw
To: gentoo-commits
commit: 4df96bf773daff0d26fe04c4a6ac2e94a4b542a1
Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Tue Sep 5 16:17:24 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 10:13:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df96bf7
sys-apps/iproute2: add patch to remove automagic fallback to libbsd
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../iproute2-6.4.0-disable-libbsd-fallback.patch | 25 ++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/sys-apps/iproute2/files/iproute2-6.4.0-disable-libbsd-fallback.patch b/sys-apps/iproute2/files/iproute2-6.4.0-disable-libbsd-fallback.patch
new file mode 100644
index 000000000000..888091387fe9
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-6.4.0-disable-libbsd-fallback.patch
@@ -0,0 +1,25 @@
+
+Disable the optional libbsd fallback in favor of iproute2's own
+strlcat/strlcpy routines. This prevents automagic linking and
+all sorts of other related problems.
+
+Bug: https://bugs.gentoo.org/911727
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+
+--- a/configure 2023-09-05 16:20:48.000000000 +0200
++++ b/configure 2023-09-05 16:29:15.850347415 +0200
+@@ -454,14 +454,8 @@ EOF
+ if $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1; then
+ echo "no"
+ else
+- if ${PKG_CONFIG} libbsd --exists; then
+- echo 'HAVE_LIBBSD_CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
+- echo 'HAVE_LIBBSD_LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
+- echo "no"
+- else
+ echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
+ echo "yes"
+- fi
+ fi
+ rm -f $TMPDIR/strtest.c $TMPDIR/strtest
+ }
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/
@ 2023-09-16 10:25 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-09-16 10:25 UTC (permalink / raw
To: gentoo-commits
commit: 5ab7e707e5f43a4d0a810219148fc47295a58e66
Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Tue Sep 5 17:26:31 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 10:13:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ab7e707
sys-apps/iproute2: modify nomagic patch to no longer enforce libbsd
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...proute2-5.12.0-configure-nomagic-nolibbsd.patch | 242 +++++++++++++++++++++
1 file changed, 242 insertions(+)
diff --git a/sys-apps/iproute2/files/iproute2-5.12.0-configure-nomagic-nolibbsd.patch b/sys-apps/iproute2/files/iproute2-5.12.0-configure-nomagic-nolibbsd.patch
new file mode 100644
index 000000000000..4f88da3c20c5
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-5.12.0-configure-nomagic-nolibbsd.patch
@@ -0,0 +1,242 @@
+The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
+a variable as well as modifying CFLAGS & LDLIBS.
+
+If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
+are still in place.
+
+Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
+are only passed when correctly needed.
+
+Prior Gentoo testcase for reproduction:
+USE=minimal ebuild ... compile.
+- Linking with libbsd, libelf, libmnl & libcap based only on presence.
+- Links based on libselinux based only on presence.
+
+Closes: https://bugs.gentoo.org/643722
+Signed-off-by: Robin H. Johnson <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 :=
+
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/
@ 2022-04-11 19:13 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2022-04-11 19:13 UTC (permalink / raw
To: gentoo-commits
commit: 3c9d2b811abb9700f7ac18d8626f4820e74db790
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Apr 11 18:15:36 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 19:12:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c9d2b81
sys-apps/iproute2: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/24994
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
...route2-5.16.0-fix-ax25.h-include-for-musl.patch | 25 ----------------------
1 file changed, 25 deletions(-)
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
deleted file mode 100644
index 28307131a3db..000000000000
--- a/sys-apps/iproute2/files/iproute2-5.16.0-fix-ax25.h-include-for-musl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://marc.info/?l=linux-netdev&m=164206157726666&w=2
-
-From: Sam James <sam@gentoo.org>
-Date: Thu, 13 Jan 2022 08:05:33 +0000
-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 <errno.h>
- #include <sys/socket.h>
--#include <netax25/ax25.h>
-+#include <linux/ax25.h>
-
- #include "utils.h"
-
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/
@ 2022-01-13 8:20 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-01-13 8:20 UTC (permalink / raw
To: gentoo-commits
commit: 8fd7cb0e18f0d80322df65b2d3109aee801869ea
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 13 08:19:50 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 13 08:19:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fd7cb0e
sys-apps/iproute2: add link to upstream submission
Bug: https://bugs.gentoo.org/831102
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../iproute2/files/iproute2-5.16.0-fix-ax25.h-include-for-musl.patch | 2 ++
1 file changed, 2 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
index 8644a93ba115..28307131a3db 100644
--- 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
@@ -1,3 +1,5 @@
+https://marc.info/?l=linux-netdev&m=164206157726666&w=2
+
From: Sam James <sam@gentoo.org>
Date: Thu, 13 Jan 2022 08:05:33 +0000
Subject: [PATCH] Fix ax25.h include for musl
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/
@ 2021-07-25 21:32 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2021-07-25 21:32 UTC (permalink / raw
To: gentoo-commits
commit: b171be5aa052c7f5d7f15f9d67ec3740a8c620fd
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jul 24 18:24:49 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jul 25 21:32:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b171be5a
sys-apps/iproute2: remove unused patch
Bug: https://github.com/gentoo/gentoo/pull/21769
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/iproute2-5.11.0-configure-nomagic.patch | 235 ---------------------
1 file changed, 235 deletions(-)
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
deleted file mode 100644
index 8ccd02a10e2..00000000000
--- a/sys-apps/iproute2/files/iproute2-5.11.0-configure-nomagic.patch
+++ /dev/null
@@ -1,235 +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>
-
---- 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` >> $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.11.0/dcb/Makefile
-+++ iproute2-5.11.0/dcb/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- TARGETS :=
-
---- iproute2-5.11.0/devlink/Makefile
-+++ iproute2-5.11.0/devlink/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- TARGETS :=
-
---- iproute2-5.11.0/genl/Makefile
-+++ iproute2-5.11.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.11.0/ip/Makefile
-+++ iproute2-5.11.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.11.0/lib/Makefile
-+++ iproute2-5.11.0/lib/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- CFLAGS += -fPIC
-
---- iproute2-5.11.0/misc/Makefile
-+++ iproute2-5.11.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.11.0/netem/Makefile
-+++ iproute2-5.11.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.11.0/rdma/Makefile
-+++ iproute2-5.11.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.11.0/tc/Makefile
-+++ iproute2-5.11.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.11.0/tipc/Makefile
-+++ iproute2-5.11.0/tipc/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
-
- TARGETS :=
-
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/
@ 2019-01-21 11:38 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2019-01-21 11:38 UTC (permalink / raw
To: gentoo-commits
commit: 2c8e69376f26fe6d3502845157dc54469b712f0a
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jan 7 15:10:30 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jan 21 11:37:42 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c8e6937
sys-apps/iproute2: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/iproute2-4.14.1-configure-nomagic.patch | 196 ---------------------
.../files/iproute2-4.14.1-posix-shell.patch | 65 -------
.../iproute2/files/iproute2-4.2.0-no-ipv6.patch | 37 ----
3 files changed, 298 deletions(-)
diff --git a/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch
deleted file mode 100644
index 919249b8392..00000000000
--- a/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch
+++ /dev/null
@@ -1,196 +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 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 <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/bridge/Makefile iproute2-4.14.1/bridge/Makefile
---- iproute2-4.14.1.orig/bridge/Makefile 2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/bridge/Makefile 2018-01-07 14:24:23.350726423 -0800
-@@ -1,6 +1,7 @@
- BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
-
- include ../config.mk
-+include ../config.include
-
- all: bridge
-
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/config.include iproute2-4.14.1/config.include
---- iproute2-4.14.1.orig/config.include 1969-12-31 16:00:00.000000000 -0800
-+++ iproute2-4.14.1/config.include 2018-01-07 14:25:34.406126921 -0800
-@@ -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
-+ $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
-+
-+# vim: ft=make:
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/configure iproute2-4.14.1/configure
---- iproute2-4.14.1.orig/configure 2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/configure 2018-01-07 14:25:49.242419367 -0800
-@@ -223,7 +223,7 @@
- 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
-@@ -268,8 +268,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
-@@ -283,8 +283,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
-@@ -297,8 +297,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
-@@ -425,7 +425,3 @@
- echo -n "docs:"
- check_docs
- echo
--
--echo >> $CONFIG
--echo "%.o: %.c" >> $CONFIG
--echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/devlink/Makefile iproute2-4.14.1/devlink/Makefile
---- iproute2-4.14.1.orig/devlink/Makefile 2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/devlink/Makefile 2018-01-07 14:24:23.351726442 -0800
-@@ -1,4 +1,5 @@
- include ../config.mk
-+include ../config.include
-
- ifeq ($(HAVE_MNL),y)
-
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/genl/Makefile iproute2-4.14.1/genl/Makefile
---- iproute2-4.14.1.orig/genl/Makefile 2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/genl/Makefile 2018-01-07 14:24:23.351726442 -0800
-@@ -1,6 +1,7 @@
- GENLOBJ=genl.o
-
- include ../config.mk
-+include ../config.include
- SHARED_LIBS ?= y
-
- CFLAGS += -fno-strict-aliasing
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/ip/Makefile iproute2-4.14.1/ip/Makefile
---- iproute2-4.14.1.orig/ip/Makefile 2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/ip/Makefile 2018-01-07 14:24:23.351726442 -0800
-@@ -14,6 +14,7 @@
- RTMONOBJ=rtmon.o
-
- include ../config.mk
-+include ../config.include
-
- ALLOBJ=$(IPOBJ) $(RTMONOBJ)
- SCRIPTS=ifcfg rtpr routel routef
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/lib/Makefile iproute2-4.14.1/lib/Makefile
---- iproute2-4.14.1.orig/lib/Makefile 2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/lib/Makefile 2018-01-07 14:24:23.351726442 -0800
-@@ -1,4 +1,5 @@
- include ../config.mk
-+include ../config.include
-
- CFLAGS += -fPIC
-
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/misc/Makefile iproute2-4.14.1/misc/Makefile
---- iproute2-4.14.1.orig/misc/Makefile 2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/misc/Makefile 2018-01-07 14:24:23.351726442 -0800
-@@ -4,6 +4,7 @@
- TARGETS=ss nstat ifstat rtacct lnstat
-
- include ../config.mk
-+include ../config.include
-
- ifeq ($(HAVE_BERKELEY_DB),y)
- TARGETS += arpd
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/netem/Makefile iproute2-4.14.1/netem/Makefile
---- iproute2-4.14.1.orig/netem/Makefile 2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/netem/Makefile 2018-01-07 14:24:23.351726442 -0800
-@@ -1,4 +1,5 @@
- include ../config.mk
-+include ../config.include
-
- DISTGEN = maketable normal pareto paretonormal
- DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/rdma/Makefile iproute2-4.14.1/rdma/Makefile
---- iproute2-4.14.1.orig/rdma/Makefile 2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/rdma/Makefile 2018-01-07 14:24:23.352726462 -0800
-@@ -1,4 +1,5 @@
- include ../config.mk
-+include ../config.include
-
- ifeq ($(HAVE_MNL),y)
-
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/tc/Makefile iproute2-4.14.1/tc/Makefile
---- iproute2-4.14.1.orig/tc/Makefile 2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/tc/Makefile 2018-01-07 14:24:23.352726462 -0800
-@@ -3,6 +3,7 @@
- emp_ematch.yacc.o emp_ematch.lex.o
-
- include ../config.mk
-+include ../config.include
-
- SHARED_LIBS ?= y
-
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/tipc/Makefile iproute2-4.14.1/tipc/Makefile
---- iproute2-4.14.1.orig/tipc/Makefile 2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/tipc/Makefile 2018-01-07 14:24:23.352726462 -0800
-@@ -1,4 +1,5 @@
- include ../config.mk
-+include ../config.include
-
- ifeq ($(HAVE_MNL),y)
-
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
deleted file mode 100644
index e5efc9068ce..00000000000
--- a/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://marc.info/?l=linux-netdev&m=151554000532498&w=2
-
-From aec69bbc285e5498add5384b6018564355594233 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-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 <perley@chromium.org>
-Signed-off-by: Mike Frysinger <vapier@chromium.org>
----
- 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 &
-+ arping -q -U -c 1 -I $dev $ipaddr ) >/dev/null 2>&1 </dev/null &
-
--ip route add unreachable 224.0.0.0/24 >& /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/files/iproute2-4.2.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-4.2.0-no-ipv6.patch
deleted file mode 100644
index b29e1aa3e11..00000000000
--- a/sys-apps/iproute2/files/iproute2-4.2.0-no-ipv6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- iproute2-4.2.0/ip/ipmonitor.c
-+++ iproute2-4.2.0/ip/ipmonitor.c
-@@ -115,7 +115,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.2.0/ip/iptunnel.c
-+++ iproute2-4.2.0/ip/iptunnel.c
-@@ -637,13 +637,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.2.0/ip/Makefile
-+++ iproute2-4.2.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_vlan.o link_veth.o link_gre.o iplink_can.o \
- iplink_macvlan.o iplink_macvtap.o ipl2tp.o link_vti.o link_vti6.o \
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-09-24 6:06 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-10 14:52 [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2024-09-24 6:06 Sam James
2023-09-16 10:25 Sam James
2023-09-16 10:25 Sam James
2022-04-11 19:13 Conrad Kostecki
2022-01-13 8:20 Sam James
2021-07-25 21:32 Conrad Kostecki
2019-01-21 11:38 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox