[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/, app-crypt/tpm2-tss/files/

[Joonas Niilola]

commit:     30f93267c27a51c005669ee62c9f84fb767b60c5
Author:     Salah Coronya <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Tue Apr  7 14:59:22 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed May 13 13:16:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f93267

app-crypt/tpm2-tss: Bump to 2.4.0

Closes: https://bugs.gentoo.org/720212
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Salah Coronya <salah.coronya <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-crypt/tpm2-tss/Manifest                        |  1 +
 .../files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch   | 22 +++++++
 app-crypt/tpm2-tss/metadata.xml                    |  1 +
 app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild           | 71 ++++++++++++++++++++++
 4 files changed, 95 insertions(+)

diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index b3e97a63921..16f1388cba1 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,2 +1,3 @@
 DIST tpm2-tss-2.2.3.tar.gz 912179 BLAKE2B 36b2a462512822dccb3adab605ea9922132f027455a1d2895b6735f6200fe44f08288477c99afd0f6c06b4bff3090104b6412b12ea4a518888cf756fb8ee53c4 SHA512 68087cbf2b7acc33788e90b3825bf2c91faa65cfc04b576790634c88876a8a6930d6943f83b7cf0858e37e5e7307703d0c975b9fc0b0ad1d87f66c74b65bd411
 DIST tpm2-tss-2.3.3.tar.gz 1171185 BLAKE2B de88d3301bf05239ac9644b4d0e8f257f483bd7a8196ba957a68da9f47cd88ca47422fded5fa8939ccb3bcdf4b39c1dd363c65b9e675f3e03021fb12ec723117 SHA512 df83908508fc8add8ca1aaf7144bcf369f13797f7e5d39fe29654d82e2de2cddf324cd06cb3154318ef767d706d863a7781d98c7b29a90945f081a54594128e5
+DIST tpm2-tss-2.4.0.tar.gz 1446509 BLAKE2B bb078719fa85d9ea07b9710b5ac5d2f9c2b842700ed5b26a30ab2708a227b4bd599563c76e648d6f0b9dfe7785a25c049826f953baffdd39113bd62e7b4563df SHA512 763370381584f2124f751f0736e6a8b34428fd52134fd9966f3581e128f3b74b3f1261992f5d6162d7c866e47f7e5519ea80c1d1d39b80d5ed6e067eb2cd35a0

diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch
new file mode 100644
index 00000000000..93a1fed8a87
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch
@@ -0,0 +1,22 @@
+diff --git a/dist/fapi-config.json.in b/dist/fapi-config.json.in
+index e32a3c36..4aa636e2 100644
+--- a/dist/fapi-config.json.in
++++ b/dist/fapi-config.json.in
+@@ -2,7 +2,7 @@
+      "profile_name": "P_RSA2048SHA256",
+      "profile_dir": "@sysconfdir@/tpm2-tss/fapi-profiles/",
+      "user_dir": "~/@userstatedir@/tpm2-tss/user/keystore",
+-     "system_dir": "@localstatedir@/lib/tpm2-tss/system/keystore",
++     "system_dir": "@localstatedir@/tpm2-tss/system/keystore",
+      "tcti": "",
+      "system_pcrs" : [],
+      "log_dir" : "@runstatedir@/tpm2-tss/eventlog/"
+diff --git a/dist/tmpfiles.d/tpm2-tss-fapi.conf.in b/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
+index 1793c4d7..3f0c8380 100644
+--- a/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
++++ b/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
+@@ -1,3 +1,3 @@
+ #Type   Path                                           Mode User Group Age         Argument
+-d       @localstatedir@/lib/tpm2-tss/system/keystore   775  tss  tss   -           -
++d       @localstatedir@/tpm2-tss/system/keystore       775  tss  tss   -           -
+ d       @runstatedir@/tpm2-tss/eventlog                775  tss  tss   -           -

diff --git a/app-crypt/tpm2-tss/metadata.xml b/app-crypt/tpm2-tss/metadata.xml
index 227ecac5856..ca0c0ecca08 100644
--- a/app-crypt/tpm2-tss/metadata.xml
+++ b/app-crypt/tpm2-tss/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
+		<flag name="fapi">Enable feature API (requires openssl as crypto backend)</flag>
 		<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> as crypto engine</flag>
 		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as crypto engine</flag>
 	</use>

diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
new file mode 100644
index 00000000000..f8986d88dc9
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info tmpfiles udev
+
+DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc +fapi gcrypt +openssl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="^^ ( gcrypt openssl )
+		fapi ( !gcrypt )"
+
+RDEPEND="acct-group/tss
+	 acct-user/tss
+	 fapi? (
+		dev-libs/json-c
+	        net-misc/curl
+	 )
+	 gcrypt? ( dev-libs/libgcrypt:0= )
+	 openssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.0-fix-tmpfiles-path.patch"
+)
+
+pkg_setup() {
+	local CONFIG_CHECK=" \
+		~TCG_TPM
+	"
+	linux-info_pkg_setup
+	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc doxygen-doc) \
+		$(use_enable fapi) \
+		$(use_enable static-libs static) \
+		$(use_enable test unit) \
+		--disable-tcti-mssim \
+		--disable-defaultflags \
+		--disable-weakcrypto \
+		--with-crypto="$(usex gcrypt gcrypt ossl)" \
+		--with-runstatedir=/run \
+		--with-udevrulesdir="$(get_udevdir)/rules.d" \
+		--with-udevrulesprefix=60- \
+		--with-sysusersdir="/usr/lib/sysusers.d"
+		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process tpm2-tss-fapi.conf
+}