[xl2tpd/el6] - Added support for CONFIG_PPPOL2TP by sigwall <fionov at gmail.com> - Require current ppp because some

[Paul Wouters]

commit b265191c6c3ce6a22acba22ec9e5b63bd549acad
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Apr 22 14:02:20 2012 -0400

    - Added support for CONFIG_PPPOL2TP by sigwall <fionov at gmail.com>
    - Require current ppp because some old versions lacked pppol2tp.so plugin
    - Fix parse error on lines > 80 chars, rhbz#806963
    
    build pending ppp upgrade

 sources     |    1 -
 xl2tpd.spec |   19 +++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/sources b/sources
index 93a3b58..568bb82 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-cd13732664905194565ea7f07546876b  xl2tpd-1.2.7.tar.gz
 cf61576fef5c2d6c68279a408ec1f0d5  xl2tpd-1.3.1.tar.gz
diff --git a/xl2tpd.spec b/xl2tpd.spec
index 40f57dc..0c42c36 100644
--- a/xl2tpd.spec
+++ b/xl2tpd.spec
@@ -1,18 +1,17 @@
 Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
 Name: xl2tpd
 Version: 1.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL+
 Url: http://www.xelerance.com/software/xl2tpd/
 Group: System Environment/Daemons
 Source0: http://www.xelerance.com/software/xl2tpd/xl2tpd-%{version}.tar.gz
+Patch1: xl2tpd-1.3.1-Wunused.patch
+Patch2: xl2tpd-bz80693.patch
+Patch3: xl2tpd-1.3.0-kernelmode.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: ppp 
-%if 0%{?el3}%{?el4}
-BuildRequires: libpcap
-%else
+Requires: ppp > 2.4.5-5
 BuildRequires: libpcap-devel
-%endif
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -44,6 +43,9 @@ It was de-facto maintained by Jacco de Leeuw <jacco2 at dds.nl> in 2002 and 2003.
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -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"
@@ -93,6 +95,11 @@ fi
 %ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control
 
 %changelog
+* Sun Apr 22 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-2
+- Added support for CONFIG_PPPOL2TP by sigwall <fionov at gmail.com>
+- Require current ppp because some old versions lacked pppol2tp.so plugin
+- Fix parse error on lines > 80 chars, rhbz#806963
+
 * 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