1 |
commit: 445fe29aae8953bb0b5e100e28b38333715c8119 |
2 |
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Sep 27 21:54:02 2021 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 28 06:14:58 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=445fe29a |
7 |
|
8 |
app-crypt/tpm2-pkcs11: Remove old |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/22426 |
13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
14 |
|
15 |
app-crypt/tpm2-pkcs11/Manifest | 1 - |
16 |
.../files/tpm2-pkcs11-1.3.2-Remove-WError.patch | 12 ---- |
17 |
app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.6.0.ebuild | 68 ---------------------- |
18 |
3 files changed, 81 deletions(-) |
19 |
|
20 |
diff --git a/app-crypt/tpm2-pkcs11/Manifest b/app-crypt/tpm2-pkcs11/Manifest |
21 |
index b5b858c55a4..b9c3a72ad07 100644 |
22 |
--- a/app-crypt/tpm2-pkcs11/Manifest |
23 |
+++ b/app-crypt/tpm2-pkcs11/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST tpm2-pkcs11-1.6.0.tar.gz 1370370 BLAKE2B 5dd8c587688a26958e8406366ce14cdadc9d2279f01276037df3895f49f835bd021b96da2c7399881e23527c79c45d25417b57acfb961f934f29d785dacf87f7 SHA512 db94b2194837564fa330ac7cc15a5185258d5d632f033a60fa82a2b3246e046dac29b6dfece19b4e075383e999ac157286c7f18f6c5ab6a98dd01c8e810065ea |
26 |
DIST tpm2-pkcs11-1.7.0.tar.gz 1386693 BLAKE2B bf53a76be712bda374a8d107910440bab087fdb6c34fee3c748128d471a7a84b08f887ff97c8cdfef632679dd4343cf020e9459b96553cd5feecf76e65d6e290 SHA512 eb2736a7ef00fefa91bb70cc96d94d1c7b6ce3701ab12301658b7b076d8fca93bc590c7cdba5a84934b6bd09dad252b13670804c686e76a65b03c7ef6d96427d |
27 |
|
28 |
diff --git a/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch b/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch |
29 |
deleted file mode 100644 |
30 |
index 7aae19c7c71..00000000000 |
31 |
--- a/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch |
32 |
+++ /dev/null |
33 |
@@ -1,12 +0,0 @@ |
34 |
-diff --git a/configure.ac b/configure.ac |
35 |
-index 3088817..d789ce9 100644 |
36 |
---- a/configure.ac |
37 |
-+++ b/configure.ac |
38 |
-@@ -460,7 +460,6 @@ AS_IF([test x"$enable_hardening" != xno], [ |
39 |
- |
40 |
- add_hardened_c_flag([-Wall]) |
41 |
- add_hardened_c_flag([-Wextra]) |
42 |
-- add_hardened_c_flag([-Werror]) |
43 |
- |
44 |
- add_hardened_c_flag([-Wformat]) |
45 |
- add_hardened_c_flag([-Wformat-security]) |
46 |
|
47 |
diff --git a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.6.0.ebuild b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.6.0.ebuild |
48 |
deleted file mode 100644 |
49 |
index fc4bbfa9a2f..00000000000 |
50 |
--- a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.6.0.ebuild |
51 |
+++ /dev/null |
52 |
@@ -1,68 +0,0 @@ |
53 |
-# Copyright 1999-2021 Gentoo Authors |
54 |
-# Distributed under the terms of the GNU General Public License v2 |
55 |
- |
56 |
-EAPI=7 |
57 |
- |
58 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
59 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
60 |
-PYTHON_REQ_USE="sqlite" |
61 |
- |
62 |
-inherit autotools distutils-r1 |
63 |
- |
64 |
-DESCRIPTION="A PKCS#11 interface for TPM2 hardware" |
65 |
-HOMEPAGE="https://tpm2-software.github.io/" |
66 |
-SRC_URI="https://github.com/tpm2-software/tpm2-pkcs11/releases/download/${PV}/${P}.tar.gz" |
67 |
- |
68 |
-LICENSE="BSD-2" |
69 |
-SLOT="0" |
70 |
-KEYWORDS="~amd64" |
71 |
- |
72 |
-IUSE="fapi" |
73 |
- |
74 |
-# python-pkcs11 is required but not in Portage. python-pkcs11 in turn requires |
75 |
-# aenum which is ALSO not in portage. Futhermore, aenum has a dead homepage. |
76 |
-RESTRICT="test" |
77 |
- |
78 |
-RDEPEND="app-crypt/p11-kit |
79 |
- app-crypt/tpm2-abrmd |
80 |
- app-crypt/tpm2-tools[fapi?] |
81 |
- !fapi? ( app-crypt/tpm2-tss ) |
82 |
- fapi? ( >=app-crypt/tpm2-tss-3.0.1[fapi] ) |
83 |
- dev-db/sqlite:3 |
84 |
- dev-libs/openssl:= |
85 |
- dev-python/cryptography[${PYTHON_USEDEP}] |
86 |
- dev-python/pyasn1[${PYTHON_USEDEP}] |
87 |
- dev-python/pyasn1-modules[${PYTHON_USEDEP}] |
88 |
- dev-python/pyyaml[${PYTHON_USEDEP}] " |
89 |
- |
90 |
-DEPEND="${RDEPEND}" |
91 |
-BDEPEND="sys-devel/autoconf-archive |
92 |
- virtual/pkgconfig" |
93 |
- |
94 |
-PATCHES=( |
95 |
- "${FILESDIR}/${PN}-1.3.2-Remove-WError.patch" |
96 |
-) |
97 |
- |
98 |
-src_prepare() { |
99 |
- default |
100 |
- eautoreconf |
101 |
-} |
102 |
- |
103 |
-src_configure() { |
104 |
- econf \ |
105 |
- $(use_enable fapi) |
106 |
-} |
107 |
- |
108 |
-src_compile() { |
109 |
- default |
110 |
- cd "${S}/tools" || die |
111 |
- BUILD_DIR="${S}/tools" python_foreach_impl distutils-r1_python_compile |
112 |
-} |
113 |
- |
114 |
-src_install() { |
115 |
- default |
116 |
- cd "${S}/tools" || die |
117 |
- BUILD_DIR="${S}/tools" python_foreach_impl distutils-r1_python_install |
118 |
- dobin "${S}/tools/tpm2_ptool" |
119 |
- find "${ED}" -name '*.la' -delete || die |
120 |
-} |