frr: upgrade to 9.1 (#8884)
This commit is contained in:
Andrew Phelps
GitHub
Родитель
c117ccd6d2
Коммит
fec8708f5c
|
|
@ -16,9 +16,9 @@ index 5be3264..33abc1d 100644
|
|||
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 \
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ index 0b7af18..0533e24 100644
|
|||
lib/log_vty.c \
|
||||
- lib/md5.c \
|
||||
lib/memory.c \
|
||||
lib/mlag.c \
|
||||
lib/module.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 \
|
||||
|
|
@ -24,8 +24,8 @@ index 0b7af18..0533e24 100644
|
|||
lib/log_vty.h \
|
||||
- lib/md5.h \
|
||||
lib/memory.h \
|
||||
lib/module.h \
|
||||
lib/monotime.h \
|
||||
lib/mgmt.pb-c.h \
|
||||
lib/mgmt_be_client.h \
|
||||
@@ -191,7 +190,6 @@ pkginclude_HEADERS += \
|
||||
lib/route_opaque.h \
|
||||
lib/sbuf.h \
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ index 631465f..e084ff3 100644
|
|||
--- a/ospfd/ospf_vty.c
|
||||
+++ b/ospfd/ospf_vty.c
|
||||
@@ -1136,6 +1136,11 @@ DEFUN (ospf_area_vlink,
|
||||
|
||||
if (argv_find(argv, argc, "message-digest", &idx)) {
|
||||
vl_config.keychain = argv[idx+1]->arg;
|
||||
} else if (argv_find(argv, argc, "message-digest", &idx)) {
|
||||
/* authentication message-digest */
|
||||
+ if(FIPS_mode())
|
||||
+ {
|
||||
|
|
@ -41,7 +41,7 @@ index 631465f..e084ff3 100644
|
|||
+ }
|
||||
SET_IF_PARAM(params, auth_type);
|
||||
params->auth_type = OSPF_AUTH_CRYPTOGRAPHIC;
|
||||
return CMD_SUCCESS;
|
||||
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")
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ index 7b5eaa4..5c82f69 100644
|
|||
--- a/tests/lib/subdir.am
|
||||
+++ b/tests/lib/subdir.am
|
||||
@@ -18,18 +18,6 @@ tests_lib_test_frrscript_SOURCES = tests/lib/test_frrscript.c
|
||||
EXTRA_DIST += tests/lib/test_frrscript.py
|
||||
|
||||
test -e tests/lib/script1.lua || \
|
||||
$(INSTALL_SCRIPT) $< tests/lib/script1.lua
|
||||
|
||||
-##############################################################################
|
||||
-GRPC_TESTS_LDADD = staticd/libstatic.a grpc/libfrrgrpc_pb.la -lgrpc++ -lprotobuf $(ALL_TESTS_LDADD) $(LIBYANG_LIBS) -lm
|
||||
|
|
|
|||
|
|
@ -0,0 +1,48 @@
|
|||
From 8e29a10b39a649d751870eb1fd1b8c388e66acc3 Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Mon, 31 Jul 2023 09:41:27 +0200
|
||||
Subject: [PATCH 08/35] 0008-Add-FIPS_mode-compatibility-macro.patch
|
||||
|
||||
Patch-name: 0008-Add-FIPS_mode-compatibility-macro.patch
|
||||
Patch-id: 8
|
||||
Patch-status: |
|
||||
# Add FIPS_mode() compatibility macro
|
||||
From-dist-git-commit: 9409bc7044cf4b5773639cce20f51399888c45fd
|
||||
---
|
||||
include/openssl/fips.h | 26 ++++++++++++++++++++++++++
|
||||
test/property_test.c | 14 ++++++++++++++
|
||||
2 files changed, 40 insertions(+)
|
||||
create mode 100644 include/openssl/fips.h
|
||||
|
||||
diff --git a/include/openssl/fips.h b/include/openssl/fips.h
|
||||
new file mode 100644
|
||||
index 0000000000..4162cbf88e
|
||||
--- /dev/null
|
||||
+++ b/include/openssl/fips.h
|
||||
@@ -0,0 +1,26 @@
|
||||
+/*
|
||||
+ * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
|
||||
+ *
|
||||
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
|
||||
+ * this file except in compliance with the License. You can obtain a copy
|
||||
+ * in the file LICENSE in the source distribution or at
|
||||
+ * https://www.openssl.org/source/license.html
|
||||
+ */
|
||||
+
|
||||
+#ifndef OPENSSL_FIPS_H
|
||||
+# define OPENSSL_FIPS_H
|
||||
+# pragma once
|
||||
+
|
||||
+# include <openssl/evp.h>
|
||||
+# include <openssl/macros.h>
|
||||
+
|
||||
+# ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+# endif
|
||||
+
|
||||
+# define FIPS_mode() EVP_default_properties_is_fips_enabled(NULL)
|
||||
+
|
||||
+# ifdef __cplusplus
|
||||
+}
|
||||
+# endif
|
||||
+#endif
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"frr-8.5.3.tar.gz": "5f0d9e47e2621ad01307764df8a228ed0a4ae18f58e8912d638cb8db2c072d78",
|
||||
"frr-9.1.tar.gz": "c4516fa3ef4286c665af809cfbe3a6e7e24a254a7bfb7247e1f7744dcd3bd5da",
|
||||
"frr-sysusers.conf": "c6f5a54402aa5f11e21dac3bd0e6cdeadfbf7937e9b34775b5fd368a9ca96fa4",
|
||||
"frr-tmpfiles.conf": "edd7b01b11f2be66bb6b4531496d1eaf6536add9f4b549c659b27f5a32cdc512"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
Summary: Routing daemon
|
||||
Name: frr
|
||||
Version: 8.5.3
|
||||
Release: 2%{?dist}
|
||||
Version: 9.1
|
||||
Release: 1%{?dist}
|
||||
License: GPL-2.0-or-later
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Azure Linux
|
||||
|
|
@ -16,6 +16,8 @@ Patch1: 0001-enable-openssl.patch
|
|||
Patch2: 0002-disable-eigrp-crypto.patch
|
||||
Patch3: 0003-fips-mode.patch
|
||||
Patch4: 0004-remove-grpc-test.patch
|
||||
Patch5: 0008-Add-FIPS_mode-compatibility-macro.patch
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: bison
|
||||
|
|
@ -24,8 +26,6 @@ BuildRequires: flex
|
|||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: groff
|
||||
BuildRequires: grpc-devel
|
||||
BuildRequires: grpc-plugins
|
||||
BuildRequires: json-c-devel
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: libtool
|
||||
|
|
@ -38,6 +38,7 @@ BuildRequires: pam-devel
|
|||
BuildRequires: patch
|
||||
BuildRequires: perl-XML-LibXML
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: protobuf-c-devel
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-sphinx
|
||||
BuildRequires: re2-devel
|
||||
|
|
@ -69,6 +70,8 @@ FRRouting is a fork of Quagga.
|
|||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-%{name}-%{version}
|
||||
# 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
|
||||
|
|
@ -95,8 +98,7 @@ autoreconf -ivf
|
|||
--disable-babeld \
|
||||
--with-moduledir=%{_libdir}/frr/modules \
|
||||
--with-crypto=openssl \
|
||||
--enable-fpm \
|
||||
--enable-grpc
|
||||
--enable-fpm
|
||||
|
||||
%make_build MAKEINFO="makeinfo --no-split" PYTHON=python3
|
||||
|
||||
|
|
@ -163,7 +165,7 @@ fi
|
|||
%systemd_preun frr.service
|
||||
|
||||
%check
|
||||
%{python3} -m pip install atomicwrites attrs docutils pluggy pygments six more-itertools
|
||||
%{python3} -m pip install atomicwrites attrs docutils pluggy pygments six more-itertools iniconfig
|
||||
#this should be temporary, the grpc test is just badly designed
|
||||
rm tests/lib/*grpc*
|
||||
%make_build check PYTHON=python3
|
||||
|
|
@ -197,6 +199,10 @@ rm tests/lib/*grpc*
|
|||
%{_sysusersdir}/%{name}.conf
|
||||
|
||||
%changelog
|
||||
* Tue Apr 23 2024 Andrew Phelps <anphel@microsoft.com> - 9.1-1
|
||||
- Upgrade to version 9.1
|
||||
- Remove `--enable-grpc`
|
||||
|
||||
* Wed Sep 20 2023 Jon Slobodzian <joslobo@microsoft.com> - 8.5.3-2
|
||||
- Recompile with stack-protection fixed gcc version (CVE-2023-4039)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"libyang-2.1.111.tar.gz": "3e52b922fcf371933ad7de1686ad83504e3358236e7817b5af795b0db52fa221"
|
||||
"libyang-2.1.148.tar.gz": "77a0aaaeb3df720aeb70d6896e32e2c2be099d48df73e3cfb52567051af3e44b"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
Summary: YANG data modeling language library
|
||||
Name: libyang
|
||||
Version: 2.1.111
|
||||
Version: 2.1.148
|
||||
Release: 1%{?dist}
|
||||
License: BSD
|
||||
Vendor: Microsoft Corporation
|
||||
|
|
@ -91,6 +91,9 @@ cp -a doc/html %{buildroot}/%{_docdir}/libyang/html
|
|||
%{_docdir}/libyang
|
||||
|
||||
%changelog
|
||||
* Tue Apr 23 2024 Andrew Phelps <anphel@microsoft.com> - 2.1.148-1
|
||||
- Upgrade to version 2.1.148
|
||||
|
||||
* Fri Oct 27 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.1.111-1
|
||||
- Auto-upgrade to 2.1.111 - Azure Linux 3.0 - package upgrades
|
||||
|
||||
|
|
|
|||
|
|
@ -3910,8 +3910,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "frr",
|
||||
"version": "8.5.3",
|
||||
"downloadUrl": "https://github.com/FRRouting/frr/archive/refs/tags/frr-8.5.3.tar.gz"
|
||||
"version": "9.1",
|
||||
"downloadUrl": "https://github.com/FRRouting/frr/archive/refs/tags/frr-9.1.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -11971,8 +11971,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "libyang",
|
||||
"version": "2.1.111",
|
||||
"downloadUrl": "https://github.com/CESNET/libyang/archive/refs/tags/v2.1.111.tar.gz"
|
||||
"version": "2.1.148",
|
||||
"downloadUrl": "https://github.com/CESNET/libyang/archive/refs/tags/v2.1.148.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче