Add upstream fix for suspend2 patched kernels (#125565).

(Portage version: 2.0.53)

6 files changed, 82 insertions, 12 deletions

diff --git a/net-dialup/hsfmodem/ChangeLog b/net-dialup/hsfmodem/ChangeLog
index 549bb42459a3..1ae1d578e4b7 100644
--- a/net-dialup/hsfmodem/ChangeLog
+++ b/net-dialup/hsfmodem/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/hsfmodem
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.23 2006/02/21 23:29:59 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.24 2006/03/10 12:28:22 mrness Exp $
+
+*hsfmodem-7.43.00.01-r1 (10 Mar 2006)
+
+  10 Mar 2006; Alin Nastac <mrness@gentoo.org>
+  +files/hsfmodem-7.43.00.01-suspend2.patch,
+  +files/hsfmodem-7.43.00.01-try_to_freeze-2.patch,
+  -hsfmodem-7.43.00.01.ebuild, +hsfmodem-7.43.00.01-r1.ebuild:
+  Add upstream fix for suspend2 patched kernels (#125565).
 
 *hsfmodem-7.43.00.01 (21 Feb 2006)
 
diff --git a/net-dialup/hsfmodem/Manifest b/net-dialup/hsfmodem/Manifest
index ab42d594bf39..ff90dd5e6197 100644
--- a/net-dialup/hsfmodem/Manifest
+++ b/net-dialup/hsfmodem/Manifest
@@ -1,21 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 60cafaf44db9b0b6c92d2f438b0ba606 ChangeLog 5998
 MD5 83ef8c3c538249abc93745ecf124151b files/digest-hsfmodem-7.18.00.07-r1 230
 MD5 83ef8c3c538249abc93745ecf124151b files/digest-hsfmodem-7.18.00.07-r2 230
 MD5 fb610b9a599d3b2ede68a872f52e95b3 files/digest-hsfmodem-7.43.00.01 230
+MD5 fb610b9a599d3b2ede68a872f52e95b3 files/digest-hsfmodem-7.43.00.01-r1 230
 MD5 1c3cdb408c8580a03b30e2ec00f63aa8 files/hsfmodem-7.18.00.07-udev-group.patch 603
 MD5 55b57b492577870de5cb58229f0426d7 files/hsfmodem-7.18.00.07-upstream-20060107.patch 2809
+MD5 020777761d71bdcee2b4e57cce60af11 files/hsfmodem-7.43.00.01-suspend2.patch 812
+MD5 d4d8d616c23eb37833008e2a76bc9a47 files/hsfmodem-7.43.00.01-try_to_freeze-2.patch 3197
 MD5 72c3d70f94e3712b160f7b41b2978f1d files/hsfmodem-7.43.00.01-udev-group.patch 603
 MD5 6f3c975173976a825b545ae010d9047c hsfmodem-7.18.00.07-r1.ebuild 1592
 MD5 7806adb04b92a668c65c709b70959929 hsfmodem-7.18.00.07-r2.ebuild 1635
+MD5 f62a00254865b106db2d50fe74b9b9b2 hsfmodem-7.43.00.01-r1.ebuild 1674
 MD5 90159889b0b06ea85352fd0eab01b447 hsfmodem-7.43.00.01.ebuild 1587
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD+6KNjG8pv1lIUX4RAn3lAJwLBYoooCqAnD+bfrdX6oCRf7I8JACg5IUn
-9AfyhWRIs6gcIATcX7TFgn8=
-=gtMw
------END PGP SIGNATURE-----
diff --git a/net-dialup/hsfmodem/files/digest-hsfmodem-7.43.00.01 b/net-dialup/hsfmodem/files/digest-hsfmodem-7.43.00.01-r1
index 242f4b2b17a9..242f4b2b17a9 100644
--- a/net-dialup/hsfmodem/files/digest-hsfmodem-7.43.00.01
+++ b/net-dialup/hsfmodem/files/digest-hsfmodem-7.43.00.01-r1
diff --git a/net-dialup/hsfmodem/files/hsfmodem-7.43.00.01-suspend2.patch b/net-dialup/hsfmodem/files/hsfmodem-7.43.00.01-suspend2.patch
new file mode 100644
index 000000000000..8b8d4fc933a9
--- /dev/null
+++ b/net-dialup/hsfmodem/files/hsfmodem-7.43.00.01-suspend2.patch
@@ -0,0 +1,27 @@
+diff -urN hsfmodem-7.43.00.01full/modules/osservices.c hsfmodem-7.43.00.01full-suspend2/modules/osservices.c
+--- hsfmodem-7.43.00.01full/modules/osservices.c	2006-01-27 07:49:32.000000000 -0500
++++ hsfmodem-7.43.00.01full-suspend2/modules/osservices.c	2006-02-24 09:40:03.000000000 -0500
+@@ -28,9 +28,22 @@
+ #include <linux/smp_lock.h>
+ #include <linux/file.h>
+ #include <linux/kmod.h>
++
+ #ifdef FOUND_LINUX_SUSPEND
++#define UINT8 UINT8_suspend
++#define BOOL BOOL_suspend
++#define UINT16 UINT16_suspend
++#define UINT32 UINT32_suspend
++#define INT32 INT32_suspend
++#undef INT64
+ #include <linux/suspend.h>
+-#endif
++#undef UINT8
++#undef BOOL
++#undef UINT16
++#undef UINT32
++#undef INT32
++#endif /* FOUND_LINUX_SUSPEND */
++
+ #if ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,7) )
+ #include <linux/completion.h>
+ #endif
diff --git a/net-dialup/hsfmodem/files/hsfmodem-7.43.00.01-try_to_freeze-2.patch b/net-dialup/hsfmodem/files/hsfmodem-7.43.00.01-try_to_freeze-2.patch
new file mode 100644
index 000000000000..8273a056102b
--- /dev/null
+++ b/net-dialup/hsfmodem/files/hsfmodem-7.43.00.01-try_to_freeze-2.patch
@@ -0,0 +1,39 @@
+diff -urN hsfmodem-7.43.00.01full/modules/Makefile hsfmodem-7.43.00.01full-try_to_freeze-2/modules/Makefile
+--- hsfmodem-7.43.00.01full/modules/Makefile	2006-02-08 01:12:09.000000000 -0500
++++ hsfmodem-7.43.00.01full-try_to_freeze-2/modules/Makefile	2006-03-09 16:20:14.000000000 -0500
+@@ -82,6 +82,8 @@
+ FOUND_TTY_START_STOP := $(shell grep -q 'stop_tx.*tty_stop' ${REAL_KERNELSRC}/include/linux/serial_core.h 2>/dev/null && echo -DFOUND_TTY_START_STOP)
+ FOUND_CLASS_DEVICE_PARENT := $(shell grep -q 'struct[ \t]*class_device[ \t]*\*[ \t]*parent' ${REAL_KERNELSRC}/include/linux/device.h 2>/dev/null && echo -DFOUND_CLASS_DEVICE_PARENT)
+ FOUND_REFRIGERATOR := $(shell grep -q 'refrigerator' ${REAL_KERNELSRC}/include/linux/suspend.h 2>/dev/null && echo -DFOUND_REFRIGERATOR)
++FOUND_TRY_TO_FREEZE_LONG := $(shell grep -q 'try_to_freeze.*long' ${REAL_KERNELSRC}/include/linux/sched.h 2>/dev/null && echo -DFOUND_TRY_TO_FREEZE_LONG)
++FOUND_TRY_TO_FREEZE_VOID := $(shell grep -q 'try_to_freeze.*void' ${REAL_KERNELSRC}/include/linux/sched.h 2>/dev/null && echo -DFOUND_TRY_TO_FREEZE_VOID)
+ FOUND_MODULE_PARAM :=  $(shell grep -q 'module_param' ${REAL_KERNELSRC}/include/linux/moduleparam.h 2>/dev/null && echo -DFOUND_MODULE_PARAM)
+ FOUND_PM_MESSAGE_T := $(shell grep -q 'pm_message_t' ${REAL_KERNELSRC}/include/linux/pci.h 2>/dev/null && echo -DFOUND_PM_MESSAGE_T)
+ FOUND_PM_MESSAGE_STRUCT := $(shell grep -q '^typedef struct pm_message' ${REAL_KERNELSRC}/include/linux/pm.h 2>/dev/null && echo -DFOUND_PM_MESSAGE_STRUCT)
+@@ -93,7 +95,7 @@
+ FOUND_TOUCH_ATIME := $(shell grep -q 'touch_atime' ${REAL_KERNELSRC}/include/linux/fs.h 2>/dev/null && echo -DFOUND_TOUCH_ATIME)
+ FOUND_KZALLOC := $(shell grep -q 'kzalloc' ${REAL_KERNELSRC}/include/linux/slab.h 2>/dev/null && echo -DFOUND_KZALLOC)
+ 
+-CFLAGS+= $(FOUND_CLASS_SIMPLE) $(FOUND_UART_REGISTER_PORT) $(FOUND_TTY_START_STOP) $(FOUND_CLASS_DEVICE_PARENT) $(FOUND_REFRIGERATOR) $(FOUND_MODULE_PARAM) $(FOUND_PM_MESSAGE_T) $(FOUND_PM_MESSAGE_STRUCT) $(FOUND_PCI_CHOOSE_STATE) $(FOUND_LINUX_SUSPEND) $(FOUND_USB_DRIVER_OWNER) $(FOUND_PCI_REGISTER_DRIVER) $(FOUND_TTY_NEW_API) $(FOUND_TOUCH_ATIME) $(FOUND_KZALLOC)
++CFLAGS+= $(FOUND_CLASS_SIMPLE) $(FOUND_UART_REGISTER_PORT) $(FOUND_TTY_START_STOP) $(FOUND_CLASS_DEVICE_PARENT) $(FOUND_REFRIGERATOR) $(FOUND_TRY_TO_FREEZE_LONG) $(FOUND_TRY_TO_FREEZE_VOID) $(FOUND_MODULE_PARAM) $(FOUND_PM_MESSAGE_T) $(FOUND_PM_MESSAGE_STRUCT) $(FOUND_PCI_CHOOSE_STATE) $(FOUND_LINUX_SUSPEND) $(FOUND_USB_DRIVER_OWNER) $(FOUND_PCI_REGISTER_DRIVER) $(FOUND_TTY_NEW_API) $(FOUND_TOUCH_ATIME) $(FOUND_KZALLOC)
+ 
+ else
+ KO= o
+diff -urN hsfmodem-7.43.00.01full/modules/osservices.c hsfmodem-7.43.00.01full-try_to_freeze-2/modules/osservices.c
+--- hsfmodem-7.43.00.01full/modules/osservices.c	2006-01-27 07:49:32.000000000 -0500
++++ hsfmodem-7.43.00.01full-try_to_freeze-2/modules/osservices.c	2006-03-09 16:21:24.000000000 -0500
+@@ -526,6 +526,14 @@
+ #ifdef FOUND_REFRIGERATOR
+ 				if (current->flags & PF_FREEZE)
+ 					refrigerator(PF_FREEZE);
++#else
++#ifdef FOUND_TRY_TO_FREEZE_LONG
++				try_to_freeze(PF_FREEZE);
++#else
++#ifdef FOUND_TRY_TO_FREEZE_VOID
++				try_to_freeze();
++#endif
++#endif
+ #endif
+ 				schedule();
+ 			}
diff --git a/net-dialup/hsfmodem/hsfmodem-7.43.00.01.ebuild b/net-dialup/hsfmodem/hsfmodem-7.43.00.01-r1.ebuild
index 594d7f0b1111..6e4a629d1cc5 100644
--- a/net-dialup/hsfmodem/hsfmodem-7.43.00.01.ebuild
+++ b/net-dialup/hsfmodem/hsfmodem-7.43.00.01-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/hsfmodem/hsfmodem-7.43.00.01.ebuild,v 1.1 2006/02/21 23:29:59 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/hsfmodem-7.43.00.01-r1.ebuild,v 1.1 2006/03/10 12:28:22 mrness Exp $
 
 inherit eutils
 
@@ -34,6 +34,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${MY_ARCH_S}"
+	epatch ${FILESDIR}/${P}-suspend2.patch
+	epatch ${FILESDIR}/${P}-try_to_freeze-2.patch
 	epatch ${FILESDIR}/${P}-udev-group.patch
 }