segfault on kernels >= 2.6.10 (#86331)

(Portage version: 2.0.51.19)

5 files changed, 124 insertions, 13 deletions

diff --git a/net-dialup/intel-536ep/ChangeLog b/net-dialup/intel-536ep/ChangeLog
index 300b46084f4d..7a4da1bd77f3 100644
--- a/net-dialup/intel-536ep/ChangeLog
+++ b/net-dialup/intel-536ep/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/intel-536ep
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/intel-536ep/ChangeLog,v 1.3 2005/03/15 17:15:27 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/intel-536ep/ChangeLog,v 1.4 2005/03/24 15:26:00 mrness Exp $
+
+*intel-536ep-4.69-r1 (24 Mar 2005)
+
+  24 Mar 2005; Alin Nastac <mrness@gentoo.org>
+  +files/intel-536ep-4.69-kernel-2.6.10-tty.patch,
+  +intel-536ep-4.69-r1.ebuild:
+  Fix segfault on kernels >= 2.6.10 (#86331), thanks to Markus Gothe
+  <margo284@student.liu.se>.
 
   15 Mar 2005; Alin Nastac <mrness@gentoo.org>
   +files/intel-536ep-4.69-kernel-2.6.11-pm.patch, intel-536ep-4.69.ebuild:
diff --git a/net-dialup/intel-536ep/Manifest b/net-dialup/intel-536ep/Manifest
index 4cfbb7c83074..d7414cc50ed1 100644
--- a/net-dialup/intel-536ep/Manifest
+++ b/net-dialup/intel-536ep/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8820ae0eee5f3e79c4160c0004d55936 intel-536ep-4.69.ebuild 1440
 MD5 53e74d1f750b83bbb4a61815054af61c ChangeLog 828
+MD5 8820ae0eee5f3e79c4160c0004d55936 intel-536ep-4.69.ebuild 1440
 MD5 4a05a31c48e912c88a3677b9c597516c metadata.xml 227
+MD5 bb0976c5626ba37a38566a6e16088682 intel-536ep-4.69-r1.ebuild 1546
+MD5 ca1e9b07e5f36835a0332562ee1d3e64 files/digest-intel-536ep-4.69 65
 MD5 18ed5f89cb69ae749a0c4f41abb7b5b3 files/intel536ep.confd 111
 MD5 29c69d64bc64efc141963b2fc3af1e19 files/intel536ep.initd 920
-MD5 ca1e9b07e5f36835a0332562ee1d3e64 files/digest-intel-536ep-4.69 65
 MD5 1c2e92f30f7fe736154568f765250211 files/intel-536ep-4.69-kernel-2.6.11-pm.patch 772
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCNxi3jiC39V7gKu0RAqvIAJ94j6OPar4oK/H4e/YeV6rA1zkDVQCfeUTV
-xk6pE0fNh//SUlknTn3ELxE=
-=VR3f
------END PGP SIGNATURE-----
+MD5 990733f961ff5236689af82f8151d42d files/intel-536ep-4.69-kernel-2.6.10-tty.patch 1914
+MD5 ca1e9b07e5f36835a0332562ee1d3e64 files/digest-intel-536ep-4.69-r1 65
diff --git a/net-dialup/intel-536ep/files/digest-intel-536ep-4.69-r1 b/net-dialup/intel-536ep/files/digest-intel-536ep-4.69-r1
new file mode 100644
index 000000000000..6c5386a8fa70
--- /dev/null
+++ b/net-dialup/intel-536ep/files/digest-intel-536ep-4.69-r1
@@ -0,0 +1 @@
+MD5 20e690541d3b18bbc1b2c2f690bfbc6d intel-536ep-4.69.tgz 463347
diff --git a/net-dialup/intel-536ep/files/intel-536ep-4.69-kernel-2.6.10-tty.patch b/net-dialup/intel-536ep/files/intel-536ep-4.69-kernel-2.6.10-tty.patch
new file mode 100644
index 000000000000..24cc4ea19d00
--- /dev/null
+++ b/net-dialup/intel-536ep/files/intel-536ep-4.69-kernel-2.6.10-tty.patch
@@ -0,0 +1,49 @@
+--- coredrv/softserial.h.orig	2005-03-23 01:55:22.000000000 +0100
++++ coredrv/softserial.h	2005-03-23 01:55:49.000000000 +0100
+@@ -86,7 +86,7 @@
+ int  softserial_open           (struct tty_struct*, struct file*);

+ void softserial_put_char       (struct tty_struct*, unsigned char);

+ void softserial_set_termios    (struct tty_struct*, struct termios*);

+-int  softserial_write          (struct tty_struct*, int, const unsigned char*, int);

++int  softserial_write          (struct tty_struct*, const unsigned char*, int);

+ int  softserial_ioctl          (struct tty_struct*, struct file*, unsigned int, unsigned long);

+ 

+ 

+--- coredrv/softserial_io.c.orig	2005-03-23 01:56:46.000000000 +0100
++++ coredrv/softserial_io.c	2005-03-23 01:58:59.000000000 +0100
+@@ -55,7 +55,7 @@
+ //=============================================================================

+ static DECLARE_MUTEX(softserial_write_sem);

+ int softserial_write(struct tty_struct* ptty,

+-                      int from_user_space,

++                      //int from_user_space,

+                       const unsigned char* input_buffer,

+                       int write_count_asked)  //why is it a signed int?

+ {

+@@ -73,7 +73,7 @@
+    //printk("softserial:softserial_write()\n");

+    //printk("write: fus%d, count%d\n",from_user_space, write_count_asked);

+    

+-   if(from_user_space)

++   /*if(from_user_space)

+    {

+       down(&softserial_write_sem); //this may not be enough

+       while(write_count_asked - written_count > 0)

+@@ -107,7 +107,7 @@
+       up(&softserial_write_sem);

+    }

+    else           //data is from kernel space

+-   {

++   {*/

+       while(write_count_asked - written_count > 0)

+       {

+          softcore_space = G.softcore.write_free();

+@@ -127,7 +127,7 @@
+          input_buffer_ptr += copy_size;

+          written_count += copy_size;

+       }

+-   }

++   /*}*/

+ 

+    return(written_count);

+ }

diff --git a/net-dialup/intel-536ep/intel-536ep-4.69-r1.ebuild b/net-dialup/intel-536ep/intel-536ep-4.69-r1.ebuild
new file mode 100644
index 000000000000..1b451d888f98
--- /dev/null
+++ b/net-dialup/intel-536ep/intel-536ep-4.69-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/intel-536ep/intel-536ep-4.69-r1.ebuild,v 1.1 2005/03/24 15:26:00 mrness Exp $
+
+inherit eutils flag-o-matic linux-mod
+
+DESCRIPTION="Driver for Intel 536EP modem"
+HOMEPAGE="http://developer.intel.com/design/modems/products/536ep.htm"
+SRC_URI="ftp://aiedownload.intel.com/df-support/6497/eng/${P}.tgz"
+
+LICENSE="Intel"
+SLOT="0"
+KEYWORDS="~x86"
+
+S=${WORKDIR}/intel-536EP-2.56.76.0
+MODULE_NAMES="Intel536(:${S}/coredrv)"
+
+pkg_setup() {
+	if kernel_is 2 4; then
+		BUILD_TARGETS="536core"
+		BUILD_PARAMS="KERNEL_SOURCE_PATH=${KV_DIR} TARGET=TARGET_SELAH"
+	else
+		BUILD_TARGETS="536core_26"
+		BUILD_PARAMS="KERNEL_SOURCE_PATH=${KV_DIR}"
+	fi
+
+	linux-mod_pkg_setup
+}
+
+src_unpack(){
+	unpack ${A}
+
+	cd ${S}
+	if kernel_is 2 4; then
+		#there is no way of passing this as make parameter
+		sed -i -e 's/\$(PSTN_DEF)/-DTARGET_SELAH -DTARGET_LINUX -DLINUX/' coredrv/Makefile
+	elif kernel_is ge 2 6 10; then
+		#see bug #86331
+		epatch ${FILESDIR}/${P}-kernel-2.6.10-tty.patch
+
+		if kernel_is ge 2 6 11; then
+			#addapt to power management changes occured in kernel
+			epatch ${FILESDIR}/${P}-kernel-2.6.11-pm.patch
+		fi
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+
+	#install hamregistry executable
+	exeinto /usr/sbin
+	doexe ${S}/hamregistry
+
+	#install boot script and config
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/intel536ep.initd intel536ep
+	insinto /etc/conf.d
+	newins ${FILESDIR}/intel536ep.confd intel536ep
+}