From 2018227e9344edb9da15fc6a4a8298086cc2aa77 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 2 Jun 2019 21:45:28 +0100 Subject: gentoo resync : 02.06.2019 --- .../tpm2-tss/files/tpm2-tss-2.1.0-build.patch | 88 ---------------------- .../tpm2-tss/files/tpm2-tss-2.1.0-tests.patch | 30 -------- 2 files changed, 118 deletions(-) delete mode 100644 app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch delete mode 100644 app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-tests.patch (limited to 'app-crypt/tpm2-tss/files') 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 deleted file mode 100644 index 85f84c38e1f1..000000000000 --- a/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch +++ /dev/null @@ -1,88 +0,0 @@ -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], -From 74037d3c15b9f9d98f9b50ca4f1c1a99d239d751 Mon Sep 17 00:00:00 2001 -From: Philip Tricca -Date: Sun, 4 Nov 2018 16:17:19 -0800 -Subject: [PATCH] build: Fix breakage in generated configure script when CFLAGS - is set. - -This fixes a bug introduced in 3980bad87fe18ad9d32914e9d21dba145eba973f. -That patch references the documentation for AC_PROG_CC but it misread -the recommended workaround. The leading colon (aka `:`) in the -documentation is significant. - -The `:` is a shell 'builtin' command that is equivalent to invoking the -'true' command. By placing the conditional substitution of the CFLAGS -after this, the result of the substitution will be ignored and the -script won't fail. Without this the contents of the CFLAGS variable set -in the environment will be interpreted as a command and since they're -not commands the configure script will abort. - -Signed-off-by: Philip Tricca ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c4e4592e..f88fe38b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -31,7 +31,7 @@ AC_INIT([tpm2-tss], - [], - [https://github.com/tpm2-software/tpm2-tss]) - AC_CONFIG_MACRO_DIR([m4]) --${CFLAGS=""} -+: ${CFLAGS=""} - AC_PROG_CC - LT_INIT() - AM_INIT_AUTOMAKE([foreign --- -2.19.2 - 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 deleted file mode 100644 index d537c40e1a90..000000000000 --- a/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-tests.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 1ea85a32c0ae20a104badcec807b72ef458d356d Mon Sep 17 00:00:00 2001 -From: Andreas Fuchs -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 ---- - 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 - -- cgit v1.2.3