Do not use killall -g, bug#463944 thanks to Murray Campbell

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

4 files changed, 146 insertions, 5 deletions

diff --git a/app-laptop/laptop-mode-tools/ChangeLog b/app-laptop/laptop-mode-tools/ChangeLog
index d402f73fcdc0..89f7baa4a101 100644
--- a/app-laptop/laptop-mode-tools/ChangeLog
+++ b/app-laptop/laptop-mode-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/laptop-mode-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.74 2013/04/12 06:22:54 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.75 2013/05/11 09:58:27 alonbl Exp $
+
+*laptop-mode-tools-1.63-r2 (11 May 2013)
+
+  11 May 2013; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/laptop-mode-tools-1.63-killall.patch,
+  +laptop-mode-tools-1.63-r2.ebuild:
+  Do not use killall -g,  bug#463944 thanks to  Murray Campbell
 
   12 Apr 2013; Fabio Erculiani <lxnay@gentoo.org>
   laptop-mode-tools-1.62-r2.ebuild, laptop-mode-tools-1.63.ebuild,
diff --git a/app-laptop/laptop-mode-tools/Manifest b/app-laptop/laptop-mode-tools/Manifest
index 8ea45f9045bb..31c9dc1ca3b2 100644
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -12,6 +12,7 @@ AUX 1.62/0018-install-remove-unused-substitute-for-udev-rule.patch 802 SHA256 23
 AUX 1.62/0019-install-use-customizable-udev-directory.patch 1960 SHA256 13cec2f005adb58e58e305e00d590652f6dbfa9e81963d7ff408a35c6a909b19 SHA512 59d6cad9ab893aba574d3ec79dcdd981433c4b19d2e8e606b44fbe4c9f4b49d03ee8aef4731c0428b789ebf0ca09b8464a5d4095f2765f190376e26cb777625b WHIRLPOOL a125734051e2bee7a4ed9a26875016cd348748a85e8998188a555ba4f6adb1bc3e17ad21ba70c9d890ffbf54d727097763f4df002b491047f0fdc9158773913f
 AUX 1.62/0020-install-make-systemd-optional-and-configurable-locat.patch 2770 SHA256 2d65e9679abff293d817c7e1e4a566d16a47dbb85d5ed1fe3d1e47f0d52789f0 SHA512 a54ac3ad9352314033465042b2cd91e35ab7acdfaa5f44ef8cede45c4f641763e7cc64b7c0c0f7569e2e42679d417a2cae240b09123d01213f7f370f5d2c3a01 WHIRLPOOL b37457277265db20243391895be9bdaebca1f5a6c1452b7536b1b664856f2c223bf472758285b980f6a141d0afa7be0300f83ddd0acfd7892e029f9e5fca0395
 AUX laptop-mode-tools-1.62-remove-hal.patch 1336 SHA256 d3a7b4edd1fb9d7d3569dea7c531f8f2c06cda28b94d03aa5c1c853b7ae22fee SHA512 5a9937127544f041dccd32d30bd6c964cad68cdf6ca777a3538ba3940674c87490426180652d4b3ba87e41f43ad9fb3607f67b756b00023826a1594348a12d87 WHIRLPOOL 044c61af773bff61e10b6d9e4e5bfcd0d89a0962e9411a2e40667e802402fdb842ad9c837cf3ba08e2b830204eaf0ba18a242b85154f07a2ebfeb0309f344364
+AUX laptop-mode-tools-1.63-killall.patch 1306 SHA256 5d72130167c5d2156e86ba34e5faa2ac6f686d27406faa620175c5949ee092fb SHA512 4b2cf85d083e0afdf67221ef3d18f1e084456add387c4e3bdefc88ee26ec1b7fb648c52668798dc3765494c423809c2b421af5a966579bd722fc65a897ae63d8 WHIRLPOOL 3611c604c594d20611b8fac96f7907613101877dcb23e6e16b59b6864138b1b307970a1805b20486fccfea53fda869ff743bf9743ebb57e21b03d04562d3e27a
 AUX laptop-mode-tools-1.63-pcie-aspm-silencing-stderr.patch 1604 SHA256 a9d14760c0ee0bde93f04fb369da00c35ac61e04393f1697a9fb7bf7030dc818 SHA512 c1d6fefb486d9ceb47f19f1b173d76c2a7244f4ed6da2c3752b3a4cbd4064964c34365aa62f114efd21d572986551cb4f74c7990cf78bbb70d845f8e0c59a94c WHIRLPOOL d739756d45cac564237a544df19491df2cce4cc121e50407f703a8dc3c3845c96abdd41cd080edf23b9f988fc148297e2afcee7eaa5e42967afbb17e97995617
 AUX laptop_mode.init-1.4 1190 SHA256 90a18e5c7e4d0b264bb51deb7b92ff25b508a3ddd75dd6c849fdc48c07ce4fda SHA512 47e67d54ed8005a864c017f4ef063c8a17286c6f8a260984fda96392e6461a3f0c5e4f17f8cf2272b072c1545b8f8e99fe45579a81b4d08a99e1eeb46f400fe5 WHIRLPOOL 7a87608d947be301400f2f1a0294a60f21e2cd1b6bed961788f7fc018bf4ac32d69a50e11e735db3cb6c000174ebd78e59f7ac0cd474bef3b803872b6a6665e5
 DIST laptop-mode-tools_1.60.tar.gz 104415 SHA256 39246db1bba2ea12c7ee6f1979f914a803a9f70836cde687ff9c3a39bc9c9519 SHA512 79596bb24b2af8bbeb3424eeff51022bb381609325a0eb5c009e0970dffe055d2493509d56a4e2c8f745c27f03bc176372d9b27e3a0a050f7bc1c58f86aae5c9 WHIRLPOOL 819cd4ad40c9e2a74bc07f70986c985b4128828ed508d808097472ee301ca788567b65d86717552a8191b378d595cb41b922a9e2f5a2fbcacf645acfe607d0ec
@@ -21,13 +22,14 @@ EBUILD laptop-mode-tools-1.60-r1.ebuild 2325 SHA256 d1a017658837ca3815a01ce4e50e
 EBUILD laptop-mode-tools-1.62-r1.ebuild 2867 SHA256 e1f3c5de68fdee7d0362e8e0396a7ae732cda4f7a4ecb48f79c7726d3d7b2307 SHA512 3010b17b6c11f99d309941b3b059661c0efac131da08867dee9d937fa7a068773eb5ffb25781aa73c44663d4074038c78bddd9a397774e2fce6a88122553d5e1 WHIRLPOOL 08c0fe07581c92777049a1d3d325fd60567af3ce583dd414b08b1a91fcc6bb77cda1b4f1b3fa184c73623bbfd070bc13db182272ed9423c093583e43a574c329
 EBUILD laptop-mode-tools-1.62-r2.ebuild 2730 SHA256 b533c6e8e809125686d08ffe823fbc21acaedd556d600a2fa19f0657ec5755f2 SHA512 8b7980e3b28c21f0456107579dd3268fc48823da9241a870cce19c4c7df44c92392fee5ac3124c9923219429ef9000d5e7f22cf32c46f279cbb6e5d6b86f2087 WHIRLPOOL 0003affa232dd5f4f0ad61cda3ce7c59c82cf547013bae7069b84e03ec1e93e078ca1687811e8783a220179bfdb1db04340334f6d64750b5f3234fbc6f8a6b00
 EBUILD laptop-mode-tools-1.63-r1.ebuild 2754 SHA256 ef0d5ac3ca2dec30760b8c26ae5faef586052a3ff0d295da4b33c7ebdb288b96 SHA512 e9fd9e970f80db13ed13dbceb719bf63d239e10323de6e1dd6defab09931d3e8923000feeac0adfcc53685e4c782bbf007a1ddd54ed2564598e6aafcb312f7d0 WHIRLPOOL 6f610f02cbeaef6c1666e28f2a977d32e5bdcb4fbd2df242959896bca6efafed963febdfc34c00327395767df29675092c1a60d7bc8c663ee640016c3948df1d
+EBUILD laptop-mode-tools-1.63-r2.ebuild 2796 SHA256 0bcfae50f7aba7e917bcb1c58e99a1ae89427baf195f3d83191eebbc2e8eb709 SHA512 10db9636ba8e1ec5b5e1573d14f2bba2dfc07adb329dd28abf3051d18b9f584f36b0316eba97a9eea7511b78b6f273d689d42346d9a3c6c2f0ae6cbe2d349bd0 WHIRLPOOL a91425b5349f6e3203a88a74beb886498e1e97796bc158c189edc2d8697c37b4195af496743343b123560a10f61641483b19bcbb7354e0cb4a252342b09e7b2b
 EBUILD laptop-mode-tools-1.63.ebuild 2690 SHA256 e39c22cdecb5526146be569f3e0bcc5075bc8283caa1bad83787e10d55fbe07e SHA512 cbf146fcd29ef6bc64df21b116242cebc3f29f4936818009671abcaf6755de07a4855d35f754fd153ac4d642a1e798daeace480c4180473a70c50e9f9a58c74c WHIRLPOOL fc3fbbc388d0e2fb125833769f345f0c2e740655c1a451f1dc8f105db6684817eaef249ae68055be54802f3b91a8284b348f95259f00d27d470a82c280cacdbf
-MISC ChangeLog 14627 SHA256 62d80e159c3abf08d8fe9d3bed8bf277a9ce9154f8e18f7620c9de1051f3f259 SHA512 7caa15e1db1cae48c88c3a25f251f9b8ea234036b56745a8643084c9bb9ea175cf40658a420b2d25293552305b1f3df00ab07741fc0cc8d1aac68bb28aa52981 WHIRLPOOL 5b49a4ff0e84ba7f7be4c04924120b705814ed40e43aae437cde363a1e9e4a5984d5d5507b7fcb3f4973df5f226d16cba1f31d5ec44c0f508be2d9a32bf87cef
+MISC ChangeLog 14867 SHA256 ccd6aeef571d966bae304c9a03c86c6ab2107d15ca71a14d636f28a0c64f3aa9 SHA512 f862314a4e2e5e2e652770f9a36eda348a38062d946fa2499f0555f3e98c8544a891ab5a24fb128e6345c347ce6e91ceb26ed01f5626688baf6634e6f020e65a WHIRLPOOL 0b218ae09384421091137e6b8aa2164177d50babcb350e5a3bde83680a9661b307938ecc31b5c677b24488d0898f984691a24d9e283015326003033225a082b1
 MISC metadata.xml 420 SHA256 2008caffae78c8d0c6a04f0b4b4768d2a9d2b9f62d96409141cd2e579f622749 SHA512 5bd05a4b5ce71343b10a46b57cd73b071c399062bb9813bcb9d9e329e1a4804a6b1f5489e6004626a9daa84e9b0ca399b0209d844dd0adb0c185a18adc535946 WHIRLPOOL ea091eb7cc936602de9e1179231f9fd8bb78ab447abd72b505be870b79acf50056a4610a56c4ab7c1585957ee44d2f85d47248eeee47f10cf860b8ac6b8535b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFnthwACgkQfaj9zK3JFuXpPQCgi8crCBtI01lx5iq3Wdaua1qX
-l8UAoOKEeOLOeXRLbl3JL4Cehkcqs3jx
-=tI5p
+iF4EAREIAAYFAlGOFkgACgkQXYk9GL8g3FHd/gD/YgFUIQJ85A+86pKnK0BKG9sQ
+Krje0NQnT4jCGmmAYr8A/3uRo10tmFVa7+sWrmNfJjB5SdJfezvkDSP3oqF79AeE
+=5Q4Z
 -----END PGP SIGNATURE-----
diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-killall.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-killall.patch
new file mode 100644
index 000000000000..0dfdfc981a9b
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-killall.patch
@@ -0,0 +1,38 @@
+From a68a8d051b476ceae87e0490001b7c60ac5ea942 Mon Sep 17 00:00:00 2001
+From: Ritesh Raj Sarraf <rrs@debian.org>
+Date: Wed, 17 Apr 2013 12:11:01 +0530
+Subject: [PATCH] Don't call killall with the -g argument.
+
+It kills the entire group of processes
+https://bugs.gentoo.org/show_bug.cgi?id=463944
+
+Thanks: Murray Campbell
+---
+ usr/sbin/laptop_mode | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/usr/sbin/laptop_mode b/usr/sbin/laptop_mode
+index 74a129c..cfd99c1 100755
+--- a/usr/sbin/laptop_mode
++++ b/usr/sbin/laptop_mode
+@@ -1130,7 +1130,7 @@ if [ x$ENABLE_BATTERY_LEVEL_POLLING = x1 ] && [ x$BLACKLIST_IN_FLOCK = x1 ]; the
+ 		log "VERBOSE" "On AC, stopping the polling daemon."
+ 
+ 		# In AC mode we disable the polling daemon.
+-		killall -g -q lm-polling-daemon
++		killall -q lm-polling-daemon
+ 	elif [ x$ON_AC = x0 ]; then
+ 		exec 7>$LMT_BATTPOLL_LOCK;
+ 		if $FLOCK -n -x -w 1 7; then
+@@ -1149,7 +1149,7 @@ if [ x$ENABLE_BATTERY_LEVEL_POLLING = x1 ] && [ x$BLACKLIST_IN_FLOCK = x1 ]; the
+ 		# should be killed.
+ 		if [ x$INITSCRIPT_STOP = x1 ]; then
+ 			log "VERBOSE" "On Battery, but init script stop is called. Killing lm-polling-daemon"
+-			killall -g -q lm-polling-daemon
++			killall -q lm-polling-daemon
+ 		fi
+ 	else
+ 		log "ERR" "Unknown ON_AC state: $ON_AC";
+-- 
+1.8.1.6
+
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r2.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r2.ebuild
new file mode 100644
index 000000000000..e42eb9c0c29a
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r2.ebuild,v 1.1 2013/05/11 09:58:27 alonbl Exp $
+
+EAPI=5
+inherit eutils multilib systemd udev
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Linux kernel laptop_mode user-space utilities"
+HOMEPAGE="http://www.samwel.tk/laptop_mode/"
+SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+acpi apm bluetooth scsi"
+
+RDEPEND="net-wireless/wireless-tools
+	sys-apps/ethtool
+	sys-apps/hdparm
+	acpi? ( sys-power/acpid )
+	apm? ( sys-apps/apmd )
+	bluetooth? ( net-wireless/bluez:= )
+	scsi? ( sys-apps/sdparm )"
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-pcie-aspm-silencing-stderr.patch"
+	epatch "${FILESDIR}/${P}-killall.patch"
+
+	# This should avoid conflict with pm-powersave wrt #327443 and #396703
+	cat <<-EOF > "${T}"/${PN}
+	HOOK_BLACKLIST="00powersave"
+	EOF
+}
+
+src_compile() { :; }
+
+src_install() {
+	DESTDIR="${D}" \
+		INIT_D="none" \
+		MAN_D="/usr/share/man" \
+		LIB_D="/usr/$(get_libdir)" \
+		UDEV_D="$(udev_get_udevdir)" \
+		SYSTEMD_UNIT_D="$(systemd_get_unitdir)" \
+		TMPFILES_D="/usr/$(get_libdir)/tmpfiles.d" \
+		ACPI="$(use acpi && echo force || echo disabled)" \
+		PMU="$(false && echo force || echo disabled)" \
+		APM="$(use apm && echo force || echo disabled)" \
+		SYSTEMD=yes \
+		sh ./install.sh || die
+
+	dodoc Documentation/*.txt README
+	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
+
+	# See src_prepare()
+	insinto /etc/pm/config.d
+	doins "${T}"/${PN}
+}
+
+pkg_postinst() {
+	if use acpi || use apm; then
+		if use acpi; then
+			daemon_name="acpid"
+		elif use apm; then
+			deamon_name="apmd"
+		fi
+		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
+			ewarn "To enable automatic power state event handling,"
+			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
+			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
+			ewarn "added to default runlevel:"
+			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
+				ewarn "# rc-update add laptop_mode default"
+			fi
+			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
+				ewarn "# rc-update add ${daemon_name} default"
+			fi
+		fi
+	else
+		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
+		ewarn "automatically disable laptop_mode on low battery."
+		ewarn
+		ewarn "This means you can lose up to 10 minutes of work if running"
+		ewarn "out of battery while laptop_mode is enabled."
+		ewarn
+		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
+		ewarn "information."
+		ewarn
+	fi
+}