From bb27be6ef64cbbe8b95d19570b70947fc3ffab12 Mon Sep 17 00:00:00 2001
From: Michal Ruprich <mruprich@redhat.com>
Date: Fri, 23 Apr 2021 10:49:09 +0200
Subject: [PATCH] Resolves: #1939456 - /etc/frr permissions are bogus Resolves:
 #1951303 - FTBFS in CentOS Stream

---
 frr.spec | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/frr.spec b/frr.spec
index f803b52..9a63868 100644
--- a/frr.spec
+++ b/frr.spec
@@ -6,7 +6,7 @@
 
 Name: frr
 Version: 7.5.1
-Release: 2%{?checkout}%{?dist}
+Release: 3%{?checkout}%{?dist}
 Summary: Routing daemon
 License: GPLv2+
 URL: http://www.frrouting.org
@@ -23,7 +23,6 @@ BuildRequires: python3-devel python3-sphinx python3-pytest
 BuildRequires: systemd systemd-devel
 BuildRequires: libyang-devel >= 0.16.74
 BuildRequires: make
-BuildRequires: grpc-devel grpc-plugins
 Requires: net-snmp ncurses
 Requires(post): systemd /sbin/install-info hostname
 Requires(preun): systemd /sbin/install-info
@@ -76,8 +75,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}
 
@@ -139,7 +137,7 @@ fi
 
 #still used by vtysh, this way no error is produced when using vtysh
 if [ ! -e %{_sysconfdir}/frr/vtysh.conf ]; then
-    echo 'no service integrated-vtysh-config' > %{_sysconfdir}/frr/vtysh.conf
+    touch %{_sysconfdir}/frr/vtysh.conf
     chmod 640 %{_sysconfdir}/frr/vtysh.conf
     chown frr:frrvty %{_sysconfdir}/frr/vtysh.conf
 fi
@@ -173,7 +171,7 @@ make check PYTHON=%{__python3}
 %doc ripngd/ripngd.conf.sample
 %doc pimd/pimd.conf.sample
 %doc doc/mpls
-%dir %attr(640,frr,frr) %{_sysconfdir}/frr
+%dir %attr(750,frr,frr) %{_sysconfdir}/frr
 %dir %attr(755,frr,frr) /var/log/frr
 %dir %attr(755,frr,frr) /run/frr
 %{_infodir}/*info*
@@ -194,6 +192,10 @@ make check PYTHON=%{__python3}
 %{_tmpfilesdir}/%{name}.conf
 
 %changelog
+* Fri Apr 23 2021 Michal Ruprich <mruprich@redhat.com> - 7.5.1-3
+- Resolves: #1939456 - /etc/frr permissions are bogus
+- Resolves: #1951303 - FTBFS in CentOS Stream
+
 * Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 7.5.1-2
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937