diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | redhat/frr.spec.in | 2 | ||||
| -rw-r--r-- | snapcraft/snapcraft.yaml.in | 10 |
4 files changed, 10 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 0a6bdd1d73..36058c1db5 100644 --- a/configure.ac +++ b/configure.ac @@ -1600,7 +1600,7 @@ AC_CHECK_HEADER([net/if_media.h], ]) AC_CHECK_MEMBERS([struct ifmediareq.ifm_status], AC_DEFINE([HAVE_BSD_LINK_DETECT], [1], [BSD link-detect]), - [], LINK_DETECT_INCLUDES)], + [], LINK_DETECT_INCLUDES)], [], FRR_INCLUDES) @@ -1616,7 +1616,7 @@ dnl ------------------------ dnl TCP_MD5SIG socket option dnl ------------------------ -AC_CHECK_HEADER([netinet/tcp.h], +AC_CHECK_HEADER([netinet/tcp.h], [m4_define([MD5_INCLUDES], FRR_INCLUDES [#include <netinet/tcp.h> @@ -2040,7 +2040,7 @@ dnl ------------------------------------ dnl Enable RPKI and add librtr to libs dnl ------------------------------------ if test "$enable_rpki" = "yes"; then - PKG_CHECK_MODULES([RTRLIB], [rtrlib >= 0.5.0], + PKG_CHECK_MODULES([RTRLIB], [rtrlib >= 0.8.0], [RPKI=true], [RPKI=false AC_MSG_ERROR([rtrlib was not found on your system or is too old.])] diff --git a/debian/control b/debian/control index 2bc144e798..7c90979a22 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: bison, libpcre2-dev, libpython3-dev, libreadline-dev, - librtr-dev <!pkg.frr.nortrlib>, + librtr-dev (>= 0.8.0) <!pkg.frr.nortrlib>, libsnmp-dev, libssh-dev <!pkg.frr.nortrlib>, libyang2-dev, diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index 73c214ea2e..0753940595 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -267,7 +267,7 @@ developing OSPF-API and frr applications. %package rpki-rtrlib Summary: BGP RPKI support (rtrlib) Group: System Environment/Daemons -BuildRequires: librtr-devel >= 0.5 +BuildRequires: librtr-devel >= 0.8 Requires: %{name} = %{version}-%{release} %description rpki-rtrlib diff --git a/snapcraft/snapcraft.yaml.in b/snapcraft/snapcraft.yaml.in index 01033d0413..bf3902d9fa 100644 --- a/snapcraft/snapcraft.yaml.in +++ b/snapcraft/snapcraft.yaml.in @@ -2,8 +2,8 @@ name: frr version: @VERSION@ summary: FRRouting BGP/OSPFv2/OSPFv3/ISIS/RIP/RIPng/PIM/LDP/EIGRP/BFD routing daemon description: BGP/OSPFv2/OSPFv3/ISIS/RIP/RIPng/PIM/LDP/EIGRP/BFD routing daemon - FRRouting (FRR) is free software which manages TCP/IP based routing - protocols. It supports BGP4, BGP4+, OSPFv2, OSPFv3, IS-IS, RIPv1, RIPv2, + FRRouting (FRR) is free software which manages TCP/IP based routing + protocols. It supports BGP4, BGP4+, OSPFv2, OSPFv3, IS-IS, RIPv1, RIPv2, RIPng, PIM, LDP, Babel, EIGRP, PBR (Policy-based routing), PATHD (Segment routing), BFD and OpenFabric as well as the IPv6 versions of these. FRRouting (frr) is a fork of Quagga. @@ -275,7 +275,7 @@ parts: - usr/lib/x86_64-linux-gnu/libssh.so* source: https://github.com/rtrlib/rtrlib.git source-type: git - source-tag: v0.7.0 + source-tag: v0.8.0 plugin: cmake configflags: - -DCMAKE_BUILD_TYPE=Release @@ -296,7 +296,7 @@ parts: - -DENABLE_LYD_PRIV=ON - -DENABLE_CACHE=ON - -DCMAKE_BUILD_TYPE:String="Release" - frr: + frr: after: [rtrlib,libyang] build-packages: - gcc @@ -366,7 +366,7 @@ parts: - --enable-rpki - --enable-vrrpd - --enable-configfile-mask=0640 - - --enable-logfile-mask=0640 + - --enable-logfile-mask=0640 - --localstatedir=/var/run - --sbindir=/sbin - --bindir=/bin |