From e647de72593ebfb3a5cae1e2695222ad550fe714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= <alzim@rosa.ch6.ru>
Date: Wed, 23 Mar 2016 18:38:59 +0300
Subject: [PATCH] Update to 5.4.0

---
 .abf.yml        |  4 +---
 strongswan.spec | 38 ++++++++++++++++++--------------------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 5276f25..2e878d9 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,2 @@
-removed_sources:
-  strongswan-5.0.1.tar.bz2: e338399e4237caee148da2197515233fcfd44822
 sources:
-  strongswan-5.1.1.tar.bz2: eba9c90e3e910edd18ef4f1e380e59751965258b
+  strongswan-5.4.0.tar.bz2: 913a499e896a222bcb5cf92c5082bf617c376cb0
diff --git a/strongswan.spec b/strongswan.spec
index a1eb8e6..6b63c98 100644
--- a/strongswan.spec
+++ b/strongswan.spec
@@ -4,16 +4,12 @@
 
 Summary:	IPSEC implementation
 Name:		strongswan
-Version:	5.1.1
-Release:	2
+Version:	5.4.0
+Release:	1
 License:	GPLv2+
-URL:		http://www.strongswan.org/
+URL:		https://www.strongswan.org/
 Source0:	http://download.strongswan.org/%{name}-%{version}.tar.bz2
 
-Patch1:		strongswan-pts-ecp-disable.patch
-Patch2:		libstrongswan-plugin.patch
-Patch3:		libstrongswan-settings-debug.patch
-
 Group:		System/Servers
 
 BuildRequires:  gmp-devel
@@ -70,8 +66,7 @@ implementation possessing a standard IF-IMC/IMV interface.
 
 %prep
 %setup -q
-%apply_patches
-echo "For migration from 4.6 to 5.0 see http://wiki.strongswan.org/projects/strongswan/wiki/CharonPlutoIKEv1" > README.omv
+# %apply_patches
 
 %build
 
@@ -126,7 +121,7 @@ automake --add-missing --copy
 %endif
 
 %make
-sed -i 's/\t/    /' src/strongswan.conf src/starter/ipsec.conf
+sed -i 's/\t/    /' src/starter/ipsec.conf
 
 %install
 %makeinstall_std
@@ -160,22 +155,28 @@ done
 #%_postun_userdel strongswan
 
 %files
-%doc README README.omv COPYING NEWS TODO
+%doc README COPYING NEWS TODO
 %dir %{_sysconfdir}/%{name}
 %{_sysconfdir}/%{name}/ipsec.d/
 %config(noreplace) %{_sysconfdir}/%{name}/ipsec.conf
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %{_unitdir}/%{name}.service
+/etc/%{name}/%{name}.d
+/etc/%{name}/swanctl
+/usr/share/%{name}/templates/config/plugins/*.conf
+/usr/share/%{name}/templates/config/%{name}.conf
+/usr/share/%{name}/templates/config/%{name}.d/*.conf
+/usr/share/%{name}/templates/database/imv/*.sql
 %{_libdir}/%{name}/libcharon.so.0
 %{_libdir}/%{name}/libcharon.so.0.0.0
-%{_libdir}/%{name}/libhydra.so.0
-%{_libdir}/%{name}/libhydra.so.0.0.0
 %{_libdir}/%{name}/libtls.so.0
 %{_libdir}/%{name}/libtls.so.0.0.0
 %{_libdir}/%{name}/libpttls.so.0
 %{_libdir}/%{name}/libpttls.so.0.0.0
 %{_libdir}/%{name}/lib%{name}.so.0
 %{_libdir}/%{name}/lib%{name}.so.0.0.0
+%{_libdir}/%{name}/libvici.so.0
+%{_libdir}/%{name}/libvici.so.0.0.0
 %dir %{_libdir}/%{name}/plugins
 %{_libdir}/%{name}/plugins/lib%{name}-aes.so
 %{_libdir}/%{name}/plugins/lib%{name}-attr.so
@@ -221,12 +222,11 @@ done
 %{_libdir}/%{name}/plugins/lib%{name}-dhcp.so
 %{_libdir}/%{name}/plugins/lib%{name}-curl.so
 %{_libdir}/%{name}/plugins/lib%{name}-eap-identity.so
+%{_libdir}/%{name}/plugins/lib%{name}-vici.so
 %dir %{_libexecdir}/%{name}
 %{_libexecdir}/%{name}/_copyright
 %{_libexecdir}/%{name}/_updown
-%{_libexecdir}/%{name}/_updown_espmark
 %{_libexecdir}/%{name}/charon
-%{_libexecdir}/%{name}/openac
 %{_libexecdir}/%{name}/scepclient
 %{_libexecdir}/%{name}/starter
 %{_libexecdir}/%{name}/stroke
@@ -234,22 +234,20 @@ done
 %{_libexecdir}/%{name}/imv_policy_manager
 %{_libexecdir}/%{name}/pt-tls-client
 %{_sbindir}/%{name}
+%{_sbindir}/swanctl
 %{_bindir}/pki
 %{_mandir}/man5/%{name}.conf.5.*
 %{_mandir}/man1/%{name}*.1.*
 %{_mandir}/man5/%{name}_ipsec.conf.5.*
 %{_mandir}/man5/%{name}_ipsec.secrets.5.*
+%{_mandir}/man5/%{name}_swanctl.conf.5.*
 %{_mandir}/man8/%{name}.8.*
-%{_mandir}/man8/%{name}__updown.8.*
-%{_mandir}/man8/%{name}__updown_espmark.8.*
-%{_mandir}/man8/%{name}_openac.8.*
 %{_mandir}/man8/%{name}_scepclient.8.*
+%{_mandir}/man8/%{name}_swanctl.8.*
 
 %files tnc-imcvs
 %{_libdir}/%{name}/libimcv.so.0
 %{_libdir}/%{name}/libimcv.so.0.0.0
-%{_libdir}/%{name}/libpts.so.0
-%{_libdir}/%{name}/libpts.so.0.0.0
 %{_libdir}/%{name}/libtnccs.so.0
 %{_libdir}/%{name}/libtnccs.so.0.0.0
 %{_libdir}/%{name}/libradius.so.0