gentoo resync : 31.12.2018

5 files changed, 156 insertions, 0 deletions

diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
new file mode 100644
index 000000000000..6304a91c7243
--- /dev/null
+++ b/app-crypt/tpm2-tss/Manifest
@@ -0,0 +1,5 @@
+AUX tpm2-tss-2.1.0-build.patch 1717 BLAKE2B 28a2ea02df0d0414176062e93c57d798c50d0f5c36ce7b162ea928cc5b5a93db71f8447bdabfd3c899941000b71927784c0d1705b0afb5f1fb3500999ebf4138 SHA512 587323ff5ec3638658d57bbfe587171dd61c9622d45c9cf08ab8d2de1a73eb9ec8c7e962c99d7e4b555ffa364d9e3831634fb8f628c5d2c36a9a163ce708644e
+AUX tpm2-tss-2.1.0-tests.patch 1066 BLAKE2B 2ec86af0165f3e50089e238760445046e073e7c9e1f69c0c739078518f83751512889f24f333fac7738539fd3c2057e42a52380003b6483400c78b68c335a75f SHA512 12b1df925a1bbc25ff00a57dbc614c2a01779c0f1849ef22f0172e343e6cc431cdc8daffa0eed271761ba17d035124532796a5072ed8fba19555e214e8b7a804
+DIST tpm2-tss-2.1.0.tar.gz 922814 BLAKE2B 06baa6b817b99c0955a5190b0f90f8a0c55987eb06feb827cb950b69992ec1623367db488617722712ce9932ad8310c1b743af038ac77508106fb8f6f4409b1c SHA512 2aea80a4cb2be59a87de6eda74a2907a2832aa76c3c208f610172f4c5bd29133b24b0876286c40855a742d6068b8f843e32f6d995b0e51c2d1e0a752b92fff7c
+EBUILD tpm2-tss-2.1.0.ebuild 1337 BLAKE2B 37d5f7e16cda8724d3e6aaf49b62c770b76de52db1158f3c206b432c33e5ebc44d3be6c96e625150fb3dae41a4394563ee603036292d49e5cc3ebd2f8b9e6ee3 SHA512 9d44925a91546aca53c9bb78da240421f446bd3fe2f19cb7d9fecb392b121dafdb1d27e739d7347a849164d0a2512709928032217a478cda3b4277d3dfda17ec
+MISC metadata.xml 501 BLAKE2B be53401663c21ea24b8fd7a898a30b398c5773d86b5f30cf9a8c4b2334736e09b64ea60e2f6069b765d7babc5695b64a8b38aa3020d65ff224910eb633d76ae6 SHA512 901b9e66b98cea1ee90c8f885f402d66d7fb90494d9b95a2028e4834d5750edb4945563275def32f3944f4e28ba5a3aa558abf3ffce935df1af316cb1cb1d865
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch
new file mode 100644
index 000000000000..930c173239ed
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch
@@ -0,0 +1,49 @@
+Next version removes these using --disable-defaultflags
+
+---
+
+diff --git a/configure.ac b/configure.ac
+index c42b487f..f9118642 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -189,19 +189,6 @@ AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
+ 
+ gl_LD_VERSION_SCRIPT
+ 
+-AX_ADD_COMPILER_FLAG([-std=c99])
+-AX_ADD_COMPILER_FLAG([-Wall])
+-AX_ADD_COMPILER_FLAG([-Wextra])
+-AX_ADD_COMPILER_FLAG([-Wformat-security])
+-AX_ADD_COMPILER_FLAG([-Werror])
+-AX_ADD_COMPILER_FLAG([-fstack-protector-all])
+-AX_ADD_COMPILER_FLAG([-fpic])
+-AX_ADD_COMPILER_FLAG([-fPIC])
+-
+-AX_ADD_PREPROC_FLAG([-D_DEFAULT_SOURCE])
+-AX_ADD_PREPROC_FLAG([-D_BSD_SOURCE])
+-AX_ADD_PREPROC_FLAG([-D_POSIX_SOURCE])
+-
+ AC_ARG_WITH([maxloglevel],
+             [AS_HELP_STRING([--with-maxloglevel={none,error,warning,info,debug,trace}],
+                             [sets the maximum log level (default is trace)])],
+@@ -227,20 +214,9 @@ AC_ARG_ENABLE([debug],
+             [enable_debug=$enableval],
+             [enable_debug=no])
+ AS_IF([test "x$enable_debug" = "xyes"], AX_ADD_COMPILER_FLAG([-ggdb3 -Og]))
+-AS_IF([test "x$enable_debug" = "xno"], [AX_ADD_PREPROC_FLAG([-U_FORTIFY_SOURCE])
+-                                        AX_ADD_PREPROC_FLAG([-D_FORTIFY_SOURCE=2])
+-                                        AX_ADD_COMPILER_FLAG([-g -O2])])
+-AX_ADD_LINK_FLAG([-Wl,--no-undefined])
+-AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
+-AX_ADD_LINK_FLAG([-Wl,-z,now])
+-AX_ADD_LINK_FLAG([-Wl,-z,relro])
+ 
+ AC_SUBST([PATH])
+ 
+-# work around GCC bug #53119
+-#   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
+-AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
+-
+ dnl ---------  Physical TPM device -----------------------
+ 
+ AC_ARG_WITH([ptpm],
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-tests.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-tests.patch
new file mode 100644
index 000000000000..d537c40e1a90
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-tests.patch
@@ -0,0 +1,30 @@
+From 1ea85a32c0ae20a104badcec807b72ef458d356d Mon Sep 17 00:00:00 2001
+From: Andreas Fuchs <andreas.fuchs@sit.fraunhofer.de>
+Date: Tue, 25 Sep 2018 09:35:33 +0200
+Subject: [PATCH] ESYS: Fix crypto_ossl return code
+
+Fix returncode and thus test of interal hmac_finish function.
+
+Fixes: #1157
+
+Signed-off-by: Andreas Fuchs <andreas.fuchs@sit.fraunhofer.de>
+---
+ src/tss2-esys/esys_crypto_ossl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tss2-esys/esys_crypto_ossl.c b/src/tss2-esys/esys_crypto_ossl.c
+index 43088f4a..91871de1 100644
+--- a/src/tss2-esys/esys_crypto_ossl.c
++++ b/src/tss2-esys/esys_crypto_ossl.c
+@@ -448,7 +448,7 @@ iesys_cryptossl_hmac_finish(IESYS_CRYPTO_CONTEXT_BLOB ** context,
+     IESYS_CRYPTOSSL_CONTEXT *mycontext =
+         (IESYS_CRYPTOSSL_CONTEXT *) * context;
+     if (mycontext->type != IESYS_CRYPTOSSL_TYPE_HMAC) {
+-        return_error(TSS2_ESYS_RC_BAD_VALUE, "bad context");
++        return_error(TSS2_ESYS_RC_BAD_REFERENCE, "bad context");
+     }
+ 
+     if (*size < mycontext->hmac.hmac_len) {
+-- 
+2.19.2
+
diff --git a/app-crypt/tpm2-tss/metadata.xml b/app-crypt/tpm2-tss/metadata.xml
new file mode 100644
index 000000000000..bbde63a7602f
--- /dev/null
+++ b/app-crypt/tpm2-tss/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<use>
+		<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>
+	<upstream>
+		<remote-id type="github">tpm2-software/tpm2-tss</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild
new file mode 100644
index 000000000000..dea061ef89ae
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info 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/0"	# sublot is libtss2-sys number
+KEYWORDS="~amd64"
+IUSE="doc +gcrypt libressl openssl static-libs test"
+
+REQUIRED_USE="
+	gcrypt? ( !openssl )
+	openssl? ( !gcrypt )
+	|| ( gcrypt openssl )"
+
+RDEPEND="gcrypt? ( dev-libs/libgcrypt:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${DEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-tests.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_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# next version add --disable-defaultflags
+	econf \
+		$(use_enable doc doxygen-doc) \
+		$(use_enable static-libs static) \
+		$(use_enable test unit) \
+		--with-crypto="$(usex gcrypt gcrypt ossl)" \
+		--with-udevrulesdir="$(get_udevdir)/rules.d" \
+		--with-udevrulesprefix=60-
+}