app-crypt/tpm2-abrmd: version bump

Signed-off-by: Alon Bar-Lev <alonbl@gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

4 files changed, 121 insertions, 73 deletions

diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index cee50e664390..d6514ef47456 100644
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -1 +1 @@
-DIST tpm2-abrmd-2.0.3.tar.gz 563029 BLAKE2B 89c20066b05818825a2addacaf123568ec095d021e9811b78d11c336af9a9e97fe280a08b4478331663efd1da9b2db54207ca53728398aefe4407bfe4b0c7efd SHA512 70b431b9d09e1c1db819aabf6ca8e40a7553573339f43a6c872ad685b7822e5046bd8ede25dcd0608ce2d8fa32257f6c1dd7f234aa7d6a447ac795625d4e0fac
+DIST tpm2-abrmd-2.1.1.tar.gz 561352 BLAKE2B 4106811b238fee7b503bf0afb4ed857371bab023d8e449d5864eebb2386779e2bc8fb0f2bf8e334ebd8d7abe5c569f2b2cc2ea60b07672b1d3294092e63c2a5a SHA512 d685812c26a097190ced5a9e8ceb1544eb9e3858606123644d5496031706af91e5ba9fb54eb371bcb4eed4d236617f7a21a49a792196db9c5ebf277582ac7124
diff --git a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch b/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch
deleted file mode 100644
index 07c607579f12..000000000000
--- a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index ecbc3bb..5973ff5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -135,7 +135,6 @@ AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
- #   these macros are defined in m4/flags.m4
- AX_ADD_COMPILER_FLAG([-Wall])
- AX_ADD_COMPILER_FLAG([-Wextra])
--AX_ADD_COMPILER_FLAG([-Werror])
- AX_ADD_COMPILER_FLAG([-std=gnu99])
- AX_ADD_COMPILER_FLAG([-Wformat])
- AX_ADD_COMPILER_FLAG([-Wformat-security])
-@@ -143,19 +142,9 @@ AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
- # work around for Glib usage of function pointers type casting
- #   https://bugzilla.gnome.org/show_bug.cgi?id=793272
- AX_ADD_COMPILER_FLAG([-Wno-cast-function-type])
--AX_ADD_COMPILER_FLAG([-fdata-sections])
--AX_ADD_COMPILER_FLAG([-ffunction-sections])
--AX_ADD_COMPILER_FLAG([-fstack-protector-all])
--AX_ADD_COMPILER_FLAG([-fpic])
--AX_ADD_COMPILER_FLAG([-fPIC])
- AX_ADD_PREPROC_FLAG([-D_GNU_SOURCE])
- AX_ADD_PREPROC_FLAG([-U_FORTIFY_SOURCE])
- AX_ADD_PREPROC_FLAG([-D_FORTIFY_SOURCE=2])
--AX_ADD_LINK_FLAG([-Wl,--gc-sections])
--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])
- 
-From 353c5e962f46e3739b1e92cbf6b1f3eb500157fc Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Thu, 17 Jan 2019 23:56:50 +0200
-Subject: [PATCH] tests: run without X
-
-Solves:
-
-$ DISPLAY= make check
-
-FAIL: test/tss2-tcti-tabrmd_unit
-
-** (process:17633): CRITICAL **: 23:53:22.403: failed to allocate dbus proxy object:
-Error spawning command line ?dbus-launch --autolaunch=4f9189e347d5cdf343
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
-
-https://github.com/tpm2-software/tpm2-abrmd/pull/577
----
- .travis.yml | 2 +-
- Makefile.am | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index b32a5fb..2598f13 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -76,7 +76,8 @@ XFAIL_TESTS = \
- TEST_EXTENSIONS = .int
- AM_TESTS_ENVIRONMENT = \
-     TEST_FUNC_LIB=$(srcdir)/scripts/int-test-funcs.sh \
--    PATH=./src:$(PATH)
-+    PATH=./src:$(PATH) \
-+    dbus-launch
- INT_LOG_COMPILER = $(srcdir)/scripts/int-test-setup.sh
- INT_LOG_FLAGS = --tabrmd-tcti=$(TABRMD_TCTI)
- 
--- 
-2.19.2
-
diff --git a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch b/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch
new file mode 100644
index 000000000000..e58bb7f72ef5
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch
@@ -0,0 +1,118 @@
+From a0a961c05c8916863a67a61f469c717f617e1c58 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 31 May 2019 01:03:03 +0300
+Subject: [PATCH 1/2] build: let autoconf detect system extensions
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+https://github.com/tpm2-software/tpm2-abrmd/pull/632
+
+diff --git a/configure.ac b/configure.ac
+index 35a0c21..0cc8ce8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,6 +7,7 @@ AC_INIT([tpm2-abrmd],
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_PROG_CC
+ AC_PROG_LN_S
++AC_USE_SYSTEM_EXTENSIONS
+ LT_INIT()
+ PKG_INSTALLDIR()
+ AM_INIT_AUTOMAKE([foreign subdir-objects])
+@@ -151,9 +152,6 @@ AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all])
+ AX_ADD_COMPILER_FLAG([-fpic])
+ AX_ADD_COMPILER_FLAG([-fPIC])
+ AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5])
+-AX_ADD_PREPROC_FLAG([-D_GNU_SOURCE])
+-AX_ADD_PREPROC_FLAG([-U_FORTIFY_SOURCE])
+-AX_ADD_PREPROC_FLAG([-D_FORTIFY_SOURCE=2])
+ AX_ADD_LINK_FLAG([-Wl,--gc-sections])
+ AX_ADD_LINK_FLAG([-Wl,--no-undefined])
+ AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
+-- 
+2.21.0
+
+From 977de33fe1499e7e8fa25f4c1247aaf9b71ba3a2 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 31 May 2019 01:03:08 +0300
+Subject: [PATCH 2/2] build: add --disable-defaultflags
+
+Align with other tpm2 build systems.
+Enable downstream to override flags.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac | 54 ++++++++++++++++++++++++++++++----------------------
+ 1 file changed, 31 insertions(+), 23 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0cc8ce8..dc32b09 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -134,29 +134,37 @@ AS_IF([test \( "x$enable_integration" = "xyes" \) -a \( "x$enable_test_hwtpm" =
+     [AC_MSG_NOTICE([Integration tests will be executed against the TPM device.])])
+ AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
+ 
+-# preprocessor / compiler / linker flags
+-#   these macros are defined in m4/flags.m4
+-AX_ADD_COMPILER_FLAG([-Wall])
+-AX_ADD_COMPILER_FLAG([-Wextra])
+-AX_ADD_COMPILER_FLAG([-Werror])
+-AX_ADD_COMPILER_FLAG([-std=gnu99])
+-AX_ADD_COMPILER_FLAG([-Wformat])
+-AX_ADD_COMPILER_FLAG([-Wformat-security])
+-AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
+-# work around for Glib usage of function pointers type casting
+-#   https://bugzilla.gnome.org/show_bug.cgi?id=793272
+-AX_ADD_COMPILER_FLAG([-Wno-cast-function-type])
+-AX_ADD_COMPILER_FLAG([-fdata-sections])
+-AX_ADD_COMPILER_FLAG([-ffunction-sections])
+-AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all])
+-AX_ADD_COMPILER_FLAG([-fpic])
+-AX_ADD_COMPILER_FLAG([-fPIC])
+-AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5])
+-AX_ADD_LINK_FLAG([-Wl,--gc-sections])
+-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"],
++      [
++      # preprocessor / compiler / linker flags
++      #   these macros are defined in m4/flags.m4
++      AX_ADD_COMPILER_FLAG([-Wall])
++      AX_ADD_COMPILER_FLAG([-Wextra])
++      AX_ADD_COMPILER_FLAG([-Werror])
++      AX_ADD_COMPILER_FLAG([-std=gnu99])
++      AX_ADD_COMPILER_FLAG([-Wformat])
++      AX_ADD_COMPILER_FLAG([-Wformat-security])
++      AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
++      # work around for Glib usage of function pointers type casting
++      #   https://bugzilla.gnome.org/show_bug.cgi?id=793272
++      AX_ADD_COMPILER_FLAG([-Wno-cast-function-type])
++      AX_ADD_COMPILER_FLAG([-fdata-sections])
++      AX_ADD_COMPILER_FLAG([-ffunction-sections])
++      AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all])
++      AX_ADD_COMPILER_FLAG([-fpic])
++      AX_ADD_COMPILER_FLAG([-fPIC])
++      AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5])
++      AX_ADD_LINK_FLAG([-Wl,--gc-sections])
++      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])
+ 
+-- 
+2.21.0
+
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.0.3.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild
index 8a2bb55ac659..8d21d2b9b4c7 100644
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.0.3.ebuild
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.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
@@ -40,6 +40,7 @@ src_configure() {
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable test unit) \
+		--disable-defaultflags \
 		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
 		--with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
 		--with-systemdpresetdisable \