diff options
| author |   Christian Heim <phreak@gentoo.org> | 2006-07-15 20:15:51 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2006-07-15 20:15:51 +0000 |
| commit | a815318a33374ae490e138f0eb214aaf2e100e0f (patch) | |
| tree | f465ebc7d94a52a400ccda971359c7cda558cefd /sys-power | |
| parent | Merge handling of login.defs (fixing #140451 along the way) and cut out old/d... (diff) | |
| download | gentoo-2-a815318a33374ae490e138f0eb214aaf2e100e0f.tar.gz gentoo-2-a815318a33374ae490e138f0eb214aaf2e100e0f.tar.bz2 gentoo-2-a815318a33374ae490e138f0eb214aaf2e100e0f.zip | |
Adding a patch to fix #140512 (thanks to Marek Szuba <cyberman at if.pw.edu.pl> for the patch)
(Portage version: 2.1.1_pre2-r8)
Diffstat (limited to 'sys-power')
4 files changed, 22 insertions, 3 deletions
diff --git a/sys-power/hibernate-script/ChangeLog b/sys-power/hibernate-script/ChangeLog index fa7bd5d9bf40..c26453c50c59 100644 --- a/sys-power/hibernate-script/ChangeLog +++ b/sys-power/hibernate-script/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-power/hibernate-script # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.28 2006/07/15 20:06:18 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.29 2006/07/15 20:15:51 phreak Exp $ + + 15 Jul 2006; Christian Heim <phreak@gentoo.org> + files/hibernate-script-1.93-gentoo.patch, + +files/hibernate-script-1.93-return.patch, + hibernate-script-1.93-r2.ebuild: + Adding a patch to fix #140512 (thanks to Marek Szuba <cyberman at + if.pw.edu.pl> for the patch) 15 Jul 2006; Christian Heim <phreak@gentoo.org> -files/hibernate-script-1.91-gentoo.patch, -hibernate-script-1.91.ebuild, diff --git a/sys-power/hibernate-script/files/hibernate-script-1.93-gentoo.patch b/sys-power/hibernate-script/files/hibernate-script-1.93-gentoo.patch index be74ba32ed00..b1cdec0de1a5 100644 --- a/sys-power/hibernate-script/files/hibernate-script-1.93-gentoo.patch +++ b/sys-power/hibernate-script/files/hibernate-script-1.93-gentoo.patch @@ -34,5 +34,5 @@ Index: hibernate-script-1.93/init.d/hibernate-cleanup.sh + ebegin "Clearing Software Suspend 2 signatures" + check_swap_sig + check_filewriter_sig -+ eend ++ eend $? +} diff --git a/sys-power/hibernate-script/files/hibernate-script-1.93-return.patch b/sys-power/hibernate-script/files/hibernate-script-1.93-return.patch new file mode 100644 index 000000000000..655b10fab352 --- /dev/null +++ b/sys-power/hibernate-script/files/hibernate-script-1.93-return.patch @@ -0,0 +1,11 @@ +--- hibernate-script-1.93/init.d/hibernate-cleanup.sh 2006-07-12 06:15:43.000000000 -0400 ++++ hibernate-script-1.93-fwreturn/init.d/hibernate-cleanup.sh 2006-07-15 12:17:41.000000000 -0400 +@@ -55,7 +55,7 @@ + + check_filewriter_sig() { + local target +- [ -f "$HIBERNATE_FILEWRITER_TRAIL" ] || return ++ [ -f "$HIBERNATE_FILEWRITER_TRAIL" ] || return 0 + read target < $HIBERNATE_FILEWRITER_TRAIL + [ -f "$target" ] || return + case "`dd \"if=$target\" bs=8 count=1 2>/dev/null`" in diff --git a/sys-power/hibernate-script/hibernate-script-1.93-r2.ebuild b/sys-power/hibernate-script/hibernate-script-1.93-r2.ebuild index 0d053eb6fda3..11adabd7a340 100644 --- a/sys-power/hibernate-script/hibernate-script-1.93-r2.ebuild +++ b/sys-power/hibernate-script/hibernate-script-1.93-r2.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/sys-power/hibernate-script/hibernate-script-1.93-r2.ebuild,v 1.1 2006/07/15 20:03:52 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/hibernate-script-1.93-r2.ebuild,v 1.2 2006/07/15 20:15:51 phreak Exp $ inherit eutils @@ -28,6 +28,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-last_result.patch epatch "${FILESDIR}"/${P}-kde-lock-session.patch epatch "${FILESDIR}"/${P}-gentoo.patch + epatch "${FILESDIR}"/${P}-return.patch ebegin "Applying ${P}-common.conf.patch" sed -i \ -e "s:^# \(Distribution\).*:\1 gentoo:" \ |