From 22d94bec341757fb7f62cc40055d6b5f7abc232b Mon Sep 17 00:00:00 2001
From: Michal Ruprich <mruprich@redhat.com>
Date: Fri, 23 Apr 2021 12:38:22 +0200
Subject: [PATCH] Fixing permissions on config files in /etc/frr Enabling
 integrated configuration option for frr

---
 frr.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/frr.spec b/frr.spec
index 053c758..ad24182 100644
--- a/frr.spec
+++ b/frr.spec
@@ -6,7 +6,7 @@
 
 Name: frr
 Version: 7.5.1
-Release: 1%{?checkout}%{?dist}
+Release: 2%{?checkout}%{?dist}
 Summary: Routing daemon
 License: GPLv2+
 URL: http://www.frrouting.org
@@ -140,7 +140,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 +173,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 +194,10 @@ make check PYTHON=%{__python3}
 %{_tmpfilesdir}/%{name}.conf
 
 %changelog
+* Fri Apr 23 2021 Michal Ruprich <mruprich@redhat.com> - 7.5.1-2
+- Fixing permissions on config files in /etc/frr
+- Enabling integrated configuration option for frr
+
 * Fri Mar 12 2021 Michal Ruprich <mruprich@redhat.com> - 7.5.1-1
 - New version 7.5.1
 - Enabling grpc, adding hostname for post scriptlet