Add patch for 2.6.20 compatibility thanks to Martin von Gagern <Martin.vGagern@gmx.net> in bug 163366

Package-Manager: portage-2.1.2-r7

5 files changed, 180 insertions, 18 deletions

diff --git a/net-dialup/fritzcapi/ChangeLog b/net-dialup/fritzcapi/ChangeLog
index 4ee5e4a66d85..b26998452b66 100644
--- a/net-dialup/fritzcapi/ChangeLog
+++ b/net-dialup/fritzcapi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/fritzcapi
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.25 2006/12/13 19:51:39 genstef Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.26 2007/02/04 22:25:24 genstef Exp $
+
+  04 Feb 2007; <genstef@gentoo.org>
+  +files/2.6.43-linux-2.6.19-irq_handler.patch, fritzcapi-2.6.43.ebuild:
+  Add patch for 2.6.20 compatibility thanks to Martin von Gagern
+  <Martin.vGagern@gmx.net> in bug 163366
 
   13 Dec 2006; Stefan Schweizer <genstef@gentoo.org>
   +files/fcusb2-2.6.19.patch, fritzcapi-2.6.43.ebuild:
diff --git a/net-dialup/fritzcapi/Manifest b/net-dialup/fritzcapi/Manifest
index cb405ae443e5..e746891fc66b 100644
--- a/net-dialup/fritzcapi/Manifest
+++ b/net-dialup/fritzcapi/Manifest
@@ -1,21 +1,25 @@
+AUX 2.6.43-linux-2.6.19-irq_handler.patch 6472 RMD160 a899fc6f602b0bb988ab68aa82c3947ca3f3b139 SHA1 2d89534668665afc71b0476bd4e4749f4cd80067 SHA256 b9df1c8677a29e25c77b65d0b219b4ddbcc373a9dd628ac0a79dfb3c1c3a57e8
+MD5 718ece9c17590750a4b13679c1302596 files/2.6.43-linux-2.6.19-irq_handler.patch 6472
+RMD160 a899fc6f602b0bb988ab68aa82c3947ca3f3b139 files/2.6.43-linux-2.6.19-irq_handler.patch 6472
+SHA256 b9df1c8677a29e25c77b65d0b219b4ddbcc373a9dd628ac0a79dfb3c1c3a57e8 files/2.6.43-linux-2.6.19-irq_handler.patch 6472
 AUX fcusb2-2.6.19.patch 396 RMD160 923e9cfcc98cca937cb5311db09d8c4b6d913442 SHA1 b8fb157ce239ed250501a1ab093e8dbd51bf97a6 SHA256 67541e2783e105ce1d7ca9f4d76fff7fb1f9cb9acc74a21c9d375b40d5df01b3
 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
 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
-EBUILD fritzcapi-2.6.43.ebuild 5345 RMD160 0904d55957130637d6a3c8d8855617fca2b59fc4 SHA1 c8cd7c70a842a6418349e419275d3bd1828228ab SHA256 82ae6455b148cdd6dc5818dae0140945aaf26f0b298047a302bc08d1feffcfd6
-MD5 b7cab071ac3306ac3fbf910006bd80ef fritzcapi-2.6.43.ebuild 5345
-RMD160 0904d55957130637d6a3c8d8855617fca2b59fc4 fritzcapi-2.6.43.ebuild 5345
-SHA256 82ae6455b148cdd6dc5818dae0140945aaf26f0b298047a302bc08d1feffcfd6 fritzcapi-2.6.43.ebuild 5345
-MISC ChangeLog 4841 RMD160 0149956f82870acfb2e81c8678175e6c06969b66 SHA1 92a6c2e8d021fc319a368e4f59019117610241cb SHA256 5f9f189a6f642e4e30ecddc7347a532c55b89f13ff118c7c5a7b4ec31cd8848b
-MD5 dae764e8123c02db9c7adf1da1f70d02 ChangeLog 4841
-RMD160 0149956f82870acfb2e81c8678175e6c06969b66 ChangeLog 4841
-SHA256 5f9f189a6f642e4e30ecddc7347a532c55b89f13ff118c7c5a7b4ec31cd8848b ChangeLog 4841
+DIST km_fritzcapi-2.6-43.x86_64.rpm 1006645 RMD160 7338380933345b211ba92654565c78cf4ad793ca SHA1 f7e5d9cf8c43db73b4e0c4fcb76753af74b6e743 SHA256 506ff28f5fd1d70969378d52d5d48f9937b585556a4a5475bbfd92865b74a860
+EBUILD fritzcapi-2.6.43.ebuild 5469 RMD160 51348d25c4eeb9010a6641a7e1d77564cd682ea3 SHA1 1695a484c855919d855403f93ef743bd8ae8b119 SHA256 920e0ee29ae239441f7aa9ceba1e4a8c7c9d25d6ec2ae5d0eef54988e36e4fe8
+MD5 56a0451e5124d9fdd7fc1fb022d1e602 fritzcapi-2.6.43.ebuild 5469
+RMD160 51348d25c4eeb9010a6641a7e1d77564cd682ea3 fritzcapi-2.6.43.ebuild 5469
+SHA256 920e0ee29ae239441f7aa9ceba1e4a8c7c9d25d6ec2ae5d0eef54988e36e4fe8 fritzcapi-2.6.43.ebuild 5469
+MISC ChangeLog 5057 RMD160 40a630c69e17d79363f1b7d2d88d7b3cdf83d4cb SHA1 7b36f2d28c23a0c675c07166f7ab2cb873257334 SHA256 6d332f16bc833025179c8cac3034c36d673e4dbf91e39c35b171d2bae9538647
+MD5 e247ae63bc630cdf9e9e2fbc6cbbd8af ChangeLog 5057
+RMD160 40a630c69e17d79363f1b7d2d88d7b3cdf83d4cb ChangeLog 5057
+SHA256 6d332f16bc833025179c8cac3034c36d673e4dbf91e39c35b171d2bae9538647 ChangeLog 5057
 MISC metadata.xml 319 RMD160 d4d008a13689fabae0994a25a60961b2fc5e6269 SHA1 bfea39d327ea986c5fc5e31864ce1bfeccb2f4d9 SHA256 ce891f4c7e75069036c8c422a1502ce9bbd4670be2e7f918dfa9da5e917787fc
 MD5 0498b76c69caf75c82ab7115df4cd4f8 metadata.xml 319
 RMD160 d4d008a13689fabae0994a25a60961b2fc5e6269 metadata.xml 319
 SHA256 ce891f4c7e75069036c8c422a1502ce9bbd4670be2e7f918dfa9da5e917787fc metadata.xml 319
-MD5 74239aa732884700de3f06a4776ef529 files/digest-fritzcapi-2.6.43 344
-RMD160 17975c68cde3c435031b0235e07bff62549c550b files/digest-fritzcapi-2.6.43 344
-SHA256 1433d7644bb83eeee7b52d3c2cec82571678f91b785c8af36007ff6994166d56 files/digest-fritzcapi-2.6.43 344
+MD5 028f9d03268a88f75ab13f1c31f83767 files/digest-fritzcapi-2.6.43 542
+RMD160 95e382f60944777de7af81a40d80732e347a3a4c files/digest-fritzcapi-2.6.43 542
+SHA256 60364bdf51ef70f8c4f4a53eb1aead745b1266cd09d855c1fa842a309aeae1ef files/digest-fritzcapi-2.6.43 542
diff --git a/net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.patch b/net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.patch
new file mode 100644
index 000000000000..0e203196909a
--- /dev/null
+++ b/net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.patch
@@ -0,0 +1,148 @@
+irq_handler_t has changed type in 2.6.19 due to commit
+7d12e780e003f93433d49ce78cfedf4b4c52adc5 by David Howells,
+for details see git diff at http://tinyurl.com/2xpdy7
+
+As the third argument was never used by the drivers, I simply wrapped every
+occurrence of it in a condition for kernel version prior to 2.6.19.
+2007-01-13 Martin von Gagern <Martin.vGagern@gmx.net>
+
+diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.classic/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.classic/src/driver.c
+--- usr.orig/src/kernel-modules/fritzcapi/fritz.classic/src/driver.c	2007-01-22 23:36:39.000000000 +0100
++++ usr/src/kernel-modules/fritzcapi/fritz.classic/src/driver.c	2007-01-23 00:04:30.000000000 +0100
+@@ -107,7 +107,11 @@
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+ static void scheduler (unsigned long data);
+-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs);
++static irqreturn_t irq_handler (int irq, void * args
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
++				, struct pt_regs * regs
++#endif
++				);
+ 
+ static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);
+ 
+@@ -805,11 +809,17 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) {
++static irqreturn_t irq_handler (int irq, void * args
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
++				, struct pt_regs * regs
++#endif
++				) {
+ 	int	res	= IRQ_NONE;
+ 	
+ 	UNUSED_ARG (irq);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 	UNUSED_ARG (regs);
++#endif
+ 	if (args != NULL) {
+ 		assert (capi_lib->cm_handle_events != NULL);
+ 		if (atomic_read (&scheduler_id) == smp_processor_id ()) {
+diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c
+--- usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c	2007-01-22 23:36:39.000000000 +0100
++++ usr/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c	2007-01-23 00:07:18.000000000 +0100
+@@ -107,7 +107,11 @@
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+ static void scheduler (unsigned long data);
+-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs);
++static irqreturn_t irq_handler (int irq, void * args
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
++				, struct pt_regs * regs
++#endif
++				);
+ 
+ static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);
+ 
+@@ -836,11 +840,17 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) {
++static irqreturn_t irq_handler (int irq, void * args
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
++				, struct pt_regs * regs
++#endif
++				) {
+ 	int	res	= IRQ_NONE;
+ 	
+ 	UNUSED_ARG (irq);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 	UNUSED_ARG (regs);
++#endif
+ 	if (args != NULL) {
+ 		assert (capi_lib->cm_handle_events != NULL);
+ 		if (atomic_read (&scheduler_id) == smp_processor_id ()) {
+diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c
+--- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c	2007-01-22 23:36:39.000000000 +0100
++++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c	2007-01-23 00:07:18.000000000 +0100
+@@ -107,7 +107,11 @@
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+ static void scheduler (unsigned long data);
+-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs);
++static irqreturn_t irq_handler (int irq, void * args
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
++				, struct pt_regs * regs
++#endif
++				);
+ 
+ static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);
+ 
+@@ -836,11 +840,17 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) {
++static irqreturn_t irq_handler (int irq, void * args
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
++				, struct pt_regs * regs
++#endif
++				) {
+ 	int	res	= IRQ_NONE;
+ 	
+ 	UNUSED_ARG (irq);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 	UNUSED_ARG (regs);
++#endif
+ 	if (args != NULL) {
+ 		assert (capi_lib->cm_handle_events != NULL);
+ 		if (atomic_read (&scheduler_id) == smp_processor_id ()) {
+diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pnp/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.pnp/src/driver.c
+--- usr.orig/src/kernel-modules/fritzcapi/fritz.pnp/src/driver.c	2007-01-22 23:36:39.000000000 +0100
++++ usr/src/kernel-modules/fritzcapi/fritz.pnp/src/driver.c	2007-01-23 00:04:52.000000000 +0100
+@@ -107,7 +107,11 @@
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+ static void scheduler (unsigned long data);
+-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs);
++static irqreturn_t irq_handler (int irq, void * args
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
++				, struct pt_regs * regs
++#endif
++				);
+ 
+ static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);
+ 
+@@ -805,11 +809,17 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) {
++static irqreturn_t irq_handler (int irq, void * args
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
++				, struct pt_regs * regs
++#endif
++				) {
+ 	int	res	= IRQ_NONE;
+ 	
+ 	UNUSED_ARG (irq);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 	UNUSED_ARG (regs);
++#endif
+ 	if (args != NULL) {
+ 		assert (capi_lib->cm_handle_events != NULL);
+ 		if (atomic_read (&scheduler_id) == smp_processor_id ()) {
diff --git a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.43 b/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.43
index 990e37766fea..4ac5efd0967b 100644
--- a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.43
+++ b/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.43
@@ -2,3 +2,5 @@ MD5 5f9f4f61426f3cf5aa10aad42fad6444 km_fritzcapi-2.6-43.i586.rpm 2991322
 RMD160 a300b383d474ddf9283c1bd9fae310be196c0199 km_fritzcapi-2.6-43.i586.rpm 2991322
 SHA256 e90827d8c2b53dc475c97be8c8a018777830519592bc9e25ef1a49389d12e475 km_fritzcapi-2.6-43.i586.rpm 2991322
 MD5 d59f758e9f6da998cd77775fc3547882 km_fritzcapi-2.6-43.x86_64.rpm 1006645
+RMD160 7338380933345b211ba92654565c78cf4ad793ca km_fritzcapi-2.6-43.x86_64.rpm 1006645
+SHA256 506ff28f5fd1d70969378d52d5d48f9937b585556a4a5475bbfd92865b74a860 km_fritzcapi-2.6-43.x86_64.rpm 1006645
diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild
index 441b5c21e578..a8dee47f6f41 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-2006 Gentoo Foundation
+# 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.6 2006/12/13 19:51:39 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild,v 1.7 2007/02/04 22:25:24 genstef Exp $
 
 inherit linux-mod rpm eutils
 
@@ -117,13 +117,16 @@ src_unpack() {
 	if [ -e fritz.usb2 ]; then
 		cd fritz.usb2; epatch ${FILESDIR}/fcusb2-2.6.19.patch; cd ..
 	fi
-	find -name \*.[hc] -print0 | xargs -0 sed -i 's:#include <linux/config\.h>:#include <linux/autoconf.h>:'
+	epatch ${FILESDIR}/2.6.43-linux-2.6.19-irq_handler.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/;'
 }
 
 src_install() {
 	linux-mod_src_install
 
-	dodir /lib/firmware /etc
+	keepdir /lib/firmware
 
 	[ "${FRITZCAPI_BUILD_TARGETS/xusb_CZ/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && \
 		dodoc "${S}/fritz.xusb_CZ/README.fxusb_CZ"