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

[Paul Wouters]

commit 56764a95d2d759fe4903fe9a96e5427a36792217
Author: Paul Wouters <paul at libreswan.org>
Date:   Tue Jun 12 11:43:44 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)

 xl2tpd-1.3.1-conf.patch |   25 +++++++++++++++++++++++++
 xl2tpd.spec             |    8 +++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/xl2tpd-1.3.1-conf.patch b/xl2tpd-1.3.1-conf.patch
new file mode 100644
index 0000000..48aa3fd
--- /dev/null
+++ b/xl2tpd-1.3.1-conf.patch
@@ -0,0 +1,25 @@
+diff -Naur xl2tpd-1.3.1-orig/examples/xl2tpd.conf xl2tpd-1.3.1/examples/xl2tpd.conf
+--- xl2tpd-1.3.1-orig/examples/xl2tpd.conf	2011-10-06 15:22:05.000000000 -0400
++++ xl2tpd-1.3.1/examples/xl2tpd.conf	2012-06-12 11:40:10.870840864 -0400
+@@ -14,6 +14,11 @@
+ ; in the example below). Yet another IP address (local ip, e.g. 192.168.1.99)
+ ; will be used by xl2tpd as its address on pppX interfaces.
+ 
++
++; IMPORTANT: always set listen-addr to a specific address, to work around a
++; udpfromto bug!!!
++
++
+ [global]
+ ; listen-addr = 192.168.1.98
+ ;
+@@ -31,7 +36,8 @@
+ [lns default]
+ ip range = 192.168.1.128-192.168.1.254
+ local ip = 192.168.1.99
+-require chap = yes
++; leave chap unspecified for maximum compatibility with windows, iOS, etc
++; require chap = yes
+ refuse pap = yes
+ require authentication = yes
+ name = LinuxVPNserver
diff --git a/xl2tpd.spec b/xl2tpd.spec
index 4289abb..1ac6793 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,7 @@ 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
 
 %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 +117,10 @@ 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)
+
 * 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