--- rpms/smeserver-libreswan/contribs9/smeserver-libreswan.spec	2016/04/24 10:38:31	1.8
+++ rpms/smeserver-libreswan/contribs9/smeserver-libreswan.spec	2017/01/26 21:11:52	1.12
@@ -1,6 +1,6 @@
 %define name smeserver-libreswan
 %define version 0.5
-%define release 20
+%define release 25
 Summary: Plugin to enable IPSEC connections
 Name: %{name}
 Version: %{version}
@@ -14,6 +14,12 @@ Patch2: smeserver-libreswan-move-logfile
 Patch3: smeserver-libreswan-add-debug-key.patch
 Patch4: smeserver-libreswan-fix-rsa-id.patch
 Patch5: smeserver-libreswan-fix-createlinks.patch
+Patch6: smeserver-libreswan-ikev2-logrotate.patch
+Patch7: smeserver-libreswan-add-certificates.patch
+Patch8: smeserver-libreswan-modify-identifiers.patch
+Patch9: smeserver-libreswan-modify-identifiers1.patch
+
+
 BuildRoot: /var/tmp/%{name}-%{version}
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -25,6 +31,28 @@ AutoReqProv: no
 Libreswan is a free software implementation of the most widely supported and standardised VPN protocol based on ("IPsec") and the Internet Key Exchange ("IKE")
 
 %changelog
+* Thu Jan 26 2017 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-25.sme
+ - Fix the ipsec.conf as well
+ - remove automatic \@ in IDs - Fixes [SME: 9729]
+ 
+* Thu Jan 26 2017 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-24.sme
+ - remove automatic \@ in IDs - Fixes [SME: 9729]
+ - fix swapped left/right IDs in password file
+
+* Wed Jan 25 2017 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-23.sme
+- Add the ability to use PEM/PKCS#12 certificates - fixes [SME: 9942]
+- lots of code tidying
+
+* Wed Dec 21 2016 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-22.sme
+- update logrotate completely now I realise it is symlinked
+- remove UPDPort and add UPDPorts due to ipsec v2
+
+* Wed Dec 21 2016 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-21.sme
+- add more variations for ike v1/2
+- remove logrotate template
+- add /etc/e-smith/events/logrotate/logfiles2timestamp/var/log/pluto.log
+- Fix some log noise when first installed and still disabled
+
 * Sat Apr 23 2016 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-20.sme
 - Fix typo in createlinks for sysctl.conf
 
@@ -146,6 +174,10 @@ Libreswan is a free software implementat
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 perl createlinks
@@ -174,7 +206,7 @@ rm -rf %{name}-%{version}
 /sbin/init q
 
 
-echo "see http://wiki.contribs.org/VPN"
+echo "see https://wiki.contribs.org/Libreswan"
 
 %postun
 /sbin/e-smith/expand-template /etc/rc.d/init.d/masq