Fix /var/run handling, per bug#448430, thanks to flameeyes

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64

4 files changed, 13 insertions, 9 deletions

diff --git a/app-crypt/tpm-emulator/ChangeLog b/app-crypt/tpm-emulator/ChangeLog
index 5fd1c2325b76..74f556dbed4c 100644
--- a/app-crypt/tpm-emulator/ChangeLog
+++ b/app-crypt/tpm-emulator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/tpm-emulator
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/ChangeLog,v 1.18 2012/12/23 01:25:26 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/ChangeLog,v 1.19 2012/12/24 17:13:25 alonbl Exp $
+
+*tpm-emulator-0.7.4-r1 (24 Dec 2012)
+
+  24 Dec 2012; Alon Bar-Lev <alonbl@gentoo.org> +tpm-emulator-0.7.4-r1.ebuild,
+  -tpm-emulator-0.7.4.ebuild, files/tpm-emulator.initd-0.7.4:
+  Fix /var/run handling, per bug#448430, thanks to flameeyes
 
 *tpm-emulator-0.7.4 (23 Dec 2012)
 
diff --git a/app-crypt/tpm-emulator/Manifest b/app-crypt/tpm-emulator/Manifest
index e4c5413d42e1..9338baa27751 100644
--- a/app-crypt/tpm-emulator/Manifest
+++ b/app-crypt/tpm-emulator/Manifest
@@ -3,7 +3,7 @@ AUX tpm-emulator.confd-0.5.1 34 SHA256 3af4a1b3f83919225c4a66f3de3159bed4e8eec4d
 AUX tpm-emulator.confd-0.7.4 34 SHA256 3af4a1b3f83919225c4a66f3de3159bed4e8eec4d55e9da848018c5ea66541ee SHA512 61b5145d3fa5b778ba09e66a25ea183165fafbdafe54aa77d171aed2a87f6b5febc918d33603a9bf58320e9ff3f79e3ec58d03d4674562d31c1c90b942faf504 WHIRLPOOL e95e8e0326f2c64695b63ba8242bf0ff9cdf256411b05b9aff9553b5bb69266d5a8bc1aef0cca701502ad94852cec254dfa0e74fdf546952f13afdabd9cc3598
 AUX tpm-emulator.initd 1098 SHA256 006cbc727471aa46e6b39783a32456c3a43cb1adf25a54ddf0e9b9c9ab92c10c SHA512 6fa77549cfa71908ac33a8f1101a7761bac326f541baa20159e4cb0d55c0836540449ce9204c973e3cf857e476aa21f8d7c68c68b5efe191aad8dec63a08b74c WHIRLPOOL 95e4dbab6f9b2a5c56f62990b1ec84de1e6f797bd2b91ca21a7dc942bde1abf8301bdebe79f144b0253ec9eda2731cfe4c5d8a1762291a408476040874e0ffb9
 AUX tpm-emulator.initd-0.5.1 1306 SHA256 7fe76f8c0104dba719c0f51b900a7d68353579a8d2bbf77960d42ed90e14286e SHA512 e852b14e15258de132f67fc7b1e39f9df6016906d7aa2f6a9bd9251ada427ba65c58ec343294dde81a61fbb37b74ff40a43ac09602cb39021d4fa44a41e95a75 WHIRLPOOL 41b446dc590f57c6286f39323e3850a1a072ee6f248409720bffa3c3a964faf669b061020a606f0bee6be3faf951627696d72b77e88743cc6ed786fe84453bb0
-AUX tpm-emulator.initd-0.7.4 1185 SHA256 fee5680a657ed460c4ac797704d66167e7d58ce108ee878ca822c6f0453060ac SHA512 96b2a4cfeb4e6e2aa88e180c3af8701c0837ed041b768adb5eb5054d1f85dd89af4e8eda2c6dec06ccbf219573623ce9571cd79f385c950d14562738dfd9eb18 WHIRLPOOL cf9f9f9972a0eb1bd900ae44a6338c1f913cc6fcb3a41c849b4f0d499911efb4aaac6013fc5838516c5a8b8a60804202ef97124bcb4cdddf16d973fe29095ecf
+AUX tpm-emulator.initd-0.7.4 1227 SHA256 c564c457674b1ecebc7f7b1442305bc4b41dd8f6c908b906068b7e2a81279842 SHA512 4973d79234cefc09c2ff0ccbb6e06c0dbf817833e4e371b2077378136e85b18a205cfaf75eaca4a27865f5a143713f7bc5305a41b885a9b219f23b35513e1bf9 WHIRLPOOL 6a53a5d4c9aeca2270cf9907c9cbf309f74d5d35f183bdb51f69669681e061f4a648ab1d2fea076430d94733c62a978047eae99c031d29082875737dfb74541c
 AUX tpm-emulator.udev 68 SHA256 b19ebed090177546d76eacbdd52ab68f32c3a3c46598e437b3fd5780efa9c164 SHA512 9c10833f011f26e051c379a352b5f68d2db67aad2144d1e35386a6099306b1d48f8446722b2d871aa625132be2c08e227d351a51aaa0ad73dcc3fa44636da311 WHIRLPOOL c32168a1726b00dc4042592a8b90cb43991acc5976a35611e1331284d4934154ebba7c4ca72adfdeeda6422851fafe300ef59ad1ff1659fb2ee4c905534ed058
 DIST tpm_emulator-0.5.1.tar.gz 146565 SHA256 b83f9fe00d77c9d88bcce0dfbd26e9b29992846fa8f995bdfff7bce88a98906c SHA512 be8c3954884dcf66e627d4fcdc913efa455c211bd026d5f262ef1ae07146e4edcfefa8c7ddbad019701b35a4207b5516d76756d25d4f72b0b82885d9c335b98e WHIRLPOOL 0db82a0c0eda895c36685146fc84d1e4273b4c1eb46f86e3b227be0e1d76b85f4ccb34ba584004536d74ebab07af61f22e5f2ce849ba15db3a46282fe379cb13
 DIST tpm_emulator-0.5.tar.gz 267193 SHA256 b6d88a601d47cfb98d00f5fc8abe3aeadd8e205781d5fd745cf7cd47d158fade SHA512 0573ebc9c9bcca91d2b29de369c77f3a24497ac59cdb378057fd709da54a21eca8d6074b2a5b8277313bb2948a67d8c93f114519f7f32d7621fabcc97f08e711 WHIRLPOOL 6e5bd9bcc8bb9ba9f94e63bd815badd458f522482f68a3e835e5acce038e363a9bd7abab218076318ccca61943b202036fb6b8e28148868413d490d7e31bb71a
@@ -11,6 +11,6 @@ DIST tpm_emulator-0.7.4.tar.gz 214145 SHA256 4e48ea0d83dd9441cc1af04ab18cd6c961b
 EBUILD tpm-emulator-0.5.1-r1.ebuild 2285 SHA256 e0d2ce56bb06c5c69200ee25444ff2bbc1d4f6fca6a889e4e5efd29874b5312d SHA512 e9940c3013a89c3b1a460641e4461911806f19807019a471d2f11ee2585fd544d92daf3fccd14b36253e1a7e4b196eaafabc500301db36e92fe0be7478f07d06 WHIRLPOOL 3506b92169535dfc45a509d6a28c207c7e78da4029a5958bfaa0aeb1b4c30a92e5fef7df64cd1c0cb6067cf97c9ca907d7ecd421709cc5bbd9fc17a50a680b98
 EBUILD tpm-emulator-0.5.1.ebuild 2284 SHA256 1a4e2a6db31b001a35de4ff73b9eba2e414909ce47be01aaf968ffa6e8e39d34 SHA512 8800c9f783e809d439c8530a89a78fc410870f5b4abf1d317f4832f6b17b3fb01e567acd9c05b59684a202f0030dbfa0e457775e9a2823e591266e32048ecbe3 WHIRLPOOL 75c5cd2e6fdf2a97e5ca5dcae79ff69e704fd60ea6edcfc5ee8f328707322737611e15400af273c917e3d267675b5712e8a102fcf2702184a6cfac7c0f5124e7
 EBUILD tpm-emulator-0.5.ebuild 1603 SHA256 581f0ede67de1a703452b2c092c950347dcc898e714b0204497cd3193ab1d225 SHA512 b9239618868613a2b1b14de5b399b974a4ae492d21aa132291cda792118e4bc52767465705c56b15f81e1a01124bcb0f6260dd361dd69e7eda60708b3e80f134 WHIRLPOOL 240a119885804446884080cb9171d101b743a52634d63f39f230b2979cf2fb2e7280eda40070faebc1f02395dfb0cb24c94c77194c1e6a52c127ac36d643a38c
-EBUILD tpm-emulator-0.7.4.ebuild 1717 SHA256 b3d44ce25db5095e47be2f18902ed5d978f20c5ae1775a0645800d09931f85ff SHA512 7f385e521b5f7df9cde8c39a630e8e49385cbd13730e7d658bbcc7bbefcff2cd7e101124a7d0a62108bbfb70ab8bc9deda1904ccf8c64255fb44fbcaf26c19da WHIRLPOOL e09a16f2821920c47fa755fcdf457bde2d11f79f4539ff039863aafdc7996b1dfd50a8c10c49cf0d326eff1dc719a2d8f9ca1cfc7c1a3d92f74f8a5b3aa234aa
-MISC ChangeLog 3290 SHA256 b08b048d222de18ac21e5d05023dfb122adff1e8222353f16e5bea591f2e843c SHA512 651c98ab7606f568e2744e362d846a9b5d6bddf67283b80b0906f9fcee2f42319d11965e5ba77b684ca09666f9df72cd116dc31c8d3b0837ff2187f594cb7897 WHIRLPOOL e7d8358b6acbe968c47522ba7f2d705a44b529b8157473a59d4108892ce5f2526092568c9caf155199469af64f145d68e12f8244143bdbfd2e6d1ded76d417eb
+EBUILD tpm-emulator-0.7.4-r1.ebuild 1671 SHA256 487a0129c51f7ed4fdb956b3b30968d138a15813bd01115d075728c5e96e1314 SHA512 f086c2980b70e6ef0afa9f72fdcb470523f592cf9fd65155e610113ebcba494f571ebb216ec36a305d56dfe62e27b639c2c8e6713affdeec7a773e6f4b9f6d7c WHIRLPOOL 72486da97466984e92c5609e19e82d9b5112e633fae4d440aa6a3276dcbfbad750386f13de50a3bc4283767e7bafbc97a922be9043b8d05571b0b9b2ab78dc88
+MISC ChangeLog 3531 SHA256 02200d31bd3c77cc4f426ad3ca3aeb80078fa87b0df5b342867e3ada6dc10f3e SHA512 36daf02f42567201292d73e5d7d7c5bf446160ea0dfd8860a7773559f3fca52c6614dc37d72887dd0fa6ef4837ca4e4100987573419e7ac2edd60b253ca78235 WHIRLPOOL 4c465f0349795fb5a79378877c91e3286de7a7e4e3ae012ecd4e8e3b3a1863959afcc2146f0ab8d2f4f536d6feb1464015f18bb7b42d11f3528880d373b498a6
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4 b/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4
index 16e4c370162f..26ed541bbea0 100755
--- a/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4
+++ b/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4,v 1.1 2012/12/23 01:25:26 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4,v 1.2 2012/12/24 17:13:25 alonbl Exp $
 
 STARTUP_MODE='save';
 
@@ -29,6 +29,7 @@ checkconfig() {
 start() {
 	ebegin "Starting tpm-emulator daemon with mode '$STARTUP_MODE' (tpmd)"
 	checkconfig || eend $?
+	checkpath -d -m 0775 -o tss /var/run/tpm
 	start-stop-daemon --start --exec "${command}" -- ${command_args} $STARTUP_MODE > /dev/null
 	eend $?
 }
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.7.4.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
index 20fdb23c2449..d58b7c4f856a 100644
--- a/app-crypt/tpm-emulator/tpm-emulator-0.7.4.ebuild
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/tpm-emulator-0.7.4.ebuild,v 1.1 2012/12/23 01:25:26 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild,v 1.1 2012/12/24 17:13:25 alonbl Exp $
 
 EAPI=2
 inherit user linux-mod cmake-utils udev
@@ -64,9 +64,6 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.initd-0.7.4 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd-0.7.4 ${PN}
 
-	keepdir /var/run/tpm
-	fowners tss /var/run/tpm
-
 	keepdir /var/log/tpm
 	fowners tss:tss /var/log/tpm
 }