Patch to fix compile errors thanks to Alan Hourihane <alanh@fairlite.demon.co.uk> in bug 177532

Package-Manager: portage-2.1.3_rc5

4 files changed, 211 insertions, 20 deletions

diff --git a/net-dialup/fcdsl/ChangeLog b/net-dialup/fcdsl/ChangeLog
index ba50b235afd0..54532e4bf7fa 100644
--- a/net-dialup/fcdsl/ChangeLog
+++ b/net-dialup/fcdsl/ChangeLog
@@ -1,6 +1,11 @@
 # 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.28 2007/05/02 01:11:59 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.29 2007/06/27 21:10:46 genstef Exp $
+
+  27 Jun 2007; Stefan Schweizer <genstef@gentoo.org> +files/usb-2.6.20.diff,
+  fcdsl-2.6.37.ebuild:
+  Patch to fix compile errors thanks to Alan Hourihane
+  <alanh@fairlite.demon.co.uk> in bug 177532
 
   02 May 2007; Marius Mauch <genone@gentoo.org> fcdsl-2.6.37.ebuild:
   Replacing einfo with elog
diff --git a/net-dialup/fcdsl/Manifest b/net-dialup/fcdsl/Manifest
index 1315289d1e25..daad4dc0d754 100644
--- a/net-dialup/fcdsl/Manifest
+++ b/net-dialup/fcdsl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fcdsl-2.6.20.diff 11848 RMD160 5a57707400fff8d8391539ba5a91ba1552ea0afa SHA1 fec9cf9d9feeaaa5bc6d687d4c68afd3b677f320 SHA256 535568804995cbfbae733ae777802fff5b48edf67858db38fdeaf3341edf3ac8
 MD5 17d295cfca2fc1eeb9253099853a4eea files/fcdsl-2.6.20.diff 11848
 RMD160 5a57707400fff8d8391539ba5a91ba1552ea0afa files/fcdsl-2.6.20.diff 11848
@@ -21,18 +18,22 @@ AUX fcdslslusb-2.6.20.diff 466 RMD160 1b1de978581ea51d3501eae9699889360488e101 S
 MD5 750c1ac23ed64634b97ad8fe5a45bd77 files/fcdslslusb-2.6.20.diff 466
 RMD160 1b1de978581ea51d3501eae9699889360488e101 files/fcdslslusb-2.6.20.diff 466
 SHA256 eb2f3ccaac307cee4499d77beb018e1c1cfac2efbd098b2f58b991f5b4768350 files/fcdslslusb-2.6.20.diff 466
+AUX usb-2.6.20.diff 7488 RMD160 347220d583d05146cb885f3fcd44e35110ea6b2a SHA1 88595f8c3a5708b634d7a4230a041c208b303cde SHA256 d28e0532c8acaf7b4495839bc6c4f56c1dbbe296f9a9cc3f101bc36f6aaa40fc
+MD5 29fcc1482a4f160d985311cfbc09c9cc files/usb-2.6.20.diff 7488
+RMD160 347220d583d05146cb885f3fcd44e35110ea6b2a files/usb-2.6.20.diff 7488
+SHA256 d28e0532c8acaf7b4495839bc6c4f56c1dbbe296f9a9cc3f101bc36f6aaa40fc files/usb-2.6.20.diff 7488
 DIST avm_fcdsl-2.6-37.i586.rpm 1059204 RMD160 3ab3bb6a8006167004c93c5348f07d4fc6fc2a96 SHA1 0e0fb73ddca5e159f224c0c032ebd8e7ae89123f SHA256 6f3531eaa2583a50586d6f29c7f3a48cd16a507ea4d1cbc1ccb2e2d718396021
 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 8105 RMD160 7d89bb052749f9291b9e65cd59d754927939503d SHA1 679e35cb221ff7b0017b7588d17ab144163add3c SHA256 360401ff254281279766167e3d97f3a20836da74151556929f0b8941802be335
-MD5 5cfdfea92b3267ca36b99b60b93d0e17 fcdsl-2.6.37.ebuild 8105
-RMD160 7d89bb052749f9291b9e65cd59d754927939503d fcdsl-2.6.37.ebuild 8105
-SHA256 360401ff254281279766167e3d97f3a20836da74151556929f0b8941802be335 fcdsl-2.6.37.ebuild 8105
-MISC ChangeLog 4941 RMD160 2d37b8f1be02efcc3f18158280681ea25c96b197 SHA1 90ede0cf6f611118b367e255f229b3a042b27197 SHA256 f81914e2afd3e5e9f3fdf08779686b0fb5d7a88b9ff39b6c869f71ef21f6a7f5
-MD5 fc66550dd82bbf9da4553319e869bcba ChangeLog 4941
-RMD160 2d37b8f1be02efcc3f18158280681ea25c96b197 ChangeLog 4941
-SHA256 f81914e2afd3e5e9f3fdf08779686b0fb5d7a88b9ff39b6c869f71ef21f6a7f5 ChangeLog 4941
+EBUILD fcdsl-2.6.37.ebuild 8221 RMD160 ab1b87979bbce7303dadc217f19eea1fd0426f73 SHA1 f3fb4ae902737a40993268a0f5b8ac648747f7aa SHA256 399db00f6abe13464741af87b577f3a11dd0214b9053498e7f39cf35a90889b7
+MD5 e55ca1969ac8bfab9a4928670e92ff90 fcdsl-2.6.37.ebuild 8221
+RMD160 ab1b87979bbce7303dadc217f19eea1fd0426f73 fcdsl-2.6.37.ebuild 8221
+SHA256 399db00f6abe13464741af87b577f3a11dd0214b9053498e7f39cf35a90889b7 fcdsl-2.6.37.ebuild 8221
+MISC ChangeLog 5143 RMD160 3561c4105c5ba3a71d14902b1e7dab2f7ee0497b SHA1 6d71adc4e96bab0151a51cd165703974b8b07333 SHA256 85e2fc02301aad9d03ed4bafa027095d45e5e616ff6c03a8c4001b679d840690
+MD5 cc66b685d099d3a7447a92a59b1783e4 ChangeLog 5143
+RMD160 3561c4105c5ba3a71d14902b1e7dab2f7ee0497b ChangeLog 5143
+SHA256 85e2fc02301aad9d03ed4bafa027095d45e5e616ff6c03a8c4001b679d840690 ChangeLog 5143
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
@@ -40,10 +41,3 @@ SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata
 MD5 e41c4dcf268ff09e5857f2c60e586cbc files/digest-fcdsl-2.6.37 1042
 RMD160 d492ceb309343268216cdad8a1f78731fb32e0ba files/digest-fcdsl-2.6.37 1042
 SHA256 9a82e617c81de5fd9ccdffa972127d6f4a4cbc6b1dbba90df5f6d567ec720c3d files/digest-fcdsl-2.6.37 1042
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGN+Wi6J2i8a8J4okRAr8tAKCNsmpz9JSGxYsGwhpX0OWfSaMBPQCggoBQ
-ffvzw+n8v+t15Y9XPbhUQ+8=
-=1/yA
------END PGP SIGNATURE-----
diff --git a/net-dialup/fcdsl/fcdsl-2.6.37.ebuild b/net-dialup/fcdsl/fcdsl-2.6.37.ebuild
index f73a65b85038..b745b2482731 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.6 2007/05/02 01:11:59 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.37.ebuild,v 1.7 2007/06/27 21:10:46 genstef Exp $
 
 inherit linux-mod eutils rpm
 
@@ -78,6 +78,9 @@ src_unpack() {
 	einfo "When you have FCDSL_CARDS set some errors are OK here"
 	patch -p0 -f < ${FILESDIR}/fcdsl-2.6.20.diff
 	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
+	cd "${S}"
 
 	if use x86; then
 		for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
diff --git a/net-dialup/fcdsl/files/usb-2.6.20.diff b/net-dialup/fcdsl/files/usb-2.6.20.diff
new file mode 100644
index 000000000000..7beff8b9f9a0
--- /dev/null
+++ b/net-dialup/fcdsl/files/usb-2.6.20.diff
@@ -0,0 +1,189 @@
+diff -ur /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.c ./src.fcdslslusb/driver.c
+--- /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.c	2005-07-06 22:00:00.000000000 +0000
++++ ./src.fcdslslusb/driver.c	2007-06-27 19:56:42.000000000 +0000
+@@ -106,7 +106,7 @@
+ static int			hard_error_issued	= FALSE;
+ static atomic_t			resetting_ctrl		= ATOMIC_INIT (0);
+ static struct work_struct	closing_work;
+-static void			closing_worker (void *);
++static void			closing_worker (struct work_struct *);
+ static atomic_t			closing_worker_running	= ATOMIC_INIT (0);
+ static void		     (* close_func) (void *)	= NULL;
+ static void *			close_data		= NULL;
+@@ -341,8 +341,8 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-static void closing_worker (void * ctx) {
+-	card_p	card = (card_p) ctx;
++static void closing_worker (struct work_struct *work) {
++	card_p	card = capi_card;
+ 
+ 	DECLARE_WAIT_QUEUE_HEAD(close_wait);
+ 
+@@ -434,7 +434,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 -ur /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.c ./src.fcdslusb/driver.c
+--- /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.c	2005-08-04 22:00:00.000000000 +0000
++++ ./src.fcdslusb/driver.c	2007-06-27 19:53:54.000000000 +0000
+@@ -84,7 +84,7 @@
+ static atomic_t			thread_capi_flag;
+ static atomic_t			resetting_ctrl		= ATOMIC_INIT (0);
+ static struct work_struct	closing_work;
+-static void			closing_worker (void *);
++static void			closing_worker (struct work_struct *);
+ static atomic_t			closing_worker_running	= ATOMIC_INIT (0);
+ static void		     (* close_func) (void *)	= NULL;
+ static void *			close_data		= NULL;
+@@ -699,8 +699,8 @@
+ 
+ /*-C-------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-static void closing_worker (void * ctx) {
+-	card_p	card = (card_p) ctx;
++static void closing_worker (struct work_struct *work) {
++	card_p	card = capi_card;
+ 
+ 	DECLARE_WAIT_QUEUE_HEAD(close_wait);
+ 
+@@ -787,7 +787,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 -ur /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb/main.c ./src.fcdslusb/main.c
+--- /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb/main.c	2006-01-30 16:06:37.000000000 +0000
++++ ./src.fcdslusb/main.c	2007-06-27 19:40:42.000000000 +0000
+@@ -76,14 +76,7 @@
+ } ;
+ 
+ static struct usb_driver usb_driver = {
+-#ifndef OLD_USB_DRIVER
+-	.driver = {
+-#endif
+-		.owner =	THIS_MODULE,
+-		.name =		TARGET,
+-#ifndef OLD_USB_DRIVER
+-	},
+-#endif
++	.name =		TARGET,
+ 	.id_table =	usb_id_table,
+ 	.probe =	usb_probe,
+ 	.disconnect =	usb_disconnect,
+diff -ur /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.c ./src.fcdslusb2/driver.c
+--- /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.c	2005-08-04 22:00:00.000000000 +0000
++++ ./src.fcdslusb2/driver.c	2007-06-27 19:57:51.000000000 +0000
+@@ -106,7 +106,7 @@
+ static int			hard_error_issued	= FALSE;
+ static atomic_t			resetting_ctrl		= ATOMIC_INIT (0);
+ static struct work_struct	closing_work;
+-static void			closing_worker (void *);
++static void			closing_worker (struct work_struct *);
+ static atomic_t			closing_worker_running	= ATOMIC_INIT (0);
+ static void		     (* close_func) (void *)	= NULL;
+ static void *			close_data		= NULL;
+@@ -341,8 +341,8 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-static void closing_worker (void * ctx) {
+-	card_p	card = (card_p) ctx;
++static void closing_worker (struct work_struct *work) {
++	card_p	card = capi_card;
+ 
+ 	DECLARE_WAIT_QUEUE_HEAD(close_wait);
+ 
+@@ -434,7 +434,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 */
+Only in ./src.fcdslusb2: driver.o
+Only in ./src.fcdslusb2: lib.o
+diff -ur /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c ./src.fcdslusb2/main.c
+--- /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c	2007-06-27 20:01:13.000000000 +0000
++++ ./src.fcdslusb2/main.c	2007-06-27 19:57:13.000000000 +0000
+@@ -91,15 +91,7 @@
+ } ;
+ 
+ static struct usb_driver usb_driver = {
+-
+-#ifndef OLD_USB_DRIVER
+-	.driver = {
+-#endif
+-		.owner =	THIS_MODULE,
+-		.name =		TARGET,
+-#ifndef OLD_USB_DRIVER
+-	},
+-#endif
++	.name =		TARGET,
+ 	.id_table =	usb_id_table,
+ 	.probe =	usb_probe,
+ 	.disconnect =	usb_disconnect,
+diff -ur /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.c ./src.fcdslusba/driver.c
+--- /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.c	2005-07-06 22:00:00.000000000 +0000
++++ ./src.fcdslusba/driver.c	2007-06-27 19:58:47.000000000 +0000
+@@ -106,7 +106,7 @@
+ static int			hard_error_issued	= FALSE;
+ static atomic_t			resetting_ctrl		= ATOMIC_INIT (0);
+ static struct work_struct	closing_work;
+-static void			closing_worker (void *);
++static void			closing_worker (struct work_struct *);
+ static atomic_t			closing_worker_running	= ATOMIC_INIT (0);
+ static void		     (* close_func) (void *)	= NULL;
+ static void *			close_data		= NULL;
+@@ -341,8 +341,8 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-static void closing_worker (void * ctx) {
+-	card_p	card = (card_p) ctx;
++static void closing_worker (struct work_struct *work) {
++	card_p	card = capi_card;
+ 
+ 	DECLARE_WAIT_QUEUE_HEAD(close_wait);
+ 
+@@ -434,7 +434,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 -ur /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c ./src.fcdslusba/main.c
+--- /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c	2007-06-27 20:01:13.000000000 +0000
++++ ./src.fcdslusba/main.c	2007-06-27 19:58:18.000000000 +0000
+@@ -91,15 +91,7 @@
+ } ;
+ 
+ static struct usb_driver usb_driver = {
+-
+-#ifndef OLD_USB_DRIVER
+-	.driver = {
+-#endif
+-		.owner =	THIS_MODULE,
+-		.name =		TARGET,
+-#ifndef OLD_USB_DRIVER
+-	},
+-#endif
++	.name =		TARGET,
+ 	.id_table =	usb_id_table,
+ 	.probe =	usb_probe,
+ 	.disconnect =	usb_disconnect,