diff --git a/0001-build-use-configfile-mode-in-init-script.patch b/0001-build-use-configfile-mode-in-init-script.patch deleted file mode 100644 index 665256c..0000000 --- a/0001-build-use-configfile-mode-in-init-script.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 5c9063771195bb51a8cc1c64f9924e53a0602817 Mon Sep 17 00:00:00 2001 -From: David Lamparter <equinox@diac24.net> -Date: Mon, 11 May 2020 21:37:08 +0200 -Subject: [PATCH] build: use configfile mode in init script - -This only applies for split-config; the init script would create an -empty config file with default permissions. - -Reported-by: Robert Scheck <robert@fedoraproject.org> -Signed-off-by: David Lamparter <equinox@opensourcerouting.org> ---- - configure.ac | 1 + - tools/frr.in | 2 ++ - tools/frrcommon.sh.in | 2 ++ - 3 files changed, 5 insertions(+) - -diff --git a/configure.ac b/configure.ac -index faaf1dd23..d4c652c6e 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -813,6 +813,7 @@ AC_SUBST([enable_vty_group]) - - enable_configfile_mask=${enable_configfile_mask:-0600} - AC_DEFINE_UNQUOTED([CONFIGFILE_MASK], [${enable_configfile_mask}], [Mask for config files]) -+AC_SUBST([enable_configfile_mask]) - - enable_logfile_mask=${enable_logfile_mask:-0600} - AC_DEFINE_UNQUOTED([LOGFILE_MASK], [${enable_logfile_mask}], [Mask for log files]) -diff --git a/tools/frr.in b/tools/frr.in -index d9816c256..40862aa4c 100755 ---- a/tools/frr.in -+++ b/tools/frr.in -@@ -21,6 +21,7 @@ VTYSH="@vtysh_bin@" # /usr/bin/vtysh - FRR_USER="@enable_user@" # frr - FRR_GROUP="@enable_group@" # frr - FRR_VTY_GROUP="@enable_vty_group@" # frrvty -+FRR_CONFIG_MODE="@enable_configfile_mask@" # 0600 - FRR_DEFAULT_PROFILE="@DFLT_NAME@" # traditional / datacenter - - # Local Daemon selection may be done by using /etc/frr/daemons. -@@ -56,6 +57,7 @@ chownfrr() - { - test -n "$FRR_USER" && chown "$FRR_USER" "$1" - test -n "$FRR_GROUP" && chgrp "$FRR_GROUP" "$1" -+ test -n "$FRR_CONFIG_MODE" && chmod "$FRR_CONFIG_MODE" "$1" - } - - # Check if daemon is started by using the pidfile. -diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in -index 0dfdfd0ef..9dc8cea60 100644 ---- a/tools/frrcommon.sh.in -+++ b/tools/frrcommon.sh.in -@@ -24,6 +24,7 @@ VTYSH="@vtysh_bin@" # /usr/bin/vtysh - FRR_USER="@enable_user@" # frr - FRR_GROUP="@enable_group@" # frr - FRR_VTY_GROUP="@enable_vty_group@" # frrvty -+FRR_CONFIG_MODE="@enable_configfile_mask@" # 0600 - FRR_DEFAULT_PROFILE="@DFLT_NAME@" # traditional / datacenter - - # ORDER MATTERS FOR $DAEMONS! -@@ -53,6 +54,7 @@ debug() { - chownfrr() { - [ -n "$FRR_USER" ] && chown "$FRR_USER" "$1" - [ -n "$FRR_GROUP" ] && chgrp "$FRR_GROUP" "$1" -+ [ -n "$FRR_CONFIG_MODE" ] && chmod "$FRR_CONFIG_MODE" "$1" - } - - vtysh_b () { --- -2.21.1 (Apple Git-122.3) - diff --git a/frr-7.3.1.tar.gz b/frr-7.3.1.tar.gz deleted file mode 100644 index 53874ad..0000000 --- a/frr-7.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81129f83ce9ae31c983bb02b3d8e3e457604bab46f01411c945d9c2cfef1f5c8 -size 5785833 diff --git a/frr-7.4.tar.gz b/frr-7.4.tar.gz new file mode 100644 index 0000000..334de77 --- /dev/null +++ b/frr-7.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c8204fda1c9b178d8446562579bbbc49d134b98f3ad02aa56f68724a2f9e40a +size 6074854 diff --git a/frr.changes b/frr.changes index 175ce78..8d5cfa4 100644 --- a/frr.changes +++ b/frr.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jul 1 12:21:24 UTC 2020 - Martin Hauke <mardnh@gmx.de> + +- Update to version 7.4 + * Upstream does not provide a changelog +- Drop patch (fixed upstream): + * 0001-build-use-configfile-mode-in-init-script.patch + ------------------------------------------------------------------- Sun May 31 22:40:46 UTC 2020 - Erico Mendonca <erico.mendonca@suse.com> diff --git a/frr.spec b/frr.spec index 4d1f74d..3137fdb 100644 --- a/frr.spec +++ b/frr.spec @@ -30,15 +30,13 @@ %define frr_daemondir %{_prefix}/lib/frr Name: frr -Version: 7.3.1 +Version: 7.4 Release: 0 Summary: FRRouting Routing daemon License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Networking/System URL: https://www.frrouting.org #Git-Clone: https://github.com/FRRouting/frr.git -# PATCH-FIX-UPSTREAM: build-use-configfile-mode-in-init-script -Patch1: 0001-build-use-configfile-mode-in-init-script.patch Source: https://github.com/FRRouting/frr/archive/%{name}-%{version}.tar.gz Source1: %{name}-tmpfiles.d BuildRequires: %{python_module Sphinx} @@ -172,7 +170,6 @@ developing OSPF-API and frr applications. %prep %setup -q -n %{name}-%{name}-%{version} -%patch1 -p1 %build # GCC LTO objects must be "fat" to avoid assembly errors @@ -388,6 +385,7 @@ getent passwd %{frr_user} >/dev/null || useradd -r -g %{frr_group} -G %{frrvty_g %{_libdir}/frr/modules/zebra_irdp.so %{_libdir}/frr/modules/bgpd_rpki.so %{_libdir}/frr/modules/grpc.so +%{_libdir}/frr/modules/dplane_fpm_nl.so %{_prefix}/lib/frr/vrrpd %{_prefix}/lib/frr/generate_support_bundle.py %{_libdir}/frr/modules/bgpd_bmp.so