mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
app-crypt/tpm2-tss: version bump
Closes: https://bugs.gentoo.org/show_bug.cgi?id=687034 Signed-off-by: Alon Bar-Lev <alonbl@gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11
This commit is contained in:
Alon Bar-Lev
@@ -1 +1 @@
|
||||
DIST tpm2-tss-2.1.0.tar.gz 922814 BLAKE2B 06baa6b817b99c0955a5190b0f90f8a0c55987eb06feb827cb950b69992ec1623367db488617722712ce9932ad8310c1b743af038ac77508106fb8f6f4409b1c SHA512 2aea80a4cb2be59a87de6eda74a2907a2832aa76c3c208f610172f4c5bd29133b24b0876286c40855a742d6068b8f843e32f6d995b0e51c2d1e0a752b92fff7c
|
||||
DIST tpm2-tss-2.2.3.tar.gz 912179 BLAKE2B 36b2a462512822dccb3adab605ea9922132f027455a1d2895b6735f6200fe44f08288477c99afd0f6c06b4bff3090104b6412b12ea4a518888cf756fb8ee53c4 SHA512 68087cbf2b7acc33788e90b3825bf2c91faa65cfc04b576790634c88876a8a6930d6943f83b7cf0858e37e5e7307703d0c975b9fc0b0ad1d87f66c74b65bd411
|
||||
|
||||
@@ -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 <flihp@twobit.org>
|
||||
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 <flihp@twobit.org>
|
||||
---
|
||||
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
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools linux-info udev
|
||||
inherit linux-info udev user
|
||||
|
||||
DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
|
||||
HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
|
||||
@@ -21,36 +21,28 @@ REQUIRED_USE="
|
||||
|
||||
RDEPEND="gcrypt? ( dev-libs/libgcrypt:0= )
|
||||
openssl? ( dev-libs/openssl:0= )"
|
||||
DEPEND="${DEPEND}
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-util/cmocka )"
|
||||
BDEPEND="virtual/pkgconfig
|
||||
~sys-devel/autoconf-archive-2018.03.13
|
||||
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
|
||||
enewgroup tss
|
||||
enewuser tss -1 -1 /var/lib/tpm tss
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# next version add --disable-defaultflags
|
||||
econf \
|
||||
$(use_enable doc doxygen-doc) \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable test unit) \
|
||||
--disable-defaultflags \
|
||||
--with-crypto="$(usex gcrypt gcrypt ossl)" \
|
||||
--with-udevrulesdir="$(get_udevdir)/rules.d" \
|
||||
--with-udevrulesprefix=60-
|
||||
Reference in New Issue
Block a user