Fix suspend/hibernate failure when using strange shells like dash-0.5.8.2 (bug #555032, thanks to David Korth et al.)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

4 files changed, 174 insertions, 11 deletions

diff --git a/sys-power/pm-utils/ChangeLog b/sys-power/pm-utils/ChangeLog
index c667f1c91b66..7c4eaff90bf8 100644
--- a/sys-power/pm-utils/ChangeLog
+++ b/sys-power/pm-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/pm-utils
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.78 2014/11/08 18:57:13 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.79 2015/07/29 02:56:15 tetromino Exp $
+
+*pm-utils-1.4.1-r7 (29 Jul 2015)
+
+  29 Jul 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +pm-utils-1.4.1-r7.ebuild, +files/1.4.1-echo-n.patch:
+  Fix suspend/hibernate failure when using strange shells like dash-0.5.8.2
+  (bug #555032, thanks to David Korth et al.)
 
   08 Nov 2014; Samuli Suominen <ssuominen@gentoo.org> -pm-utils-1.4.1-r2.ebuild:
   old
diff --git a/sys-power/pm-utils/Manifest b/sys-power/pm-utils/Manifest
index ce3fda509ef7..81cebacebf02 100644
--- a/sys-power/pm-utils/Manifest
+++ b/sys-power/pm-utils/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX 1.4.1-bluetooth-sync.patch 1504 SHA256 2af763812d609f384c818635028791c875e3e56a1fa387e80b7f1ca5afc3c4e3 SHA512 35e02607280b4cd166fbbb1dfc44ef33d20debe1e564db9d532af74a773cc4f8cc3ee3be149318cbbc0f9cc451b5001a499609dd962ff42c0a7c3305215ef831 WHIRLPOOL ca8cd0a50962f100fd956254771a243d4433a6a518a3c8d925ee78f1b527888b0d3d37e71981779dd7b424f9771d5a418d8d2e82ee96ac3fcf401c574f644bcb
 AUX 1.4.1-disable-sata-alpm.patch 578 SHA256 93fb45b92af2772975155f4c0dfc8d8c596dc4d0e67668313658aef19bf118f2 SHA512 ae2ed5c0170c3c54592819b39b3901f88c795b285decdffc1c505d3f05b2f68f9c5f9ff074157d7b176daa674cd63cda05faf11cd8f03a91a6010f3de1acf683 WHIRLPOOL 7e4a9ce758c7e40a9be37c37513c102c55b25fb10e1a1017c315169aed3215919329300bfdb5c5e5f0d2ddadbc6d54ac9e057edcfb2a0a070666a0784b49f033
+AUX 1.4.1-echo-n.patch 1602 SHA256 7a6581179a08bf3c7db051beb31d9d4b93c1726af1acbf9e7a66d178a418fb4e SHA512 a3ea6ac65b5a75b2af43c3c4ba36c2cab50ad7d4f916ff2750426ae87853d110253d157b365884615f0daa58b51fd41fb45d3dbc182b8d53f55e1f04e968f62b WHIRLPOOL 30e259a68492c157b0c212f4e7311a913531dc322e5c7faf6541f2dd4f3c7960b0241ba6e38ad5c8e15557b6c2eed7ebd5088aeb89709d7c3a85f9dcf0a7d777
 AUX 1.4.1-fix-alpm-typo.patch 1052 SHA256 340135cc9b8cfd538564c4e839922401011f0bd374dafde0b00252b4939f1726 SHA512 9858ad0400e420387c458349e375cf7d9c9fd40f54cc329595eda9458adf830cdd5033dc4c0408aae9fb010852face5c82df04a2ef1dce536d451e50372a2555 WHIRLPOOL 5ab4ec6412f0dfa9841269149e8e2d206781f713352fbd476428585020de519713edb4848e5e9b7f148cb38f2a990b89482e971dc4079fd41634b61d5e1af003
 AUX 1.4.1-fix-intel-audio-powersave-hook.patch 1412 SHA256 16d5355d1c5cff6316fef11768673434394582c67039c79e8b86aafe2d2f7797 SHA512 5c5cc0e810c9a189de5d3b603cac1c5adb69058f2033daad3558463d1a0f65c039e19132da54da373929fe8e652ae06e28edad2ea9ce17a2f73527e494eecaff WHIRLPOOL aa0f8191cd4697a3fe314c248624282284e6ef540add5998de11d1e910c1516103c3061490ce6b8750ac929891f4ce5b757532aee0f2d8e233fc83ec4d60410e
 AUX 1.4.1-ignore-led-failure.patch 269 SHA256 0d2262a68a2abdbcca99b310d39399fa11afc6e04bd6540d03502b902454e873 SHA512 7429d2adad4caa53a787456a223ae2b280b81285bebf3f952597a8e56ec818c61502721d95095ac58e9846769f70ab377cd1ea5bede7c4f9620a7ff0c4b9f0d3 WHIRLPOOL cb78388793c69fd2eb98dce7f4ada8d214723f85d786e8d081211e9d70af7ab6ae4a5d06449e0960133409c70cba563aa9ce3bc20617b37e7c0e39db0bd38eda
@@ -18,16 +19,25 @@ AUX power.d/usb_bluetooth 1121 SHA256 f2f06d4a7179edf51a0022ca0f6d61b5013ace1f94
 AUX sleep.d/50unload_alx 316 SHA256 7325ffde4b6cbb70eecfeafb301df4a053fe1db11cd3314275cdb3ca3af38a04 SHA512 64e7f77088a6157c90024d26ae6afde40abffc17d8ec2775e6a4ed17fac6c6fc1787c9f1b02cd0f4cd9e18dd74502f84e894006875b7dcacc39e509b3e0d86b0 WHIRLPOOL a5bc946803a0bedd84ff60938dcf98dd25b76374a8d9772475ff15d3d4807f51ef4b65b2ffad401e08a9b0b2b946a540155c5a0fc7ca884eeac85c90f79bbf60
 DIST pm-utils-1.4.1.tar.gz 208687 SHA256 8ed899032866d88b2933a1d34cc75e8ae42dcde20e1cc21836baaae3d4370c0b SHA512 5bc9479fe75f120aee136befeb24c8d7d85f61410b551177ed61fd1b4ea9cce7989796b067e357ea93b44b4ae9f66311687066f188236c5efdfd3750695a8017 WHIRLPOOL 7bf4752d96af776c90eb2d0319d615be157c8289551c72edb0c7fed05aeebbdc729f405d5ff04de401f4c12bfb8801e8b80242c3ba28e7b973442e51bf2374a3
 EBUILD pm-utils-1.4.1-r6.ebuild 3029 SHA256 1860593c1b52afcb3dba816f4834642fb313231820898f61535dccf7983e1883 SHA512 9152f7065831aa66ef292c7e89b94353267578315718d53f2890dd7e319f9391122b55b64fc79d52e0f664473aef14f5cdb5daea92938830e51f751aa4030563 WHIRLPOOL 89a512adb425ee8605ea7d35e9ff55e64ddd1a522cb72ffeb396e1c7acbd141702bb40f2954a871ac5aea15e3506de21a9ecb406a29b905f5a049109693ebcff
-MISC ChangeLog 12425 SHA256 fcb99dbd552ae4a1e7aa704357a7c55fd4efd8f31f1b055e5390fa885b089124 SHA512 12e11908332cde23b795f55c031ac9f5e5cb0b3e3fccf16eb726c30adc8571dee87519199b0432fea39b242d2dc5705aab6c49a722a326bdb8d6a6f449302177 WHIRLPOOL 4c73b7319e2215159d9c9dd2eff1f916f8a496b1644cd01df8f2110f2ab78f83860f8c9e9c3ae02d47c07aa8e168139678aa8820fc5cf1f233cdfde705db7b14
+EBUILD pm-utils-1.4.1-r7.ebuild 3074 SHA256 492b03646e6afdef0e5f1bc1d549392ebcc8e08560c53395b935792436339339 SHA512 c8e91032d6809b3d1975721b4570eb03d5d317e759d0b8517cabb04fdea41dc600a2c7bfcb3ec62224f13a3469aea4246bbec6417f0d68622275ca9c85f43168 WHIRLPOOL 89a332b11eafca00ff4bd9b662c6652684f646289855d8a671d7165b122cea435a906aead1e093c1204220fb7024b256ec590d0f28593cd2fd18a598aac2301e
+MISC ChangeLog 12697 SHA256 c71bc84336a631c39228a45700a3f44aff6b6a6f7ecbc261f618c9671f0e2229 SHA512 004fe1880eae437af246124ee41259f2f7c18fa01e165b0ccee906e2b7c2045307dd120295cc2be8cd1785ac52a45cabe73a6a3ed0b3b111266b8a523d420e72 WHIRLPOOL 9e2ef7230b4dda9508fc5657368f9a6b83d68f9d0391dffa08c20c18febe82e08af904e63aee8961b389bdaa4c73c0bf4dca90309c4d683809ac2499f34d1ad2
 MISC metadata.xml 333 SHA256 f06c34f767b411fcbc763a18bfd022d40fd4eb7fb38d3d14473a47064685bbda SHA512 d8b286df144605f4e3657716212c1abb1b87c3ec2f1c55635e20902bcba0e3db1dccfc61ad5756112614765178a382f47a6075a1f3fbb5f7d0847f8198d0c914 WHIRLPOOL 1d4a80ba7c144b26b8e6e56592b375df545742da7cd9336d759d0e9e3861450d21d24cac8bea42d78126e989e2b06bff837f532c6e96b37697d52e2608160d94
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJUXmczAAoJEEdUh39IaPFNyfwH/0EzYR/J6AXZpIAtqumO8So4
-xd8+q9NheWktP3iOBQoX5QxXxanNy2KVkp8NN9W/Ml+FeF4PH+oLwPTjw7+PwsMj
-zRbLPrz0HufluraKL97TosqrLHWdV0aZukrfNpTD73ygVvuFauYy3jORx12f/xgu
-PU00QG245BlB9MfGYmYDEepkGpxDIxEvNgdj6iJ8wXKwc8p6UVDcEPkDgpbetkK/
-G/gbzdX33MyiW+tNf/wx8TIVaH4cjGTWlqWOflpPCsr54eFJz+Qp6UB3/h+fma/S
-4mCxS/a5ESz79oX33T2iGYtsumaq+EKVxnxV1nwwnNOoXnCnsaPB7QVSYdQ8QB8=
-=a8ZC
+iQJ8BAEBCABmBQJVuEDRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNRAUP/17dK1Je+WlR2fiU8dj6PMpI
+BH1EezY0Owx6+vmtd/rwdzDaC3VS2suSekjolBmqGY8q6Bi53rLc+bdfyJEuZarX
+LJLNNAN0vyrqNSAn4Qy4F9eXTjR49p2F8MMpTw0eghxlnFPPoWtip7IhTlLgTJLi
+aTZUxcBcy9RCSVjdl4cXWVI7kWCTK1zw7siieNZgtq1ZIiWB5579JueeMz8pEEAn
+S6Z8vD6rtjiyF+TRJzCsM3y3yUAcQPC/WXO01dg9aOQbbSh0DC6nCMc0IkFynLlD
+6Dgfckjdn8K7t6cQyOxcgXTSx5zYKynAyzBtlSF4r5DBFGreC1AcGi/lG+iWMAkr
+0h0w+FjFWPUluHVrCpwsFViexWANvU+ycgGn3dUiVmA6M11MPfqSvxE3XINVAMmx
+Hsu0A6taKjEs1WvQtIi4c2mBdlHF78HMuhD7UW2GJ4Xtp0loAPxJMzf2Tcma3vLv
+4uLcOedVi+T18fykzhcE/SrYuxF4PLvdmMs3xr/mKtmwjTjVDG56RvsuIn+4hWkQ
+nzws3b47u3Cbi6/muYxP8nT3ShS2+RTO69ZN5fUz+6T+FZ4Vfhb0AWRs+pSmRFzC
+B0ifdQ4yvSZvzh/WwMkufLrH16B6sylQsGlqVC6e97We6/gzQ9jZpQ0WFVcNlaiE
+ePAUticLSLTsQSzMRm+K
+=1Ti2
 -----END PGP SIGNATURE-----
diff --git a/sys-power/pm-utils/files/1.4.1-echo-n.patch b/sys-power/pm-utils/files/1.4.1-echo-n.patch
new file mode 100644
index 000000000000..354ccb6a7e65
--- /dev/null
+++ b/sys-power/pm-utils/files/1.4.1-echo-n.patch
@@ -0,0 +1,51 @@
+From ffce4bc35a34b6b543e2ae2828a3096a19ebb1ae Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 28 Jul 2015 22:24:56 -0400
+Subject: [PATCH] Avoid -n in "echo -n foo > /sys/bar"
+
+It's not portable and not needed.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=91497
+
+[ Rebased on top of Gentoo's -r6 patchset. ]
+---
+ pm/pm-functions.in | 8 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/pm/pm-functions.in b/pm/pm-functions.in
+index c82be30..a68f955 100644
+--- a/pm/pm-functions.in
++++ b/pm/pm-functions.in
+@@ -296,13 +296,13 @@
+ if [ -z "$SUSPEND_MODULE" ]; then
+ 	if grep -q mem /sys/power/state; then
+ 		SUSPEND_MODULE="kernel"
+-		do_suspend() { echo -n "mem" >/sys/power/state; }
++		do_suspend() { echo "mem" >/sys/power/state; }
+ 	elif [ -c /dev/pmu ] && pm-pmu --check; then
+ 		SUSPEND_MODULE="kernel"
+ 		do_suspend() { pm-pmu --suspend; }
+ 	elif grep -q standby /sys/power/state; then
+ 		SUSPEND_MODULE="kernel"
+-		do_suspend() { echo -n "standby" >/sys/power/state; }
++		do_suspend() { echo "standby" >/sys/power/state; }
+ 	fi
+ fi
+ 
+@@ -317,10 +317,10 @@
+ 		HIBERNATE_MODE_SAVE=$(cat /sys/power/disk) && \
+ 		HIBERNATE_MODE_SAVE="${HIBERNATE_MODE_SAVE##*[}" && \
+ 		HIBERNATE_MODE_SAVE="${HIBERNATE_MODE_SAVE%%]*}" && \
+-		echo -n "${HIBERNATE_MODE}" > /sys/power/disk
+-		echo -n "disk" > /sys/power/state
++		echo "${HIBERNATE_MODE}" > /sys/power/disk
++		echo "disk" > /sys/power/state
+ 		RET=$?
+-		echo -n "$HIBERNATE_MODE_SAVE" > /sys/power/disk
++		echo "$HIBERNATE_MODE_SAVE" > /sys/power/disk
+ 		return "$RET"
+ 	}
+ fi
+-- 
+2.4.6
+
diff --git a/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild b/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild
new file mode 100644
index 000000000000..a7e2f9c4f0de
--- /dev/null
+++ b/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild,v 1.1 2015/07/29 02:56:15 tetromino Exp $
+
+EAPI=5
+inherit eutils multilib
+
+DESCRIPTION="Suspend and hibernation utilities"
+HOMEPAGE="http://pm-utils.freedesktop.org/"
+SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa debug ntp video_cards_intel video_cards_radeon"
+
+vbetool="!video_cards_intel? ( sys-apps/vbetool )"
+RDEPEND="!<app-laptop/laptop-mode-tools-1.55-r1
+	!sys-power/powermgmt-base[-pm-utils(+)]
+	sys-apps/dbus
+	>=sys-apps/util-linux-2.13
+	sys-power/pm-quirks
+	alsa? ( media-sound/alsa-utils )
+	ntp? ( || ( net-misc/ntp net-misc/openntpd ) )
+	amd64? ( ${vbetool} )
+	x86? ( ${vbetool} )
+	video_cards_radeon? ( app-laptop/radeontool )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog NEWS pm/HOWTO* README* TODO"
+
+src_prepare() {
+	local ignore="01grub"
+	use ntp || ignore+=" 90clock"
+
+	use debug && echo 'PM_DEBUG="true"' > "${T}"/gentoo
+	echo "HOOK_BLACKLIST=\"${ignore}\"" >> "${T}"/gentoo
+
+	epatch \
+		"${FILESDIR}"/${PV}-bluetooth-sync.patch \
+		"${FILESDIR}"/${PV}-disable-sata-alpm.patch \
+		"${FILESDIR}"/${PV}-fix-intel-audio-powersave-hook.patch \
+		"${FILESDIR}"/${PV}-logging-append.patch \
+		"${FILESDIR}"/${PV}-fix-alpm-typo.patch \
+		"${FILESDIR}"/${PV}-inhibit-on-right-status.patch \
+		"${FILESDIR}"/${PV}-ignore-led-failure.patch \
+		"${FILESDIR}"/${PV}-run-hook-logging.patch \
+		"${FILESDIR}"/${PV}-suspend-hybrid.patch \
+		"${FILESDIR}"/${PV}-uswsusp-hibernate-mode.patch \
+		"${FILESDIR}"/${PV}-xfs_buffer_arguments.patch \
+		"${FILESDIR}"/${PV}-echo-n.patch
+}
+
+src_configure() {
+	econf --disable-doc
+}
+
+src_install() {
+	default
+	doman man/*.{1,8}
+
+	# Remove duplicate documentation install
+	rm -r "${ED}"/usr/share/doc/${PN}
+
+	insinto /etc/pm/config.d
+	doins "${T}"/gentoo
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN} #408091
+
+	exeinto /usr/$(get_libdir)/${PN}/sleep.d
+	doexe "${FILESDIR}"/sleep.d/50unload_alx
+
+	exeinto /usr/$(get_libdir)/${PN}/power.d
+	doexe "${FILESDIR}"/power.d/{pci_devices,usb_bluetooth}
+
+	# No longer required with current networkmanager (rm -f from debian/rules)
+	rm -f "${ED}"/usr/$(get_libdir)/${PN}/sleep.d/55NetworkManager
+
+	# No longer required with current kernels (rm -f from debian/rules)
+	rm -f "${ED}"/usr/$(get_libdir)/${PN}/sleep.d/49bluetooth
+
+	# Punt HAL related file wrt #401257 (rm -f from debian/rules)
+	rm -f "${ED}"/usr/$(get_libdir)/${PN}/power.d/hal-cd-polling
+
+	# Punt hooks which have shown to not reduce, or even increase power usage
+	# (rm -f from debian rules)
+	rm -f "${ED}"/usr/$(get_libdir)/${PN}/power.d/{journal-commit,readahead}
+
+	# Remove hooks which are not stable enough yet (rm -f from debian/rules)
+	rm -f "${ED}"/usr/$(get_libdir)/${PN}/power.d/harddrive
+
+	# Change to executable (chmod +x from debian/rules)
+	fperms +x /usr/$(get_libdir)/${PN}/defaults
+}