--- rpms/smeserver-libreswan-xl2tpd/contribs9/smeserver-libreswan-xl2tpd.spec	2019/10/13 14:08:12	1.6
+++ rpms/smeserver-libreswan-xl2tpd/contribs9/smeserver-libreswan-xl2tpd.spec	2020/02/14 18:20:56	1.8
@@ -1,18 +1,20 @@
 %define name smeserver-libreswan-xl2tpd
 %define version 0.5
-%define release 6
+%define release 8
 Summary: Plugin to enable LT2P/IPSEC connections
 Name: %{name}
 Version: %{version}
 Release: %{release}
 License: GNU GPL version 2
-URL: http://libreswan.org/
+URL: https://www.libreswan.org/
 Group: SMEserver/addon
 Source: %{name}-%{version}.tar.gz
 Patch1: smeserver-libreswan-xl2tpd-private-access.patch
 Patch2: smeserver-libreswan-xl2tpd-update-variables.patch
 Patch3: smeserver-libreswan-xl2tpd-cleanup-obsoletes.patch
 Patch4: smeserver-libreswan-xl2tpd-update-status-default
+Patch5: smeserver-libreswan-xl2tpd-update-ip-up-local.patch
+Patch6: smeserver-libreswan-xl2tpd-update-createlinks.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}
 BuildArchitectures: noarch
@@ -20,13 +22,28 @@ BuildRequires: e-smith-devtools
 Requires:  e-smith-release >= 9.2
 Requires:  libreswan >= 3.29
 Requires:  smeserver-libreswan >= 0.5
-Requires:  xl2tpd >= 1.3.8
+Requires:  xl2tpd >= 1.3.15
 AutoReqProv: no
 
 %description
 xl2tpd is an implementation of the Layer 2 Tunnelling Protocol (RFC 2661). L2TP allows you to tunnel PPP over UDP
 
 %changelog
+* Tue Feb 14 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-8.sme
+- Update for xl2tpd 1.3.15
+- Update createlinks to regenerate masq on connection
+- Modify Nat/non Nat sections
+- remove rightsubnet as normal configuration item
+- set IKE v1 only and other updates to ipsec.conf
+- update file layouts to match samples
+- load pppol2tp on startup if xl2tpd is enabled
+- Bump requires to newer xl2tpd
+
+* Thu Jan 30 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-7
+- Update ip-up.local to add debug and enhance setting
+- update ipsec.conf to for NAT/noNAT
+- add $mtu key - defaults to 1400
+
 * Tue Sep 03 2019 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-6
 - Add ipsec connection status key (disabled as default)
 - Update Libreswan depends
@@ -114,7 +131,8 @@ xl2tpd is an implementation of the Layer
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks