Fix building with 2.6.19 and 2.6.20 thanks to André Malo <nd@perlig.de> in bug 165485

(Portage version: 2.1.2-r9)

3 files changed, 360 insertions, 4 deletions

diff --git a/net-dialup/fcdsl/ChangeLog b/net-dialup/fcdsl/ChangeLog
index 010ff6665232..d4854a7382be 100644
--- a/net-dialup/fcdsl/ChangeLog
+++ b/net-dialup/fcdsl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/fcdsl
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.25 2006/09/21 13:24:54 mrness Exp $
+# 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 $
+
+  12 Feb 2007; <genstef@gentoo.org> +files/fcdsl-2.6.20.diff,
+  fcdsl-2.6.37.ebuild:
+  Fix building with 2.6.19 and 2.6.20 thanks to André Malo <nd@perlig.de> in
+  bug 165485
 
   21 Sep 2006; Alin Nastac <mrness@gentoo.org> -fcdsl-2.6.20.7-r5.ebuild,
   -fcdsl-2.6.30.ebuild:
diff --git a/net-dialup/fcdsl/fcdsl-2.6.37.ebuild b/net-dialup/fcdsl/fcdsl-2.6.37.ebuild
index 88042eac6bc4..64748bb13db6 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-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/fcdsl/fcdsl-2.6.37.ebuild,v 1.3 2006/04/27 17:40:57 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.37.ebuild,v 1.4 2007/02/12 20:04:49 genstef Exp $
 
 inherit linux-mod eutils rpm
 
@@ -74,6 +74,9 @@ 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
+	einfo "When you have FCDSL_CARDS set some errors are OK here"
+	patch -p0 -f < ${FILESDIR}/fcdsl-2.6.20.diff
 
 	if use x86; then
 		for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
diff --git a/net-dialup/fcdsl/files/fcdsl-2.6.20.diff b/net-dialup/fcdsl/files/fcdsl-2.6.20.diff
new file mode 100644
index 000000000000..268504c99913
--- /dev/null
+++ b/net-dialup/fcdsl/files/fcdsl-2.6.20.diff
@@ -0,0 +1,348 @@
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c
+@@ -1823,19 +1823,19 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-int driver_init (void) {
++int avm_driver_init (void) {
+ 
+ 	return (NULL != (capi_lib = link_library (&capi_card)));
+-} /* driver_init */
++} /* avm_driver_init */
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-void driver_exit (void) {
++void avm_driver_exit (void) {
+ 
+ 	assert (capi_lib != NULL);
+ 	free_library ();
+ 	capi_lib = NULL;
+-} /* driver_exit */
++} /* avm_driver_exit */
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h
+--- usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h
++++ usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h
+@@ -23,7 +23,7 @@
+ #ifndef __have_driver_h__
+ #define __have_driver_h__
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/pci.h>
+ #include <linux/list.h>
+ #include <linux/skbuff.h>
+@@ -139,8 +139,8 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-extern int driver_init (void);
+-extern void driver_exit (void);
++extern int avm_driver_init (void);
++extern void avm_driver_exit (void);
+ 
+ #endif
+ 
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c
+@@ -23,7 +23,7 @@
+ #include <stdarg.h>
+ #include <asm/uaccess.h>
+ #include <linux/pci.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+@@ -115,14 +115,14 @@
+ 		return -ENODEV;
+ 	}
+ 	NOTE( "Loading...\n");
+-	if (!driver_init ()) {
++	if (!avm_driver_init ()) {
+ 		ERROR("Error: Driver library not available.\n");
+ 		ERROR("Not loaded.\n");
+ 		return -ENOSYS;
+ 	}
+ 	if (0 != (res = add_card (dev))) {
+ 		ERROR("Not loaded.\n");
+-		driver_exit ();
++		avm_driver_exit ();
+ 		return res;
+ 	}
+ 	NOTE("Loaded.\n");
+@@ -143,7 +143,7 @@
+ 	NOTE("Removing...\n");
+ 	remove_ctrls (card);
+ 	NOTE("Removed.\n");
+-	driver_exit ();
++	avm_driver_exit ();
+ #ifndef NDEBUG
+ 	if (hallocated() != 0) {
+ 		ERROR( "%u bytes leaked.\n", hallocated());
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c
+@@ -1576,19 +1576,19 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-int driver_init (void) {
++int avm_driver_init (void) {
+ 
+ 	return (NULL != (capi_lib = link_library (&capi_card)));
+-} /* driver_init */
++} /* avm_driver_init */
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-void driver_exit (void) {
++void avm_driver_exit (void) {
+ 
+ 	assert (capi_lib);
+ 	free_library ();
+ 	capi_lib = NULL;
+-} /* driver_exit */
++} /* avm_driver_exit */
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h
+--- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h
++++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h
+@@ -24,7 +24,7 @@
+ #define __have_driver_h__
+ 
+ #include <asm/atomic.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/skbuff.h>
+ #include <linux/pci.h>
+ #include <linux/spinlock.h>
+@@ -161,8 +161,8 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-extern int driver_init (void);
+-extern void driver_exit (void);
++extern int avm_driver_init (void);
++extern void avm_driver_exit (void);
+ 
+ #endif
+ 
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c
+@@ -23,7 +23,7 @@
+ #include <stdarg.h>
+ #include <asm/uaccess.h>
+ #include <linux/pci.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+@@ -116,14 +116,14 @@
+ 		return -ENODEV;
+ 	}
+ 	NOTE("Loading...\n");
+-	if (!driver_init ()) {
++	if (!avm_driver_init ()) {
+ 		ERROR("Error: Driver library not available.\n");
+ 		NOTE("Not loaded.\n");
+ 		return -ENOSYS;
+ 	}
+ 	if (0 != (res = add_card (dev))) {
+ 		NOTE("Not loaded.\n");
+-		driver_exit ();
++		avm_driver_exit ();
+ 		return res;
+ 	}
+ 	NOTE("Loaded.\n");
+@@ -144,7 +144,7 @@
+ 	NOTE("Removing...\n");
+ 	remove_ctrls (cp);
+ 	NOTE("Removed.\n");
+-	driver_exit ();
++	avm_driver_exit ();
+ #ifndef NDEBUG
+ 	if (hallocated() != 0) {
+ 		ERROR("%u bytes leaked.\n", hallocated());
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c
+@@ -1577,19 +1577,19 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-int driver_init (void) {
++int avm_driver_init (void) {
+ 
+ 	return (NULL != (capi_lib = link_library (&capi_card)));
+-} /* driver_init */
++} /* avm_driver_init */
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-void driver_exit (void) {
++void avm_driver_exit (void) {
+ 
+ 	assert (capi_lib);
+ 	free_library ();
+ 	capi_lib = NULL;
+-} /* driver_exit */
++} /* avm_driver_exit */
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h
+@@ -24,7 +24,7 @@
+ #define __have_driver_h__
+ 
+ #include <asm/atomic.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/skbuff.h>
+ #include <linux/pci.h>
+ #include <linux/spinlock.h>
+@@ -161,8 +161,8 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-extern int driver_init (void);
+-extern void driver_exit (void);
++extern int avm_driver_init (void);
++extern void avm_driver_exit (void);
+ 
+ #endif
+ 
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c
+@@ -23,7 +23,7 @@
+ #include <stdarg.h>
+ #include <asm/uaccess.h>
+ #include <linux/pci.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+@@ -116,14 +116,14 @@
+ 		return -ENODEV;
+ 	}
+ 	NOTE("Loading...\n");
+-	if (!driver_init ()) {
++	if (!avm_driver_init ()) {
+ 		ERROR("Error: Driver library not available.\n");
+ 		NOTE("Not loaded.\n");
+ 		return -ENOSYS;
+ 	}
+ 	if (0 != (res = add_card (dev))) {
+ 		NOTE("Not loaded.\n");
+-		driver_exit ();
++		avm_driver_exit ();
+ 		return res;
+ 	}
+ 	NOTE("Loaded.\n");
+@@ -144,7 +144,7 @@
+ 	NOTE("Removing...\n");
+ 	remove_ctrls (cp);
+ 	NOTE("Removed.\n");
+-	driver_exit ();
++	avm_driver_exit ();
+ #ifndef NDEBUG
+ 	if (hallocated() != 0) {
+ 		ERROR("%u bytes leaked.\n", hallocated());
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h
+@@ -24,7 +24,7 @@
+ #define __have_driver_h__
+ 
+ #include <asm/atomic.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/skbuff.h>
+ #include <linux/spinlock.h>
+ #include <linux/usb.h>
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c
+@@ -27,7 +27,7 @@
+ #include <stdarg.h>
+ #include <asm/uaccess.h>
+ #include <linux/usb.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h
+@@ -25,7 +25,7 @@
+ 
+ #include <asm/semaphore.h>
+ #include <asm/atomic.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/skbuff.h>
+ #include <linux/capi.h>
+ #include <linux/isdn/capilli.h>
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h
+@@ -24,7 +24,7 @@
+ #define __have_driver_h__
+ 
+ #include <asm/atomic.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/skbuff.h>
+ #include <linux/spinlock.h>
+ #include <linux/usb.h>
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c
+@@ -27,7 +27,7 @@
+ #include <stdarg.h>
+ #include <asm/uaccess.h>
+ #include <linux/usb.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h
+@@ -24,7 +24,7 @@
+ #define __have_driver_h__
+ 
+ #include <asm/atomic.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/skbuff.h>
+ #include <linux/spinlock.h>
+ #include <linux/usb.h>
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c
+@@ -27,7 +27,7 @@
+ #include <stdarg.h>
+ #include <asm/uaccess.h>
+ #include <linux/usb.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>