From 442f6f89f5cd30bfd93b95862e00f6dc7f87f485 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Tue, 12 Jun 2012 12:27:37 -0400 Subject: [PATCH] * Tue Jun 12 2012 Paul Wouters - 1.3.1-7 - Improved patch, more doc fixed (esp. "force userspace" option) --- xl2tpd-1.3.1-conf.patch | 42 +++++++++++++++++++++++++++++++++++++++-- xl2tpd.spec | 5 ++++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/xl2tpd-1.3.1-conf.patch b/xl2tpd-1.3.1-conf.patch index 48aa3fd..7c240fc 100644 --- a/xl2tpd-1.3.1-conf.patch +++ b/xl2tpd-1.3.1-conf.patch @@ -1,6 +1,36 @@ +diff -Naur xl2tpd-1.3.1-orig/examples/chapsecrets.sample xl2tpd-1.3.1/examples/chapsecrets.sample +--- xl2tpd-1.3.1-orig/examples/chapsecrets.sample 2011-10-06 15:22:05.000000000 -0400 ++++ xl2tpd-1.3.1/examples/chapsecrets.sample 2012-06-12 12:08:26.850851970 -0400 +@@ -1,7 +1,9 @@ +-# Secrets for authentication using CHAP +-# client server secret IP addresses +-jacco * "mysecret" 192.168.1.128/25 +-* jacco "mysecret" 192.168.1.128/25 +-sam * "rumpelstiltskin" 192.168.1.5 +-* sam "rumpelstiltskin" 192.168.1.5 +- ++# Secrets for authentication on server using CHAP ++# client server secret IP addresses ++jacco * "mysecret" 192.168.1.128/25 # Dynamic IP ++sam * "rumpelstiltskin" 192.168.1.5 # Static IP ++# ++# Secrets for authentication on client using CHAP ++# client server secret IP addresses ++* jacco "mysecret" ++* sam "rumpelstiltskin" +diff -Naur xl2tpd-1.3.1-orig/examples/README xl2tpd-1.3.1/examples/README +--- xl2tpd-1.3.1-orig/examples/README 2011-10-06 15:22:05.000000000 -0400 ++++ xl2tpd-1.3.1/examples/README 2012-06-12 12:08:26.850851970 -0400 +@@ -1,2 +1,4 @@ +-These are example files for use with xl2tpd. The xl2tpd*conf files are +-examples to use xl2tpd with Openswan's IPsec. See www.openswan.org ++These are example files for use with xl2tpd. ++ ++Openswan carries config examples for use with l2tp-over-ipsec. ++See http://www.openswan.org/ 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 ++++ xl2tpd-1.3.1/examples/xl2tpd.conf 2012-06-12 12:27:00.922911049 -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. @@ -13,7 +43,15 @@ diff -Naur xl2tpd-1.3.1-orig/examples/xl2tpd.conf xl2tpd-1.3.1/examples/xl2tpd.c [global] ; listen-addr = 192.168.1.98 ; -@@ -31,7 +36,8 @@ +@@ -24,14 +29,15 @@ + ; when using any of the SAref kernel patches for kernels up to 2.6.35. + ; ipsec refinfo = 30 + ; +-; forceuserspace = yes ++; force userspace = yes + ; + ; debug tunnel = yes + [lns default] ip range = 192.168.1.128-192.168.1.254 local ip = 192.168.1.99 diff --git a/xl2tpd.spec b/xl2tpd.spec index 1ac6793..9bc5e55 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: 6%{?dist} +Release: 7%{?dist} License: GPL+ Url: http://www.xelerance.com/software/xl2tpd/ Group: System Environment/Daemons @@ -117,6 +117,9 @@ fi %ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control %changelog +* Tue Jun 12 2012 Paul Wouters - 1.3.1-7 +- Improved patch, more doc fixed (esp. "force userspace" option) + * Tue Jun 12 2012 Paul Wouters - 1.3.1-6 - Added patch for xl2tpd.conf to improve interop settings (no longer need to say "no encryption" on Windows)