Include utsrelease.h for kernels >= 2.6.18 (#140723).

Package-Manager: portage-2.1-r2

3 files changed, 58 insertions, 3 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index f0ff25dd6439..2748a0bdf31c 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.68 2006/09/09 15:27:36 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.69 2006/09/10 09:55:23 mrness Exp $
+
+  10 Sep 2006; Alin Nastac <mrness@gentoo.org>
+  -files/slmodem-2.9.11-devfs.patch,
+  +files/slmodem-2.9.11-kernel-2.6.18.patch, -files/slmodem-2.9.devfs,
+  slmodem-2.9.11_pre20051101-r1.ebuild:
+  Include utsrelease.h when kernel ver >= 2.6.18 (#140723).
 
 *slmodem-2.9.11_pre20051101-r1 (09 Sep 2006)
 
diff --git a/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.18.patch b/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.18.patch
new file mode 100644
index 000000000000..62a21f332a1b
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.18.patch
@@ -0,0 +1,49 @@
+diff -Nru slmodem-2.9.11-20051101.orig/drivers/amrmo_init.c slmodem-2.9.11-20051101/drivers/amrmo_init.c
+--- slmodem-2.9.11-20051101.orig/drivers/amrmo_init.c	2005-10-10 00:14:13.000000000 +0300
++++ slmodem-2.9.11-20051101/drivers/amrmo_init.c	2006-09-09 18:13:47.219081000 +0300
+@@ -53,7 +53,13 @@
+ #include <linux/poll.h>
+ #include <linux/fs.h>
+ #include <asm/uaccess.h>
+-#include <linux/devfs_fs_kernel.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
++#	include <linux/devfs_fs_kernel.h>
++#else
++#	define devfs_mk_cdev(dev, mode, fmt, i)
++#	define devfs_remove(fmt, i)
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ #define OLD_KERNEL 1
+diff -Nru slmodem-2.9.11-20051101.orig/drivers/kernel-ver.c slmodem-2.9.11-20051101/drivers/kernel-ver.c
+--- slmodem-2.9.11-20051101.orig/drivers/kernel-ver.c   2003-09-23 20:38:40.000000000 +0300
++++ slmodem-2.9.11-20051101/drivers/kernel-ver.c        2006-09-10 12:45:04.643367500 +0300
+@@ -4,6 +4,9 @@
+
+ #include <stdio.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++#      include <linux/utsrelease.h>
++#endif
+
+ int main()
+ {
+diff -Nru slmodem-2.9.11-20051101.orig/drivers/st7554.c slmodem-2.9.11-20051101/drivers/st7554.c
+--- slmodem-2.9.11-20051101.orig/drivers/st7554.c	2005-11-01 17:31:45.000000000 +0200
++++ slmodem-2.9.11-20051101/drivers/st7554.c	2006-09-09 18:14:36.910186500 +0300
+@@ -55,7 +55,13 @@
+ #include <linux/poll.h>
+ #include <linux/usb.h>
+ #include <linux/device.h>
+-#include <linux/devfs_fs_kernel.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
++#	include <linux/devfs_fs_kernel.h>
++#else
++#	define devfs_mk_cdev(dev, mode, fmt, i)
++#	define devfs_remove(fmt, i)
++#endif
+ 
+ #include <modem_defs.h>
+ 
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r1.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r1.ebuild
index 211d9fdf65b8..45a4b5669893 100644
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r1.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r1.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/slmodem/slmodem-2.9.11_pre20051101-r1.ebuild,v 1.1 2006/09/09 15:27:37 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r1.ebuild,v 1.2 2006/09/10 09:55:23 mrness Exp $
 
 inherit eutils linux-mod multilib
 
@@ -43,7 +43,7 @@ src_unpack() {
 
 	cd "${S}"
 	epatch "${FILESDIR}/${P%%_*}-makefile.patch"
-	epatch "${FILESDIR}/${P%%_*}-devfs.patch"
+	epatch "${FILESDIR}/${P%%_*}-kernel-2.6.18.patch"
 	cd drivers
 	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" Makefile
 	convert_to_m Makefile