diff --git a/0000-remove-babeld-and-ldpd.patch b/0000-remove-babeld-and-ldpd.patch
index cc19cc4..490cddc 100644
--- a/0000-remove-babeld-and-ldpd.patch
+++ b/0000-remove-babeld-and-ldpd.patch
@@ -1,8 +1,8 @@
 diff --git a/Makefile.am b/Makefile.am
-index 5be3264..33abc1d 100644
+index ce0f70a1a..209f4cbcc 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -130,8 +130,6 @@ include ospf6d/subdir.am
+@@ -180,8 +180,6 @@ include ospf6d/subdir.am
  include ospfclient/subdir.am
  include isisd/subdir.am
  include nhrpd/subdir.am
@@ -11,7 +11,7 @@ index 5be3264..33abc1d 100644
  include eigrpd/subdir.am
  include sharpd/subdir.am
  include pimd/subdir.am
-@@ -182,7 +180,6 @@ EXTRA_DIST += \
+@@ -243,7 +241,6 @@ EXTRA_DIST += \
  	snapcraft/defaults \
  	snapcraft/helpers \
  	snapcraft/snap \
@@ -19,7 +19,7 @@ index 5be3264..33abc1d 100644
  	bgpd/Makefile \
  	bgpd/rfp-example/librfp/Makefile \
  	bgpd/rfp-example/rfptest/Makefile \
-@@ -193,7 +190,6 @@ EXTRA_DIST += \
+@@ -255,7 +252,6 @@ EXTRA_DIST += \
  	fpm/Makefile \
  	grpc/Makefile \
  	isisd/Makefile \
diff --git a/0001-use-python3.patch b/0001-use-python3.patch
deleted file mode 100644
index ce0359e..0000000
--- a/0001-use-python3.patch
+++ /dev/null
@@ -1,20 +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.
- #
-diff --git a/tools/generate_support_bundle.py b/tools/generate_support_bundle.py
-index 540b7a1..0876ebb 100755
---- a/tools/generate_support_bundle.py
-+++ b/tools/generate_support_bundle.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
- 
- ########################################################
- ### Python Script to generate the FRR support bundle ###
diff --git a/0002-enable-openssl.patch b/0002-enable-openssl.patch
index 3e3baab..1ebeb07 100644
--- a/0002-enable-openssl.patch
+++ b/0002-enable-openssl.patch
@@ -1,41 +1,5 @@
-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/mlag.c \
- 	lib/module.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/linklist.h \
- 	lib/log.h \
- 	lib/log_vty.h \
--	lib/md5.h \
- 	lib/memory.h \
- 	lib/module.h \
- 	lib/monotime.h \
-@@ -191,7 +190,6 @@ pkginclude_HEADERS += \
- 	lib/routemap.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
+index e3de6f08c..378f6960d 100644
 --- a/isisd/isis_lsp.c
 +++ b/isisd/isis_lsp.c
 @@ -35,7 +35,9 @@
@@ -49,7 +13,7 @@ index 1991666..2e4fe55 100644
  #include "srcdest_table.h"
  #include "lib_errors.h"
 diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c
-index 9c63311..7cf594c 100644
+index 7256fcbbc..43e123b03 100644
 --- a/isisd/isis_pdu.c
 +++ b/isisd/isis_pdu.c
 @@ -33,7 +33,9 @@
@@ -63,10 +27,10 @@ index 9c63311..7cf594c 100644
  
  #include "isisd/isis_constants.h"
 diff --git a/isisd/isis_te.c b/isisd/isis_te.c
-index 4ea6c2c..72ff0d2 100644
+index 8daa2b36b..fdb2bb92a 100644
 --- a/isisd/isis_te.c
 +++ b/isisd/isis_te.c
-@@ -38,7 +38,9 @@
+@@ -39,7 +39,9 @@
  #include "if.h"
  #include "vrf.h"
  #include "checksum.h"
@@ -76,3 +40,39 @@ index 4ea6c2c..72ff0d2 100644
  #include "sockunion.h"
  #include "network.h"
  #include "sbuf.h"
+diff --git a/lib/subdir.am b/lib/subdir.am
+index dab5fb9e8..924b7eccf 100644
+--- a/lib/subdir.am
++++ b/lib/subdir.am
+@@ -53,7 +53,6 @@ lib_libfrr_la_SOURCES = \
+ 	lib/log.c \
+ 	lib/log_filter.c \
+ 	lib/log_vty.c \
+-	lib/md5.c \
+ 	lib/memory.c \
+ 	lib/mlag.c \
+ 	lib/module.c \
+@@ -82,7 +81,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 \
+@@ -220,7 +218,6 @@ pkginclude_HEADERS += \
+ 	lib/link_state.h \
+ 	lib/log.h \
+ 	lib/log_vty.h \
+-	lib/md5.h \
+ 	lib/memory.h \
+ 	lib/module.h \
+ 	lib/monotime.h \
+@@ -250,7 +247,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/0003-disable-eigrp-crypto.patch b/0003-disable-eigrp-crypto.patch
index cd43569..0c44aa8 100644
--- a/0003-disable-eigrp-crypto.patch
+++ b/0003-disable-eigrp-crypto.patch
@@ -1,224 +1,5 @@
-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
+index 533d7de2c..bef214cb0 100644
 --- a/eigrpd/eigrp_cli.c
 +++ b/eigrpd/eigrp_cli.c
 @@ -25,6 +25,7 @@
@@ -229,7 +10,7 @@ index a93d4c8..b01e121 100644
  
  #include "eigrp_structs.h"
  #include "eigrpd.h"
-@@ -726,6 +726,20 @@ DEFPY(
+@@ -728,6 +729,20 @@ DEFPY_YANG(
  	"Keyed message digest\n"
  	"HMAC SHA256 algorithm \n")
  {
@@ -250,3 +31,222 @@ index a93d4c8..b01e121 100644
  	char xpath[XPATH_MAXLEN], xpath_auth[XPATH_MAXLEN + 64];
  
  	snprintf(xpath, sizeof(xpath), "./frr-eigrpd:eigrp/instance[asn='%s']",
+diff --git a/eigrpd/eigrp_filter.c b/eigrpd/eigrp_filter.c
+index 8f80b78d2..6aeeff78e 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 e3680b31a..56ea9d0e9 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_packet.c b/eigrpd/eigrp_packet.c
+index 39e384c12..972e6320a 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"
+@@ -103,8 +105,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;
+@@ -127,6 +133,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);
+ 
+@@ -154,7 +163,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);
+ 
+@@ -170,7 +179,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;
+@@ -211,6 +223,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);
+ 
+@@ -238,6 +253,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) {
+@@ -262,7 +278,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;
+@@ -291,6 +311,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));
+@@ -299,7 +322,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_query.c b/eigrpd/eigrp_query.c
+index c8769fb11..cd31fa839 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 015daa768..ebf33e04e 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 9c2a8c9d8..d1d50a617 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 2d298c20b..556fb3f3e 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 9ada292fe..1d0637019 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 0dc509706..cbabe3a3c 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/0004-fips-mode.patch b/0004-fips-mode.patch
index e8efeb7..90ec83c 100644
--- a/0004-fips-mode.patch
+++ b/0004-fips-mode.patch
@@ -1,8 +1,38 @@
+diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
+index 6f4a91be6..59b4826c8 100644
+--- a/isisd/isis_circuit.c
++++ b/isisd/isis_circuit.c
+@@ -1409,6 +1409,10 @@ ferr_r 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 65764654e..65ed945b8 100644
+--- a/isisd/isisd.c
++++ b/isisd/isisd.c
+@@ -2493,6 +2493,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/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
-index 631465f..e084ff3 100644
+index f998f2e5f..58f831ea1 100644
 --- a/ospfd/ospf_vty.c
 +++ b/ospfd/ospf_vty.c
-@@ -1136,6 +1136,11 @@ DEFUN (ospf_area_vlink,
+@@ -1106,6 +1106,11 @@ DEFUN (ospf_area_vlink,
  
  	if (argv_find(argv, argc, "message-digest", &idx)) {
  		/* authentication message-digest */
@@ -14,7 +44,7 @@ index 631465f..e084ff3 100644
  		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,
+@@ -2019,6 +2024,15 @@ DEFUN (ospf_area_authentication_message_digest,
  				  ? OSPF_AUTH_NULL
  				  : OSPF_AUTH_CRYPTOGRAPHIC;
  
@@ -30,7 +60,7 @@ index 631465f..e084ff3 100644
  	return CMD_SUCCESS;
  }
  
-@@ -6665,6 +6679,11 @@ DEFUN (ip_ospf_authentication_args,
+@@ -7553,6 +7567,11 @@ DEFUN (ip_ospf_authentication_args,
  
  	/* Handle message-digest authentication */
  	if (argv[idx_encryption]->arg[0] == 'm') {
@@ -42,7 +72,7 @@ index 631465f..e084ff3 100644
  		SET_IF_PARAM(params, auth_type);
  		params->auth_type = OSPF_AUTH_CRYPTOGRAPHIC;
  		return CMD_SUCCESS;
-@@ -6971,6 +6990,11 @@ DEFUN (ip_ospf_message_digest_key,
+@@ -7859,6 +7878,11 @@ DEFUN (ip_ospf_message_digest_key,
         "The OSPF password (key)\n"
         "Address of interface\n")
  {
@@ -54,41 +84,11 @@ index 631465f..e084ff3 100644
  	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
-@@ -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
-@@ -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
+index 8a3ce24f5..04cc0968a 100644
 --- a/ripd/rip_cli.c
 +++ b/ripd/rip_cli.c
-@@ -796,6 +796,12 @@ DEFPY (ip_rip_authentication_mode,
+@@ -827,6 +827,12 @@ DEFPY_YANG (ip_rip_authentication_mode,
  			value = "20";
  	}
  
diff --git a/0005-icc-options.patch b/0005-icc-options.patch
deleted file mode 100644
index ec743d5..0000000
--- a/0005-icc-options.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 4e90d19ea3de6b8938d097d84f6df3fcf6eb0422 Mon Sep 17 00:00:00 2001
-From: Mark Stapp <mjs@voltanet.io>
-Date: Mon, 15 Feb 2021 13:59:02 -0500
-Subject: [PATCH] build: detect ICC, only try ICC options if ICC
-
-Some ICC command-line options can cause confusion for other
-compilers; test for ICC specifically, and only try to use those
-options if ICC is being used.
-
-Signed-off-by: Mark Stapp <mjs@voltanet.io>
----
- configure.ac | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 266f37a1129..f3d1f38986a 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -191,6 +191,11 @@ CXXFLAGS="$orig_cxxflags"
- AC_PROG_CC_C99
- dnl NB: see C11 below
- 
-+dnl Some special handling for ICC later on
-+if test "$CC" = "icc"; then
-+    cc_is_icc="yes"
-+fi
-+
- PKG_PROG_PKG_CONFIG
- 
- dnl it's 2019, sed is sed.
-@@ -252,7 +257,9 @@ AC_DEFUN([AC_LINK_IFELSE_FLAGS], [{
- 
- dnl ICC won't bail on unknown options without -diag-error 10006
- dnl need to do this first so we get useful results for the other options
--AC_C_FLAG([-diag-error 10006])
-+if test "$cc_is_icc" = "yes"; then
-+    AC_C_FLAG([-diag-error 10006])
-+fi
- 
- dnl AC_PROG_CC_C99 may change CC to include -std=gnu99 or something
- ac_cc="$CC"
-@@ -335,7 +342,9 @@ AC_SUBST([CXX_COMPAT_CFLAGS])
- dnl ICC emits a broken warning for const char *x = a ? "b" : "c";
- dnl for some reason the string consts get 'promoted' to char *,
- dnl triggering a const to non-const conversion warning.
--AC_C_FLAG([-diag-disable 3179])
-+if test "$cc_is_icc" = "yes"; then
-+    AC_C_FLAG([-diag-disable 3179])
-+fi
- 
- if test "$enable_werror" = "yes" ; then
-   WERROR="-Werror"
diff --git a/0007-ospfd-crash.patch b/0007-ospfd-crash.patch
deleted file mode 100644
index 2eceab9..0000000
--- a/0007-ospfd-crash.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 4f08c715db6893ff439d0a39bf4506cd26256d13 Mon Sep 17 00:00:00 2001
-From: Igor Ryzhov <iryzhov@nfware.com>
-Date: Fri, 18 Jun 2021 13:06:13 +0300
-Subject: [PATCH] lib: remove pure attribute from functions that modify memory
-
-Almost all functions currently marked with pure attribute acquire a
-route_node lock. By marking them pure we allow compiler to optimize the
-code and not call them when it already knows the return value. This is
-completely incorrect.
-
-Only two of eleven functions can be marked as pure. And they still won't
-be optimized because they are never called from the same function twice.
-Let's remove the ext_pure macro completely to reduce the chance of
-repeating this mistake in the future.
-
-Fixes #8866, #8809, #8595, #6992.
-
-Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
----
- lib/compiler.h |  9 ---------
- lib/table.h    | 44 ++++++++++++++++++++------------------------
- 2 files changed, 20 insertions(+), 33 deletions(-)
-
-diff --git a/lib/compiler.h b/lib/compiler.h
-index bbfe01b569c..e805eb8be48 100644
---- a/lib/compiler.h
-+++ b/lib/compiler.h
-@@ -123,15 +123,6 @@ extern "C" {
- #define assume(x)
- #endif
- 
--/* pure = function does not modify memory & return value is the same if
-- * memory hasn't changed (=> allows compiler to optimize)
-- *
-- * Mostly autodetected by the compiler if function body is available (i.e.
-- * static inline functions in headers).  Since that implies it should only be
-- * used in headers for non-inline functions, the "extern" is included here.
-- */
--#define ext_pure	extern __attribute__((pure))
--
- /* for helper functions defined inside macros */
- #define macro_inline	static inline __attribute__((unused))
- #define macro_pure	static inline __attribute__((unused, pure))
-diff --git a/lib/table.h b/lib/table.h
-index 7e383dce808..5dec69ee7ea 100644
---- a/lib/table.h
-+++ b/lib/table.h
-@@ -197,29 +197,25 @@ static inline void route_table_set_info(struct route_table *table, void *d)
- 	table->info = d;
- }
- 
--/* ext_pure => extern __attribute__((pure))
-- *   does not modify memory (but depends on mem), allows compiler to optimize
-- */
--
- extern void route_table_finish(struct route_table *table);
--ext_pure struct route_node *route_top(struct route_table *table);
--ext_pure struct route_node *route_next(struct route_node *node);
--ext_pure struct route_node *route_next_until(struct route_node *node,
--					     const struct route_node *limit);
-+extern struct route_node *route_top(struct route_table *table);
-+extern struct route_node *route_next(struct route_node *node);
-+extern struct route_node *route_next_until(struct route_node *node,
-+					   const struct route_node *limit);
- extern struct route_node *route_node_get(struct route_table *table,
- 					 union prefixconstptr pu);
--ext_pure struct route_node *route_node_lookup(struct route_table *table,
--					      union prefixconstptr pu);
--ext_pure struct route_node *route_node_lookup_maynull(struct route_table *table,
--						      union prefixconstptr pu);
--ext_pure struct route_node *route_node_match(struct route_table *table,
--					     union prefixconstptr pu);
--ext_pure struct route_node *route_node_match_ipv4(struct route_table *table,
--						  const struct in_addr *addr);
--ext_pure struct route_node *route_node_match_ipv6(struct route_table *table,
--						  const struct in6_addr *addr);
--
--ext_pure unsigned long route_table_count(struct route_table *table);
-+extern struct route_node *route_node_lookup(struct route_table *table,
-+					    union prefixconstptr pu);
-+extern struct route_node *route_node_lookup_maynull(struct route_table *table,
-+						    union prefixconstptr pu);
-+extern struct route_node *route_node_match(struct route_table *table,
-+					   union prefixconstptr pu);
-+extern struct route_node *route_node_match_ipv4(struct route_table *table,
-+						const struct in_addr *addr);
-+extern struct route_node *route_node_match_ipv6(struct route_table *table,
-+						const struct in6_addr *addr);
-+
-+extern unsigned long route_table_count(struct route_table *table);
- 
- extern struct route_node *route_node_create(route_table_delegate_t *delegate,
- 					    struct route_table *table);
-@@ -228,10 +224,10 @@ extern void route_node_destroy(route_table_delegate_t *delegate,
- 			       struct route_table *table,
- 			       struct route_node *node);
- 
--ext_pure struct route_node *route_table_get_next(struct route_table *table,
--						 union prefixconstptr pu);
--ext_pure int route_table_prefix_iter_cmp(const struct prefix *p1,
--					 const struct prefix *p2);
-+extern struct route_node *route_table_get_next(struct route_table *table,
-+					       union prefixconstptr pu);
-+extern int route_table_prefix_iter_cmp(const struct prefix *p1,
-+				       const struct prefix *p2);
- 
- /*
-  * Iterator functions.
diff --git a/frr-8.1.tar.xz b/frr-8.1.tar.xz
new file mode 100644
index 0000000..7d4a20a
Binary files /dev/null and b/frr-8.1.tar.xz differ
diff --git a/frr.spec b/frr.spec
index e4afeb0..7a230c2 100644
--- a/frr.spec
+++ b/frr.spec
@@ -1,16 +1,18 @@
-%global frrversion	7.5.1
+%global imsversion .ims.1
+%global frrversion	8.1
 %global frr_libdir /usr/libexec/frr
+# % global checkout dev
 
 %global _hardened_build 1
 %define _legacy_common_support 1
 
 Name: frr
-Version: 7.5.1
-Release: 3%{?checkout}%{?dist}
+Version: 8.1.0
+Release: 2%{?imsversion}%{?dist}
 Summary: Routing daemon
 License: GPLv2+
 URL: http://www.frrouting.org
-Source0: https://github.com/FRRouting/frr/releases/download/%{name}-%{frrversion}/%{name}-%{frrversion}.tar.gz
+Source0: https://github.com/FRRouting/frr/releases/download/%{name}-%{frrversion}/%{name}-%{frrversion}%{?checkout:-%{checkout}}.tar.xz
 Source1: %{name}-tmpfiles.conf
 BuildRequires: perl-generators
 BuildRequires: gcc
@@ -41,7 +43,7 @@ BuildRequires: readline
 BuildRequires: git-core
 BuildRequires: json-c-devel
 BuildRequires: systemd
-BuildRequires: libyang-devel >= 0.16.74
+BuildRequires: libyang2-devel >= 2.0.0
 BuildRequires: make
 Requires: net-snmp ncurses
 Requires(post): systemd /sbin/install-info hostname
@@ -51,13 +53,10 @@ Provides: routingdaemon = %{version}-%{release}
 Conflicts: quagga
 
 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-icc-options.patch
-Patch0006: 0006-move-to-libexec.patch
-Patch0007: 0007-ospfd-crash.patch
+# Patch0006: 0006-move-to-libexec.patch
 
 %description
 FRRouting is free software that manages TCP/IP based routing protocols. It takes
@@ -69,7 +68,7 @@ FRRouting supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, NHRP, PBR, EIGRP
 FRRouting is a fork of Quagga.
 
 %prep
-%autosetup -S git
+%autosetup -S git -n %{name}-%{frrversion}%{?checkout:-%{checkout}}
 
 %build
 autoreconf -ivf
@@ -120,14 +119,15 @@ mkdir -p %{buildroot}%{_tmpfilesdir}
 rm -rf %{buildroot}/usr/share/info/dir
 
 install -p -m 644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf
-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 %{_builddir}/%{name}-%{frrversion}%{?checkout:-%{checkout}}/tools/frr.service %{buildroot}%{_unitdir}/frr.service
+install -p -m 644 %{_builddir}/%{name}-%{frrversion}%{?checkout:-%{checkout}}/tools/frr@.service %{buildroot}%{_unitdir}/frr@.service
+install -p -m 755 %{_builddir}/%{name}-%{frrversion}%{?checkout:-%{checkout}}/tools/frrinit.sh %{buildroot}%{frr_libdir}/frr
+install -p -m 755 %{_builddir}/%{name}-%{frrversion}%{?checkout:-%{checkout}}/tools/frrcommon.sh %{buildroot}%{frr_libdir}/frrcommon.sh
+install -p -m 755 %{_builddir}/%{name}-%{frrversion}%{?checkout:-%{checkout}}/tools/watchfrr.sh %{buildroot}%{frr_libdir}/watchfrr.sh
+install -p -m 644 %{_builddir}/%{name}-%{frrversion}%{?checkout:-%{checkout}}/tools/etc/frr/daemons %{buildroot}%{_sysconfdir}/frr/daemons
 
-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 %{_builddir}/%{name}-%{frrversion}%{?checkout:-%{checkout}}/redhat/frr.logrotate %{buildroot}/etc/logrotate.d/frr
+install -p -m 644 %{_builddir}/%{name}-%{frrversion}%{?checkout:-%{checkout}}/redhat/frr.pam %{buildroot}/etc/pam.d/frr
 install -d -m 775 %{buildroot}/run/frr
 
 rm %{buildroot}%{_libdir}/frr/*.la
@@ -146,6 +146,7 @@ usermod -aG frrvty frr
 
 %post
 %systemd_post frr.service
+%systemd_post frr@.service
 
 if [ -f %{_infodir}/%{name}.inf* ]; then
     install-info %{_infodir}/frr.info %{_infodir}/dir || :
@@ -168,9 +169,11 @@ fi
 
 %postun
 %systemd_postun_with_restart frr.service
+%systemd_postun_with_restart frr@.service
 
 %preun
 %systemd_preun frr.service
+%systemd_preun frr@.service
 
 #only when removing frr
 if [ $1 -eq 0 ]; then
@@ -185,14 +188,6 @@ make 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(750,frr,frr) %{_sysconfdir}/frr
 %dir %attr(755,frr,frr) /var/log/frr