gentoo resync : 02.06.2019

5 files changed, 160 insertions, 0 deletions

diff --git a/app-crypt/tpm2-tss-engine/Manifest b/app-crypt/tpm2-tss-engine/Manifest
new file mode 100644
index 000000000000..0bb11bf31ed5
--- /dev/null
+++ b/app-crypt/tpm2-tss-engine/Manifest
@@ -0,0 +1,5 @@
+AUX tpm2-tss-engine-1.0.0-build.patch 2362 BLAKE2B d1e28ef019da77a9f857b90d9bce7d03a55504e0b74b7aafa2e56e417cc528b55ea8284ca9e2e30b35dd357a829b0329f26e595f9c421315c6b08ec8ac2aba80 SHA512 6a5fa163ccf8e0b24c9f1641b1c29be55d437d2e026343d9f33872fe2f2914a440884c705ec0c679130533ffa67d8ee33d475385568c57ed5d738d84b598c49d
+AUX tpm2-tss-engine-1.0.0-libressl.patch 1054 BLAKE2B 42f666eb44e61659e941758ab48bcf76c5be94be5944d7437db0671b286f038d8cee3e8754ca84fdbb0957b7e964445e798d2c494354c6ca9eff576ce45d7f6d SHA512 9b7c769d6a65ec67a522d78abb56da8c8560074a6bc1efcb300669308bfeeb39340da7c049a4c5d0a446f9e0d4e9fc03ee80ad0db52395c4a81013e11d27796d
+DIST tpm2-tss-engine-1.0.0.tar.gz 382277 BLAKE2B 6580eb83f4e9391a12df2fb9cb86ace385a9e29004a64f6ca9378d9b8f60572a7761f4f486e1010d435487fed28858737d2bb71b08e400e9551a7b83c198bbe7 SHA512 b06722c82c9cefd5184125b26fb46bd7b20d62631c21c51a028348833c4786b41ff64f2c1cb7d53f749a6cf35b8fae02ae02285fc43d1d044e2d2b6e2e7048a3
+EBUILD tpm2-tss-engine-1.0.0.ebuild 794 BLAKE2B 4d5fd45aecaa622ccfd1c53f251c9ead5988824b14ffebb5a23b74ab65a89d8fe3fa9f5fce2593a296660c8315c0cbc27d520ea2217ce905d4cdf05f6f04543b SHA512 fea4780fca65134fcbcda56994c6652e2bd934de7c8c50e26b41578596ab85d3dc4aa075d4542d1527247936b3f440ea59a52c8a0adde2caf3c548226cf58b4b
+MISC metadata.xml 334 BLAKE2B 8ee81cad095cd2c3f3a31e2b181ab678a4a51316e868bd6f84af46aa6bf87af35bea0a9d6fa0fad368175f55020e23cbdf2aed8af3ccb853bc3085db4ba82dc3 SHA512 0d38a3515c9b31fc64988812c4015a25fa8a7c6550cfe90e78f73bfcecad57d1c043da2843b5c72c7a220db1c77b1790c32cab61fa3ec970b72da7f448e12b02
diff --git a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-build.patch b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-build.patch
new file mode 100644
index 000000000000..aa2b2e4e4fd3
--- /dev/null
+++ b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-build.patch
@@ -0,0 +1,70 @@
+From 92aee12fbd246461a22925dd054c4d6394c4fdf5 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 31 May 2019 02:30:37 +0300
+Subject: [PATCH] build: add --disable-defaultflags
+
+Align with tpm2-tss to allow downstream to provide flags.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac | 42 +++++++++++++++++++++++++-----------------
+ 1 file changed, 25 insertions(+), 17 deletions(-)
+
+https://github.com/tpm2-software/tpm2-tss-engine/pull/117
+
+diff --git a/configure.ac b/configure.ac
+index f3a399c..f59cfaf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,23 +80,31 @@ AS_IF([test "x$enable_tctienvvar" = xyes], [AC_DEFINE([ENABLE_TCTIENVVAR], [1])]
+ 
+ AC_CONFIG_FILES([Makefile])
+ 
+-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])
+-
+-# work around GCC bug #53119
+-#   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
+-AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
+-
+-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_ARG_ENABLE([defaultflags],
++              [AS_HELP_STRING([--disable-defaultflags],
++                              [Disable default preprocessor, compiler, and linker flags.])],
++              [enable_defaultflags=$enableval],
++              [enable_defaultflags=yes])
++AS_IF([test "x$enable_defaultflags" = "xyes"],
++      [
++      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])
++
++      # work around GCC bug #53119
++      #   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
++      AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
++
++      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])
++      ])
+ 
+ AX_CODE_COVERAGE
+ m4_ifdef([_AX_CODE_COVERAGE_RULES],
+-- 
+2.21.0
+
diff --git a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-libressl.patch b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-libressl.patch
new file mode 100644
index 000000000000..66bb68e76940
--- /dev/null
+++ b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.0-libressl.patch
@@ -0,0 +1,35 @@
+From deb2b6697babf99aaf3f64b342ce414b48638ea3 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 31 May 2019 20:36:47 +0300
+Subject: [PATCH] build: libressl fix incomplete type
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+src/tpm2-tss-engine-rand.c:90:1: error: variable ‘rand_methods’ has initializer but incomplete type
+   90 | static RAND_METHOD rand_methods = {
+      | ^~~~~~
+src/tpm2-tss-engine-rand.c:91:5: warning: excess elements in struct initializer
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ src/tpm2-tss-engine-rand.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+https://github.com/tpm2-software/tpm2-tss-engine/pull/120
+
+diff --git a/src/tpm2-tss-engine-rand.c b/src/tpm2-tss-engine-rand.c
+index 50d5661..86980a5 100644
+--- a/src/tpm2-tss-engine-rand.c
++++ b/src/tpm2-tss-engine-rand.c
+@@ -32,6 +32,7 @@
+ #include <string.h>
+ 
+ #include <openssl/engine.h>
++#include <openssl/rand.h>
+ 
+ #include <tss2/tss2_mu.h>
+ #include <tss2/tss2_esys.h>
+-- 
+2.21.0
+
diff --git a/app-crypt/tpm2-tss-engine/metadata.xml b/app-crypt/tpm2-tss-engine/metadata.xml
new file mode 100644
index 000000000000..7931bebd0b34
--- /dev/null
+++ b/app-crypt/tpm2-tss-engine/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="github">tpm2-software/tpm2-tss-engine</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.0.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.0.ebuild
new file mode 100644
index 000000000000..b42ef4ae8168
--- /dev/null
+++ b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="OpenSSL Engine for TPM2 devices"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libressl test"
+
+RDEPEND=">=app-crypt/tpm2-tss-2.2.2:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-libressl.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable test unit) \
+		--disable-defaultflags \
+		--disable-static
+}