Compare commits
107 Commits
f31-st
...
frr-10.3-1
| Author | SHA1 | Date | |
|---|---|---|---|
| 44f1e4e485 | |||
|
|
b28c6b6928 | ||
| 6dd06c3274 | |||
|
|
959d8d1a3f | ||
|
|
9db41267a7 | ||
|
|
0d2ad1b406 | ||
|
|
fadec67736 | ||
|
|
0c182ee574 | ||
|
|
c39d922dae | ||
|
|
61519cccf4 | ||
|
|
81fa627af2 | ||
|
|
c09dc1bed5 | ||
|
|
4c161409bf | ||
|
|
7643df3757 | ||
|
|
14d3b39746 | ||
|
|
f10270279b | ||
|
|
9c91b908e1 | ||
|
|
2228c29472 | ||
|
|
9bf8cfe430 | ||
|
|
30f4eb8e8e | ||
|
|
ca06a43267 | ||
|
|
4405129034 | ||
|
|
a302f6117d | ||
|
|
73b57e75c1 | ||
|
|
b6998f1514 | ||
|
|
de8d85febb | ||
|
|
7f0775ec07 | ||
|
|
eee04cae3d | ||
|
|
58b91e7bdb | ||
|
|
a5fc21e539 | ||
|
|
12b88485f2 | ||
|
|
f062556435 | ||
|
|
28e257ed71 | ||
|
|
777829246b | ||
|
|
a0c4fb9063 | ||
|
|
0d70491296 | ||
|
|
1787b2810b | ||
|
|
d506655fff | ||
|
|
5301cdd961 | ||
|
|
3905b5274d | ||
|
|
41a038e1d1 | ||
|
|
a7b3783ddc | ||
|
|
a2ffd90d49 | ||
|
|
db09f8886c | ||
|
|
6e63bc125e | ||
|
|
b2c9845f51 | ||
|
|
16d43cc08d | ||
|
|
d0157c4cbf | ||
|
|
40f863faec | ||
|
|
1e7608b86e | ||
|
|
4a6900f6dc | ||
|
|
15e17067ee | ||
|
|
9408b0b09e | ||
|
|
cba62cd207 | ||
|
|
0c5e4dac6b | ||
|
|
38e840d2af | ||
|
|
4519d663ea | ||
|
|
46c4cd45bd | ||
|
|
4ed096d9e0 | ||
|
|
efd1a71f65 | ||
|
|
b2d9986308 | ||
|
|
48fc52869f | ||
|
|
cc05a64a36 | ||
|
|
96de429704 | ||
|
|
6ff7ded7f0 | ||
|
|
7ce4ec0635 | ||
|
|
c5466bb615 | ||
|
|
07fa06fda3 | ||
|
|
8f024e6425 | ||
|
|
49e2bd48c8 | ||
|
|
494d547bc7 | ||
|
|
b33a5eb07f | ||
|
|
a96e1dd222 | ||
|
|
c7d9dbbe26 | ||
|
|
176ca84f0f | ||
|
|
dcf54beb15 | ||
|
|
31b2cc24c1 | ||
|
|
60a5f4164e | ||
|
|
88413391a7 | ||
|
|
eec6e6c3c0 | ||
|
|
9f5eed940b | ||
|
|
7880ef80b4 | ||
|
|
ca909aee1b | ||
|
|
158687cb0e | ||
|
|
8e0c6a5a41 | ||
|
|
22d94bec34 | ||
|
|
c0bc1c720a | ||
|
|
1cc2fcd604 | ||
|
|
d3558d90f6 | ||
|
|
eafae8ca75 | ||
|
|
3d0f818836 | ||
|
|
b79d97cbd2 | ||
|
|
7bc4774a57 | ||
|
|
549c517210 | ||
|
|
6295fc893e | ||
|
|
0d34206229 | ||
|
|
69f43ae016 | ||
|
|
cc5d8e11bc | ||
|
|
6eb34bb459 | ||
|
|
57c898887f | ||
|
|
fbca0aec49 | ||
|
|
3f446986bd | ||
|
|
6649e1db0a | ||
|
|
55a1ddaf1c | ||
|
|
a762237e7b | ||
|
|
db560a0aad | ||
|
|
1924a87e88 |
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@@ -0,0 +1 @@
|
||||
1
|
||||
23
.gitignore
vendored
23
.gitignore
vendored
@@ -1 +1,24 @@
|
||||
/frr-7.1.tar.gz
|
||||
/frr-7.2.tar.gz
|
||||
/frr-7.3.tar.gz
|
||||
/remove-babeld-ldpd.sh
|
||||
/frr-7.3.1.tar.gz
|
||||
/frr-7.4.tar.gz
|
||||
/frr-7.5.tar.gz
|
||||
/frr-7.5.1.tar.gz
|
||||
/frr-8.0.tar.gz
|
||||
/frr-8.0.1.tar.gz
|
||||
/frr-8.2.tar.gz
|
||||
/frr-8.2.2.tar.gz
|
||||
/frr-8.3.1.tar.gz
|
||||
/frr-8.4.tar.gz
|
||||
/frr-8.4.1.tar.gz
|
||||
/frr-8.4.2.tar.gz
|
||||
/frr-8.5.tar.gz
|
||||
/frr-8.5.1.tar.gz
|
||||
/frr-8.5.2.tar.gz
|
||||
/frr-9.0.1.tar.gz
|
||||
/frr-9.1.tar.gz
|
||||
/frr-10.0.1.tar.gz
|
||||
/frr-10.1.tar.gz
|
||||
/frr-10.2.tar.gz
|
||||
|
||||
@@ -12,13 +12,13 @@ index 5be3264..33abc1d 100644
|
||||
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 \
|
||||
bgpd/rfp-example/rfptest/Makefile \
|
||||
@@ -193,7 +190,6 @@ EXTRA_DIST += \
|
||||
fpm/Makefile \
|
||||
grpc/Makefile \
|
||||
@@ -27,3 +27,29 @@ index 5be3264..33abc1d 100644
|
||||
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"
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
diff --git a/tools/frr-reload.py b/tools/frr-reload.py
|
||||
index 208fb11..0692adc 100755
|
||||
--- a/tools/frr-reload.py
|
||||
+++ b/tools/frr-reload.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/python
|
||||
+#!/usr/bin/python3
|
||||
# Frr Reloader
|
||||
# Copyright (C) 2014 Cumulus Networks, Inc.
|
||||
#
|
||||
78
0002-enable-openssl.patch
Normal file
78
0002-enable-openssl.patch
Normal file
@@ -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"
|
||||
252
0003-disable-eigrp-crypto.patch
Normal file
252
0003-disable-eigrp-crypto.patch
Normal file
@@ -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']",
|
||||
147
0004-fips-mode.patch
Normal file
147
0004-fips-mode.patch
Normal file
@@ -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 <zebra.h>
|
||||
#include <string.h>
|
||||
|
||||
+#ifdef CRYPTO_OPENSSL
|
||||
+#include <openssl/fips.h>
|
||||
+#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 <netinet/if_ether.h>
|
||||
#endif
|
||||
|
||||
+#ifdef CRYPTO_OPENSSL
|
||||
+#include <openssl/fips.h>
|
||||
+#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 <zebra.h>
|
||||
|
||||
+#ifdef CRYPTO_OPENSSL
|
||||
+#include <openssl/fips.h>
|
||||
+#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 <zebra.h>
|
||||
|
||||
+#ifdef CRYPTO_OPENSSL
|
||||
+#include <openssl/fips.h>
|
||||
+#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"))
|
||||
27
0005-remove-grpc-test.patch
Normal file
27
0005-remove-grpc-test.patch
Normal file
@@ -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
|
||||
41
0006-autorp-segfault.patch
Normal file
41
0006-autorp-segfault.patch
Normal file
@@ -0,0 +1,41 @@
|
||||
From 37b88191fb4736ff0a1e565fc22003d0ab853ea2 Mon Sep 17 00:00:00 2001
|
||||
From: Donald Sharp <sharpd@nvidia.com>
|
||||
Date: Wed, 4 Dec 2024 10:47:33 -0500
|
||||
Subject: [PATCH] pimd: Prevent crash of pim when auto-rp's socket is not
|
||||
initialized
|
||||
|
||||
If the socket associated with the auto-rp fails to initialize then
|
||||
the memory for the auto-rp is just dropped on the floor. Additionally
|
||||
any type of attempt at using the feature will just cause pimd to crash,
|
||||
when the pointer is derefed. Since it is derefed all over the place
|
||||
without checking.
|
||||
|
||||
Clearly if you cannot bind/use the socket let's allow continuation.
|
||||
|
||||
Fixes: #17540
|
||||
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
|
||||
---
|
||||
pimd/pim_autorp.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pimd/pim_autorp.c b/pimd/pim_autorp.c
|
||||
index 3fb10f4..91ed005 100644
|
||||
--- a/pimd/pim_autorp.c
|
||||
+++ b/pimd/pim_autorp.c
|
||||
@@ -1014,12 +1014,14 @@ void pim_autorp_init(struct pim_instance *pim)
|
||||
autorp->announce_interval = DEFAULT_ANNOUNCE_INTERVAL;
|
||||
autorp->announce_holdtime = DEFAULT_ANNOUNCE_HOLDTIME;
|
||||
|
||||
+ pim->autorp = autorp;
|
||||
+
|
||||
if (!pim_autorp_socket_enable(autorp)) {
|
||||
- zlog_err("%s: AutoRP failed to initialize", __func__);
|
||||
+ zlog_err("%s: AutoRP failed to initialize, feature will not work correctly",
|
||||
+ __func__);
|
||||
return;
|
||||
}
|
||||
|
||||
- pim->autorp = autorp;
|
||||
if (PIM_DEBUG_AUTORP)
|
||||
zlog_debug("%s: AutoRP Initialized", __func__);
|
||||
|
||||
BIN
frr-10.3.tar.gz
Normal file
BIN
frr-10.3.tar.gz
Normal file
Binary file not shown.
4
frr-sysusers.conf
Normal file
4
frr-sysusers.conf
Normal file
@@ -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
|
||||
1
frr-tmpfiles.conf
Normal file
1
frr-tmpfiles.conf
Normal file
@@ -0,0 +1 @@
|
||||
d /run/frr 0755 frr frr -
|
||||
30
frr.fc
Normal file
30
frr.fc
Normal file
@@ -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)
|
||||
214
frr.if
Normal file
214
frr.if
Normal file
@@ -0,0 +1,214 @@
|
||||
## <summary>policy for frr</summary>
|
||||
|
||||
########################################
|
||||
## <summary>
|
||||
## Execute frr_exec_t in the frr domain.
|
||||
## </summary>
|
||||
## <param name="domain">
|
||||
## <summary>
|
||||
## Domain allowed to transition.
|
||||
## </summary>
|
||||
## </param>
|
||||
#
|
||||
interface(`frr_domtrans',`
|
||||
gen_require(`
|
||||
type frr_t, frr_exec_t;
|
||||
')
|
||||
|
||||
corecmd_search_bin($1)
|
||||
domtrans_pattern($1, frr_exec_t, frr_t)
|
||||
')
|
||||
|
||||
######################################
|
||||
## <summary>
|
||||
## Execute frr in the caller domain.
|
||||
## </summary>
|
||||
## <param name="domain">
|
||||
## <summary>
|
||||
## Domain allowed access.
|
||||
## </summary>
|
||||
## </param>
|
||||
#
|
||||
interface(`frr_exec',`
|
||||
gen_require(`
|
||||
type frr_exec_t;
|
||||
')
|
||||
|
||||
corecmd_search_bin($1)
|
||||
can_exec($1, frr_exec_t)
|
||||
')
|
||||
|
||||
########################################
|
||||
## <summary>
|
||||
## Read frr's log files.
|
||||
## </summary>
|
||||
## <param name="domain">
|
||||
## <summary>
|
||||
## Domain allowed access.
|
||||
## </summary>
|
||||
## </param>
|
||||
## <rolecap/>
|
||||
#
|
||||
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)
|
||||
')
|
||||
')
|
||||
|
||||
########################################
|
||||
## <summary>
|
||||
## Append to frr log files.
|
||||
## </summary>
|
||||
## <param name="domain">
|
||||
## <summary>
|
||||
## Domain allowed access.
|
||||
## </summary>
|
||||
## </param>
|
||||
#
|
||||
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)
|
||||
')
|
||||
')
|
||||
|
||||
########################################
|
||||
## <summary>
|
||||
## Manage frr log files
|
||||
## </summary>
|
||||
## <param name="domain">
|
||||
## <summary>
|
||||
## Domain allowed access.
|
||||
## </summary>
|
||||
## </param>
|
||||
#
|
||||
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)
|
||||
')
|
||||
')
|
||||
|
||||
########################################
|
||||
## <summary>
|
||||
## Read frr PID files.
|
||||
## </summary>
|
||||
## <param name="domain">
|
||||
## <summary>
|
||||
## Domain allowed access.
|
||||
## </summary>
|
||||
## </param>
|
||||
#
|
||||
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)
|
||||
')
|
||||
|
||||
########################################
|
||||
## <summary>
|
||||
## All of the rules required to administrate
|
||||
## an frr environment
|
||||
## </summary>
|
||||
## <param name="domain">
|
||||
## <summary>
|
||||
## Domain allowed access.
|
||||
## </summary>
|
||||
## </param>
|
||||
#
|
||||
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.
|
||||
#
|
||||
|
||||
######################################
|
||||
## <summary>
|
||||
## Watch ifconfig_var_run_t directories
|
||||
## </summary>
|
||||
## <param name="domain">
|
||||
## <summary>
|
||||
## Domain allowed access.
|
||||
## </summary>
|
||||
## </param>
|
||||
#
|
||||
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)
|
||||
')
|
||||
')
|
||||
|
||||
########################################
|
||||
## <summary>
|
||||
## Read ifconfig_var_run_t files and link files
|
||||
## </summary>
|
||||
## <param name="domain">
|
||||
## <summary>
|
||||
## Domain allowed access.
|
||||
## </summary>
|
||||
## </param>
|
||||
#
|
||||
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)
|
||||
')
|
||||
')
|
||||
544
frr.spec
544
frr.spec
@@ -1,47 +1,115 @@
|
||||
%global frrversion 7.1
|
||||
%global frr_libdir /usr/lib/frr
|
||||
%global dist .ims.1%{?dist}
|
||||
|
||||
%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: 7.1
|
||||
Release: 2%{?checkout}%{?dist}
|
||||
Version: 10.3
|
||||
Release: 1%{?dist}
|
||||
Summary: Routing daemon
|
||||
License: GPLv2+
|
||||
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}-%{frrversion}/%{name}-%{frrversion}.tar.gz
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: systemd
|
||||
BuildRequires: gcc
|
||||
BuildRequires: net-snmp-devel
|
||||
BuildRequires: texinfo libcap-devel texi2html autoconf automake libtool patch groff
|
||||
BuildRequires: readline readline-devel ncurses ncurses-devel
|
||||
BuildRequires: git pam-devel c-ares-devel
|
||||
BuildRequires: json-c-devel bison >= 2.7 flex perl-XML-LibXML
|
||||
BuildRequires: python3-devel python3-sphinx python3-pytest
|
||||
BuildRequires: systemd systemd-devel
|
||||
BuildRequires: libyang-devel >= 0.16.74
|
||||
Requires: net-snmp ncurses
|
||||
Requires(post): systemd /sbin/install-info
|
||||
Requires(preun): systemd /sbin/install-info
|
||||
Requires(postun): systemd
|
||||
Provides: routingdaemon = %{version}-%{release}
|
||||
Conflicts: quagga
|
||||
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
|
||||
Patch0001: 0001-use-python3.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-autorp-segfault.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.0.0
|
||||
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 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
|
||||
@@ -51,7 +119,7 @@ autoreconf -ivf
|
||||
--sysconfdir=%{_sysconfdir}/frr \
|
||||
--libdir=%{_libdir}/frr \
|
||||
--libexecdir=%{_libexecdir}/frr \
|
||||
--localstatedir=%{_localstatedir}/run/frr \
|
||||
--localstatedir=/var \
|
||||
--enable-multipath=64 \
|
||||
--enable-vtysh=yes \
|
||||
--disable-ospfclient \
|
||||
@@ -67,57 +135,68 @@ autoreconf -ivf
|
||||
--disable-ldpd \
|
||||
--disable-babeld \
|
||||
--with-moduledir=%{_libdir}/frr/modules \
|
||||
--enable-fpm
|
||||
--with-yangmodelsdir=%{_datadir}/frr-yang/ \
|
||||
--with-crypto=openssl \
|
||||
--with-vici-socket=/run/strongswan/charon.vici \
|
||||
--enable-fpm \
|
||||
%{?with_grpc:--enable-grpc}
|
||||
|
||||
%make_build MAKEINFO="makeinfo --no-split" PYTHON=%{__python3}
|
||||
|
||||
pushd doc
|
||||
make info
|
||||
popd
|
||||
# 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}/etc/{frr,rc.d/init.d,sysconfig,logrotate.d,pam.d,default} \
|
||||
%{buildroot}/var/log/frr %{buildroot}%{_infodir} \
|
||||
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}/usr/share/info/dir
|
||||
rm -rf %{buildroot}%{_infodir}/dir
|
||||
|
||||
install -p -m 644 %{_builddir}/%{name}-%{frrversion}/tools/etc/frr/daemons %{buildroot}/etc/frr/daemons
|
||||
install -p -m 644 %{_builddir}/%{name}-%{frrversion}/tools/frr.service %{buildroot}%{_unitdir}/frr.service
|
||||
install -p -m 755 %{_builddir}/%{name}-%{frrversion}/tools/frrinit.sh %{buildroot}%{frr_libdir}/frr
|
||||
install -p -m 755 %{_builddir}/%{name}-%{frrversion}/tools/frrcommon.sh %{buildroot}%{frr_libdir}/frrcommon.sh
|
||||
install -p -m 755 %{_builddir}/%{name}-%{frrversion}/tools/watchfrr.sh %{buildroot}%{frr_libdir}/watchfrr.sh
|
||||
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 %{_builddir}/%{name}-%{frrversion}/redhat/frr.logrotate %{buildroot}/etc/logrotate.d/frr
|
||||
install -p -m 644 %{_builddir}/%{name}-%{frrversion}/redhat/frr.pam %{buildroot}/etc/pam.d/frr
|
||||
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
|
||||
|
||||
rm %{buildroot}%{_libdir}/frr/*.la
|
||||
rm %{buildroot}%{_libdir}/frr/modules/*.la
|
||||
%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
|
||||
getent group frrvty >/dev/null 2>&1 || groupadd -r frrvty >/dev/null 2>&1 || :
|
||||
getent group frr >/dev/null 2>&1 || groupadd -r frr >/dev/null 2>&1 || :
|
||||
getent passwd frr >/dev/null 2>&1 || useradd -M -r -g frr -s /sbin/nologin \
|
||||
-c "FRRouting routing suite" -d %{_localstatedir}/run/frr frr || :
|
||||
usermod -aG frrvty frr
|
||||
%sysusers_create_compat %{SOURCE2}
|
||||
|
||||
%post
|
||||
%systemd_post frr.service
|
||||
|
||||
if [ -f %{_infodir}/%{name}.inf* ]; then
|
||||
install-info %{_infodir}/frr.info %{_infodir}/dir || :
|
||||
fi
|
||||
|
||||
# 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
|
||||
@@ -125,52 +204,368 @@ if [ ! -e %{_sysconfdir}/frr/frr.conf ]; then
|
||||
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
|
||||
|
||||
#only when removing frr
|
||||
#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
|
||||
if [ -f %{_infodir}/%{name}.inf* ]; then
|
||||
install-info --delete %{_infodir}/frr.info %{_infodir}/dir || :
|
||||
fi
|
||||
%selinux_modules_uninstall -s %{selinuxtype} %{name}
|
||||
%selinux_relabel_post -s %{selinuxtype}
|
||||
fi
|
||||
|
||||
%endif
|
||||
|
||||
%check
|
||||
make check PYTHON=%{__python3}
|
||||
#this should be temporary, the grpc test is just badly designed
|
||||
rm tests/lib/*grpc*
|
||||
%make_build check PYTHON=%{__python3}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%license COPYING
|
||||
%doc zebra/zebra.conf.sample
|
||||
%doc isisd/isisd.conf.sample
|
||||
%doc ripd/ripd.conf.sample
|
||||
%doc bgpd/bgpd.conf.sample*
|
||||
%doc ospfd/ospfd.conf.sample
|
||||
%doc ospf6d/ospf6d.conf.sample
|
||||
%doc ripngd/ripngd.conf.sample
|
||||
%doc pimd/pimd.conf.sample
|
||||
%doc doc/mpls
|
||||
%dir %attr(755,frr,frr) %{_sysconfdir}/frr
|
||||
%dir %attr(755,frr,frr) /var/log/frr
|
||||
%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}/man*/*
|
||||
%{_mandir}/man1/frr.1*
|
||||
%{_mandir}/man1/vtysh.1*
|
||||
%{_mandir}/man8/frr-*.8*
|
||||
%{_mandir}/man8/mtracebis.8*
|
||||
%dir %{frr_libdir}/
|
||||
%{frr_libdir}/*
|
||||
%{_bindir}/*
|
||||
%{_bindir}/mtracebis
|
||||
%{_bindir}/vtysh
|
||||
%dir %{_libdir}/frr
|
||||
%{_libdir}/frr/*.so.*
|
||||
%dir %{_libdir}/frr/modules
|
||||
%{_libdir}/frr/modules/*
|
||||
%config(noreplace) %attr(644,root,root) /etc/logrotate.d/frr
|
||||
/etc/frr/daemons
|
||||
%config(noreplace) /etc/pam.d/frr
|
||||
%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
|
||||
/usr/share/yang/*.yang
|
||||
#%%{_libdir}/frr/frr/libyang_plugins/*
|
||||
%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
|
||||
* Thu Dec 05 2024 Michal Ruprich <mruprich@redhat.com> - 10.2-2
|
||||
- Resolves: rhbz#2329643 - upgrading frr to 10.2 causes pimd crashes
|
||||
|
||||
* Fri Nov 22 2024 Michal Ruprich <mruprich@redhat.com> - 10.2-1
|
||||
- New version 10.2
|
||||
|
||||
* Tue Sep 10 2024 Michal Ruprich <mruprich@redhat.com> - 10.1-4
|
||||
- Resolves: #2311119 - Multiple AVCs for accessing lib_t in FRR-10.1
|
||||
- Resolves: #2311120 - AVCs for using a netlink socket in FRR
|
||||
|
||||
* Sun Aug 25 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 10.1-3
|
||||
- Rebuilt for abseil-cpp-20240722.0
|
||||
|
||||
* Thu Aug 15 2024 Michal Ruprich <mruprich@redhat.com> - 10.1-2
|
||||
- Rebuilding for the libre soname bump
|
||||
|
||||
* Mon Aug 12 2024 Michal Ruprich <mruprich@redhat.com> - 10.1-1
|
||||
- New version 10.1
|
||||
|
||||
* Wed Jul 31 2024 Michal Ruprich <mruprich@redhat.com> - 10.0.1-1
|
||||
- New version 10.0.1
|
||||
|
||||
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Wed Apr 17 2024 Michal Ruprich <mruprich@redhat.com> - 9.1-4
|
||||
- Moving yang modules to frr specific dir to avoid conflicts
|
||||
- Adding rpminspect.yaml
|
||||
|
||||
* Sat Feb 24 2024 Paul Wouters <paul.wouters@aiven.io> - 9.1-3
|
||||
- Rebuild for libre2.so.11 bump
|
||||
|
||||
* Sun Feb 04 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 9.1-2
|
||||
- Rebuilt for abseil-cpp-20240116.0
|
||||
|
||||
* Thu Jan 25 2024 Michal Ruprich <mruprich@redhat.com> - 9.1-1
|
||||
- New version 9.1
|
||||
|
||||
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Mon Oct 16 2023 Michal Ruprich <mruprich@redhat.com> - 9.0.1-1
|
||||
- New version 9.0.1
|
||||
|
||||
* Fri Sep 01 2023 Michal Ruprich <mruprich@redhat.com> - 8.5.2-4
|
||||
- Adding a couple of SELinux rules, includes fix for rhbz#2149299
|
||||
|
||||
* Wed Aug 30 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 8.5.2-3
|
||||
- Rebuilt for abseil-cpp 20230802.0
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.5.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Fri Jun 30 2023 Michal Ruprich <mruprich@redhat.com> - 8.5.2-1
|
||||
- New version 8.5.2
|
||||
- Fixing some rpmlint warnings
|
||||
|
||||
* Mon Jun 26 2023 Michal Ruprich <mruprich@redhat.com> - 8.5.1-4
|
||||
- Resolves: #2216073 - SELinux is preventing FRR-Zebra to access to network namespaces.
|
||||
|
||||
* Mon Jun 05 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 8.5.1-3
|
||||
- Disable grpc in RHEL builds
|
||||
|
||||
* Fri May 19 2023 Petr Pisar <ppisar@redhat.com> - 8.5.1-2
|
||||
- Rebuild against rpm-4.19 (https://fedoraproject.org/wiki/Changes/RPM-4.19)
|
||||
|
||||
* Wed Apr 26 2023 Michal Ruprich <mruprich@redhat.com> - 8.5.1-1
|
||||
- New version 8.5.1
|
||||
|
||||
* Wed Apr 12 2023 Michal Ruprich <mruprich@redhat.com> - 8.5-1
|
||||
- New version 8.5
|
||||
|
||||
* Thu Mar 23 2023 Michal Ruprich <mruprich@redhat.com> - 8.4.2-5
|
||||
- Rebuilding for new abseil-cpp version
|
||||
|
||||
* Wed Mar 22 2023 Michal Ruprich <mruprich@redhat.com> - 8.4.2-4
|
||||
- SPDX migration
|
||||
|
||||
* Wed Mar 08 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 8.4.2-3
|
||||
- Build as C++17, required by abseil-cpp 20230125
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Thu Jan 12 2023 Michal Ruprich <mruprich@redhat.com> - 8.4.2-1
|
||||
- New version 8.4.2
|
||||
|
||||
* Fri Nov 25 2022 Michal Ruprich <mruprich@redhat.com> - 8.4.1-1
|
||||
- New version 8.4.1
|
||||
- Fix for rhbz #2140705
|
||||
|
||||
* Thu Nov 10 2022 Michal Ruprich <mruprich@redhat.com> - 8.4-1
|
||||
- New version 8.4
|
||||
|
||||
* Fri Sep 16 2022 Michal Ruprich <mruprich@redhat.com> - 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 <mruprich@redhat.com> - 8.3.1-4
|
||||
- Fixing an error in post scriptlet
|
||||
|
||||
* Fri Sep 09 2022 Michal Ruprich <mruprich@redhat.com> - 8.3.1-3
|
||||
- Resolves: #2124254 - frr can no longer update routes
|
||||
|
||||
* Wed Sep 07 2022 Michal Ruprich <mruprich@redhat.com> - 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 <mruprich@redhat.com> - 8.3.1-1
|
||||
- New version 8.3.1
|
||||
|
||||
* Mon Aug 22 2022 Michal Ruprich <mruprich@redhat.com> - 8.2.2-10
|
||||
- Rebuilding for new abseil-cpp and grpc updates
|
||||
|
||||
* Wed Aug 10 2022 Michal Ruprich <mruprich@redhat.com> - 8.2.2-9
|
||||
- Adding vrrpd and pathd as daemons to the policy
|
||||
|
||||
* Wed Aug 10 2022 Michal Ruprich <mruprich@redhat.com> - 8.2.2-8
|
||||
- Finalizing SELinux policy
|
||||
|
||||
* Tue Aug 02 2022 Michal Ruprich <mruprich@redhat.com> - 8.2.2-7
|
||||
- Fixing wrong path for vtysh in frr.fc
|
||||
|
||||
* Fri Jul 29 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 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 <releng@fedoraproject.org> - 8.2.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Tue May 17 2022 Michal Ruprich <mruprich@redhat.com> - 8.2.2-3
|
||||
- Rebuild for grpc-1.46.1
|
||||
|
||||
* Mon Apr 11 2022 Michal Ruprich <mruprich@redhat.com> - 8.2.2-2
|
||||
- Fix for CVE-2022-16126
|
||||
|
||||
* Tue Mar 15 2022 Michal Ruprich <mruprich@redhat.com> - 8.2.2-1
|
||||
- New version 8.2.2
|
||||
|
||||
* Thu Mar 10 2022 Michal Ruprich <mruprich@redhat.com> - 8.2-2
|
||||
- Rebuild for abseil-cpp 20211102.0
|
||||
|
||||
* Wed Mar 09 2022 Michal Ruprich <mruprich@redhat.com> - 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 <mruprich@redhat.com> - 8.0.1-11
|
||||
- Rebuilding for FTBFS in Rawhide(rhbz#2045399)
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.1-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 8.0.1-9
|
||||
- Rebuilt for libre2.so.9
|
||||
|
||||
* Sat Nov 06 2021 Adrian Reber <adrian@lisas.de> - 8.0.1-8
|
||||
- Rebuilt for protobuf 3.19.0
|
||||
|
||||
* Mon Oct 25 2021 Adrian Reber <adrian@lisas.de> - 8.0.1-7
|
||||
- Rebuilt for protobuf 3.18.1
|
||||
|
||||
* Fri Oct 15 2021 Michal Ruprich <mruprich@redhat.com> - 8.0.1-6
|
||||
- Obsoleting quagga so that it may be retired
|
||||
|
||||
* Thu Oct 07 2021 Michal Ruprich <mruprich@redhat.com> - 8.0.1-5
|
||||
- Rebuilding for grpc 1.41
|
||||
|
||||
* Thu Sep 30 2021 Michal Ruprich <mruprich@redhat.com> - 8.0.1-4
|
||||
- Rebuild for new version of libyang
|
||||
|
||||
* Sat Sep 18 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 8.0.1-3
|
||||
- Rebuild for grpc 1.40
|
||||
|
||||
* Thu Sep 16 2021 Sahana Prasad <sahana@redhat.com> - 8.0.1-2
|
||||
- Rebuilt with OpenSSL 3.0.0
|
||||
|
||||
* Thu Sep 16 2021 Michal Ruprich <mruprich@redhat.com> - 8.0.1-1
|
||||
- New version 8.0.1
|
||||
|
||||
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 8.0-2
|
||||
- Rebuilt with OpenSSL 3.0.0
|
||||
|
||||
* Wed Aug 11 2021 Michal Ruprich <mruprich@redhat.com> - 8.0-1
|
||||
- New version 8.0
|
||||
|
||||
* Wed Aug 04 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 7.5.1-9
|
||||
- Rebuild for grpc 1.39
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.5.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Jul 20 2021 Michal Ruprich <mruprich@redhat.com> - 7.5.1-7
|
||||
- Resolves: #1983278 - ospfd crashes in route_node_delete with assertion fail
|
||||
|
||||
* Sat Jul 10 2021 Björn Esser <besser82@fedoraproject.org> - 7.5.1-6
|
||||
- Rebuild for versioned symbols in json-c
|
||||
|
||||
* Wed Jul 07 2021 Neal Gompa <ngompa@datto.com> - 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 <mruprich@redhat.com> - 7.5.1-4
|
||||
- Rebuild for newer abseil-cpp
|
||||
|
||||
* Tue May 11 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 7.5.1-3
|
||||
- Rebuild for grpc 1.37
|
||||
|
||||
* Fri Apr 23 2021 Michal Ruprich <mruprich@redhat.com> - 7.5.1-2
|
||||
- Fixing permissions on config files in /etc/frr
|
||||
- Enabling integrated configuration option for frr
|
||||
|
||||
* Fri Mar 12 2021 Michal Ruprich <mruprich@redhat.com> - 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 <zbyszek@in.waw.pl> - 7.5-4
|
||||
- Rebuilt for updated systemd-rpm-macros
|
||||
See https://pagure.io/fesco/issue/2583.
|
||||
|
||||
* Tue Feb 16 2021 Michal Ruprich <mruprich@redhat.com> - 7.5-3
|
||||
- Fixing FTBS - icc options are confusing the new gcc
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Jan 01 2021 Michal Ruprich <mruprich@redhat.com> - 7.5-1
|
||||
- New version 7.5
|
||||
|
||||
* Mon Sep 21 2020 Michal Ruprich <mruprich@redhat.com> - 7.4-1
|
||||
- New version 7.4
|
||||
|
||||
* Thu Aug 27 2020 Josef Řídký <jridky@redhat.com> - 7.3.1-4
|
||||
- Rebuilt for new net-snmp release
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Thu Jun 18 2020 Michal Ruprich <mruprich@redhat.com> - 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 <mruprich@redhat.com> - 7.3-6
|
||||
- Removing texi2html, it is not available in Rawhide anymore
|
||||
|
||||
* Mon May 18 2020 Michal Ruprich <mruprich@redhat.com> - 7.3-5
|
||||
- Rebuild for new version of libyang
|
||||
|
||||
* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 7.3-4
|
||||
- Rebuild (json-c)
|
||||
|
||||
* Mon Apr 13 2020 Björn Esser <besser82@fedoraproject.org> - 7.3-3
|
||||
- Update json-c-0.14 patch with a solution from upstream
|
||||
|
||||
* Mon Apr 13 2020 Björn Esser <besser82@fedoraproject.org> - 7.3-2
|
||||
- Add support for upcoming json-c 0.14.0
|
||||
|
||||
* Wed Feb 19 2020 Michal Ruprich <mruprich@redhat.com> - 7.3-1
|
||||
- New version 7.3
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Mon Dec 16 2019 Michal Ruprich <mruprich@redhat.com> - 7.2-1
|
||||
- New version 7.2
|
||||
|
||||
* Tue Nov 12 2019 Michal Ruprich <mruprich@redhat.com> - 7.1-5
|
||||
- Rebuilding for new version of libyang
|
||||
|
||||
* Mon Oct 07 2019 Michal Ruprich <mruprich@redhat.com> - 7.1-4
|
||||
- Adding noreplace to the /etc/frr/daemons file
|
||||
|
||||
* Fri Sep 13 2019 Michal Ruprich <mruprich@redhat.com> - 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 <releng@fedoraproject.org> - 7.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
@@ -179,4 +574,3 @@ make check PYTHON=%{__python3}
|
||||
|
||||
* Wed Jun 19 2019 Michal Ruprich <mruprich@redhat.com> - 7.0-2
|
||||
- Initial build
|
||||
|
||||
|
||||
139
frr.te
Normal file
139
frr.te
Normal file
@@ -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)
|
||||
# general reserved port for pimd
|
||||
corenet_tcp_bind_reserved_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")
|
||||
')
|
||||
16
gating.yaml
Normal file
16
gating.yaml
Normal file
@@ -0,0 +1,16 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_contexts: [bodhi_update_push_testing]
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||
|
||||
#gating rawhide
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_contexts: [bodhi_update_push_stable]
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||
6
plans/all.fmf
Normal file
6
plans/all.fmf
Normal file
@@ -0,0 +1,6 @@
|
||||
summary: Test plan with all Fedora tests
|
||||
discover:
|
||||
how: fmf
|
||||
url: https://src.fedoraproject.org/tests/frr.git
|
||||
execute:
|
||||
how: tmt
|
||||
7
rpminspect.yaml
Normal file
7
rpminspect.yaml
Normal file
@@ -0,0 +1,7 @@
|
||||
---
|
||||
runpath:
|
||||
allowed_paths:
|
||||
- /usr/lib64/frr
|
||||
- /usr/lib/frr
|
||||
inspections:
|
||||
badfuncs: off
|
||||
3
sources
3
sources
@@ -1 +1,2 @@
|
||||
SHA512 (frr-7.1.tar.gz) = ee0be872a96737e45dd841b936f66c394db2bcd857c28437dfeeeabf70cf420e69212b4b744569cc1c9f6038e7ca66211c6294ec2e94855ed8131833985e32b0
|
||||
SHA512 (frr-10.2.tar.gz) = 40a0e1f1a7f2cc137aac6e838b2f865b93fdc1cd6bd0f6c5b15b4507cbff87cb60092682e45aca68633cb053fb2ce663386edb78e5d3c5f890f4666e871ab8c5
|
||||
SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d
|
||||
|
||||
Reference in New Issue
Block a user