gentoo resync : 18.08.2019

2 files changed, 0 insertions, 223 deletions

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 250df54fce1f..b65867237109 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,6 +1,5 @@
 AUX iproute2-3.1.0-mtu.patch 1649 BLAKE2B cbecd9770391ca7c7f25b860a95bb5b2783073b333084874b18de85f5a9072ab3922e083f726ab1e6f58f0334b515968b1e3651abcd7fc6f603def0492da79cb SHA512 5479c2085b4aca958a89d3e265ebc3763c9e7cb273bd4046d7b7585209739f75ff04cc9b84d8eb9e3afae821ff788f0f0c7ab443260ab07943b6fad6946403e1
 AUX iproute2-4.11.0-no-ipv6.patch 1360 BLAKE2B 43881c76622159e6ae7f7499eddfc251b0cf1e0a8fa077d3099c509706b056c51685c3dff66e3381a2ca0839dd32d1534a310dff4acf329836ddd1bec6eb8241 SHA512 8e548f19079eea1d3a5a91bb657bba961c9e9206147e0e0aea1aaf04d74b46e2687c906b78561d939f53f4a33ecb9e08ad8237f401068076df5842c78bc3b577
-AUX iproute2-4.14.1-fix-tc-actions.patch 6665 BLAKE2B e2ff926f2122973bcbe61e16717b8a1c51b6b76a774b6ce03126b7664fc5beb47e4f38672910e822b19aadd5c369d00553b2e6b6c30c012e03ad37b023cac4f7 SHA512 cdde7bb5a0cb49471472a8412758023529976dcafefc6a759ce758fba1b0420c046ca6faf084df81ac11e7153ac820909b1b9ec41c04f643208b9db456cfda28
 AUX iproute2-4.17.0-configure-nomagic.patch 5654 BLAKE2B b56f7a3a02822c99a1f2c7ca1bcd0af633dc2f57d454c44dabd81b923f43afee1dfdfffda1d1293c101041316c8496275d773c2495f73817fb4ff90d0a85daed SHA512 97f35b0e8a93e5570fdade6a47864518686a358c9c6b5a55832d66baae628140015a90418b49b8426f66011c8b8a9dc7713d89c3e0e45938b3dc948a92350d42
 AUX iproute2-4.20.0-configure-nomagic.patch 5835 BLAKE2B e21e79a5f804b4f3ebd82334541dd6d9e931308cfa218dfd7743f5a807126d6bf52d63e9e84f7683be41b2249ea8aa13991ea3f4d486702d3d4d2c4e9a51b238 SHA512 a41b87a11d71120c3f3df9f9dbecc789df0355de517700749ea0b9bb4fb9ffeb94dd9218f9b2edc75ffc865e63a9a00af381816b36b0a929c0c9c7828c949660
 AUX iproute2-4.20.0-no-ipv6.patch 1334 BLAKE2B 612fa64a897fe8c601aca529a09508cc865f2f0fb7cb865ba28f3369748086622b6910f25052047c972f495b5e20014cdf6e9f73b230124f372cfe6301bc0bf2 SHA512 f4b42667d4433225b2e4272b6e629fc43b73ede02ac0e706d2e46d81ffcecd19ca45b8b9789904b4bd6d10d34c82239f9b3c33cfcf3f9e5b309d828a3494c864
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 a8b7aaa9efe0..000000000000
--- 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
-