Install udev rules to udevdir as defined by udev.pc pkg-config file instead of /etc/udev which is reserved for user defined rules.

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

3 files changed, 106 insertions, 2 deletions

diff --git a/app-crypt/tpm-emulator/ChangeLog b/app-crypt/tpm-emulator/ChangeLog
index 06b513c35138..f719738aa805 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.13 2012/05/31 03:31:59 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/ChangeLog,v 1.14 2012/08/11 16:43:01 ssuominen Exp $
+
+*tpm-emulator-0.5.1-r1 (11 Aug 2012)
+
+  11 Aug 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +tpm-emulator-0.5.1-r1.ebuild:
+  Install udev rules to udevdir as defined by udev.pc pkg-config file instead
+  of /etc/udev which is reserved for user defined rules.
 
   31 May 2012; Zac Medico <zmedico@gentoo.org> tpm-emulator-0.5.1.ebuild,
   tpm-emulator-0.5.ebuild:
diff --git a/app-crypt/tpm-emulator/Manifest b/app-crypt/tpm-emulator/Manifest
index 686d18a32268..5f696f32815a 100644
--- a/app-crypt/tpm-emulator/Manifest
+++ b/app-crypt/tpm-emulator/Manifest
@@ -1,3 +1,6 @@
+-----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.initd 1098 SHA256 006cbc727471aa46e6b39783a32456c3a43cb1adf25a54ddf0e9b9c9ab92c10c SHA512 6fa77549cfa71908ac33a8f1101a7761bac326f541baa20159e4cb0d55c0836540449ce9204c973e3cf857e476aa21f8d7c68c68b5efe191aad8dec63a08b74c WHIRLPOOL 95e4dbab6f9b2a5c56f62990b1ec84de1e6f797bd2b91ca21a7dc942bde1abf8301bdebe79f144b0253ec9eda2731cfe4c5d8a1762291a408476040874e0ffb9
@@ -5,7 +8,19 @@ AUX tpm-emulator.initd-0.5.1 1307 SHA256 28d874aa0cebd914201aaca40062e924c919ee6
 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
+EBUILD tpm-emulator-0.5.1-r1.ebuild 2419 SHA256 84cb1ba95ce2883e5434e4cb3a9e0d4c6dfd7caacc7a0607f67a2e0e29ee5e4b SHA512 2b43cf4a86ddec74fc81ed7d15c9984ba98ab73ad25405750bebf07f3a7b63f5b6d83615c766c9ed16a473533533a855b5a845092ccf7369356ada811c699594 WHIRLPOOL eea23f0adacfbd19741f3a06a55a3e80beae0564ba3b80f39afd9fc8df245749760d14d00c68af309a72399f56f2b9f64f1de5d783861c93114c0f5d1308a043
 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 2384 SHA256 d1eebf75d6c868c27b74d7724e190e42290d6b14d9d63781b19636160be23a4e SHA512 deaf934cfc554819e3f59e73e727322209afb225dda828a46f2d4082a238603dccb5fd96cea12197f8c77bdc983f5faf61fb9f525012e48d6d3b7e99d57e2d95 WHIRLPOOL df7ff0b97d8a11a69a8db3084274503771db1492c8870557c8f8700c3d251b5513538e11062ee7083d1e612a5f6904b034c9a2c3a0a83dbd0ef5d8087f6397cc
+MISC ChangeLog 2647 SHA256 590f41da825592781c6bb0854fe33ffc00705b3c47f70acc437c11da26fd929e SHA512 f4bda294f0bf1d54c7259726ad27ca8ab3a5cfc12658f01a72f598f33a60036db55f7a85d1bc2ede7b4cef04dcf2f0500b80f75394f9d07b63f223e5fb4decb0 WHIRLPOOL 382bba5bea601aa47cd20e9f3067945be21d31fdb4b915f1226ca8d64a0508a55057c6a08c73fcea23a560f4601f38c2c23bc428f697ba6b3a3388da0e66c983
 MISC metadata.xml 251 SHA256 1739a4e8833a2a5b9501182eb830cbd3e26014ccef5e9ae1b4d7a0686c665c1b SHA512 224dba61ead84cd24dd0984852cbf5040601ab4ff12763abe7916f57c9b2339002c2c2d753dc0b44a9d2212896d5af531b79ce63b0b7600d01cd06222b33ae56 WHIRLPOOL 56afa8b9fa4e7b4bda4502432ec25c7eb84973a05e5bc676184421698167ea1b152d7bcb75194be28c7a2048113f134a2f475687d28c9c1e939bfade9219fbf7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQJot4AAoJEEdUh39IaPFNYAMH/jYcLr/8kfzpzGHj5AZ12Nr4
+DFXZrMnpXdvhgBcd/5ki4OcGindhW83+0DxUjXLnUFaN1LV196IG6bwrpx8J7xIt
+PtKQjiZiAA7e1mhNCkX8JZR3GeXDNvBNnfJYX889Y4HWN/v5VCzT9vS8bhTzIeIN
+fuLlLigvU/Sji2HKc3YzDyrZaqPKgFLoqhN053ozUYrdLw8syUPrmOQGzsCwyLAy
+IFE/N+reQg1ScnkHs8PMjR8DcjLfs3pDYXynMGNfDNdWR8Q4f0XHJjjZ6PYXbVto
+xiccmoYMGPU5b9VFuPaeMszGiEA4i63W7c0HmcQjROWH4NKNW5QjT5u+Tus/FwI=
+=3AOV
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.5.1-r1.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..546bc8e6054f
--- /dev/null
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.5.1-r1.ebuild
@@ -0,0 +1,82 @@
+# 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.5.1-r1.ebuild,v 1.1 2012/08/11 16:43:01 ssuominen Exp $
+
+EAPI=2
+inherit toolchain-funcs linux-mod eutils multilib user
+
+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="modules"
+DEPEND="dev-libs/gmp
+	virtual/pkgconfig"
+RDEPEND=""
+S=${WORKDIR}/${P/-/_}
+
+#fixups at:
+#https://developer.berlios.de/feature/index.php?func=detailfeature&feature_id=3304&group_id=2491
+
+pkg_setup() {
+	use modules && linux-mod_pkg_setup
+	MODULE_NAMES="tpmd_dev(crypt::${S}/tpmd_dev)"
+	BUILD_TARGETS="all"
+	BUILD_PARAMS="CC=$(tc-getCC)"
+	enewuser tss -1 -1 /var/lib/tpm tss
+}
+
+src_prepare() {
+	sed -i 's/LDFLAGS :=/override LDFLAGS +=/g' tpmd/Makefile
+	sed -i 's#/var/tpm#/var/run/tpm#g' tpmd/tpmd.c tddl/tddl.c tpmd_dev/tpmd_dev.c
+
+	# use kernel object directory found by linux-info getversion() (bug 241956)
+	sed -i 's#/lib/modules/\$(KERNEL_RELEASE)/build#'"${KV_OUT_DIR}#" tpmd_dev/Makefile
+
+	# reorder -lgmp so --as-needed works (bug 264073)
+	sed -i 's/LDFLAGS/LDLIBS/' tpmd/Makefile
+
+	# fix parallel make
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
+}
+
+src_compile() {
+	emake user || die "Failed to build userspace"
+	if use modules; then
+		linux-mod_src_compile || die "Failed to build kernelspace"
+	fi
+}
+
+src_install() {
+	if [ -x /usr/bin/scanelf -a -f tpm_emulator.ko ]; then
+		[ -z "$(/usr/bin/scanelf -qs __guard tpm_emulator.ko)" ] || \
+			die 'cannot have gmp compiled with hardened flags'
+		[ -z "$(/usr/bin/scanelf -qs __stack_smash_handler tpm_emulator.ko)" ] || \
+			die 'cannot have gmp compiled with hardened flags'
+	fi
+
+	use modules && linux-mod_src_install
+	dodoc README
+
+	emake user_install DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" \
+		|| die "Failed to install userspace"
+
+	newinitd "${FILESDIR}"/${PN}.initd-0.5.1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-0.5.1 ${PN}
+
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	insinto "${udevdir}"/rules.d
+	newins "${FILESDIR}"/${PN}.udev 60-${PN}.rules
+
+	keepdir /var/run/tpm
+	fowners tss /var/run/tpm
+
+	keepdir /var/log/tpm
+	fowners tss:tss /var/log/tpm
+}