| 1 |
commit: 9f9a243c78d70f493469b40c4805940a1dcfe667 |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 30 21:47:42 2019 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 30 23:46:13 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f9a243c |
| 7 |
|
| 8 |
app-crypt/tpm2-abrmd: version bump |
| 9 |
|
| 10 |
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.66, Repoman-2.3.11 |
| 12 |
|
| 13 |
app-crypt/tpm2-abrmd/Manifest | 2 +- |
| 14 |
.../tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch | 71 ------------- |
| 15 |
.../tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch | 118 +++++++++++++++++++++ |
| 16 |
...-abrmd-2.0.3.ebuild => tpm2-abrmd-2.1.1.ebuild} | 3 +- |
| 17 |
4 files changed, 121 insertions(+), 73 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest |
| 20 |
index cee50e66439..d6514ef4745 100644 |
| 21 |
--- a/app-crypt/tpm2-abrmd/Manifest |
| 22 |
+++ b/app-crypt/tpm2-abrmd/Manifest |
| 23 |
@@ -1 +1 @@ |
| 24 |
-DIST tpm2-abrmd-2.0.3.tar.gz 563029 BLAKE2B 89c20066b05818825a2addacaf123568ec095d021e9811b78d11c336af9a9e97fe280a08b4478331663efd1da9b2db54207ca53728398aefe4407bfe4b0c7efd SHA512 70b431b9d09e1c1db819aabf6ca8e40a7553573339f43a6c872ad685b7822e5046bd8ede25dcd0608ce2d8fa32257f6c1dd7f234aa7d6a447ac795625d4e0fac |
| 25 |
+DIST tpm2-abrmd-2.1.1.tar.gz 561352 BLAKE2B 4106811b238fee7b503bf0afb4ed857371bab023d8e449d5864eebb2386779e2bc8fb0f2bf8e334ebd8d7abe5c569f2b2cc2ea60b07672b1d3294092e63c2a5a SHA512 d685812c26a097190ced5a9e8ceb1544eb9e3858606123644d5496031706af91e5ba9fb54eb371bcb4eed4d236617f7a21a49a792196db9c5ebf277582ac7124 |
| 26 |
|
| 27 |
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 |
| 28 |
deleted file mode 100644 |
| 29 |
index 07c607579f1..00000000000 |
| 30 |
--- a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch |
| 31 |
+++ /dev/null |
| 32 |
@@ -1,71 +0,0 @@ |
| 33 |
-diff --git a/configure.ac b/configure.ac |
| 34 |
-index ecbc3bb..5973ff5 100644 |
| 35 |
---- a/configure.ac |
| 36 |
-+++ b/configure.ac |
| 37 |
-@@ -135,7 +135,6 @@ AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"]) |
| 38 |
- # these macros are defined in m4/flags.m4 |
| 39 |
- AX_ADD_COMPILER_FLAG([-Wall]) |
| 40 |
- AX_ADD_COMPILER_FLAG([-Wextra]) |
| 41 |
--AX_ADD_COMPILER_FLAG([-Werror]) |
| 42 |
- AX_ADD_COMPILER_FLAG([-std=gnu99]) |
| 43 |
- AX_ADD_COMPILER_FLAG([-Wformat]) |
| 44 |
- AX_ADD_COMPILER_FLAG([-Wformat-security]) |
| 45 |
-@@ -143,19 +142,9 @@ AX_ADD_COMPILER_FLAG([-Wno-missing-braces]) |
| 46 |
- # work around for Glib usage of function pointers type casting |
| 47 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=793272 |
| 48 |
- AX_ADD_COMPILER_FLAG([-Wno-cast-function-type]) |
| 49 |
--AX_ADD_COMPILER_FLAG([-fdata-sections]) |
| 50 |
--AX_ADD_COMPILER_FLAG([-ffunction-sections]) |
| 51 |
--AX_ADD_COMPILER_FLAG([-fstack-protector-all]) |
| 52 |
--AX_ADD_COMPILER_FLAG([-fpic]) |
| 53 |
--AX_ADD_COMPILER_FLAG([-fPIC]) |
| 54 |
- AX_ADD_PREPROC_FLAG([-D_GNU_SOURCE]) |
| 55 |
- AX_ADD_PREPROC_FLAG([-U_FORTIFY_SOURCE]) |
| 56 |
- AX_ADD_PREPROC_FLAG([-D_FORTIFY_SOURCE=2]) |
| 57 |
--AX_ADD_LINK_FLAG([-Wl,--gc-sections]) |
| 58 |
--AX_ADD_LINK_FLAG([-Wl,--no-undefined]) |
| 59 |
--AX_ADD_LINK_FLAG([-Wl,-z,noexecstack]) |
| 60 |
--AX_ADD_LINK_FLAG([-Wl,-z,now]) |
| 61 |
--AX_ADD_LINK_FLAG([-Wl,-z,relro]) |
| 62 |
- |
| 63 |
- AC_SUBST([PATH]) |
| 64 |
- |
| 65 |
-From 353c5e962f46e3739b1e92cbf6b1f3eb500157fc Mon Sep 17 00:00:00 2001 |
| 66 |
-From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 67 |
-Date: Thu, 17 Jan 2019 23:56:50 +0200 |
| 68 |
-Subject: [PATCH] tests: run without X |
| 69 |
- |
| 70 |
-Solves: |
| 71 |
- |
| 72 |
-$ DISPLAY= make check |
| 73 |
- |
| 74 |
-FAIL: test/tss2-tcti-tabrmd_unit |
| 75 |
- |
| 76 |
-** (process:17633): CRITICAL **: 23:53:22.403: failed to allocate dbus proxy object: |
| 77 |
-Error spawning command line ?dbus-launch --autolaunch=4f9189e347d5cdf343 |
| 78 |
- |
| 79 |
-Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
| 80 |
- |
| 81 |
-https://github.com/tpm2-software/tpm2-abrmd/pull/577 |
| 82 |
---- |
| 83 |
- .travis.yml | 2 +- |
| 84 |
- Makefile.am | 3 ++- |
| 85 |
- 2 files changed, 3 insertions(+), 2 deletions(-) |
| 86 |
- |
| 87 |
-diff --git a/Makefile.am b/Makefile.am |
| 88 |
-index b32a5fb..2598f13 100644 |
| 89 |
---- a/Makefile.am |
| 90 |
-+++ b/Makefile.am |
| 91 |
-@@ -76,7 +76,8 @@ XFAIL_TESTS = \ |
| 92 |
- TEST_EXTENSIONS = .int |
| 93 |
- AM_TESTS_ENVIRONMENT = \ |
| 94 |
- TEST_FUNC_LIB=$(srcdir)/scripts/int-test-funcs.sh \ |
| 95 |
-- PATH=./src:$(PATH) |
| 96 |
-+ PATH=./src:$(PATH) \ |
| 97 |
-+ dbus-launch |
| 98 |
- INT_LOG_COMPILER = $(srcdir)/scripts/int-test-setup.sh |
| 99 |
- INT_LOG_FLAGS = --tabrmd-tcti=$(TABRMD_TCTI) |
| 100 |
- |
| 101 |
--- |
| 102 |
-2.19.2 |
| 103 |
- |
| 104 |
|
| 105 |
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 |
| 106 |
new file mode 100644 |
| 107 |
index 00000000000..e58bb7f72ef |
| 108 |
--- /dev/null |
| 109 |
+++ b/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch |
| 110 |
@@ -0,0 +1,118 @@ |
| 111 |
+From a0a961c05c8916863a67a61f469c717f617e1c58 Mon Sep 17 00:00:00 2001 |
| 112 |
+From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 113 |
+Date: Fri, 31 May 2019 01:03:03 +0300 |
| 114 |
+Subject: [PATCH 1/2] build: let autoconf detect system extensions |
| 115 |
+ |
| 116 |
+Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
| 117 |
+--- |
| 118 |
+ configure.ac | 4 +--- |
| 119 |
+ 1 file changed, 1 insertion(+), 3 deletions(-) |
| 120 |
+ |
| 121 |
+https://github.com/tpm2-software/tpm2-abrmd/pull/632 |
| 122 |
+ |
| 123 |
+diff --git a/configure.ac b/configure.ac |
| 124 |
+index 35a0c21..0cc8ce8 100644 |
| 125 |
+--- a/configure.ac |
| 126 |
++++ b/configure.ac |
| 127 |
+@@ -7,6 +7,7 @@ AC_INIT([tpm2-abrmd], |
| 128 |
+ AC_CONFIG_MACRO_DIR([m4]) |
| 129 |
+ AC_PROG_CC |
| 130 |
+ AC_PROG_LN_S |
| 131 |
++AC_USE_SYSTEM_EXTENSIONS |
| 132 |
+ LT_INIT() |
| 133 |
+ PKG_INSTALLDIR() |
| 134 |
+ AM_INIT_AUTOMAKE([foreign subdir-objects]) |
| 135 |
+@@ -151,9 +152,6 @@ AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all]) |
| 136 |
+ AX_ADD_COMPILER_FLAG([-fpic]) |
| 137 |
+ AX_ADD_COMPILER_FLAG([-fPIC]) |
| 138 |
+ AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5]) |
| 139 |
+-AX_ADD_PREPROC_FLAG([-D_GNU_SOURCE]) |
| 140 |
+-AX_ADD_PREPROC_FLAG([-U_FORTIFY_SOURCE]) |
| 141 |
+-AX_ADD_PREPROC_FLAG([-D_FORTIFY_SOURCE=2]) |
| 142 |
+ AX_ADD_LINK_FLAG([-Wl,--gc-sections]) |
| 143 |
+ AX_ADD_LINK_FLAG([-Wl,--no-undefined]) |
| 144 |
+ AX_ADD_LINK_FLAG([-Wl,-z,noexecstack]) |
| 145 |
+-- |
| 146 |
+2.21.0 |
| 147 |
+ |
| 148 |
+From 977de33fe1499e7e8fa25f4c1247aaf9b71ba3a2 Mon Sep 17 00:00:00 2001 |
| 149 |
+From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 150 |
+Date: Fri, 31 May 2019 01:03:08 +0300 |
| 151 |
+Subject: [PATCH 2/2] build: add --disable-defaultflags |
| 152 |
+ |
| 153 |
+Align with other tpm2 build systems. |
| 154 |
+Enable downstream to override flags. |
| 155 |
+ |
| 156 |
+Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
| 157 |
+--- |
| 158 |
+ configure.ac | 54 ++++++++++++++++++++++++++++++---------------------- |
| 159 |
+ 1 file changed, 31 insertions(+), 23 deletions(-) |
| 160 |
+ |
| 161 |
+diff --git a/configure.ac b/configure.ac |
| 162 |
+index 0cc8ce8..dc32b09 100644 |
| 163 |
+--- a/configure.ac |
| 164 |
++++ b/configure.ac |
| 165 |
+@@ -134,29 +134,37 @@ AS_IF([test \( "x$enable_integration" = "xyes" \) -a \( "x$enable_test_hwtpm" = |
| 166 |
+ [AC_MSG_NOTICE([Integration tests will be executed against the TPM device.])]) |
| 167 |
+ AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"]) |
| 168 |
+ |
| 169 |
+-# preprocessor / compiler / linker flags |
| 170 |
+-# these macros are defined in m4/flags.m4 |
| 171 |
+-AX_ADD_COMPILER_FLAG([-Wall]) |
| 172 |
+-AX_ADD_COMPILER_FLAG([-Wextra]) |
| 173 |
+-AX_ADD_COMPILER_FLAG([-Werror]) |
| 174 |
+-AX_ADD_COMPILER_FLAG([-std=gnu99]) |
| 175 |
+-AX_ADD_COMPILER_FLAG([-Wformat]) |
| 176 |
+-AX_ADD_COMPILER_FLAG([-Wformat-security]) |
| 177 |
+-AX_ADD_COMPILER_FLAG([-Wno-missing-braces]) |
| 178 |
+-# work around for Glib usage of function pointers type casting |
| 179 |
+-# https://bugzilla.gnome.org/show_bug.cgi?id=793272 |
| 180 |
+-AX_ADD_COMPILER_FLAG([-Wno-cast-function-type]) |
| 181 |
+-AX_ADD_COMPILER_FLAG([-fdata-sections]) |
| 182 |
+-AX_ADD_COMPILER_FLAG([-ffunction-sections]) |
| 183 |
+-AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all]) |
| 184 |
+-AX_ADD_COMPILER_FLAG([-fpic]) |
| 185 |
+-AX_ADD_COMPILER_FLAG([-fPIC]) |
| 186 |
+-AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5]) |
| 187 |
+-AX_ADD_LINK_FLAG([-Wl,--gc-sections]) |
| 188 |
+-AX_ADD_LINK_FLAG([-Wl,--no-undefined]) |
| 189 |
+-AX_ADD_LINK_FLAG([-Wl,-z,noexecstack]) |
| 190 |
+-AX_ADD_LINK_FLAG([-Wl,-z,now]) |
| 191 |
+-AX_ADD_LINK_FLAG([-Wl,-z,relro]) |
| 192 |
++AC_ARG_ENABLE([defaultflags], |
| 193 |
++ [AS_HELP_STRING([--disable-defaultflags], |
| 194 |
++ [Disable default preprocessor, compiler, and linker flags.])], |
| 195 |
++ [enable_defaultflags=$enableval], |
| 196 |
++ [enable_defaultflags=yes]) |
| 197 |
++AS_IF([test "x$enable_defaultflags" = "xyes"], |
| 198 |
++ [ |
| 199 |
++ # preprocessor / compiler / linker flags |
| 200 |
++ # these macros are defined in m4/flags.m4 |
| 201 |
++ AX_ADD_COMPILER_FLAG([-Wall]) |
| 202 |
++ AX_ADD_COMPILER_FLAG([-Wextra]) |
| 203 |
++ AX_ADD_COMPILER_FLAG([-Werror]) |
| 204 |
++ AX_ADD_COMPILER_FLAG([-std=gnu99]) |
| 205 |
++ AX_ADD_COMPILER_FLAG([-Wformat]) |
| 206 |
++ AX_ADD_COMPILER_FLAG([-Wformat-security]) |
| 207 |
++ AX_ADD_COMPILER_FLAG([-Wno-missing-braces]) |
| 208 |
++ # work around for Glib usage of function pointers type casting |
| 209 |
++ # https://bugzilla.gnome.org/show_bug.cgi?id=793272 |
| 210 |
++ AX_ADD_COMPILER_FLAG([-Wno-cast-function-type]) |
| 211 |
++ AX_ADD_COMPILER_FLAG([-fdata-sections]) |
| 212 |
++ AX_ADD_COMPILER_FLAG([-ffunction-sections]) |
| 213 |
++ AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all]) |
| 214 |
++ AX_ADD_COMPILER_FLAG([-fpic]) |
| 215 |
++ AX_ADD_COMPILER_FLAG([-fPIC]) |
| 216 |
++ AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5]) |
| 217 |
++ AX_ADD_LINK_FLAG([-Wl,--gc-sections]) |
| 218 |
++ AX_ADD_LINK_FLAG([-Wl,--no-undefined]) |
| 219 |
++ AX_ADD_LINK_FLAG([-Wl,-z,noexecstack]) |
| 220 |
++ AX_ADD_LINK_FLAG([-Wl,-z,now]) |
| 221 |
++ AX_ADD_LINK_FLAG([-Wl,-z,relro]) |
| 222 |
++ ]) |
| 223 |
+ |
| 224 |
+ AC_SUBST([PATH]) |
| 225 |
+ |
| 226 |
+-- |
| 227 |
+2.21.0 |
| 228 |
+ |
| 229 |
|
| 230 |
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.0.3.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild |
| 231 |
similarity index 94% |
| 232 |
rename from app-crypt/tpm2-abrmd/tpm2-abrmd-2.0.3.ebuild |
| 233 |
rename to app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild |
| 234 |
index 8a2bb55ac65..8d21d2b9b4c 100644 |
| 235 |
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.0.3.ebuild |
| 236 |
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild |
| 237 |
@@ -1,4 +1,4 @@ |
| 238 |
-# Copyright 1999-2018 Gentoo Authors |
| 239 |
+# Copyright 1999-2019 Gentoo Authors |
| 240 |
# Distributed under the terms of the GNU General Public License v2 |
| 241 |
|
| 242 |
EAPI=7 |
| 243 |
@@ -40,6 +40,7 @@ src_configure() { |
| 244 |
econf \ |
| 245 |
$(use_enable static-libs static) \ |
| 246 |
$(use_enable test unit) \ |
| 247 |
+ --disable-defaultflags \ |
| 248 |
--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \ |
| 249 |
--with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \ |
| 250 |
--with-systemdpresetdisable \ |
Archives