Hello community,

here is the log from the commit of package strongswan for openSUSE:Factory 
checked in at 2020-04-02 17:42:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/strongswan (Old)
 and      /work/SRC/openSUSE:Factory/.strongswan.new.3248 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "strongswan"

Thu Apr  2 17:42:30 2020 rev:73 rq:790269 version:5.8.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/strongswan/strongswan.changes    2020-02-22 
18:59:53.625576003 +0100
+++ /work/SRC/openSUSE:Factory/.strongswan.new.3248/strongswan.changes  
2020-04-02 17:42:32.361358110 +0200
@@ -1,0 +2,6 @@
+Tue Mar 31 16:42:23 UTC 2020 - Madhu Mohan Nelemane <[email protected]>
+
+- Fix to resolve multiple definitions for swanctl_dir (bsc#1164493)
+  [+ 0006-Resolve-multiple-definition-of-swanctl_dir.patch ]
+
+-------------------------------------------------------------------

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

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ strongswan.spec ++++++
--- /var/tmp/diff_new_pack.jDj5Ft/_old  2020-04-02 17:42:33.117358695 +0200
+++ /var/tmp/diff_new_pack.jDj5Ft/_new  2020-04-02 17:42:33.121358698 +0200
@@ -80,7 +80,7 @@
 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 @@
 %patch3 -p1
 %endif
 %patch5 -p1
+%patch6 -p1
 sed -e 's|@libexecdir@|%_libexecdir|g'    \
      < %{_sourcedir}/strongswan.init.in \
      > strongswan.init

++++++ 0006-Resolve-multiple-definition-of-swanctl_dir.patch ++++++
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.


Reply via email to