summaryrefslogtreecommitdiff
path: root/app-crypt
diff options
context:
space:
mode:
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/Manifest.gzbin28281 -> 28294 bytes
-rw-r--r--app-crypt/glep63-check/Manifest2
-rw-r--r--app-crypt/glep63-check/glep63-check-10.ebuild1
-rw-r--r--app-crypt/ima-evm-utils/Manifest4
-rw-r--r--app-crypt/ima-evm-utils/ima-evm-utils-1.3.2.ebuild46
-rw-r--r--app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild20
-rw-r--r--app-crypt/tpm2-pkcs11/Manifest5
-rw-r--r--app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch12
-rw-r--r--app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.7.0.ebuild (renamed from app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.6.0.ebuild)37
9 files changed, 82 insertions, 45 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index c420b4c01f6c..c65ae5ff0540 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
Binary files differ
diff --git a/app-crypt/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
index 001e5417796f..d4fd326b89d1 100644
--- a/app-crypt/glep63-check/Manifest
+++ b/app-crypt/glep63-check/Manifest
@@ -1,5 +1,5 @@
DIST glep63-check-10.tar.gz 73550 BLAKE2B af45dce2a89e4af31a81e979659494c47b9c24f3fb71cccc33e84d6fc2900339ecefcafb1b6186b1e19e9fce7a2f17df754005c91828d27d0d2d9fe67586661e SHA512 d2fbfdb1b60250897b5d9582111573b6ed78f02b30d66cffc0fa94e0a1136dc0f3561e808b66d9b8ce43fca9fbdaf1548790c7c2395929308ff24d42d18ecf03
DIST glep63-check-9.tar.gz 73445 BLAKE2B cd229065da9a4663491a891787d2a9e719cd9d61ea5974393199ca418413e7e1c6b73a3146577b26029ceb3302f430ed1051c9d050278b098b18407e95c1cac3 SHA512 86c49ffe2b8dde3735b85ff4808862c460b1e832fa9c3fca4fc2ea776d314c29ed2442adef2e1dbca1cec81b6ea29bbb417b123306602dfaa611b5153dddb7ac
-EBUILD glep63-check-10.ebuild 551 BLAKE2B 694217b96184f979f3253bd7768595990be6ecbfde11ada0c79f21bbe0dd4355f32043527506896962052e9a0dc8d7f4c02c80eb3dde8ab2532cc3f4675cc992 SHA512 e154ae12c064980624baf5b2bc22b5c42a89b479bc21962a64a77dc6f5b264dd5a8f5401e2814c64151d7d575b335529084e20e6670b067d6e8d38348969efcb
+EBUILD glep63-check-10.ebuild 578 BLAKE2B 55866cf4987dbca5a6f4b7fe1e6321f6c659ca5eabb5c8108fa3dde8089c3685b411fb1e62c5e441fd2116c53e02ab4b2ae2e96d50c40ad219f599eaf1524d67 SHA512 a46d1b4c7807a60b582b0f202fc1b7d5576f165ce53dff6557fbb47e89982cf392abd968fcb7584ed236a7567796ed67941b6318d58e74bd656f18951c4bd5de
EBUILD glep63-check-9.ebuild 686 BLAKE2B f3e108b7e17d3c2e63d56641306c4b5c3a39cdf4da469921d0fef3f7f0b1be0e753b07c4dc049d08710d5952117437ac1ae80424f56a56243016a42c25d0e00e SHA512 493c8cf0ce6feaa44b7212ebe10abb93169accbd6f4542cf99c32512871c0d47143ff64cc0ad705a154140918eb0a160e885ccf008f5da45d8ad9efb490f3012
MISC metadata.xml 538 BLAKE2B f8b4385968fe1f9504666398550baf1c13a0f840e9d0d9c1f80caa7bca9001ed679a22bfba1e8b62064d0d5e6507e0eb8f40cf1e44b57f4e4a0830b1aae36c74 SHA512 6dbcbf2413392f6bc587cb96f6f127af72f5412d07c4c7a40472304470fb90390d05057010ad383d8431481b09d54df972f5873d69c2908dd6f80b27e52e75ba
diff --git a/app-crypt/glep63-check/glep63-check-10.ebuild b/app-crypt/glep63-check/glep63-check-10.ebuild
index 61e18a116228..c11a81b67fe5 100644
--- a/app-crypt/glep63-check/glep63-check-10.ebuild
+++ b/app-crypt/glep63-check/glep63-check-10.ebuild
@@ -21,6 +21,7 @@ KEYWORDS="~amd64 ~x86"
RDEPEND="app-crypt/gnupg"
DEPEND="
test? (
+ >=app-crypt/gnupg-2.2.29
sys-libs/libfaketime
)"
diff --git a/app-crypt/ima-evm-utils/Manifest b/app-crypt/ima-evm-utils/Manifest
index 2dfdd87ff387..c43718818651 100644
--- a/app-crypt/ima-evm-utils/Manifest
+++ b/app-crypt/ima-evm-utils/Manifest
@@ -1,5 +1,7 @@
AUX ima-evm-utils-1.1-configure-use-sys-xattr-bug-649790.patch 1332 BLAKE2B 1787a1f7154843123c1b4879f2e159ffef5ed8edb64a34ba84c5cbc71b1bdf34db63686e26f44554da67731ed857ca399219a1e7b36ca1630bac0705be56d2de SHA512 02642544797076d3c1568b11cc8edb303d844a2b9d9088af80f3bf7135da25635cbf7ce67387d9c51365466fc60942254773854fb9eff5562e2c7fff88d5a42f
DIST ima-evm-utils-1.1.tar.gz 37825 BLAKE2B 469f5bbc194f3fcc8996f252d01745c0d8d4d4f63476174622ea4569c97978db478bd522ae4672819c5ef995f2bb524eb857e5bf5c303131959f2f5cb9c2ebcc SHA512 fc7efc890812233db888eef210dc4357bee838b56fd95efd9a9e141d684b0b354670a3c053dd93a94a1402dd826074d4a83a4637c8e6c1d90ead3132354a5776
+DIST ima-evm-utils-1.3.2.tar.gz 100373 BLAKE2B 04717a934795f7e2a351b1f59388d2d429e00a8a18c57c0eb258bb81bc329342cb9971fa2b4493f7b492f07961ec794a0549fd2d0984381492dcab474915a0d6 SHA512 af96935f953fbec8cdd40ba1a24001fae916633df03f9dee1e96775baec0ffea21a7a13798b3e3c3f375fd493a65fe65b5357887890b46cac0c4dcca5a5b79db
EBUILD ima-evm-utils-1.1-r1.ebuild 930 BLAKE2B e781a98fbaa64eddde0e5da3e83078d081b38fd5793233774d704e78f1cb0fccbf6c4967cf3b54c4fe9b7441ea65368744d5dbc5bf19742bcf4cf2636ac10419 SHA512 d0ce0baafa523571fe772d277c86cf56cc9f540e13dd8a0e6b90332f61abb9c4ee9417adb2452f6e56b8b482ffb240d42025e24fb95794b0598c2d8fc27bb746
-EBUILD ima-evm-utils-9999.ebuild 846 BLAKE2B 4597d73c6834177822a8ec9067a2b80a048bad69b51d0592fcf9a254050c08f62d9f9115b6ceb1e5bbb24b16682922690015cc12e9ca16deb126100f07749b6d SHA512 69a422bf56c8dfcfb7ed190d134b461311be05498b7f9b090d6c0152f14d840657a69a5481222b3a22662aa7e80f489ae49095c5a1057edcdbf8fc5ca0c12561
+EBUILD ima-evm-utils-1.3.2.ebuild 939 BLAKE2B 65582200fc5b73c90d4fef83297001d1d94c76fb4f7a60550929ae8fb25314fe3efdde4b0dbea4de577ba75e78d171342c7c04ef94d544d60d5a2cb9296cfc72 SHA512 348f47d3a235ba09437593c6408c5cf3f7d448f0f238138208d1e2181800b7eb4e3d3a34e2612eb77a0c3ecea706cac295fa5350921e70dd2674687392e041f5
+EBUILD ima-evm-utils-9999.ebuild 924 BLAKE2B a78f12fd68b67be06b6d897ff864ad1df3e864a0b102e6b483045aa4e34410f603126895d1e97509ed26d98eb760b79cdd7256db5fe3e5beda289aefe1e91d71 SHA512 3306757d5d64cf1fab08f1260484c71b4bd333eb106baa57bdc70f7396680db3a5ecc74ca2f2629119851bb70a4db8f4bff632c3689ea47c5717b872e497f065
MISC metadata.xml 331 BLAKE2B 1c72879ab3666f6dcb1b9b4f5b268ba4763a4d0c833e349d454a3a480ae70f3f287b1514ec04f3c79595658f7815d1e35be5247af5b64d0036b1c2206529ed7d SHA512 6c63abaa5dfda37911626af3683da11115bc6f753cba511a95b4c129912c19e516b8a4a71f9fe905c27924022e2bc6585444683000a4d6a2c3b3709b0818fa76
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-1.3.2.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-1.3.2.ebuild
new file mode 100644
index 000000000000..760e13c50315
--- /dev/null
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-1.3.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Supporting tools for IMA and EVM"
+HOMEPAGE="http://linux-ima.sourceforge.net"
+SRC_URI="https://download.sourceforge.net/linux-ima/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test"
+
+RDEPEND="
+ dev-libs/openssl:0=
+ sys-apps/keyutils:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-text/asciidoc
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ test? ( app-editors/vim-core )"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+ default
+
+ sed -i '/^MANPAGE_DOCBOOK_XSL/s:/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl:/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' Makefile.am || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable debug) \
+ --disable-static
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
index d967038aff71..bdb4d49d4f72 100644
--- a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
@@ -1,25 +1,29 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools git-r3
DESCRIPTION="Supporting tools for IMA and EVM"
HOMEPAGE="http://linux-ima.sourceforge.net"
-EGIT_REPO_URI="git://git.code.sf.net/p/linux-ima/ima-evm-utils"
+EGIT_REPO_URI="https://git.code.sf.net/p/linux-ima/ima-evm-utils"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug test"
RDEPEND="
dev-libs/openssl:0=
sys-apps/keyutils:="
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
app-text/asciidoc
app-text/docbook-xsl-stylesheets
- dev-libs/libxslt"
+ dev-libs/libxslt
+ test? ( app-editors/vim-core )"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
+RESTRICT="!test? ( test )"
src_prepare() {
default
diff --git a/app-crypt/tpm2-pkcs11/Manifest b/app-crypt/tpm2-pkcs11/Manifest
index 5f8fd8cf5da6..a7b7c18c0a89 100644
--- a/app-crypt/tpm2-pkcs11/Manifest
+++ b/app-crypt/tpm2-pkcs11/Manifest
@@ -1,4 +1,3 @@
-AUX tpm2-pkcs11-1.3.2-Remove-WError.patch 356 BLAKE2B d3c124abbad2e3f8a818091293156840e22fca3aa59b59ff8af4f5e3ddd351e56e1619c647b89fd84df7e804bfccd608a1c9ea89d586ca84eb0326d3563ebf79 SHA512 4cd405ff046fd209bcc543c55514e5750007f76e2ed014bcf50975d62493feee0173c0649a06632d2aff2bcd39375be4ec5d341ba75558a257edf7a4ae03a63c
-DIST tpm2-pkcs11-1.6.0.tar.gz 1370370 BLAKE2B 5dd8c587688a26958e8406366ce14cdadc9d2279f01276037df3895f49f835bd021b96da2c7399881e23527c79c45d25417b57acfb961f934f29d785dacf87f7 SHA512 db94b2194837564fa330ac7cc15a5185258d5d632f033a60fa82a2b3246e046dac29b6dfece19b4e075383e999ac157286c7f18f6c5ab6a98dd01c8e810065ea
-EBUILD tpm2-pkcs11-1.6.0.ebuild 1559 BLAKE2B 91679bcf8eec8fe09d12601bbfa0bf0ad120d6eb60b0025044d31f814506bfeda522948dd150fbe9331c382f6079e35776dc85717879c4f0abfc99e61c1ad3b0 SHA512 9eba3fe01a307f46680bbd7e9880c71a6368d56711c67fdd10bc9f5d67bf934400621946df67e9528a8d93fbd60a140e9af4f5da3743ba50663ae6b83edc0c87
+DIST tpm2-pkcs11-1.7.0.tar.gz 1386693 BLAKE2B bf53a76be712bda374a8d107910440bab087fdb6c34fee3c748128d471a7a84b08f887ff97c8cdfef632679dd4343cf020e9459b96553cd5feecf76e65d6e290 SHA512 eb2736a7ef00fefa91bb70cc96d94d1c7b6ce3701ab12301658b7b076d8fca93bc590c7cdba5a84934b6bd09dad252b13670804c686e76a65b03c7ef6d96427d
+EBUILD tpm2-pkcs11-1.7.0.ebuild 1436 BLAKE2B 9bbf63d22a2f29bcc0fe5860563a7f445e19ec5ac293eae4c547a90e7fd1c99eebf9d5820469095d6d2a6dc5dc272e7a4b10b039950521153c7fe7009d5bf835 SHA512 ab607f6dc726f8afc9e0a6c71c0d8a7007bbe09d5f4b3d3bdcd8d8d9b994356c07d2a1f03d695ec543daeb4a2de975fa53d06b9825e40af3a49167335df759e2
MISC metadata.xml 473 BLAKE2B 66d9a37ccc8a1dc4e94798394a6e33090a42922d40ca87b55b687207da072ed50a12b985e9261863a4208bced5a76c856e1d05eeed78b27a766dc56234a40ff1 SHA512 e15ae6f4fa11fe7719ba7692b04f7b81563f6c1ea7caa1984c0e0957c18a53abb87ea70c27f0972fec6f6b8608f94142e7791cbd9c2025d7ad0d17889968a549
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
deleted file mode 100644
index 7aae19c7c71f..000000000000
--- a/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 3088817..d789ce9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -460,7 +460,6 @@ AS_IF([test x"$enable_hardening" != xno], [
-
- add_hardened_c_flag([-Wall])
- add_hardened_c_flag([-Wextra])
-- add_hardened_c_flag([-Werror])
-
- add_hardened_c_flag([-Wformat])
- add_hardened_c_flag([-Wformat-security])
diff --git a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.6.0.ebuild b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.7.0.ebuild
index fc4bbfa9a2f1..407c9604607b 100644
--- a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.6.0.ebuild
+++ b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.7.0.ebuild
@@ -1,13 +1,12 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="sqlite"
-inherit autotools distutils-r1
+inherit distutils-r1
DESCRIPTION="A PKCS#11 interface for TPM2 hardware"
HOMEPAGE="https://tpm2-software.github.io/"
@@ -17,11 +16,10 @@ LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="fapi"
+IUSE="fapi test"
-# python-pkcs11 is required but not in Portage. python-pkcs11 in turn requires
-# aenum which is ALSO not in portage. Futhermore, aenum has a dead homepage.
-RESTRICT="test"
+# Units tests only for now
+RESTRICT="!test? ( test )"
RDEPEND="app-crypt/p11-kit
app-crypt/tpm2-abrmd
@@ -29,28 +27,23 @@ RDEPEND="app-crypt/p11-kit
!fapi? ( app-crypt/tpm2-tss )
fapi? ( >=app-crypt/tpm2-tss-3.0.1[fapi] )
dev-db/sqlite:3
+ dev-libs/libyaml
dev-libs/openssl:=
+ dev-python/bcrypt[${PYTHON_USEDEP}]
dev-python/cryptography[${PYTHON_USEDEP}]
dev-python/pyasn1[${PYTHON_USEDEP}]
dev-python/pyasn1-modules[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}] "
+ dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
+DEPEND="test? ( dev-util/cmocka )
+ ${RDEPEND}"
BDEPEND="sys-devel/autoconf-archive
virtual/pkgconfig"
-PATCHES=(
- "${FILESDIR}/${PN}-1.3.2-Remove-WError.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
src_configure() {
econf \
- $(use_enable fapi)
+ $(use_enable fapi) \
+ $(use_enable test unit)
}
src_compile() {
@@ -66,3 +59,7 @@ src_install() {
dobin "${S}/tools/tpm2_ptool"
find "${ED}" -name '*.la' -delete || die
}
+
+src_test() {
+ default
+}