X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=redhat%2Ffrr.spec.in;h=e5407a2cb9be6f816ebcfe9133e1d5ef583f4bea;hb=33e56da60666cd26ca18787104e721b9df9ed4a2;hp=e2be7050d7ad98f406d79b4ae90ae14401f27aa5;hpb=262c829d7e86dbec3b35472cf861c433683cec82;p=mirror_frr.git diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index e2be7050d..e5407a2cb 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -11,6 +11,7 @@ #################### FRRouting (FRR) configure options ##################### # with-feature options %{!?with_babeld: %global with_babeld 1 } +%{!?with_bfdd: %global with_bfdd 1 } %{!?with_bgp_vnc: %global with_bgp_vnc 0 } %{!?with_cumulus: %global with_cumulus 0 } %{!?with_eigrpd: %global with_eigrpd 1 } @@ -85,7 +86,7 @@ %{!?frr_gid: %global frr_gid 92 } %{!?vty_gid: %global vty_gid 85 } -%define daemon_list zebra ripd ospfd bgpd isisd ripngd ospf6d pbrd +%define daemon_list zebra ripd ospfd bgpd isisd ripngd ospf6d pbrd staticd bfdd %if %{with_ldpd} %define daemon_ldpd ldpd @@ -129,7 +130,13 @@ %define daemon_watchfrr "" %endif -%define all_daemons %{daemon_list} %{daemon_ldpd} %{daemon_pimd} %{daemon_nhrpd} %{daemon_eigrpd} %{daemon_babeld} %{daemon_watchfrr} %{daemon_pbrd} +%if %{with_bfdd} + %define daemon_bfdd bfdd +%else + %define daemon_bfdd "" +%endif + +%define all_daemons %{daemon_list} %{daemon_ldpd} %{daemon_pimd} %{daemon_nhrpd} %{daemon_eigrpd} %{daemon_babeld} %{daemon_watchfrr} %{daemon_pbrd} %{daemon_bfdd} #release sub-revision (the two digits after the CONFDATE) %{!?release_rev: %global release_rev 01 } @@ -137,7 +144,7 @@ Summary: Routing daemon Name: frr Version: %{rpmversion} -Release: @CONFDATE@%{release_rev}%{?dist} +Release: %{release_rev}%{?dist} License: GPLv2+ Group: System Environment/Daemons Source0: https://github.com/FRRouting/frr/archive/%{name}-%{frrversion}.tar.gz @@ -193,7 +200,7 @@ protocol. It takes multi-server and multi-thread approach to resolve the current complexity of the Internet. FRRouting supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP -NHRP, Babel, PBR and EIGRP. +NHRP, Babel, PBR, EIGRP and BFD. FRRouting is a fork of Quagga. @@ -209,7 +216,7 @@ Contributed/3rd party tools which may be of use with frr. %package pythontools Summary: python tools for frr BuildRequires: python -Requires: python-ipaddr +Requires: python-ipaddress Group: System Environment/Daemons %description pythontools @@ -331,22 +338,28 @@ developing OSPF-API and frr applications. --enable-systemd \ %endif %if %{with_rpki} - --enable-rpki + --enable-rpki \ +%else + --disable-rpki \ +%endif +%if %{with_bfdd} + --enable-bfdd \ %else - --disable-rpki + --disable-bfdd \ %endif + SPHINXBUILD=%{sphinx} -make %{?_smp_mflags} MAKEINFO="makeinfo --no-split" SPHINXBUILD=%{sphinx} +make %{?_smp_mflags} MAKEINFO="makeinfo --no-split" pushd doc -make SPHINXBUILD=%{sphinx} info +make info popd %install mkdir -p %{buildroot}%{_sysconfdir}/{frr,sysconfig,logrotate.d,pam.d,default} \ %{buildroot}%{_localstatedir}/log/frr %{buildroot}%{_infodir} -make DESTDIR=%{buildroot} INSTALL="install -p" CP="cp -p" SPHINXBUILD=%{sphinx} install +make DESTDIR=%{buildroot} INSTALL="install -p" CP="cp -p" install # Remove this file, as it is uninstalled and causes errors when building on RH9 rm -rf %{buildroot}/usr/share/info/dir @@ -361,15 +374,17 @@ rm -vf %{buildroot}%{_libdir}/*.la # install /etc sources %if "%{initsystem}" == "systemd" mkdir -p %{buildroot}%{_unitdir} -install -m644 %{zeb_rh_src}/frr.service %{buildroot}%{_unitdir}/frr.service -install %{zeb_rh_src}/frr.init %{buildroot}%{_sbindir}/frr +install -m644 %{zeb_src}/tools/frr.service %{buildroot}%{_unitdir}/frr.service %else mkdir -p %{buildroot}%{_initddir} -install %{zeb_rh_src}/frr.init %{buildroot}%{_sbindir}/frr -ln -s %{_sbindir}/frr %{buildroot}%{_initddir}/frr +ln -s %{_sbindir}/frrinit.sh %{buildroot}%{_initddir}/frr %endif -install %{zeb_rh_src}/daemons %{buildroot}%{_sysconfdir}/frr +install %{zeb_src}/tools/etc/frr/daemons %{buildroot}%{_sysconfdir}/frr +# add rpki module to daemon +%if %{with_rpki} + sed -i -e 's/^\(bgpd_options=\)\(.*\)\(".*\)/\1\2 -M rpki\3/' %{buildroot}%{_sysconfdir}/frr/daemons +%endif install -m644 %{zeb_rh_src}/frr.pam %{buildroot}%{_sysconfdir}/pam.d/frr install -m644 %{zeb_rh_src}/frr.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/frr install -d -m750 %{buildroot}%{rundir} @@ -412,6 +427,7 @@ zebra_spec_add_service () zebra_spec_add_service zebrasrv 2600/tcp "zebra service" zebra_spec_add_service zebra 2601/tcp "zebra vty" +zebra_spec_add_service staticd 2616/tcp "staticd vty" zebra_spec_add_service ripd 2602/tcp "RIPd vty" zebra_spec_add_service ripngd 2603/tcp "RIPngd vty" zebra_spec_add_service ospfd 2604/tcp "OSPFd vty" @@ -439,6 +455,9 @@ zebra_spec_add_service isisd 2608/tcp "ISISd vty" %if %{with_eigrpd} zebra_spec_add_service eigrpd 2613/tcp "EIGRPd vty" %endif +%if %{with_bfdd} + zebra_spec_add_service bfdd 2617/tcp "BFDd vty" +%endif %if "%{initsystem}" == "systemd" for daemon in %all_daemons ; do @@ -450,7 +469,7 @@ zebra_spec_add_service isisd 2608/tcp "ISISd vty" # Fix bad path in previous config files # Config files won't get replaced by default, so we do this ugly hack to fix it -%__sed -i 's|/etc/init.d/|%{_sbindir}/|g' %{configdir}/daemons 2> /dev/null || true +%__sed -i 's|watchfrr_options=|#watchfrr_options=|g' %{configdir}/daemons 2> /dev/null || true # With systemd, watchfrr is mandatory. Fix config to make sure it's enabled if # we install or upgrade to a frr built with systemd @@ -539,9 +558,9 @@ fi %files -%doc */*.sample* AUTHORS COPYING +%doc */*.sample* COPYING %doc doc/mpls -%doc ChangeLog NEWS README +%doc README.md %if 0%{?frr_user:1} %dir %attr(751,%{frr_user},%{frr_user}) %{configdir} %dir %attr(750,%{frr_user},%{frr_user}) %{_localstatedir}/log/frr @@ -557,6 +576,7 @@ fi %{_infodir}/frr.info.gz %{_mandir}/man*/* %{_sbindir}/zebra +%{_sbindir}/staticd %{_sbindir}/ospfd %{_sbindir}/ripd %{_sbindir}/bgpd @@ -585,6 +605,9 @@ fi %if %{with_babeld} %{_sbindir}/babeld %endif +%if %{with_bfdd} + %{_sbindir}/bfdd +%endif %{_libdir}/lib*.so.0 %{_libdir}/lib*.so.0.* %if %{with_fpm} @@ -602,10 +625,12 @@ fi %else %{_initddir}/frr %endif -%{_sbindir}/frr %config(noreplace) %{_sysconfdir}/pam.d/frr %config(noreplace) %{_sysconfdir}/logrotate.d/frr %{_sbindir}/frr-reload +%{_sbindir}/frrcommon.sh +%{_sbindir}/frrinit.sh +%{_sbindir}/watchfrr.sh %files contrib @@ -620,9 +645,6 @@ fi %files devel %{_libdir}/lib*.so -%if %{with_ospfclient} - %{_sbindir}/ospfclient -%endif %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %dir %{_includedir}/%{name}/ospfd @@ -638,9 +660,83 @@ fi %changelog -* Sun May 20 2018 Martin Winter + +* Tue May 7 2019 Quentin Young - %{version} +- bgpd: Fix 'show bgp ipv4/ipv6 neighbors' to show only v4 or v6 neighbors +- bgpd: Fix display issue when showing labeled-unicast routes +- bgpd: Fix incorrect # peers in 'show bgp ipv6 summary' output +- bgpd: Fix issue with remote-private-as in combination with local-as +- bgpd: Fix memory error when prepending to AS-path +- bgpd: Improve error handling when using maximum-prefix +- ldpd: Fix startup permissions error on OpenBSD +- ldpd: add support for FreeBSD IP_BINDANY +- ospfd: Fix incorrect display of millisecond time values +- tools: Fix incorrect systemd dependencies causing failure to start on boot +- vtysh: Fix unnecessary reconnection under multi-instance OSPF +- watchfrr: Fix multi-instance support when using new init script +- zebra: Fix a display bug in 'show ip route ... json' +- zebra: Fix compilation issue on OpenBSD +- zebra: Fix issue with missed selection of system-sourced routes +- zebra: Fix race condition in label manager +- zebra: Reliability improvements to pseudowire route recovery +- zebra: Tweak metric values for macvlan devices + +* Tue Jan 8 2019 Martin Winter - 6.0.2 +- Security Issue (Denial of Service): Fix BGP Attribute 255 (experimental VNC) + handling + +* Sat Dec 29 2018 Martin Winter - 6.0.1 +- Various fixes for label manager +- Fix BGP unnumbered peer setup +- Various other fixes + +* Sun Oct 7 2018 Martin Winter - 6.0 +- Staticd: New daemon responsible for management of static routes +- ISISd: Implement dst-src routing as per draft-ietf-isis-ipv6-dst-src-routing +- BFDd: new daemon for BFD (Bidrectional Forwarding Detection). Responsiblei + for notifying link changes to make routing protocols converge faster. +- various bug fixes + +* Thu Jul 5 2018 Martin Winter - 5.0.1 +- Support Automake 1.16.1 +- BGPd: Support for flowspec ICMP, DSCP, packet length, fragment and tcp flags +- BGPd: fix rpki validation for ipv6 +- VRF: Workaround for kernel bug on Linux 4.14 and newer +- Zebra: Fix interface based routes from zebra not marked up +- Zebra: Fix large zebra memory usage when redistribute between protocols +- Zebra: Allow route-maps to match on source instance +- BGPd: Backport peer-attr overrides, peer-level enforce-first-as and filtered-routes fix +- BGPd: fix for crash during display of filtered-routes +- BGPd: Actually display labeled unicast routes received +- Label Manager: Fix to work correctly behind a label manager proxy + +* Thu Jun 7 2018 Martin Winter - 5.0 +- PIM: Add a Multicast Trace Command draft-ietf-idmr-traceroute-ipm-05 +- IS-IS: Implement Three-Way Handshake as per RFC5303 +- BGPD: Implement VPN-VRF route leaking per RFC4364. +- BGPD: Implement VRF with NETNS backend +- BGPD: Flowspec +- PBRD: Add a new Policy Based Routing Daemon + +* Sun May 28 2018 Rafael Zalamena - %{version} +- Add BFDd support + +* Sun May 20 2018 Martin Winter - 4.0.1 - Fixed RPKI RPM build +* Sun Mar 11 2018 Martin Winter - 4.0 +- ISIS-MT - https://tools.ietf.org/html/rfc5120 +- BGP - RPKI (RFC 6810) +- BGP - v4 labeled unicast as per RFC 3107 +- BGP/Zebra - Type 2 and 3 EVPN with symmetric and asymmetric routing +- EIGRP - https://tools.ietf.org/html/rfc7868 +- FRR - Tab completion for iface names, prefix-lists, route-maps, BGP peers +- BABEL - https://tools.ietf.org/html/rfc6126 +- PIM VRF - Added the ability to work with VRF’s to PIM +- OSPFv2 VRF - Added the ability to work with VRF’s to OSPFv2 +- OSPFv2 Experimental SR - draft-ietf-ospf-segment-routing-extensions-24 +- ZEBRA - Add ability to create a static route that leaks across VRF’s. + * Sun Mar 4 2018 Martin Winter - Add option to build with RPKI (default: disabled)