diff --git a/.gitignore b/.gitignore index 59edda5..e0e39ed 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /frr-8.5.2.tar.gz /frr-9.0.1.tar.gz /frr-9.1.tar.gz +/frr-10.0.1.tar.gz diff --git a/0004-fips-mode.patch b/0004-fips-mode.patch index ed324e8..6c0501b 100644 --- a/0004-fips-mode.patch +++ b/0004-fips-mode.patch @@ -2,6 +2,17 @@ diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 631465f..e084ff3 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c +@@ -7,6 +7,10 @@ + #include + #include + ++#ifdef CRYPTO_OPENSSL ++#include ++#endif ++ + #include "printfrr.h" + #include "monotime.h" + #include "memory.h" @@ -1136,6 +1136,11 @@ DEFUN (ospf_area_vlink, vl_config.keychain = argv[idx+1]->arg; } else if (argv_find(argv, argc, "message-digest", &idx)) { @@ -58,6 +69,17 @@ diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index 81b4b39..cce33d9 100644 --- a/isisd/isis_circuit.c +++ b/isisd/isis_circuit.c +@@ -13,6 +13,10 @@ + #include + #endif + ++#ifdef CRYPTO_OPENSSL ++#include ++#endif ++ + #include "log.h" + #include "memory.h" + #include "vrf.h" @@ -1318,6 +1318,10 @@ static int isis_circuit_passwd_set(struct isis_circuit *circuit, return ferr_code_bug( "circuit password too long (max 254 chars)"); @@ -73,6 +95,17 @@ diff --git a/isisd/isisd.c b/isisd/isisd.c index 419127c..a6c36af 100644 --- a/isisd/isisd.c +++ b/isisd/isisd.c +@@ -9,6 +9,10 @@ + + #include + ++#ifdef CRYPTO_OPENSSL ++#include ++#endif ++ + #include "frrevent.h" + #include "vty.h" + #include "command.h" @@ -1638,6 +1638,10 @@ static int isis_area_passwd_set(struct isis_area *area, int level, if (len > 254) return -1; @@ -88,6 +121,17 @@ diff --git a/ripd/rip_cli.c b/ripd/rip_cli.c index 5bb81ef..02a09ef 100644 --- a/ripd/rip_cli.c +++ b/ripd/rip_cli.c +@@ -7,6 +7,10 @@ + + #include + ++#ifdef CRYPTO_OPENSSL ++#include ++#endif ++ + #include "if.h" + #include "if_rmap.h" + #include "vrf.h" @@ -796,6 +796,12 @@ DEFPY (ip_rip_authentication_mode, value = "20"; } @@ -101,15 +145,3 @@ index 5bb81ef..02a09ef 100644 nb_cli_enqueue_change(vty, "./authentication-scheme/mode", NB_OP_MODIFY, strmatch(mode, "md5") ? "md5" : "plain-text"); if (strmatch(mode, "md5")) -diff --git a/lib/zebra.h b/lib/zebra.h -index 53ae5b4..930307f 100644 ---- a/lib/zebra.h -+++ b/lib/zebra.h -@@ -114,6 +114,7 @@ - #ifdef CRYPTO_OPENSSL - #include - #include -+#include - #endif - - #include "openbsd-tree.h" diff --git a/0005-remove-grpc-test.patch b/0005-remove-grpc-test.patch index a22d9d6..dd1c004 100644 --- a/0005-remove-grpc-test.patch +++ b/0005-remove-grpc-test.patch @@ -7,7 +7,7 @@ index 7b5eaa4..5c82f69 100644 $(INSTALL_SCRIPT) $< tests/lib/script1.lua -############################################################################## --GRPC_TESTS_LDADD = staticd/libstatic.a grpc/libfrrgrpc_pb.la -lgrpc++ -lprotobuf $(ALL_TESTS_LDADD) $(LIBYANG_LIBS) -lm +-GRPC_TESTS_LDADD = mgmtd/libmgmt_be_nb.la staticd/libstatic.a grpc/libfrrgrpc_pb.la $(GRPC_LIBS) $(ALL_TESTS_LDADD) $(LIBYANG_LIBS) -lm - -if GRPC -check_PROGRAMS += tests/lib/test_grpc diff --git a/0006-noprefixroute-network-manager.patch b/0006-noprefixroute-network-manager.patch new file mode 100644 index 0000000..a1c2c79 --- /dev/null +++ b/0006-noprefixroute-network-manager.patch @@ -0,0 +1,167 @@ +--- b/tests/topotests/zebra_multiple_connected/test_zebra_multiple_connected.py ++++ a/tests/topotests/zebra_multiple_connected/test_zebra_multiple_connected.py +@@ -144,23 +144,6 @@ + assert result is None, "Kernel route is missing from zebra" + + +-def test_zebra_noprefix_connected(): +- "Test that a noprefixroute created does not create a connected route" +- +- tgen = get_topogen() +- if tgen.routers_have_failure(): +- pytest.skip(tgen.errors) +- +- router = tgen.gears["r1"] +- router.run("ip addr add 192.168.44.1/24 dev r1-eth1 noprefixroute") +- expected = "% Network not in table" +- test_func = partial( +- topotest.router_output_cmp, router, "show ip route 192.168.44.0/24", expected +- ) +- result, diff = topotest.run_and_expect(test_func, "", count=20, wait=1) +- assert result, "Connected Route should not have been added" +- +- + if __name__ == "__main__": + args = ["-s"] + sys.argv[1:] + sys.exit(pytest.main(args)) +--- b/zebra/if_netlink.c ++++ a/zebra/if_netlink.c +@@ -1423,9 +1423,6 @@ + if (kernel_flags & IFA_F_SECONDARY) + dplane_ctx_intf_set_secondary(ctx); + +- if (kernel_flags & IFA_F_NOPREFIXROUTE) +- dplane_ctx_intf_set_noprefixroute(ctx); +- + /* Label */ + if (tb[IFA_LABEL]) { + label = (char *)RTA_DATA(tb[IFA_LABEL]); +--- b/zebra/zebra_dplane.c ++++ a/zebra/zebra_dplane.c +@@ -230,7 +230,6 @@ + #define DPLANE_INTF_BROADCAST (1 << 2) + #define DPLANE_INTF_HAS_DEST DPLANE_INTF_CONNECTED + #define DPLANE_INTF_HAS_LABEL (1 << 4) +-#define DPLANE_INTF_NOPREFIXROUTE (1 << 5) + + /* Interface address/prefix */ + struct prefix prefix; +@@ -2542,13 +2541,6 @@ + return (ctx->u.intf.flags & DPLANE_INTF_CONNECTED); + } + +-bool dplane_ctx_intf_is_noprefixroute(const struct zebra_dplane_ctx *ctx) +-{ +- DPLANE_CTX_VALID(ctx); +- +- return (ctx->u.intf.flags & DPLANE_INTF_NOPREFIXROUTE); +-} +- + bool dplane_ctx_intf_is_secondary(const struct zebra_dplane_ctx *ctx) + { + DPLANE_CTX_VALID(ctx); +@@ -2577,13 +2569,6 @@ + ctx->u.intf.flags |= DPLANE_INTF_SECONDARY; + } + +-void dplane_ctx_intf_set_noprefixroute(struct zebra_dplane_ctx *ctx) +-{ +- DPLANE_CTX_VALID(ctx); +- +- ctx->u.intf.flags |= DPLANE_INTF_NOPREFIXROUTE; +-} +- + void dplane_ctx_intf_set_broadcast(struct zebra_dplane_ctx *ctx) + { + DPLANE_CTX_VALID(ctx); +--- b/zebra/zebra_dplane.h ++++ a/zebra/zebra_dplane.h +@@ -658,8 +658,6 @@ + void dplane_ctx_intf_set_connected(struct zebra_dplane_ctx *ctx); + bool dplane_ctx_intf_is_secondary(const struct zebra_dplane_ctx *ctx); + void dplane_ctx_intf_set_secondary(struct zebra_dplane_ctx *ctx); +-bool dplane_ctx_intf_is_noprefixroute(const struct zebra_dplane_ctx *ctx); +-void dplane_ctx_intf_set_noprefixroute(struct zebra_dplane_ctx *ctx); + bool dplane_ctx_intf_is_broadcast(const struct zebra_dplane_ctx *ctx); + void dplane_ctx_intf_set_broadcast(struct zebra_dplane_ctx *ctx); + const struct prefix *dplane_ctx_get_intf_addr( +--- b/lib/if.h ++++ a/lib/if.h +@@ -434,8 +434,6 @@ + #define ZEBRA_IFA_SECONDARY (1 << 0) + #define ZEBRA_IFA_PEER (1 << 1) + #define ZEBRA_IFA_UNNUMBERED (1 << 2) +-#define ZEBRA_IFA_NOPREFIXROUTE (1 << 3) +- + /* N.B. the ZEBRA_IFA_PEER flag should be set if and only if + a peer address has been configured. If this flag is set, + the destination field must contain the peer address. +--- b/zebra/connected.c ++++ a/zebra/connected.c +@@ -282,15 +282,13 @@ + return; + } + ++ rib_add(afi, SAFI_UNICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_CONNECT, 0, ++ flags, &p, NULL, &nh, 0, zvrf->table_id, metric, 0, 0, 0, ++ false); +- if (!CHECK_FLAG(ifc->flags, ZEBRA_IFA_NOPREFIXROUTE)) { +- rib_add(afi, SAFI_UNICAST, zvrf->vrf->vrf_id, +- ZEBRA_ROUTE_CONNECT, 0, flags, &p, NULL, &nh, 0, +- zvrf->table_id, metric, 0, 0, 0, false); + ++ rib_add(afi, SAFI_MULTICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_CONNECT, 0, ++ flags, &p, NULL, &nh, 0, zvrf->table_id, metric, 0, 0, 0, ++ false); +- rib_add(afi, SAFI_MULTICAST, zvrf->vrf->vrf_id, +- ZEBRA_ROUTE_CONNECT, 0, flags, &p, NULL, &nh, 0, +- zvrf->table_id, metric, 0, 0, 0, false); +- } + + if (install_local) { + rib_add(afi, SAFI_UNICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_LOCAL, +@@ -483,15 +481,11 @@ + * Same logic as for connected_up(): push the changes into the + * head. + */ ++ rib_delete(afi, SAFI_UNICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_CONNECT, 0, ++ 0, &p, NULL, &nh, 0, zvrf->table_id, 0, 0, false); +- if (!CHECK_FLAG(ifc->flags, ZEBRA_IFA_NOPREFIXROUTE)) { +- rib_delete(afi, SAFI_UNICAST, zvrf->vrf->vrf_id, +- ZEBRA_ROUTE_CONNECT, 0, 0, &p, NULL, &nh, 0, +- zvrf->table_id, 0, 0, false); + ++ rib_delete(afi, SAFI_MULTICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_CONNECT, ++ 0, 0, &p, NULL, &nh, 0, zvrf->table_id, 0, 0, false); +- rib_delete(afi, SAFI_MULTICAST, zvrf->vrf->vrf_id, +- ZEBRA_ROUTE_CONNECT, 0, 0, &p, NULL, &nh, 0, +- zvrf->table_id, 0, 0, false); +- } + + if (remove_local) { + rib_delete(afi, SAFI_UNICAST, zvrf->vrf->vrf_id, +--- b/zebra/interface.c ++++ a/zebra/interface.c +@@ -1317,9 +1317,6 @@ + if (dplane_ctx_intf_is_secondary(ctx)) + SET_FLAG(flags, ZEBRA_IFA_SECONDARY); + +- if (dplane_ctx_intf_is_noprefixroute(ctx)) +- SET_FLAG(flags, ZEBRA_IFA_NOPREFIXROUTE); +- + /* Label? */ + if (dplane_ctx_intf_has_label(ctx)) + label = dplane_ctx_get_intf_label(ctx); +@@ -2337,12 +2334,6 @@ + else if (CHECK_FLAG(connected->flags, ZEBRA_IFA_SECONDARY)) + vty_out(vty, " secondary"); + +- if (json) +- json_object_boolean_add(json_addr, "noPrefixRoute", +- CHECK_FLAG(connected->flags, ZEBRA_IFA_NOPREFIXROUTE)); +- else if (CHECK_FLAG(connected->flags, ZEBRA_IFA_NOPREFIXROUTE)) +- vty_out(vty, " noprefixroute"); +- + if (json) + json_object_boolean_add( + json_addr, "unnumbered", diff --git a/frr.spec b/frr.spec index 270b77a..95436f6 100644 --- a/frr.spec +++ b/frr.spec @@ -8,8 +8,8 @@ %bcond selinux 1 Name: frr -Version: 9.1 -Release: 5%{?dist} +Version: 10.0.1 +Release: 1%{?dist} Summary: Routing daemon License: GPL-2.0-or-later AND ISC AND LGPL-2.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND (GPL-2.0-or-later OR ISC) AND MIT URL: http://www.frrouting.org @@ -26,6 +26,7 @@ Patch0002: 0002-enable-openssl.patch Patch0003: 0003-disable-eigrp-crypto.patch Patch0004: 0004-fips-mode.patch Patch0005: 0005-remove-grpc-test.patch +Patch0006: 0006-noprefixroute-network-manager.patch BuildRequires: autoconf BuildRequires: automake @@ -276,6 +277,9 @@ rm tests/lib/*grpc* %endif %changelog +* Wed Jul 31 2024 Michal Ruprich - 10.0.1-1 +- New version 10.0.1 + * Wed Jul 17 2024 Fedora Release Engineering - 9.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 5f8e436..077f79d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (frr-9.1.tar.gz) = 5e77de9d26275ac8babd3bd467fe05c7fb6fa50c80fe61e13057784945372debe24f44557d9d52e76e2e785919cdfb4d5a80e7b2a06558f2a52745d0e0b92766 SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d +SHA512 (frr-10.0.1.tar.gz) = 5642f563a8b6a11b56f777b167bb8427cca20801f0e2750bbb49a14a727cd464292bd14534c4db245280ba185ce92a28d1f529bd7ef5f0294cc9c9756dcf94c2