1 |
commit: 9dc0747ba3c29a85b7ab3dede90ac9b39f29e438 |
2 |
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat May 22 01:11:37 2021 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 10 08:13:15 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dc0747b |
7 |
|
8 |
app-crypt/tpm2-tss: Remove old |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
11 |
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/20918 |
13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
14 |
|
15 |
app-crypt/tpm2-tss/Manifest | 2 - |
16 |
...0.0-Dont-run-systemd-sysusers-in-Makefile.patch | 16 ----- |
17 |
...ss-3.0.1-Fix-underquoting-in-configure-ac.patch | 22 ------- |
18 |
app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild | 77 ---------------------- |
19 |
app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild | 76 --------------------- |
20 |
5 files changed, 193 deletions(-) |
21 |
|
22 |
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest |
23 |
index 24f31fe276b..bcc65f26237 100644 |
24 |
--- a/app-crypt/tpm2-tss/Manifest |
25 |
+++ b/app-crypt/tpm2-tss/Manifest |
26 |
@@ -1,5 +1,3 @@ |
27 |
-DIST tpm2-tss-2.4.3.tar.gz 1439120 BLAKE2B 21acce29f96e8039124874c024b43eb8d2c4ffda27db58bb4f34446747c0fa6953c6ca390f8e87d22c1349123bada81051b119eaf7a28c7d1ad8a9195287c312 SHA512 4adaeb2724b720017e9d488f66de879ebdc0dbc2a4f7536493214913a49d2c631e302be26f710f0f45b0d514212cb036ca7ba9715ee13c29dda1d4a61595aa27 |
28 |
DIST tpm2-tss-2.4.5.tar.gz 1439394 BLAKE2B 644d917f545e93dd81856611522329caf4ff038e4ddb04d761f03339cc7308095abc1c9b46a4d601cad67deea6f917ee5e4236c59f3d7042a7fdf2d33630dd3f SHA512 2c92af07ed1cc3665c19479c00ce5608883081f311192a264a4f7d9119c75ac582596c53b910534c4b66dbb60de2ffd3d6218169748332609c2e0fc89f519259 |
29 |
DIST tpm2-tss-2.4.6.tar.gz 1472883 BLAKE2B e007de07c759e77e377f8569c0c5d94ab57597ea3cb452fb598a47c9b404714a7816c86221d4eacad962436fc7625066d4066f433cd957c37b92d51b0455e2a0 SHA512 f7f7f067605ea30661ac891e22095238689856e22e45f11a6b603cb36ed1ae0724ae52d36f0ee5dd72208da8520457667676ae08107647faa5441a0c9b642f7a |
30 |
-DIST tpm2-tss-3.0.3.tar.gz 1489136 BLAKE2B 5bf24cf2c36e579388f62eea06ab3811eab1a89c0cd5d12f6f61cee7f6836487f25fefb864432ff8920931ff37327ca867d1d40fad89e0305d5e1edfb8f0e883 SHA512 54a926db55790250d69c81ac6e436556072057dd7c610d2718689030287dee69d533d4e04b3325dd73d9fc7635dad0bf0a7bfb082957bb51cb420efdb68efaf8 |
31 |
DIST tpm2-tss-3.1.0.tar.gz 1584690 BLAKE2B cee2807a030b8bab653045cb11dfc7a6a3f7b1e60c1ce4650ba5f0549f29f36ff307e7d53fb5ef9c950b4dae720bdaf35f7cd1e59ebc07b3f16740035e1d5738 SHA512 8967f172c92f1e3e5ba324dbe8afe07bf1bc7179dd755cef9812105f32634f312ee7cc7dfe8e13af69dc219432463f5dc9b93477743de47aba6af1d70b252405 |
32 |
|
33 |
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch |
34 |
deleted file mode 100644 |
35 |
index fd1d462151f..00000000000 |
36 |
--- a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch |
37 |
+++ /dev/null |
38 |
@@ -1,16 +0,0 @@ |
39 |
-diff --git a/Makefile.am b/Makefile.am |
40 |
-index f2fa515a..7d2aca29 100644 |
41 |
---- a/Makefile.am |
42 |
-+++ b/Makefile.am |
43 |
-@@ -664,11 +664,6 @@ endif #FAPI |
44 |
- EXTRA_DIST += dist/tpm-udev.rules |
45 |
- |
46 |
- install-dirs: |
47 |
--if HOSTOS_LINUX |
48 |
-- (systemd-sysusers && systemd-tmpfiles --create) || \ |
49 |
-- ($(call make_tss_user_and_group) && $(call make_fapi_dirs) && ($call set_fapi_permissions)) || true |
50 |
-- $(call check_fapi_dirs) |
51 |
--endif |
52 |
- |
53 |
- install-data-hook: install-dirs |
54 |
- -if [ ! -z "$(udevrulesprefix)" ]; then \ |
55 |
|
56 |
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch |
57 |
deleted file mode 100644 |
58 |
index a593716c97e..00000000000 |
59 |
--- a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch |
60 |
+++ /dev/null |
61 |
@@ -1,22 +0,0 @@ |
62 |
-diff --git a/configure.ac b/configure.ac |
63 |
-index ff59dd7c..3049032b 100755 |
64 |
---- a/configure.ac |
65 |
-+++ b/configure.ac |
66 |
-@@ -285,7 +285,7 @@ AC_ARG_ENABLE([integration], |
67 |
- [build and execute integration tests])],, |
68 |
- [enable_integration=no]) |
69 |
- AS_IF([test "x$enable_integration" = "xyes"], |
70 |
-- AS_IF([test "$HOSTOS" = "Linux"], |
71 |
-+ [AS_IF([test "$HOSTOS" = "Linux"], |
72 |
- [ERROR_IF_NO_PROG([ss])], |
73 |
- [ERROR_IF_NO_PROG([sockstat])]) |
74 |
- ERROR_IF_NO_PROG([echo]) |
75 |
-@@ -335,7 +335,7 @@ AS_IF([test "x$enable_integration" = "xyes"], |
76 |
- [AC_MSG_ERROR([No simulator executable found in PATH for testing TCTI.])]) |
77 |
- AC_SUBST([INTEGRATION_TCTI], [$integration_tcti]) |
78 |
- AC_SUBST([INTEGRATION_ARGS], [$integration_args]) |
79 |
-- AC_SUBST([ENABLE_INTEGRATION], [$enable_integration])) |
80 |
-+ AC_SUBST([ENABLE_INTEGRATION], [$enable_integration])]) |
81 |
- AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"]) |
82 |
- # |
83 |
- # sanitizer compiler flags |
84 |
|
85 |
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild |
86 |
deleted file mode 100644 |
87 |
index 011fcaefd4a..00000000000 |
88 |
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild |
89 |
+++ /dev/null |
90 |
@@ -1,77 +0,0 @@ |
91 |
-# Copyright 1999-2020 Gentoo Authors |
92 |
-# Distributed under the terms of the GNU General Public License v2 |
93 |
- |
94 |
-EAPI=7 |
95 |
- |
96 |
-inherit autotools linux-info tmpfiles udev |
97 |
- |
98 |
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack" |
99 |
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss" |
100 |
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz" |
101 |
- |
102 |
-LICENSE="BSD-2" |
103 |
-SLOT="0" |
104 |
-KEYWORDS="amd64 arm arm64 x86" |
105 |
-IUSE="doc +fapi gcrypt +openssl static-libs test" |
106 |
- |
107 |
-RESTRICT="!test? ( test )" |
108 |
- |
109 |
-REQUIRED_USE="^^ ( gcrypt openssl ) |
110 |
- fapi? ( openssl !gcrypt )" |
111 |
- |
112 |
-RDEPEND="acct-group/tss |
113 |
- acct-user/tss |
114 |
- fapi? ( |
115 |
- dev-libs/json-c |
116 |
- net-misc/curl |
117 |
- ) |
118 |
- gcrypt? ( dev-libs/libgcrypt:0= ) |
119 |
- openssl? ( dev-libs/openssl:0= )" |
120 |
-DEPEND="${RDEPEND} |
121 |
- test? ( dev-util/cmocka )" |
122 |
-BDEPEND="virtual/pkgconfig |
123 |
- doc? ( app-doc/doxygen )" |
124 |
- |
125 |
-PATCHES=( |
126 |
- "${FILESDIR}/${PN}-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch" |
127 |
-) |
128 |
- |
129 |
-pkg_setup() { |
130 |
- local CONFIG_CHECK=" \ |
131 |
- ~TCG_TPM |
132 |
- " |
133 |
- linux-info_pkg_setup |
134 |
- kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required" |
135 |
-} |
136 |
- |
137 |
-src_prepare() { |
138 |
- default |
139 |
- eautoreconf |
140 |
-} |
141 |
- |
142 |
-src_configure() { |
143 |
- econf \ |
144 |
- --localstatedir=/var \ |
145 |
- $(use_enable doc doxygen-doc) \ |
146 |
- $(use_enable fapi) \ |
147 |
- $(use_enable static-libs static) \ |
148 |
- $(use_enable test unit) \ |
149 |
- --disable-tcti-mssim \ |
150 |
- --disable-defaultflags \ |
151 |
- --disable-weakcrypto \ |
152 |
- --with-crypto="$(usex gcrypt gcrypt ossl)" \ |
153 |
- --with-runstatedir=/run \ |
154 |
- --with-udevrulesdir="$(get_udevdir)/rules.d" \ |
155 |
- --with-udevrulesprefix=60- \ |
156 |
- --with-sysusersdir="/usr/lib/sysusers.d" \ |
157 |
- --with-tmpfilesdir="/usr/lib/tmpfiles.d" |
158 |
-} |
159 |
- |
160 |
-src_install() { |
161 |
- default |
162 |
- find "${D}" -name '*.la' -delete || die |
163 |
-} |
164 |
- |
165 |
-pkg_postinst() { |
166 |
- tmpfiles_process tpm2-tss-fapi.conf |
167 |
-} |
168 |
|
169 |
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild |
170 |
deleted file mode 100644 |
171 |
index a5458854763..00000000000 |
172 |
--- a/app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild |
173 |
+++ /dev/null |
174 |
@@ -1,76 +0,0 @@ |
175 |
-# Copyright 1999-2020 Gentoo Authors |
176 |
-# Distributed under the terms of the GNU General Public License v2 |
177 |
- |
178 |
-EAPI=7 |
179 |
- |
180 |
-inherit autotools linux-info tmpfiles udev |
181 |
- |
182 |
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack" |
183 |
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss" |
184 |
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz" |
185 |
- |
186 |
-LICENSE="BSD-2" |
187 |
-SLOT="0" |
188 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
189 |
-IUSE="doc +fapi +openssl mbedtls static-libs test" |
190 |
- |
191 |
-RESTRICT="!test? ( test )" |
192 |
- |
193 |
-REQUIRED_USE="^^ ( mbedtls openssl ) |
194 |
- fapi? ( openssl !mbedtls )" |
195 |
- |
196 |
-RDEPEND="acct-group/tss |
197 |
- acct-user/tss |
198 |
- fapi? ( dev-libs/json-c |
199 |
- net-misc/curl ) |
200 |
- mbedtls? ( net-libs/mbedtls:= ) |
201 |
- openssl? ( dev-libs/openssl:= )" |
202 |
-DEPEND="${RDEPEND} |
203 |
- test? ( dev-util/cmocka )" |
204 |
-BDEPEND="virtual/pkgconfig |
205 |
- doc? ( app-doc/doxygen )" |
206 |
- |
207 |
-PATCHES=( |
208 |
- "${FILESDIR}/${PN}-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch" |
209 |
- "${FILESDIR}/${PN}-3.0.1-Fix-underquoting-in-configure-ac.patch" |
210 |
-) |
211 |
- |
212 |
-pkg_setup() { |
213 |
- local CONFIG_CHECK=" \ |
214 |
- ~TCG_TPM |
215 |
- " |
216 |
- linux-info_pkg_setup |
217 |
- kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required" |
218 |
-} |
219 |
- |
220 |
-src_prepare() { |
221 |
- default |
222 |
- eautoreconf |
223 |
-} |
224 |
- |
225 |
-src_configure() { |
226 |
- econf \ |
227 |
- --localstatedir=/var \ |
228 |
- $(use_enable doc doxygen-doc) \ |
229 |
- $(use_enable fapi) \ |
230 |
- $(use_enable static-libs static) \ |
231 |
- $(use_enable test unit) \ |
232 |
- --disable-tcti-mssim \ |
233 |
- --disable-defaultflags \ |
234 |
- --disable-weakcrypto \ |
235 |
- --with-crypto="$(usex mbedtls mbed ossl)" \ |
236 |
- --with-runstatedir=/run \ |
237 |
- --with-udevrulesdir="$(get_udevdir)/rules.d" \ |
238 |
- --with-udevrulesprefix=60- \ |
239 |
- --with-sysusersdir="/usr/lib/sysusers.d" \ |
240 |
- --with-tmpfilesdir="/usr/lib/tmpfiles.d" |
241 |
-} |
242 |
- |
243 |
-src_install() { |
244 |
- default |
245 |
- find "${D}" -name '*.la' -delete || die |
246 |
-} |
247 |
- |
248 |
-pkg_postinst() { |
249 |
- tmpfiles_process tpm2-tss-fapi.conf |
250 |
-} |