From 55d5d568d0ef0c2a5d4f136906104d2654afb0c0 Mon Sep 17 00:00:00 2001 From: Salah Coronya Date: Wed, 19 Feb 2020 20:06:07 -0600 Subject: app-crypt/tpm2-tss-engine: Remove libressl support Libressl dropped all engine support in 2.3.0 . Closes: https://bugs.gentoo.org/692558 Closes: https://bugs.gentoo.org/687132 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Salah Coronya Signed-off-by: Joonas Niilola --- ...gine-1.0.1-build-add-disable-defaultflags.patch | 67 +++++++++++++++++++++ .../files/tpm2-tss-engine-1.0.1-build.patch | 70 ---------------------- .../files/tpm2-tss-engine-1.0.1-libressl.patch | 35 ----------- .../tpm2-tss-engine/tpm2-tss-engine-1.0.1.ebuild | 8 +-- 4 files changed, 70 insertions(+), 110 deletions(-) create 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/files/tpm2-tss-engine-1.0.1-build.patch delete mode 100644 app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-libressl.patch (limited to 'app-crypt/tpm2-tss-engine') 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 new file mode 100644 index 000000000000..7556a80600da --- /dev/null +++ b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-build-add-disable-defaultflags.patch @@ -0,0 +1,67 @@ +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/files/tpm2-tss-engine-1.0.1-build.patch b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-build.patch deleted file mode 100644 index aa2b2e4e4fd3..000000000000 --- a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-build.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 92aee12fbd246461a22925dd054c4d6394c4fdf5 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Fri, 31 May 2019 02:30:37 +0300 -Subject: [PATCH] build: add --disable-defaultflags - -Align with tpm2-tss to allow downstream to provide flags. - -Signed-off-by: Alon Bar-Lev ---- - configure.ac | 42 +++++++++++++++++++++++++----------------- - 1 file changed, 25 insertions(+), 17 deletions(-) - -https://github.com/tpm2-software/tpm2-tss-engine/pull/117 - -diff --git a/configure.ac b/configure.ac -index f3a399c..f59cfaf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -80,23 +80,31 @@ AS_IF([test "x$enable_tctienvvar" = xyes], [AC_DEFINE([ENABLE_TCTIENVVAR], [1])] - - 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=$enableval], -+ [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.21.0 - diff --git a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-libressl.patch b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-libressl.patch deleted file mode 100644 index 66bb68e76940..000000000000 --- a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.0.1-libressl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From deb2b6697babf99aaf3f64b342ce414b48638ea3 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Fri, 31 May 2019 20:36:47 +0300 -Subject: [PATCH] build: libressl fix incomplete type -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -src/tpm2-tss-engine-rand.c:90:1: error: variable ‘rand_methods’ has initializer but incomplete type - 90 | static RAND_METHOD rand_methods = { - | ^~~~~~ -src/tpm2-tss-engine-rand.c:91:5: warning: excess elements in struct initializer - -Signed-off-by: Alon Bar-Lev ---- - src/tpm2-tss-engine-rand.c | 1 + - 1 file changed, 1 insertion(+) - -https://github.com/tpm2-software/tpm2-tss-engine/pull/120 - -diff --git a/src/tpm2-tss-engine-rand.c b/src/tpm2-tss-engine-rand.c -index 50d5661..86980a5 100644 ---- a/src/tpm2-tss-engine-rand.c -+++ b/src/tpm2-tss-engine-rand.c -@@ -32,6 +32,7 @@ - #include - - #include -+#include - - #include - #include --- -2.21.0 - 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 index f1b1b5c2ca02..8bdced04657f 100644 --- 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 @@ -12,19 +12,17 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.ta LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" -IUSE="libressl test" +IUSE="test" RESTRICT="!test? ( test )" RDEPEND=">=app-crypt/tpm2-tss-2.2.2:= - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" + dev-libs/openssl:0" DEPEND="${RDEPEND} test? ( dev-util/cmocka )" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}/${P}-build.patch" - "${FILESDIR}/${P}-libressl.patch" + "${FILESDIR}/${P}-build-add-disable-defaultflags.patch" ) src_prepare() { -- cgit v1.2.3-65-gdbad