Remove 2.6.23-r10 as tuxonice requires resync for >2.6.23.14 (bug #209755), add 2.6.24-r2 with a patch to correctly support userui (bug #209775).

(Portage version: 2.1.4.4)

3 files changed, 37 insertions, 5 deletions

diff --git a/sys-kernel/tuxonice-sources/ChangeLog b/sys-kernel/tuxonice-sources/ChangeLog
index 8297affa3988..6c8380ff0831 100644
--- a/sys-kernel/tuxonice-sources/ChangeLog
+++ b/sys-kernel/tuxonice-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/tuxonice-sources
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/ChangeLog,v 1.15 2008/02/11 12:29:54 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/ChangeLog,v 1.16 2008/02/12 07:50:56 nelchael Exp $
+
+*tuxonice-sources-2.6.24-r2 (12 Feb 2008)
+
+  12 Feb 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/2.6.24-3.0-rc5-userui-fix.patch,
+  -tuxonice-sources-2.6.23-r10.ebuild, +tuxonice-sources-2.6.24-r2.ebuild:
+  Remove 2.6.23-r10 as tuxonice requires resync for >2.6.23.14 (bug #209755),
+  add 2.6.24-r2 with a patch to correctly support userui (bug #209775).
 
 *tuxonice-sources-2.6.23-r10 (11 Feb 2008)
 
diff --git a/sys-kernel/tuxonice-sources/files/2.6.24-3.0-rc5-userui-fix.patch b/sys-kernel/tuxonice-sources/files/2.6.24-3.0-rc5-userui-fix.patch
new file mode 100644
index 000000000000..f3dee63df0d5
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/files/2.6.24-3.0-rc5-userui-fix.patch
@@ -0,0 +1,23 @@
+From: Nigel Cunningham <nigel@tuxonice.net>
+Date: Fri, 25 Jan 2008 20:51:56 +0000 (+1100)
+Subject: [TuxOnIce] Fix regression in starting userui (wrong umh_wait arg).
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnigelc%2Ftuxonice-head.git;a=commitdiff_plain;h=c43ab8880c53f2acb55be4614ce97b8c9d3664c2
+
+[TuxOnIce] Fix regression in starting userui (wrong umh_wait arg).
+
+Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
+---
+
+diff --git a/kernel/power/tuxonice_netlink.c b/kernel/power/tuxonice_netlink.c
+index 80f6c38..f459a7f 100644
+--- a/kernel/power/tuxonice_netlink.c
++++ b/kernel/power/tuxonice_netlink.c
+@@ -302,7 +302,7 @@ int toi_netlink_setup(struct user_helper_data *uhd)
+ 	}
+ 
+ 	if (toi_launch_userspace_program(uhd->program, uhd->netlink_id,
+-				UMH_NO_WAIT) < 0) {
++				UMH_WAIT_EXEC) < 0) {
+ 		printk(KERN_INFO "Launch userspace program failed.\n");
+ 		toi_netlink_close_complete(uhd);
+ 		return 1;
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.23-r10.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.24-r2.ebuild
index a45c0be296a0..fc547e604d43 100644
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.23-r10.ebuild
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.24-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.23-r10.ebuild,v 1.1 2008/02/11 12:29:54 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.24-r2.ebuild,v 1.1 2008/02/12 07:50:56 nelchael Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="9"
+K_GENPATCHES_VER="3"
 
 inherit kernel-2
 detect_version
@@ -14,11 +14,12 @@ DESCRIPTION="TuxOnIce + Gentoo patchset sources"
 HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.tuxonice.net"
 
 TUXONICE_VERSION="3.0-rc5"
-TUXONICE_TARGET="2.6.23.14"
+TUXONICE_TARGET="2.6.24"
 TUXONICE_SRC="tuxonice-${TUXONICE_VERSION}-for-${TUXONICE_TARGET}"
 TUXONICE_URI="http://www.tuxonice.net/downloads/all/${TUXONICE_SRC}.patch.bz2"
 
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_SRC}.patch.bz2"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_SRC}.patch.bz2
+	${FILESDIR}/${TUXONICE_TARGET}-${TUXONICE_VERSION}-userui-fix.patch"
 UNIPATCH_STRICTORDER="yes"
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"