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

Package-Manager: portage-2.1.2-r7

4 files changed, 93 insertions, 13 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/Manifest b/net-dialup/fritzcapi/Manifest
index 6f06725dc6cb..179641a92be5 100644
--- a/net-dialup/fritzcapi/Manifest
+++ b/net-dialup/fritzcapi/Manifest
@@ -10,16 +10,20 @@ AUX fcusb2-2.6.19.patch 396 RMD160 923e9cfcc98cca937cb5311db09d8c4b6d913442 SHA1
 MD5 c768ffb3ac0290117fbe06c6862a2b5b files/fcusb2-2.6.19.patch 396
 RMD160 923e9cfcc98cca937cb5311db09d8c4b6d913442 files/fcusb2-2.6.19.patch 396
 SHA256 67541e2783e105ce1d7ca9f4d76fff7fb1f9cb9acc74a21c9d375b40d5df01b3 files/fcusb2-2.6.19.patch 396
+AUX fritzcapi-2.6.20.patch 3500 RMD160 670766ffe9f17e2953c5413163a45158da0f608a SHA1 2bdcf2b28a048d2bd65d3c6a3eec70668559ad1f SHA256 6d919ea803b79caced2bdd0b35efbc739131ceb65904d14e58927d5b7875bc5e
+MD5 e2e21b27a9f8187de54c70804f201e1e files/fritzcapi-2.6.20.patch 3500
+RMD160 670766ffe9f17e2953c5413163a45158da0f608a files/fritzcapi-2.6.20.patch 3500
+SHA256 6d919ea803b79caced2bdd0b35efbc739131ceb65904d14e58927d5b7875bc5e files/fritzcapi-2.6.20.patch 3500
 DIST km_fritzcapi-2.6-43.i586.rpm 2991322 RMD160 a300b383d474ddf9283c1bd9fae310be196c0199 SHA1 80768055694913b706075fa03f15a7477ef29a3f SHA256 e90827d8c2b53dc475c97be8c8a018777830519592bc9e25ef1a49389d12e475
 DIST km_fritzcapi-2.6-43.x86_64.rpm 1006645 RMD160 7338380933345b211ba92654565c78cf4ad793ca SHA1 f7e5d9cf8c43db73b4e0c4fcb76753af74b6e743 SHA256 506ff28f5fd1d70969378d52d5d48f9937b585556a4a5475bbfd92865b74a860
-EBUILD fritzcapi-2.6.43.ebuild 5258 RMD160 b5c14cd98d10967fbf4f29b4d957e57d005de619 SHA1 b27473ba607068cf77ef4d6680ac0230df32c363 SHA256 b9766d41affeb4ab0d462419fa12d42d9795053a8a91f785d88e6cd7b8110bde
-MD5 0008c5e5eb4cdb086faa41f1f0ff77c8 fritzcapi-2.6.43.ebuild 5258
-RMD160 b5c14cd98d10967fbf4f29b4d957e57d005de619 fritzcapi-2.6.43.ebuild 5258
-SHA256 b9766d41affeb4ab0d462419fa12d42d9795053a8a91f785d88e6cd7b8110bde fritzcapi-2.6.43.ebuild 5258
-MISC ChangeLog 5212 RMD160 d99ce5df6ce25fb41a12ecc5c5863e00e9802118 SHA1 acc2115d726b620cbd574752bc124edbd9d55623 SHA256 da4c64d440ad0e09c01d2987cb2d8ac6c9f5b12c8d031234ede3b99e0deb0609
-MD5 72b6365ec279fef8b7bce3358a4bde8b ChangeLog 5212
-RMD160 d99ce5df6ce25fb41a12ecc5c5863e00e9802118 ChangeLog 5212
-SHA256 da4c64d440ad0e09c01d2987cb2d8ac6c9f5b12c8d031234ede3b99e0deb0609 ChangeLog 5212
+EBUILD fritzcapi-2.6.43.ebuild 5312 RMD160 e9ac1a9e5ab29bcfb6fbd9c25f274a342bfcfc25 SHA1 a240e615f1d9bd1e8e122d60593f025f78449a0a SHA256 885841c1fac879170718fdbe4f47085f45ad07c788a59cafbb3fc1b83d2650cc
+MD5 373ce77b61c0132d536199f2cd68cdb6 fritzcapi-2.6.43.ebuild 5312
+RMD160 e9ac1a9e5ab29bcfb6fbd9c25f274a342bfcfc25 fritzcapi-2.6.43.ebuild 5312
+SHA256 885841c1fac879170718fdbe4f47085f45ad07c788a59cafbb3fc1b83d2650cc fritzcapi-2.6.43.ebuild 5312
+MISC ChangeLog 5401 RMD160 18530340c91cf55fcff85d4dc3ed4934d8ae3145 SHA1 c33cbef56221e3e05a0b73a82c9affb8d5388425 SHA256 9965af98e938133e8966c508c73ed81e4d64d83beb88c090c70625020a7f3124
+MD5 70b50774f58dfbc4d4ba35e130c03c62 ChangeLog 5401
+RMD160 18530340c91cf55fcff85d4dc3ed4934d8ae3145 ChangeLog 5401
+SHA256 9965af98e938133e8966c508c73ed81e4d64d83beb88c090c70625020a7f3124 ChangeLog 5401
 MISC metadata.xml 319 RMD160 d4d008a13689fabae0994a25a60961b2fc5e6269 SHA1 bfea39d327ea986c5fc5e31864ce1bfeccb2f4d9 SHA256 ce891f4c7e75069036c8c422a1502ce9bbd4670be2e7f918dfa9da5e917787fc
 MD5 0498b76c69caf75c82ab7115df4cd4f8 metadata.xml 319
 RMD160 d4d008a13689fabae0994a25a60961b2fc5e6269 metadata.xml 319
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/;'