* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/, app-crypt/tpm2-tss/files/
@ 2018-12-30 21:00 Alon Bar-Lev
0 siblings, 0 replies; 13+ messages in thread
From: Alon Bar-Lev @ 2018-12-30 21:00 UTC (permalink / raw
To: gentoo-commits
commit: 2116ee6b8d5ea228d739cb6aa6b917eeb948faf6
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 30 19:03:07 2018 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Sun Dec 30 20:58:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2116ee6b
app-crypt/tpm2-tss: initial add
Closes: https://bugs.gentoo.org/show_bug.cgi?id=634298
Thanks: Alex Guzman
Thanks: Sebastian Hamann
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-crypt/tpm2-tss/Manifest | 1 +
.../tpm2-tss/files/tpm2-tss-2.1.0-build.patch | 49 +++++++++++++++++++
.../tpm2-tss/files/tpm2-tss-2.1.0-tests.patch | 30 ++++++++++++
app-crypt/tpm2-tss/metadata.xml | 15 ++++++
app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild | 57 ++++++++++++++++++++++
5 files changed, 152 insertions(+)
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
new file mode 100644
index 00000000000..50abb292c49
--- /dev/null
+++ b/app-crypt/tpm2-tss/Manifest
@@ -0,0 +1 @@
+DIST tpm2-tss-2.1.0.tar.gz 922814 BLAKE2B 06baa6b817b99c0955a5190b0f90f8a0c55987eb06feb827cb950b69992ec1623367db488617722712ce9932ad8310c1b743af038ac77508106fb8f6f4409b1c SHA512 2aea80a4cb2be59a87de6eda74a2907a2832aa76c3c208f610172f4c5bd29133b24b0876286c40855a742d6068b8f843e32f6d995b0e51c2d1e0a752b92fff7c
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 00000000000..930c173239e
--- /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 00000000000..d537c40e1a9
--- /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 00000000000..5176de72bd2
--- /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/gcrypt</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 00000000000..dea061ef89a
--- /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-
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/, app-crypt/tpm2-tss/files/
@ 2019-01-09 20:12 Alon Bar-Lev
0 siblings, 0 replies; 13+ messages in thread
From: Alon Bar-Lev @ 2019-01-09 20:12 UTC (permalink / raw
To: gentoo-commits
commit: 846d47e8c5426578048aa6e41354d5e20c984fdb
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 9 20:11:19 2019 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Wed Jan 9 20:12:20 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=846d47e8
app-crypt/tpm2-tss: add missing sys-devel/autoconf-archive dependency
Bug: https://bugs.gentoo.org/show_bug.cgi?id=675016
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../tpm2-tss/files/tpm2-tss-2.1.0-build.patch | 39 ++++++++++++++++++++++
app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild | 3 +-
2 files changed, 41 insertions(+), 1 deletion(-)
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 930c173239e..85f84c38e1f 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 fc172e0e91c..e986cc524b4 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
@@ -24,6 +24,7 @@ RDEPEND="gcrypt? ( dev-libs/libgcrypt:0= )
DEPEND="${DEPEND}
test? ( dev-util/cmocka )"
BDEPEND="virtual/pkgconfig
+ sys-devel/autoconf-archive
doc? ( app-doc/doxygen )"
PATCHES=(
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/, app-crypt/tpm2-tss/files/
@ 2019-05-30 23:46 Alon Bar-Lev
0 siblings, 0 replies; 13+ messages in thread
From: Alon Bar-Lev @ 2019-05-30 23:46 UTC (permalink / raw
To: gentoo-commits
commit: 9a3ca0cd4d6daaff4e90f65c6f484dde5c675ae4
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 21:24:44 2019 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Thu May 30 23:46:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a3ca0cd
app-crypt/tpm2-tss: version bump
Closes: https://bugs.gentoo.org/show_bug.cgi?id=687034
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
app-crypt/tpm2-tss/Manifest | 2 +-
.../tpm2-tss/files/tpm2-tss-2.1.0-build.patch | 88 ----------------------
.../tpm2-tss/files/tpm2-tss-2.1.0-tests.patch | 30 --------
...tpm2-tss-2.1.0.ebuild => tpm2-tss-2.2.3.ebuild} | 18 ++---
4 files changed, 6 insertions(+), 132 deletions(-)
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 50abb292c49..533d36c8bbe 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -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
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 85f84c38e1f..00000000000
--- 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 <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/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 d537c40e1a9..00000000000
--- 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 <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/tpm2-tss-2.1.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.2.3.ebuild
similarity index 81%
rename from app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild
rename to app-crypt/tpm2-tss/tpm2-tss-2.2.3.ebuild
index 07b4fb47e67..8496a3630e8 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.2.3.ebuild
@@ -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-
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/, app-crypt/tpm2-tss/files/
@ 2020-05-13 13:17 Joonas Niilola
0 siblings, 0 replies; 13+ messages in thread
From: Joonas Niilola @ 2020-05-13 13:17 UTC (permalink / raw
To: gentoo-commits
commit: 30f93267c27a51c005669ee62c9f84fb767b60c5
Author: Salah Coronya <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Tue Apr 7 14:59:22 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed May 13 13:16:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f93267
app-crypt/tpm2-tss: Bump to 2.4.0
Closes: https://bugs.gentoo.org/720212
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Salah Coronya <salah.coronya <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-crypt/tpm2-tss/Manifest | 1 +
.../files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch | 22 +++++++
app-crypt/tpm2-tss/metadata.xml | 1 +
app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild | 71 ++++++++++++++++++++++
4 files changed, 95 insertions(+)
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index b3e97a63921..16f1388cba1 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,2 +1,3 @@
DIST tpm2-tss-2.2.3.tar.gz 912179 BLAKE2B 36b2a462512822dccb3adab605ea9922132f027455a1d2895b6735f6200fe44f08288477c99afd0f6c06b4bff3090104b6412b12ea4a518888cf756fb8ee53c4 SHA512 68087cbf2b7acc33788e90b3825bf2c91faa65cfc04b576790634c88876a8a6930d6943f83b7cf0858e37e5e7307703d0c975b9fc0b0ad1d87f66c74b65bd411
DIST tpm2-tss-2.3.3.tar.gz 1171185 BLAKE2B de88d3301bf05239ac9644b4d0e8f257f483bd7a8196ba957a68da9f47cd88ca47422fded5fa8939ccb3bcdf4b39c1dd363c65b9e675f3e03021fb12ec723117 SHA512 df83908508fc8add8ca1aaf7144bcf369f13797f7e5d39fe29654d82e2de2cddf324cd06cb3154318ef767d706d863a7781d98c7b29a90945f081a54594128e5
+DIST tpm2-tss-2.4.0.tar.gz 1446509 BLAKE2B bb078719fa85d9ea07b9710b5ac5d2f9c2b842700ed5b26a30ab2708a227b4bd599563c76e648d6f0b9dfe7785a25c049826f953baffdd39113bd62e7b4563df SHA512 763370381584f2124f751f0736e6a8b34428fd52134fd9966f3581e128f3b74b3f1261992f5d6162d7c866e47f7e5519ea80c1d1d39b80d5ed6e067eb2cd35a0
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch
new file mode 100644
index 00000000000..93a1fed8a87
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch
@@ -0,0 +1,22 @@
+diff --git a/dist/fapi-config.json.in b/dist/fapi-config.json.in
+index e32a3c36..4aa636e2 100644
+--- a/dist/fapi-config.json.in
++++ b/dist/fapi-config.json.in
+@@ -2,7 +2,7 @@
+ "profile_name": "P_RSA2048SHA256",
+ "profile_dir": "@sysconfdir@/tpm2-tss/fapi-profiles/",
+ "user_dir": "~/@userstatedir@/tpm2-tss/user/keystore",
+- "system_dir": "@localstatedir@/lib/tpm2-tss/system/keystore",
++ "system_dir": "@localstatedir@/tpm2-tss/system/keystore",
+ "tcti": "",
+ "system_pcrs" : [],
+ "log_dir" : "@runstatedir@/tpm2-tss/eventlog/"
+diff --git a/dist/tmpfiles.d/tpm2-tss-fapi.conf.in b/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
+index 1793c4d7..3f0c8380 100644
+--- a/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
++++ b/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
+@@ -1,3 +1,3 @@
+ #Type Path Mode User Group Age Argument
+-d @localstatedir@/lib/tpm2-tss/system/keystore 775 tss tss - -
++d @localstatedir@/tpm2-tss/system/keystore 775 tss tss - -
+ d @runstatedir@/tpm2-tss/eventlog 775 tss tss - -
diff --git a/app-crypt/tpm2-tss/metadata.xml b/app-crypt/tpm2-tss/metadata.xml
index 227ecac5856..ca0c0ecca08 100644
--- a/app-crypt/tpm2-tss/metadata.xml
+++ b/app-crypt/tpm2-tss/metadata.xml
@@ -10,6 +10,7 @@
<name>Proxy Maintainers</name>
</maintainer>
<use>
+ <flag name="fapi">Enable feature API (requires openssl as crypto backend)</flag>
<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>
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
new file mode 100644
index 00000000000..f8986d88dc9
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info tmpfiles 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"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc +fapi gcrypt +openssl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="^^ ( gcrypt openssl )
+ fapi ( !gcrypt )"
+
+RDEPEND="acct-group/tss
+ acct-user/tss
+ fapi? (
+ dev-libs/json-c
+ net-misc/curl
+ )
+ gcrypt? ( dev-libs/libgcrypt:0= )
+ openssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+ test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.4.0-fix-tmpfiles-path.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_configure() {
+ econf \
+ $(use_enable doc doxygen-doc) \
+ $(use_enable fapi) \
+ $(use_enable static-libs static) \
+ $(use_enable test unit) \
+ --disable-tcti-mssim \
+ --disable-defaultflags \
+ --disable-weakcrypto \
+ --with-crypto="$(usex gcrypt gcrypt ossl)" \
+ --with-runstatedir=/run \
+ --with-udevrulesdir="$(get_udevdir)/rules.d" \
+ --with-udevrulesprefix=60- \
+ --with-sysusersdir="/usr/lib/sysusers.d"
+ --with-tmpfilesdir="/usr/lib/tmpfiles.d"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ tmpfiles_process tpm2-tss-fapi.conf
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/, app-crypt/tpm2-tss/files/
@ 2020-05-18 5:00 Jason A. Donenfeld
0 siblings, 0 replies; 13+ messages in thread
From: Jason A. Donenfeld @ 2020-05-18 5:00 UTC (permalink / raw
To: gentoo-commits
commit: 911b35667b9e66b5d29f0ef2927219cacabd2e30
Author: Salah Coronya <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Thu May 14 03:12:06 2020 +0000
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Mon May 18 04:59:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=911b3566
app-crypt/tpm2-tss: Fix sandbox violation for systemd users
Closes: https://bugs.gentoo.org/722864
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Salah Coronya <salah.coronya <AT> gmail.com>
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
...-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch | 15 +++++++++++++++
app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild | 5 +++--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch
new file mode 100644
index 00000000000..c916bbf0133
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile.am b/Makefile.am
+index c543a287..58187f7e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -558,10 +558,6 @@ uninstall-local:
+ -rm $(DESTDIR)$(udevrulesdir)/$(udevrulesprefix)tpm-udev.rules
+ endif
+
+-# Create tss user and FAPI directories directly after installation (vs. after a reboot)
+-install-exec-hook:
+- systemd-sysusers && systemd-tmpfiles --create || true
+-
+ uninstall-hook:
+ cd $(DESTDIR)$(man3dir) && \
+ [ -L Tss2_TctiLdr_Initialize_Ex.3 ] && \
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
index f8986d88dc9..76c8cc9bf6d 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
@@ -34,7 +34,8 @@ BDEPEND="virtual/pkgconfig
PATCHES=(
"${FILESDIR}/${PN}-2.4.0-fix-tmpfiles-path.patch"
-)
+ "${FILESDIR}/${PN}-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch"
+ )
pkg_setup() {
local CONFIG_CHECK=" \
@@ -57,7 +58,7 @@ src_configure() {
--with-runstatedir=/run \
--with-udevrulesdir="$(get_udevdir)/rules.d" \
--with-udevrulesprefix=60- \
- --with-sysusersdir="/usr/lib/sysusers.d"
+ --with-sysusersdir="/usr/lib/sysusers.d" \
--with-tmpfilesdir="/usr/lib/tmpfiles.d"
}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/, app-crypt/tpm2-tss/files/
@ 2020-06-17 17:00 Joonas Niilola
0 siblings, 0 replies; 13+ messages in thread
From: Joonas Niilola @ 2020-06-17 17:00 UTC (permalink / raw
To: gentoo-commits
commit: 0fa527fdc9548279a21a981ae51557af9bf2b6bb
Author: Salah Coronya <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Sun May 24 19:58:18 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 17:00:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fa527fd
app-crypt/tpm2-tss: Remove old
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Salah Coronya <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15956
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-crypt/tpm2-tss/Manifest | 1 -
...4.0-Dont-run-systemd-sysusers-in-Makefile.patch | 15 -----
.../files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch | 22 -------
app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild | 77 ----------------------
4 files changed, 115 deletions(-)
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index f810a2ffc5b..2fb402eb43d 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,2 +1 @@
-DIST tpm2-tss-2.4.0.tar.gz 1446509 BLAKE2B bb078719fa85d9ea07b9710b5ac5d2f9c2b842700ed5b26a30ab2708a227b4bd599563c76e648d6f0b9dfe7785a25c049826f953baffdd39113bd62e7b4563df SHA512 763370381584f2124f751f0736e6a8b34428fd52134fd9966f3581e128f3b74b3f1261992f5d6162d7c866e47f7e5519ea80c1d1d39b80d5ed6e067eb2cd35a0
DIST tpm2-tss-2.4.1.tar.gz 1445103 BLAKE2B c7be91b93d19b5afeddb6ec455db9ba06795f8dc76ee2a0c6cbabbd8f623930d7c9fdf6319497c70790445531d1e36fe3f904f4c1f4bc9254d833b6d19280f1f SHA512 51551d63fa404e23664aaad1b247bd4b1f93812ced1aed144c37f28cdb3adb4e696aa9e93a502c8fa0eb7e9b4376ac9377f0537eb4c717b68c0b014fee7a0643
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch
deleted file mode 100644
index c916bbf0133..00000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-Dont-run-systemd-sysusers-in-Makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index c543a287..58187f7e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -558,10 +558,6 @@ uninstall-local:
- -rm $(DESTDIR)$(udevrulesdir)/$(udevrulesprefix)tpm-udev.rules
- endif
-
--# Create tss user and FAPI directories directly after installation (vs. after a reboot)
--install-exec-hook:
-- systemd-sysusers && systemd-tmpfiles --create || true
--
- uninstall-hook:
- cd $(DESTDIR)$(man3dir) && \
- [ -L Tss2_TctiLdr_Initialize_Ex.3 ] && \
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch
deleted file mode 100644
index 93a1fed8a87..00000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/dist/fapi-config.json.in b/dist/fapi-config.json.in
-index e32a3c36..4aa636e2 100644
---- a/dist/fapi-config.json.in
-+++ b/dist/fapi-config.json.in
-@@ -2,7 +2,7 @@
- "profile_name": "P_RSA2048SHA256",
- "profile_dir": "@sysconfdir@/tpm2-tss/fapi-profiles/",
- "user_dir": "~/@userstatedir@/tpm2-tss/user/keystore",
-- "system_dir": "@localstatedir@/lib/tpm2-tss/system/keystore",
-+ "system_dir": "@localstatedir@/tpm2-tss/system/keystore",
- "tcti": "",
- "system_pcrs" : [],
- "log_dir" : "@runstatedir@/tpm2-tss/eventlog/"
-diff --git a/dist/tmpfiles.d/tpm2-tss-fapi.conf.in b/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
-index 1793c4d7..3f0c8380 100644
---- a/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
-+++ b/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
-@@ -1,3 +1,3 @@
- #Type Path Mode User Group Age Argument
--d @localstatedir@/lib/tpm2-tss/system/keystore 775 tss tss - -
-+d @localstatedir@/tpm2-tss/system/keystore 775 tss tss - -
- d @runstatedir@/tpm2-tss/eventlog 775 tss tss - -
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
deleted file mode 100644
index 9f3fd54be54..00000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info tmpfiles 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"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc +fapi gcrypt +openssl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( gcrypt openssl )
- fapi? ( openssl !gcrypt )"
-
-RDEPEND="acct-group/tss
- acct-user/tss
- fapi? (
- dev-libs/json-c
- net-misc/curl
- )
- gcrypt? ( dev-libs/libgcrypt:0= )
- openssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
- test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.4.0-fix-tmpfiles-path.patch"
- "${FILESDIR}/${PN}-2.4.0-Dont-run-systemd-sysusers-in-Makefile.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() {
- econf \
- $(use_enable doc doxygen-doc) \
- $(use_enable fapi) \
- $(use_enable static-libs static) \
- $(use_enable test unit) \
- --disable-tcti-mssim \
- --disable-defaultflags \
- --disable-weakcrypto \
- --with-crypto="$(usex gcrypt gcrypt ossl)" \
- --with-runstatedir=/run \
- --with-udevrulesdir="$(get_udevdir)/rules.d" \
- --with-udevrulesprefix=60- \
- --with-sysusersdir="/usr/lib/sysusers.d" \
- --with-tmpfilesdir="/usr/lib/tmpfiles.d"
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- tmpfiles_process tpm2-tss-fapi.conf
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/, app-crypt/tpm2-tss/files/
@ 2020-09-06 5:55 Joonas Niilola
0 siblings, 0 replies; 13+ messages in thread
From: Joonas Niilola @ 2020-09-06 5:55 UTC (permalink / raw
To: gentoo-commits
commit: 47af162aba9d836e7720a83239cffff006bfd4df
Author: Salah Coronya <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Wed Aug 5 23:16:32 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Sep 6 05:55:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47af162a
app-crypt/tpm2-tss: Bump to 2.4.2
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Salah Coronya <salah.coronya <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-crypt/tpm2-tss/Manifest | 1 +
...4.2-Dont-run-systemd-sysusers-in-Makefile.patch | 15 +++++
app-crypt/tpm2-tss/tpm2-tss-2.4.2.ebuild | 77 ++++++++++++++++++++++
3 files changed, 93 insertions(+)
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 2fb402eb43d..5e42808b9f8 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1 +1,2 @@
DIST tpm2-tss-2.4.1.tar.gz 1445103 BLAKE2B c7be91b93d19b5afeddb6ec455db9ba06795f8dc76ee2a0c6cbabbd8f623930d7c9fdf6319497c70790445531d1e36fe3f904f4c1f4bc9254d833b6d19280f1f SHA512 51551d63fa404e23664aaad1b247bd4b1f93812ced1aed144c37f28cdb3adb4e696aa9e93a502c8fa0eb7e9b4376ac9377f0537eb4c717b68c0b014fee7a0643
+DIST tpm2-tss-2.4.2.tar.gz 1461987 BLAKE2B 7d37818ba91c4128862206d5179dcde2c5149b5b00807b242a0b4311531ad2da9e8ad435a6b46872aab5eb91777012010a352ba0f478737740175e0353275643 SHA512 db31d216abcefdad76f5d9ff2995c99c552400392a4dec800b962fa1fa3ac83effacca831602a9b7f814045c996a1bb066802c5373b54233aa24ddafd636c27e
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch
new file mode 100644
index 00000000000..c37a73531c0
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile.am b/Makefile.am
+index 322415b8..39e09063 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -602,10 +602,6 @@ endif #FAPI
+ EXTRA_DIST += dist/tpm-udev.rules
+
+ install-dirs:
+-if HOSTOS_LINUX
+- (systemd-sysusers && systemd-tmpfiles --create) || \
+- ($(call make_tss_user_and_group) && $(call make_fapi_dirs) && ($call set_fapi_permissions)) || true
+-endif
+
+ install-data-hook: install-dirs
+ -if [ ! -z "$(udevrulesprefix)" ]; then \
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.2.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.2.ebuild
new file mode 100644
index 00000000000..6f62e2098b9
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info tmpfiles 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc +fapi gcrypt +openssl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="^^ ( gcrypt openssl )
+ fapi? ( openssl !gcrypt )"
+
+RDEPEND="acct-group/tss
+ acct-user/tss
+ fapi? (
+ dev-libs/json-c
+ net-misc/curl
+ )
+ gcrypt? ( dev-libs/libgcrypt:0= )
+ openssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+ test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-Dont-run-systemd-sysusers-in-Makefile.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() {
+ econf \
+ --localstatedir=/var \
+ $(use_enable doc doxygen-doc) \
+ $(use_enable fapi) \
+ $(use_enable static-libs static) \
+ $(use_enable test unit) \
+ --disable-tcti-mssim \
+ --disable-defaultflags \
+ --disable-weakcrypto \
+ --with-crypto="$(usex gcrypt gcrypt ossl)" \
+ --with-runstatedir=/run \
+ --with-udevrulesdir="$(get_udevdir)/rules.d" \
+ --with-udevrulesprefix=60- \
+ --with-sysusersdir="/usr/lib/sysusers.d" \
+ --with-tmpfilesdir="/usr/lib/tmpfiles.d"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ tmpfiles_process tpm2-tss-fapi.conf
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/, app-crypt/tpm2-tss/files/
@ 2020-11-20 10:12 Joonas Niilola
0 siblings, 0 replies; 13+ messages in thread
From: Joonas Niilola @ 2020-11-20 10:12 UTC (permalink / raw
To: gentoo-commits
commit: 0f66e61fe78bd2a385ebe1c1beae564f3d42a494
Author: Salah Coronya <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Fri Nov 13 21:34:16 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 10:11:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f66e61f
app-crypt/tpm2-tss: Fix building with autoconf-2.70
Closes: https://bugs.gentoo.org/750845
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Salah Coronya <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18252
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...ss-3.0.1-Fix-underquoting-in-configure-ac.patch | 22 ++++++++++++++++++++++
app-crypt/tpm2-tss/tpm2-tss-3.0.1.ebuild | 1 +
2 files changed, 23 insertions(+)
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch
new file mode 100644
index 00000000000..a593716c97e
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch
@@ -0,0 +1,22 @@
+diff --git a/configure.ac b/configure.ac
+index ff59dd7c..3049032b 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -285,7 +285,7 @@ AC_ARG_ENABLE([integration],
+ [build and execute integration tests])],,
+ [enable_integration=no])
+ AS_IF([test "x$enable_integration" = "xyes"],
+- AS_IF([test "$HOSTOS" = "Linux"],
++ [AS_IF([test "$HOSTOS" = "Linux"],
+ [ERROR_IF_NO_PROG([ss])],
+ [ERROR_IF_NO_PROG([sockstat])])
+ ERROR_IF_NO_PROG([echo])
+@@ -335,7 +335,7 @@ AS_IF([test "x$enable_integration" = "xyes"],
+ [AC_MSG_ERROR([No simulator executable found in PATH for testing TCTI.])])
+ AC_SUBST([INTEGRATION_TCTI], [$integration_tcti])
+ AC_SUBST([INTEGRATION_ARGS], [$integration_args])
+- AC_SUBST([ENABLE_INTEGRATION], [$enable_integration]))
++ AC_SUBST([ENABLE_INTEGRATION], [$enable_integration])])
+ AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
+ #
+ # sanitizer compiler flags
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.0.1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.0.1.ebuild
index 0eb03051233..824c52730cf 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-3.0.1.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-3.0.1.ebuild
@@ -32,6 +32,7 @@ BDEPEND="virtual/pkgconfig
PATCHES=(
"${FILESDIR}/${PN}-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch"
+ "${FILESDIR}/${P}-Fix-underquoting-in-configure-ac.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/, app-crypt/tpm2-tss/files/
@ 2021-06-10 8:13 Joonas Niilola
0 siblings, 0 replies; 13+ messages in thread
From: Joonas Niilola @ 2021-06-10 8:13 UTC (permalink / raw
To: gentoo-commits
commit: 9dc0747ba3c29a85b7ab3dede90ac9b39f29e438
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Sat May 22 01:11:37 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jun 10 08:13:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dc0747b
app-crypt/tpm2-tss: Remove old
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20918
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-crypt/tpm2-tss/Manifest | 2 -
...0.0-Dont-run-systemd-sysusers-in-Makefile.patch | 16 -----
...ss-3.0.1-Fix-underquoting-in-configure-ac.patch | 22 -------
app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild | 77 ----------------------
app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild | 76 ---------------------
5 files changed, 193 deletions(-)
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 24f31fe276b..bcc65f26237 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,5 +1,3 @@
-DIST tpm2-tss-2.4.3.tar.gz 1439120 BLAKE2B 21acce29f96e8039124874c024b43eb8d2c4ffda27db58bb4f34446747c0fa6953c6ca390f8e87d22c1349123bada81051b119eaf7a28c7d1ad8a9195287c312 SHA512 4adaeb2724b720017e9d488f66de879ebdc0dbc2a4f7536493214913a49d2c631e302be26f710f0f45b0d514212cb036ca7ba9715ee13c29dda1d4a61595aa27
DIST tpm2-tss-2.4.5.tar.gz 1439394 BLAKE2B 644d917f545e93dd81856611522329caf4ff038e4ddb04d761f03339cc7308095abc1c9b46a4d601cad67deea6f917ee5e4236c59f3d7042a7fdf2d33630dd3f SHA512 2c92af07ed1cc3665c19479c00ce5608883081f311192a264a4f7d9119c75ac582596c53b910534c4b66dbb60de2ffd3d6218169748332609c2e0fc89f519259
DIST tpm2-tss-2.4.6.tar.gz 1472883 BLAKE2B e007de07c759e77e377f8569c0c5d94ab57597ea3cb452fb598a47c9b404714a7816c86221d4eacad962436fc7625066d4066f433cd957c37b92d51b0455e2a0 SHA512 f7f7f067605ea30661ac891e22095238689856e22e45f11a6b603cb36ed1ae0724ae52d36f0ee5dd72208da8520457667676ae08107647faa5441a0c9b642f7a
-DIST tpm2-tss-3.0.3.tar.gz 1489136 BLAKE2B 5bf24cf2c36e579388f62eea06ab3811eab1a89c0cd5d12f6f61cee7f6836487f25fefb864432ff8920931ff37327ca867d1d40fad89e0305d5e1edfb8f0e883 SHA512 54a926db55790250d69c81ac6e436556072057dd7c610d2718689030287dee69d533d4e04b3325dd73d9fc7635dad0bf0a7bfb082957bb51cb420efdb68efaf8
DIST tpm2-tss-3.1.0.tar.gz 1584690 BLAKE2B cee2807a030b8bab653045cb11dfc7a6a3f7b1e60c1ce4650ba5f0549f29f36ff307e7d53fb5ef9c950b4dae720bdaf35f7cd1e59ebc07b3f16740035e1d5738 SHA512 8967f172c92f1e3e5ba324dbe8afe07bf1bc7179dd755cef9812105f32634f312ee7cc7dfe8e13af69dc219432463f5dc9b93477743de47aba6af1d70b252405
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch
deleted file mode 100644
index fd1d462151f..00000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index f2fa515a..7d2aca29 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -664,11 +664,6 @@ endif #FAPI
- EXTRA_DIST += dist/tpm-udev.rules
-
- install-dirs:
--if HOSTOS_LINUX
-- (systemd-sysusers && systemd-tmpfiles --create) || \
-- ($(call make_tss_user_and_group) && $(call make_fapi_dirs) && ($call set_fapi_permissions)) || true
-- $(call check_fapi_dirs)
--endif
-
- install-data-hook: install-dirs
- -if [ ! -z "$(udevrulesprefix)" ]; then \
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch
deleted file mode 100644
index a593716c97e..00000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index ff59dd7c..3049032b 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -285,7 +285,7 @@ AC_ARG_ENABLE([integration],
- [build and execute integration tests])],,
- [enable_integration=no])
- AS_IF([test "x$enable_integration" = "xyes"],
-- AS_IF([test "$HOSTOS" = "Linux"],
-+ [AS_IF([test "$HOSTOS" = "Linux"],
- [ERROR_IF_NO_PROG([ss])],
- [ERROR_IF_NO_PROG([sockstat])])
- ERROR_IF_NO_PROG([echo])
-@@ -335,7 +335,7 @@ AS_IF([test "x$enable_integration" = "xyes"],
- [AC_MSG_ERROR([No simulator executable found in PATH for testing TCTI.])])
- AC_SUBST([INTEGRATION_TCTI], [$integration_tcti])
- AC_SUBST([INTEGRATION_ARGS], [$integration_args])
-- AC_SUBST([ENABLE_INTEGRATION], [$enable_integration]))
-+ AC_SUBST([ENABLE_INTEGRATION], [$enable_integration])])
- AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
- #
- # sanitizer compiler flags
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild
deleted file mode 100644
index 011fcaefd4a..00000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info tmpfiles 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"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="doc +fapi gcrypt +openssl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( gcrypt openssl )
- fapi? ( openssl !gcrypt )"
-
-RDEPEND="acct-group/tss
- acct-user/tss
- fapi? (
- dev-libs/json-c
- net-misc/curl
- )
- gcrypt? ( dev-libs/libgcrypt:0= )
- openssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
- test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.4.2-Dont-run-systemd-sysusers-in-Makefile.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() {
- econf \
- --localstatedir=/var \
- $(use_enable doc doxygen-doc) \
- $(use_enable fapi) \
- $(use_enable static-libs static) \
- $(use_enable test unit) \
- --disable-tcti-mssim \
- --disable-defaultflags \
- --disable-weakcrypto \
- --with-crypto="$(usex gcrypt gcrypt ossl)" \
- --with-runstatedir=/run \
- --with-udevrulesdir="$(get_udevdir)/rules.d" \
- --with-udevrulesprefix=60- \
- --with-sysusersdir="/usr/lib/sysusers.d" \
- --with-tmpfilesdir="/usr/lib/tmpfiles.d"
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- tmpfiles_process tpm2-tss-fapi.conf
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild
deleted file mode 100644
index a5458854763..00000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info tmpfiles 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"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="doc +fapi +openssl mbedtls static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( mbedtls openssl )
- fapi? ( openssl !mbedtls )"
-
-RDEPEND="acct-group/tss
- acct-user/tss
- fapi? ( dev-libs/json-c
- net-misc/curl )
- mbedtls? ( net-libs/mbedtls:= )
- openssl? ( dev-libs/openssl:= )"
-DEPEND="${RDEPEND}
- test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch"
- "${FILESDIR}/${PN}-3.0.1-Fix-underquoting-in-configure-ac.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() {
- econf \
- --localstatedir=/var \
- $(use_enable doc doxygen-doc) \
- $(use_enable fapi) \
- $(use_enable static-libs static) \
- $(use_enable test unit) \
- --disable-tcti-mssim \
- --disable-defaultflags \
- --disable-weakcrypto \
- --with-crypto="$(usex mbedtls mbed ossl)" \
- --with-runstatedir=/run \
- --with-udevrulesdir="$(get_udevdir)/rules.d" \
- --with-udevrulesprefix=60- \
- --with-sysusersdir="/usr/lib/sysusers.d" \
- --with-tmpfilesdir="/usr/lib/tmpfiles.d"
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- tmpfiles_process tpm2-tss-fapi.conf
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/, app-crypt/tpm2-tss/files/
@ 2022-12-21 23:37 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2022-12-21 23:37 UTC (permalink / raw
To: gentoo-commits
commit: 9729ee777cebe423731bbbbab153a2ffae660d8d
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Tue Dec 13 19:09:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 23:35:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9729ee77
app-crypt/tpm2-tss: drop 3.2.0-r3
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28655
Signed-off-by: Sam James <sam <AT> gentoo.org>
...1.0-Dont-run-systemd-sysusers-in-Makefile.patch | 29 ------
app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild | 102 ---------------------
2 files changed, 131 deletions(-)
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch
deleted file mode 100644
index b66b6e79c143..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 183289f7..c791896c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -689,24 +689,6 @@ endif #FAPI
- EXTRA_DIST += dist/tpm-udev.rules
-
- install-dirs:
--if HOSTOS_LINUX
--if SYSD_SYSUSERS
-- @echo "systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf"
-- @systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf || echo "WARNING Failed to create the tss user and group"
--else
-- @echo "call make_tss_user_and_group"
-- @$(call make_tss_user_and_group) || echo "WARNING Failed to create the tss user and group"
--endif
--if SYSD_TMPFILES
-- @echo "systemd-tmpfiles --create $(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf"
-- @systemd-tmpfiles --create $(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf|| echo "WARNING Failed to create the FAPI directories with the correct permissions"
--else
-- @echo "(call make_fapi_dirs) && (call set_fapi_permissions)"
-- @-$(call make_fapi_dirs) && $(call set_fapi_permissions) || echo "WARNING Failed to create the FAPI directories with the correct permissions"
--endif
-- @echo "call check_fapi_dirs"
-- @$(call check_fapi_dirs)
--endif
-
- install-data-hook: install-dirs
- -if [ ! -z "$(udevrulesprefix)" ]; then \
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild
deleted file mode 100644
index 6b9f088e71d1..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles 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/3"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-IUSE="doc +fapi +openssl mbedtls static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( mbedtls openssl )
- fapi? ( openssl !mbedtls )"
-
-RDEPEND="acct-group/tss
- acct-user/tss
- fapi? ( dev-libs/json-c:=[${MULTILIB_USEDEP}]
- >=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] )
- mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
- openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
- test? ( app-crypt/swtpm
- dev-libs/uthash
- dev-util/cmocka
- fapi? ( >=net-misc/curl-7.80.0 ) )"
-BDEPEND="sys-apps/acl
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.1.0-Dont-run-systemd-sysusers-in-Makefile.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
-
- # See bug #833887 (and similar); eautoreconf means .pc file gets wrong version.
- sed -i \
- "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
- "configure.ac" || die
-
- eautoreconf
-}
-
-multilib_src_configure() {
- # tests fail with LTO enabbled. See bug 865275 and 865279
- filter-lto
-
- ECONF_SOURCE=${S} econf \
- --localstatedir=/var \
- $(multilib_native_use_enable doc doxygen-doc) \
- $(use_enable fapi) \
- $(use_enable static-libs static) \
- $(multilib_native_use_enable test unit) \
- $(multilib_native_use_enable test integration) \
- $(multilib_native_use_enable test self-generated-certificate) \
- --disable-tcti-libtpms \
- --disable-defaultflags \
- --disable-weakcrypto \
- --with-crypto="$(usex mbedtls mbed ossl)" \
- --with-runstatedir=/run \
- --with-udevrulesdir="$(get_udevdir)/rules.d" \
- --with-udevrulesprefix=60- \
- --with-sysusersdir="/usr/lib/sysusers.d" \
- --with-tmpfilesdir="/usr/lib/tmpfiles.d"
-}
-
-multilib_src_install() {
- default
-
- if [[ ${PV} != $(sed -n -e 's/^Version: //p' "${ED}/usr/$(get_libdir)/pkgconfig/tss2-sys.pc" || die) ]] ; then
- # Safeguard for bug #833887
- die "pkg-config file version doesn't match ${PV}! Please report a bug!"
- fi
-
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- tmpfiles_process tpm2-tss-fapi.conf
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/, app-crypt/tpm2-tss/files/
@ 2023-06-27 9:42 David Seifert
0 siblings, 0 replies; 13+ messages in thread
From: David Seifert @ 2023-06-27 9:42 UTC (permalink / raw
To: gentoo-commits
commit: e4ede124b4acd0e235ea0ad0087456851a10d845
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Tue Jun 27 09:42:24 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 09:42:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4ede124
app-crypt/tpm2-tss: Fix leftover "imageno" directory
Closes: https://github.com/gentoo/gentoo/pull/31444
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
...4.0.1-Make-sysusers-and-tmpfiles-optional.patch | 50 ++++++++++++++++++++++
app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild | 1 +
2 files changed, 51 insertions(+)
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Make-sysusers-and-tmpfiles-optional.patch b/app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Make-sysusers-and-tmpfiles-optional.patch
new file mode 100644
index 000000000000..d93fcf9ef2d6
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Make-sysusers-and-tmpfiles-optional.patch
@@ -0,0 +1,50 @@
+From 75f53cf7eab591870ce735203995d01d2f577187 Mon Sep 17 00:00:00 2001
+From: Christopher Byrne <salah.coronya@gmail.com>
+Date: Tue, 13 Jun 2023 21:40:56 -0500
+Subject: [PATCH] configure.ac: Make sysusers and tmpfiles optional
+
+Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
+---
+ Makefile.am | 6 +++++-
+ configure.ac | 4 ++--
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 2c81cfa9..98965fa7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -563,10 +563,14 @@ fapi-config.json: dist/fapi-config.json.in
+ -e 's|[@]sysmeasurements@|$(sysmeasurements)|g' \
+ < "$<" > "$@"
+
++if SYSD_SYSUSERS
+ sysusers_DATA = dist/sysusers.d/tpm2-tss.conf
+-tmpfiles_DATA = tpm2-tss-fapi.conf
++endif
+
++if SYSD_TMPFILES
++tmpfiles_DATA = tpm2-tss-fapi.conf
+ CLEANFILES += tpm2-tss-fapi.conf
++endif
+
+ # We have to do this ourselves, in order to get absolute paths
+ tpm2-tss-fapi.conf: dist/tmpfiles.d/tpm2-tss-fapi.conf.in
+diff --git a/configure.ac b/configure.ac
+index b6550278..2d478147 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -550,9 +550,9 @@ AS_IF([test "x$enable_integration" = "xyes" && test "x$enable_self_generated_cer
+
+ # Check for systemd helper tools used by make install
+ AC_CHECK_PROG(systemd_sysusers, systemd-sysusers, yes)
+-AM_CONDITIONAL(SYSD_SYSUSERS, test "x$systemd_sysusers" = "xyes")
++AM_CONDITIONAL([SYSD_SYSUSERS], [test "x$systemd_sysusers" = "xyes" && test "x$sysusersdir" != "xno"])
+ AC_CHECK_PROG(systemd_tmpfiles, systemd-tmpfiles, yes)
+-AM_CONDITIONAL(SYSD_TMPFILES, test "x$systemd_tmpfiles" = "xyes")
++AM_CONDITIONAL([SYSD_TMPFILES], [test "x$systemd_tmpfiles" = "xyes" && test "x$tmpfilesdir" != "xno"])
+
+ # Check all tools used by make install
+ AS_IF([test "$HOSTOS" = "Linux" && test "x$systemd_sysusers" != "xyes"],
+--
+2.39.3
+
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild
index a9dd55409584..3e27adc524f7 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild
@@ -39,6 +39,7 @@ BDEPEND="sys-apps/acl
PATCHES=(
"${FILESDIR}/${PN}-4.0.0-Dont-install-files-into-run.patch"
+ "${FILESDIR}/${PN}-4.0.1-Make-sysusers-and-tmpfiles-optional.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/, app-crypt/tpm2-tss/files/
@ 2024-03-08 18:28 Michał Górny
0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2024-03-08 18:28 UTC (permalink / raw
To: gentoo-commits
commit: c4911ac3943c60832bce5210e5839f326db707d5
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Fri Mar 8 02:17:31 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 8 18:28:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4911ac3
app-crypt/tpm2-tss: Don't fail tmpfiles_process where /sys is restricted
Closes: https://bugs.gentoo.org/893636
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35661
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
...sider-failures-to-write-files-in-sys-hard.patch | 27 +++++
app-crypt/tpm2-tss/tpm2-tss-4.0.1-r1.ebuild | 109 +++++++++++++++++++++
2 files changed, 136 insertions(+)
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Do-not-consider-failures-to-write-files-in-sys-hard.patch b/app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Do-not-consider-failures-to-write-files-in-sys-hard.patch
new file mode 100644
index 000000000000..83f123ffdc52
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Do-not-consider-failures-to-write-files-in-sys-hard.patch
@@ -0,0 +1,27 @@
+From 0632885d08917092ffc8d98febd158745a74465a Mon Sep 17 00:00:00 2001
+From: Daan De Meyer <daan.j.demeyer@gmail.com>
+Date: Fri, 4 Aug 2023 16:07:52 +0200
+Subject: [PATCH] Do not consider failures to write files in /sys hard errors
+
+systemd-tmpfiles can run in containers, chroots, ... where writing to /sys will fail, so let's suffix these lines with "-" to avoid considering these cases hard errors.
+
+Signed-off-by: Daan De Meyer <daan.j.demeyer@gmail.com>
+---
+ dist/tmpfiles.d/tpm2-tss-fapi.conf.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dist/tmpfiles.d/tpm2-tss-fapi.conf.in b/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
+index 7ea3c652..51ff78e5 100644
+--- a/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
++++ b/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
+@@ -3,5 +3,5 @@ d @localstatedir@/lib/tpm2-tss/system/keystore 2775 tss tss -
+ a+ @localstatedir@/lib/tpm2-tss/system/keystore - - - - default:group:tss:rwx
+ d @runstatedir@/tpm2-tss/eventlog 2775 tss tss - -
+ a+ @runstatedir@/tpm2-tss/eventlog - - - - default:group:tss:rwx
+-z /sys/kernel/security/tpm[0-9]/binary_bios_measurements 0440 root tss - -
+-z /sys/kernel/security/ima/binary_runtime_measurements 0440 root tss - -
++z- /sys/kernel/security/tpm[0-9]/binary_bios_measurements 0440 root tss - -
++z- /sys/kernel/security/ima/binary_runtime_measurements 0440 root tss - -
+--
+2.43.0
+
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.1-r1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..558f221a5be8
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-4.0.1-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles 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/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="doc +fapi +openssl mbedtls +policy static-libs test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+ ^^ ( mbedtls openssl )
+ fapi? ( openssl !mbedtls )
+ policy? ( openssl !mbedtls )
+"
+
+RDEPEND="
+ acct-group/tss
+ acct-user/tss
+ sys-apps/util-linux:=[${MULTILIB_USEDEP}]
+ fapi? (
+ dev-libs/json-c:=[${MULTILIB_USEDEP}]
+ >=net-misc/curl-7.80.0[${MULTILIB_USEDEP}]
+ )
+ mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+ openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="
+ ${RDEPEND}
+ test? ( app-crypt/swtpm
+ dev-libs/uthash
+ dev-util/cmocka
+ fapi? ( >=net-misc/curl-7.80.0 ) )
+"
+
+BDEPEND="
+ sys-apps/acl
+ virtual/pkgconfig
+ doc? ( app-text/doxygen )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.0-Dont-install-files-into-run.patch"
+ "${FILESDIR}/${PN}-4.0.1-Make-sysusers-and-tmpfiles-optional.patch"
+ "${FILESDIR}/${PN}-4.0.1-Do-not-consider-failures-to-write-files-in-sys-hard.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
+}
+
+multilib_src_configure() {
+ # Fails with inlining
+ filter-flags -fno-semantic-interposition
+ # tests fail with LTO enabbled. See bug 865275 and 865279
+ filter-lto
+
+ local myconf=(
+ --localstatedir=/var
+ $(multilib_native_use_enable doc doxygen-doc)
+ $(use_enable fapi)
+ $(use_enable policy)
+ $(use_enable static-libs static)
+ $(multilib_native_use_enable test unit)
+ $(multilib_native_use_enable test integration)
+ $(multilib_native_use_enable test self-generated-certificate)
+ --disable-tcti-libtpms
+ --disable-defaultflags
+ --disable-weakcrypto
+ --with-crypto="$(usex mbedtls mbed ossl)"
+ --with-runstatedir=/run
+ --with-udevrulesdir="$(get_udevdir)/rules.d"
+ --with-udevrulesprefix=60-
+ --without-sysusersdir
+ --with-tmpfilesdir="/usr/lib/tmpfiles.d"
+ )
+
+ ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+ default
+ keepdir /var/lib/tpm2-tss/system/keystore
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ tmpfiles_process tpm2-tss-fapi.conf
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/, app-crypt/tpm2-tss/files/
@ 2024-05-22 17:11 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-05-22 17:11 UTC (permalink / raw
To: gentoo-commits
commit: f425b156d1ce0e2607795ee14facd8fb98e4642b
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Wed May 22 16:44:59 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 22 17:10:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f425b156
app-crypt/tpm2-tss: Hide write_all symbol to fix tpm2-abrmd crash on clang/lld
Closes: https://bugs.gentoo.org/923411
Closes: https://bugs.gentoo.org/923412
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36777
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../tpm2-tss-4.0.2-Hide-write-all-function.patch | 24 +++++
app-crypt/tpm2-tss/tpm2-tss-4.0.2-r1.ebuild | 110 +++++++++++++++++++++
2 files changed, 134 insertions(+)
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-4.0.2-Hide-write-all-function.patch b/app-crypt/tpm2-tss/files/tpm2-tss-4.0.2-Hide-write-all-function.patch
new file mode 100644
index 000000000000..bd682df53bac
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-4.0.2-Hide-write-all-function.patch
@@ -0,0 +1,24 @@
+diff --git a/src/util/io.c b/src/util/io.c
+index c6446826..50c0fd6c 100644
+--- a/src/util/io.c
++++ b/src/util/io.c
+@@ -81,6 +81,7 @@ read_all (
+ return recvd_total;
+ }
+
++__attribute__ ((visibility("hidden")))
+ ssize_t
+ write_all (
+ SOCKET fd,
+diff --git a/src/util/io.h b/src/util/io.h
+index 25dd5c45..fec391d8 100644
+--- a/src/util/io.h
++++ b/src/util/io.h
+@@ -70,6 +70,7 @@ read_all (
+ * are detected. This is currently limited to interrupted system calls and
+ * short writes.
+ */
++__attribute__ ((visibility("hidden")))
+ ssize_t
+ write_all (
+ SOCKET fd,
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r1.ebuild
new file mode 100644
index 000000000000..1ada848dd5d2
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles 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/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="doc +fapi +openssl mbedtls +policy static-libs test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+ ^^ ( mbedtls openssl )
+ fapi? ( openssl !mbedtls )
+ policy? ( openssl !mbedtls )
+"
+
+RDEPEND="
+ acct-group/tss
+ acct-user/tss
+ sys-apps/util-linux:=[${MULTILIB_USEDEP}]
+ fapi? (
+ dev-libs/json-c:=[${MULTILIB_USEDEP}]
+ >=net-misc/curl-7.80.0[${MULTILIB_USEDEP}]
+ )
+ mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+ openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="
+ ${RDEPEND}
+ test? ( app-crypt/swtpm
+ dev-libs/uthash
+ dev-util/cmocka
+ fapi? ( >=net-misc/curl-7.80.0 ) )
+"
+
+BDEPEND="
+ sys-apps/acl
+ virtual/pkgconfig
+ doc? ( app-text/doxygen )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.2-Dont-install-files-into-run.patch"
+ "${FILESDIR}/${PN}-4.0.1-Make-sysusers-and-tmpfiles-optional.patch"
+ "${FILESDIR}/${PN}-4.0.1-Do-not-consider-failures-to-write-files-in-sys-hard.patch"
+ "${FILESDIR}/${PN}-4.0.2-Hide-write-all-function.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
+}
+
+multilib_src_configure() {
+ # Fails with inlining
+ filter-flags -fno-semantic-interposition
+ # tests fail with LTO enabbled. See bug 865275 and 865279
+ filter-lto
+
+ local myconf=(
+ --localstatedir=/var
+ $(multilib_native_use_enable doc doxygen-doc)
+ $(use_enable fapi)
+ $(use_enable policy)
+ $(use_enable static-libs static)
+ $(multilib_native_use_enable test unit)
+ $(multilib_native_use_enable test integration)
+ $(multilib_native_use_enable test self-generated-certificate)
+ --disable-tcti-libtpms
+ --disable-defaultflags
+ --disable-weakcrypto
+ --with-crypto="$(usex mbedtls mbed ossl)"
+ --with-runstatedir=/run
+ --with-udevrulesdir="$(get_udevdir)/rules.d"
+ --with-udevrulesprefix=60-
+ --without-sysusersdir
+ --with-tmpfilesdir="/usr/lib/tmpfiles.d"
+ )
+
+ ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+ default
+ keepdir /var/lib/tpm2-tss/system/keystore
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ tmpfiles_process tpm2-tss-fapi.conf
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2024-05-22 17:11 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-13 13:17 [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/, app-crypt/tpm2-tss/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2024-05-22 17:11 Sam James
2024-03-08 18:28 Michał Górny
2023-06-27 9:42 David Seifert
2022-12-21 23:37 Sam James
2021-06-10 8:13 Joonas Niilola
2020-11-20 10:12 Joonas Niilola
2020-09-06 5:55 Joonas Niilola
2020-06-17 17:00 Joonas Niilola
2020-05-18 5:00 Jason A. Donenfeld
2019-05-30 23:46 Alon Bar-Lev
2019-01-09 20:12 Alon Bar-Lev
2018-12-30 21:00 Alon Bar-Lev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox