[xl2tpd/el5] * Thu Oct 06 2011 Paul Wouters <paul at xelerance.com> - 1.3.1-1 - Upgraded to 1.3.1 that has 'saref re

[Paul Wouters]

commit 6c8bdf530edde5af9ef3fb7b610f249a9eb393cd
Author: Paul Wouters <paul at xelerance.com>
Date:   Thu Oct 6 16:09:52 2011 -0400

    * Thu Oct 06 2011 Paul Wouters <paul at xelerance.com> - 1.3.1-1
    - Upgraded to 1.3.1 that has 'saref refinfo' support
    - Compiled without DEBUG per default to gain more performance
    - Added xl2tpd-control
    - Add ghosting for l2tp pipe (bz#656725)

 .gitignore  |    3 ++-
 sources     |    1 +
 xl2tpd.spec |   25 ++++++++++++++++++++++---
 3 files changed, 25 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9ef1425..3af90b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ xl2tpd-1.1.08.tar.gz
 xl2tpd-1.1.09.tar.gz
 xl2tpd-1.1.11.tar.gz
 xl2tpd-1.2.5.tar.gz
-/xl2tpd-1.2.7.tar.gz
+xl2tpd-1.2.7.tar.gz
+xl2tpd-1.3.1.tar.gz
diff --git a/sources b/sources
index 7c8670a..93a3b58 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 cd13732664905194565ea7f07546876b  xl2tpd-1.2.7.tar.gz
+cf61576fef5c2d6c68279a408ec1f0d5  xl2tpd-1.3.1.tar.gz
diff --git a/xl2tpd.spec b/xl2tpd.spec
index a9645ff..dbc47ec 100644
--- a/xl2tpd.spec
+++ b/xl2tpd.spec
@@ -1,6 +1,6 @@
 Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
 Name: xl2tpd
-Version: 1.2.7
+Version: 1.3.1
 Release: 1%{?dist}
 License: GPL+
 Url: http://www.xelerance.com/software/xl2tpd/
@@ -29,12 +29,23 @@ Example configuration files for such a setup are included in this RPM.
 xl2tpd works by opening a pseudo-tty for communicating with pppd.
 It runs completely in userspace.
 
+xl2tpd supports IPsec SA Reference tracking to enable overlapping internak
+NAT'ed IP's by different clients (eg all clients connecting from their
+linksys internal IP 192.168.1.101) as well as multiple clients behind
+the same NAT router.
+
+xl2tpd supports the pppol2tp kernel mode operations on 2.6.23 or higher,
+or via a patch in contrib for 2.4.x kernels.
+
+Xl2tpd is based on the 0.69 L2TP by Jeff McAdams <jeffm at iglou.com>
+It was de-facto maintained by Jacco de Leeuw <jacco2 at dds.nl> in 2002 and 2003.
 
 %prep
 %setup -q
 
 %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"
+#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"
+make DFLAGS="$RPM_OPT_FLAGS -g "
 
 %install
 rm -rf %{buildroot}
@@ -82,15 +93,23 @@ fi
 %doc BUGS CHANGES CREDITS LICENSE README.* TODO doc/rfc2661.txt 
 %doc doc/README.patents examples/chapsecrets.sample
 %{_sbindir}/xl2tpd
+%{_sbindir}/xl2tpd-control
 %{_bindir}/pfc
 %{_mandir}/*/*
 %dir %{_sysconfdir}/xl2tpd
 %config(noreplace) %{_sysconfdir}/xl2tpd/*
 %config(noreplace) %{_sysconfdir}/ppp/*
 %attr(0755,root,root)  %{_initrddir}/xl2tpd
-%dir %{_localstatedir}/run/xl2tpd
+%ghost %dir %{_localstatedir}/run/xl2tpd
+%ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control
 
 %changelog
+* Thu Oct 06 2011 Paul Wouters <paul at xelerance.com> - 1.3.1-1
+- Upgraded to 1.3.1 that has 'saref refinfo' support
+- Compiled without DEBUG per default to gain more performance
+- Added xl2tpd-control
+- Add ghosting for l2tp pipe (bz#656725)
+
 * Tue Nov 30 2010 Paul Wouters <paul at xelerance.com> - 1.2.7-1
 - Updated to 1.2.7
 - Added more DEBUG build options to the make command