1 |
commit: 1776ddd88c901cad1ce29ec08ca6da58c34a6943 |
2 |
Author: Salah Coronya <salah.coronya <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Aug 19 20:00:50 2020 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 15 14:11:17 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1776ddd8 |
7 |
|
8 |
app-crypt/tpm2-abrmd: Remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
11 |
Signed-off-by: Salah Coronya <salah.coronya <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/17176 |
13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
14 |
|
15 |
app-crypt/tpm2-abrmd/Manifest | 2 - |
16 |
.../tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch | 118 --------------------- |
17 |
app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r2.ebuild | 55 ---------- |
18 |
app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.1.ebuild | 51 --------- |
19 |
4 files changed, 226 deletions(-) |
20 |
|
21 |
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest |
22 |
index 8c93ee844f6..7b889203c0f 100644 |
23 |
--- a/app-crypt/tpm2-abrmd/Manifest |
24 |
+++ b/app-crypt/tpm2-abrmd/Manifest |
25 |
@@ -1,3 +1 @@ |
26 |
-DIST tpm2-abrmd-2.1.1.tar.gz 561352 BLAKE2B 4106811b238fee7b503bf0afb4ed857371bab023d8e449d5864eebb2386779e2bc8fb0f2bf8e334ebd8d7abe5c569f2b2cc2ea60b07672b1d3294092e63c2a5a SHA512 d685812c26a097190ced5a9e8ceb1544eb9e3858606123644d5496031706af91e5ba9fb54eb371bcb4eed4d236617f7a21a49a792196db9c5ebf277582ac7124 |
27 |
-DIST tpm2-abrmd-2.3.1.tar.gz 566988 BLAKE2B 281c1288baaa07b93939219143f4ecc2420b353d04d751746b6e43c93e092d0facb3d0ddbc20129328666d69954dd16ea7e709fea99690af80b2c83e1ac855e4 SHA512 144ab2b147cd18f892f3c05181efdbed2ac422fe8507eb42871ffe571340b6395431743a4f1995a7ce7a914fd5e7afd2b17328062c893a0403708c2c4d92e0cb |
28 |
DIST tpm2-abrmd-2.3.3.tar.gz 573449 BLAKE2B c3bc0311a73a0c69060a4d19517c3b5d09077ee8efdcd6e7d605675111cb5ac568d1e43bf9c329d4fad21fd44fb50b20e502205360461533c68866d329c320db SHA512 2191c7e466271cb85fcb20fcd91c78df80f53030fb055d0b4670db33708939b60a9124955356f27662975abdcb9c8d144df884003986ffdbd801ca4e47edc21a |
29 |
|
30 |
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 |
31 |
deleted file mode 100644 |
32 |
index e58bb7f72ef..00000000000 |
33 |
--- a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch |
34 |
+++ /dev/null |
35 |
@@ -1,118 +0,0 @@ |
36 |
-From a0a961c05c8916863a67a61f469c717f617e1c58 Mon Sep 17 00:00:00 2001 |
37 |
-From: Alon Bar-Lev <alon.barlev@×××××.com> |
38 |
-Date: Fri, 31 May 2019 01:03:03 +0300 |
39 |
-Subject: [PATCH 1/2] build: let autoconf detect system extensions |
40 |
- |
41 |
-Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
42 |
---- |
43 |
- configure.ac | 4 +--- |
44 |
- 1 file changed, 1 insertion(+), 3 deletions(-) |
45 |
- |
46 |
-https://github.com/tpm2-software/tpm2-abrmd/pull/632 |
47 |
- |
48 |
-diff --git a/configure.ac b/configure.ac |
49 |
-index 35a0c21..0cc8ce8 100644 |
50 |
---- a/configure.ac |
51 |
-+++ b/configure.ac |
52 |
-@@ -7,6 +7,7 @@ AC_INIT([tpm2-abrmd], |
53 |
- AC_CONFIG_MACRO_DIR([m4]) |
54 |
- AC_PROG_CC |
55 |
- AC_PROG_LN_S |
56 |
-+AC_USE_SYSTEM_EXTENSIONS |
57 |
- LT_INIT() |
58 |
- PKG_INSTALLDIR() |
59 |
- AM_INIT_AUTOMAKE([foreign subdir-objects]) |
60 |
-@@ -151,9 +152,6 @@ AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all]) |
61 |
- AX_ADD_COMPILER_FLAG([-fpic]) |
62 |
- AX_ADD_COMPILER_FLAG([-fPIC]) |
63 |
- AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5]) |
64 |
--AX_ADD_PREPROC_FLAG([-D_GNU_SOURCE]) |
65 |
--AX_ADD_PREPROC_FLAG([-U_FORTIFY_SOURCE]) |
66 |
--AX_ADD_PREPROC_FLAG([-D_FORTIFY_SOURCE=2]) |
67 |
- AX_ADD_LINK_FLAG([-Wl,--gc-sections]) |
68 |
- AX_ADD_LINK_FLAG([-Wl,--no-undefined]) |
69 |
- AX_ADD_LINK_FLAG([-Wl,-z,noexecstack]) |
70 |
--- |
71 |
-2.21.0 |
72 |
- |
73 |
-From 977de33fe1499e7e8fa25f4c1247aaf9b71ba3a2 Mon Sep 17 00:00:00 2001 |
74 |
-From: Alon Bar-Lev <alon.barlev@×××××.com> |
75 |
-Date: Fri, 31 May 2019 01:03:08 +0300 |
76 |
-Subject: [PATCH 2/2] build: add --disable-defaultflags |
77 |
- |
78 |
-Align with other tpm2 build systems. |
79 |
-Enable downstream to override flags. |
80 |
- |
81 |
-Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
82 |
---- |
83 |
- configure.ac | 54 ++++++++++++++++++++++++++++++---------------------- |
84 |
- 1 file changed, 31 insertions(+), 23 deletions(-) |
85 |
- |
86 |
-diff --git a/configure.ac b/configure.ac |
87 |
-index 0cc8ce8..dc32b09 100644 |
88 |
---- a/configure.ac |
89 |
-+++ b/configure.ac |
90 |
-@@ -134,29 +134,37 @@ AS_IF([test \( "x$enable_integration" = "xyes" \) -a \( "x$enable_test_hwtpm" = |
91 |
- [AC_MSG_NOTICE([Integration tests will be executed against the TPM device.])]) |
92 |
- AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"]) |
93 |
- |
94 |
--# preprocessor / compiler / linker flags |
95 |
--# these macros are defined in m4/flags.m4 |
96 |
--AX_ADD_COMPILER_FLAG([-Wall]) |
97 |
--AX_ADD_COMPILER_FLAG([-Wextra]) |
98 |
--AX_ADD_COMPILER_FLAG([-Werror]) |
99 |
--AX_ADD_COMPILER_FLAG([-std=gnu99]) |
100 |
--AX_ADD_COMPILER_FLAG([-Wformat]) |
101 |
--AX_ADD_COMPILER_FLAG([-Wformat-security]) |
102 |
--AX_ADD_COMPILER_FLAG([-Wno-missing-braces]) |
103 |
--# work around for Glib usage of function pointers type casting |
104 |
--# https://bugzilla.gnome.org/show_bug.cgi?id=793272 |
105 |
--AX_ADD_COMPILER_FLAG([-Wno-cast-function-type]) |
106 |
--AX_ADD_COMPILER_FLAG([-fdata-sections]) |
107 |
--AX_ADD_COMPILER_FLAG([-ffunction-sections]) |
108 |
--AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all]) |
109 |
--AX_ADD_COMPILER_FLAG([-fpic]) |
110 |
--AX_ADD_COMPILER_FLAG([-fPIC]) |
111 |
--AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5]) |
112 |
--AX_ADD_LINK_FLAG([-Wl,--gc-sections]) |
113 |
--AX_ADD_LINK_FLAG([-Wl,--no-undefined]) |
114 |
--AX_ADD_LINK_FLAG([-Wl,-z,noexecstack]) |
115 |
--AX_ADD_LINK_FLAG([-Wl,-z,now]) |
116 |
--AX_ADD_LINK_FLAG([-Wl,-z,relro]) |
117 |
-+AC_ARG_ENABLE([defaultflags], |
118 |
-+ [AS_HELP_STRING([--disable-defaultflags], |
119 |
-+ [Disable default preprocessor, compiler, and linker flags.])], |
120 |
-+ [enable_defaultflags=$enableval], |
121 |
-+ [enable_defaultflags=yes]) |
122 |
-+AS_IF([test "x$enable_defaultflags" = "xyes"], |
123 |
-+ [ |
124 |
-+ # preprocessor / compiler / linker flags |
125 |
-+ # these macros are defined in m4/flags.m4 |
126 |
-+ AX_ADD_COMPILER_FLAG([-Wall]) |
127 |
-+ AX_ADD_COMPILER_FLAG([-Wextra]) |
128 |
-+ AX_ADD_COMPILER_FLAG([-Werror]) |
129 |
-+ AX_ADD_COMPILER_FLAG([-std=gnu99]) |
130 |
-+ AX_ADD_COMPILER_FLAG([-Wformat]) |
131 |
-+ AX_ADD_COMPILER_FLAG([-Wformat-security]) |
132 |
-+ AX_ADD_COMPILER_FLAG([-Wno-missing-braces]) |
133 |
-+ # work around for Glib usage of function pointers type casting |
134 |
-+ # https://bugzilla.gnome.org/show_bug.cgi?id=793272 |
135 |
-+ AX_ADD_COMPILER_FLAG([-Wno-cast-function-type]) |
136 |
-+ AX_ADD_COMPILER_FLAG([-fdata-sections]) |
137 |
-+ AX_ADD_COMPILER_FLAG([-ffunction-sections]) |
138 |
-+ AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all]) |
139 |
-+ AX_ADD_COMPILER_FLAG([-fpic]) |
140 |
-+ AX_ADD_COMPILER_FLAG([-fPIC]) |
141 |
-+ AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5]) |
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 |
-+ AX_ADD_LINK_FLAG([-Wl,-z,now]) |
146 |
-+ AX_ADD_LINK_FLAG([-Wl,-z,relro]) |
147 |
-+ ]) |
148 |
- |
149 |
- AC_SUBST([PATH]) |
150 |
- |
151 |
--- |
152 |
-2.21.0 |
153 |
- |
154 |
|
155 |
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r2.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r2.ebuild |
156 |
deleted file mode 100644 |
157 |
index dddc82c0e86..00000000000 |
158 |
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r2.ebuild |
159 |
+++ /dev/null |
160 |
@@ -1,55 +0,0 @@ |
161 |
-# Copyright 1999-2020 Gentoo Authors |
162 |
-# Distributed under the terms of the GNU General Public License v2 |
163 |
- |
164 |
-EAPI=7 |
165 |
- |
166 |
-inherit autotools systemd |
167 |
- |
168 |
-DESCRIPTION="TPM2 Access Broker & Resource Manager" |
169 |
-HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd" |
170 |
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz" |
171 |
- |
172 |
-LICENSE="BSD" |
173 |
-SLOT="0" |
174 |
-KEYWORDS="~amd64" |
175 |
-IUSE="static-libs test" |
176 |
- |
177 |
-RESTRICT="!test? ( test )" |
178 |
- |
179 |
-RDEPEND="sys-apps/dbus:= |
180 |
- acct-group/tss |
181 |
- acct-user/tss |
182 |
- dev-libs/glib:= |
183 |
- app-crypt/tpm2-tss:=" |
184 |
-DEPEND="${RDEPEND} |
185 |
- test? ( dev-util/cmocka )" |
186 |
-BDEPEND="virtual/pkgconfig |
187 |
- dev-util/gdbus-codegen" |
188 |
- |
189 |
-PATCHES=( |
190 |
- "${FILESDIR}/${P}-build.patch" |
191 |
-) |
192 |
- |
193 |
-src_prepare() { |
194 |
- default |
195 |
- eautoreconf |
196 |
-} |
197 |
- |
198 |
-src_configure() { |
199 |
- econf \ |
200 |
- $(use_enable static-libs static) \ |
201 |
- $(use_enable test unit) \ |
202 |
- --disable-defaultflags \ |
203 |
- --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \ |
204 |
- --with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \ |
205 |
- --with-systemdpresetdisable \ |
206 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
207 |
-} |
208 |
- |
209 |
-src_install() { |
210 |
- default |
211 |
- find "${D}" -name '*.la' -delete || die |
212 |
- |
213 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
214 |
- newconfd "${FILESDIR}"/${PN}.confd ${PN} |
215 |
-} |
216 |
|
217 |
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.1.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.1.ebuild |
218 |
deleted file mode 100644 |
219 |
index 53562b771fd..00000000000 |
220 |
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.1.ebuild |
221 |
+++ /dev/null |
222 |
@@ -1,51 +0,0 @@ |
223 |
-# Copyright 1999-2020 Gentoo Authors |
224 |
-# Distributed under the terms of the GNU General Public License v2 |
225 |
- |
226 |
-EAPI=7 |
227 |
- |
228 |
-inherit autotools systemd |
229 |
- |
230 |
-DESCRIPTION="TPM2 Access Broker & Resource Manager" |
231 |
-HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd" |
232 |
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz" |
233 |
- |
234 |
-LICENSE="BSD" |
235 |
-SLOT="0" |
236 |
-KEYWORDS="~amd64" |
237 |
-IUSE="static-libs test" |
238 |
- |
239 |
-RESTRICT="!test? ( test )" |
240 |
- |
241 |
-RDEPEND="acct-group/tss |
242 |
- acct-user/tss |
243 |
- sys-apps/dbus:= |
244 |
- dev-libs/glib:= |
245 |
- app-crypt/tpm2-tss:=" |
246 |
-DEPEND="${RDEPEND} |
247 |
- test? ( dev-util/cmocka )" |
248 |
-BDEPEND="virtual/pkgconfig |
249 |
- dev-util/gdbus-codegen" |
250 |
- |
251 |
-src_prepare() { |
252 |
- default |
253 |
- eautoreconf |
254 |
-} |
255 |
- |
256 |
-src_configure() { |
257 |
- econf \ |
258 |
- $(use_enable static-libs static) \ |
259 |
- $(use_enable test unit) \ |
260 |
- --disable-defaultflags \ |
261 |
- --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \ |
262 |
- --with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \ |
263 |
- --with-systemdpresetdisable \ |
264 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
265 |
-} |
266 |
- |
267 |
-src_install() { |
268 |
- default |
269 |
- find "${D}" -name '*.la' -delete || die |
270 |
- |
271 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
272 |
- newconfd "${FILESDIR}"/${PN}.confd ${PN} |
273 |
-} |