From 5815fa2a2478c1b87ee91466aa2162445e36c0c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= Date: Wed, 24 Jan 2024 10:50:21 +0100 Subject: [PATCH] v9.1.0 --- 0001-remove-babeld-and-ldpd.patch | 6 +++--- 0002-enable-openssl.patch | 10 +++++----- 0003-disable-eigrp-crypto.patch | 22 +++++++++++----------- 0004-fips-mode.patch | 30 +++++++++++++++--------------- 0005-remove-grpc-test.patch | 4 ++-- frr.spec | 2 +- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/0001-remove-babeld-and-ldpd.patch b/0001-remove-babeld-and-ldpd.patch index 463f42d..65bcaa2 100644 --- a/0001-remove-babeld-and-ldpd.patch +++ b/0001-remove-babeld-and-ldpd.patch @@ -1,4 +1,4 @@ -From 8c6e4318d2efd2314d8e9f30baefffef7de5a116 Mon Sep 17 00:00:00 2001 +From 1adef7e973aeab4de3409ab77295bf218fc0c56c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= Date: Sun, 8 Oct 2023 11:22:51 +0200 Subject: [PATCH 1/5] remove babeld and ldpd @@ -9,7 +9,7 @@ Subject: [PATCH 1/5] remove babeld and ldpd 2 files changed, 8 deletions(-) diff --git a/Makefile.am b/Makefile.am -index f56e1b8e0..a42811d94 100644 +index f56e1b8e0b..a42811d940 100644 --- a/Makefile.am +++ b/Makefile.am @@ -196,8 +196,6 @@ include ospf6d/subdir.am @@ -38,7 +38,7 @@ index f56e1b8e0..a42811d94 100644 nhrpd/Makefile \ ospf6d/Makefile \ diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons -index c487e7e5f..2e602901d 100644 +index c487e7e5f2..2e602901d3 100644 --- a/tools/etc/frr/daemons +++ b/tools/etc/frr/daemons @@ -22,10 +22,8 @@ ripngd=no diff --git a/0002-enable-openssl.patch b/0002-enable-openssl.patch index cea8a64..a3e9bce 100644 --- a/0002-enable-openssl.patch +++ b/0002-enable-openssl.patch @@ -1,4 +1,4 @@ -From 51ec61745373caa4702604ee2d379066f90b6d60 Mon Sep 17 00:00:00 2001 +From f2afebcbbd27c834b5d5727b561e588348503c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= Date: Sun, 8 Oct 2023 11:19:44 +0200 Subject: [PATCH 2/5] enable openssl @@ -11,7 +11,7 @@ Subject: [PATCH 2/5] enable openssl 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c -index 950d5f359..4cd792246 100644 +index 77573cdfac..df8508fa17 100644 --- a/isisd/isis_lsp.c +++ b/isisd/isis_lsp.c @@ -22,7 +22,9 @@ @@ -25,7 +25,7 @@ index 950d5f359..4cd792246 100644 #include "srcdest_table.h" #include "lib_errors.h" diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c -index 0cd43a7ab..b2e114d73 100644 +index 0cd43a7abc..b2e114d734 100644 --- a/isisd/isis_pdu.c +++ b/isisd/isis_pdu.c @@ -20,7 +20,9 @@ @@ -39,7 +39,7 @@ index 0cd43a7ab..b2e114d73 100644 #include "isisd/isis_constants.h" diff --git a/isisd/isis_te.c b/isisd/isis_te.c -index 90b53c540..9d98c16e7 100644 +index 90b53c540e..9d98c16e78 100644 --- a/isisd/isis_te.c +++ b/isisd/isis_te.c @@ -24,7 +24,9 @@ @@ -53,7 +53,7 @@ index 90b53c540..9d98c16e7 100644 #include "network.h" #include "sbuf.h" diff --git a/lib/subdir.am b/lib/subdir.am -index d7b28ffbd..b2ee32168 100644 +index d7b28ffbd5..b2ee32168b 100644 --- a/lib/subdir.am +++ b/lib/subdir.am @@ -63,7 +63,6 @@ lib_libfrr_la_SOURCES = \ diff --git a/0003-disable-eigrp-crypto.patch b/0003-disable-eigrp-crypto.patch index a538ce3..855960d 100644 --- a/0003-disable-eigrp-crypto.patch +++ b/0003-disable-eigrp-crypto.patch @@ -1,4 +1,4 @@ -From 8ec9ddca959618ea6091711cd446ebac5b730147 Mon Sep 17 00:00:00 2001 +From 138dff00b047a92b0616d53742b83b13cca8981c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= Date: Sun, 8 Oct 2023 11:23:48 +0200 Subject: [PATCH 3/5] disable eigrp crypto @@ -17,7 +17,7 @@ Subject: [PATCH 3/5] disable eigrp crypto 10 files changed, 56 insertions(+), 2 deletions(-) diff --git a/eigrpd/eigrp_cli.c b/eigrpd/eigrp_cli.c -index 213834afc..73647937d 100644 +index 213834afc8..73647937db 100644 --- a/eigrpd/eigrp_cli.c +++ b/eigrpd/eigrp_cli.c @@ -11,6 +11,7 @@ @@ -50,7 +50,7 @@ index 213834afc..73647937d 100644 snprintf(xpath, sizeof(xpath), "./frr-eigrpd:eigrp/instance[asn='%s']", diff --git a/eigrpd/eigrp_filter.c b/eigrpd/eigrp_filter.c -index eceef6b8a..1d194be14 100644 +index eceef6b8a7..1d194be143 100644 --- a/eigrpd/eigrp_filter.c +++ b/eigrpd/eigrp_filter.c @@ -32,7 +32,9 @@ @@ -64,7 +64,7 @@ index eceef6b8a..1d194be14 100644 #include "privs.h" #include "vrf.h" diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c -index 662c750e9..a3a5ec822 100644 +index ee0e2451a2..d3b8414b81 100644 --- a/eigrpd/eigrp_hello.c +++ b/eigrpd/eigrp_hello.c @@ -28,7 +28,9 @@ @@ -78,7 +78,7 @@ index 662c750e9..a3a5ec822 100644 #include "eigrpd/eigrp_structs.h" #include "eigrpd/eigrpd.h" diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c -index 963d229bc..587eb422e 100644 +index 963d229bc1..587eb422ea 100644 --- a/eigrpd/eigrp_packet.c +++ b/eigrpd/eigrp_packet.c @@ -25,8 +25,10 @@ @@ -185,7 +185,7 @@ index 963d229bc..587eb422e 100644 /* Put hmac-sha256 digest to it's place */ memcpy(auth_TLV->digest, digest, EIGRP_AUTH_TYPE_SHA256_LEN); diff --git a/eigrpd/eigrp_query.c b/eigrpd/eigrp_query.c -index 0e206cded..4b3f4e082 100644 +index 0e206cded6..4b3f4e0821 100644 --- a/eigrpd/eigrp_query.c +++ b/eigrpd/eigrp_query.c @@ -23,7 +23,9 @@ @@ -199,7 +199,7 @@ index 0e206cded..4b3f4e082 100644 #include "eigrpd/eigrp_structs.h" diff --git a/eigrpd/eigrp_reply.c b/eigrpd/eigrp_reply.c -index aae89e832..1fb1f404d 100644 +index aae89e832b..1fb1f404d2 100644 --- a/eigrpd/eigrp_reply.c +++ b/eigrpd/eigrp_reply.c @@ -27,7 +27,9 @@ @@ -213,7 +213,7 @@ index aae89e832..1fb1f404d 100644 #include "keychain.h" #include "plist.h" diff --git a/eigrpd/eigrp_siaquery.c b/eigrpd/eigrp_siaquery.c -index 71486a1f6..430e8ce71 100644 +index 71486a1f6f..430e8ce719 100644 --- a/eigrpd/eigrp_siaquery.c +++ b/eigrpd/eigrp_siaquery.c @@ -23,7 +23,9 @@ @@ -227,7 +227,7 @@ index 71486a1f6..430e8ce71 100644 #include "eigrpd/eigrp_structs.h" diff --git a/eigrpd/eigrp_siareply.c b/eigrpd/eigrp_siareply.c -index 6c8c1ef58..b16e0fcfc 100644 +index 6c8c1ef58d..b16e0fcfc8 100644 --- a/eigrpd/eigrp_siareply.c +++ b/eigrpd/eigrp_siareply.c @@ -22,7 +22,9 @@ @@ -241,7 +241,7 @@ index 6c8c1ef58..b16e0fcfc 100644 #include "eigrpd/eigrp_structs.h" diff --git a/eigrpd/eigrp_snmp.c b/eigrpd/eigrp_snmp.c -index 492ef3e71..5618c3f2b 100644 +index 492ef3e713..5618c3f2b5 100644 --- a/eigrpd/eigrp_snmp.c +++ b/eigrpd/eigrp_snmp.c @@ -27,7 +27,9 @@ @@ -255,7 +255,7 @@ index 492ef3e71..5618c3f2b 100644 #include "smux.h" diff --git a/eigrpd/eigrp_update.c b/eigrpd/eigrp_update.c -index a056267bf..3dc8d0e56 100644 +index 74f573d9d8..39f4dcfc39 100644 --- a/eigrpd/eigrp_update.c +++ b/eigrpd/eigrp_update.c @@ -27,7 +27,9 @@ diff --git a/0004-fips-mode.patch b/0004-fips-mode.patch index 4d08765..354a2ea 100644 --- a/0004-fips-mode.patch +++ b/0004-fips-mode.patch @@ -1,4 +1,4 @@ -From 730598d8a4c1bd32d0e4fc0e76be926314a6f57b Mon Sep 17 00:00:00 2001 +From 90d09b061feae5e39a88c0ae51f880e82d82bb18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= Date: Sun, 8 Oct 2023 11:24:43 +0200 Subject: [PATCH 4/5] fips mode @@ -12,10 +12,10 @@ Subject: [PATCH 4/5] fips mode 5 files changed, 39 insertions(+) diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c -index feab45123..f02bae968 100644 +index ffa6ad3e40..8c28b17eb2 100644 --- a/isisd/isis_circuit.c +++ b/isisd/isis_circuit.c -@@ -1542,6 +1542,10 @@ ferr_r isis_circuit_passwd_set(struct isis_circuit *circuit, +@@ -1543,6 +1543,10 @@ ferr_r isis_circuit_passwd_set(struct isis_circuit *circuit, return ferr_code_bug( "circuit password too long (max 254 chars)"); @@ -27,10 +27,10 @@ index feab45123..f02bae968 100644 strlcpy((char *)circuit->passwd.passwd, passwd, sizeof(circuit->passwd.passwd)); diff --git a/isisd/isisd.c b/isisd/isisd.c -index ea304ba5e..67f6e253a 100644 +index b1064d8941..fbcd097f72 100644 --- a/isisd/isisd.c +++ b/isisd/isisd.c -@@ -3036,6 +3036,10 @@ static int isis_area_passwd_set(struct isis_area *area, int level, +@@ -3040,6 +3040,10 @@ static int isis_area_passwd_set(struct isis_area *area, int level, if (len > 254) return -1; @@ -42,7 +42,7 @@ index ea304ba5e..67f6e253a 100644 strlcpy((char *)modified.passwd, passwd, sizeof(modified.passwd)); diff --git a/lib/zebra.h b/lib/zebra.h -index ecc87f58f..5cb716759 100644 +index ecc87f58f1..5cb7167598 100644 --- a/lib/zebra.h +++ b/lib/zebra.h @@ -90,6 +90,7 @@ @@ -54,12 +54,12 @@ index ecc87f58f..5cb716759 100644 #include "openbsd-tree.h" diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c -index 5cd70c7c2..0b8dbaa73 100644 +index 740ecb518b..d094b205b3 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c -@@ -1069,6 +1069,11 @@ DEFUN (ospf_area_vlink, - - if (argv_find(argv, argc, "message-digest", &idx)) { +@@ -1085,6 +1085,11 @@ DEFUN (ospf_area_vlink, + vl_config.keychain = argv[idx+1]->arg; + } else if (argv_find(argv, argc, "message-digest", &idx)) { /* authentication message-digest */ + if(FIPS_mode()) + { @@ -69,7 +69,7 @@ index 5cd70c7c2..0b8dbaa73 100644 vl_config.auth_type = OSPF_AUTH_CRYPTOGRAPHIC; } else if (argv_find(argv, argc, "null", &idx)) { /* "authentication null" */ -@@ -1974,6 +1979,15 @@ DEFUN (ospf_area_authentication_message_digest, +@@ -1997,6 +2002,15 @@ DEFUN (ospf_area_authentication_message_digest, ? OSPF_AUTH_NULL : OSPF_AUTH_CRYPTOGRAPHIC; @@ -85,7 +85,7 @@ index 5cd70c7c2..0b8dbaa73 100644 return CMD_SUCCESS; } -@@ -7419,6 +7433,11 @@ DEFUN (ip_ospf_authentication_args, +@@ -7621,6 +7635,11 @@ DEFUN (ip_ospf_authentication_args, /* Handle message-digest authentication */ if (argv[idx_encryption]->arg[0] == 'm') { @@ -96,8 +96,8 @@ index 5cd70c7c2..0b8dbaa73 100644 + } SET_IF_PARAM(params, auth_type); params->auth_type = OSPF_AUTH_CRYPTOGRAPHIC; - return CMD_SUCCESS; -@@ -7725,6 +7744,11 @@ DEFUN (ip_ospf_message_digest_key, + UNSET_IF_PARAM(params, keychain_name); +@@ -7949,6 +7968,11 @@ DEFUN (ip_ospf_message_digest_key, "The OSPF password (key)\n" "Address of interface\n") { @@ -110,7 +110,7 @@ index 5cd70c7c2..0b8dbaa73 100644 struct crypt_key *ck; uint8_t key_id; diff --git a/ripd/rip_cli.c b/ripd/rip_cli.c -index 097c708ab..854a16e4e 100644 +index 097c708ab1..854a16e4e0 100644 --- a/ripd/rip_cli.c +++ b/ripd/rip_cli.c @@ -876,6 +876,12 @@ DEFPY_YANG (ip_rip_authentication_mode, diff --git a/0005-remove-grpc-test.patch b/0005-remove-grpc-test.patch index 3643f6f..2a7d89a 100644 --- a/0005-remove-grpc-test.patch +++ b/0005-remove-grpc-test.patch @@ -1,4 +1,4 @@ -From a41d8382ba6b5ba0edf1887e65bbd21676ca9be4 Mon Sep 17 00:00:00 2001 +From e89eb677ad94cd39379e254215e3ec91e571da73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= Date: Sun, 8 Oct 2023 11:26:25 +0200 Subject: [PATCH 5/5] remove grpc test @@ -8,7 +8,7 @@ Subject: [PATCH 5/5] remove grpc test 1 file changed, 11 deletions(-) diff --git a/tests/lib/subdir.am b/tests/lib/subdir.am -index 6c1be5020..2ac3d508e 100644 +index 6c1be50201..2ac3d508e9 100644 --- a/tests/lib/subdir.am +++ b/tests/lib/subdir.am @@ -24,17 +24,6 @@ copy_script: tests/lib/script1.lua diff --git a/frr.spec b/frr.spec index b518497..4b6cc7a 100644 --- a/frr.spec +++ b/frr.spec @@ -9,7 +9,7 @@ %bcond selinux 1 Name: frr -Version: 9.0.2 +Version: 9.1.0 Release: 1%{?dist} Summary: Routing daemon License: GPLv2+