From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 May 2020 11:44:06 +0100 Subject: gentoo resync : 30.05.2020 --- app-crypt/tpm2-tss-engine/Manifest | 5 +- ...gine-1.0.1-build-add-disable-defaultflags.patch | 67 ---------------------- .../tpm2-tss-engine/tpm2-tss-engine-1.0.1.ebuild | 38 ------------ .../tpm2-tss-engine-1.1.0_rc0.ebuild | 45 +++++++++++++++ 4 files changed, 47 insertions(+), 108 deletions(-) delete mode 100644 app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-build-add-disable-defaultflags.patch delete mode 100644 app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.1.ebuild create mode 100644 app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0_rc0.ebuild (limited to 'app-crypt/tpm2-tss-engine') diff --git a/app-crypt/tpm2-tss-engine/Manifest b/app-crypt/tpm2-tss-engine/Manifest index 9ce542e4cf92..8461ef3f202d 100644 --- a/app-crypt/tpm2-tss-engine/Manifest +++ b/app-crypt/tpm2-tss-engine/Manifest @@ -1,4 +1,3 @@ -AUX tpm2-tss-engine-1.0.1-build-add-disable-defaultflags.patch 2205 BLAKE2B 59d04d10159899a453204a4812d768d78cba86b2ca649692d105107790a157fb6bf32fe202ede43a4c57437f87ee7d8c5917d6493386841e9c8574b86db93882 SHA512 d1e97ec52a459da7de3e53797cfac118230da90988a8112d7118c084a85cd04f6f3b8053d2fcae9bf3b819f4ab5ac3cd04d74cd4c8a7c7c725c0547436bfb045 -DIST tpm2-tss-engine-1.0.1.tar.gz 382715 BLAKE2B b33b91bf892509f8ed88bea1ba9611f06c9342726932baebbe918fcd4208f6c4b07710db666261b7676b90feb796746552804553e79ef817c02587504d266f44 SHA512 106fc6aadf0b4b27c3b38be596356aa59b4b76ec1602e8c5564aec6b4be7e2b5d6077006ee13d41e58402255b879aadaa966c758b5b326ae32742007ce2ef238 -EBUILD tpm2-tss-engine-1.0.1.ebuild 750 BLAKE2B 76b054f7a11d9ab8093d5a119a55a6822b92ed2108713dfb23193df1fa8d17ba196e39b1c97bd8f77f9bfee4485fb0c867b3b91a7cce18d0c530dea36c2a5e05 SHA512 49a0b8e9661ebe6af52f093ad80e9f92cac5d9b5a0dbeaae8a62723dbe3b2a60a4f9d2cda4de0d8e7432bfbb48f924e0c9842f2f19ac5f1d588a91797971711d +DIST tpm2-tss-engine-1.1.0_rc0.tar.gz 37583 BLAKE2B 634ebfa23452c32a4643f735d580df2d8fa07ba4c301804d877d1c75cf608ea4ddf634081c16ac71df3e163bea89931c8c91c188834fa5a7d2bbdedb0b39d952 SHA512 967eca63c58218f461b9e2b2a8042229794da6af7b759081f4c7ca1fbfcf16a1dc9a323f87c1383dc894614552babe1db7bc9c69849bd34526317b62879255a2 +EBUILD tpm2-tss-engine-1.1.0_rc0.ebuild 877 BLAKE2B e4c94cd2a0ae1d384d184a6e61b0aca663486ac575c082c479034274b4ce3d60843c543bdfeaae6ee45115e370b4850cd67e7f85349c109afb4a39e5c54936cf SHA512 415b82124ab4285c6fa3ab8fb3158f2c2100447dd80c82eec3389be3937496d8a4f43ed96da8f62d9154bdc332b5a37f0be774daee5728ce38a8bd45ace74c11 MISC metadata.xml 463 BLAKE2B 7e0574fa7ade812b4a7176f30d0218a70e0396f2c76ccaedac3cc50ffd0aca7581f7b6075ee98828634d7f3b6b7af63059bfed2eab84b52fce418ee787e237be SHA512 b6d0746d2806d1e1f2a741b5ccd97abfc74e6fd8562796175a900ebf28244d8b3a8a1d9cc4bcd70cf51abd66eb180594f972e03c68deed57fa0023d726b6227b diff --git a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-build-add-disable-defaultflags.patch b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-build-add-disable-defaultflags.patch deleted file mode 100644 index 7556a80600da..000000000000 --- a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-build-add-disable-defaultflags.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 56cc4110e1ef0667ff248a689c50803c2ec4312b Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Fri, 31 May 2019 02:30:37 +0300 -Subject: [PATCH 2/3] build: add --disable-defaultflags - -Align with tpm2-tss to allow downstream to provide flags. - -Signed-off-by: Alon Bar-Lev ---- - configure.ac | 41 ++++++++++++++++++++++++----------------- - 1 file changed, 24 insertions(+), 17 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d14c4d7..3ee45c5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -84,23 +84,30 @@ AC_ARG_ENABLE([tctienvvar], - - 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=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.24.1 - diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.1.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.1.ebuild deleted file mode 100644 index 8bdced04657f..000000000000 --- a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 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="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=app-crypt/tpm2-tss-2.2.2:= - dev-libs/openssl:0" -DEPEND="${RDEPEND} - test? ( dev-util/cmocka )" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-build-add-disable-defaultflags.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable test unit) \ - --disable-defaultflags \ - --disable-static -} diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0_rc0.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0_rc0.ebuild new file mode 100644 index 000000000000..48317f9f77c1 --- /dev/null +++ b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0_rc0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools bash-completion-r1 + +MY_PV="${PV/_/-}" + +DESCRIPTION="OpenSSL Engine for TPM2 devices" +HOMEPAGE="https://github.com/tpm2-software/tpm2-tools" +SRC_URI="https://github.com/tpm2-software/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="app-crypt/tpm2-tss + dev-libs/openssl:0=" +DEPEND="${RDEPEND} + test? ( dev-util/cmocka )" +BDEPEND="sys-devel/autoconf-archive + virtual/pkgconfig" +S="${WORKDIR}/${PN}-${MY_PV}" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable test unit) \ + --disable-defaultflags \ + --disable-static \ + --with-completionsdir="$(get_bashcompdir)" + +} + +src_install () { + default + dobashcomp bash-completion/* +} -- cgit v1.2.3