* Wed Aug 24 2016 Paul Wouters <pwouters@redhat.com> - 1.3.8-1

- Upgraded to 1.3.8 and updated existing patches still required
- Fix kernel mode breaking the closing tunnels

xl2tpd.spec

@@ -2,17 +2,19 @@
 
 Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
 Name: xl2tpd
-Version: 1.3.6
+Version: 1.3.8
-Release: 10%{?dist}
+Release: 1%{?dist}
 License: GPL+
-Url: https://github.com/xelerance/%{name}/
+Url: https://github.com/xelerance/xl2tpd/
 Group: System Environment/Daemons
-Source0: https://github.com/xelerance/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
+# upstream isn't using proper names, we manually rename v-VERSION.tar.gz to xl2tpd-VERSION.tar.gz
+Source0: https://github.com/xelerance/xl2tpd/archive/xl2tpd-%{version}.tar.gz
 Source1: xl2tpd.service
 Source2: tmpfiles-xl2tpd.conf
 Patch1: xl2tpd-1.3.6-conf.patch
-Patch2: xl2tpd-1.3.6-md5-fips.patch
+Patch2: xl2tpd-1.3.8-md5-fips.patch
-Patch3: xl2tpd-1.3.6-saref.patch
+Patch3: xl2tpd-1.3.8-saref.patch
+Patch4: xl2tpd-1.3.8-kernelmode.patch
 
 Requires: ppp >= 2.4.5-18, kmod(l2tp_ppp.ko)
 # If you want to authenticate against a Microsoft PDC/Active Directory
@@ -30,7 +32,7 @@ L2TP allows you to tunnel PPP over UDP. Some ISPs use L2TP to tunnel user
 sessions from dial-in servers (modem banks, ADSL DSLAMs) to back-end PPP
 servers. Another important application is Virtual Private Networks where
 the IPsec protocol is used to secure the L2TP connection (L2TP/IPsec,
-RFC 3193). The L2TP/IPsec protocol is mainly used by Windows and 
+RFC 3193). The L2TP/IPsec protocol is mainly used by Windows and
 Mac OS X clients. On Linux, xl2tpd can be used in combination with IPsec
 implementations such as Openswan.
 Example configuration files for such a setup are included in this RPM.
@@ -50,10 +52,11 @@ Xl2tpd is based on the 0.69 L2TP by Jeff McAdams <jeffm@iglou.com>
 It was de-facto maintained by Jacco de Leeuw <jacco2@dds.nl> in 2002 and 2003.
 
 %prep
-%setup -qn %{name}-%{commit}
+%setup
-%patch1 -p1 
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 #make DFLAGS="$RPM_OPT_FLAGS -g -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_FLOW -DDEBUG_PAYLOAD -DDEBUG_CONTROL -DDEBUG_CONTROL_XMIT -DDEBUG_FLOW_MORE -DDEBUG_MAGIC -DDEBUG_ENTROPY -DDEBUG_HIDDEN -DDEBUG_PPPD -DDEBUG_AAA -DDEBUG_FILE -DDEBUG_FLOW -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_ZLB -DDEBUG_AUTH"
@@ -84,7 +87,7 @@ install -p -D -m755 -d %{buildroot}%{_localstatedir}/run/xl2tpd
 %systemd_post xl2tpd.service
 
 %postun
-%systemd_postun_with_restart xl2tpd.service 
+%systemd_postun_with_restart xl2tpd.service
 
 %triggerun -- xl2td < 1.3.1-3
 # Save the current service runlevel info
@@ -96,7 +99,7 @@ install -p -D -m755 -d %{buildroot}%{_localstatedir}/run/xl2tpd
 /bin/systemctl try-restart xl2tpd.service >/dev/null 2>&1 || :
 
 %files
-%doc BUGS CHANGES CREDITS LICENSE README.* TODO doc/rfc2661.txt 
+%doc BUGS CHANGES CREDITS LICENSE README.* TODO
 %doc doc/README.patents examples/chapsecrets.sample
 %{_sbindir}/xl2tpd
 %{_sbindir}/xl2tpd-control
@@ -111,6 +114,10 @@ install -p -D -m755 -d %{buildroot}%{_localstatedir}/run/xl2tpd
 %ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control
 
 %changelog
+* Wed Aug 24 2016 Paul Wouters <pwouters@redhat.com> - 1.3.8-1
+- Upgraded to 1.3.8 and updated existing patches still required
+- Fix kernel mode breaking the closing tunnels
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.6-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
@@ -287,7 +294,7 @@ install -p -D -m755 -d %{buildroot}%{_localstatedir}/run/xl2tpd
 - Upgraded to 1.1.07
 - Added /var/run/xl2tpd to the spec file so this pacakge
   owns /var/run/xl2tpd
- 
+
 * Thu Dec  7 2006 Paul Wouters <paul@xelerance.com> 1.1.06-5
 - Changed space/tab replacing method
 
@@ -329,10 +336,10 @@ install -p -D -m755 -d %{buildroot}%{_localstatedir}/run/xl2tpd
 
 * Sat Jun 4 2005 Jacco de Leeuw <jacco2@dds.nl>
 - l2tpd.org has been hijacked. Project moved back to SourceForge:
-  http://l2tpd.sourceforge.net 
+  http://l2tpd.sourceforge.net
 
 * Tue May 3 2005 Jacco de Leeuw <jacco2@dds.nl>
-- Small Makefile fixes. Explicitly use gcc instead of cc. 
+- Small Makefile fixes. Explicitly use gcc instead of cc.
   Network services library was not linked on Solaris due to typo.
 
 * Thu Mar 17 2005 Jacco de Leeuw <jacco2@dds.nl> 0.69-11jdl
@@ -341,7 +348,7 @@ install -p -D -m755 -d %{buildroot}%{_localstatedir}/run/xl2tpd
 
 * Fri Feb 4 2005 Jacco de Leeuw <jacco2@dds.nl>
 - Added code from Roaring Penguin (rp-l2tp) to support SysV-style ptys.
-  Requires the N_HDLC kernel module. 
+  Requires the N_HDLC kernel module.
 
 * Fri Nov 26 2004 Jacco de Leeuw <jacco2@dds.nl>
 - Updated the README.
@@ -397,7 +404,7 @@ install -p -D -m755 -d %{buildroot}%{_localstatedir}/run/xl2tpd
 - Renamed the example Openswan .conf files to better reflect
   the situation. There are two variants using different portselectors.
   Previously I thought Windows 2000/XP used portselector 17/0
-  and the rest used 17/1701. But with the release of an updated 
+  and the rest used 17/1701. But with the release of an updated
   IPsec client by Microsoft, it turns out that 17/0 must have
   been a mistake: the updated client now also uses 17/1701.
 
@@ -411,7 +418,7 @@ install -p -D -m755 -d %{buildroot}%{_localstatedir}/run/xl2tpd
 
 * Thu Mar 6 2003 Jacco de Leeuw <jacco2@dds.nl> 0.69-5jdl
 - Replaced Dominique's patch by Damion de Soto's, which does not
-  depend on the N_HDLC kernel module. 
+  depend on the N_HDLC kernel module.
 
 * Wed Feb 26 2003 Jacco de Leeuw <jacco2@dds.nl> 0.69-4jdl
 - Seperate example config files for Win9x (MSL2TP) and Win2K/XP
@@ -445,7 +452,7 @@ install -p -D -m755 -d %{buildroot}%{_localstatedir}/run/xl2tpd
 - Specfile adapted from Mandrake Cooker. The original RPM can be
   retrieved through:
   http://www.rpmfind.net/linux/rpm2html/search.php?query=l2tpd
-- Config path changed from /etc/l2tp/ to /etc/l2tpd/ 
+- Config path changed from /etc/l2tp/ to /etc/l2tpd/
   (Seems more logical and rp-l2tp already uses /etc/l2tp/).
 - Do not run at boot or install. The original RPM uses a config file
   which is completely commented out, but it still starts l2tpd on all