| 1 |
commit: 67d70633119f9edce686d0233fded6db1423e8d5 |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 2 16:32:07 2021 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 2 16:40:48 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67d70633 |
| 7 |
|
| 8 |
app-crypt/tpm2-tools: remove libressl support |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
| 11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 12 |
|
| 13 |
app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild | 8 +++----- |
| 14 |
app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild | 8 +++----- |
| 15 |
2 files changed, 6 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild |
| 18 |
index f9edff247c5..01663f80cd5 100644 |
| 19 |
--- a/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild |
| 20 |
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild |
| 21 |
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar |
| 22 |
LICENSE="BSD" |
| 23 |
SLOT="0" |
| 24 |
KEYWORDS="~amd64" |
| 25 |
-IUSE="+fapi libressl" |
| 26 |
+IUSE="+fapi" |
| 27 |
|
| 28 |
# Integration test are now run as part of the testing suite, which will fail |
| 29 |
# because none of the supported TPM emulators are in Portage. In a future |
| 30 |
@@ -21,13 +21,11 @@ RESTRICT="test" |
| 31 |
|
| 32 |
RDEPEND="net-misc/curl:= |
| 33 |
>=app-crypt/tpm2-tss-2.4.0:=[fapi?] |
| 34 |
- !libressl? ( dev-libs/openssl:0= ) |
| 35 |
- libressl? ( dev-libs/libressl:0= )" |
| 36 |
+ dev-libs/openssl:0=" |
| 37 |
DEPEND="${RDEPEND}" |
| 38 |
BDEPEND="virtual/pkgconfig |
| 39 |
sys-devel/autoconf-archive" |
| 40 |
PATCHES=( |
| 41 |
- "${FILESDIR}/${PN}-4.3.0-libressl.patch" |
| 42 |
"${FILESDIR}/${PN}-4.3.0-Remove-WError.patch" |
| 43 |
) |
| 44 |
|
| 45 |
@@ -42,5 +40,5 @@ src_prepare() { |
| 46 |
src_configure() { |
| 47 |
econf \ |
| 48 |
$(use_enable fapi) \ |
| 49 |
- $(use_enable !libressl hardening) |
| 50 |
+ --enable-hardening |
| 51 |
} |
| 52 |
|
| 53 |
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild |
| 54 |
index 375c04e216e..344be726c38 100644 |
| 55 |
--- a/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild |
| 56 |
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild |
| 57 |
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar |
| 58 |
LICENSE="BSD" |
| 59 |
SLOT="0" |
| 60 |
KEYWORDS="~amd64" |
| 61 |
-IUSE="+fapi libressl" |
| 62 |
+IUSE="+fapi" |
| 63 |
|
| 64 |
# Integration test are now run as part of the testing suite, which will fail |
| 65 |
# because none of the supported TPM emulators are in Portage. In a future |
| 66 |
@@ -21,13 +21,11 @@ RESTRICT="test" |
| 67 |
|
| 68 |
RDEPEND="net-misc/curl:= |
| 69 |
>=app-crypt/tpm2-tss-3.0.1:=[fapi?] |
| 70 |
- !libressl? ( dev-libs/openssl:0= ) |
| 71 |
- libressl? ( dev-libs/libressl:0= )" |
| 72 |
+ dev-libs/openssl:0=" |
| 73 |
DEPEND="${RDEPEND}" |
| 74 |
BDEPEND="virtual/pkgconfig |
| 75 |
sys-devel/autoconf-archive" |
| 76 |
PATCHES=( |
| 77 |
- "${FILESDIR}/${PN}-5.0-libressl.patch" |
| 78 |
"${FILESDIR}/${PN}-4.3.0-Remove-WError.patch" |
| 79 |
) |
| 80 |
|
| 81 |
@@ -42,5 +40,5 @@ src_prepare() { |
| 82 |
src_configure() { |
| 83 |
econf \ |
| 84 |
$(use_enable fapi) \ |
| 85 |
- $(use_enable !libressl hardening) |
| 86 |
+ --enable-hardening |
| 87 |
} |
Archives