[xl2tpd/f16] * Tue Jun 12 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-6 - Added patch for xl2tpd.conf to impr

[Paul Wouters]

commit 0a1aa9277a72ebbfb4436066ce82a32c3256f51d
Author: Paul Wouters <paul at libreswan.org>
Date:   Tue Jun 12 13:22:15 2012 -0400

    * Tue Jun 12 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-6
    - Added patch for xl2tpd.conf to improve interop settings
      (no longer need to say "no encryption" on Windows)
    - Improved patch, more doc fixed (esp. "force userspace" option)
    - don't use old version of if_pppol2tp.h

 xl2tpd.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/xl2tpd.spec b/xl2tpd.spec
index de96276..ae71ff5 100644
--- a/xl2tpd.spec
+++ b/xl2tpd.spec
@@ -1,7 +1,7 @@
 Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
 Name: xl2tpd
 Version: 1.3.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL+
 Url: http://www.xelerance.com/software/xl2tpd/
 Group: System Environment/Daemons
@@ -11,6 +11,7 @@ Source2: tmpfiles-xl2tpd.conf
 Patch1: xl2tpd-1.3.1-Wunused.patch
 Patch2: xl2tpd-bz80693.patch
 Patch3: xl2tpd-1.3.0-kernelmode.patch
+Patch4: xl2tpd-1.3.1-conf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: ppp >= 2.4.5-18
 BuildRequires: libpcap-devel
@@ -50,6 +51,8 @@ It was de-facto maintained by Jacco de Leeuw <jacco2 at dds.nl> in 2002 and 2003.
 %patch1 -p1 
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+rm linux/include/linux/if_pppol2tp.h 
 
 %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"
@@ -115,6 +118,12 @@ fi
 %ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control
 
 %changelog
+* Tue Jun 12 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-6
+- Added patch for xl2tpd.conf to improve interop settings
+  (no longer need to say "no encryption" on Windows)
+- Improved patch, more doc fixed (esp. "force userspace" option)
+- don't use old version of if_pppol2tp.h
+
 * Wed Apr 18 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-5
 - Added support for CONFIG_PPPOL2TP by sigwall <fionov at gmail.com>
 - Require current ppp because some old versions lacked pppol2tp.so plugin