2.6.24 patch only for fcdsl version1 thanks to Arnd Feldmueller

Package-Manager: portage-2.1.4_rc11

4 files changed, 43 insertions, 12 deletions

diff --git a/net-dialup/fcdsl/ChangeLog b/net-dialup/fcdsl/ChangeLog
index e1824969823a..954514a6ff44 100644
--- a/net-dialup/fcdsl/ChangeLog
+++ b/net-dialup/fcdsl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/fcdsl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.30 2007/07/13 08:00:12 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.31 2007/12/21 23:15:54 genstef Exp $
+
+  21 Dec 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/fcdsl-2.6.24.diff, fcdsl-2.6.37.ebuild:
+  2.6.24 patch only for fcdsl version1 thanks to Arnd Feldmueller
 
   13 Jul 2007; Stefan Schweizer <genstef@gentoo.org>
   +files/fcdsl-2.6.22.diff, fcdsl-2.6.37.ebuild:
diff --git a/net-dialup/fcdsl/Manifest b/net-dialup/fcdsl/Manifest
index 43e686ea1be9..a4c351300786 100644
--- a/net-dialup/fcdsl/Manifest
+++ b/net-dialup/fcdsl/Manifest
@@ -6,6 +6,10 @@ AUX fcdsl-2.6.22.diff 16368 RMD160 340a51e3f4ad3659205dea6ca61f4260d0ca6bee SHA1
 MD5 fa9b250fbe66ab66e7b29b2fcff5e74e files/fcdsl-2.6.22.diff 16368
 RMD160 340a51e3f4ad3659205dea6ca61f4260d0ca6bee files/fcdsl-2.6.22.diff 16368
 SHA256 1c784fce3a9aa98d4a4db78700017b301a74847f7a3168809dcbd29c758d6af4 files/fcdsl-2.6.22.diff 16368
+AUX fcdsl-2.6.24.diff 940 RMD160 95dd862276846f148e8e74a2cb4d93927c377900 SHA1 92615b60c55628bb67df31cb190d13be5b9a2132 SHA256 a6eab9b22e20dbb5eb8898cba911dccb2b3c59b9b2225001e7e9c38d284a47cd
+MD5 3a32dbc940018b9ed599d7c7e49be56e files/fcdsl-2.6.24.diff 940
+RMD160 95dd862276846f148e8e74a2cb4d93927c377900 files/fcdsl-2.6.24.diff 940
+SHA256 a6eab9b22e20dbb5eb8898cba911dccb2b3c59b9b2225001e7e9c38d284a47cd files/fcdsl-2.6.24.diff 940
 AUX fcdsl.diff 4636 RMD160 cbb6808cc70d914352153ffa38971f331977c432 SHA1 9194d797666a011fb1f6f3f6b88e6014c81e5241 SHA256 6e30c6dd4f5e00f519b738c704171be15c7d8721fdce18a801b54fc62be9bb8c
 MD5 22a65f3dcb8b67dc53a23ef35886bf18 files/fcdsl.diff 4636
 RMD160 cbb6808cc70d914352153ffa38971f331977c432 files/fcdsl.diff 4636
@@ -30,14 +34,14 @@ DIST avm_fcdsl-2.6-37.i586.rpm 1059204 RMD160 3ab3bb6a8006167004c93c5348f07d4fc6
 DIST avm_fcdsl-2.6-37.x86_64.rpm 1064850 RMD160 f0a76d19f0ed2221f872e42dbc38cba874d31137 SHA1 a4527480201060bcfd6b4ce8c60033fa30b67be1 SHA256 b9498312286e7d3f8c3bd7ac202e7bd75245fd93dc9aa8f2c784ace90a955757
 DIST km_fcdsl-2.6-37.i586.rpm 2447670 RMD160 a8372219af67b1a9d5c27d0c382f30b5c05a2e7e SHA1 13a63e79a78f5a17d3aabb8b240ea4aada417a70 SHA256 8d767da36061ed4a0a9ee84b989d1810bcde0dab0474087b7e85e2bbc0751e4e
 DIST km_fcdsl-2.6-37.x86_64.rpm 1792580 RMD160 8484ee301a6d603a7d9d0e1c97bc8d542e31833c SHA1 d40520e4a2464f42d870041456790e989fe7b809 SHA256 0412b03faa8b4f0e0b90e915e9492ae345fe7a797270b682de64b65ed9d20d33
-EBUILD fcdsl-2.6.37.ebuild 8339 RMD160 e1c43b2b8150a35f6a0f7d166bf09422308ccded SHA1 fb08665d325cbdb9c259e90a56a15c5e5e3f8baa SHA256 9ee97a2f84d6c527feca3abc713ec27d3e8d39a05a0d691f80f92b0ae9d061c4
-MD5 0396583e567ccabd80503b0b09b0787b fcdsl-2.6.37.ebuild 8339
-RMD160 e1c43b2b8150a35f6a0f7d166bf09422308ccded fcdsl-2.6.37.ebuild 8339
-SHA256 9ee97a2f84d6c527feca3abc713ec27d3e8d39a05a0d691f80f92b0ae9d061c4 fcdsl-2.6.37.ebuild 8339
-MISC ChangeLog 5316 RMD160 01bbef101117676dafcf7f8b95b9beca25e6d65e SHA1 b7fed98bafa4b92ed21caa7a9defd0019cc778b3 SHA256 c4ab40e161a847b716cc6d828cab84977d659054cdb87e1b8a0e328de4ff7501
-MD5 f0b3d459de1592bbd7fa1e3e0d8cdf9a ChangeLog 5316
-RMD160 01bbef101117676dafcf7f8b95b9beca25e6d65e ChangeLog 5316
-SHA256 c4ab40e161a847b716cc6d828cab84977d659054cdb87e1b8a0e328de4ff7501 ChangeLog 5316
+EBUILD fcdsl-2.6.37.ebuild 8416 RMD160 e5be45d4534fed5003ecdcc5cf27364654c651ef SHA1 15a99aa5346f84bb53581b9ba0ed181f930599e0 SHA256 9e07e7a39cf884705edc3f692664fa27990ef341bd8c66ea56b2ae4838755aaf
+MD5 81905ac441b4ece358bd7e0250b093b4 fcdsl-2.6.37.ebuild 8416
+RMD160 e5be45d4534fed5003ecdcc5cf27364654c651ef fcdsl-2.6.37.ebuild 8416
+SHA256 9e07e7a39cf884705edc3f692664fa27990ef341bd8c66ea56b2ae4838755aaf fcdsl-2.6.37.ebuild 8416
+MISC ChangeLog 5485 RMD160 08c297a15f9772e4e1746eda07e9277deca1d960 SHA1 8bb5dfe414749f194cf2965265775a4f6fabb12c SHA256 4deb7852b6b4a7e07acf869c2f5f50276247828976b149bbcb65440ddb97a4ed
+MD5 eea2baf412a982f892150f921ecda74a ChangeLog 5485
+RMD160 08c297a15f9772e4e1746eda07e9277deca1d960 ChangeLog 5485
+SHA256 4deb7852b6b4a7e07acf869c2f5f50276247828976b149bbcb65440ddb97a4ed ChangeLog 5485
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
diff --git a/net-dialup/fcdsl/fcdsl-2.6.37.ebuild b/net-dialup/fcdsl/fcdsl-2.6.37.ebuild
index bd4e19a4398e..56f5b2cdb34b 100644
--- a/net-dialup/fcdsl/fcdsl-2.6.37.ebuild
+++ b/net-dialup/fcdsl/fcdsl-2.6.37.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/fcdsl/fcdsl-2.6.37.ebuild,v 1.8 2007/07/13 08:00:12 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.37.ebuild,v 1.9 2007/12/21 23:15:54 genstef Exp $
 
 inherit linux-mod eutils rpm
 
@@ -35,7 +35,7 @@ pkg_setup() {
 	FCDSL_FIRMWARES=("fds2base.bin" "fdssbase.bin" "fdsubase.frm" "fdlubase.frm"
 		"fds2base.frm" "fdslbase.bin" "fdlabase.frm")
 
-	CONFIG_CHECK="ISDN_CAPI_CAPI20"
+	#CONFIG_CHECK="ISDN_CAPI_CAPI20"
 	linux-mod_pkg_setup
 
 	MODULE_NAMES=""
@@ -74,7 +74,7 @@ src_unpack() {
 	cd "${S}"
 	mv usr/src/kernel-modules/fcdsl/src/src.fcdslusb1 \
 		usr/src/kernel-modules/fcdsl/src/src.fcdslusb
-	# do not fail even if some drivers are not present
+	# use -f to not fail even if some drivers are not present
 	einfo "When you have FCDSL_CARDS set some errors are OK here"
 	if kernel_is ge 2 6 22 ; then
 		patch -p0 -f < "${FILESDIR}"/fcdsl-2.6.22.diff
@@ -84,6 +84,7 @@ src_unpack() {
 	patch -p0 -f < ${FILESDIR}/fcdslslusb-2.6.20.diff
 	cd usr/src/kernel-modules/fcdsl/src
 	kernel_is ge 2 6 20 && patch -p1 -f < ${FILESDIR}/usb-2.6.20.diff
+	kernel_is ge 2 6 24 && patch -p0 -f < ${FILESDIR}/fcdsl-2.6.24.diff
 	cd "${S}"
 
 	if use x86; then
diff --git a/net-dialup/fcdsl/files/fcdsl-2.6.24.diff b/net-dialup/fcdsl/files/fcdsl-2.6.24.diff
new file mode 100644
index 000000000000..544b96ead128
--- /dev/null
+++ b/net-dialup/fcdsl/files/fcdsl-2.6.24.diff
@@ -0,0 +1,22 @@
+--- src.fcdsl/driver.c.orig	2007-12-22 00:07:35.000000000 +0100
++++ src.fcdsl/driver.c	2007-12-22 00:07:46.000000000 +0100
+@@ -121,7 +121,7 @@
+ 
+ static DECLARE_WAIT_QUEUE_HEAD(wait);
+ static DECLARE_WAIT_QUEUE_HEAD(capi_wait);
+-static DECLARE_MUTEX_LOCKED(hotplug);
++static DECLARE_MUTEX(hotplug);
+ 
+ #define SCHED_WAKEUP_CAPI       { atomic_set (&thread_capi_flag, 1); wake_up_interruptible (&capi_wait); }
+ #define SCHED_WAKEUP            { atomic_set (&got_kicked, 1); wake_up_interruptible (&wait); }
+@@ -210,7 +210,9 @@
+ 		cp->rx_dmabuf = NULL;
+ 		goto dma_rx_exit;
+ 	}
+-	res = request_irq (cp->irq, &irq_handler, SA_INTERRUPT | SA_SHIRQ, TARGET, cp);
++	/* Renamed function now: IRQF_DISABLED and IRQF_SHARED */
++        /* Arnd Feldmueller <arnd.feldmueller@web.de> */
++	res = request_irq (cp->irq, &irq_handler, IRQF_DISABLED | IRQF_SHARED, TARGET, cp);
+ 	if (res) {
+ 		LOG("Could not install irq handler.\n");
+ 		goto dma_tx_exit;