summaryrefslogtreecommitdiff
path: root/app-crypt/tpm2-tss
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-01-12 16:58:08 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-01-12 16:58:08 +0000
commitc8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch)
tree9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /app-crypt/tpm2-tss
parent2891d29af8907ce881662f4a02844926d7a293c7 (diff)
gentoo resync : 12.01.2019
Diffstat (limited to 'app-crypt/tpm2-tss')
-rw-r--r--app-crypt/tpm2-tss/Manifest4
-rw-r--r--app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch39
-rw-r--r--app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild13
3 files changed, 50 insertions, 6 deletions
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 6304a91c7243..24daf8c1cc03 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,5 +1,5 @@
-AUX tpm2-tss-2.1.0-build.patch 1717 BLAKE2B 28a2ea02df0d0414176062e93c57d798c50d0f5c36ce7b162ea928cc5b5a93db71f8447bdabfd3c899941000b71927784c0d1705b0afb5f1fb3500999ebf4138 SHA512 587323ff5ec3638658d57bbfe587171dd61c9622d45c9cf08ab8d2de1a73eb9ec8c7e962c99d7e4b555ffa364d9e3831634fb8f628c5d2c36a9a163ce708644e
+AUX tpm2-tss-2.1.0-build.patch 3044 BLAKE2B 4d166306c401e0a178626ab9c49f22ee8c69114051c753631870a65f6ae5c80a6ca710092f2ce66b0c2f5b937ec7f05f288a79cfbbaaf59b62bbe61b77e23f6b SHA512 9a3b4fce5e2403f0c9dc2ac3726efd3fd6e0e3f0b62109cce22b25e55f950aa3c2e32894460d016913eb4635fe99580bb7a14afae1677464af1c9f6b927e7f73
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
+EBUILD tpm2-tss-2.1.0.ebuild 1399 BLAKE2B 007296b2f01c92cd395c357b68a3b7666848b9867ebb6e077c43f1fa4015d4620aa4cd268fb4e77cc43b2022bb263ecc175f5fc8070ed47eacb9b714fe35df1d SHA512 3094d1a812a15b59b2d725c0bad668516805970f3a92e6840be7345cd5a1ce820b9775b97f8f5dc2808b8943af04edcd61a45ae570257e0def482c4ec103a70f
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
index 930c173239ed..85f84c38e1f1 100644
--- 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
@@ -47,3 +47,42 @@ index c42b487f..f9118642 100644
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
+
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild
index dea061ef89ae..07b4fb47e677 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
LICENSE="BSD-2"
SLOT="0/0" # sublot is libtss2-sys number
KEYWORDS="~amd64"
-IUSE="doc +gcrypt libressl openssl static-libs test"
+IUSE="doc +gcrypt openssl static-libs test"
REQUIRED_USE="
gcrypt? ( !openssl )
@@ -20,11 +20,11 @@ REQUIRED_USE="
|| ( gcrypt openssl )"
RDEPEND="gcrypt? ( dev-libs/libgcrypt:0= )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )"
+ openssl? ( dev-libs/openssl:0= )"
DEPEND="${DEPEND}
test? ( dev-util/cmocka )"
BDEPEND="virtual/pkgconfig
+ ~sys-devel/autoconf-archive-2018.03.13
doc? ( app-doc/doxygen )"
PATCHES=(
@@ -55,3 +55,8 @@ src_configure() {
--with-udevrulesdir="$(get_udevdir)/rules.d" \
--with-udevrulesprefix=60-
}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}