remove bashisms from scripts, install scripts executable

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 45 insertions, 14 deletions

diff --git a/app-admin/mcelog/ChangeLog b/app-admin/mcelog/ChangeLog
index 0c9d84478491..f3f613508d3f 100644
--- a/app-admin/mcelog/ChangeLog
+++ b/app-admin/mcelog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/mcelog
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/mcelog/ChangeLog,v 1.27 2013/01/24 21:15:37 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mcelog/ChangeLog,v 1.28 2013/01/26 17:52:36 hasufell Exp $
+
+  26 Jan 2013; Julian Ospald <hasufell@gentoo.org>
+  mcelog-1.0_pre3_p20120918-r1.ebuild,
+  +files/mcelog-1.0_pre3_p20120918-bashism.patch:
+  remove bashisms from scripts, install scripts executable
 
 *mcelog-1.0_pre3_p20120918-r1 (24 Jan 2013)
 
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 4687feb5e68a..350ff7ecd6af 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -2,22 +2,23 @@
 Hash: SHA256
 
 AUX mcelog-0.8_pre1-timestamp-mcelog.patch 425 SHA256 7ead10c71b0941950e7c69b1211a0643360c725f923c9b0336ba39c38bba7780 SHA512 77312f9346c7e16141a57a5e44964d0b2cab77a428403d19cfc9558af55b250be7c9fadaecf87c8d78075251a7fc3ab309e0cbbdbb30ddc4423717cb3979a1db WHIRLPOOL 17427dab2baa1df6fe1c0ff6cebbdc1c645fd56e35bb5865ca5fd38db760728054d4c9d9edad778d2357b7ef2ee109d21c788208d91c8ec408cc6c8b4df507f6
+AUX mcelog-1.0_pre3_p20120918-bashism.patch 725 SHA256 bc1714e3fb2e66f9d2183b00df6fa94d2fb5db9530043c15bed19784499a0676 SHA512 eb1db5f79ab7e3b177cb183353d2c27e621961247f9a2f9d9456793d7fe3a582fa168a8d76f18aeb599f6305c5098dbe83230b8ee63c934af588ae68f0f85aaf WHIRLPOOL 70d828d1c03ab9e165370d2aa1252a49043d8d6b944e363d013f1206872bac9e5e655ad061987af472567754a4d68163db356b49bca562bd2d27b76361d4f5fa
 AUX mcelog-1.0_pre3_p20120918-build.patch 849 SHA256 591073022aaeb6d1c98052a231da29664c0938282ee487dbf0a4a042f870a3d9 SHA512 0fa95423e0fa7030eb83ecf5b6cf646d37737cbdc4dea1c4eb0b710da79032f70f98ea9d12553c9721f5b16ab6168721f9fb0c44763bd8b9dfcf7afa2dc2e998 WHIRLPOOL 75a7ea958368143004b451a1e7fdb17a578ab433abd2bcefdaaf696a66f83239862e4ddf342b9f5735e905cb9b4a2f7b0d288b1d9718aca3e5af198719f4b550
 AUX mcelog.init 654 SHA256 013f1196f0223867fac0db3740c1bd39dffac0668bcc9c609b15fab741270fab SHA512 e685762a341f8ed52f4fbac479f5d78cabe0c4007dafb82dad9ec431c7abc9a68c24d9c10d75a832c0c8c9d9cba10e01ee474203e3be5392a2d8d488e855fa8f WHIRLPOOL 4330ebe42a39890c987cc6ff48f537964e8db5c1716cb42a2a9458cf67ab934adcb1dde99a09e80f0a66a92cf70df19a5193ff122412a56502e9b5ade7c7536a
 DIST mcelog-1.0_pre3_p20120918.tar.gz 284893 SHA256 21c3cfa2d4a5998495a50705124af452ef92d2ddf909c2b00c87a37cead8179a SHA512 fcb97a2b5fb13f9a161b9a5e9c85947baa41f61ec9f04e32d09f4ffa4e0f1854a449e73661bdf0eabb568f6721727fcf3ed3fdfabe69c8e2a6133159d862e594 WHIRLPOOL c6e85b652cc756729df29dd7be00351573cafebd18c01ee01c9b38f5a39de93e380f0e6d1a37b1f56db34993fec5564bde0591346a98b88c997664f07495c469
 DIST mcelog-1.0pre3.tar.gz 176649 SHA256 0782e0aa952fa4bd641071e6b501774a63993a813a4f494ffd7819521a13c50c SHA512 ef571cde8ce170d2003e6789116ff88fedfd5aeeb75d09bc5f9cafcb30eb081ca572e2604ba160e83ad927433d963d3bcbae06bca4c499a1bebcb8cc632355b0 WHIRLPOOL 3627567c42bf8685fb355f84e9405b5f7e36df57e2b73f8b40df52d12a4d2e37ef3a8d03311ab48068b76ac03cbbe0dea9acc24a001274544321b76f42f78c66
 EBUILD mcelog-1.0_pre3.ebuild 1143 SHA256 c4989a003113897d6e66da52db0af0d2443b3fbb272bb00163ea1ad51717213d SHA512 9e41f9088a3a263d92301eff41abe2a553aff54136e2c23af24fcfc444e6791e5f68cbebacb106345a5f22890ec3c78e2fd240197fe5f82c6ccd69a4470f377f WHIRLPOOL 1f8bab4f1c9b584f6d28171060b033a9fae9b1f4702290506f974e13b9e66aff9bfbf6bc4bf599ceba806f62d8bf3470725e2e42c379b24c3ec9d5b9523e8987
-EBUILD mcelog-1.0_pre3_p20120918-r1.ebuild 1263 SHA256 292cd80ea0aee7c07c43e23a0f5bfb42ca74b3b81c8033ac1b238bf5ca383e90 SHA512 db4501f538a8c77486d73915d1d39b41bfa84edff477b306d02d686995e51a1cd9e5b55e7609395270e17c10693a9386cdc90f5ce8f7ef422e72069434d48db6 WHIRLPOOL e4e18269de4f39c36671bd5c02928f6a60d32cec3f555aab42611fcd1dd2fc1398bdacfab26d3b55d025446dfae704398c4f66b6cd21bde3334298fd1d99c9bb
-MISC ChangeLog 3820 SHA256 48b0c5176034ee10a4ca11fcb77445df3cc1dd8a91a38f9d94afdee48e706e9f SHA512 94472844c2e695ccf75e290f3221c58fb9f17e1cad441869f5b1eb42613bd3238be300f95962672d3ca20a6f360799af8e6fa5d26e5bd2ef07ca7799d07f83fc WHIRLPOOL 62f918be4df8a30e2104485f87184d977c1b9c9fa1a2d975db3a4a557611623831e1a2d7dfc1f7da6c2c1d09273553cebc950ca6a0419582e4a54ccc6ced0802
+EBUILD mcelog-1.0_pre3_p20120918-r1.ebuild 1346 SHA256 e4b83d4e695254045ca12044998a4230e2ee77d47c253401e811d060114dc7d6 SHA512 9630e51fc343b5b5ccf8deebf9e8928240cb642b17fb0981f68726d2f6f99dbbd1e71e2072c5ab1f33e4c228c682a3bfd2ad0e1930666155a9b969879527a4d1 WHIRLPOOL 961d81bef1cff5b35c1f4fd30fb8b90dde6636494c922f374c1ff2ce99ed121e7298f4ecbef416a2b734878f7ada3fa16cb47fe666fab9280165b600ff2dd10a
+MISC ChangeLog 4020 SHA256 dae11677a4a0b1051436abfb09964a3b62d53395f4982dfbf80c1509ad6fe906 SHA512 2e71e090e80fd392df975a191c5071afe16259f91597728a6a87eb5ce1cd5cefb85fa3b1673921964ff51742c2b0ca4a4cbebe84e85ebf4639eb46c2e41a4865 WHIRLPOOL 3ac94ae94771ae4b5691704adcbe1edcc076f64b8b19685e6d52e1d90442006f8c4be4816cf81f983e97519601d43b2dc0b3d6748885873bfc353cb8c8856390
 MISC metadata.xml 659 SHA256 42707f927a780e0422cc17601f1c51b12057192f5bf4ebd8afe0d81f27c8dc6b SHA512 e81394fea62579e9fe92282882845920ebe4c32ce3ac8fa834c0bf42b03f4afa78dbe7148837ca476ae737892022b205ce506035b7a91530ffdc51a94db2e272 WHIRLPOOL dd325d4d6ef24ad2c6ce7cc19392f61bfa7181cbec609cea5b9c0b284b6ad94a9dc1aca8894922b498d4c1ad86c7b1191037f181af9dcf3ef4e1528783a2b142
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRAaR+AAoJEFpvPKfnPDWz1DsH/1j2OtEOu9oHOhbinwc0Sb+w
-9RYdgq+SVJDupsb2UDLgPXQujMvQhzgKYSzyJJbedwkJEqRBOjxWJFRKsAue26qe
-VYWin0P42g5E/VNy4IiXRC9Ae7svh2scVyKg3L40k98k1SCdpwkTTXFAhVJFYo7s
-HpqZrcWhldW3P6gSW2Y5VtW96WV5ytH36yESBchSun4UN6sRCIZB2upGQqxIBQBX
-uz7nIfjFFIpOpBihyExdXGpNOgQwvD3zeegO9fKlmMFJEEOY8/kUA+Q5VSDsEcdC
-ndeqjHmIPBJR2+Qc/3cuF5Yrv9j+ad2u8uOeaGCHMbXjshUG883JpfHa9Rs05Mg=
-=B2B9
+iQEcBAEBCAAGBQJRBBfpAAoJEFpvPKfnPDWz7K0H/iXPWOaElcDklLFp2dLOW3U0
+kkBCUazER6dnynTt3uIP+UWV2bKi80ed3u0yuVkxcsFACe2vjxSa/hQDmzY3CiEr
+njGqbwwzyiWAVhtNsIw6W70g5ZxMX1rTuemp0+a0kaL16lwE3FrappJEzfezRmoJ
+vZG4Ri6yOSKHgL761Gc5vGB17+53jra/N0pVr5DB4xNxtzfojrrAgJlMsliXphwP
+MQSzqCKMcJFvkEGuTu1ebyYNXe4WfDWdY0417K4ZMCA+YuYKFi/8nPdWwVU0rBuA
+Dho4G7IIGIcl2xInphPo04GqCwDEdz93GBKWynxurn3VR75AbQITpcYWpZeSWVg=
+=w7wZ
 -----END PGP SIGNATURE-----
diff --git a/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch b/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch
new file mode 100644
index 000000000000..c6cba7d83bae
--- /dev/null
+++ b/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch
@@ -0,0 +1,21 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sat Jan 26 17:40:22 UTC 2013
+Subject: remove bashisms
+
+--- triggers/cache-error-trigger
++++ triggers/cache-error-trigger
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ # cache error trigger. This shell script is executed by mcelog in daemon mode
+ # when a CPU reports excessive corrected cache errors. This could be a indication
+ # for future uncorrected errors.
+@@ -28,7 +28,7 @@
+ 	logger -s -p daemon.crit -t mcelog "Offlining CPU $i due to cache error threshold"
+ 	F=$(printf "/sys/devices/system/cpu/cpu%d/online" $i)
+ 	echo 0 > $F
+-	if [ "$(< $F)" != "0" ] ; then
++	if [ "$(cat $F)" != "0" ] ; then
+ 		logger -s -p daemon.warn -t mcelog "Offlining CPU $i failed"
+ 		EXIT=1
+ 	fi
diff --git a/app-admin/mcelog/mcelog-1.0_pre3_p20120918-r1.ebuild b/app-admin/mcelog/mcelog-1.0_pre3_p20120918-r1.ebuild
index 7c32afc16ea2..9583d9b1f88f 100644
--- a/app-admin/mcelog/mcelog-1.0_pre3_p20120918-r1.ebuild
+++ b/app-admin/mcelog/mcelog-1.0_pre3_p20120918-r1.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/mcelog/mcelog-1.0_pre3_p20120918-r1.ebuild,v 1.1 2013/01/24 21:15:37 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mcelog/mcelog-1.0_pre3_p20120918-r1.ebuild,v 1.2 2013/01/26 17:52:36 hasufell Exp $
 
 EAPI=5
 
 inherit linux-info eutils toolchain-funcs vcs-snapshot
 
+COMMIT="0f5d0238ca7fb963a687a3c50c96c5f37a599c6b"
 DESCRIPTION="A tool to log and decode Machine Check Exceptions"
 HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/tarball/0f5d0238ca7fb963a687a3c50c96c5f37a599c6b -> ${P}.tar.gz"
+SRC_URI="https://github.com/andikleen/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -24,7 +25,8 @@ RESTRICT="test"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${P}-build.patch
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-bashism.patch
 	tc-export CC
 }
 
@@ -40,7 +42,9 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.init ${PN}
 
 	insinto /etc/${PN}
-	doins triggers/* mcelog.conf
+	doins mcelog.conf
+	exeinto /etc/${PN}
+	doexe triggers/*
 
 	dodoc CHANGES README TODO *.pdf
 	doman ${PN}.8