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).

Package-Manager: portage-2.1.4.4

4 files changed, 43 insertions, 12 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/Manifest b/sys-kernel/tuxonice-sources/Manifest
index 3f1f7ce45ea7..00c894b421a0 100644
--- a/sys-kernel/tuxonice-sources/Manifest
+++ b/sys-kernel/tuxonice-sources/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 2.6.24-3.0-rc5-userui-fix.patch 930 RMD160 dd5875575da5fa392ea9923fb400dc9a16ce0b6c SHA1 a862dd73bfb9b725bbc360f433954cafe6bc5746 SHA256 98047261f7df02da9f1c9d75da38a8a3b5e08664b0f7228c5095510aaef6bdaf
 DIST genpatches-2.6.23-1.base.tar.bz2 3147 RMD160 555ed180e4e700f3ce913fe460f05eb8f71dfe46 SHA1 3d68154d4d956460aa66b6c6d30e857696d8c2f2 SHA256 773cbe243642b1c10a49cab1175fa1c54c0ca67d6471257ce66417a754d87578
 DIST genpatches-2.6.23-1.extras.tar.bz2 57252 RMD160 201fdd76ba5024f662da2c2d20e03093bcecc6d5 SHA1 196238c658d68d9046b70c98d1340a1305a102df SHA256 50bf8799ea7816d72b0db7c0fa4b886379b7b49f366fd647130318ad5de314b6
 DIST genpatches-2.6.23-2.base.tar.bz2 6134 RMD160 b4d459e06a1a482fb4cfe51e8b693f9c95a6254b SHA1 b851ef449ec34d4331aba47774fe915cc2408e13 SHA256 fa6c34455470c4d57df1d51829a444343f7cbfca44d726843382baeec5ccbaec
@@ -15,8 +16,6 @@ DIST genpatches-2.6.23-6.base.tar.bz2 82841 RMD160 120ff54d3ed59be87539ffb43eb7a
 DIST genpatches-2.6.23-6.extras.tar.bz2 147992 RMD160 bb9cfc7687944b677799b2386bc4b36d95676cea SHA1 fc7f24df398033cdf8e0ff444020c58407aa9925 SHA256 9d272384be06e00ecfdfa1795262a0859e86acd09aa95c531ff311e210d87db6
 DIST genpatches-2.6.23-7.base.tar.bz2 83558 RMD160 12347bbc1a3dfd96dbe5cb638c40d646537737f8 SHA1 bc12250baecd513f2c8666b2287c6678673166ee SHA256 0068ddeab387fcdc36ee05b5312a4b4cc6a32adf3d7df4de8fa4b5c6c45cbad6
 DIST genpatches-2.6.23-7.extras.tar.bz2 147992 RMD160 bb9cfc7687944b677799b2386bc4b36d95676cea SHA1 fc7f24df398033cdf8e0ff444020c58407aa9925 SHA256 9d272384be06e00ecfdfa1795262a0859e86acd09aa95c531ff311e210d87db6
-DIST genpatches-2.6.23-9.base.tar.bz2 138031 RMD160 1f5312a88ee3a4a91ee6f6c089cfc621745fdd3d SHA1 a94c19b3f4763f8011e233947dd3847edf4b34ab SHA256 ad4319131b8117f58a9057d6ac25870a188571e46ef70c6c85930af3530f3bf6
-DIST genpatches-2.6.23-9.extras.tar.bz2 147992 RMD160 bb9cfc7687944b677799b2386bc4b36d95676cea SHA1 fc7f24df398033cdf8e0ff444020c58407aa9925 SHA256 9d272384be06e00ecfdfa1795262a0859e86acd09aa95c531ff311e210d87db6
 DIST genpatches-2.6.24-1.base.tar.bz2 960 RMD160 a7b9932bc33e8a56da4bfafbdf16749bf141db6c SHA1 19271490c3faf040b7cf580123690785e95c1c66 SHA256 3f7c948b72494aed970be1187a75c7c8573ad500e35c5bc9610b87ffa42bd54f
 DIST genpatches-2.6.24-1.extras.tar.bz2 41902 RMD160 259b831110120518149bbccdacf9982330af5ef0 SHA1 48d85d6b6cf84369b34d6fbd169fbfdaf97fc83f SHA256 bc8723863cace59d8bcb6d84d678cc9c370a5e2144133f543396b45e4655b063
 DIST genpatches-2.6.24-3.base.tar.bz2 22714 RMD160 826ab844e3f4d96f94e09d8763a0131d01bdce94 SHA1 1c50a62af1265684b8039d936a4fb044b3eb72b8 SHA256 51e9a3b0ca3f7434b9b0e91072509e7f697998efbfc869b6528daa7811bc2bb3
@@ -30,7 +29,6 @@ DIST tuxonice-3.0-rc4-for-2.6.23.14.patch.bz2 112446 RMD160 6377c5eab316ce885977
 DIST tuxonice-3.0-rc5-for-2.6.23.14.patch.bz2 112636 RMD160 679e982c0c20f488a4b7447d6d7d9dcfc64b80b6 SHA1 ab3d5d7ceba68db8daf9c718ecd52250f9363e40 SHA256 2e5632332f8a0ff1a363a83455ac45cec11f3cafa96cbe0c0b3dd9d53348e1a0
 DIST tuxonice-3.0-rc5-for-2.6.24.patch.bz2 113258 RMD160 c1fde23de970b6347302ae2bff71bf3ab1bfbeb3 SHA1 bf559c8dead1d0372d3388e4f9d2c4d145862ec1 SHA256 0a3b502b89bebbcd0f701a0e89c072797257ce766b2ea2d2bda1f6762ca2ce9b
 EBUILD tuxonice-sources-2.6.23-r1.ebuild 1263 RMD160 5b1a3ec6d6d397e8f2bab70d616f1479484b10ac SHA1 ba7a9b5b5751aefbc970f8c026347e7193cec02b SHA256 bdbfee47f54ac71103671a427970a78979ad922e921930678b9bb85929493a6c
-EBUILD tuxonice-sources-2.6.23-r10.ebuild 1267 RMD160 4f2f68e244cd4e6a2d5f7468171379b342e7b457 SHA1 b8d93a19befdf0c44d81bd8cb75f098cea45725f SHA256 ede74f287bd1a9d64c79a8b12cf1da4e9bca469ba0c73b752113984e44fef7e0
 EBUILD tuxonice-sources-2.6.23-r2.ebuild 1265 RMD160 e62bca066bcbcb2f5be89f2b24940a7651b2319a SHA1 242d31bd8d83441c2bef0abf4ca7f1ee87e32a01 SHA256 faf6a6cd387690f8bfb9dadce6054c2eb87ec2241455b790b8eb5c8a852e1eba
 EBUILD tuxonice-sources-2.6.23-r3.ebuild 1265 RMD160 d9bb37371d40283b2bd6eb7905bacaf2f32bf7d7 SHA1 3e82b20f5c7a5c49e8aae760492f37c1c377e1ce SHA256 e2004e23fe71920f43c123b1a71893e2d8dffe38f620c346fd4950c2eb8aa9ae
 EBUILD tuxonice-sources-2.6.23-r4.ebuild 1265 RMD160 45f3973a002275a2384169f5ee1d590901cffebb SHA1 8cc1fb7113270fbf56de1eadd1941b9f6b9f59a4 SHA256 5b26b79e00bedf20096fc152971e9d4fc47db4048baa7142b058d67348d4d62b
@@ -41,13 +39,14 @@ EBUILD tuxonice-sources-2.6.23-r8.ebuild 1266 RMD160 b3d4c049dea490b570d1ee5b994
 EBUILD tuxonice-sources-2.6.23-r9.ebuild 1266 RMD160 3d1e0dec995da460476a9df387481f7a8403c414 SHA1 c2944eb11fb8b895049f170b012815c67b6d1e13 SHA256 e40ccbe0b3f7b48f1e274900909a5557b9b08147899365da17abbda5f88a2a97
 EBUILD tuxonice-sources-2.6.23.ebuild 1258 RMD160 a7aed0774ce805c37e98f829f826aff6d338e6c0 SHA1 3bdd01c5d41ef28f2310f67e9aad580b7af1c0c2 SHA256 680b1e637b411643e7707899a24d8d7f3cfb0ac5492eff370573d6c23f875e52
 EBUILD tuxonice-sources-2.6.24-r1.ebuild 1263 RMD160 a4316b603156d304ebcb939c373590f6befec04c SHA1 c831ca0f010ad010aaad6bd64f5567a4cf57c4a5 SHA256 9a4329a85daec0d2e86a9c021f37d0a310c918492129b83660ead2a0860a8b24
+EBUILD tuxonice-sources-2.6.24-r2.ebuild 1332 RMD160 d42d4ef462eea710014883bbd6d28a2c04aa937d SHA1 932e5e8d0124367c0f51cce7f2c5fdc6753ce376 SHA256 7c861ae02ec6aef618cc0d2bcc5d7d791f4f5b3053ee9534807a01677c3fa5b5
 EBUILD tuxonice-sources-2.6.24.ebuild 1260 RMD160 d021d9745d9ef3bbc98c01591a6de9a3db01e7cb SHA1 17e2401aeb98992f0dee95e1d21702fc38f44a60 SHA256 8408869ee295a43dab769cc6565a09ca74422bfac851f4b6f4e8968eedae23be
-MISC ChangeLog 27288 RMD160 8696dff8fb08d0d113acc16d8990f61d547836ea SHA1 d8af4f5e95748c0da112bee9aece6493f7dfd508 SHA256 3793b2f9a6079fa286b25aec91d78aac9088127808190aa9a116dc4901e28c96
+MISC ChangeLog 27652 RMD160 c5dbdd67cd23301aa8a17ec9d3e0d5d7a289ccb0 SHA1 18409e050788fa593955240a61558fa3d0928276 SHA256 75678af48571935e44c5eed8ccad0b8e9bffc262e362de46729b895ca01430a0
 MISC metadata.xml 278 RMD160 ed11e2348ca2d8f2bd5d647afab7eedf49ed4fea SHA1 7fecfe735fd49536863c0045aa1548860ad89797 SHA256 17c4da4868f175afef2cf8bca329a88c874b117ed9c242ec2139864475606bbe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHsD/Kgo/w9rxVVVERAokYAJ9E2kXjaQw19CSqTlsP3PxLvSAxLACgk447
-ybqJpbDol8h0B2zud0AxP/M=
-=Yk4d
+iD8DBQFHsU/ogo/w9rxVVVERAlR9AJ4rM+YLwe7hiyC8aODl62fKYiXsigCghwxO
+05bHNI5B6CIJBHirMolmKTY=
+=MEkY
 -----END PGP SIGNATURE-----
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}"