Fix compilation errors when build against kernel 2.6.27, thanks to Aleksandar Topuzovic (#244833).

Package-Manager: portage-2.1.4.4

5 files changed, 54 insertions, 24 deletions

diff --git a/net-dialup/ltmodem/ChangeLog b/net-dialup/ltmodem/ChangeLog
index 3d638e71f79e..2ba9dc959088 100644
--- a/net-dialup/ltmodem/ChangeLog
+++ b/net-dialup/ltmodem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/ltmodem
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ChangeLog,v 1.43 2008/08/31 16:59:16 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ChangeLog,v 1.44 2008/11/02 10:26:37 mrness Exp $
+
+  02 Nov 2008; Alin Năstac <mrness@gentoo.org>
+  -files/ltmodem-2.6.9-kernel-2.6.24.patch,
+  +files/ltmodem-2.6.9-kernel-2.6.27.patch, ltmodem-2.6.9-r1.ebuild:
+  Fix compilation errors when build against kernel 2.6.27, thanks to
+  Aleksandar Topuzovic (#244833).
 
   31 Aug 2008; Alin Năstac <mrness@gentoo.org> ltmodem-2.6.9-r1.ebuild:
   Add AgereSystems-WinModem license (#235484).
diff --git a/net-dialup/ltmodem/Manifest b/net-dialup/ltmodem/Manifest
index 4d744f6b178f..6ba90ec96975 100644
--- a/net-dialup/ltmodem/Manifest
+++ b/net-dialup/ltmodem/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ltmodem-2.6.9-kernel-2.6.24.patch 648 RMD160 8e4137c109aa98b07be159418e0ddc728a0613fc SHA1 279663430bafdab85d906d5261027afa7c5b8f48 SHA256 5b0e95206df10ec0e606cb2a28c6ba6685452bd61f57879f19bcc9df67922e0d
+AUX ltmodem-2.6.9-kernel-2.6.27.patch 1329 RMD160 4604093f7a38e30366a16d70aa3c7314496c66ba SHA1 6eda3c682b7f3e9b7667393cfe5ade3e7a9ff1a4 SHA256 76c2410f9193ade1fddd8b9fa4692f008d1659d52823e1da1056d5bab2139f79
 AUX ltmodem_udev 185 RMD160 38b8bb7d80045ab04438d6f9a823d96a37b849f2 SHA1 190be0cb0232530424fbc4b17377a122adf97c9e SHA256 1b7bb2c1b4efd62b0cd45d22c59c93626cd3bc3b5e7bbc83e8c8252c060d1caf
 DIST ltmodem-2.6-alk-9.tar.bz2 436144 RMD160 cba66ad674cd4fdb9254041e5f8ae70a52996b67 SHA1 ea8ac7f907f39d49226334d65ac94db9d21a9ab9 SHA256 fb5082cf62434be59a32dc8bd304d9946ba275412057dc439bc569e8be71293f
-EBUILD ltmodem-2.6.9-r1.ebuild 2411 RMD160 5caee2934a630c3dd69d53de307db4ab0a1ed31a SHA1 ccc98910111b36aebff671c5be88be9ea04b4414 SHA256 904bfe88966a794c458e1ca069012d11b5a08059e755c820a6214ac0f1d5522c
-MISC ChangeLog 6551 RMD160 163495d93f6186a098ffa4a4600e9af0d548da70 SHA1 dd95c5dbf01119d94c67913de4a01168fde1ac54 SHA256 db53b1640447f701c0d14295a21288a77c8ac924af7fdc30800539a5c33983b1
+EBUILD ltmodem-2.6.9-r1.ebuild 2411 RMD160 5a7cd7b9c7a7d6bde273a25fb7c6fc7f1a6cabd0 SHA1 ab2ef120e1c757a1f7764fdd3f933f14fde00ad5 SHA256 e5757e7b46a51a323ada7cf2192cdf0ed5cfc687e224636f319ed0b2a0d746c3
+MISC ChangeLog 6816 RMD160 8451f14881b4f6a25aff16fb553ccf1dee2105f4 SHA1 1523f08e8ded1f22aad5cc73748df58da39b7885 SHA256 25e6198d68cb658fae53bf5ed81cbbab73e3ca2527bd33fb839f3b9df031b23c
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAki6zfIACgkQPrHvTlXvhtts3ACfXNkFg6PeQ6mvDKcORagX6aS+
-ic0AniLX7WDmVjd8qMLi8hxyXT8Ag+W7
-=VdIu
+iEYEARECAAYFAkkNgGwACgkQPrHvTlXvhts2fgCfQ+YIHclB89UwinexMpgcSya7
+sbkAn1Z0dCCJYXzi705s6Z+gIYMFd19w
+=ASyi
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.24.patch b/net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.24.patch
deleted file mode 100644
index b2d8f111a882..000000000000
--- a/net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.24.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nru ltmodem-2.6-alk-9.orig/serial.c ltmodem-2.6-alk-9/serial.c
---- ltmodem-2.6-alk-9.orig/serial.c	2007-09-06 04:56:25.000000000 +0300
-+++ ltmodem-2.6-alk-9/serial.c	2008-02-13 17:21:44.000000000 +0200
-@@ -826,7 +826,11 @@
- 	*lt_modem_ops.virtual_isr_ptr = lt_virtual_rs_interrupt;
- 
- 	/* lets try to grap dsp interrupt here */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
- 	ret = request_irq(lt_modem_res.Irq, VMODEM_Hw_Int_Proc, SA_INTERRUPT | SA_SHIRQ,
-+#else
-+	ret = request_irq(lt_modem_res.Irq, VMODEM_Hw_Int_Proc, IRQF_DISABLED | IRQF_SHARED,
-+#endif
- 				ltserialstring, &lt_modem_res.BaseAddress);
- 	if (ret<0)
- 		goto out_port;
diff --git a/net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.27.patch b/net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.27.patch
new file mode 100644
index 000000000000..d9e5cd23e27a
--- /dev/null
+++ b/net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.27.patch
@@ -0,0 +1,39 @@
+diff -Nru ltmodem-2.6-alk-9.orig/serial.c ltmodem-2.6-alk-9/serial.c
+--- ltmodem-2.6-alk-9.orig/serial.c	2007-09-06 01:56:25.000000000 +0000
++++ ltmodem-2.6-alk-9/serial.c	2008-11-02 10:19:26.000000000 +0000
+@@ -362,7 +362,11 @@
+ 		receive_chars(&lt_port,&status,0);
+ 
+ 		{
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
+ 			struct tty_struct *tty = lt_port.port.info->tty;
++#else
++			struct tty_struct *tty = lt_port.port.info->port.tty;
++#endif
+ 			spin_unlock_irqrestore(&lt_port.port.lock, flags);
+ 			tty_flip_buffer_push(tty);
+ 			spin_lock_irqsave(&lt_port.port.lock,flags);
+@@ -568,7 +572,11 @@
+ 
+ 	// force low latency mode on tty.
+ 	// We will push data from buttom half, no need to delay it further.
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
+ 	port->info->tty->low_latency = 1;
++#else
++	port->info->port.tty->low_latency = 1;
++#endif
+ 
+ 	lt_modem_ops.PortOpen();
+ 
+@@ -826,7 +834,11 @@
+ 	*lt_modem_ops.virtual_isr_ptr = lt_virtual_rs_interrupt;
+ 
+ 	/* lets try to grap dsp interrupt here */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+ 	ret = request_irq(lt_modem_res.Irq, VMODEM_Hw_Int_Proc, SA_INTERRUPT | SA_SHIRQ,
++#else
++	ret = request_irq(lt_modem_res.Irq, VMODEM_Hw_Int_Proc, IRQF_DISABLED | IRQF_SHARED,
++#endif
+ 				ltserialstring, &lt_modem_res.BaseAddress);
+ 	if (ret<0)
+ 		goto out_port;
diff --git a/net-dialup/ltmodem/ltmodem-2.6.9-r1.ebuild b/net-dialup/ltmodem/ltmodem-2.6.9-r1.ebuild
index d7908526b8f8..6a067f55caf6 100644
--- a/net-dialup/ltmodem/ltmodem-2.6.9-r1.ebuild
+++ b/net-dialup/ltmodem/ltmodem-2.6.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-2.6.9-r1.ebuild,v 1.2 2008/08/31 16:59:16 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-2.6.9-r1.ebuild,v 1.3 2008/11/02 10:26:37 mrness Exp $
 
 inherit linux-mod eutils
 
@@ -46,7 +46,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	epatch "${FILESDIR}"/${P}-kernel-2.6.24.patch
+	epatch "${FILESDIR}"/${P}-kernel-2.6.27.patch
 }
 
 src_install() {