T7664: Remove patches that are already in 10.5

5 files changed, 0 insertions, 343 deletions

diff --git a/scripts/package-build/frr/patches/frr/0001-ldpd-Option-for-disabled-LDP-hello-message-during-TC.patch b/scripts/package-build/frr/patches/frr/0001-ldpd-Option-for-disabled-LDP-hello-message-during-TC.patch
deleted file mode 100644
index 67f85d01..00000000
--- a/scripts/package-build/frr/patches/frr/0001-ldpd-Option-for-disabled-LDP-hello-message-during-TC.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From 945eff42df61982585011fa8427050c74ca90c6b Mon Sep 17 00:00:00 2001
-From: Andrii Melnychenko <a.melnychenko@vyos.io>
-Date: Mon, 17 Mar 2025 13:25:20 +0100
-Subject: [PATCH 1/1] ldpd: Option for disabled LDP hello message during TCP
-
-Added option "disable-establish-hello" that disableds
-sending additional LDP hello multicast messages during
-TCP session establishment.
-This option enables per interface: "(config-ldp-af-if)".
-
-Signed-off-by: Andrii Melnychenko <a.melnychenko@vyos.io>
----
- ldpd/interface.c    |  2 ++
- ldpd/ldp_vty.h      |  1 +
- ldpd/ldp_vty_cmds.c | 11 +++++++++++
- ldpd/ldp_vty_conf.c | 32 ++++++++++++++++++++++++++++++++
- ldpd/ldpd.c         |  1 +
- ldpd/ldpd.h         |  1 +
- ldpd/neighbor.c     |  5 +++--
- 7 files changed, 51 insertions(+), 2 deletions(-)
-
-diff --git a/ldpd/interface.c b/ldpd/interface.c
-index f0e70cbac..6fccd4af5 100644
---- a/ldpd/interface.c
-+++ b/ldpd/interface.c
-@@ -63,11 +63,13 @@ if_new(const char *name)
- 	iface->ipv4.af = AF_INET;
- 	iface->ipv4.iface = iface;
- 	iface->ipv4.enabled = 0;
-+	iface->ipv4.disable_establish_hello = 0;
- 
- 	/* ipv6 */
- 	iface->ipv6.af = AF_INET6;
- 	iface->ipv6.iface = iface;
- 	iface->ipv6.enabled = 0;
-+	iface->ipv6.disable_establish_hello = 0;
- 
- 	return (iface);
- }
-diff --git a/ldpd/ldp_vty.h b/ldpd/ldp_vty.h
-index 5c83d1c56..196d05c93 100644
---- a/ldpd/ldp_vty.h
-+++ b/ldpd/ldp_vty.h
-@@ -24,6 +24,7 @@ int	 ldp_vty_allow_broken_lsp(struct vty *, const char *);
- int	 ldp_vty_address_family (struct vty *, const char *, const char *);
- int	 ldp_vty_disc_holdtime(struct vty *, const char *, enum hello_type, long);
- int	 ldp_vty_disc_interval(struct vty *, const char *, enum hello_type, long);
-+int	 ldp_vty_disable_establish_hello(struct vty *, const char *);
- int	 ldp_vty_targeted_hello_accept(struct vty *, const char *, const char *);
- int	 ldp_vty_nbr_session_holdtime(struct vty *, const char *, struct in_addr, long);
- int	 ldp_vty_af_session_holdtime(struct vty *, const char *, long);
-diff --git a/ldpd/ldp_vty_cmds.c b/ldpd/ldp_vty_cmds.c
-index e046ae996..d6c36c35b 100644
---- a/ldpd/ldp_vty_cmds.c
-+++ b/ldpd/ldp_vty_cmds.c
-@@ -122,6 +122,15 @@ DEFPY  (ldp_discovery_link_interval,
- 	return (ldp_vty_disc_interval(vty, no, HELLO_LINK, interval));
- }
- 
-+DEFPY  (ldp_disable_establish_hello,
-+	ldp_disable_establish_hello_cmd,
-+	"[no] disable-establish-hello",
-+	NO_STR
-+	"Disable sending additional LDP hello message on establishing LDP tcp connection\n")
-+{
-+	return ldp_vty_disable_establish_hello(vty, no);
-+}
-+
- DEFPY  (ldp_discovery_targeted_interval,
- 	ldp_discovery_targeted_interval_cmd,
- 	"[no] discovery targeted-hello interval (1-65535)$interval",
-@@ -866,9 +875,11 @@ ldp_vty_init (void)
- 
- 	install_element(LDP_IPV4_IFACE_NODE, &ldp_discovery_link_holdtime_cmd);
- 	install_element(LDP_IPV4_IFACE_NODE, &ldp_discovery_link_interval_cmd);
-+	install_element(LDP_IPV4_IFACE_NODE, &ldp_disable_establish_hello_cmd);
- 
- 	install_element(LDP_IPV6_IFACE_NODE, &ldp_discovery_link_holdtime_cmd);
- 	install_element(LDP_IPV6_IFACE_NODE, &ldp_discovery_link_interval_cmd);
-+	install_element(LDP_IPV6_IFACE_NODE, &ldp_disable_establish_hello_cmd);
- 
- 	install_element(LDP_L2VPN_NODE, &ldp_bridge_cmd);
- 	install_element(LDP_L2VPN_NODE, &ldp_mtu_cmd);
-diff --git a/ldpd/ldp_vty_conf.c b/ldpd/ldp_vty_conf.c
-index ffff67683..56ad071c8 100644
---- a/ldpd/ldp_vty_conf.c
-+++ b/ldpd/ldp_vty_conf.c
-@@ -119,6 +119,8 @@ ldp_af_iface_config_write(struct vty *vty, int af)
- 		    ia->hello_interval != 0)
- 			vty_out (vty, "   discovery hello interval %u\n",
- 			    ia->hello_interval);
-+		if (ia->disable_establish_hello)
-+			vty_out (vty, "   disable-establish-hello\n");
- 
- 		vty_out (vty, "  exit\n");
- 	}
-@@ -632,6 +634,36 @@ ldp_vty_disc_interval(struct vty *vty, const char *negate,
- 	return (CMD_SUCCESS);
- }
- 
-+int
-+ldp_vty_disable_establish_hello(struct vty *vty,
-+	const char *negate)
-+{
-+	struct iface		*iface;
-+	struct iface_af		*ia;
-+	int			 af;
-+
-+	switch (vty->node) {
-+	case LDP_IPV4_IFACE_NODE:
-+	case LDP_IPV6_IFACE_NODE:
-+		af = ldp_vty_get_af(vty);
-+		iface = VTY_GET_CONTEXT(iface);
-+		VTY_CHECK_CONTEXT(iface);
-+
-+		ia = iface_af_get(iface, af);
-+		if (negate)
-+			ia->disable_establish_hello = 0;
-+		else
-+			ia->disable_establish_hello = 1;
-+
-+		ldp_config_apply(vty, vty_conf);
-+		break;
-+	default:
-+		fatalx("ldp_vty_disable_establish_hello: unexpected node");
-+	}
-+
-+	return (CMD_SUCCESS);
-+}
-+
- int
- ldp_vty_targeted_hello_accept(struct vty *vty, const char *negate,
-     const char *acl_from_str)
-diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c
-index 4d38fdcd0..9a5667c26 100644
---- a/ldpd/ldpd.c
-+++ b/ldpd/ldpd.c
-@@ -1604,6 +1604,7 @@ merge_iface_af(struct iface_af *ia, struct iface_af *xi)
- 	}
- 	ia->hello_holdtime = xi->hello_holdtime;
- 	ia->hello_interval = xi->hello_interval;
-+	ia->disable_establish_hello = xi->disable_establish_hello;
- }
- 
- static void
-diff --git a/ldpd/ldpd.h b/ldpd/ldpd.h
-index ad831a6ea..40a1e8c3c 100644
---- a/ldpd/ldpd.h
-+++ b/ldpd/ldpd.h
-@@ -332,6 +332,7 @@ struct iface_af {
- 	struct event *hello_timer;
- 	uint16_t		 hello_holdtime;
- 	uint16_t		 hello_interval;
-+	int disable_establish_hello;
- };
- 
- struct iface_ldp_sync {
-diff --git a/ldpd/neighbor.c b/ldpd/neighbor.c
-index 2596c7948..00a809186 100644
---- a/ldpd/neighbor.c
-+++ b/ldpd/neighbor.c
-@@ -630,8 +630,9 @@ nbr_establish_connection(struct nbr *nbr)
- 	 * an adjacency as well.
- 	 */
- 	RB_FOREACH(adj, nbr_adj_head, &nbr->adj_tree)
--		send_hello(adj->source.type, adj->source.link.ia,
--		    adj->source.target);
-+		if (!(adj->source.type == HELLO_LINK && adj->source.link.ia->disable_establish_hello))
-+			send_hello(adj->source.type, adj->source.link.ia,
-+				adj->source.target);
- 
- 	if (connect(nbr->fd, &remote_su.sa, sockaddr_len(&remote_su.sa)) == -1) {
- 		if (errno == EINPROGRESS) {
--- 
-2.43.0
-
diff --git a/scripts/package-build/frr/patches/frr/0003-Clear-Babel-Config-On-Stop.patch b/scripts/package-build/frr/patches/frr/0003-Clear-Babel-Config-On-Stop.patch
deleted file mode 100644
index fea45891..00000000
--- a/scripts/package-build/frr/patches/frr/0003-Clear-Babel-Config-On-Stop.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c3c70e87b040233263b9594d14582dfedfecc92e Mon Sep 17 00:00:00 2001
-From: Yaroslav Kholod <y.kholod@vyos.io>
-Date: Wed, 18 Dec 2024 11:48:29 +0200
-Subject: [PATCH] #17413: Clean babeld config on stop
-
----
- babeld/babeld.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/babeld/babeld.c b/babeld/babeld.c
-index b562f0b70..6f1a9a3d7 100644
---- a/babeld/babeld.c
-+++ b/babeld/babeld.c
-@@ -304,6 +304,12 @@ void babel_clean_routing_process(void)
-     flush_all_routes();
-     babel_interface_close_all();
- 
-+    /* Clean babel config */
-+    diversity_kind = DIVERSITY_NONE;
-+    diversity_factor = BABEL_DEFAULT_DIVERSITY_FACTOR;
-+    resend_delay = BABEL_DEFAULT_RESEND_DELAY;
-+    smoothing_half_life = BABEL_DEFAULT_SMOOTHING_HALF_LIFE;
-+
-     /* cancel events */
-     event_cancel(&babel_routing_process->t_read);
-     event_cancel(&babel_routing_process->t_update);
--- 
-2.43.0
-
diff --git a/scripts/package-build/frr/patches/frr/0004-tools-Add-missing-keyword-segment-routing-srv6-in-fr.patch b/scripts/package-build/frr/patches/frr/0004-tools-Add-missing-keyword-segment-routing-srv6-in-fr.patch
deleted file mode 100644
index 6344cfb4..00000000
--- a/scripts/package-build/frr/patches/frr/0004-tools-Add-missing-keyword-segment-routing-srv6-in-fr.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b4babae93b81be46c105e59c74b1708f00b68704 Mon Sep 17 00:00:00 2001
-From: Carmine Scarpitta <cscarpit@cisco.com>
-Date: Sat, 23 Nov 2024 08:46:00 +0100
-Subject: [PATCH 4/5] tools: Add missing keyword `segment-routing srv6` in
- frr-reload
-
-Fix the error below:
-
-```
-[58564|mgmtd] sending configuration
-[58565|zebra] sending configuration,
-line 10: % Unknown command[52]:  node-msd
-[58573|isisd] sending configuration
-[58565|zebra] Configuration file[/etc/frr/frr.conf] processing failure: 2
-```
-
-Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
----
- tools/frr-reload.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tools/frr-reload.py b/tools/frr-reload.py
-index 08a1f1e07e..baa6285f45 100755
---- a/tools/frr-reload.py
-+++ b/tools/frr-reload.py
-@@ -255,7 +255,9 @@ ctx_keywords = {
-     },
-     "router rip": {},
-     "router ripng": {},
--    "router isis ": {},
-+    "router isis ": {
-+        "segment-routing srv6": {},
-+    },
-     "router openfabric ": {},
-     "router ospf": {},
-     "router ospf6": {},
--- 
-2.39.5
-
diff --git a/scripts/package-build/frr/patches/frr/0005-tools-Add-missing-keyword-node-msd-in-frr-reload.patch b/scripts/package-build/frr/patches/frr/0005-tools-Add-missing-keyword-node-msd-in-frr-reload.patch
deleted file mode 100644
index 559caead..00000000
--- a/scripts/package-build/frr/patches/frr/0005-tools-Add-missing-keyword-node-msd-in-frr-reload.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 458e8a851608b8308b564e6cbfe95314629dccda Mon Sep 17 00:00:00 2001
-From: Carmine Scarpitta <cscarpit@cisco.com>
-Date: Sat, 23 Nov 2024 08:46:50 +0100
-Subject: [PATCH 5/5] tools: Add missing keyword `node-msd` in frr-reload
-
-Fix the error below:
-
-```
-[58564|mgmtd] sending configuration
-[58565|zebra] sending configuration,
-line 14: % Unknown command[52]:  max-segs-left 3
-line 18: % Unknown command[52]:  max-end-pop 3
-line 22: % Unknown command[52]:  max-h-encaps 2
-line 26: % Unknown command[52]:  max-end-d 5
-[58573|isisd] sending configuration
-[58565|zebra] Configuration file[/etc/frr/frr.conf] processing failure: 2
-```
-
-Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
----
- tools/frr-reload.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tools/frr-reload.py b/tools/frr-reload.py
-index baa6285f45..33d6cf0444 100755
---- a/tools/frr-reload.py
-+++ b/tools/frr-reload.py
-@@ -256,7 +256,9 @@ ctx_keywords = {
-     "router rip": {},
-     "router ripng": {},
-     "router isis ": {
--        "segment-routing srv6": {},
-+        "segment-routing srv6": {
-+            "node-msd": {},
-+        },
-     },
-     "router openfabric ": {},
-     "router ospf": {},
--- 
-2.39.5
-
diff --git a/scripts/package-build/frr/patches/frr/0006-ospfd-support-table-direct-redistribution.patch b/scripts/package-build/frr/patches/frr/0006-ospfd-support-table-direct-redistribution.patch
deleted file mode 100644
index 5bdbe966..00000000
--- a/scripts/package-build/frr/patches/frr/0006-ospfd-support-table-direct-redistribution.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From cbc1602bc6be411bebce2fd9cef712622a1b1799 Mon Sep 17 00:00:00 2001
-From: Rafael Zalamena <rzalamena@opensourcerouting.org>
-Date: Fri, 15 Dec 2023 14:24:17 -0300
-Subject: [PATCH] ospfd: support table-direct redistribution
-
-Add the 'table-direct' option to the redistribute command in OSPF.
-
-Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
----
- ospfd/ospf_vty.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
-index ccc46424bc..3594ad5e2c 100644
---- a/ospfd/ospf_vty.c
-+++ b/ospfd/ospf_vty.c
-@@ -9321,10 +9321,11 @@ DEFUN (no_ospf_redistribute_source,
- 
- DEFUN (ospf_redistribute_instance_source,
-        ospf_redistribute_instance_source_cmd,
--       "redistribute <ospf|table> (1-65535) [{metric (0-16777214)|metric-type (1-2)|route-map RMAP_NAME}]",
-+       "redistribute <ospf|table|table-direct> (1-65535) [{metric (0-16777214)|metric-type (1-2)|route-map RMAP_NAME}]",
-        REDIST_STR
-        "Open Shortest Path First\n"
-        "Non-main Kernel Routing Table\n"
-+       "Non-main Kernel Routing Table - Direct\n"
-        "Instance ID/Table ID\n"
-        "Metric for redistributed routes\n"
-        "OSPF default metric\n"
-@@ -9397,11 +9398,12 @@ DEFUN (ospf_redistribute_instance_source,
- 
- DEFUN (no_ospf_redistribute_instance_source,
-        no_ospf_redistribute_instance_source_cmd,
--       "no redistribute <ospf|table> (1-65535) [{metric (0-16777214)|metric-type (1-2)|route-map RMAP_NAME}]",
-+       "no redistribute <ospf|table|table-direct> (1-65535) [{metric (0-16777214)|metric-type (1-2)|route-map RMAP_NAME}]",
-        NO_STR
-        REDIST_STR
-        "Open Shortest Path First\n"
-        "Non-main Kernel Routing Table\n"
-+       "Non-main Kernel Routing Table - Direct\n"
-        "Instance ID/Table Id\n"
-        "Metric for redistributed routes\n"
-        "OSPF default metric\n"
-@@ -9417,10 +9419,7 @@ DEFUN (no_ospf_redistribute_instance_source,
- 	struct ospf_redist *red;
- 	int source;
- 
--	if (strncmp(argv[idx_ospf_table]->arg, "o", 1) == 0)
--		source = ZEBRA_ROUTE_OSPF;
--	else
--		source = ZEBRA_ROUTE_TABLE;
-+	source = proto_redistnum(AFI_IP, argv[idx_ospf_table]->text);
- 
- 	instance = strtoul(argv[idx_number]->arg, NULL, 10);
- 
--- 
-2.50.1
-