[ppp/f16] Fixed support for multilink channels in pppol2tp

[Michal Sekletar]

commit eb64d995091a3ca19c00f89e4fb4d399f4acfc6f
Author: Michal Sekletar <msekleta at redhat.com>
Date:   Sun May 20 00:22:29 2012 +0200

    Fixed support for multilink channels in pppol2tp

 ppp-2.4.5-l2tp-multilink.patch |   10 ++++++++++
 ppp.spec                       |    7 ++++++-
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/ppp-2.4.5-l2tp-multilink.patch b/ppp-2.4.5-l2tp-multilink.patch
new file mode 100644
index 0000000..909a418
--- /dev/null
+++ b/ppp-2.4.5-l2tp-multilink.patch
@@ -0,0 +1,10 @@
+diff -up ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux.l2tp-multilink ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux
+--- ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux.l2tp-multilink	2012-05-19 22:27:43.554642987 +0200
++++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux	2012-05-19 22:28:08.807407341 +0200
+@@ -1,5 +1,5 @@
+ #CC	= gcc
+-COPTS	= -O2 -g
++COPTS	= -DHAVE_MULTILINK -O2 -g
+ CFLAGS	= $(COPTS) -I. -I../.. -I../../../include -fPIC
+ LDFLAGS	= -shared
+ INSTALL	= install
diff --git a/ppp.spec b/ppp.spec
index 1d62753..64cf21c 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -1,7 +1,7 @@
 Summary: The Point-to-Point Protocol daemon
 Name: ppp
 Version: 2.4.5
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: BSD and LGPLv2+ and GPLv2+ and Public Domain
 Group: System Environment/Daemons
 URL: http://www.samba.org/ppp
@@ -32,6 +32,7 @@ Patch28: ppp-2.4.5-ppp_resolv.patch
 Patch29: ppp-2.4.5-man.patch
 Patch30: ppp-2.4.5-eth.patch
 Patch31: ppp-2.4.5-lock.patch
+Patch32: ppp-2.4.5-l2tp-multilink.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel, libpcap-devel, openssl-devel
@@ -81,6 +82,7 @@ This package contains the header files for building plugins for ppp.
 %patch30 -p1 -b .eth
 # fixes bz#708260 - SELinux is preventing access on the file LCK..ttyUSB3
 %patch31 -p1 -b .lock
+%patch32 -p1 -b .l2tp-multilink
 
 rm -f scripts/*.local
 rm -f scripts/*.change_resolv_conf
@@ -157,6 +159,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc PLUGINS
 
 %changelog
+* Mon May 21 2012 Michal Sekletar <msekleta at redhat.com>
+- Resolves: #817013 - fixed support for multilink channels in pppol2tp plugin
+
 * Thu May 17 2012 Michal Sekletar <msekleta at redhat.com>
 - Resolves: #771340 - fixed compilation of pppd without USE_EAPTLS