Bump version for ST

0001-nhrp-Configure-vici-socket-path-using-configure-with.patch

@@ -0,0 +1,54 @@
+From a2d2631efd4cee59cb6e15cc6d1cefc15bb2f433 Mon Sep 17 00:00:00 2001
+From: root <root@dm4.st.test2.hr>
+Date: Sat, 25 Jan 2020 19:38:39 +0100
+Subject: [PATCH] nhrp: Configure vici socket path using configure
+ --with-vici-socket=/var/run/charon.vici (default)
+
+---
+ configure.ac       | 8 ++++++++
+ nhrpd/README.nhrpd | 3 ++-
+ nhrpd/vici.c       | 2 +-
+ 3 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 59443b9f5..4fd96642a 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -139,6 +139,13 @@ AC_ARG_WITH([yangmodelsdir], [AS_HELP_STRING([--with-yangmodelsdir=DIR], [yang m
+ ])
+ AC_SUBST([yangmodelsdir])
+ 
++AC_ARG_WITH([vici-socket], [AS_HELP_STRING([--with-vici-socket=DIR], [vici-socket (/var/run/charon.vici)])], [
++	vici_socket="$withval"
++], [
++	vici_socket="/var/run/charon.vici"
++])
++AC_DEFINE_UNQUOTED([VICI_SOCKET], ["$vici_socket"], [StrongSWAN vici interface])
++
+ AC_ARG_ENABLE(tcmalloc,
+ 	AS_HELP_STRING([--enable-tcmalloc], [Turn on tcmalloc]),
+ [case "${enableval}" in
+@@ -2384,6 +2391,7 @@ group for vty sockets   : ${enable_vty_group}
+ config file mask        : ${enable_configfile_mask}
+ log file mask           : ${enable_logfile_mask}
+ zebra protobuf enabled  : ${enable_protobuf:-no}
++vici socket path        : ${vici_socket}
+ 
+ The above user and group must have read/write access to the state file
+ directory and to the config files in the config file directory."
+diff --git a/nhrpd/vici.c b/nhrpd/vici.c
+index d6105b71d..86023e1f8 100644
+--- a/nhrpd/vici.c
++++ b/nhrpd/vici.c
+@@ -478,7 +478,7 @@ static int vici_reconnect(struct thread *t)
+ 	if (vici->fd >= 0)
+ 		return 0;
+ 
+-	fd = sock_open_unix("/var/run/charon.vici");
++	fd = sock_open_unix(VICI_SOCKET);
+ 	if (fd < 0) {
+ 		debugf(NHRP_DEBUG_VICI,
+ 		       "%s: failure connecting VICI socket: %s",
+-- 
+2.26.2
+

frr.spec

@@ -1,5 +1,6 @@
 %global frrversion	7.3.1
 %global frr_libdir /usr/lib/frr
+%global checkout .st.1
 
 %global _hardened_build 1
 %define _legacy_common_support 1
@@ -35,6 +36,7 @@ Patch0002: 0002-enable-openssl.patch
 Patch0003: 0003-disable-eigrp-crypto.patch
 Patch0004: 0004-fips-mode.patch
 Patch0006: 0006-python-version.patch
+Patch0060: 0001-nhrp-Configure-vici-socket-path-using-configure-with.patch
 
 %description
 FRRouting is free software that manages TCP/IP based routing protocols. It takes
@@ -73,6 +75,7 @@ autoreconf -ivf
     --disable-babeld \
     --with-moduledir=%{_libdir}/frr/modules \
     --with-crypto=openssl \
+    --with-vici-socket=/run/strongswan/charon.vici \
     --enable-fpm
 
 %make_build MAKEINFO="makeinfo --no-split" PYTHON=%{__python3}