Add patch to fix kernels >= 2.6.20 thanks to Michael Biebl <biebl@teco.edu> in bug 165536

(Portage version: 2.1.2-r7)

3 files changed, 81 insertions, 5 deletions

diff --git a/net-dialup/fritzcapi/ChangeLog b/net-dialup/fritzcapi/ChangeLog
index b6b1db92d255..c18af119471d 100644
--- a/net-dialup/fritzcapi/ChangeLog
+++ b/net-dialup/fritzcapi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/fritzcapi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.27 2007/02/05 23:08:15 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.28 2007/02/06 08:14:34 genstef Exp $
+
+  06 Feb 2007; <genstef@gentoo.org> +files/fritzcapi-2.6.20.patch,
+  fritzcapi-2.6.43.ebuild:
+  Add patch to fix kernels >= 2.6.20 thanks to Michael Biebl <biebl@teco.edu>
+  in bug 165536
 
   05 Feb 2007; <genstef@gentoo.org> +files/2.6.43-fcpcmcia.patch,
   fritzcapi-2.6.43.ebuild:
diff --git a/net-dialup/fritzcapi/files/fritzcapi-2.6.20.patch b/net-dialup/fritzcapi/files/fritzcapi-2.6.20.patch
new file mode 100644
index 000000000000..6531099d8cd7
--- /dev/null
+++ b/net-dialup/fritzcapi/files/fritzcapi-2.6.20.patch
@@ -0,0 +1,72 @@
+diff -urN usr.orig/src/kernel-modules/fritzcapi/e2220pc/src/driver.c usr/src/kernel-modules/fritzcapi/e2220pc/src/driver.c
+--- usr.orig/src/kernel-modules/fritzcapi/e2220pc/src/driver.c	2007-02-06 00:41:17.000000000 +0100
++++ usr/src/kernel-modules/fritzcapi/e2220pc/src/driver.c	2007-02-06 00:42:57.000000000 +0100
+@@ -756,7 +756,7 @@
+ 	close_func = func;
+ 	close_data = data;
+ 
+-	INIT_WORK (&closing_work, closing_worker, capi_card);
++	INIT_WORK (&closing_work, closing_worker);
+ 	schedule_work (&closing_work);
+ 	LOG("Worker scheduled.\n");
+ } /* start_closing_worker */
+diff -urN usr.orig/src/kernel-modules/fritzcapi/e5520pc/src/driver.c usr/src/kernel-modules/fritzcapi/e5520pc/src/driver.c
+--- usr.orig/src/kernel-modules/fritzcapi/e5520pc/src/driver.c	2007-02-06 00:41:17.000000000 +0100
++++ usr/src/kernel-modules/fritzcapi/e5520pc/src/driver.c	2007-02-06 00:43:12.000000000 +0100
+@@ -756,7 +756,7 @@
+ 	close_func = func;
+ 	close_data = data;
+ 
+-	INIT_WORK (&closing_work, closing_worker, capi_card);
++	INIT_WORK (&closing_work, closing_worker);
+ 	schedule_work (&closing_work);
+ 	LOG("Worker scheduled.\n");
+ } /* start_closing_worker */
+diff -urN usr.orig/src/kernel-modules/fritzcapi/fritz.usb/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.usb/src/driver.c
+--- usr.orig/src/kernel-modules/fritzcapi/fritz.usb/src/driver.c	2007-02-06 00:41:17.000000000 +0100
++++ usr/src/kernel-modules/fritzcapi/fritz.usb/src/driver.c	2007-02-06 00:43:33.000000000 +0100
+@@ -789,7 +789,7 @@
+ 	close_func = func;
+ 	close_data = data;
+ 
+-	INIT_WORK (&closing_work, closing_worker, capi_card);
++	INIT_WORK (&closing_work, closing_worker);
+ 	schedule_work (&closing_work);
+ 	LOG("Worker scheduled.\n");
+ } /* start_closing_worker */
+diff -urN usr.orig/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c
+--- usr.orig/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c	2007-02-06 00:41:17.000000000 +0100
++++ usr/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c	2007-02-06 00:46:06.000000000 +0100
+@@ -789,7 +789,7 @@
+ 	close_func = func;
+ 	close_data = data;
+ 
+-	INIT_WORK (&closing_work, closing_worker, capi_card);
++	INIT_WORK (&closing_work, closing_worker);
+ 	schedule_work (&closing_work);
+ 	LOG("Worker scheduled.\n");
+ } /* start_closing_worker */
+diff -urN usr.orig/src/kernel-modules/fritzcapi/fritz.xusb/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.xusb/src/driver.c
+--- usr.orig/src/kernel-modules/fritzcapi/fritz.xusb/src/driver.c	2007-02-06 00:41:17.000000000 +0100
++++ usr/src/kernel-modules/fritzcapi/fritz.xusb/src/driver.c	2007-02-06 00:43:48.000000000 +0100
+@@ -789,7 +789,7 @@
+ 	close_func = func;
+ 	close_data = data;
+ 
+-	INIT_WORK (&closing_work, closing_worker, capi_card);
++	INIT_WORK (&closing_work, closing_worker);
+ 	schedule_work (&closing_work);
+ 	LOG("Worker scheduled.\n");
+ } /* start_closing_worker */
+diff -urN usr.orig/src/kernel-modules/fritzcapi/fritz.xusb_CZ/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.xusb_CZ/src/driver.c
+--- usr.orig/src/kernel-modules/fritzcapi/fritz.xusb_CZ/src/driver.c	2007-02-06 00:41:17.000000000 +0100
++++ usr/src/kernel-modules/fritzcapi/fritz.xusb_CZ/src/driver.c	2007-02-06 00:45:52.000000000 +0100
+@@ -789,7 +789,7 @@
+ 	close_func = func;
+ 	close_data = data;
+ 
+-	INIT_WORK (&closing_work, closing_worker, capi_card);
++	INIT_WORK (&closing_work, closing_worker);
+ 	schedule_work (&closing_work);
+ 	LOG("Worker scheduled.\n");
+ } /* start_closing_worker */
diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild
index 3fe5abbe4225..6166b7d300ee 100644
--- a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild
+++ b/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild,v 1.8 2007/02/05 23:08:15 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild,v 1.9 2007/02/06 08:14:34 genstef Exp $
 
 inherit linux-mod rpm eutils
 
@@ -112,9 +112,8 @@ src_unpack() {
 		cd fritz.usb2; epatch ${FILESDIR}/fcusb2-2.6.19.patch; cd ..
 	fi
 	epatch ${FILESDIR}/2.6.43-linux-2.6.19-irq_handler.patch
-	if kernel_is ge 2 6 17; then
-		epatch ${FILESDIR}/2.6.43-fcpcmcia.patch
-	fi
+	kernel_is ge 2 6 17 && epatch ${FILESDIR}/2.6.43-fcpcmcia.patch
+	kernel_is ge 2 6 20 && epatch ${FILESDIR}/fritzcapi-2.6.20.patch
 	find -name \*.[hc] -print0 | xargs -0 sed -i '
 		s:#include <linux/config\.h>:#include <linux/autoconf.h>:;
 		s/driver_init/fc_driver_init/g; s/driver_exit/fc_driver_exit/;'