[packages/wanpipe] - updated to 7.0.10 - added linux3 patch (fixes build with Linux >= 3.0 < 3.9)

[qboosh]

commit 55cb143222ca6599017b427cca54a425c930f586
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Feb 16 09:04:28 2014 +0100

    - updated to 7.0.10
    - added linux3 patch (fixes build with Linux >= 3.0 < 3.9)

 wanpipe-linux3.patch | 22 ++++++++++++++++++++++
 wanpipe.spec         |  6 ++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/wanpipe.spec b/wanpipe.spec
index 5b67701..0585bc6 100644
--- a/wanpipe.spec
+++ b/wanpipe.spec
@@ -12,12 +12,12 @@
 Summary:	WAN routing package for Sangoma cards
 Summary(pl.UTF-8):	Pakiet do rutingu WAN dla kart Sangoma
 Name:		wanpipe
-Version:	7.0.8
+Version:	7.0.10
 Release:	%{rel}
 License:	GPL v2+, partially BSD
 Group:		Applications/System
 Source0:	ftp://ftp.sangoma.com/linux/current_wanpipe/%{name}-%{version}.tgz
-# Source0-md5:	fe2d6a2c1aa63d2024beeabd9adb4e8e
+# Source0-md5:	ee1f34dbbf0e4ee340813b33d5f12de3
 Source1:	wanrouter.init
 Source2:	wanrouter.sysconfig
 Source3:	%{name}1.conf
@@ -26,6 +26,7 @@ Patch1:		%{name}-opt.patch
 Patch2:		%{name}-setup.patch
 Patch3:		%{name}-kbuild.patch
 Patch4:		%{name}-format.patch
+Patch5:		%{name}-linux3.patch
 URL:		http://www.sangoma.com/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -122,6 +123,7 @@ Ten pakiet zawiera moduł WANPIPE dla Linuksa.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 sed -i 's#EXTRA_UTIL_FLAGS = #EXTRA_UTIL_FLAGS = -I/usr/include/ncurses #' Makefile
 sed -i 's#<ncurses.h>#<ncurses/ncurses.h>#' util/lxdialog/Makefile
diff --git a/wanpipe-linux3.patch b/wanpipe-linux3.patch
new file mode 100644
index 0000000..f758ce5
--- /dev/null
+++ b/wanpipe-linux3.patch
@@ -0,0 +1,22 @@
+--- wanpipe-7.0.10/patches/kdrivers/src/wanrouter/af_wanpipe.c.orig	2014-02-16 08:53:50.845662793 +0100
++++ wanpipe-7.0.10/patches/kdrivers/src/wanrouter/af_wanpipe.c	2014-02-16 08:51:49.382334557 +0100
+@@ -1736,7 +1736,7 @@
+ 	}	
+ 
+ 	read_lock(&wanpipe_sklist_lock);
+-#if defined(LINUX_3_0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)
+ 	sk_for_each(sk, &wanpipe_sklist) {
+ #elif defined(LINUX_2_6)
+ 	sk_for_each(sk, node, &wanpipe_sklist) {
+--- wanpipe-7.0.10/patches/kdrivers/src/wanrouter/af_wanpipe_datascope.c.orig	2008-08-01 15:00:00.000000000 +0200
++++ wanpipe-7.0.10/patches/kdrivers/src/wanrouter/af_wanpipe_datascope.c	2014-02-16 08:51:26.309002194 +0100
+@@ -152,7 +152,7 @@
+ #ifdef LINUX_2_6
+ 	{
+ 	struct hlist_node *node;
+-#ifdef LINUX_3_0
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)
+ 	sk_for_each(parent_sk, &wanpipe_parent_sklist) {
+ #else
+ 	sk_for_each(parent_sk, node, &wanpipe_parent_sklist) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wanpipe.git/commitdiff/55cb143222ca6599017b427cca54a425c930f586