Accepting request 790269 from network:vpn

OBS-URL: https://build.opensuse.org/request/show/790269
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/strongswan?expand=0&rev=73

0006-Resolve-multiple-definition-of-swanctl_dir.patch

@@ -0,0 +1,12 @@
+diff -Naur strongswan-5.8.2.orig/src/swanctl/swanctl.h strongswan-5.8.2/src/swanctl/swanctl.h
+--- strongswan-5.8.2.orig/src/swanctl/swanctl.h	2018-12-14 16:48:24.000000000 +0100
++++ strongswan-5.8.2/src/swanctl/swanctl.h	2020-03-26 07:54:21.876224209 +0100
+@@ -30,7 +30,7 @@
+ /**
+  * Base directory for credentials and config
+  */
+-char *swanctl_dir;
++extern char *swanctl_dir;
+ 
+ /**
+  * Configuration file for connections, etc.

strongswan.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 31 16:42:23 UTC 2020 - Madhu Mohan Nelemane <mmnelemane@suse.com>
+
+- Fix to resolve multiple definitions for swanctl_dir (bsc#1164493)
+  [+ 0006-Resolve-multiple-definition-of-swanctl_dir.patch ]
+
 -------------------------------------------------------------------
 Mon Feb 17 20:26:37 UTC 2020 - Johannes Kastl <kastl@b1-systems.de>
 

strongswan.spec

@@ -80,7 +80,7 @@ Patch2:         %{name}_ipsec_service.patch
 Patch3:         %{name}_fipscheck.patch
 %endif
 Patch5:         0005-ikev1-Don-t-retransmit-Aggressive-Mode-response.patch
-
+Patch6:         0006-Resolve-multiple-definition-of-swanctl_dir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  curl-devel
@@ -257,6 +257,7 @@ and the load testing plugin for IKEv2 daemon.
 %patch3 -p1
 %endif
 %patch5 -p1
+%patch6 -p1
 sed -e 's|@libexecdir@|%_libexecdir|g'    \
      < %{_sourcedir}/strongswan.init.in \
      > strongswan.init