Fix broken compilation against kernel 2.6.19 (#156861).

(Portage version: 2.1.1-r1)

3 files changed, 278 insertions, 9 deletions

diff --git a/net-dialup/misdn/ChangeLog b/net-dialup/misdn/ChangeLog
index 641f106885bb..e5d3fdd88d30 100644
--- a/net-dialup/misdn/ChangeLog
+++ b/net-dialup/misdn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/misdn
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/ChangeLog,v 1.14 2006/11/18 20:58:48 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/ChangeLog,v 1.15 2006/12/02 14:06:17 mrness Exp $
+
+  02 Dec 2006; Alin Năstac <mrness@gentoo.org>
+  +files/misdn-1.0.4-kernel-2.6.19.patch, misdn-1.0.4.ebuild:
+  Fix broken compilation against kernel 2.6.19 (#156861).
 
 *misdn-1.0.4 (18 Nov 2006)
 
diff --git a/net-dialup/misdn/files/misdn-1.0.4-kernel-2.6.19.patch b/net-dialup/misdn/files/misdn-1.0.4-kernel-2.6.19.patch
new file mode 100644
index 000000000000..eb0c46a2d348
--- /dev/null
+++ b/net-dialup/misdn/files/misdn-1.0.4-kernel-2.6.19.patch
@@ -0,0 +1,262 @@
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/avm_fritz.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/avm_fritz.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/avm_fritz.c	2006-07-03 12:16:08.000000000 +0300
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/avm_fritz.c	2006-12-02 15:56:52.345830409 +0200
+@@ -8,7 +8,7 @@
+  * This file is (c) under GNU PUBLIC LICENSE
+  *
+  */
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include <linux/pci.h>
+ #ifdef NEW_ISAPNP
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/core.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/core.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/core.c	2006-08-08 12:18:44.000000000 +0300
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/core.c	2006-12-02 15:57:30.084188909 +0200
+@@ -8,7 +8,7 @@
+ 
+ #include <linux/types.h>
+ #include <linux/stddef.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include <linux/spinlock.h>
+ #include "core.h"
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/dsp_core.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/dsp_core.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/dsp_core.c	2006-09-13 16:58:02.000000000 +0300
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/dsp_core.c	2006-12-02 15:55:33.760919158 +0200
+@@ -172,7 +172,7 @@
+ const char *dsp_revision = "$Revision: 1.1 $";
+ 
+ #include <linux/delay.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include <linux/vmalloc.h>
+ #include "layer1.h"
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/dtmf.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/dtmf.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/dtmf.c	2006-07-03 12:16:08.000000000 +0300
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/dtmf.c	2006-12-02 15:56:12.887364410 +0200
+@@ -15,7 +15,7 @@
+  *
+  */
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include "layer1.h"
+ #include "helper.h"
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/faxl3.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/faxl3.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/faxl3.c	2006-03-23 15:56:11.000000000 +0200
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/faxl3.c	2006-12-02 15:56:32.308578159 +0200
+@@ -11,7 +11,7 @@
+  *
+  */
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include "layer1.h"
+ #include "m_capi.h"
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/hfc_multi.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/hfc_multi.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/hfc_multi.c	2006-10-09 15:51:33.000000000 +0300
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/hfc_multi.c	2006-12-02 15:57:36.220572410 +0200
+@@ -93,7 +93,7 @@
+ /* debug using register map (never use this, it will flood your system log) */
+ //#define HFC_REGISTER_MAP
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/hfcs_mini.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/hfcs_mini.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/hfcs_mini.c	2006-07-03 12:16:08.000000000 +0300
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/hfcs_mini.c	2006-12-02 15:54:52.922366908 +0200
+@@ -49,7 +49,7 @@
+  *
+  */
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include <linux/delay.h>
+ #include <asm/timex.h>
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/hfcs_usb.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/hfcs_usb.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/hfcs_usb.c	2006-09-04 16:32:14.000000000 +0300
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/hfcs_usb.c	2006-12-02 15:57:42.092939408 +0200
+@@ -28,7 +28,7 @@
+  *
+  */
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include <linux/delay.h>
+ #include <linux/usb.h>
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/i4l_mISDN.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/i4l_mISDN.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/i4l_mISDN.c	2006-03-23 15:56:11.000000000 +0200
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/i4l_mISDN.c	2006-12-02 15:56:19.015747409 +0200
+@@ -10,7 +10,7 @@
+  *
+  */
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include <linux/isdnif.h>
+ #include <linux/delay.h>
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/l1oip.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/l1oip.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/l1oip.c	2006-03-23 15:56:11.000000000 +0200
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/l1oip.c	2006-12-02 15:57:10.122941410 +0200
+@@ -207,7 +207,7 @@
+ */
+ 
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include <linux/delay.h>
+ 
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/layer1.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/layer1.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/layer1.c	2006-10-09 15:51:33.000000000 +0300
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/layer1.c	2006-12-02 15:57:04.286576660 +0200
+@@ -10,7 +10,7 @@
+ 
+ static char *l1_revision = "$Revision: 1.1 $";
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include "layer1.h"
+ #include "helper.h"
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/loop.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/loop.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/loop.c	2006-03-23 15:56:11.000000000 +0200
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/loop.c	2006-12-02 15:57:16.639348659 +0200
+@@ -25,7 +25,7 @@
+ 
+  */
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include <linux/delay.h>
+ 
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/memdbg.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/memdbg.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/memdbg.c	2006-03-07 14:21:06.000000000 +0200
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/memdbg.c	2006-12-02 15:56:58.514215910 +0200
+@@ -1,5 +1,5 @@
+ #include <linux/stddef.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include <linux/list.h>
+ #include <linux/slab.h>
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/netjet.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/netjet.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/netjet.c	2006-10-09 14:28:41.000000000 +0300
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/netjet.c	2006-12-02 15:57:48.401333659 +0200
+@@ -7,7 +7,7 @@
+  * Based on HiSax NETJet driver by Karsten Keil
+  */
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/sedl_fax.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/sedl_fax.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/sedl_fax.c	2006-07-03 12:16:08.000000000 +0300
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/sedl_fax.c	2006-12-02 15:55:22.724229410 +0200
+@@ -26,7 +26,7 @@
+  * the firmware onto the card.
+  */
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/socket.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/socket.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/socket.c	2006-03-07 14:21:06.000000000 +0200
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/socket.c	2006-12-02 15:56:05.806921909 +0200
+@@ -22,7 +22,7 @@
+ 
+ 
+ #include <linux/vmalloc.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/in.h>
+ #include <net/sock.h>
+ 
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/udevice.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/udevice.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/udevice.c	2006-11-02 11:40:53.000000000 +0200
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/udevice.c	2006-12-02 15:57:23.087751659 +0200
+@@ -8,7 +8,7 @@
+ #include <linux/stddef.h>
+ #include <linux/poll.h>
+ #include <linux/vmalloc.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/timer.h>
+ #ifdef CONFIG_DEVFS_FS
+ #include <linux/devfs_fs_kernel.h>
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/w6692.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/w6692.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/w6692.c	2006-07-03 12:16:08.000000000 +0300
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/w6692.c	2006-12-02 15:56:38.408959409 +0200
+@@ -21,7 +21,7 @@
+  *
+  */
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/x25_dte.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/x25_dte.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/x25_dte.c	2006-07-03 12:16:08.000000000 +0300
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/x25_dte.c	2006-12-02 15:55:06.031186160 +0200
+@@ -12,7 +12,7 @@
+  *
+  */
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include "x25_l3.h"
+ #include "helper.h"
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/x25_l3.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/x25_l3.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/x25_l3.c	2006-08-08 12:18:44.000000000 +0300
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/x25_l3.c	2006-12-02 15:56:45.277388660 +0200
+@@ -12,7 +12,7 @@
+  *
+  */
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include "x25_l3.h"
+ #include "helper.h"
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c	2006-03-23 13:39:23.000000000 +0200
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c	2006-12-02 15:56:25.164131660 +0200
+@@ -21,7 +21,7 @@
+  *
+  */
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include <linux/delay.h>
+ #include "xhfc_su.h"
+diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/xhfc_su.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/xhfc_su.c
+--- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/xhfc_su.c	2006-09-13 16:58:02.000000000 +0300
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/xhfc_su.c	2006-12-02 15:54:59.522779410 +0200
+@@ -51,7 +51,7 @@
+  */
+  
+ #include <linux/mISDNif.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include <linux/delay.h>
+ #include <linux/pci.h>
diff --git a/net-dialup/misdn/misdn-1.0.4.ebuild b/net-dialup/misdn/misdn-1.0.4.ebuild
index d079438440eb..49ac8308ceb8 100644
--- a/net-dialup/misdn/misdn-1.0.4.ebuild
+++ b/net-dialup/misdn/misdn-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/misdn-1.0.4.ebuild,v 1.1 2006/11/18 20:58:48 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/misdn-1.0.4.ebuild,v 1.2 2006/12/02 14:06:17 mrness Exp $
 
 inherit eutils linux-mod
 
@@ -114,8 +114,11 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
 
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}"/${P}-kernel-2.6.19.patch
+
+	cd "${S}"
 	if use ecaggressive; then
 		sed -i -e "s:.*#define \(AGGRESSIVE_SUPPRESSOR\):#define \1:m" dsp.h
 	fi
@@ -140,7 +143,7 @@ src_install() {
 	linux-mod_src_install
 
 	insinto /usr/include/linux
-	doins "${WORKDIR}/${MY_P}/include/linux/"*.h
+	doins "${WORKDIR}/${MY_P}/"include/linux/*.h
 
 	dodir /etc/udev/rules.d
 	echo 'KERNEL=="obj-*", NAME="mISDN", GROUP="dialout", MODE="0660"' \
@@ -158,12 +161,12 @@ src_install() {
 }
 
 pkg_preinst() {
-	if [ -e ${ROOT}/etc/misdn-init.conf ]; then
-		cp ${ROOT}/etc/misdn-init.conf ${IMAGE}/etc
+	if [ -e "${ROOT}"/etc/misdn-init.conf ]; then
+		cp "${ROOT}"/etc/misdn-init.conf "${IMAGE}"/etc
 	else
-		sed -i -e "s:/etc/misdn-init.conf:${IMAGE}\0:" ${IMAGE}/usr/sbin/misdn-init
-		${IMAGE}/usr/sbin/misdn-init config
-		sed -i -e "s:${IMAGE}/etc/misdn-init.conf:/etc/misdn-init.conf:" ${IMAGE}/usr/sbin/misdn-init
+		sed -i -e "s:/etc/misdn-init.conf:${IMAGE}\0:" "${IMAGE}"/usr/sbin/misdn-init
+		"${IMAGE}"/usr/sbin/misdn-init config
+		sed -i -e "s:${IMAGE}/etc/misdn-init.conf:/etc/misdn-init.conf:" "${IMAGE}"/usr/sbin/misdn-init
 	fi
 }