Version bump, per bug#371551

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

6 files changed, 149 insertions, 16 deletions

diff --git a/app-crypt/tpm-emulator/ChangeLog b/app-crypt/tpm-emulator/ChangeLog
index ba7f9ce940ca..5fd1c2325b76 100644
--- a/app-crypt/tpm-emulator/ChangeLog
+++ b/app-crypt/tpm-emulator/ChangeLog
@@ -1,6 +1,13 @@
 # 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.17 2012/12/11 15:44:01 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/ChangeLog,v 1.18 2012/12/23 01:25:26 alonbl Exp $
+
+*tpm-emulator-0.7.4 (23 Dec 2012)
+
+  23 Dec 2012; Alon Bar-Lev <alonbl@gentoo.org> +files/tpm-emulator.confd-0.7.4,
+  +files/tpm-emulator.initd-0.7.4, +tpm-emulator-0.7.4.ebuild,
+  files/tpm-emulator.initd-0.5.1:
+  Version bump, per bug#371551
 
   11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> tpm-emulator-0.5.1-r1.ebuild:
   use udev.eclass to handle rules installation (a cleaner method than the
@@ -81,4 +88,3 @@
   +files/tpm-emulator-0.2a-inline.patch, +metadata.xml,
   +tpm-emulator-0.2a.ebuild:
   initial import
-
diff --git a/app-crypt/tpm-emulator/Manifest b/app-crypt/tpm-emulator/Manifest
index c2a57d5e6eab..e4c5413d42e1 100644
--- a/app-crypt/tpm-emulator/Manifest
+++ b/app-crypt/tpm-emulator/Manifest
@@ -1,22 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX tpm-emulator-0.5.1-parallel-make.patch 1910 SHA256 2af0336f84a5e9f38413fef5cebea825b8e57423f0a080a59598d8c1e1929789 SHA512 65f3bbb5a75fc910c37e30e196b04b16fc29dd80aa3256cf2ecbb561cc0a15a22f5535f899cc30a1758d48a46e792179ee9303bb1bb66ad1bac57adc18a33b1c WHIRLPOOL 6aa8b4380d5e11b19665bff211dddc865c8e87b0bf383b820984fb1237fb3777eec5799958d3708b152afbb253556aa4a833354143abd760a1e4f09308b5a236
 AUX tpm-emulator.confd-0.5.1 34 SHA256 3af4a1b3f83919225c4a66f3de3159bed4e8eec4d55e9da848018c5ea66541ee SHA512 61b5145d3fa5b778ba09e66a25ea183165fafbdafe54aa77d171aed2a87f6b5febc918d33603a9bf58320e9ff3f79e3ec58d03d4674562d31c1c90b942faf504 WHIRLPOOL e95e8e0326f2c64695b63ba8242bf0ff9cdf256411b05b9aff9553b5bb69266d5a8bc1aef0cca701502ad94852cec254dfa0e74fdf546952f13afdabd9cc3598
+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 1307 SHA256 28d874aa0cebd914201aaca40062e924c919ee60ef94070196b1c132f7bc7ebb SHA512 a34c8176d9f5ac548f4a67c7ef40ee707b560240f9fec67b95000be42eb035fe2ebec990abf9a8affaf81503938dee51a07bc83c32f1bd9eeef782514546c05b WHIRLPOOL 7b01c1bab39be20e7297d53e007dd7717dad5305d1bc4fe1d669bcf0e649aee5d5d29812a4977a383bd15fd5f1436f3a538228480d4fc82b23cd0f32765ade60
+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.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
+DIST tpm_emulator-0.7.4.tar.gz 214145 SHA256 4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459 SHA512 4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35 WHIRLPOOL c75d49e834f8df6c810d7cb7ca3553e742fde0fd6050af7f7aeda8bbdf652084dda6600719eb0b816e1d51bbc5d9f0e119ea40ce3e59af05fd8d55971056fd6f
 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
-MISC ChangeLog 3043 SHA256 cfe1792a61cce10d6050b95d0b2e3785eabcde859e6586006bcd1ec3c13230a0 SHA512 9af58ee6547474d817dc8c169e498f9eb263e21417a0ebf907561e95e35cfde1f07de8add7d9936cb6c6ef4f279943243ae611a1e78f06435b935c1671adcddd WHIRLPOOL 731f6915386a491ed3031e8cf8212a43d7397f1281c6e911376aac73cdc08e1725a3e79caf41459ed96019b12e6464a602542df3208f41f4b3f8665e85283093
+EBUILD tpm-emulator-0.7.4.ebuild 1717 SHA256 b3d44ce25db5095e47be2f18902ed5d978f20c5ae1775a0645800d09931f85ff SHA512 7f385e521b5f7df9cde8c39a630e8e49385cbd13730e7d658bbcc7bbefcff2cd7e101124a7d0a62108bbfb70ab8bc9deda1904ccf8c64255fb44fbcaf26c19da WHIRLPOOL e09a16f2821920c47fa755fcdf457bde2d11f79f4539ff039863aafdc7996b1dfd50a8c10c49cf0d326eff1dc719a2d8f9ca1cfc7c1a3d92f74f8a5b3aa234aa
+MISC ChangeLog 3290 SHA256 b08b048d222de18ac21e5d05023dfb122adff1e8222353f16e5bea591f2e843c SHA512 651c98ab7606f568e2744e362d846a9b5d6bddf67283b80b0906f9fcee2f42319d11965e5ba77b684ca09666f9df72cd116dc31c8d3b0837ff2187f594cb7897 WHIRLPOOL e7d8358b6acbe968c47522ba7f2d705a44b529b8157473a59d4108892ce5f2526092568c9caf155199469af64f145d68e12f8244143bdbfd2e6d1ded76d417eb
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iF4EAREIAAYFAlDHVNMACgkQ2ugaI38ACPAtiAD/fbqNGKQdTMgSCNoKbHrfcPTP
-Lfl6LfUIMNX86SSaa3QA/0AjbwDkSwJyy11zwqjkf/NInCpID4OxDAfCCnJpXfnA
-=UWl7
------END PGP SIGNATURE-----
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator.confd-0.7.4 b/app-crypt/tpm-emulator/files/tpm-emulator.confd-0.7.4
new file mode 100644
index 000000000000..da24e57840b9
--- /dev/null
+++ b/app-crypt/tpm-emulator/files/tpm-emulator.confd-0.7.4
@@ -0,0 +1,2 @@
+STARTUP_MODE="save"
+#DEBUG="true"
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.5.1 b/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.5.1
index c0652f2fcd63..1e93950b59ae 100644
--- a/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.5.1
+++ b/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.5.1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# 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/files/tpm-emulator.initd-0.5.1,v 1.1 2009/09/21 10:40:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.5.1,v 1.2 2012/12/23 01:25:26 alonbl Exp $
 
 opts="save clear deactivated"
 
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
new file mode 100755
index 000000000000..16e4c370162f
--- /dev/null
+++ b/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4
@@ -0,0 +1,59 @@
+#!/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 $
+
+STARTUP_MODE='save';
+
+extra_started_commands="clear save deactivated"
+command="/usr/bin/tpmd"
+command_args="-o tss -g tss"
+
+depend() {
+	use logger
+	after coldplug
+}
+
+checkconfig() {
+	lsmod | grep -q "^tpmd_dev\b" \
+		|| modprobe tpmd_dev &>/dev/null \
+		|| eerror "Failed to load module tpmd_dev";
+
+	if [ ! -c /dev/tpm ] && [ ! -c /dev/tpm0 ] ; then
+		eerror "No TPM device found!"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	ebegin "Starting tpm-emulator daemon with mode '$STARTUP_MODE' (tpmd)"
+	checkconfig || eend $?
+	start-stop-daemon --start --exec "${command}" -- ${command_args} $STARTUP_MODE > /dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping tpm-emulator daemon (tpmd)"
+	start-stop-daemon --stop --exec "${command}" -- ${command_args} > /dev/null
+	eend $?
+}
+
+clear() {
+	STARTUP_MODE='clear';
+	stop
+	start
+}
+
+save() {
+	STARTUP_MODE='save';
+	stop
+	start
+}
+
+deactivated() {
+	STARTUP_MODE='deactivated';
+	stop
+	start
+}
+
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.7.4.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.7.4.ebuild
new file mode 100644
index 000000000000..20fdb23c2449
--- /dev/null
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.7.4.ebuild
@@ -0,0 +1,72 @@
+# 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 $
+
+EAPI=2
+inherit user linux-mod cmake-utils udev
+
+MY_P=${P/-/_}
+DESCRIPTION="Emulator driver for tpm"
+HOMEPAGE="https://developer.berlios.de/projects/tpm-emulator"
+SRC_URI="mirror://berlios/tpm-emulator/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ssl modules"
+RDEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	!ssl? ( dev-libs/gmp )"
+
+S=${WORKDIR}/${P/-/_}
+
+pkg_setup() {
+	enewuser tss -1 -1 /var/lib/tpm tss
+	if use modules; then
+		CONFIG_CHECK="MODULES"
+		linux-mod_pkg_setup
+		BUILD_TARGETS="all"
+		BUILD_PARAMS="KERNEL_BUILD=${KERNEL_DIR}"
+	fi
+}
+
+src_prepare() {
+	# do not build and install the kernel module
+	sed -i 's/COMMAND ${tpmd_dev_BUILD_CMD}//' tpmd_dev/CMakeLists.txt || die
+	sed -i 's/install(CODE.*//' tpmd_dev/CMakeLists.txt || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_use ssl OPENSSL)
+	)
+	cmake-utils_src_configure
+
+	# only here we have BUILD_DIR
+	MODULE_NAMES="tpmd_dev(misc:${BUILD_DIR}/tpmd_dev/linux)"
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use modules && linux-mod_src_compile
+	emake -C ${BUILD_DIR}/tpmd_dev/linux tpmd_dev.rules
+}
+
+src_install() {
+	cmake-utils_src_install
+	use modules && linux-mod_src_install
+
+	dodoc README
+
+	udev_newrules "${BUILD_DIR}/tpmd_dev/linux/tpmd_dev.rules" 60-tpmd_dev.rules
+
+	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
+}