summaryrefslogtreecommitdiff
path: root/app-crypt/tpm2-abrmd
diff options
context:
space:
mode:
Diffstat (limited to 'app-crypt/tpm2-abrmd')
-rw-r--r--app-crypt/tpm2-abrmd/Manifest6
-rw-r--r--app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch71
-rw-r--r--app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch118
-rw-r--r--app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild (renamed from app-crypt/tpm2-abrmd/tpm2-abrmd-2.0.3.ebuild)3
4 files changed, 123 insertions, 75 deletions
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index 1f98875df8bb..9c14fe83440b 100644
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -1,6 +1,6 @@
-AUX tpm2-abrmd-2.0.3-build.patch 2266 BLAKE2B ae973682cd38c80405bbfb6c1cee5070c4df08579fe82dc169c04ff547f73d851eeeae0eafea8119dfe6569caace196ef1c523a673f6227ebfa2553cde631c47 SHA512 87ed96de2c8bd39b89e5570540ba84735b0fc3ded0c804b349f0d6588047b93df0df4fddacbe0e73c88c354ff38e9c8646a32eaf105de9f580f278be67a2b3e3
+AUX tpm2-abrmd-2.1.1-build.patch 4350 BLAKE2B 9d8dd854954bb79239a2b443d7d6a8eb4ada564036ef480438d716f06c30ec5d45476d1fee194fbb669d323ea4c67bb7f049f6acd3745ab5f8284cb8efab1e6e SHA512 2fb6f5a63928064612175f822a41295e1c74afe3850ff4b2709384bc7eb54e5ec14a2af60b8720500fa5d91a102a89d9c6b177e8cd880e3f2f8dafc9f82e08d8
AUX tpm2-abrmd.confd 17 BLAKE2B f3b6301cb29f0f741c26025bded10af8948eb7f16faca051828b063f4fdab823309fac085e69e281600f77646f3e2bd91c1a5079bd675569aef8db762fdbe991 SHA512 ca7c4782ccc3ee7592bb4b24a6a81c624d22969cf9b9e1c3e22d45e85d3720836b1f22735ccf2ba51258c6eb0b30c4d88d7bed893f58b1aac7423fb7013529f9
AUX tpm2-abrmd.initd 390 BLAKE2B 5dbaccf073eba208e13c24f92127e41c4c71fe62dd9bf2062301efbcc16daa1559ffba127399a189d6466e21a8cf9b85ac0e09d34f495be58430eb3cfe0886ef SHA512 aef622face110e22831dddab8a6474b4d003e6d50da9d334653a88ef0a7fca88377379a56fef9c404af5222c8c2fb97090eca913aa7d96183c4e14d7ab470044
-DIST tpm2-abrmd-2.0.3.tar.gz 563029 BLAKE2B 89c20066b05818825a2addacaf123568ec095d021e9811b78d11c336af9a9e97fe280a08b4478331663efd1da9b2db54207ca53728398aefe4407bfe4b0c7efd SHA512 70b431b9d09e1c1db819aabf6ca8e40a7553573339f43a6c872ad685b7822e5046bd8ede25dcd0608ce2d8fa32257f6c1dd7f234aa7d6a447ac795625d4e0fac
-EBUILD tpm2-abrmd-2.0.3.ebuild 1188 BLAKE2B 51842982c3644e7007cc827211bc342c0366110d81c10735d096fec3f4ee7332aeb5307f1ca9ecded8015bf2b6ab494e2fe0a4b80aab9ff8e9ff5fd99625f0cd SHA512 2861c1d3b622bbc33b676dd928c481763fab431735a944cf9ad2265656acf97fe1d2cf33fc4854de43d916aafd377e18cf96873f2719e2e1bccf048f93c18636
+DIST tpm2-abrmd-2.1.1.tar.gz 561352 BLAKE2B 4106811b238fee7b503bf0afb4ed857371bab023d8e449d5864eebb2386779e2bc8fb0f2bf8e334ebd8d7abe5c569f2b2cc2ea60b07672b1d3294092e63c2a5a SHA512 d685812c26a097190ced5a9e8ceb1544eb9e3858606123644d5496031706af91e5ba9fb54eb371bcb4eed4d236617f7a21a49a792196db9c5ebf277582ac7124
+EBUILD tpm2-abrmd-2.1.1.ebuild 1215 BLAKE2B ede9c7f24240bbe5a22f5bdd3dcc7233fcafa38fee77979eaf8103ffa86cd60effed90dd1ee78a32a8de20558c32bb79a3d6b5196ea0174e035a685053723ec4 SHA512 bd3801de3795f6ef7261ea6d373e02eeafc5fefc200542973ee664f15187effb551f8188637d33a6ed339a379ca36c430d1fa7d0d1884ea2f95d8e59c24f4a93
MISC metadata.xml 329 BLAKE2B 32d5f42e0427e9c83625ec972d4b266a1338c1629933628a0a32b8e4afb053468fece7f03916a983cdce9ff0a1d36d9c0f44006e7df4e383817005197a8be9a3 SHA512 920412d7cae5cfe3cd9a96133948b3101595edd966cc0d056934cdf45f9f4c36e1bb8fc79b0ee7146b2d1047d895de9d1fd57a7a753f4957707fad57962a9cb2
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 \
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-22 18:47:28 +0000