fcdslslusb patch thanks to Florian Lederer <Florian2780@gmx.de> in bug 165485

Package-Manager: portage-2.1.2-r9

diff --git a/net-dialup/fcdsl/ChangeLog b/net-dialup/fcdsl/ChangeLog
index d4854a7382be6a219952c4acf6f0d2ffe62fe00c..c8e1b51c1f4f8f72394a9fca3cf4ae508667c543 100644 (file)
--- 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.26 2007/02/12 20:04:49 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.27 2007/02/22 12:11:53 genstef Exp $
+
+  22 Feb 2007; <genstef@gentoo.org> +files/fcdslslusb-2.6.20.diff,
+  fcdsl-2.6.37.ebuild:
+  fcdslslusb patch thanks to Florian Lederer <Florian2780@gmx.de> in bug 165485
 
   12 Feb 2007; <genstef@gentoo.org> +files/fcdsl-2.6.20.diff,
   fcdsl-2.6.37.ebuild:

diff --git a/net-dialup/fcdsl/Manifest b/net-dialup/fcdsl/Manifest
index 7ad5680495cee3accbbb18d093cff23635e971d4..9e1f757b27c38b6fffe1a7b1aaec017865b46c8b 100644 (file)
--- a/net-dialup/fcdsl/Manifest
+++ b/net-dialup/fcdsl/Manifest
@@ -14,18 +14,22 @@ AUX fcdslsl.diff 1896 RMD160 3025a672f4d21d2aa0456c224ddc7c97f1a18b44 SHA1 29ad0
 MD5 776e0c65eda5432a30f9beae8896ca97 files/fcdslsl.diff 1896
 RMD160 3025a672f4d21d2aa0456c224ddc7c97f1a18b44 files/fcdslsl.diff 1896
 SHA256 461cd3841d888275fe823f185c4cd8caafdae2e772ecac7b259a323e09b0e5d3 files/fcdslsl.diff 1896
+AUX fcdslslusb-2.6.20.diff 466 RMD160 1b1de978581ea51d3501eae9699889360488e101 SHA1 94c7168adfe35f8e204ce151734c61247a300c5b SHA256 eb2f3ccaac307cee4499d77beb018e1c1cfac2efbd098b2f58b991f5b4768350
+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
 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 8068 RMD160 56e3333a4b9072df5ca3847578e089b14520388a SHA1 5ccf85b8c7b36dfb247c2692b8c8388e6e422027 SHA256 875723e97f612bfeef6e905457413f497df7cad61e288f47c32720759d719c57
-MD5 a980301e44f612ab740547b9c9207476 fcdsl-2.6.37.ebuild 8068
-RMD160 56e3333a4b9072df5ca3847578e089b14520388a fcdsl-2.6.37.ebuild 8068
-SHA256 875723e97f612bfeef6e905457413f497df7cad61e288f47c32720759d719c57 fcdsl-2.6.37.ebuild 8068
-MISC ChangeLog 4673 RMD160 97147372950aed6e5cd23c5a0b3d7bc3a32d1dc5 SHA1 ab2f4ba1c97674764900e39fef2a61984c58bd47 SHA256 26682df3f3a80412b1124d630b1460485ff4a3a8a1b33d52a6046c5caa458b0a
-MD5 41627a086c93a7b6f63befbfc9cff985 ChangeLog 4673
-RMD160 97147372950aed6e5cd23c5a0b3d7bc3a32d1dc5 ChangeLog 4673
-SHA256 26682df3f3a80412b1124d630b1460485ff4a3a8a1b33d52a6046c5caa458b0a ChangeLog 4673
+EBUILD fcdsl-2.6.37.ebuild 8119 RMD160 89f57e85baa3e4a56988f379975df7948afe0bf8 SHA1 75da9d0d0deb4e0e10c6870515afcac1d3dbec0f SHA256 2251fe7b6419b8093d870221d6103312c2b88c3c74c48d65c6c3f6ea3df42356
+MD5 9be907f90fc41088b65cbb4ce04e693a fcdsl-2.6.37.ebuild 8119
+RMD160 89f57e85baa3e4a56988f379975df7948afe0bf8 fcdsl-2.6.37.ebuild 8119
+SHA256 2251fe7b6419b8093d870221d6103312c2b88c3c74c48d65c6c3f6ea3df42356 fcdsl-2.6.37.ebuild 8119
+MISC ChangeLog 4844 RMD160 7522dd82ce7e1ab328d96563313c0bda8ec950de SHA1 be4c2594c64bcf4cd401540f8a0228885966b41e SHA256 745ff8608261d5ffb6bc58272e08d0592fb1d1cc1f061f8fafe44bc53ee9d408
+MD5 99641888fab2ebc1d7f7022be5af84a8 ChangeLog 4844
+RMD160 7522dd82ce7e1ab328d96563313c0bda8ec950de ChangeLog 4844
+SHA256 745ff8608261d5ffb6bc58272e08d0592fb1d1cc1f061f8fafe44bc53ee9d408 ChangeLog 4844
 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 64748bb13db6c8dc9b69ef14515b44f5183447ed..5f841092c8da9a7395c88c42dc6211d1d796e245 100644 (file)
--- 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.4 2007/02/12 20:04:49 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.37.ebuild,v 1.5 2007/02/22 12:11:53 genstef Exp $
 
 inherit linux-mod eutils rpm
 
@@ -77,6 +77,7 @@ src_unpack() {
        # do not fail even if some drivers are not present
        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
 
        if use x86; then
                for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do

diff --git a/net-dialup/fcdsl/files/fcdslslusb-2.6.20.diff b/net-dialup/fcdsl/files/fcdslslusb-2.6.20.diff
new file mode 100644 (file)
index 0000000..a8ae5ac
--- /dev/null
+++ b/net-dialup/fcdsl/files/fcdslslusb-2.6.20.diff
@@ -0,0 +1,23 @@
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c
+@@ -92,17 +92,12 @@
+ 
+ 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,
++      
+ } ;
+ 
+ MODULE_DEVICE_TABLE (usb, usb_id_table);