commit d1a0cd7431a6ec4297110b2b147d007be3d47d0b Author: MSVSphere Packaging Team Date: Fri Oct 25 14:41:59 2024 +0300 import frr-10.1-4.el10 diff --git a/.frr.metadata b/.frr.metadata new file mode 100644 index 0000000..cbe07d3 --- /dev/null +++ b/.frr.metadata @@ -0,0 +1 @@ +ae93955533d9370c136d45a3adf808d7b50284a0 SOURCES/frr-10.1.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fe44f9a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/frr-10.1.tar.gz diff --git a/SOURCES/0000-remove-babeld-and-ldpd.patch b/SOURCES/0000-remove-babeld-and-ldpd.patch new file mode 100644 index 0000000..b355ce6 --- /dev/null +++ b/SOURCES/0000-remove-babeld-and-ldpd.patch @@ -0,0 +1,55 @@ +diff --git a/Makefile.am b/Makefile.am +index 5be3264..33abc1d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -130,8 +130,6 @@ include ospf6d/subdir.am + include ospfclient/subdir.am + include isisd/subdir.am + include nhrpd/subdir.am +-include ldpd/subdir.am +-include babeld/subdir.am + include eigrpd/subdir.am + include sharpd/subdir.am + include pimd/subdir.am +@@ -182,7 +180,6 @@ EXTRA_DIST += \ + snapcraft/defaults \ + snapcraft/helpers \ + snapcraft/snap \ +- babeld/Makefile \ + mgmtd/Makefile \ + bgpd/Makefile \ + bgpd/rfp-example/librfp/Makefile \ +@@ -193,7 +190,6 @@ EXTRA_DIST += \ + fpm/Makefile \ + grpc/Makefile \ + isisd/Makefile \ +- ldpd/Makefile \ + lib/Makefile \ + nhrpd/Makefile \ + ospf6d/Makefile \ +diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons +index 8aa0887..c92dcca 100644 +--- a/tools/etc/frr/daemons ++++ b/tools/etc/frr/daemons +@@ -22,10 +22,8 @@ ripngd=no + isisd=no + pimd=no + pim6d=no +-ldpd=no + nhrpd=no + eigrpd=no +-babeld=no + sharpd=no + pbrd=no + bfdd=no +@@ -48,10 +46,8 @@ ripngd_options=" -A ::1" + isisd_options=" -A 127.0.0.1" + pimd_options=" -A 127.0.0.1" + pim6d_options=" -A ::1" +-ldpd_options=" -A 127.0.0.1" + nhrpd_options=" -A 127.0.0.1" + eigrpd_options=" -A 127.0.0.1" +-babeld_options=" -A 127.0.0.1" + sharpd_options=" -A 127.0.0.1" + pbrd_options=" -A 127.0.0.1" + staticd_options="-A 127.0.0.1" diff --git a/SOURCES/0002-enable-openssl.patch b/SOURCES/0002-enable-openssl.patch new file mode 100644 index 0000000..5101f06 --- /dev/null +++ b/SOURCES/0002-enable-openssl.patch @@ -0,0 +1,78 @@ +diff --git a/lib/subdir.am b/lib/subdir.am +index 0b7af18..0533e24 100644 +--- a/lib/subdir.am ++++ b/lib/subdir.am +@@ -41,7 +41,6 @@ lib_libfrr_la_SOURCES = \ + lib/log.c \ + lib/log_filter.c \ + lib/log_vty.c \ +- lib/md5.c \ + lib/memory.c \ + lib/mgmt_be_client.c \ + lib/mgmt_fe_client.c \ +@@ -64,7 +64,6 @@ lib_libfrr_la_SOURCES = \ + lib/routemap_northbound.c \ + lib/sbuf.c \ + lib/seqlock.c \ +- lib/sha256.c \ + lib/sigevent.c \ + lib/skiplist.c \ + lib/sockopt.c \ +@@ -170,7 +170,6 @@ pkginclude_HEADERS += \ + lib/link_state.h \ + lib/log.h \ + lib/log_vty.h \ +- lib/md5.h \ + lib/memory.h \ + lib/mgmt.pb-c.h \ + lib/mgmt_be_client.h \ +@@ -191,7 +190,6 @@ pkginclude_HEADERS += \ + lib/route_opaque.h \ + lib/sbuf.h \ + lib/seqlock.h \ +- lib/sha256.h \ + lib/sigevent.h \ + lib/skiplist.h \ + lib/smux.h \ +diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c +index 1991666..2e4fe55 100644 +--- a/isisd/isis_lsp.c ++++ b/isisd/isis_lsp.c +@@ -35,7 +35,9 @@ + #include "hash.h" + #include "if.h" + #include "checksum.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + #include "table.h" + #include "srcdest_table.h" + #include "lib_errors.h" +diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c +index 9c63311..7cf594c 100644 +--- a/isisd/isis_pdu.c ++++ b/isisd/isis_pdu.c +@@ -33,7 +33,9 @@ + #include "prefix.h" + #include "if.h" + #include "checksum.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + #include "lib_errors.h" + + #include "isisd/isis_constants.h" +diff --git a/isisd/isis_te.c b/isisd/isis_te.c +index 4ea6c2c..72ff0d2 100644 +--- a/isisd/isis_te.c ++++ b/isisd/isis_te.c +@@ -38,7 +38,9 @@ + #include "if.h" + #include "vrf.h" + #include "checksum.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + #include "sockunion.h" + #include "network.h" + #include "sbuf.h" diff --git a/SOURCES/0003-disable-eigrp-crypto.patch b/SOURCES/0003-disable-eigrp-crypto.patch new file mode 100644 index 0000000..cd43569 --- /dev/null +++ b/SOURCES/0003-disable-eigrp-crypto.patch @@ -0,0 +1,252 @@ +diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c +index bedaf15..8dc09bf 100644 +--- a/eigrpd/eigrp_packet.c ++++ b/eigrpd/eigrp_packet.c +@@ -40,8 +40,10 @@ + #include "log.h" + #include "sockopt.h" + #include "checksum.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" + #include "sha256.h" ++#endif + #include "lib_errors.h" + + #include "eigrpd/eigrp_structs.h" +@@ -95,8 +97,12 @@ int eigrp_make_md5_digest(struct eigrp_interface *ei, struct stream *s, + struct key *key = NULL; + struct keychain *keychain; + ++ + unsigned char digest[EIGRP_AUTH_TYPE_MD5_LEN]; ++#ifdef CRYPTO_OPENSSL ++#elif CRYPTO_INTERNAL + MD5_CTX ctx; ++#endif + uint8_t *ibuf; + size_t backup_get, backup_end; + struct TLV_MD5_Authentication_Type *auth_TLV; +@@ -119,6 +125,9 @@ int eigrp_make_md5_digest(struct eigrp_interface *ei, struct stream *s, + return EIGRP_AUTH_TYPE_NONE; + } + ++#ifdef CRYPTO_OPENSSL ++//TBD when this is fixed in upstream ++#elif CRYPTO_INTERNAL + memset(&ctx, 0, sizeof(ctx)); + MD5Init(&ctx); + +@@ -146,7 +155,7 @@ int eigrp_make_md5_digest(struct eigrp_interface *ei, struct stream *s, + } + + MD5Final(digest, &ctx); +- ++#endif + /* Append md5 digest to the end of the stream. */ + memcpy(auth_TLV->digest, digest, EIGRP_AUTH_TYPE_MD5_LEN); + +@@ -162,7 +171,10 @@ int eigrp_check_md5_digest(struct stream *s, + struct TLV_MD5_Authentication_Type *authTLV, + struct eigrp_neighbor *nbr, uint8_t flags) + { ++#ifdef CRYPTO_OPENSSL ++#elif CRYPTO_INTERNAL + MD5_CTX ctx; ++#endif + unsigned char digest[EIGRP_AUTH_TYPE_MD5_LEN]; + unsigned char orig[EIGRP_AUTH_TYPE_MD5_LEN]; + struct key *key = NULL; +@@ -203,6 +215,9 @@ int eigrp_check_md5_digest(struct stream *s, + return 0; + } + ++#ifdef CRYPTO_OPENSSL ++ //TBD when eigrpd crypto is fixed in upstream ++#elif CRYPTO_INTERNAL + memset(&ctx, 0, sizeof(ctx)); + MD5Init(&ctx); + +@@ -230,6 +245,7 @@ int eigrp_check_md5_digest(struct stream *s, + } + + MD5Final(digest, &ctx); ++#endif + + /* compare the two */ + if (memcmp(orig, digest, EIGRP_AUTH_TYPE_MD5_LEN) != 0) { +@@ -254,7 +270,11 @@ int eigrp_make_sha256_digest(struct eigrp_interface *ei, struct stream *s, + unsigned char digest[EIGRP_AUTH_TYPE_SHA256_LEN]; + unsigned char buffer[1 + PLAINTEXT_LENGTH + 45 + 1] = {0}; + ++#ifdef CRYPTO_OPENSSL ++ //TBD when eigrpd crypto is fixed in upstream ++#elif CRYPTO_INTERNAL + HMAC_SHA256_CTX ctx; ++#endif + void *ibuf; + size_t backup_get, backup_end; + struct TLV_SHA256_Authentication_Type *auth_TLV; +@@ -283,6 +303,9 @@ int eigrp_make_sha256_digest(struct eigrp_interface *ei, struct stream *s, + + inet_ntop(AF_INET, &ei->address.u.prefix4, source_ip, PREFIX_STRLEN); + ++#ifdef CRYPTO_OPENSSL ++ //TBD when eigrpd crypto is fixed in upstream ++#elif CRYPTO_INTERNAL + memset(&ctx, 0, sizeof(ctx)); + buffer[0] = '\n'; + memcpy(buffer + 1, key, strlen(key->string)); +@@ -291,7 +314,7 @@ int eigrp_make_sha256_digest(struct eigrp_interface *ei, struct stream *s, + 1 + strlen(key->string) + strlen(source_ip)); + HMAC__SHA256_Update(&ctx, ibuf, strlen(ibuf)); + HMAC__SHA256_Final(digest, &ctx); +- ++#endif + + /* Put hmac-sha256 digest to it's place */ + memcpy(auth_TLV->digest, digest, EIGRP_AUTH_TYPE_SHA256_LEN); +diff --git a/eigrpd/eigrp_filter.c b/eigrpd/eigrp_filter.c +index 93eed94..f1c7347 100644 +--- a/eigrpd/eigrp_filter.c ++++ b/eigrpd/eigrp_filter.c +@@ -47,7 +47,9 @@ + #include "if_rmap.h" + #include "plist.h" + #include "distribute.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + #include "keychain.h" + #include "privs.h" + #include "vrf.h" +diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c +index dacd5ca..b232cc5 100644 +--- a/eigrpd/eigrp_hello.c ++++ b/eigrpd/eigrp_hello.c +@@ -43,7 +43,9 @@ + #include "sockopt.h" + #include "checksum.h" + #include "vty.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + + #include "eigrpd/eigrp_structs.h" + #include "eigrpd/eigrpd.h" +diff --git a/eigrpd/eigrp_query.c b/eigrpd/eigrp_query.c +index 84dcf5e..a2575e3 100644 +--- a/eigrpd/eigrp_query.c ++++ b/eigrpd/eigrp_query.c +@@ -38,7 +38,9 @@ + #include "log.h" + #include "sockopt.h" + #include "checksum.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + #include "vty.h" + + #include "eigrpd/eigrp_structs.h" +diff --git a/eigrpd/eigrp_reply.c b/eigrpd/eigrp_reply.c +index ccf0496..2902365 100644 +--- a/eigrpd/eigrp_reply.c ++++ b/eigrpd/eigrp_reply.c +@@ -42,7 +42,9 @@ + #include "log.h" + #include "sockopt.h" + #include "checksum.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + #include "vty.h" + #include "keychain.h" + #include "plist.h" +diff --git a/eigrpd/eigrp_siaquery.c b/eigrpd/eigrp_siaquery.c +index ff38325..09b9369 100644 +--- a/eigrpd/eigrp_siaquery.c ++++ b/eigrpd/eigrp_siaquery.c +@@ -38,7 +38,9 @@ + #include "log.h" + #include "sockopt.h" + #include "checksum.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + #include "vty.h" + + #include "eigrpd/eigrp_structs.h" +diff --git a/eigrpd/eigrp_siareply.c b/eigrpd/eigrp_siareply.c +index d3dd123..f6a2bd6 100644 +--- a/eigrpd/eigrp_siareply.c ++++ b/eigrpd/eigrp_siareply.c +@@ -37,7 +37,9 @@ + #include "log.h" + #include "sockopt.h" + #include "checksum.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + #include "vty.h" + + #include "eigrpd/eigrp_structs.h" +diff --git a/eigrpd/eigrp_snmp.c b/eigrpd/eigrp_snmp.c +index 21c9238..cfb8890 100644 +--- a/eigrpd/eigrp_snmp.c ++++ b/eigrpd/eigrp_snmp.c +@@ -42,7 +42,9 @@ + #include "log.h" + #include "sockopt.h" + #include "checksum.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + #include "keychain.h" + #include "smux.h" + +diff --git a/eigrpd/eigrp_update.c b/eigrpd/eigrp_update.c +index 8db4903..2a4f0bb 100644 +--- a/eigrpd/eigrp_update.c ++++ b/eigrpd/eigrp_update.c +@@ -42,7 +42,9 @@ + #include "log.h" + #include "sockopt.h" + #include "checksum.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + #include "vty.h" + #include "plist.h" + #include "plist_int.h" +diff --git a/eigrpd/eigrp_cli.c b/eigrpd/eigrp_cli.c +index a93d4c8..b01e121 100644 +--- a/eigrpd/eigrp_cli.c ++++ b/eigrpd/eigrp_cli.c +@@ -25,6 +25,7 @@ + #include "lib/command.h" + #include "lib/log.h" + #include "lib/northbound_cli.h" ++#include "lib/libfrr.h" + + #include "eigrp_structs.h" + #include "eigrpd.h" +@@ -726,6 +726,20 @@ DEFPY( + "Keyed message digest\n" + "HMAC SHA256 algorithm \n") + { ++ //EIGRP authentication is currently broken in FRR ++ switch (frr_get_cli_mode()) { ++ case FRR_CLI_CLASSIC: ++ vty_out(vty, "%% Eigrp Authentication is disabled\n\n"); ++ break; ++ case FRR_CLI_TRANSACTIONAL: ++ vty_out(vty, ++ "%% Failed to edit candidate configuration - " ++ "Eigrp Authentication is disabled.\n\n"); ++ break; ++ } ++ ++ return CMD_WARNING_CONFIG_FAILED; ++ + char xpath[XPATH_MAXLEN], xpath_auth[XPATH_MAXLEN + 64]; + + snprintf(xpath, sizeof(xpath), "./frr-eigrpd:eigrp/instance[asn='%s']", diff --git a/SOURCES/0004-fips-mode.patch b/SOURCES/0004-fips-mode.patch new file mode 100644 index 0000000..6c0501b --- /dev/null +++ b/SOURCES/0004-fips-mode.patch @@ -0,0 +1,147 @@ +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)) { + /* authentication message-digest */ ++ if(FIPS_mode()) ++ { ++ vty_out(vty, "FIPS mode is enabled, md5 authentication is disabled\n"); ++ return CMD_WARNING_CONFIG_FAILED; ++ } + vl_config.auth_type = OSPF_AUTH_CRYPTOGRAPHIC; + } else if (argv_find(argv, argc, "null", &idx)) { + /* "authentication null" */ +@@ -1993,6 +1998,15 @@ DEFUN (ospf_area_authentication_message_digest, + ? OSPF_AUTH_NULL + : OSPF_AUTH_CRYPTOGRAPHIC; + ++ if(area->auth_type == OSPF_AUTH_CRYPTOGRAPHIC) ++ { ++ if(FIPS_mode()) ++ { ++ vty_out(vty, "FIPS mode is enabled, md5 authentication is disabled\n"); ++ return CMD_WARNING_CONFIG_FAILED; ++ } ++ } ++ + return CMD_SUCCESS; + } + +@@ -6665,6 +6679,11 @@ DEFUN (ip_ospf_authentication_args, + + /* Handle message-digest authentication */ + if (argv[idx_encryption]->arg[0] == 'm') { ++ if(FIPS_mode()) ++ { ++ vty_out(vty, "FIPS mode is enabled, md5 authentication is disabled\n"); ++ return CMD_WARNING_CONFIG_FAILED; ++ } + SET_IF_PARAM(params, auth_type); + params->auth_type = OSPF_AUTH_CRYPTOGRAPHIC; + UNSET_IF_PARAM(params, keychain_name); +@@ -6971,6 +6990,11 @@ DEFUN (ip_ospf_message_digest_key, + "The OSPF password (key)\n" + "Address of interface\n") + { ++ if(FIPS_mode()) ++ { ++ vty_out(vty, "FIPS mode is enabled, md5 authentication is disabled\n"); ++ return CMD_WARNING_CONFIG_FAILED; ++ } + VTY_DECLVAR_CONTEXT(interface, ifp); + struct crypt_key *ck; + uint8_t key_id; +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)"); + ++ //When in FIPS mode, the password never gets set in MD5 ++ if((passwd_type == ISIS_PASSWD_TYPE_HMAC_MD5) && FIPS_mode()) ++ return ferr_cfg_invalid("FIPS mode is enabled, md5 authentication is disabled"); ++ + circuit->passwd.len = len; + strlcpy((char *)circuit->passwd.passwd, passwd, + sizeof(circuit->passwd.passwd)); +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; + ++ //When in FIPS mode, the password never get set in MD5 ++ if ((passwd_type == ISIS_PASSWD_TYPE_HMAC_MD5) && (FIPS_mode())) ++ return ferr_cfg_invalid("FIPS mode is enabled, md5 authentication is disabled"); ++ + modified.len = len; + strlcpy((char *)modified.passwd, passwd, + sizeof(modified.passwd)); +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"; + } + ++ if(strmatch(mode, "md5") && FIPS_mode()) ++ { ++ vty_out(vty, "FIPS mode is enabled, md5 authentication id disabled\n"); ++ return CMD_WARNING_CONFIG_FAILED; ++ } ++ + nb_cli_enqueue_change(vty, "./authentication-scheme/mode", NB_OP_MODIFY, + strmatch(mode, "md5") ? "md5" : "plain-text"); + if (strmatch(mode, "md5")) diff --git a/SOURCES/0005-remove-grpc-test.patch b/SOURCES/0005-remove-grpc-test.patch new file mode 100644 index 0000000..148c1ea --- /dev/null +++ b/SOURCES/0005-remove-grpc-test.patch @@ -0,0 +1,27 @@ +diff --git a/tests/lib/subdir.am b/tests/lib/subdir.am +index 7b5eaa4..5c82f69 100644 +--- a/tests/lib/subdir.am ++++ b/tests/lib/subdir.am +@@ -18,22 +18,6 @@ tests_lib_test_frrscript_SOURCES = tests/lib/test_frrscript.c + test -e tests/lib/script1.lua || \ + $(INSTALL_SCRIPT) $< tests/lib/script1.lua + +-############################################################################## +-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 +-endif +-tests_lib_test_grpc_CXXFLAGS = $(WERROR) $(TESTS_CXXFLAGS) +-tests_lib_test_grpc_CPPFLAGS = $(TESTS_CPPFLAGS) +-tests_lib_test_grpc_LDADD = $(GRPC_TESTS_LDADD) +-tests_lib_test_grpc_SOURCES = tests/lib/test_grpc.cpp +-nodist_tests_lib_test_grpc_SOURCES = \ +- yang/frr-bfdd.yang.c \ +- yang/frr-staticd.yang.c \ +- # end +- +- + ############################################################################## + if ZEROMQ + check_PROGRAMS += tests/lib/test_zmq diff --git a/SOURCES/0006-noprefixroute-network-manager.patch b/SOURCES/0006-noprefixroute-network-manager.patch new file mode 100644 index 0000000..a1c2c79 --- /dev/null +++ b/SOURCES/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/SOURCES/frr-sysusers.conf b/SOURCES/frr-sysusers.conf new file mode 100644 index 0000000..9632955 --- /dev/null +++ b/SOURCES/frr-sysusers.conf @@ -0,0 +1,4 @@ +#Type Name ID GECOS Home directory Shell +g frrvty - +u frr - "FRRouting routing suite" /var/run/frr /sbin/nologin +m frr frrvty diff --git a/SOURCES/frr-tmpfiles.conf b/SOURCES/frr-tmpfiles.conf new file mode 100644 index 0000000..c1613b2 --- /dev/null +++ b/SOURCES/frr-tmpfiles.conf @@ -0,0 +1 @@ +d /run/frr 0755 frr frr - diff --git a/SOURCES/frr.fc b/SOURCES/frr.fc new file mode 100644 index 0000000..881cfee --- /dev/null +++ b/SOURCES/frr.fc @@ -0,0 +1,30 @@ +/usr/libexec/frr/(.*)? gen_context(system_u:object_r:frr_exec_t,s0) + +/usr/lib/systemd/system/frr.* gen_context(system_u:object_r:frr_unit_file_t,s0) + +/etc/frr(/.*)? gen_context(system_u:object_r:frr_conf_t,s0) + +/var/log/frr(/.*)? gen_context(system_u:object_r:frr_log_t,s0) +/var/tmp/frr(/.*)? gen_context(system_u:object_r:frr_tmp_t,s0) +/var/lib/frr(/.*)? gen_context(system_u:object_r:frr_var_lib_t,s0) + +/run/lock/subsys/bfdd -- gen_context(system_u:object_r:frr_lock_t,s0) +/run/lock/subsys/bgpd -- gen_context(system_u:object_r:frr_lock_t,s0) +/run/lock/subsys/eigrpd -- gen_context(system_u:object_r:frr_lock_t,s0) +/run/lock/subsys/fabricd -- gen_context(system_u:object_r:frr_lock_t,s0) +/run/lock/subsys/isisd -- gen_context(system_u:object_r:frr_lock_t,s0) +/run/lock/subsys/nhrpd -- gen_context(system_u:object_r:frr_lock_t,s0) +/run/lock/subsys/ospf6d -- gen_context(system_u:object_r:frr_lock_t,s0) +/run/lock/subsys/ospfd -- gen_context(system_u:object_r:frr_lock_t,s0) +/run/lock/subsys/pbrd -- gen_context(system_u:object_r:frr_lock_t,s0) +/run/lock/subsys/pimd -- gen_context(system_u:object_r:frr_lock_t,s0) +/run/lock/subsys/ripd -- gen_context(system_u:object_r:frr_lock_t,s0) +/run/lock/subsys/ripngd -- gen_context(system_u:object_r:frr_lock_t,s0) +/run/lock/subsys/staticd -- gen_context(system_u:object_r:frr_lock_t,s0) +/run/lock/subsys/zebra -- gen_context(system_u:object_r:frr_lock_t,s0) +/run/lock/subsys/vrrpd -- gen_context(system_u:object_r:frr_lock_t,s0) +/run/lock/subsys/pathd -- gen_context(system_u:object_r:frr_lock_t,s0) + +/run/frr(/.*)? gen_context(system_u:object_r:frr_var_run_t,s0) + +/usr/bin/vtysh -- gen_context(system_u:object_r:frr_exec_t,s0) diff --git a/SOURCES/frr.if b/SOURCES/frr.if new file mode 100644 index 0000000..f445718 --- /dev/null +++ b/SOURCES/frr.if @@ -0,0 +1,234 @@ +## policy for frr + +######################################## +## +## Execute frr_exec_t in the frr domain. +## +## +## +## Domain allowed to transition. +## +## +# +interface(`frr_domtrans',` + gen_require(` + type frr_t, frr_exec_t; + ') + + corecmd_search_bin($1) + domtrans_pattern($1, frr_exec_t, frr_t) +') + +###################################### +## +## Execute frr in the caller domain. +## +## +## +## Domain allowed access. +## +## +# +interface(`frr_exec',` + gen_require(` + type frr_exec_t; + ') + + corecmd_search_bin($1) + can_exec($1, frr_exec_t) +') + +######################################## +## +## Read frr's log files. +## +## +## +## Domain allowed access. +## +## +## +# +interface(`frr_read_log',` + gen_require(` + type frr_log_t; + ') + + read_files_pattern($1, frr_log_t, frr_log_t) + optional_policy(` + logging_search_logs($1) + ') +') + +######################################## +## +## Append to frr log files. +## +## +## +## Domain allowed access. +## +## +# +interface(`frr_append_log',` + gen_require(` + type frr_log_t; + ') + + append_files_pattern($1, frr_log_t, frr_log_t) + optional_policy(` + logging_search_logs($1) + ') +') + +######################################## +## +## Manage frr log files +## +## +## +## Domain allowed access. +## +## +# +interface(`frr_manage_log',` + gen_require(` + type frr_log_t; + ') + + manage_dirs_pattern($1, frr_log_t, frr_log_t) + manage_files_pattern($1, frr_log_t, frr_log_t) + manage_lnk_files_pattern($1, frr_log_t, frr_log_t) + optional_policy(` + logging_search_logs($1) + ') +') + +######################################## +## +## Read frr PID files. +## +## +## +## Domain allowed access. +## +## +# +interface(`frr_read_pid_files',` + gen_require(` + type frr_var_run_t; + ') + + files_search_pids($1) + read_files_pattern($1, frr_var_run_t, frr_var_run_t) +') + +######################################## +## +## All of the rules required to administrate +## an frr environment +## +## +## +## Domain allowed access. +## +## +# +interface(`frr_admin',` + gen_require(` + type frr_t; + type frr_log_t; + type frr_var_run_t; + ') + + allow $1 frr_t:process { signal_perms }; + ps_process_pattern($1, frr_t) + + tunable_policy(`deny_ptrace',`',` + allow $1 frr_t:process ptrace; + ') + + admin_pattern($1, frr_log_t) + + files_search_pids($1) + admin_pattern($1, frr_var_run_t) + optional_policy(` + logging_search_logs($1) + ') + optional_policy(` + systemd_passwd_agent_exec($1) + systemd_read_fifo_file_passwd_run($1) + ') +') + +######################################## +# +# Interface compatibility blocks +# +# The following definitions ensure compatibility with distribution policy +# versions that do not contain given interfaces (epel, or older Fedora +# releases). +# Each block tests for existence of given interface and defines it if needed. +# + +###################################### +## +## Watch ifconfig_var_run_t directories +## +## +## +## Domain allowed access. +## +## +# +ifndef(`sysnet_watch_ifconfig_run_dirs',` + interface(`sysnet_watch_ifconfig_run_dirs',` + gen_require(` + type ifconfig_var_run_t; + ') + + watch_dirs_pattern($1, ifconfig_var_run_t, ifconfig_var_run_t) + ') +') + +######################################## +## +## Read ifconfig_var_run_t files and link files +## +## +## +## Domain allowed access. +## +## +# +ifndef(`sysnet_read_ifconfig_run_files',` + interface(`sysnet_read_ifconfig_run_files',` + gen_require(` + type ifconfig_var_run_t; + ') + + list_dirs_pattern($1, ifconfig_var_run_t, ifconfig_var_run_t) + read_files_pattern($1, ifconfig_var_run_t, ifconfig_var_run_t) + read_lnk_files_pattern($1, ifconfig_var_run_t, ifconfig_var_run_t) + ') +') + +######################################## +## +## setattr admin_home_t files +## +## +## +## Domain allowed access. +## +## +# +ifndef(`userdom_setattr_admin_files',` + interface(`userdom_setattr_admin_files',` + gen_require(` + type admin_home_t; + ') + + allow $1 admin_home_t:file setattr; + ') +') diff --git a/SOURCES/frr.te b/SOURCES/frr.te new file mode 100644 index 0000000..68af3e9 --- /dev/null +++ b/SOURCES/frr.te @@ -0,0 +1,139 @@ +policy_module(frr, 1.0.0) + +######################################## +# +# Declarations +# + +type frr_t; +type frr_exec_t; +init_daemon_domain(frr_t, frr_exec_t) + +type frr_log_t; +logging_log_file(frr_log_t) + +type frr_tmp_t; +files_tmp_file(frr_tmp_t) + +type frr_lock_t; +files_lock_file(frr_lock_t) + +type frr_conf_t; +files_config_file(frr_conf_t) + +type frr_unit_file_t; +systemd_unit_file(frr_unit_file_t) + +type frr_var_run_t; +files_pid_file(frr_var_run_t) + +type frr_var_lib_t; +files_type(frr_var_lib_t) + +######################################## +# +# frr local policy +# +allow frr_t self:capability { chown dac_override dac_read_search kill net_bind_service net_raw setgid setuid net_admin sys_admin }; +allow frr_t self:netlink_route_socket rw_netlink_socket_perms; +allow frr_t self:netlink_generic_socket create; +allow frr_t self:netlink_generic_socket setopt; +allow frr_t self:netlink_generic_socket getopt; +allow frr_t self:netlink_generic_socket getattr; +allow frr_t self:netlink_generic_socket bind; +allow frr_t self:packet_socket create_socket_perms; +allow frr_t self:process { setcap setpgid }; +allow frr_t self:rawip_socket create_socket_perms; +allow frr_t self:tcp_socket { connect connected_stream_socket_perms }; +allow frr_t self:udp_socket create_socket_perms; +allow frr_t self:unix_stream_socket connectto; + +allow frr_t frr_conf_t:dir list_dir_perms; +manage_files_pattern(frr_t, frr_conf_t, frr_conf_t) +read_lnk_files_pattern(frr_t, frr_conf_t, frr_conf_t) + +manage_dirs_pattern(frr_t, frr_log_t, frr_log_t) +manage_files_pattern(frr_t, frr_log_t, frr_log_t) +manage_lnk_files_pattern(frr_t, frr_log_t, frr_log_t) +logging_log_filetrans(frr_t, frr_log_t, { dir file lnk_file }) + +manage_dirs_pattern(frr_t, frr_var_lib_t, frr_var_lib_t) +manage_files_pattern(frr_t, frr_var_lib_t, frr_var_lib_t) +files_var_lib_filetrans(frr_t, frr_var_lib_t, { dir file }) + +allow frr_t frr_tmp_t:file map; +manage_dirs_pattern(frr_t, frr_tmp_t, frr_tmp_t) +manage_files_pattern(frr_t, frr_tmp_t, frr_tmp_t) +files_tmp_filetrans(frr_t, frr_tmp_t, { file dir }) + +manage_files_pattern(frr_t, frr_lock_t, frr_lock_t) +manage_lnk_files_pattern(frr_t, frr_lock_t, frr_lock_t) +files_lock_filetrans(frr_t, frr_lock_t, { file lnk_file }) + +manage_dirs_pattern(frr_t, frr_var_run_t, frr_var_run_t) +manage_files_pattern(frr_t, frr_var_run_t, frr_var_run_t) +manage_lnk_files_pattern(frr_t, frr_var_run_t, frr_var_run_t) +manage_sock_files_pattern(frr_t, frr_var_run_t, frr_var_run_t) +files_pid_filetrans(frr_t, frr_var_run_t, { dir file lnk_file }) + +allow frr_t frr_exec_t:dir search_dir_perms; +can_exec(frr_t, frr_exec_t) + +kernel_read_network_state(frr_t) +kernel_rw_net_sysctls(frr_t) +kernel_read_system_state(frr_t) +kernel_request_load_module(frr_t) + +auth_use_nsswitch(frr_t) + +corecmd_exec_bin(frr_t) + +corenet_tcp_bind_appswitch_emp_port(frr_t) +corenet_udp_bind_bfd_control_port(frr_t) +corenet_udp_bind_bfd_echo_port(frr_t) +corenet_udp_bind_bfd_multi_port(frr_t) +corenet_tcp_bind_bgp_port(frr_t) +corenet_tcp_connect_bgp_port(frr_t) +corenet_tcp_bind_cmadmin_port(frr_t) +corenet_udp_bind_cmadmin_port(frr_t) +corenet_tcp_bind_firepower_port(frr_t) +corenet_tcp_bind_generic_port(frr_t) +corenet_tcp_bind_priority_e_com_port(frr_t) +corenet_udp_bind_router_port(frr_t) +corenet_tcp_bind_qpasa_agent_port(frr_t) +corenet_tcp_bind_smntubootstrap_port(frr_t) +corenet_tcp_bind_versa_tek_port(frr_t) +corenet_tcp_bind_zebra_port(frr_t) + +domain_use_interactive_fds(frr_t) + +fs_read_nsfs_files(frr_t) + +sysnet_exec_ifconfig(frr_t) +sysnet_read_ifconfig_run_files(frr_t) +sysnet_watch_ifconfig_run_dirs(frr_t) + +ipsec_domtrans_mgmt(frr_t) + +userdom_read_admin_home_files(frr_t) + +optional_policy(` + logging_send_syslog_msg(frr_t) +') + +optional_policy(` + modutils_exec_kmod(frr_t) + modutils_getattr_module_deps(frr_t) + modutils_read_module_config(frr_t) + modutils_read_module_deps_files(frr_t) +') + +optional_policy(` + networkmanager_read_state(frr_t) +') + +optional_policy(` + userdom_admin_home_dir_filetrans(frr_t, frr_conf_t, file, ".history_frr") + userdom_inherit_append_admin_home_files(frr_t, frr_conf_t, file, ".history_frr") + userdom_setattr_admin_files(frr_t, frr_conf_t, file, ".history_frr") +') diff --git a/SPECS/frr.spec b/SPECS/frr.spec new file mode 100644 index 0000000..228cb54 --- /dev/null +++ b/SPECS/frr.spec @@ -0,0 +1,581 @@ +%global frr_libdir %{_libexecdir}/frr + +%global _hardened_build 1 +%global selinuxtype targeted +%define _legacy_common_support 1 + +%bcond grpc %{undefined rhel} +%bcond selinux 1 + +Name: frr +Version: 10.1 +Release: 4%{?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 +Source0: https://github.com/FRRouting/frr/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz +Source1: %{name}-tmpfiles.conf +Source2: %{name}-sysusers.conf +#Decentralized SELinux policy +Source3: frr.fc +Source4: frr.te +Source5: frr.if + +Patch0000: 0000-remove-babeld-and-ldpd.patch +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 +BuildRequires: bison >= 2.7 +BuildRequires: c-ares-devel +BuildRequires: flex +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: git-core +BuildRequires: groff +%if %{with grpc} +BuildRequires: grpc-devel +BuildRequires: grpc-plugins +%endif +BuildRequires: json-c-devel +BuildRequires: libcap-devel +BuildRequires: libtool +BuildRequires: libyang-devel >= 2.1.148 +BuildRequires: make +BuildRequires: ncurses +BuildRequires: ncurses-devel +BuildRequires: net-snmp-devel +BuildRequires: pam-devel +BuildRequires: patch +BuildRequires: perl-XML-LibXML +BuildRequires: perl-generators +BuildRequires: python3-devel +BuildRequires: python3-pytest +BuildRequires: python3-sphinx +BuildRequires: readline-devel +BuildRequires: systemd-devel +BuildRequires: systemd-rpm-macros +BuildRequires: texinfo +BuildRequires: protobuf-c-devel + +Requires: ncurses +Requires: net-snmp +Requires(post): hostname +%{?sysusers_requires_compat} +Requires(post): systemd +Requires(postun): systemd +Requires(preun): systemd + +%if 0%{?with_selinux} +Requires: (%{name}-selinux = %{version}-%{release} if selinux-policy-%{selinuxtype}) +%endif + +Obsoletes: quagga < 1.2.4-17 +Provides: routingdaemon = %{version}-%{release} + +%description +FRRouting is free software that manages TCP/IP based routing protocols. It takes +a multi-server and multi-threaded approach to resolve the current complexity +of the Internet. + +FRRouting supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, NHRP, PBR, +EIGRP and BFD. + +FRRouting is a fork of Quagga. + +%if 0%{?with_selinux} +%package selinux +Summary: Selinux policy for FRR +BuildArch: noarch +Requires: selinux-policy-%{selinuxtype} +Requires(post): selinux-policy-%{selinuxtype} +BuildRequires: selinux-policy-devel +%{?selinux_requires} + +%description selinux +SELinux policy modules for FRR package + +%endif + +%prep +%autosetup -S git +#Selinux +mkdir selinux +cp -p %{SOURCE3} %{SOURCE4} %{SOURCE5} selinux +# C++14 or later needed for abseil-cpp 20230125; string_view needs C++17: +sed -r -i 's/(AX_CXX_COMPILE_STDCXX\(\[)11(\])/\117\2/' configure.ac + +%build +autoreconf -ivf + +%configure \ + --sbindir=%{frr_libdir} \ + --sysconfdir=%{_sysconfdir}/frr \ + --libdir=%{_libdir}/frr \ + --libexecdir=%{_libexecdir}/frr \ + --localstatedir=/var \ + --enable-multipath=64 \ + --enable-vtysh=yes \ + --disable-ospfclient \ + --disable-ospfapi \ + --enable-snmp=agentx \ + --enable-user=frr \ + --enable-group=frr \ + --enable-vty-group=frrvty \ + --enable-rtadv \ + --disable-exampledir \ + --enable-systemd=yes \ + --enable-static=no \ + --disable-ldpd \ + --disable-babeld \ + --with-moduledir=%{_libdir}/frr/modules \ + --with-yangmodelsdir=%{_datadir}/frr-yang/ \ + --with-crypto=openssl \ + --enable-fpm \ + %{?with_grpc:--enable-grpc} + +%make_build MAKEINFO="makeinfo --no-split" PYTHON=%{__python3} + +# Build info documentation +%make_build -C doc info + +#SELinux policy +%if 0%{?with_selinux} +make -C selinux -f %{_datadir}/selinux/devel/Makefile %{name}.pp +bzip2 -9 selinux/%{name}.pp +%endif + +%install +mkdir -p %{buildroot}%{_sysconfdir}/{frr,rc.d/init.d,sysconfig,logrotate.d,pam.d,default} \ + %{buildroot}%{_localstatedir}/log/frr %{buildroot}%{_infodir} \ + %{buildroot}%{_unitdir} + +mkdir -p -m 0755 %{buildroot}%{_libdir}/frr +mkdir -p %{buildroot}%{_tmpfilesdir} +mkdir -p %{buildroot}%{_sysusersdir} + +%make_install + +# Remove this file, as it is uninstalled and causes errors when building on RH9 +rm -rf %{buildroot}%{_infodir}/dir + +install -p -m 644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf +install -p -m 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf +install -p -m 644 tools/etc/frr/daemons %{buildroot}%{_sysconfdir}/frr/daemons +install -p -m 644 tools/frr.service %{buildroot}%{_unitdir}/frr.service +install -p -m 755 tools/frrinit.sh %{buildroot}%{frr_libdir}/frr +install -p -m 755 tools/frrcommon.sh %{buildroot}%{frr_libdir}/frrcommon.sh +install -p -m 755 tools/watchfrr.sh %{buildroot}%{frr_libdir}/watchfrr.sh + +install -p -m 644 redhat/frr.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/frr +install -p -m 644 redhat/frr.pam %{buildroot}%{_sysconfdir}/pam.d/frr +install -d -m 775 %{buildroot}/run/frr + +%if 0%{?with_selinux} +install -D -m 644 selinux/%{name}.pp.bz2 \ + %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 +install -D -m 644 selinux/%{name}.if %{buildroot}%{_datadir}/selinux/devel/include/distributed/%{name}.if +%endif + +# Delete libtool archives +find %{buildroot} -type f -name "*.la" -delete -print + +#Upstream does not maintain a stable API, these headers from -devel subpackage are no longer needed +rm %{buildroot}%{_libdir}/frr/*.so +rm -r %{buildroot}%{_includedir}/frr/ + +%pre +%sysusers_create_compat %{SOURCE2} + +%post +%systemd_post frr.service + +# Create dummy files if they don't exist so basic functions can be used. +if [ ! -e %{_sysconfdir}/frr/frr.conf ]; then + echo "hostname `hostname`" > %{_sysconfdir}/frr/frr.conf + chown frr:frr %{_sysconfdir}/frr/frr.conf + chmod 640 %{_sysconfdir}/frr/frr.conf +fi + +#still used by vtysh, this way no error is produced when using vtysh +if [ ! -e %{_sysconfdir}/frr/vtysh.conf ]; then + touch %{_sysconfdir}/frr/vtysh.conf + chmod 640 %{_sysconfdir}/frr/vtysh.conf + chown frr:frrvty %{_sysconfdir}/frr/vtysh.conf +fi + +%postun +%systemd_postun_with_restart frr.service + +%preun +%systemd_preun frr.service + +#SELinux +%if 0%{?with_selinux} +%pre selinux +%selinux_relabel_pre -s %{selinuxtype} + +%post selinux +%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 +%selinux_relabel_post -s %{selinuxtype} +#/var/tmp and /var/run need to be relabeled as well if FRR is running before upgrade +if [ $1 == 2 ]; then + %{_sbindir}/restorecon -R /var/tmp/frr &> /dev/null + %{_sbindir}/restorecon -R /var/run/frr &> /dev/null +fi + +%postun selinux +if [ $1 -eq 0 ]; then + %selinux_modules_uninstall -s %{selinuxtype} %{name} + %selinux_relabel_post -s %{selinuxtype} +fi + +%endif + +%check +#this should be temporary, the grpc test is just badly designed +rm tests/lib/*grpc* +%make_build check PYTHON=%{__python3} + +%files +%license COPYING +%doc doc/mpls +%dir %attr(750,frr,frr) %{_sysconfdir}/frr +%dir %attr(755,frr,frr) %{_localstatedir}/log/frr +%dir %attr(755,frr,frr) /run/frr +%{_infodir}/*info* +%{_mandir}/man1/frr.1* +%{_mandir}/man1/vtysh.1* +%{_mandir}/man8/frr-*.8* +%{_mandir}/man8/mtracebis.8* +%dir %{frr_libdir}/ +%{frr_libdir}/* +%{_bindir}/mtracebis +%{_bindir}/vtysh +%dir %{_libdir}/frr +%{_libdir}/frr/*.so.* +%dir %{_libdir}/frr/modules +%{_libdir}/frr/modules/* +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/frr +%config(noreplace) %attr(644,frr,frr) %{_sysconfdir}/frr/daemons +%config(noreplace) %{_sysconfdir}/pam.d/frr +%{_unitdir}/*.service +%dir %{_datadir}/frr-yang/ +%{_datadir}/frr-yang/*.yang +%{_tmpfilesdir}/%{name}.conf +%{_sysusersdir}/%{name}.conf + +%if 0%{?with_selinux} +%files selinux +%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.* +%{_datadir}/selinux/devel/include/distributed/%{name}.if +%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} +%endif + +%changelog +* Mon Sep 09 2024 Michal Ruprich - 10.1-4 +- Resolves: RHEL-56074 - frr AVCs after rebase to 10.1 + +* Mon Aug 26 2024 Michal Ruprich - 10.1-3 +- Related: RHEL-55747 - Adding libs_manage_lib_dirs for handling lib_t + +* Sun Aug 25 2024 Michal Ruprich - 10.1-2 +- Related: RHEL-55747 - Adding new selinux rules + +* Thu Aug 22 2024 Michal Ruprich - 10.1-1 +- New version 10.1 + +* Mon Jun 24 2024 Troy Dawson - 9.1-11 +- Bump release for June 2024 mass rebuild + +* Wed Jun 12 2024 Michal Ruprich - 9.1-10 +- Resolves: RHEL-32134 - buffer overflow and daemon crash in ospf_te_parse_ri + +* Wed Jun 12 2024 Michal Ruprich - 9.1-9 +- Resolves: RHEL-32138 - buffer overflow in ospf_te_parse_ext_link + +* Wed Jun 12 2024 Michal Ruprich - 9.1-8 +- Resolves: RHEL-34911 - null pointer via get_edge() function can trigger a denial of service + +* Mon May 27 2024 Michal Ruprich - 9.1-7 +- Resolves: RHEL-38834 - Missing selinux rules for .history_frr file for FRR + +* Thu Apr 18 2024 Michal Ruprich - 9.1-6 +- Resolves: RHEL-32128 - infinite loop + +* Thu Apr 18 2024 Michal Ruprich - 9.1-5 +- Resolves: RHEL-32125 - bgpd daemon crash + +* Tue Apr 16 2024 Michal Ruprich - 9.1-4 +- Moving yang modules to an frr specific directory to avoid conflicts +- Adding rpminspect.yaml + +* Thu Apr 11 2024 Michal Ruprich - 9.1-3 +- Resolves: RHEL-32502 - frr fails to start: SELinux is preventing watchfrr from create access on the sock_file + +* Sun Feb 04 2024 Benjamin A. Beasley - 9.1-2 +- Rebuilt for abseil-cpp-20240116.0 + +* Thu Jan 25 2024 Michal Ruprich - 9.1-1 +- New version 9.1 + +* Wed Jan 24 2024 Fedora Release Engineering - 9.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 9.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Oct 16 2023 Michal Ruprich - 9.0.1-1 +- New version 9.0.1 + +* Fri Sep 01 2023 Michal Ruprich - 8.5.2-4 +- Adding a couple of SELinux rules, includes fix for rhbz#2149299 + +* Wed Aug 30 2023 Benjamin A. Beasley - 8.5.2-3 +- Rebuilt for abseil-cpp 20230802.0 + +* Wed Jul 19 2023 Fedora Release Engineering - 8.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 30 2023 Michal Ruprich - 8.5.2-1 +- New version 8.5.2 +- Fixing some rpmlint warnings + +* Mon Jun 26 2023 Michal Ruprich - 8.5.1-4 +- Resolves: #2216073 - SELinux is preventing FRR-Zebra to access to network namespaces. + +* Mon Jun 05 2023 Yaakov Selkowitz - 8.5.1-3 +- Disable grpc in RHEL builds + +* Fri May 19 2023 Petr Pisar - 8.5.1-2 +- Rebuild against rpm-4.19 (https://fedoraproject.org/wiki/Changes/RPM-4.19) + +* Wed Apr 26 2023 Michal Ruprich - 8.5.1-1 +- New version 8.5.1 + +* Wed Apr 12 2023 Michal Ruprich - 8.5-1 +- New version 8.5 + +* Thu Mar 23 2023 Michal Ruprich - 8.4.2-5 +- Rebuilding for new abseil-cpp version + +* Wed Mar 22 2023 Michal Ruprich - 8.4.2-4 +- SPDX migration + +* Wed Mar 08 2023 Benjamin A. Beasley - 8.4.2-3 +- Build as C++17, required by abseil-cpp 20230125 + +* Thu Jan 19 2023 Fedora Release Engineering - 8.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jan 12 2023 Michal Ruprich - 8.4.2-1 +- New version 8.4.2 + +* Fri Nov 25 2022 Michal Ruprich - 8.4.1-1 +- New version 8.4.1 +- Fix for rhbz #2140705 + +* Thu Nov 10 2022 Michal Ruprich - 8.4-1 +- New version 8.4 + +* Fri Sep 16 2022 Michal Ruprich - 8.3.1-5 +- Adding SELinux rule to enable zebra to write to sysctl_net_t +- Adding SELinux rule to enable bgpd to call name_connect to bgp_port_t + +* Fri Sep 09 2022 Michal Ruprich - 8.3.1-4 +- Fixing an error in post scriptlet + +* Fri Sep 09 2022 Michal Ruprich - 8.3.1-3 +- Resolves: #2124254 - frr can no longer update routes + +* Wed Sep 07 2022 Michal Ruprich - 8.3.1-2 +- Resolves: #2124253 - SELinux is preventing zebra from setattr access on the directory frr +- Better handling FRR files during upgrade + +* Tue Sep 06 2022 Michal Ruprich - 8.3.1-1 +- New version 8.3.1 + +* Mon Aug 22 2022 Michal Ruprich - 8.2.2-10 +- Rebuilding for new abseil-cpp and grpc updates + +* Wed Aug 10 2022 Michal Ruprich - 8.2.2-9 +- Adding vrrpd and pathd as daemons to the policy + +* Wed Aug 10 2022 Michal Ruprich - 8.2.2-8 +- Finalizing SELinux policy + +* Tue Aug 02 2022 Michal Ruprich - 8.2.2-7 +- Fixing wrong path for vtysh in frr.fc + +* Fri Jul 29 2022 Benjamin A. Beasley - 8.2.2-6 +- Rebuild with abseil-cpp-20211102.0-4.fc37 (RHBZ#2108658) + +* Wed Jul 27 2022 Michal Ruprich - 8.2.2-5 +- Packaging SELinux policy for FRR + +* Thu Jul 21 2022 Fedora Release Engineering - 8.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue May 17 2022 Michal Ruprich - 8.2.2-3 +- Rebuild for grpc-1.46.1 + +* Mon Apr 11 2022 Michal Ruprich - 8.2.2-2 +- Fix for CVE-2022-16126 + +* Tue Mar 15 2022 Michal Ruprich - 8.2.2-1 +- New version 8.2.2 + +* Thu Mar 10 2022 Michal Ruprich - 8.2-2 +- Rebuild for abseil-cpp 20211102.0 + +* Wed Mar 09 2022 Michal Ruprich - 8.2-1 +- New version 8.2 (rhbz#2020439) +- Resolves: #2011868 - systemctl frr reload does not stop daemons that are not enabled in /etc/frr/daemons + +* Tue Feb 01 2022 Michal Ruprich - 8.0.1-11 +- Rebuilding for FTBFS in Rawhide(rhbz#2045399) + +* Thu Jan 20 2022 Fedora Release Engineering - 8.0.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Jan 08 2022 Miro Hrončok - 8.0.1-9 +- Rebuilt for libre2.so.9 + +* Sat Nov 06 2021 Adrian Reber - 8.0.1-8 +- Rebuilt for protobuf 3.19.0 + +* Mon Oct 25 2021 Adrian Reber - 8.0.1-7 +- Rebuilt for protobuf 3.18.1 + +* Fri Oct 15 2021 Michal Ruprich - 8.0.1-6 +- Obsoleting quagga so that it may be retired + +* Thu Oct 07 2021 Michal Ruprich - 8.0.1-5 +- Rebuilding for grpc 1.41 + +* Thu Sep 30 2021 Michal Ruprich - 8.0.1-4 +- Rebuild for new version of libyang + +* Sat Sep 18 2021 Benjamin A. Beasley - 8.0.1-3 +- Rebuild for grpc 1.40 + +* Thu Sep 16 2021 Sahana Prasad - 8.0.1-2 +- Rebuilt with OpenSSL 3.0.0 + +* Thu Sep 16 2021 Michal Ruprich - 8.0.1-1 +- New version 8.0.1 + +* Tue Sep 14 2021 Sahana Prasad - 8.0-2 +- Rebuilt with OpenSSL 3.0.0 + +* Wed Aug 11 2021 Michal Ruprich - 8.0-1 +- New version 8.0 + +* Wed Aug 04 2021 Benjamin A. Beasley - 7.5.1-9 +- Rebuild for grpc 1.39 + +* Wed Jul 21 2021 Fedora Release Engineering - 7.5.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jul 20 2021 Michal Ruprich - 7.5.1-7 +- Resolves: #1983278 - ospfd crashes in route_node_delete with assertion fail + +* Sat Jul 10 2021 Björn Esser - 7.5.1-6 +- Rebuild for versioned symbols in json-c + +* Wed Jul 07 2021 Neal Gompa - 7.5.1-5 +- Clean up the spec file for legibility and modern spec standards +- Remove unneeded info scriptlets +- Use systemd-sysusers for frr user and frrvty group +- Use git-core instead of git for applying patches +- Drop redundant build dependencies + +* Wed Jul 07 2021 Michal Ruprich - 7.5.1-4 +- Rebuild for newer abseil-cpp + +* Tue May 11 2021 Benjamin A. Beasley - 7.5.1-3 +- Rebuild for grpc 1.37 + +* Fri Apr 23 2021 Michal Ruprich - 7.5.1-2 +- Fixing permissions on config files in /etc/frr +- Enabling integrated configuration option for frr + +* Fri Mar 12 2021 Michal Ruprich - 7.5.1-1 +- New version 7.5.1 +- Enabling grpc, adding hostname for post scriptlet +- Moving files to libexec due to selinux issues + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 7.5-4 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Tue Feb 16 2021 Michal Ruprich - 7.5-3 +- Fixing FTBS - icc options are confusing the new gcc + +* Tue Jan 26 2021 Fedora Release Engineering - 7.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jan 01 2021 Michal Ruprich - 7.5-1 +- New version 7.5 + +* Mon Sep 21 2020 Michal Ruprich - 7.4-1 +- New version 7.4 + +* Thu Aug 27 2020 Josef Řídký - 7.3.1-4 +- Rebuilt for new net-snmp release + +* Mon Jul 27 2020 Fedora Release Engineering - 7.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jun 18 2020 Michal Ruprich - 7.3.1-1 +- New version 7.3.1 +- Fixes a couple of bugs(#1832259, #1835039, #1830815, #1830808, #1830806, #1830800, #1830798, #1814773) + +* Tue May 19 2020 Michal Ruprich - 7.3-6 +- Removing texi2html, it is not available in Rawhide anymore + +* Mon May 18 2020 Michal Ruprich - 7.3-5 +- Rebuild for new version of libyang + +* Tue Apr 21 2020 Björn Esser - 7.3-4 +- Rebuild (json-c) + +* Mon Apr 13 2020 Björn Esser - 7.3-3 +- Update json-c-0.14 patch with a solution from upstream + +* Mon Apr 13 2020 Björn Esser - 7.3-2 +- Add support for upcoming json-c 0.14.0 + +* Wed Feb 19 2020 Michal Ruprich - 7.3-1 +- New version 7.3 + +* Tue Jan 28 2020 Fedora Release Engineering - 7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Dec 16 2019 Michal Ruprich - 7.2-1 +- New version 7.2 + +* Tue Nov 12 2019 Michal Ruprich - 7.1-5 +- Rebuilding for new version of libyang + +* Mon Oct 07 2019 Michal Ruprich - 7.1-4 +- Adding noreplace to the /etc/frr/daemons file + +* Fri Sep 13 2019 Michal Ruprich - 7.1-3 +- New way of finding python version during build +- Replacing crypto of all routing daemons with openssl +- Disabling EIGRP crypto because it is broken +- Disabling crypto in FIPS mode + +* Thu Jul 25 2019 Fedora Release Engineering - 7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jun 25 2019 Michal Ruprich - 7.1-1 +- New version 7.1 + +* Wed Jun 19 2019 Michal Ruprich - 7.0-2 +- Initial build