summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalah Coronya <salah.coronya@gmail.com>2020-05-14 21:54:37 -0500
committerConrad Kostecki <conikost@gentoo.org>2020-05-15 23:16:27 +0200
commitf7401276af3d0e6742824a7c63ba3fdbef81fc76 (patch)
treeb40621c816b56ec07afa80fc6fee9c4fd87e99dd
parentapp-crypt/tpm2-tss-engine: Bump to 1.1.0_rc0 (diff)
downloadgentoo-f7401276.tar.gz
gentoo-f7401276.tar.bz2
gentoo-f7401276.zip
app-crypt/tpm2-tss-engine: Remove old
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Salah Coronya <salah.coronya@gmail.com> Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
-rw-r--r--app-crypt/tpm2-tss-engine/Manifest1
-rw-r--r--app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-build-add-disable-defaultflags.patch67
-rw-r--r--app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.0.1.ebuild38
3 files changed, 0 insertions, 106 deletions
diff --git a/app-crypt/tpm2-tss-engine/Manifest b/app-crypt/tpm2-tss-engine/Manifest
index 753f7dd092bc..2e0a573e8a98 100644
--- a/app-crypt/tpm2-tss-engine/Manifest
+++ b/app-crypt/tpm2-tss-engine/Manifest
@@ -1,2 +1 @@
-DIST tpm2-tss-engine-1.0.1.tar.gz 382715 BLAKE2B b33b91bf892509f8ed88bea1ba9611f06c9342726932baebbe918fcd4208f6c4b07710db666261b7676b90feb796746552804553e79ef817c02587504d266f44 SHA512 106fc6aadf0b4b27c3b38be596356aa59b4b76ec1602e8c5564aec6b4be7e2b5d6077006ee13d41e58402255b879aadaa966c758b5b326ae32742007ce2ef238
DIST tpm2-tss-engine-1.1.0_rc0.tar.gz 37583 BLAKE2B 634ebfa23452c32a4643f735d580df2d8fa07ba4c301804d877d1c75cf608ea4ddf634081c16ac71df3e163bea89931c8c91c188834fa5a7d2bbdedb0b39d952 SHA512 967eca63c58218f461b9e2b2a8042229794da6af7b759081f4c7ca1fbfcf16a1dc9a323f87c1383dc894614552babe1db7bc9c69849bd34526317b62879255a2
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 <alon.barlev@gmail.com>
-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 <alon.barlev@gmail.com>
----
- 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
-}