From: Alin Năstac Date: Sat, 2 Dec 2006 14:06:17 +0000 (+0000) Subject: Fix broken compilation against kernel 2.6.19 (#156861). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a3343b1d35d5e7bc02a3c5be09e4e82cb7949286;p=gentoo.git Fix broken compilation against kernel 2.6.19 (#156861). Package-Manager: portage-2.1.1-r1 --- 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 + +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/Manifest b/net-dialup/misdn/Manifest index b00beda4b373..2a75d8b8cb8c 100644 --- a/net-dialup/misdn/Manifest +++ b/net-dialup/misdn/Manifest @@ -1,16 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX README.hfcmulti 2488 RMD160 6c4e62fdfd6ce872b0ec270271ce97954c6374f4 SHA1 94af469baeab0972539a9dc707d1a334dfe0b1b5 SHA256 29793879cd9a752fb1f71e9f9aebc8988024b5ec8cdb53d0d551fc75ade0377f MD5 4be2313e0dafa1a491fc57e2bf3edca8 files/README.hfcmulti 2488 RMD160 6c4e62fdfd6ce872b0ec270271ce97954c6374f4 files/README.hfcmulti 2488 SHA256 29793879cd9a752fb1f71e9f9aebc8988024b5ec8cdb53d0d551fc75ade0377f files/README.hfcmulti 2488 +AUX misdn-1.0.4-kernel-2.6.19.patch 10517 RMD160 2842ab7c7f174cd5c7c22d2dec7b70b08d34fb45 SHA1 90d32dc21fb1b150d280c6cf03c4d49a3f061681 SHA256 7a520b5b1f822869fd7d1cfd1dc525d6a1491b74048bda6ac43e1876bb46d549 +MD5 08a604b01478c116ada952a60ac057a7 files/misdn-1.0.4-kernel-2.6.19.patch 10517 +RMD160 2842ab7c7f174cd5c7c22d2dec7b70b08d34fb45 files/misdn-1.0.4-kernel-2.6.19.patch 10517 +SHA256 7a520b5b1f822869fd7d1cfd1dc525d6a1491b74048bda6ac43e1876bb46d549 files/misdn-1.0.4-kernel-2.6.19.patch 10517 DIST mISDN-1_0_4.tar.gz 762995 RMD160 566e6a0ce15bed1d054239abbce07f38d31354eb SHA1 0b9cfed306cf19cd3e24401166c0b52f5b2302cd SHA256 0584c76ebac01b135afad3db464e443855746bf047276c7e88223834a7b4cec3 -EBUILD misdn-1.0.4.ebuild 5292 RMD160 604a8c75ad29d85b573e68f7997e9fc89d224708 SHA1 6f714e17228a93facbbb06438c341ef0bad03028 SHA256 e550319b9c0c067e2b86220cf8e1e26070938a344192c21c81689444564d1189 -MD5 531b1a756f1c1c918ebeec8eb7639918 misdn-1.0.4.ebuild 5292 -RMD160 604a8c75ad29d85b573e68f7997e9fc89d224708 misdn-1.0.4.ebuild 5292 -SHA256 e550319b9c0c067e2b86220cf8e1e26070938a344192c21c81689444564d1189 misdn-1.0.4.ebuild 5292 -MISC ChangeLog 3038 RMD160 655b69ea10f1c82db5d2e66c3f38b01916a78efd SHA1 242d9e201054b39f328d73e0fd72dfd16debec0d SHA256 8bb8fa0a675bd273179afd457215a547e3612d0faa4baeea0fc706e077c1b473 -MD5 1b4f7bad5707a3d209e5343d46133f4e ChangeLog 3038 -RMD160 655b69ea10f1c82db5d2e66c3f38b01916a78efd ChangeLog 3038 -SHA256 8bb8fa0a675bd273179afd457215a547e3612d0faa4baeea0fc706e077c1b473 ChangeLog 3038 +EBUILD misdn-1.0.4.ebuild 5368 RMD160 54e6a5202561972ee63e9c4d32a793a73633ef6c SHA1 4205d31a5495dbc73ba3a6b1fd2071a61c577dbe SHA256 7dff44463ecbf9e28b88e02b64b08a3d0d36d3844691bb248d508f400b32a862 +MD5 e91424a92a268aab18364da20a8816a5 misdn-1.0.4.ebuild 5368 +RMD160 54e6a5202561972ee63e9c4d32a793a73633ef6c misdn-1.0.4.ebuild 5368 +SHA256 7dff44463ecbf9e28b88e02b64b08a3d0d36d3844691bb248d508f400b32a862 misdn-1.0.4.ebuild 5368 +MISC ChangeLog 3206 RMD160 72c3173aac29ed31eb7f9f8b7a7a9ccfb5add9fb SHA1 15396afe6e7e91b17b6d9e394a2c2f3bcac76834 SHA256 74a43a2204a29a1e211360a7293e779fda42005525a7b82796ae24c546e59825 +MD5 0c17ba6f7c2eb925d40f67a47883ef1a ChangeLog 3206 +RMD160 72c3173aac29ed31eb7f9f8b7a7a9ccfb5add9fb ChangeLog 3206 +SHA256 74a43a2204a29a1e211360a7293e779fda42005525a7b82796ae24c546e59825 ChangeLog 3206 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163 @@ -18,3 +25,10 @@ SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata MD5 74f350eeb1253ae9a803b7a4edc207d1 files/digest-misdn-1.0.4 235 RMD160 145b9b657007c0af2f5d8e45a477dc510b60e0c6 files/digest-misdn-1.0.4 235 SHA256 f2e255a95860950afb70f0ecd0854596965aeae689ee3cb8721e3b7ef1ad2b1e files/digest-misdn-1.0.4 235 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFcYhk3sf9c6kjmR8RAgtUAJ9PmdOyFbSgYaBemlxf1KrIre8cJwCggEz6 +FQC8kvWk/sap8Lna7HznGzU= +=EDgV +-----END PGP SIGNATURE----- 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 ++#include + #include + #include + #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 + #include +-#include ++#include + #include + #include + #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 +-#include ++#include + #include + #include + #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 ++#include + #include + #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 ++#include + #include + #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 ++#include + #include + #include + #include +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 ++#include + #include + #include + #include +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 ++#include + #include + #include + #include +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 ++#include + #include + #include + #include +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 ++#include + #include + #include + +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 ++#include + #include + #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 ++#include + #include + #include + +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 +-#include ++#include + #include + #include + #include +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 ++#include + #include + #include + #include +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 ++#include + #include + #include + #include +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 +-#include ++#include + #include + #include + +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 + #include + #include +-#include ++#include + #include + #ifdef CONFIG_DEVFS_FS + #include +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 ++#include + #include + #include + #include +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 ++#include + #include + #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 ++#include + #include + #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 ++#include + #include + #include + #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 +-#include ++#include + #include + #include + #include 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 }