summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/acme-sh/Manifest2
-rw-r--r--app-crypt/acme-sh/acme-sh-3.0.4.ebuild (renamed from app-crypt/acme-sh/acme-sh-3.0.1.ebuild)7
-rw-r--r--app-crypt/acme-sh/acme-sh-9999.ebuild7
-rw-r--r--app-crypt/acme-tiny/Manifest1
-rw-r--r--app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild47
-rw-r--r--app-crypt/acme-tiny/acme-tiny-9999.ebuild4
-rw-r--r--app-crypt/acme/Manifest5
-rw-r--r--app-crypt/acme/acme-1.26.0.ebuild (renamed from app-crypt/acme/acme-1.22.0.ebuild)6
-rw-r--r--app-crypt/acme/acme-1.27.0.ebuild (renamed from app-crypt/acme/acme-1.21.0.ebuild)10
-rw-r--r--app-crypt/acme/acme-1.28.0.ebuild39
-rw-r--r--app-crypt/acme/acme-9999.ebuild8
-rw-r--r--app-crypt/adcli/adcli-0.9.1-r2.ebuild (renamed from app-crypt/adcli/adcli-0.9.1-r1.ebuild)2
-rw-r--r--app-crypt/adcli/metadata.xml3
-rw-r--r--app-crypt/argon2/argon2-20190702-r1.ebuild6
-rw-r--r--app-crypt/asekey/asekey-3.7.ebuild4
-rw-r--r--app-crypt/ccid/Manifest1
-rw-r--r--app-crypt/ccid/ccid-1.5.0.ebuild61
-rw-r--r--app-crypt/certbot-apache/Manifest5
-rw-r--r--app-crypt/certbot-apache/certbot-apache-1.26.0.ebuild (renamed from app-crypt/certbot-apache/certbot-apache-1.22.0.ebuild)0
-rw-r--r--app-crypt/certbot-apache/certbot-apache-1.27.0.ebuild (renamed from app-crypt/certbot-apache/certbot-apache-1.21.0.ebuild)2
-rw-r--r--app-crypt/certbot-apache/certbot-apache-1.28.0.ebuild33
-rw-r--r--app-crypt/certbot-nginx/Manifest5
-rw-r--r--app-crypt/certbot-nginx/certbot-nginx-1.26.0.ebuild (renamed from app-crypt/certbot-nginx/certbot-nginx-1.22.0.ebuild)4
-rw-r--r--app-crypt/certbot-nginx/certbot-nginx-1.27.0.ebuild (renamed from app-crypt/certbot-nginx/certbot-nginx-1.21.0.ebuild)6
-rw-r--r--app-crypt/certbot-nginx/certbot-nginx-1.28.0.ebuild35
-rw-r--r--app-crypt/certbot-nginx/certbot-nginx-9999.ebuild6
-rw-r--r--app-crypt/certbot/Manifest5
-rw-r--r--app-crypt/certbot/certbot-1.26.0.ebuild (renamed from app-crypt/certbot/certbot-1.22.0.ebuild)9
-rw-r--r--app-crypt/certbot/certbot-1.27.0.ebuild (renamed from app-crypt/certbot/certbot-1.21.0.ebuild)13
-rw-r--r--app-crypt/certbot/certbot-1.28.0.ebuild42
-rw-r--r--app-crypt/certbot/certbot-9999.ebuild11
-rw-r--r--app-crypt/codecrypt/Manifest1
-rw-r--r--app-crypt/codecrypt/codecrypt-1.7.2-r1.ebuild30
-rw-r--r--app-crypt/codecrypt/codecrypt-1.8-r2.ebuild4
-rw-r--r--app-crypt/coolkey/coolkey-1.1.0-r7.ebuild82
-rw-r--r--app-crypt/dehydrated/dehydrated-0.7.0.ebuild4
-rw-r--r--app-crypt/dehydrated/metadata.xml4
-rw-r--r--app-crypt/dieharder/dieharder-3.31.1-r4.ebuild4
-rw-r--r--app-crypt/eid-mw/Manifest1
-rw-r--r--app-crypt/eid-mw/eid-mw-5.1.4.ebuild118
-rw-r--r--app-crypt/gcr/Manifest1
-rw-r--r--app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch27
-rw-r--r--app-crypt/gcr/gcr-3.40.0.ebuild2
-rw-r--r--app-crypt/gcr/gcr-3.41.0.ebuild89
-rw-r--r--app-crypt/glep63-check/Manifest2
-rw-r--r--app-crypt/glep63-check/glep63-check-10.ebuild4
-rw-r--r--app-crypt/glep63-check/glep63-check-11.ebuild28
-rw-r--r--app-crypt/glep63-check/glep63-check-9.ebuild31
-rw-r--r--app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.initd2
-rw-r--r--app-crypt/gnupg/Manifest8
-rw-r--r--app-crypt/gnupg/files/gnupg-2.2.35-status-messages-garbled.patch45
-rw-r--r--app-crypt/gnupg/files/gnupg-2.3.6-status-messages-garbled.patch45
-rw-r--r--app-crypt/gnupg/gnupg-2.2.35-r1.ebuild (renamed from app-crypt/gnupg/gnupg-2.2.33-r1.ebuild)35
-rw-r--r--app-crypt/gnupg/gnupg-2.2.35.ebuild (renamed from app-crypt/gnupg/gnupg-2.2.32-r1.ebuild)32
-rw-r--r--app-crypt/gnupg/gnupg-2.3.6-r1.ebuild (renamed from app-crypt/gnupg/gnupg-2.3.4.ebuild)37
-rw-r--r--app-crypt/gnupg/gnupg-2.3.6.ebuild (renamed from app-crypt/gnupg/gnupg-2.3.3-r1.ebuild)36
-rw-r--r--app-crypt/gnupg/metadata.xml7
-rw-r--r--app-crypt/gorilla/gorilla-1.4-r2.ebuild (renamed from app-crypt/gorilla/gorilla-1.4-r1.ebuild)6
-rw-r--r--app-crypt/gpa/metadata.xml6
-rw-r--r--app-crypt/gpgme/Manifest4
-rw-r--r--app-crypt/gpgme/files/gpgme-1.16.0-fix-t-edit-sign-test.patch120
-rw-r--r--app-crypt/gpgme/gpgme-1.15.1.ebuild111
-rw-r--r--app-crypt/gpgme/gpgme-1.16.0.ebuild16
-rw-r--r--app-crypt/gpgme/gpgme-1.17.1-r1.ebuild126
-rw-r--r--app-crypt/gpgme/metadata.xml6
-rw-r--r--app-crypt/gpgstats/gpgstats-0.5-r2.ebuild (renamed from app-crypt/gpgstats/gpgstats-0.5-r1.ebuild)14
-rw-r--r--app-crypt/heimdal/heimdal-7.7.0-r5.ebuild (renamed from app-crypt/heimdal/heimdal-7.7.0-r3.ebuild)15
-rw-r--r--app-crypt/hmaccalc/Manifest1
-rw-r--r--app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild25
-rw-r--r--app-crypt/hmaccalc/metadata.xml14
-rw-r--r--app-crypt/ima-evm-utils/Manifest1
-rw-r--r--app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-configure-remove-automagic-TSS-dependencies.patch39
-rw-r--r--app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-test-Rename-bash-variable-WORKDIR-to-MYWORKDIR.patch84
-rw-r--r--app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-test-remove-boot_aggregate.patch216
-rw-r--r--app-crypt/ima-evm-utils/ima-evm-utils-1.4-r1.ebuild52
-rw-r--r--app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild18
-rw-r--r--app-crypt/ima-evm-utils/metadata.xml3
-rw-r--r--app-crypt/jitterentropy-rngd/Manifest3
-rw-r--r--app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.5.ebuild31
-rw-r--r--app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.7.ebuild (renamed from app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.6.ebuild)6
-rw-r--r--app-crypt/jitterentropy/Manifest1
-rw-r--r--app-crypt/jitterentropy/jitterentropy-3.3.1.ebuild49
-rw-r--r--app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild10
-rw-r--r--app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild10
-rw-r--r--app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild12
-rw-r--r--app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild12
-rw-r--r--app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild8
-rw-r--r--app-crypt/libb2/libb2-0.98.1-r2.ebuild11
-rw-r--r--app-crypt/libb2/libb2-0.98.1-r3.ebuild13
-rw-r--r--app-crypt/libmd/libmd-1.0.4.ebuild4
-rw-r--r--app-crypt/libscrypt/Manifest1
-rw-r--r--app-crypt/libscrypt/libscrypt-1.21.ebuild6
-rw-r--r--app-crypt/libscrypt/libscrypt-1.22.ebuild32
-rw-r--r--app-crypt/libsecret/Manifest2
-rw-r--r--app-crypt/libsecret/files/libsecret-0.20.4-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch44
-rw-r--r--app-crypt/libsecret/libsecret-0.20.4-r1.ebuild95
-rw-r--r--app-crypt/libsecret/libsecret-0.20.5-r3.ebuild155
-rw-r--r--app-crypt/libsecret/metadata.xml3
-rw-r--r--app-crypt/libu2f-host/libu2f-host-1.1.10-r1.ebuild50
-rw-r--r--app-crypt/minisign/minisign-0.10.ebuild4
-rw-r--r--app-crypt/minisign/minisign-9999.ebuild4
-rw-r--r--app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r3.ebuild4
-rw-r--r--app-crypt/mit-krb5/Manifest2
-rw-r--r--app-crypt/mit-krb5/mit-krb5-1.19.2-r4.ebuild (renamed from app-crypt/mit-krb5/mit-krb5-1.19.2-r2.ebuild)11
-rw-r--r--app-crypt/mit-krb5/mit-krb5-1.19.3-r2.ebuild161
-rw-r--r--app-crypt/mit-krb5/mit-krb5-1.20.ebuild147
-rw-r--r--app-crypt/mkp224o/Manifest1
-rw-r--r--app-crypt/mkp224o/metadata.xml14
-rw-r--r--app-crypt/mkp224o/mkp224o-1.5.0.ebuild36
-rw-r--r--app-crypt/monkeysphere/files/monkeysphere-0.44-no-werror.patch12
-rw-r--r--app-crypt/monkeysphere/monkeysphere-0.44.ebuild26
-rw-r--r--app-crypt/moolticute/files/moolticuted.init-r112
-rw-r--r--app-crypt/moolticute/moolticute-0.43.19-r1.ebuild66
-rw-r--r--app-crypt/moolticute/moolticute-9999.ebuild4
-rw-r--r--app-crypt/nasty/nasty-0.6-r2.ebuild (renamed from app-crypt/nasty/nasty-0.6-r1.ebuild)18
-rw-r--r--app-crypt/nwipe/Manifest2
-rw-r--r--app-crypt/nwipe/nwipe-0.33.ebuild (renamed from app-crypt/nwipe/nwipe-0.32.ebuild)2
-rw-r--r--app-crypt/ophcrack/ophcrack-3.8.0.ebuild7
-rw-r--r--app-crypt/p11-kit/Manifest2
-rw-r--r--app-crypt/p11-kit/p11-kit-0.23.22.ebuild4
-rw-r--r--app-crypt/p11-kit/p11-kit-0.24.1.ebuild (renamed from app-crypt/p11-kit/p11-kit-0.24.0.ebuild)8
-rw-r--r--app-crypt/pdfcrack/pdfcrack-0.19.ebuild4
-rw-r--r--app-crypt/pesign/Manifest2
-rw-r--r--app-crypt/pesign/files/pesign-113-enum-conversion.patch46
-rw-r--r--app-crypt/pesign/files/pesign-113-nss.patch47
-rw-r--r--app-crypt/pesign/files/pesign-114-format-string.patch111
-rw-r--r--app-crypt/pesign/files/pesign-114-no-werror.patch13
-rw-r--r--app-crypt/pesign/files/pesign-114-wanalyzer-diagnostic.patch19
-rw-r--r--app-crypt/pesign/pesign-114.ebuild (renamed from app-crypt/pesign/pesign-113.ebuild)29
-rw-r--r--app-crypt/pinentry/Manifest1
-rw-r--r--app-crypt/pinentry/pinentry-1.2.0-r1.ebuild (renamed from app-crypt/pinentry/pinentry-1.1.1-r1.ebuild)13
-rw-r--r--app-crypt/pinentry/pinentry-1.2.0.ebuild8
-rw-r--r--app-crypt/pius/pius-3.0.0-r1.ebuild4
-rw-r--r--app-crypt/qca/qca-2.3.4.ebuild4
-rw-r--r--app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild6
-rw-r--r--app-crypt/rhash/Manifest2
-rw-r--r--app-crypt/rhash/files/darwin-triplet.patch23
-rw-r--r--app-crypt/rhash/files/freebsd-triplet.patch23
-rw-r--r--app-crypt/rhash/files/rhash-1.3.6-no_echon.patch54
-rw-r--r--app-crypt/rhash/files/unquote-cc.patch26
-rw-r--r--app-crypt/rhash/rhash-1.4.2.ebuild4
-rw-r--r--app-crypt/rhash/rhash-1.4.3.ebuild (renamed from app-crypt/rhash/rhash-1.3.6-r1.ebuild)43
-rw-r--r--app-crypt/sbsigntools/files/sbsigntools-0.9.4-no-werror.patch13
-rw-r--r--app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild9
-rw-r--r--app-crypt/seahorse-sharing/Manifest1
-rw-r--r--app-crypt/seahorse-sharing/metadata.xml8
-rw-r--r--app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild59
-rw-r--r--app-crypt/seahorse/Manifest2
-rw-r--r--app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch29
-rw-r--r--app-crypt/seahorse/files/seahorse-40.0-fix-segfault-with-ldap-disabled.patch29
-rw-r--r--app-crypt/seahorse/seahorse-41.0-r1.ebuild (renamed from app-crypt/seahorse/seahorse-40.0-r1.ebuild)17
-rw-r--r--app-crypt/seahorse/seahorse-42.0.ebuild (renamed from app-crypt/seahorse/seahorse-41.0.ebuild)17
-rw-r--r--app-crypt/sequoia-sq/Manifest469
-rw-r--r--app-crypt/sequoia-sq/sequoia-sq-0.25.0.ebuild316
-rw-r--r--app-crypt/sequoia-sq/sequoia-sq-0.26.0.ebuild449
-rw-r--r--app-crypt/sequoia-sqv/sequoia-sqv-1.1.0.ebuild4
-rw-r--r--app-crypt/signify/signify-30-r2.ebuild4
-rw-r--r--app-crypt/signing-party/Manifest1
-rw-r--r--app-crypt/signing-party/signing-party-2.10-r1.ebuild115
-rw-r--r--app-crypt/signing-party/signing-party-2.11.ebuild4
-rw-r--r--app-crypt/ssss/ssss-0.5.7-r1.ebuild (renamed from app-crypt/ssss/ssss-0.5.7.ebuild)4
-rw-r--r--app-crypt/swtpm/Manifest3
-rw-r--r--app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch26
-rw-r--r--app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch42
-rw-r--r--app-crypt/swtpm/swtpm-0.6.1.ebuild70
-rw-r--r--app-crypt/swtpm/swtpm-0.7.3.ebuild (renamed from app-crypt/swtpm/swtpm-0.7.0.ebuild)18
-rw-r--r--app-crypt/tc-play/tc-play-2.0-r1.ebuild8
-rw-r--r--app-crypt/tpm2-abrmd/Manifest2
-rw-r--r--app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.1-r1.ebuild (renamed from app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.0.ebuild)16
-rw-r--r--app-crypt/tpm2-pkcs11/Manifest2
-rw-r--r--app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.8.0.ebuild (renamed from app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.7.0.ebuild)36
-rw-r--r--app-crypt/tpm2-tools/Manifest1
-rw-r--r--app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch12
-rw-r--r--app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild44
-rw-r--r--app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild (renamed from app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild)12
-rw-r--r--app-crypt/tpm2-totp/tpm2-totp-0.3.0-r1.ebuild (renamed from app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild)6
-rw-r--r--app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r1.ebuild (renamed from app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0.ebuild)5
-rw-r--r--app-crypt/tpm2-tss/Manifest4
-rw-r--r--app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch53
-rw-r--r--app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch15
-rw-r--r--app-crypt/tpm2-tss/metadata.xml1
-rw-r--r--app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild78
-rw-r--r--app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild78
-rw-r--r--app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild (renamed from app-crypt/tpm2-tss/tpm2-tss-3.1.0.ebuild)53
-rw-r--r--app-crypt/trousers/Manifest1
-rw-r--r--app-crypt/trousers/files/tcsd.confd9
-rw-r--r--app-crypt/trousers/files/tcsd.initd31
-rw-r--r--app-crypt/trousers/files/trousers-0.3.14-fno-common.patch15
-rw-r--r--app-crypt/trousers/files/trousers-0.3.14-tcsd-fixes.patch58
-rw-r--r--app-crypt/trousers/trousers-0.3.14-r3.ebuild68
-rw-r--r--app-crypt/trousers/trousers-0.3.15.ebuild11
-rw-r--r--app-crypt/veracrypt/Manifest2
-rw-r--r--app-crypt/veracrypt/veracrypt-1.25.7.ebuild99
-rw-r--r--app-crypt/veracrypt/veracrypt-1.25.9.ebuild99
-rw-r--r--app-crypt/xca/Manifest1
-rw-r--r--app-crypt/xca/files/xca-2.3.0-bug-733000.patch28
-rw-r--r--app-crypt/xca/xca-2.3.0-r1.ebuild70
-rw-r--r--app-crypt/xca/xca-2.4.0-r1.ebuild71
-rw-r--r--app-crypt/yubikey-manager/Manifest3
-rw-r--r--app-crypt/yubikey-manager/yubikey-manager-4.0.5-r1.ebuild36
-rw-r--r--app-crypt/yubikey-manager/yubikey-manager-4.0.8.ebuild (renamed from app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild)14
201 files changed, 3710 insertions, 2573 deletions
diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
index 713a25283ec..f7bc015bfae 100644
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@@ -1 +1 @@
-DIST acme.sh-3.0.1.tar.gz 239311 BLAKE2B cbbaf6da068447c3400081889e249dc6f17f56df2038d75915eb990e417ecf5407c9c8272dfbd8403fac413357f30df552678ed27096de769ee5355f6343b6f4 SHA512 8bc5468fa70bf0a23f516b05e49f4c457cceb3ae0c12e963b538297912adce1f16fca200b116fc39a88ee0ba522e1757654ed231bebb6199ef7f5ad152511c71
+DIST acme.sh-3.0.4.tar.gz 253157 BLAKE2B b1bde1ca31ef34c264f5045dd36220b3fd04230c59f7e65a9623681377dbde161ed3b92d86bd3e6f5a115d8847b1c2019bf984194f2901b52eb65abefad8bf81 SHA512 919987ac026366d245fa2730edf1212deafb051129811f35b482a30af9b0034a802baa218a35048e030795127cfeae03b4c3d4f12e580cd82edbacdd72e588e7
diff --git a/app-crypt/acme-sh/acme-sh-3.0.1.ebuild b/app-crypt/acme-sh/acme-sh-3.0.4.ebuild
index a6b09a058aa..e8a4db2391b 100644
--- a/app-crypt/acme-sh/acme-sh-3.0.1.ebuild
+++ b/app-crypt/acme-sh/acme-sh-3.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
MY_PN="${PN/-/.}"
MY_P="${MY_PN}-${PV}"
@@ -17,10 +17,13 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="selinux"
+
RDEPEND="
dev-libs/openssl:0
net-misc/curl
net-misc/socat
+ selinux? ( sec-policy/selinux-certbot )
"
src_install() {
diff --git a/app-crypt/acme-sh/acme-sh-9999.ebuild b/app-crypt/acme-sh/acme-sh-9999.ebuild
index 978b348479a..25fe72160c3 100644
--- a/app-crypt/acme-sh/acme-sh-9999.ebuild
+++ b/app-crypt/acme-sh/acme-sh-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit git-r3 optfeature
@@ -13,10 +13,13 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS=""
+IUSE="selinux"
+
RDEPEND="
dev-libs/openssl:0
net-misc/curl
net-misc/socat
+ selinux? ( sec-policy/selinux-certbot )
"
src_install() {
diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest
index 10ca796d503..3c2337792f1 100644
--- a/app-crypt/acme-tiny/Manifest
+++ b/app-crypt/acme-tiny/Manifest
@@ -1 +1,2 @@
DIST acme-tiny-4.1.0.tar.gz 12776 BLAKE2B 7efd9d1399ec3bbd98180511c9f36fbf6f9a96a0d4e0e72b9d4c85d16246118eaaad25bc26ba42f746fd4b60b498ceca5307e279d788157237ac6ad153848501 SHA512 31d69a5031c019acbc23b3f06041eae8e261766396d4a7420fd70a71cfa16de953bea4c0c2ad0c6a6e793ed61ab5331f40145352ffce69f4f062f35dd0db7519
+DIST acme-tiny-5.0.1.tar.gz 21036 BLAKE2B a09c16ca19570b48d34c919e2a361e3be5d66ed8fc0ccff7af74e4018d294f2940a552906dee45bac27a16e7b039a3567dc35e201b058015c5123baa2cbb01c1 SHA512 6e0619917b31a5795c2c7d8aa811b46231b81fc6b57227f611f7f4b9f73eb3de669676482563c33d935a4a0812498677bcbe974663a561af61abb441a880947e
diff --git a/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild b/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild
new file mode 100644
index 00000000000..d1dbadc0543
--- /dev/null
+++ b/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
+else
+ SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol"
+HOMEPAGE="https://github.com/diafygi/acme-tiny"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+RDEPEND="dev-libs/openssl:0"
+
+pkg_setup() {
+ if [[ ${PV} != 9999 ]]; then
+ export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+ fi
+}
+
+src_prepare() {
+ sed -i 's|#!/usr/bin/sh|#!/bin/sh|g' README.md || die
+
+ distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+ for v in ${REPLACING_VERSIONS}; do
+ if ver_test "$v" "-lt" "4.0.3" || ver_test "$v" "-ge" "9999"; then
+ einfo "The --account-email flag has been changed to --contact and"
+ einfo "has different syntax."
+ einfo "Please update your scripts accordingly"
+ fi
+ done
+}
diff --git a/app-crypt/acme-tiny/acme-tiny-9999.ebuild b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
index 5c6c1c7e6e6..b1ca9c31e4a 100644
--- a/app-crypt/acme-tiny/acme-tiny-9999.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
inherit distutils-r1
if [[ ${PV} == 9999 ]]; then
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index cb730280cc4..ba10cdacbdf 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,2 +1,3 @@
-DIST certbot-1.21.0.tar.gz 1343180 BLAKE2B 79bbaafe96bca4cee9aabb39f4e9f1f12be4d2e1d9c1b156966061606ac3b07e5d80c5053baa03698e5513477076ca8f604aff43f77ee7f45d70d4b88429a875 SHA512 11ea781c5113cf68e3a76cafc2cf38d5ebc9cdb2f40a79eae0cdeac5d40f8dac05a4c71a269d5a6ff78027a1db0676195a8413e28a87d00aaf1602f6f2ce5b5e
-DIST certbot-1.22.0.tar.gz 1352714 BLAKE2B 213dc08d3a88e0d20d6324c026a47eb96b9e45fbde41f79e37c2e62c655d7c6df01292e110d2e78ea085dfc62ef3c7b623279224029c9ae2a59e69c5c00054a5 SHA512 9a7a0d11e9fd5bd59b526a2cc5d0029b972e34a2bf41035c2d8ab535b93fc6d985ee8ea3dd5e50a7f4af80450135b739d1297245ad21b47b8362cddb03738932
+DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
+DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de SHA512 5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e
+DIST certbot-1.28.0.tar.gz 1367671 BLAKE2B 01fda6c068217e32273b2c1ac97faa099f98da687d41796e1c98971ed6779ab4ff78e3309b7a6f82b9b0a891c5f00b5201bb3ce1bc879e5acbab3ccc4988ec31 SHA512 888f51dfcf4712b70ce7c99abfc52106384dcba2eef486db8b033bfcca3043bd0beaadce1c1e59f19c3a58b7fe454b2b64774de2e23f5d93579b3e1be1a7c08b
diff --git a/app-crypt/acme/acme-1.22.0.ebuild b/app-crypt/acme/acme-1.26.0.ebuild
index 148c9950f4f..da63ed45304 100644
--- a/app-crypt/acme/acme-1.22.0.ebuild
+++ b/app-crypt/acme/acme-1.26.0.ebuild
@@ -27,11 +27,11 @@ SLOT="0"
RDEPEND="
dev-python/chardet[${PYTHON_USEDEP}]
>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
dev-python/pyrfc3339[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
"
diff --git a/app-crypt/acme/acme-1.21.0.ebuild b/app-crypt/acme/acme-1.27.0.ebuild
index ea5170d5a8c..da63ed45304 100644
--- a/app-crypt/acme/acme-1.21.0.ebuild
+++ b/app-crypt/acme/acme-1.27.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -26,12 +26,12 @@ SLOT="0"
RDEPEND="
dev-python/chardet[${PYTHON_USEDEP}]
- >=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
- >=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
dev-python/pyrfc3339[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
"
diff --git a/app-crypt/acme/acme-1.28.0.ebuild b/app-crypt/acme/acme-1.28.0.ebuild
new file mode 100644
index 00000000000..be518d60662
--- /dev/null
+++ b/app-crypt/acme/acme-1.28.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+ dev-python/chardet[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+ dev-python/pyrfc3339[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 7ff144bc492..be518d60662 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -27,11 +27,11 @@ SLOT="0"
RDEPEND="
dev-python/chardet[${PYTHON_USEDEP}]
>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
dev-python/pyrfc3339[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
"
diff --git a/app-crypt/adcli/adcli-0.9.1-r1.ebuild b/app-crypt/adcli/adcli-0.9.1-r2.ebuild
index f353d5f6054..4e27d477b69 100644
--- a/app-crypt/adcli/adcli-0.9.1-r1.ebuild
+++ b/app-crypt/adcli/adcli-0.9.1-r2.ebuild
@@ -16,7 +16,7 @@ IUSE="doc"
DEPEND="
app-crypt/mit-krb5
- net-nds/openldap[sasl]"
+ net-nds/openldap:=[sasl]"
RDEPEND="${DEPEND}"
BDEPEND="
doc? (
diff --git a/app-crypt/adcli/metadata.xml b/app-crypt/adcli/metadata.xml
index aa63ecdac24..9d60dd89cfd 100644
--- a/app-crypt/adcli/metadata.xml
+++ b/app-crypt/adcli/metadata.xml
@@ -9,7 +9,4 @@
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <upstream>
- <remote-id type="gitlab">https://gitlab.freedesktop.org/realmd/adcli</remote-id>
- </upstream>
</pkgmetadata>
diff --git a/app-crypt/argon2/argon2-20190702-r1.ebuild b/app-crypt/argon2/argon2-20190702-r1.ebuild
index b8456fce50b..c36974b6a53 100644
--- a/app-crypt/argon2/argon2-20190702-r1.ebuild
+++ b/app-crypt/argon2/argon2-20190702-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
LICENSE="|| ( Apache-2.0 CC0-1.0 )"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="static-libs"
S="${WORKDIR}/phc-winner-${P}"
@@ -44,7 +44,7 @@ src_prepare() {
}
src_compile() {
- emake OPTTEST="${OPTTEST}" LIBRARY_REL="$(get_libdir)" \
+ emake OPTTEST="${OPTTEST}" LIBRARY_REL="$(get_libdir)" PREFIX="${EPREFIX}/usr" \
ARGON2_VERSION="0~${PV}"
}
diff --git a/app-crypt/asekey/asekey-3.7.ebuild b/app-crypt/asekey/asekey-3.7.ebuild
index fcf24ad70ac..e7f6dbe0846 100644
--- a/app-crypt/asekey/asekey-3.7.ebuild
+++ b/app-crypt/asekey/asekey-3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.athena-scs.com/docs/reader-drivers/${PN}-${PV/./-}-tar.bz2 -
LICENSE="BSD LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
RDEPEND="sys-apps/pcsc-lite[udev]
virtual/libusb:0"
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index b5271c5e638..75e73a659fb 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,2 +1,3 @@
DIST ccid-1.4.35.tar.bz2 676789 BLAKE2B d1123c024a798a22906a5c2c2e35f5485b8d2252ddec28571af835bbf169bc5abeb26fea871ef70d67270cc1eb52f992c56f0abb74f6deed555f15e39dbf4756 SHA512 da990b5537ec35baa1b36b9c4be7f1bdccfc149cfa4ce024ddf59504f2a2044273057c1454f227fdad8f6b04fceaf48b88e70d4d0a5475384749b367529deaeb
DIST ccid-1.4.36.tar.bz2 677047 BLAKE2B b3d48f1c51b64d260b7055251fb04aeea4a22cc5d4f024bb972a9a9874b1bdf4b75b9daf8cd7c9f26000b04e7d4c1779e20a26d4927aa1e403cd274f548b71b5 SHA512 e9ca3f5364c6cec988edad325c1ef1b35886e3ecb15d6e1409c989b9f669fbda3f0688e246e3976b58eacc0ed035cde36e65675abf12562e81c3630d4ce67773
+DIST ccid-1.5.0.tar.bz2 689961 BLAKE2B e5621f9af647028787cddd1b5a0d674420b4bf0c532a8527b4e10773bbd8af6f6600e7c40039e27f1ae182504d4b69b5e1e4aae509154ebd9653a34bd085f820 SHA512 fa2eac306066255fd89e8220e2b8d82811ce9e284baa155ea968b7afe0f113a94b1ee1898578d02fb8cde0634b6fe60ae8af956089ce5401c11bb90c3b334d5a
diff --git a/app-crypt/ccid/ccid-1.5.0.ebuild b/app-crypt/ccid/ccid-1.5.0.ebuild
new file mode 100644
index 00000000000..b77236eb75b
--- /dev/null
+++ b/app-crypt/ccid/ccid-1.5.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="CCID free software driver"
+HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
+SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="twinserial kobil-midentity +usb"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.8.3
+ usb? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}"
+BDEPEND="kernel_linux? ( virtual/pkgconfig )"
+
+DOCS=( README.md AUTHORS )
+
+src_configure() {
+ econf \
+ LEX=: \
+ $(use_enable twinserial) \
+ $(use_enable usb libusb)
+}
+
+src_compile() {
+ default
+ use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
+}
+
+src_install() {
+ default
+
+ if use kobil-midentity; then
+ dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
+ doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
+ fi
+
+ if use kernel_linux; then
+ # note: for eudev support, rules probably will always need to be
+ # installed to /usr
+
+ # ccid >=1.4.11 version changed the rules drastically in a minor
+ # release to no longer use the pcscd group. Using the old ones in
+ # the mean time.
+ udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
+
+ # disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
+ if ! use kobil-midentity; then
+ sed \
+ -e '/Kobil_mIDentity_switch/s/^/#/' \
+ -i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
+ fi
+
+ fi
+}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index cb730280cc4..ba10cdacbdf 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,2 +1,3 @@
-DIST certbot-1.21.0.tar.gz 1343180 BLAKE2B 79bbaafe96bca4cee9aabb39f4e9f1f12be4d2e1d9c1b156966061606ac3b07e5d80c5053baa03698e5513477076ca8f604aff43f77ee7f45d70d4b88429a875 SHA512 11ea781c5113cf68e3a76cafc2cf38d5ebc9cdb2f40a79eae0cdeac5d40f8dac05a4c71a269d5a6ff78027a1db0676195a8413e28a87d00aaf1602f6f2ce5b5e
-DIST certbot-1.22.0.tar.gz 1352714 BLAKE2B 213dc08d3a88e0d20d6324c026a47eb96b9e45fbde41f79e37c2e62c655d7c6df01292e110d2e78ea085dfc62ef3c7b623279224029c9ae2a59e69c5c00054a5 SHA512 9a7a0d11e9fd5bd59b526a2cc5d0029b972e34a2bf41035c2d8ab535b93fc6d985ee8ea3dd5e50a7f4af80450135b739d1297245ad21b47b8362cddb03738932
+DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
+DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de SHA512 5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e
+DIST certbot-1.28.0.tar.gz 1367671 BLAKE2B 01fda6c068217e32273b2c1ac97faa099f98da687d41796e1c98971ed6779ab4ff78e3309b7a6f82b9b0a891c5f00b5201bb3ce1bc879e5acbab3ccc4988ec31 SHA512 888f51dfcf4712b70ce7c99abfc52106384dcba2eef486db8b033bfcca3043bd0beaadce1c1e59f19c3a58b7fe454b2b64774de2e23f5d93579b3e1be1a7c08b
diff --git a/app-crypt/certbot-apache/certbot-apache-1.22.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.26.0.ebuild
index 85b55229a0d..85b55229a0d 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.22.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.26.0.ebuild
diff --git a/app-crypt/certbot-apache/certbot-apache-1.21.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.27.0.ebuild
index 4ced4681cfb..85b55229a0d 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.21.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.27.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/app-crypt/certbot-apache/certbot-apache-1.28.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.28.0.ebuild
new file mode 100644
index 00000000000..cf0c9621b1a
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-1.28.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+ >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+ dev-python/python-augeas[${PYTHON_USEDEP}]
+ dev-python/zope-component[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index cb730280cc4..ba10cdacbdf 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,2 +1,3 @@
-DIST certbot-1.21.0.tar.gz 1343180 BLAKE2B 79bbaafe96bca4cee9aabb39f4e9f1f12be4d2e1d9c1b156966061606ac3b07e5d80c5053baa03698e5513477076ca8f604aff43f77ee7f45d70d4b88429a875 SHA512 11ea781c5113cf68e3a76cafc2cf38d5ebc9cdb2f40a79eae0cdeac5d40f8dac05a4c71a269d5a6ff78027a1db0676195a8413e28a87d00aaf1602f6f2ce5b5e
-DIST certbot-1.22.0.tar.gz 1352714 BLAKE2B 213dc08d3a88e0d20d6324c026a47eb96b9e45fbde41f79e37c2e62c655d7c6df01292e110d2e78ea085dfc62ef3c7b623279224029c9ae2a59e69c5c00054a5 SHA512 9a7a0d11e9fd5bd59b526a2cc5d0029b972e34a2bf41035c2d8ab535b93fc6d985ee8ea3dd5e50a7f4af80450135b739d1297245ad21b47b8362cddb03738932
+DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
+DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de SHA512 5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e
+DIST certbot-1.28.0.tar.gz 1367671 BLAKE2B 01fda6c068217e32273b2c1ac97faa099f98da687d41796e1c98971ed6779ab4ff78e3309b7a6f82b9b0a891c5f00b5201bb3ce1bc879e5acbab3ccc4988ec31 SHA512 888f51dfcf4712b70ce7c99abfc52106384dcba2eef486db8b033bfcca3043bd0beaadce1c1e59f19c3a58b7fe454b2b64774de2e23f5d93579b3e1be1a7c08b
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.22.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.26.0.ebuild
index 6f8e3f6b7a1..3566b27d06f 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.22.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.26.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=(python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
@@ -29,7 +29,7 @@ RDEPEND="
>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
- >=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.21.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.27.0.ebuild
index f916e2e4708..3566b27d06f 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.21.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.27.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=(python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
@@ -29,7 +29,7 @@ RDEPEND="
>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
- >=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.28.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.28.0.ebuild
new file mode 100644
index 00000000000..e66a6b39887
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.28.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ >=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+ >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index 45a8976cfe3..e66a6b39887 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=(python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
@@ -29,7 +29,7 @@ RDEPEND="
>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
- >=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
distutils_enable_tests pytest
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index cb730280cc4..ba10cdacbdf 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,2 +1,3 @@
-DIST certbot-1.21.0.tar.gz 1343180 BLAKE2B 79bbaafe96bca4cee9aabb39f4e9f1f12be4d2e1d9c1b156966061606ac3b07e5d80c5053baa03698e5513477076ca8f604aff43f77ee7f45d70d4b88429a875 SHA512 11ea781c5113cf68e3a76cafc2cf38d5ebc9cdb2f40a79eae0cdeac5d40f8dac05a4c71a269d5a6ff78027a1db0676195a8413e28a87d00aaf1602f6f2ce5b5e
-DIST certbot-1.22.0.tar.gz 1352714 BLAKE2B 213dc08d3a88e0d20d6324c026a47eb96b9e45fbde41f79e37c2e62c655d7c6df01292e110d2e78ea085dfc62ef3c7b623279224029c9ae2a59e69c5c00054a5 SHA512 9a7a0d11e9fd5bd59b526a2cc5d0029b972e34a2bf41035c2d8ab535b93fc6d985ee8ea3dd5e50a7f4af80450135b739d1297245ad21b47b8362cddb03738932
+DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
+DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de SHA512 5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e
+DIST certbot-1.28.0.tar.gz 1367671 BLAKE2B 01fda6c068217e32273b2c1ac97faa099f98da687d41796e1c98971ed6779ab4ff78e3309b7a6f82b9b0a891c5f00b5201bb3ce1bc879e5acbab3ccc4988ec31 SHA512 888f51dfcf4712b70ce7c99abfc52106384dcba2eef486db8b033bfcca3043bd0beaadce1c1e59f19c3a58b7fe454b2b64774de2e23f5d93579b3e1be1a7c08b
diff --git a/app-crypt/certbot/certbot-1.22.0.ebuild b/app-crypt/certbot/certbot-1.26.0.ebuild
index 08785c973b2..44b7e3889a5 100644
--- a/app-crypt/certbot/certbot-1.22.0.ebuild
+++ b/app-crypt/certbot/certbot-1.26.0.ebuild
@@ -23,17 +23,20 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
LICENSE="Apache-2.0"
SLOT="0"
+IUSE="selinux"
+
RDEPEND="
>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
dev-python/pyrfc3339[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
dev-python/zope-component[${PYTHON_USEDEP}]
- dev-python/zope-interface[${PYTHON_USEDEP}]"
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ selinux? ( sec-policy/selinux-certbot )"
distutils_enable_tests pytest
diff --git a/app-crypt/certbot/certbot-1.21.0.ebuild b/app-crypt/certbot/certbot-1.27.0.ebuild
index 6ade5ca6e21..44b7e3889a5 100644
--- a/app-crypt/certbot/certbot-1.21.0.ebuild
+++ b/app-crypt/certbot/certbot-1.27.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -23,17 +23,20 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
LICENSE="Apache-2.0"
SLOT="0"
+IUSE="selinux"
+
RDEPEND="
>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
- >=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
dev-python/pyrfc3339[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
dev-python/zope-component[${PYTHON_USEDEP}]
- dev-python/zope-interface[${PYTHON_USEDEP}]"
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ selinux? ( sec-policy/selinux-certbot )"
distutils_enable_tests pytest
diff --git a/app-crypt/certbot/certbot-1.28.0.ebuild b/app-crypt/certbot/certbot-1.28.0.ebuild
new file mode 100644
index 00000000000..bad8bc65b32
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.28.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+S=${WORKDIR}/${P}/${PN}
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="selinux"
+
+RDEPEND="
+ >=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+ >=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+ >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
+ >=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
+ dev-python/pyrfc3339[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+ dev-python/zope-component[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ selinux? ( sec-policy/selinux-certbot )"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 3c75588e8c4..bad8bc65b32 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -23,17 +23,20 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
LICENSE="Apache-2.0"
SLOT="0"
+IUSE="selinux"
+
RDEPEND="
>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
dev-python/pyrfc3339[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
dev-python/zope-component[${PYTHON_USEDEP}]
- dev-python/zope-interface[${PYTHON_USEDEP}]"
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ selinux? ( sec-policy/selinux-certbot )"
distutils_enable_tests pytest
diff --git a/app-crypt/codecrypt/Manifest b/app-crypt/codecrypt/Manifest
index ab0f8341436..2b8abf3d87f 100644
--- a/app-crypt/codecrypt/Manifest
+++ b/app-crypt/codecrypt/Manifest
@@ -1,2 +1 @@
-DIST codecrypt-1.7.2.tar.gz 446975 BLAKE2B 40b7f97dae84a0fd621ee19c6bfeba47b781a7f856ce9c077445d6387b75b97dce0fc02ee9481241b246b0eb7de6b44ac014a708a8ceba629828ca9d63b8e24c SHA512 4ad2ad9e665e486e353b48efff344436b276eac2dcbddcf4330796b8f1f06284eaeec9c4f4ef63f61e4477c3bce0973f60f76291dce11bee31a75658bee6a3a0
DIST codecrypt-1.8.tar.gz 471273 BLAKE2B 30547c299689547b50e2742e12dbfd32f420217a81813446b36bf5ea52929ca1f3b1968d76937de17e0f003c82186abfa683a6e30dc1fa5dc2ffe89594827ae4 SHA512 0e452f4e93498faa671a5927a3dd93b6dc66cbda7eb71cb33a509f8608573eff5ac8fed0d5e09911e03c153b88c9cb1bb54f7b2aeeb7b6c31eec918ad9685102
diff --git a/app-crypt/codecrypt/codecrypt-1.7.2-r1.ebuild b/app-crypt/codecrypt/codecrypt-1.7.2-r1.ebuild
deleted file mode 100644
index fa8f1c6527b..00000000000
--- a/app-crypt/codecrypt/codecrypt-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Post-quantum cryptography tool"
-HOMEPAGE="http://e-x-a.org/codecrypt/"
-SRC_URI="http://e-x-a.org/codecrypt/files/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cryptopp"
-
-DEPEND="dev-libs/gmp:=
- cryptopp? ( dev-libs/crypto++:= )
- sci-libs/fftw:3.0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- eapply_user
- # workaround -- gentoo is missing crypto++ pkg-config file
- sed -i -e 's/PKG_CHECK_MODULES(\[CRYPTOPP\],.*/LDFLAGS="$LDFLAGS -lcrypto++"/' configure.ac
- ./autogen.sh
-}
-
-src_configure() {
- econf \
- $(use_with cryptopp )
-}
diff --git a/app-crypt/codecrypt/codecrypt-1.8-r2.ebuild b/app-crypt/codecrypt/codecrypt-1.8-r2.ebuild
index 93d82f35a94..d0a857db898 100644
--- a/app-crypt/codecrypt/codecrypt-1.8-r2.ebuild
+++ b/app-crypt/codecrypt/codecrypt-1.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -27,5 +27,5 @@ src_prepare() {
src_configure() {
econf \
- $(use_with cryptopp )
+ $(use_with cryptopp)
}
diff --git a/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild
deleted file mode 100644
index 4a15201f3fb..00000000000
--- a/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCHVER="003"
-
-DESCRIPTION="Linux Driver support for the CoolKey and CAC products"
-HOMEPAGE="https://directory.fedora.redhat.com/wiki/CoolKey"
-SRC_URI="https://directory.fedora.redhat.com/download/coolkey/${P}.tar.gz
- mirror://gentoo/${P}-patches-${PATCHVER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.6.4
- dev-libs/nss[utils]
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- >=app-crypt/ccid-1.4.0"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${WORKDIR}/${PN}-patches"
-)
-
-pkg_setup() {
- pk="pk11install"
- dbdir="/etc/pki/nssdb"
- ck_mod_name="CoolKey PKCS #11 Module"
-
- if ! [[ -x $dbdir ]]; then
- ewarn "No /etc/pki/nssdb found; check under \$HOME/.pki and"
- ewarn "follow the suggested commands using the correct path."
- fi
-}
-
-src_configure() {
- econf \
- --enable-pk11install \
- $(use_enable debug)
-}
-
-src_compile() {
- emake CFLAGS+="-fno-strict-aliasing" -j1
-}
-
-src_install() {
- emake DESTDIR="${D}" install -j1
- einstalldocs
-}
-
-pkg_postinst() {
- if [[ -x $dbdir ]]; then
- if ! $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
- elog "You still need to install libcoolkey in your PKCS11 library:"
- elog "$pk -p $dbdir 'name=$ck_mod_name library=libcoolkeypk11.so'"
-
- fi
- else
- elog ""
- elog "You still need to setup your PKCS11 library, or at least"
- elog "find where it is (perhaps \$HOME/.pki/nssdb). Once you"
- elog "find it, use 'modutil -rawlist -dbdir \$db' to look for"
- elog "libcoolkeypk11.so, and if not found, add it using:"
- elog ""
- elog "$pk -p \$db 'name=$ck_mod_name library=libcoolkeypk11.so'"
- elog ""
- elog "where \$db is the full path to your pki/nssdb directory."
- elog ""
- fi
-}
-
-pkg_postrm() {
- if [[ -x $dbdir ]]; then
- if $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
- elog "You should remove libcoolkey from your PKCS11 library."
- fi
- fi
-}
diff --git a/app-crypt/dehydrated/dehydrated-0.7.0.ebuild b/app-crypt/dehydrated/dehydrated-0.7.0.ebuild
index 471ea876397..ff4c301408b 100644
--- a/app-crypt/dehydrated/dehydrated-0.7.0.ebuild
+++ b/app-crypt/dehydrated/dehydrated-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
IUSE="+cron"
RDEPEND="acct-group/dehydrated
diff --git a/app-crypt/dehydrated/metadata.xml b/app-crypt/dehydrated/metadata.xml
index 01e9074304e..d4974e2fd2d 100644
--- a/app-crypt/dehydrated/metadata.xml
+++ b/app-crypt/dehydrated/metadata.xml
@@ -4,10 +4,6 @@
<maintainer type="person">
<email>mschiff@gentoo.org</email>
</maintainer>
- <maintainer type="person">
- <email>whissi@gentoo.org</email>
- <name>Thomas Deutschmann</name>
- </maintainer>
<stabilize-allarches/>
<use>
<flag name="cron">Install cron job to sign/renew non-existent/changed/expiring certificates</flag>
diff --git a/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild b/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild
index 75ad6f0f329..c6ed2a02f63 100644
--- a/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild
+++ b/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.phy.duke.edu/~rgb/General/${PN}/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="doc"
RESTRICT="test" # Way too long
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 115ca9888bd..5da7ad8089b 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1 +1,2 @@
DIST eid-mw-5.0.28.tar.gz 13615312 BLAKE2B 1dbc39267688ad322059009ee0aecdd52e7133d3029285255d019819075249755153b7bf10acd775cee7fef86603de4440ff4e47338a28ff9a1ddfce79ff7adc SHA512 05705180f69cb68617660a793baf314486407557f40a223e474047e2f7f9ca8e125feb60f6b0cd47cba6e84653cfe02cdbf48c7169fe78b39b08ec621e3a7898
+DIST eid-mw-5.1.4.tar.gz 13646645 BLAKE2B 3d1ede2078e4293a082bbdc19b942f4aa5a71cf5b852edb68a18cfa78f2d5b53a609b1190bc9b81dc87938de4619e99c9d4b19b4980e62631910e30683bf983b SHA512 903ca2dd7566e760badfb9fb1ea40e7cada42173d7d8f3795c1df16643f082c1cb8dd1ee3cd9e031b6306ca2dd2118df179f547a6b1f5f1a7ba05a45f247cc1d
diff --git a/app-crypt/eid-mw/eid-mw-5.1.4.ebuild b/app-crypt/eid-mw/eid-mw-5.1.4.ebuild
new file mode 100644
index 00000000000..cb218b605e0
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-5.1.4.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop gnome2-utils xdg-utils
+
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+HOMEPAGE="https://eid.belgium.be"
+SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+dialogs +gtk p11-kit"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.2.9
+ gtk? (
+ x11-libs/gdk-pixbuf[jpeg]
+ x11-libs/gtk+:3
+ dev-libs/libxml2
+ net-misc/curl[ssl]
+ net-libs/libproxy
+ >=app-crypt/pinentry-1.1.0-r4[gtk]
+ )
+ p11-kit? ( app-crypt/p11-kit )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+REQUIRED_USE="dialogs? ( gtk )"
+
+src_prepare() {
+ default
+
+ # Buggy internal versioning when autoreconf a tarball release.
+ # Weird numbering is required otherwise we get a seg fault in
+ # about-eid-mw program.
+ echo "${PV}-v${PV}" > .version
+
+ # xpi module : we don't want it anymore
+ sed -i -e '/SUBDIRS/ s:plugins_tools/xpi ::' Makefile.am || die
+ sed -i -e '/plugins_tools\/xpi/ d' configure.ac || die
+
+ # hardcoded lsb_info
+ sed -i \
+ -e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
+ -e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
+ -e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
+ plugins_tools/aboutmw/gtk/about-main.c || die
+
+ # Fix libdir for pkcs11_manifestdir
+ sed -i \
+ -e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
+ cardcomm/pkcs11/src/Makefile.am || die
+
+ # See bug #732994
+ sed -i \
+ -e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
+ configure.ac || die
+
+ # See bug #751472
+ eapply "${FILESDIR}/use-printf-in-Makefile.patch"
+
+ # See bug #811270 (remove uml build)
+ sed -i \
+ -e 's:cardlayer/uml::' \
+ cardcomm/pkcs11/src/Makefile.am || die
+ sed -i \
+ -e 's:uml::' \
+ plugins_tools/eid-viewer/Makefile.am || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable dialogs) \
+ $(use_enable p11-kit p11kit) \
+ $(use_with gtk gtkvers 'detect') \
+ --with-gnu-ld \
+ --disable-static
+}
+
+src_install() {
+ default
+ rm -r "${ED}"/usr/$(get_libdir)/*.la || die
+ if use gtk; then
+ domenu plugins_tools/eid-viewer/eid-viewer.desktop
+ doicon plugins_tools/eid-viewer/gtk/eid-viewer.png
+ fi
+}
+
+pkg_postinst() {
+ if use gtk; then
+ gnome2_schemas_update
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+
+ local peimpl=$(eselect --brief --colour=no pinentry show)
+ case "${peimpl}" in
+ *gnome*|*qt*) ;;
+ *) ewarn "The pinentry front-end currently selected is not supported by eid-mw."
+ ewarn "You may be prompted for your pin code in an inaccessible shell!!"
+ ewarn "Please select pinentry-gnome3 as default pinentry provider:"
+ ewarn " # eselect pinentry set pinentry-gnome3"
+ ;;
+ esac
+ fi
+}
+
+pkg_postrm() {
+ if use gtk; then
+ gnome2_schemas_update
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+ fi
+}
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index cc0e9da4b4e..c24bb8c5bd9 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1 +1,2 @@
DIST gcr-3.40.0.tar.xz 1011044 BLAKE2B 6b1016f74e5fd3ace32a534a59575db9c39b5deefd2f4f3a747ef7e87a43c7c00b33500d8151009347af9fe6b073c390895bb6e17c577c6e150c780c487b997e SHA512 7118608e7bef7d0cf2eea33cb3286b7f9c3622a38892ce88cf33ed453d343cc33e070831e7b4d0c5cdb43c2e57b3f0b91c7cbd6aa8463982d3af8844b59bcb81
+DIST gcr-3.41.0.tar.xz 1039744 BLAKE2B c646a04168310051d5b582a9d2f7ab9da89eef095e856e56b8d730600debead051ad8bb40eddb7457b1be2be3e092227dd886f647258a9c6a81d4bab728245f7 SHA512 455acc40ed77feeb35f9845b00229f468b322b7eda0b1b5abb0153f0a6ba29f3d0364df22225143f4caf130254a1258b3c7f934370e5142f2f64e1c3084b6f6e
diff --git a/app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch b/app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch
new file mode 100644
index 00000000000..eac12c0a34a
--- /dev/null
+++ b/app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch
@@ -0,0 +1,27 @@
+From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Sun, 24 Oct 2021 10:26:03 +0200
+Subject: [PATCH] Unbreak build without systemd.
+
+This fixes the check for WITH_SYSTEMD and prevents a fatal error:
+'systemd/sd-daemon.h' file not found when building with systemd disabled.
+---
+ gcr/gcr-ssh-agent-service.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c
+index 3b5a4ca..b7e8928 100644
+--- a/gcr/gcr-ssh-agent-service.c
++++ b/gcr/gcr-ssh-agent-service.c
+@@ -39,7 +39,7 @@
+ #include <glib/gstdio.h>
+ #include <gcr/gcr-base.h>
+
+-#ifdef WITH_SYSTEMD
++#if WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
+ #endif
+
+--
+2.35.1
+
diff --git a/app-crypt/gcr/gcr-3.40.0.ebuild b/app-crypt/gcr/gcr-3.40.0.ebuild
index 3a367dc3642..e3ac13de0be 100644
--- a/app-crypt/gcr/gcr-3.40.0.ebuild
+++ b/app-crypt/gcr/gcr-3.40.0.ebuild
@@ -17,7 +17,7 @@ IUSE="gtk gtk-doc +introspection test +vala"
REQUIRED_USE="vala? ( introspection )"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
DEPEND="
>=dev-libs/glib-2.44.0:2
diff --git a/app-crypt/gcr/gcr-3.41.0.ebuild b/app-crypt/gcr/gcr-3.41.0.ebuild
new file mode 100644
index 00000000000..9a85413d5e3
--- /dev/null
+++ b/app-crypt/gcr/gcr-3.41.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0/1" # subslot = suffix of libgcr-base-3 and co
+
+IUSE="gtk gtk-doc +introspection systemd test +vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+DEPEND="
+ >=dev-libs/glib-2.44.0:2
+ >=dev-libs/libgcrypt-1.2.2:0=
+ >=app-crypt/p11-kit-0.19.0
+ >=app-crypt/libsecret-0.20
+ systemd? ( sys-apps/systemd:= )
+ gtk? ( >=x11-libs/gtk+-3.22:3[introspection?] )
+ >=sys-apps/dbus-1
+ introspection? ( >=dev-libs/gobject-introspection-1.58:= )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="app-crypt/gnupg"
+BDEPEND="
+ ${PYTHON_DEPS}
+ gtk? ( dev-libs/libxml2:2 )
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.9
+ app-text/docbook-xml-dtd:4.1.2
+ )
+ >=sys-devel/gettext-0.19.8
+ test? ( app-crypt/gnupg )
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+ "${FILESDIR}"/3.38.0-optional-vapi.patch
+ "${FILESDIR}"/${PN}-3.40.0-meson-0.61-build.patch
+ "${FILESDIR}"/${P}-Unbreak-build-without-systemd.patch
+)
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ use vala && vala_setup
+ xdg_environment_reset
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use introspection)
+ $(meson_use gtk)
+ $(meson_use gtk-doc gtk_doc)
+ -Dgpg_path="${EPREFIX}"/usr/bin/gpg
+ -Dssh_agent=true
+ $(meson_feature systemd)
+ $(meson_use vala vapi)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/app-crypt/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
index f3611e13c7d..705a4d59d57 100644
--- a/app-crypt/glep63-check/Manifest
+++ b/app-crypt/glep63-check/Manifest
@@ -1,2 +1,2 @@
DIST glep63-check-10.tar.gz 73550 BLAKE2B af45dce2a89e4af31a81e979659494c47b9c24f3fb71cccc33e84d6fc2900339ecefcafb1b6186b1e19e9fce7a2f17df754005c91828d27d0d2d9fe67586661e SHA512 d2fbfdb1b60250897b5d9582111573b6ed78f02b30d66cffc0fa94e0a1136dc0f3561e808b66d9b8ce43fca9fbdaf1548790c7c2395929308ff24d42d18ecf03
-DIST glep63-check-9.tar.gz 73445 BLAKE2B cd229065da9a4663491a891787d2a9e719cd9d61ea5974393199ca418413e7e1c6b73a3146577b26029ceb3302f430ed1051c9d050278b098b18407e95c1cac3 SHA512 86c49ffe2b8dde3735b85ff4808862c460b1e832fa9c3fca4fc2ea776d314c29ed2442adef2e1dbca1cec81b6ea29bbb417b123306602dfaa611b5153dddb7ac
+DIST glep63-check-11.tar.gz 73765 BLAKE2B f1893397c18458d1a9abb0236334f2acf9adcb4cf13229f49887cd1381db4e68c470f604b76b339c5481207c63522a3f99256e00cba820e3a15c412a8e52ec2d SHA512 6ee9ed33ee259eaa14d6fb1d914e555aae5b622d04f08a2eef094e7ff20ce9368a3af105a55cbc2c37ced5b51846f17651b20a2c0644f0efcc883eea49f0310b
diff --git a/app-crypt/glep63-check/glep63-check-10.ebuild b/app-crypt/glep63-check/glep63-check-10.ebuild
index c11a81b67fe..ad32f1258df 100644
--- a/app-crypt/glep63-check/glep63-check-10.ebuild
+++ b/app-crypt/glep63-check/glep63-check-10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="app-crypt/gnupg"
DEPEND="
diff --git a/app-crypt/glep63-check/glep63-check-11.ebuild b/app-crypt/glep63-check/glep63-check-11.ebuild
new file mode 100644
index 00000000000..cc39349f46f
--- /dev/null
+++ b/app-crypt/glep63-check/glep63-check-11.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="GLEP 63 compliance checker for OpenPGP keys"
+HOMEPAGE="https://github.com/mgorny/glep63-check/"
+SRC_URI="
+ https://github.com/mgorny/glep63-check/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-crypt/gnupg"
+DEPEND="
+ test? (
+ >=app-crypt/gnupg-2.3.3
+ sys-libs/libfaketime
+ )"
+
+distutils_enable_tests unittest
diff --git a/app-crypt/glep63-check/glep63-check-9.ebuild b/app-crypt/glep63-check/glep63-check-9.ebuild
deleted file mode 100644
index 2d5751e6947..00000000000
--- a/app-crypt/glep63-check/glep63-check-9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="GLEP 63 compliance checker for OpenPGP keys"
-HOMEPAGE="https://github.com/mgorny/glep63-check/"
-SRC_URI="https://github.com/mgorny/glep63-check/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-crypt/gnupg"
-DEPEND="
- test? (
- ${RDEPEND}
- sys-libs/libfaketime
- )"
-
-python_test() {
- "${EPYTHON}" -m unittest -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.initd b/app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.initd
index 2861293e0ef..eb6b3cc62c9 100644
--- a/app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.initd
+++ b/app-crypt/gnupg-pkcs11-scd/files/gnupg-pkcs11-scd-proxy.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
description="gnupg-pkcs11-scd proxy."
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 167f90df860..5c812feb828 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,4 +1,4 @@
-DIST gnupg-2.2.32.tar.bz2 7212625 BLAKE2B 8e1feba83a0d8fa1c154c814e26b41aa252cef4af53937e4e8954860249c180c1d6910356b0c46dfefde094846b02bd5375f17c8b6fdcc9138281d0daa292d42 SHA512 76b75d3688561ce65a8014812656aa87c9722c898d7e186fdb1331dee6af32f886a6b0a4806975c348a22ad6dda60f956ece56076d00153b9706aad4c934c6a1
-DIST gnupg-2.2.33.tar.bz2 7238439 BLAKE2B 9655ab8733f79c56c706502ddeeb41a2841467146753965898528d53a95ba77c51bcaf7fb93c51fb1c36953253ef993e67ce3c9ec756c9eece1042dcd17aa455 SHA512 0e6382ebb78425dc81b280a3b453111fb4a764b3fb0565ac09ac24cec2ecd571079617e263d9fce077ba6ce8d202fb43425b51c26f9ec6e8c61706a1ca5f8c78
-DIST gnupg-2.3.3.tar.bz2 7590874 BLAKE2B a80a84b4f6691815550de6125f4f24aa9c901b8ca8eeb6bc91c90ccd3d285a5ddb15688c7ab870aa6a6c418eb98b969e7b958120c3976b5aaea55188f39b67b0 SHA512 12d500e6b45910d5f7bfd4916bcee37ac988a58a35563fcf425a65b88c0cf92c2af2e94d3e31e9e5e19094c8beb5ec3779cf90bfe43d1555c4196f69eee2f102
-DIST gnupg-2.3.4.tar.bz2 7589561 BLAKE2B 6e04a90a5ffac7d4701202e35071a48530ba86d8c64cab3ed1617df23358f4d564ddf6cdbc6c861890725344a19619e0f6791ccabd97b18b28dc4e6e01f7837b SHA512 a3cf1c759512ec561c6f01cec72d533fc099dccf8c03b3a3e4a930862ae4c6815ecb856edd41884a65f058b65553cb69519e53e134d652353a7a76144bd99758
+DIST gnupg-2.2.35.tar.bz2 7262687 BLAKE2B 18b5965151ded3b3f28d139824e14d7a6f1673c5192ec5f5a80366a6d5f2e04ed7fa035e2bff105e1752753584f992626ccc9ea8840c2bfa39ffe7ca39b81f7f SHA512 ad9f8d10890b7fafb15a7422e2cebaf0f85ce7cf5f880f4edd8d1dec46aa73c01f9096e601f6edd665f8684d1f5892634991a400e00b3185e6b201f549004d3e
+DIST gnupg-2.2.35.tar.bz2.sig 119 BLAKE2B d95323703c12c9474b21fa91ddb70d4d4d464c794223e21f6ae5d4de955f07a5cabde50612e977168ea6071c4b12be3262cbafe9bcaa8e9a0b009318c0ff6718 SHA512 9043894730520e974e7bc17e0f95419c319fbcd514f102faf644e2f5580e238719cecb8b5e778ecf20f9212ee2554206eb0686e8b5fce7f8c556146657660fe2
+DIST gnupg-2.3.6.tar.bz2 7604761 BLAKE2B 6cbc749156c50b6633c126cde621271c6c9682a04efea51fbc5a2e92ee56493e8348814391ee0c337adcb4de4dd23293b9592db78998626905038c859ac4af6e SHA512 4540e8d2be836b491918f4987ba301a73fcdc4539b1f9abf6112a74c2d39c0e5dc3f17511212bac1dd7fd0594feecd91f95ecf78d4b2c1e70e818342a1802b85
+DIST gnupg-2.3.6.tar.bz2.sig 119 BLAKE2B c7d4cdc81580b8b1e56c7bc83236d65c9d2c1bab2d210d14a0d3c58f635d656c9b449ef9596b9601027cb891bd437cc8f2a63eb3c17742c288531511984fba7f SHA512 85d155f9809c8d0f38723d8622c085e421531c016d19fcce2ae34dc9a4aeac0bc1895f7a094ee9cdf69a15b426fb0d72ee53319fe0a05665c92caa0e950c1797
diff --git a/app-crypt/gnupg/files/gnupg-2.2.35-status-messages-garbled.patch b/app-crypt/gnupg/files/gnupg-2.2.35-status-messages-garbled.patch
new file mode 100644
index 00000000000..23dbf00b183
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.2.35-status-messages-garbled.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/855395
+https://marc.info/?l=oss-security&m=165657063921408&w=2
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=7b1db7192e6e4d0cfc439b23b13831837c85bc21
+
+From 7b1db7192e6e4d0cfc439b23b13831837c85bc21 Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk@gnupg.org>
+Date: Tue, 14 Jun 2022 11:33:27 +0200
+Subject: [PATCH] g10: Fix garbled status messages in NOTATION_DATA
+
+* g10/cpr.c (write_status_text_and_buffer): Fix off-by-one
+--
+
+Depending on the escaping and line wrapping the computed remaining
+buffer length could be wrong. Fixed by always using a break to
+terminate the escape detection loop. Might have happened for all
+status lines which may wrap.
+
+GnuPG-bug-id: T6027
+--- a/g10/cpr.c
++++ b/g10/cpr.c
+@@ -328,20 +328,15 @@ write_status_text_and_buffer (int no, const char *string,
+ }
+ first = 0;
+ }
+- for (esc=0, s=buffer, n=len; n && !esc; s++, n--)
++ for (esc=0, s=buffer, n=len; n; s++, n--)
+ {
+ if (*s == '%' || *(const byte*)s <= lower_limit
+ || *(const byte*)s == 127 )
+ esc = 1;
+ if (wrap && ++count > wrap)
+- {
+- dowrap=1;
+- break;
+- }
+- }
+- if (esc)
+- {
+- s--; n++;
++ dowrap=1;
++ if (esc || dowrap)
++ break;
+ }
+ if (s != buffer)
+ es_fwrite (buffer, s-buffer, 1, statusfp);
diff --git a/app-crypt/gnupg/files/gnupg-2.3.6-status-messages-garbled.patch b/app-crypt/gnupg/files/gnupg-2.3.6-status-messages-garbled.patch
new file mode 100644
index 00000000000..4bac4fea0f0
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.3.6-status-messages-garbled.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/855395
+https://marc.info/?l=oss-security&m=165657063921408&w=2
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=34c649b3601383cd11dbc76221747ec16fd68e1b;hp=4dbef2addca8c76fb4953fd507bd800d2a19d3ec
+
+From 34c649b3601383cd11dbc76221747ec16fd68e1b Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk@gnupg.org>
+Date: Tue, 14 Jun 2022 11:33:27 +0200
+Subject: [PATCH 1/1] g10: Fix garbled status messages in NOTATION_DATA
+
+* g10/cpr.c (write_status_text_and_buffer): Fix off-by-one
+--
+
+Depending on the escaping and line wrapping the computed remaining
+buffer length could be wrong. Fixed by always using a break to
+terminate the escape detection loop. Might have happened for all
+status lines which may wrap.
+
+GnuPG-bug-id: T6027
+--- a/g10/cpr.c
++++ b/g10/cpr.c
+@@ -372,20 +372,15 @@ write_status_text_and_buffer (int no, const char *string,
+ }
+ first = 0;
+ }
+- for (esc=0, s=buffer, n=len; n && !esc; s++, n--)
++ for (esc=0, s=buffer, n=len; n; s++, n--)
+ {
+ if (*s == '%' || *(const byte*)s <= lower_limit
+ || *(const byte*)s == 127 )
+ esc = 1;
+ if (wrap && ++count > wrap)
+- {
+- dowrap=1;
+- break;
+- }
+- }
+- if (esc)
+- {
+- s--; n++;
++ dowrap=1;
++ if (esc || dowrap)
++ break;
+ }
+ if (s != buffer)
+ es_fwrite (buffer, s-buffer, 1, statusfp);
diff --git a/app-crypt/gnupg/gnupg-2.2.33-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.35-r1.ebuild
index fb9711a1074..8590dbbe4f9 100644
--- a/app-crypt/gnupg/gnupg-2.2.33-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.35-r1.ebuild
@@ -1,20 +1,24 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit flag-o-matic systemd toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit flag-o-matic systemd toolchain-funcs verify-sig
MY_P="${P/_/-}"
DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
HOMEPAGE="https://gnupg.org/"
SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
+S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
+RESTRICT="!test? ( test )"
# Existence of executables is checked during configuration.
# Note: On each bump, update dep bounds on each version from configure.ac!
@@ -24,12 +28,12 @@ DEPEND=">=dev-libs/libassuan-2.5.0
>=dev-libs/libksba-1.3.5
>=dev-libs/npth-1.2
>=net-misc/curl-7.10
+ sys-libs/zlib
bzip2? ( app-arch/bzip2 )
- ldap? ( net-nds/openldap )
+ ldap? ( net-nds/openldap:= )
readline? ( sys-libs/readline:0= )
smartcard? ( usb? ( virtual/libusb:1 ) )
ssl? ( >=net-libs/gnutls-3.0:0= )
- sys-libs/zlib
tofu? ( >=dev-db/sqlite-3.7 )"
RDEPEND="${DEPEND}
@@ -40,9 +44,8 @@ RDEPEND="${DEPEND}
BDEPEND="virtual/pkgconfig
doc? ( sys-apps/texinfo )
- nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
+ nls? ( sys-devel/gettext )
+ verify-sig? ( sec-keys/openpgp-keys-gnupg )"
DOCS=(
ChangeLog NEWS README THANKS TODO VERSION
@@ -50,7 +53,8 @@ DOCS=(
)
PATCHES=(
- "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+ "${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
+ "${FILESDIR}"/${P}-status-messages-garbled.patch
)
src_prepare() {
@@ -72,6 +76,8 @@ src_configure() {
$(use_enable nls)
$(use_enable smartcard scdaemon)
$(use_enable ssl gnutls)
+ $(use_enable test all-tests)
+ $(use_enable test tests)
$(use_enable tofu)
$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
$(use_enable wks-server wks-tools)
@@ -79,16 +85,17 @@ src_configure() {
$(use_with readline)
--with-mailprog=/usr/libexec/sendmail
--disable-ntbtls
- --enable-all-tests
--enable-gpg
--enable-gpgsm
--enable-large-secmem
+
CC_FOR_BUILD="$(tc-getBUILD_CC)"
GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+
$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
)
@@ -97,14 +104,13 @@ src_configure() {
append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
fi
- #bug 663142
+ # bug #663142
if use user-socket; then
myconf+=( --enable-run-gnupg-user-socket )
fi
# glib fails and picks up clang's internal stdint.h causing weird errors
- [[ ${CC} == *clang ]] && \
- export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+ tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
# As of GnuPG 2.3, the mailprog substitution is used for the binary called
@@ -125,8 +131,9 @@ src_compile() {
}
src_test() {
- #Bug: 638574
+ # bug #638574
use tofu && export TESTFLAGS=--parallel
+
default
}
diff --git a/app-crypt/gnupg/gnupg-2.2.32-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.35.ebuild
index 8e60b86e80f..eb852eeed2d 100644
--- a/app-crypt/gnupg/gnupg-2.2.32-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.35.ebuild
@@ -1,20 +1,24 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit flag-o-matic systemd toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit flag-o-matic systemd toolchain-funcs verify-sig
MY_P="${P/_/-}"
DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
HOMEPAGE="https://gnupg.org/"
SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
+S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
+RESTRICT="!test? ( test )"
# Existence of executables is checked during configuration.
# Note: On each bump, update dep bounds on each version from configure.ac!
@@ -24,12 +28,12 @@ DEPEND=">=dev-libs/libassuan-2.5.0
>=dev-libs/libksba-1.3.5
>=dev-libs/npth-1.2
>=net-misc/curl-7.10
+ sys-libs/zlib
bzip2? ( app-arch/bzip2 )
- ldap? ( net-nds/openldap )
+ ldap? ( net-nds/openldap:= )
readline? ( sys-libs/readline:0= )
smartcard? ( usb? ( virtual/libusb:1 ) )
ssl? ( >=net-libs/gnutls-3.0:0= )
- sys-libs/zlib
tofu? ( >=dev-db/sqlite-3.7 )"
RDEPEND="${DEPEND}
@@ -40,9 +44,8 @@ RDEPEND="${DEPEND}
BDEPEND="virtual/pkgconfig
doc? ( sys-apps/texinfo )
- nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
+ nls? ( sys-devel/gettext )
+ verify-sig? ( sec-keys/openpgp-keys-gnupg )"
DOCS=(
ChangeLog NEWS README THANKS TODO VERSION
@@ -72,6 +75,8 @@ src_configure() {
$(use_enable nls)
$(use_enable smartcard scdaemon)
$(use_enable ssl gnutls)
+ $(use_enable test all-tests)
+ $(use_enable test tests)
$(use_enable tofu)
$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
$(use_enable wks-server wks-tools)
@@ -79,16 +84,17 @@ src_configure() {
$(use_with readline)
--with-mailprog=/usr/libexec/sendmail
--disable-ntbtls
- --enable-all-tests
--enable-gpg
--enable-gpgsm
--enable-large-secmem
+
CC_FOR_BUILD="$(tc-getBUILD_CC)"
GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+
$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
)
@@ -97,14 +103,13 @@ src_configure() {
append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
fi
- #bug 663142
+ # bug #663142
if use user-socket; then
myconf+=( --enable-run-gnupg-user-socket )
fi
# glib fails and picks up clang's internal stdint.h causing weird errors
- [[ ${CC} == *clang ]] && \
- export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+ tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
# As of GnuPG 2.3, the mailprog substitution is used for the binary called
@@ -125,8 +130,9 @@ src_compile() {
}
src_test() {
- #Bug: 638574
+ # bug #638574
use tofu && export TESTFLAGS=--parallel
+
default
}
diff --git a/app-crypt/gnupg/gnupg-2.3.4.ebuild b/app-crypt/gnupg/gnupg-2.3.6-r1.ebuild
index dc083b09c42..c2540e9010b 100644
--- a/app-crypt/gnupg/gnupg-2.3.4.ebuild
+++ b/app-crypt/gnupg/gnupg-2.3.6-r1.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit flag-o-matic systemd toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit flag-o-matic systemd toolchain-funcs verify-sig
MY_P="${P/_/-}"
DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
HOMEPAGE="https://gnupg.org/"
SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tools usb user-socket wks-server"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( tofu )"
@@ -27,13 +29,14 @@ DEPEND=">=dev-libs/libassuan-2.5.0
>=dev-libs/libksba-1.3.4
>=dev-libs/npth-1.2
>=net-misc/curl-7.10
+ sys-libs/zlib
bzip2? ( app-arch/bzip2 )
- ldap? ( net-nds/openldap )
+ ldap? ( net-nds/openldap:= )
readline? ( sys-libs/readline:0= )
smartcard? ( usb? ( virtual/libusb:1 ) )
tofu? ( >=dev-db/sqlite-3.27 )
+ tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
ssl? ( >=net-libs/gnutls-3.0:0= )
- sys-libs/zlib
"
RDEPEND="${DEPEND}
@@ -44,7 +47,8 @@ RDEPEND="${DEPEND}
BDEPEND="virtual/pkgconfig
doc? ( sys-apps/texinfo )
- nls? ( sys-devel/gettext )"
+ nls? ( sys-devel/gettext )
+ verify-sig? ( sec-keys/openpgp-keys-gnupg )"
DOCS=(
ChangeLog NEWS README THANKS TODO VERSION
@@ -52,7 +56,8 @@ DOCS=(
)
PATCHES=(
- "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+ "${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
+ "${FILESDIR}"/${P}-status-messages-garbled.patch
)
src_prepare() {
@@ -74,40 +79,43 @@ src_configure() {
$(use_enable nls)
$(use_enable smartcard scdaemon)
$(use_enable ssl gnutls)
+ $(use_enable test all-tests)
+ $(use_enable test tests)
$(use_enable tofu)
$(use_enable tofu keyboxd)
$(use_enable tofu sqlite)
+ $(usex tpm '--with-tss=intel' '--disable-tpm2d')
$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
$(use_enable wks-server wks-tools)
$(use_with ldap)
$(use_with readline)
--with-mailprog=/usr/libexec/sendmail
--disable-ntbtls
- --enable-all-tests
--enable-gpgsm
--enable-large-secmem
+
CC_FOR_BUILD="$(tc-getBUILD_CC)"
GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+
$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
)
if use prefix && use usb; then
# bug #649598
- append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+ append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0"
fi
- #bug 663142
+ # bug #663142
if use user-socket; then
myconf+=( --enable-run-gnupg-user-socket )
fi
# glib fails and picks up clang's internal stdint.h causing weird errors
- [[ ${CC} == *clang ]] && \
- export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+ tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
# As of GnuPG 2.3, the mailprog substitution is used for the binary called
@@ -128,8 +136,9 @@ src_compile() {
}
src_test() {
- #Bug: 638574
+ # bug #638574
use tofu && export TESTFLAGS=--parallel
+
default
}
diff --git a/app-crypt/gnupg/gnupg-2.3.3-r1.ebuild b/app-crypt/gnupg/gnupg-2.3.6.ebuild
index dc083b09c42..f75d3200b5f 100644
--- a/app-crypt/gnupg/gnupg-2.3.3-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.3.6.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit flag-o-matic systemd toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit flag-o-matic systemd toolchain-funcs verify-sig
MY_P="${P/_/-}"
DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
HOMEPAGE="https://gnupg.org/"
SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tools usb user-socket wks-server"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( tofu )"
@@ -27,13 +29,14 @@ DEPEND=">=dev-libs/libassuan-2.5.0
>=dev-libs/libksba-1.3.4
>=dev-libs/npth-1.2
>=net-misc/curl-7.10
+ sys-libs/zlib
bzip2? ( app-arch/bzip2 )
- ldap? ( net-nds/openldap )
+ ldap? ( net-nds/openldap:= )
readline? ( sys-libs/readline:0= )
smartcard? ( usb? ( virtual/libusb:1 ) )
tofu? ( >=dev-db/sqlite-3.27 )
+ tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
ssl? ( >=net-libs/gnutls-3.0:0= )
- sys-libs/zlib
"
RDEPEND="${DEPEND}
@@ -44,7 +47,8 @@ RDEPEND="${DEPEND}
BDEPEND="virtual/pkgconfig
doc? ( sys-apps/texinfo )
- nls? ( sys-devel/gettext )"
+ nls? ( sys-devel/gettext )
+ verify-sig? ( sec-keys/openpgp-keys-gnupg )"
DOCS=(
ChangeLog NEWS README THANKS TODO VERSION
@@ -52,7 +56,7 @@ DOCS=(
)
PATCHES=(
- "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+ "${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
)
src_prepare() {
@@ -74,40 +78,43 @@ src_configure() {
$(use_enable nls)
$(use_enable smartcard scdaemon)
$(use_enable ssl gnutls)
+ $(use_enable test all-tests)
+ $(use_enable test tests)
$(use_enable tofu)
$(use_enable tofu keyboxd)
$(use_enable tofu sqlite)
+ $(usex tpm '--with-tss=intel' '--disable-tpm2d')
$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
$(use_enable wks-server wks-tools)
$(use_with ldap)
$(use_with readline)
--with-mailprog=/usr/libexec/sendmail
--disable-ntbtls
- --enable-all-tests
--enable-gpgsm
--enable-large-secmem
+
CC_FOR_BUILD="$(tc-getBUILD_CC)"
GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+
$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
)
if use prefix && use usb; then
# bug #649598
- append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+ append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0"
fi
- #bug 663142
+ # bug #663142
if use user-socket; then
myconf+=( --enable-run-gnupg-user-socket )
fi
# glib fails and picks up clang's internal stdint.h causing weird errors
- [[ ${CC} == *clang ]] && \
- export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+ tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
# As of GnuPG 2.3, the mailprog substitution is used for the binary called
@@ -128,8 +135,9 @@ src_compile() {
}
src_test() {
- #Bug: 638574
+ # bug #638574
use tofu && export TESTFLAGS=--parallel
+
default
}
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index b8002cbca7e..9704490d3e8 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -5,10 +5,6 @@
<email>zlogene@gentoo.org</email>
<name>Mikle Kolyada</name>
</maintainer>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
<maintainer type="project">
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
@@ -31,6 +27,9 @@
<flag name="tools">
Install extra tools (including gpgsplit and gpg-zip).
</flag>
+ <flag name="tpm">
+ Enable TPM support via <pkg>app-crypt/tpm2-tss</pkg> and build tpm2d.
+ </flag>
<flag name="wks-server">
Install the wks-server
</flag>
diff --git a/app-crypt/gorilla/gorilla-1.4-r1.ebuild b/app-crypt/gorilla/gorilla-1.4-r2.ebuild
index fdb790d0430..860983172a0 100644
--- a/app-crypt/gorilla/gorilla-1.4-r1.ebuild
+++ b/app-crypt/gorilla/gorilla-1.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,8 +12,8 @@ SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="
- >=dev-lang/tcl-8.4.19:0
- >=dev-lang/tk-8.4.19:0
+ >=dev-lang/tcl-8.4.19:=
+ >=dev-lang/tk-8.4.19:=
dev-tcltk/iwidgets
dev-tcltk/bwidget
"
diff --git a/app-crypt/gpa/metadata.xml b/app-crypt/gpa/metadata.xml
index 268ce4bb67a..b0d83aa2e48 100644
--- a/app-crypt/gpa/metadata.xml
+++ b/app-crypt/gpa/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <name>Lars Wendler</name>
- <email>polynomial-c@gentoo.org</email>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
</maintainer>
</pkgmetadata>
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index df3e6542686..1b3f13117b3 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,2 +1,4 @@
-DIST gpgme-1.15.1.tar.bz2 1699349 BLAKE2B d3a6ccaa35360ed3fc79364dfcc3f2fdcb70e5e41ac72ef011373a39d5def9be9ce1be45843ab65a87630d3fc570d29db5f40b9a273aa8e281464c9d1d3477de SHA512 1d75a848cce6389f7cb8896b57a28dfe1dc5a447bfb4f128b0994a43e04134343400a3be063e971f03dfd595474cfd558519741d5d56afb3e84853ad4f2a45c2
DIST gpgme-1.16.0.tar.bz2 1718913 BLAKE2B da55e695b148e949a1c0770d0298d7a8c9f87d7a1f9e45d380f8c13c472bd44cb4266adb9a113e2b1dcc2596291744f48fdf998ff2de876059d89d184dc87f3a SHA512 69487be69612e9bf0221ff56ae687248bd13635db1b7087130e93c1670e38f3c810bbca17723555c04fe207976c35871bbc3da005179ce099504321cf33636e4
+DIST gpgme-1.16.0.tar.bz2.sig 119 BLAKE2B abf363142f67a005d1a4c13c2d3d944d0fd449e2297ad5a853fc145e106757e639b5bf5c23de6475055578633e12d8dc7d11ebb689ee6c74283c7cfe28058e65 SHA512 0c230b55bb0b24af85cd6df9e6be6ef8245d29af0fb8348fe044979ab75250987fafbd709d1898852a23df99fb16dd61b0b2bc6a821ed1c1b9aadd86182e5b9a
+DIST gpgme-1.17.1.tar.bz2 1747692 BLAKE2B 44cf9309cbad038f23aa7c5c77fd85be23faf3d8e1eb7abdb87a737ad1ade1ee269a95ce618dba327bbd06e6f4b2a91e2446744ee08f09ea6fb3b2dad44431c5 SHA512 e6399c3de1e430e38f2692bf5ec0c02ecb36ea3dbb56ff29dc3a438a5be4900a77a0559dc5b673dc1ffbff5e7f589e548e19176b2644fe8f63e00c6b9181b920
+DIST gpgme-1.17.1.tar.bz2.sig 119 BLAKE2B 31832424c0e029dc520d3302a71b086d9fcb044c74344cc0fb4b6c6a02d0dd840e62e7eb60acfaf004e6f3650d58436b58e645ef2a50b948ecaf3ca162bf577a SHA512 e1a4213d0d39f2efd0d5c007a0449c76bd650e76e002a9acb673eef0579912db06d844df11a4f7cb821e1d8468d2d6c1303f1c5d915a5c3c9cb5abacfbd004fc
diff --git a/app-crypt/gpgme/files/gpgme-1.16.0-fix-t-edit-sign-test.patch b/app-crypt/gpgme/files/gpgme-1.16.0-fix-t-edit-sign-test.patch
new file mode 100644
index 00000000000..6a5a7c0707c
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.16.0-fix-t-edit-sign-test.patch
@@ -0,0 +1,120 @@
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff;h=81a33ea5e1b86d586b956e893a5b25c4cd41c969;hp=e8e055e682f8994d62012574e1c8d862ca72a35d
+https://dev.gnupg.org/T5509
+https://bugs.gentoo.org/827898
+
+From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
+Date: Sat, 26 Jun 2021 18:02:47 +0200
+Subject: [PATCH 1/1] core: Fix use-after-free issue in test
+
+* tests/gpg/t-edit-sign.c (sign_key, verify_key_signature): New.
+(main): Factored out signing and verifying the result.
+--
+
+Factoring the two steps of the test into different functions fixes the
+use-after-free issue that was caused by accidentaly using a variable
+of the first step in the second step.
+
+GnuPG-bug-id: 5509
+--- a/tests/gpg/t-edit-sign.c
++++ b/tests/gpg/t-edit-sign.c
+@@ -107,31 +107,19 @@ interact_fnc (void *opaque, const char *status, const char *args, int fd)
+ }
+
+
+-int
+-main (int argc, char **argv)
++void
++sign_key (const char *key_fpr, const char *signer_fpr)
+ {
+ gpgme_ctx_t ctx;
+ gpgme_error_t err;
+ gpgme_data_t out = NULL;
+- const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */
+ gpgme_key_t signing_key = NULL;
+- const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */
+ gpgme_key_t key = NULL;
+- gpgme_key_t signed_key = NULL;
+- gpgme_user_id_t signed_uid = NULL;
+- gpgme_key_sig_t key_sig = NULL;
+ char *agent_info;
+- int mode;
+-
+- (void)argc;
+- (void)argv;
+-
+- init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
+ err = gpgme_new (&ctx);
+ fail_if_err (err);
+
+- /* Sign the key */
+ agent_info = getenv("GPG_AGENT_INFO");
+ if (!(agent_info && strchr (agent_info, ':')))
+ gpgme_set_passphrase_cb (ctx, passphrase_cb, 0);
+@@ -159,8 +147,23 @@ main (int argc, char **argv)
+ gpgme_data_release (out);
+ gpgme_key_unref (key);
+ gpgme_key_unref (signing_key);
++ gpgme_release (ctx);
++}
++
++
++void
++verify_key_signature (const char *key_fpr, const char *signer_keyid)
++{
++ gpgme_ctx_t ctx;
++ gpgme_error_t err;
++ gpgme_key_t signed_key = NULL;
++ gpgme_user_id_t signed_uid = NULL;
++ gpgme_key_sig_t key_sig = NULL;
++ int mode;
++
++ err = gpgme_new (&ctx);
++ fail_if_err (err);
+
+- /* Verify the key signature */
+ mode = gpgme_get_keylist_mode (ctx);
+ mode |= GPGME_KEYLIST_MODE_SIGS;
+ err = gpgme_set_keylist_mode (ctx, mode);
+@@ -168,7 +171,7 @@ main (int argc, char **argv)
+ err = gpgme_get_key (ctx, key_fpr, &signed_key, 0);
+ fail_if_err (err);
+
+- signed_uid = key->uids;
++ signed_uid = signed_key->uids;
+ if (!signed_uid)
+ {
+ fprintf (stderr, "Signed key has no user IDs\n");
+@@ -180,7 +183,7 @@ main (int argc, char **argv)
+ exit (1);
+ }
+ key_sig = signed_uid->signatures->next;
+- if (strcmp ("2D727CC768697734", key_sig->keyid))
++ if (strcmp (signer_keyid, key_sig->keyid))
+ {
+ fprintf (stderr, "Unexpected key ID in second user ID sig: %s\n",
+ key_sig->keyid);
+@@ -196,6 +199,23 @@ main (int argc, char **argv)
+
+ gpgme_key_unref (signed_key);
+ gpgme_release (ctx);
++}
++
++
++int
++main (int argc, char **argv)
++{
++ const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */
++ const char *signer_keyid = signer_fpr + strlen(signer_fpr) - 16;
++ const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */
++
++ (void)argc;
++ (void)argv;
++
++ init_gpgme (GPGME_PROTOCOL_OpenPGP);
++
++ sign_key (key_fpr, signer_fpr);
++ verify_key_signature (key_fpr, signer_keyid);
+
+ return 0;
+ }
diff --git a/app-crypt/gpgme/gpgme-1.15.1.ebuild b/app-crypt/gpgme/gpgme-1.15.1.ebuild
deleted file mode 100644
index b4cc775f000..00000000000
--- a/app-crypt/gpgme/gpgme-1.15.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
-
-DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
-SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp static-libs +cxx python qt5"
-
-# Note: On each bump, update dep bounds on each version from configure.ac!
-RDEPEND=">=app-crypt/gnupg-2
- >=dev-libs/libassuan-2.5.3:=
- >=dev-libs/libgpg-error-1.36:=
- python? ( ${PYTHON_DEPS} )
- qt5? ( dev-qt/qtcore:5 )"
- #doc? ( app-doc/doxygen[dot] )
-DEPEND="${RDEPEND}
- qt5? ( dev-qt/qttest:5 )"
-BDEPEND="python? ( dev-lang/swig )"
-
-REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-do_python() {
- if use python; then
- pushd "lang/python" > /dev/null || die
- top_builddir="../.." srcdir="." CPP=$(tc-getCPP) distutils-r1_src_${EBUILD_PHASE}
- popd > /dev/null
- fi
-}
-
-pkg_setup() {
- addpredict /run/user/$(id -u)/gnupg
-
- local MAX_WORKDIR=66
- if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
- ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
- SKIP_TESTS=1
- fi
-}
-
-src_prepare() {
- default
- elibtoolize
-
- # Make best effort to allow longer PORTAGE_TMPDIR
- # as usock limitation fails build/tests
- ln -s "${P}" "${WORKDIR}/b"
- S="${WORKDIR}/b"
-}
-
-src_configure() {
- local languages=()
- use common-lisp && languages+=( "cl" )
- use cxx && languages+=( "cpp" )
- if use qt5; then
- languages+=( "qt" )
- #use doc ||
- export DOXYGEN=true
- export MOC="$(qt5_get_bindir)/moc"
- fi
-
- econf \
- $([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
- --enable-languages="${languages[*]}" \
- $(use_enable static-libs static)
-
- use python && make -C lang/python prepare
-
- do_python
-}
-
-src_compile() {
- default
- do_python
-}
-
-src_test() {
- [[ -z "${SKIP_TESTS}" ]] || return
-
- default
- if use python; then
- test_python() {
- emake -C lang/python/tests check \
- PYTHON=${EPYTHON} \
- PYTHONS=${EPYTHON} \
- TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
- }
- python_foreach_impl test_python
- fi
-}
-
-src_install() {
- default
- do_python
- find "${ED}" -type f -name '*.la' -delete || die
-
- # backward compatibility for gentoo
- # in the past we had slots
- dodir /usr/include/gpgme
- dosym ../gpgme.h /usr/include/gpgme/gpgme.h
-}
diff --git a/app-crypt/gpgme/gpgme-1.16.0.ebuild b/app-crypt/gpgme/gpgme-1.16.0.ebuild
index e728a4e493c..7a84df5e6d2 100644
--- a/app-crypt/gpgme/gpgme-1.16.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.16.0.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_OPTIONAL=1
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
+inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs verify-sig
DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
-SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2
+ verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )"
LICENSE="GPL-2 LGPL-2.1"
SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="common-lisp static-libs +cxx python qt5"
# Note: On each bump, update dep bounds on each version from configure.ac!
@@ -26,18 +28,20 @@ RDEPEND=">=app-crypt/gnupg-2
#doc? ( app-doc/doxygen[dot] )
DEPEND="${RDEPEND}
qt5? ( dev-qt/qttest:5 )"
-BDEPEND="python? ( dev-lang/swig )"
+BDEPEND="python? ( dev-lang/swig )
+ verify-sig? ( sec-keys/openpgp-keys-gnupg )"
REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
PATCHES=(
"${FILESDIR}"/${P}-glibc-2.34.patch
+ "${FILESDIR}"/${P}-fix-t-edit-sign-test.patch
)
do_python() {
if use python; then
pushd "lang/python" > /dev/null || die
- top_builddir="../.." srcdir="." CPP=$(tc-getCPP) distutils-r1_src_${EBUILD_PHASE}
+ top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_${EBUILD_PHASE}
popd > /dev/null
fi
}
diff --git a/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild b/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
new file mode 100644
index 00000000000..0673116bef8
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_OPTIONAL=1
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+
+inherit distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2
+ verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-2 LGPL-2.1"
+# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355
+# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff.
+# Subslot: SONAME of each: <libgpgme.libgpgmepp.libqgpgme>
+SLOT="1/11.6.15"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp static-libs +cxx python qt5 test"
+RESTRICT="!test? ( test )"
+
+# Note: On each bump, update dep bounds on each version from configure.ac!
+RDEPEND=">=app-crypt/gnupg-2
+ >=dev-libs/libassuan-2.5.3:=
+ >=dev-libs/libgpg-error-1.36:=
+ python? ( ${PYTHON_DEPS} )
+ qt5? ( dev-qt/qtcore:5 )"
+ #doc? ( app-doc/doxygen[dot] )
+DEPEND="${RDEPEND}
+ test? (
+ qt5? ( dev-qt/qttest:5 )
+ )"
+BDEPEND="python? ( dev-lang/swig )
+ verify-sig? ( sec-keys/openpgp-keys-gnupg )"
+
+REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+do_python() {
+ if use python; then
+ pushd "lang/python" > /dev/null || die
+ top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_${EBUILD_PHASE}
+ popd > /dev/null || die
+ fi
+}
+
+src_prepare() {
+ default
+
+ elibtoolize
+
+ # bug #697456
+ addpredict /run/user/$(id -u)/gnupg
+
+ local MAX_WORKDIR=66
+ if use test && [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
+ eerror "Unable to run tests as WORKDIR='${WORKDIR}' is longer than ${MAX_WORKDIR} which causes failure!"
+ die "Could not run tests as requested with too-long WORKDIR."
+ fi
+
+ # Make best effort to allow longer PORTAGE_TMPDIR
+ # as usock limitation fails build/tests
+ ln -s "${P}" "${WORKDIR}/b" || die
+ S="${WORKDIR}/b"
+}
+
+src_configure() {
+ local languages=()
+
+ use common-lisp && languages+=( "cl" )
+ use cxx && languages+=( "cpp" )
+ if use qt5; then
+ languages+=( "qt" )
+ #use doc ||
+ export DOXYGEN=true
+ export MOC="$(qt5_get_bindir)/moc"
+ fi
+
+ # bug #847955
+ append-lfs-flags
+
+ # bug #811933 for libassuan prefix
+ econf \
+ $(use test || echo "--disable-gpgconf-test --disable-gpg-test --disable-gpgsm-test --disable-g13-test") \
+ --enable-languages="${languages[*]}" \
+ --with-libassuan-prefix="${ESYSROOT}"/usr \
+ $(use_enable static-libs static)
+
+ use python && emake -C lang/python prepare
+
+ do_python
+}
+
+src_compile() {
+ default
+ do_python
+}
+
+src_test() {
+ default
+
+ use python && distutils-r1_src_test
+}
+
+python_test() {
+ emake -C lang/python/tests check \
+ PYTHON=${EPYTHON} \
+ PYTHONS=${EPYTHON} \
+ TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+}
+
+src_install() {
+ default
+
+ do_python
+
+ find "${ED}" -type f -name '*.la' -delete || die
+
+ # Backward compatibility for gentoo
+ # (in the past, we had slots)
+ dodir /usr/include/gpgme
+ dosym ../gpgme.h /usr/include/gpgme/gpgme.h
+}
diff --git a/app-crypt/gpgme/metadata.xml b/app-crypt/gpgme/metadata.xml
index b051a2c8901..12645d415e4 100644
--- a/app-crypt/gpgme/metadata.xml
+++ b/app-crypt/gpgme/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <name>Lars Wendler</name>
- <email>polynomial-c@gentoo.org</email>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
</maintainer>
<use>
<flag name="common-lisp">Install common-lisp files</flag>
diff --git a/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild b/app-crypt/gpgstats/gpgstats-0.5-r2.ebuild
index aaf6c2ee7ad..85f24aeacce 100644
--- a/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild
+++ b/app-crypt/gpgstats/gpgstats-0.5-r2.ebuild
@@ -1,28 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit toolchain-funcs
DESCRIPTION="GPGstats calculates statistics on the keys in your key-ring"
HOMEPAGE="http://www.vanheusden.com/gpgstats/"
SRC_URI="http://www.vanheusden.com/gpgstats/${P}.tgz"
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-RDEPEND="app-crypt/gpgme"
+
+RDEPEND="app-crypt/gpgme:="
DEPEND="${RDEPEND}"
-PATCHES=(
- "${FILESDIR}/${P}-flags.patch"
-)
+PATCHES=( "${FILESDIR}"/${P}-flags.patch )
src_compile() {
emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" DEBUG=
}
src_install() {
- einstalldocs
dobin gpgstats
+ einstalldocs
}
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r3.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r5.ebuild
index 877ceb3362f..7faee15b679 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r3.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
VIRTUALX_REQUIRED="manual"
inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="afs +berkdb caps gdbm hdb-ldap +lmdb otp selinux ssl static-libs test X"
RESTRICT="!test? ( test )"
@@ -26,17 +26,14 @@ CDEPEND="
)
berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
- lmdb? ( dev-db/lmdb )
+ lmdb? ( dev-db/lmdb:= )
caps? ( sys-libs/libcap-ng )
>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
- || (
- >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
- sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
- )
+ >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
sys-libs/ncurses:0=
>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
afs? ( net-fs/openafs )
- hdb-ldap? ( >=net-nds/openldap-2.3.0 )
+ hdb-ldap? ( >=net-nds/openldap-2.3.0:= )
X? (
x11-libs/libX11
x11-libs/libXau
diff --git a/app-crypt/hmaccalc/Manifest b/app-crypt/hmaccalc/Manifest
deleted file mode 100644
index 872e76ee4a6..00000000000
--- a/app-crypt/hmaccalc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hmaccalc-0.9.14.tar.gz 111893 BLAKE2B 30aebd67e49db354c616110477e78fd6923df3ddfbe5e5023fd791bd90c783031da8c631fbfc9e5f2bdae06a08da1d56a08df921ddee359b630c5665e833ad4e SHA512 688a72b4e534ca4a1d45a116c0361ffd389de93dfdeec68e35cbffe0be13832789abaf33300003e12c7317ba473d3a0415f4b22cb3b7b36946c04bd40aa49184
diff --git a/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild b/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild
deleted file mode 100644
index b094e116998..00000000000
--- a/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Tools for computing and checking HMAC values for files"
-HOMEPAGE="https://pagure.io/hmaccalc"
-SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fips"
-
-DEPEND="dev-libs/nss
- sys-devel/prelink"
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --enable-sum-directory=/usr/$(get_libdir)/${PN}/ \
- $(use_enable !fips non-fips)
-}
diff --git a/app-crypt/hmaccalc/metadata.xml b/app-crypt/hmaccalc/metadata.xml
deleted file mode 100644
index 48c380e5611..00000000000
--- a/app-crypt/hmaccalc/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-<use>
-<flag name="fips">Enable NSS FIPS mode and support only the FIPS-compliant functions</flag>
-</use>
-<longdescription>
-hmaccalc can be used to compute HMAC (hash-based message authentication code)
-values for files. An HMAC is similar in concept to a message digest, except in
-that its calculation also incorporates a key which must be known to both the
-party generating the HMAC and the party verifying the HMAC.
-</longdescription>
-</pkgmetadata>
diff --git a/app-crypt/ima-evm-utils/Manifest b/app-crypt/ima-evm-utils/Manifest
index 02f3d5d79e9..3485816848d 100644
--- a/app-crypt/ima-evm-utils/Manifest
+++ b/app-crypt/ima-evm-utils/Manifest
@@ -1,2 +1,3 @@
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
+DIST ima-evm-utils-1.4.tar.gz 110104 BLAKE2B 12e09162e0d5e689132dde6b814ceeb8001a0379e8edb89b9aeb87c8e9f6e21fdd554e6626d1496b82cc77213fdf08b26bcc0be77140d7d598589a482940a321 SHA512 2fdf41470d88608162a084c4877ba17d531941b744bcb44dd4913e48ab2c2d131e0af3e3ead74c18748a5d46aced51213ebd7c13a5ee19050c28d54a26c011a3
diff --git a/app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-configure-remove-automagic-TSS-dependencies.patch b/app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-configure-remove-automagic-TSS-dependencies.patch
new file mode 100644
index 00000000000..a5fb28a291f
--- /dev/null
+++ b/app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-configure-remove-automagic-TSS-dependencies.patch
@@ -0,0 +1,39 @@
+From 911cef2b984a947b1020bdcf87d1573600ea754d Mon Sep 17 00:00:00 2001
+From: Christopher Byrne <salah.coronya@gmail.com>
+Date: Fri, 5 Nov 2021 21:31:10 -0500
+Subject: [PATCH] configure.ac: Remove automagic dependencies on the TSS stacks
+
+Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
+---
+ configure.ac | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1a0f093..c05b72d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,12 +31,18 @@ AC_CHECK_HEADER(unistd.h)
+ AC_CHECK_HEADERS(openssl/conf.h)
+
+ # Intel TSS
+-AC_CHECK_LIB([tss2-esys], [Esys_Free])
+-AC_CHECK_LIB([tss2-rc], [Tss2_RC_Decode])
++AC_ARG_WITH([pcrtss], AS_HELP_STRING([--with-pcrtss], [Build with Intel TSS library (default: disabled)]))
++AS_IF([test "x$with_pcrtss" = "xyes"], [
++ AC_CHECK_LIB([tss2-esys], [Esys_Free])
++ AC_CHECK_LIB([tss2-rc], [Tss2_RC_Decode])
++])
+ AM_CONDITIONAL([USE_PCRTSS], [test "x$ac_cv_lib_tss2_esys_Esys_Free" = "xyes"])
+
+ # IBM TSS include files
+-AC_CHECK_HEADER(ibmtss/tss.h, [], [], [[#define TPM_POSIX]])
++AC_ARG_WITH([ibmtss], AS_HELP_STRING([--with-ibmtss], [Build with IBM TSS library (default: disabled)]))
++AS_IF([test "x$with_ibmtss" = "xyes"], [
++ AC_CHECK_HEADER(ibmtss/tss.h, [], [], [[#define TPM_POSIX]])
++])
+ AM_CONDITIONAL([USE_IBMTSS], [test "x$ac_cv_header_ibmtss_tss_h" = "xyes"])
+
+ AC_CHECK_HEADERS(sys/xattr.h, , [AC_MSG_ERROR([sys/xattr.h header not found. You need the c-library development package.])])
+--
+2.32.0
+
diff --git a/app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-test-Rename-bash-variable-WORKDIR-to-MYWORKDIR.patch b/app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-test-Rename-bash-variable-WORKDIR-to-MYWORKDIR.patch
new file mode 100644
index 00000000000..41dd2cd6fb0
--- /dev/null
+++ b/app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-test-Rename-bash-variable-WORKDIR-to-MYWORKDIR.patch
@@ -0,0 +1,84 @@
+From 5be7797f96db606c16701b6cb7e218a487c4cf4a Mon Sep 17 00:00:00 2001
+From: Christopher Byrne <salah.coronya@gmail.com>
+Date: Sat, 6 Nov 2021 15:36:48 -0500
+Subject: [PATCH] test: Rename bash variable WORKDIR to MYWORKDIR
+
+Gentoo Portage ALSO uses the variable WORKDIR, and this results in
+Portage deleting the entire tree if the tests are run under it
+
+Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
+---
+ tests/functions.sh | 12 ++++++------
+ tests/sign_verify.test | 6 +++---
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/tests/functions.sh b/tests/functions.sh
+index 8f6f02d..eb6b34a 100755
+--- a/tests/functions.sh
++++ b/tests/functions.sh
+@@ -250,8 +250,8 @@ _enable_gost_engine() {
+ # Show test stats and exit into automake test system
+ # with proper exit code (same as ours). Do cleanups.
+ _report_exit_and_cleanup() {
+- if [ -n "${WORKDIR}" ]; then
+- rm -rf "${WORKDIR}"
++ if [ -n "${MYWORKDIR}" ]; then
++ rm -rf "${MYWORKDIR}"
+ fi
+
+ if [ $testsfail -gt 0 ]; then
+@@ -277,19 +277,19 @@ _report_exit_and_cleanup() {
+ }
+
+ # Setup SoftHSM for local testing by calling the softhsm_setup script.
+-# Use the provided workdir as the directory where SoftHSM will store its state
++# Use the provided myworkdir as the directory where SoftHSM will store its state
+ # into.
+ # Upon successfully setting up SoftHSM, this function sets the global variables
+ # OPENSSL_ENGINE and OPENSSL_KEYFORM so that the openssl command line tool can
+ # use SoftHSM. Also the PKCS11_KEYURI global variable is set to the test key's
+ # pkcs11 URI.
+ _softhsm_setup() {
+- local workdir="$1"
++ local myworkdir="$1"
+
+ local msg
+
+- export SOFTHSM_SETUP_CONFIGDIR="${workdir}/softhsm"
+- export SOFTHSM2_CONF="${workdir}/softhsm/softhsm2.conf"
++ export SOFTHSM_SETUP_CONFIGDIR="${myworkdir}/softhsm"
++ export SOFTHSM2_CONF="${myworkdir}/softhsm/softhsm2.conf"
+
+ mkdir -p "${SOFTHSM_SETUP_CONFIGDIR}"
+
+diff --git a/tests/sign_verify.test b/tests/sign_verify.test
+index c56290a..b619c22 100755
+--- a/tests/sign_verify.test
++++ b/tests/sign_verify.test
+@@ -29,7 +29,7 @@ fi
+ ./gen-keys.sh >/dev/null 2>&1
+
+ trap _report_exit_and_cleanup EXIT
+-WORKDIR=$(mktemp -d)
++MYWORKDIR=$(mktemp -d)
+ set -f # disable globbing
+
+ # Determine keyid from a cert
+@@ -426,7 +426,7 @@ expect_fail \
+ check_sign TYPE=ima KEY=gost2012_256-B ALG=md_gost12_512 PREFIX=0x0302 OPTS=
+
+ # Test signing with key described by pkcs11 URI
+-_softhsm_setup "${WORKDIR}"
++_softhsm_setup "${MYWORKDIR}"
+ if [ -n "${PKCS11_KEYURI}" ]; then
+ expect_pass check_sign FILE=pkcs11test TYPE=ima KEY=${PKCS11_KEYURI} ALG=sha256 PREFIX=0x030204aabbccdd0100 OPTS=--keyid=aabbccdd
+ expect_pass check_sign FILE=pkcs11test TYPE=ima KEY=${PKCS11_KEYURI} ALG=sha1 PREFIX=0x030202aabbccdd0100 OPTS=--keyid=aabbccdd
+@@ -436,4 +436,4 @@ else
+ expect_pass __skip
+ expect_pass __skip
+ fi
+-_softhsm_teardown "${WORKDIR}"
++_softhsm_teardown "${MYWORKDIR}"
+--
+2.32.0
+
diff --git a/app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-test-remove-boot_aggregate.patch b/app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-test-remove-boot_aggregate.patch
new file mode 100644
index 00000000000..701a81614f7
--- /dev/null
+++ b/app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-test-remove-boot_aggregate.patch
@@ -0,0 +1,216 @@
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index ff928e1..029f2ff 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1,7 +1,7 @@
+ check_SCRIPTS =
+ TESTS = $(check_SCRIPTS)
+
+-check_SCRIPTS += ima_hash.test sign_verify.test boot_aggregate.test
++check_SCRIPTS += ima_hash.test sign_verify.test
+
+ clean-local:
+ -rm -f *.txt *.out *.sig *.sig2
+diff --git a/tests/boot_aggregate.test b/tests/boot_aggregate.test
+deleted file mode 100755
+index d711566..0000000
+--- a/tests/boot_aggregate.test
++++ /dev/null
+@@ -1,197 +0,0 @@
+-#!/bin/bash
+-
+-#
+-# Calculate the boot_aggregate for each TPM bank, verifying that the
+-# boot_aggregate in the IMA measurement list matches one of them.
+-#
+-# A software TPM may be used to verify the boot_aggregate. If a
+-# software TPM is not already running on the system, this test
+-# starts one and initializes the TPM PCR banks by walking the sample
+-# binary_bios_measurements event log, included in this directory, and
+-# extending the TPM PCRs. The associated ascii_runtime_measurements
+-# for verifying the calculated boot_aggregate is included in this
+-# directory as well.
+-
+-trap cleanup SIGINT SIGTERM EXIT
+-
+-# Base VERBOSE on the environment variable, if set.
+-VERBOSE="${VERBOSE:-0}"
+-
+-cd "$(dirname "$0")"
+-export PATH=../src:$PATH
+-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+-. ./functions.sh
+-_require evmctl
+-TSSDIR="$(dirname -- "$(which tssstartup)")"
+-PCRFILE="/sys/class/tpm/tpm0/device/pcrs"
+-MISC_PCRFILE="/sys/class/misc/tpm0/device/pcrs"
+-
+-# Only stop this test's software TPM
+-cleanup() {
+- if [ -n "${SWTPM_PID}" ]; then
+- kill -SIGTERM "${SWTPM_PID}"
+- elif [ -n "${TPMSERVER_PID}" ]; then
+- "${TSSDIR}/tsstpmcmd" -stop
+- fi
+-}
+-
+-# Try to start a software TPM if needed.
+-swtpm_start() {
+- local tpm_server swtpm
+-
+- tpm_server="$(which tpm_server)"
+- swtpm="$(which swtpm)"
+- if [ -z "${tpm_server}" ] && [ -z "${swtpm}" ]; then
+- echo "${CYAN}SKIP: Software TPM (tpm_server and swtpm) not found${NORM}"
+- return "$SKIP"
+- fi
+-
+- if [ -n "${swtpm}" ]; then
+- pgrep swtpm
+- if [ $? -eq 0 ]; then
+- echo "INFO: Software TPM (swtpm) already running"
+- return 114
+- else
+- echo "INFO: Starting software TPM: ${swtpm}"
+- mkdir -p ./myvtpm
+- ${swtpm} socket --tpmstate dir=./myvtpm --tpm2 --ctrl type=tcp,port=2322 --server type=tcp,port=2321 --flags not-need-init > /dev/null 2>&1 &
+- SWTPM_PID=$!
+- fi
+- elif [ -n "${tpm_server}" ]; then
+- # tpm_server uses the Microsoft simulator encapsulated packet format
+- export TPM_SERVER_TYPE="mssim"
+- pgrep tpm_server
+- if [ $? -eq 0 ]; then
+- echo "INFO: Software TPM (tpm_server) already running"
+- return 114
+- else
+- echo "INFO: Starting software TPM: ${tpm_server}"
+- ${tpm_server} > /dev/null 2>&1 &
+- TPMSERVER_PID=$!
+- fi
+- fi
+- return 0
+-}
+-
+-# Initialize the software TPM using the sample binary_bios_measurements log.
+-swtpm_init() {
+- if [ ! -f "${TSSDIR}/tssstartup" ] || [ ! -f "${TSSDIR}/tsseventextend" ]; then
+- echo "${CYAN}SKIP: tssstartup and tsseventextend needed for test${NORM}"
+- return "$SKIP"
+- fi
+-
+- echo "INFO: Sending software TPM startup"
+- "${TSSDIR}/tssstartup"
+- if [ $? -ne 0 ]; then
+- echo "INFO: Retry sending software TPM startup"
+- sleep 1
+- "${TSSDIR}/tssstartup"
+- fi
+-
+- if [ $? -ne 0 ]; then
+- echo "INFO: Software TPM startup failed"
+- return "$SKIP"
+- fi
+-
+- echo "INFO: Walking ${BINARY_BIOS_MEASUREMENTS} initializing the software TPM"
+-# $(${TSSDIR}/tsseventextend -tpm -if "${BINARY_BIOS_MEASUREMENTS}" -v) 2>&1 > /dev/null
+- "${TSSDIR}/tsseventextend" -tpm -if "${BINARY_BIOS_MEASUREMENTS}" -v > /dev/null 2>&1
+-}
+-
+-# In VERBOSE mode, display the calculated TPM PCRs for the different banks.
+-display_pcrs() {
+- local PCRMAX=9
+- local banks=("sha1" "sha256")
+- local i;
+-
+- for bank in "${banks[@]}"; do
+- echo "INFO: Displaying ${bank} TPM bank (PCRs 0 - 9)"
+- for i in $(seq 0 $PCRMAX); do
+- rc=0
+- pcr=$("${TSSDIR}/tsspcrread" -halg "${bank}" -ha "${i}" -ns)
+- if [ $rc -ne 0 ]; then
+- echo "INFO: tsspcrread failed: $pcr"
+- break
+- fi
+- echo "$i: $pcr"
+- done
+- done
+-}
+-
+-# The first entry in the IMA measurement list is the "boot_aggregate".
+-# For each kexec, an additional "boot_aggregate" will appear in the
+-# measurement list, assuming the previous measurement list is carried
+-# across the kexec.
+-#
+-# Verify that the last "boot_aggregate" record in the IMA measurement
+-# list matches.
+-check() {
+- echo "INFO: Calculating the boot_aggregate (PCRs 0 - 9) for multiple banks"
+- bootaggr=$(evmctl ima_boot_aggregate)
+- if [ $? -ne 0 ]; then
+- echo "${CYAN}SKIP: evmctl ima_boot_aggregate: $bootaggr${NORM}"
+- exit "$SKIP"
+- fi
+-
+- boot_aggr=( $bootaggr )
+-
+- echo "INFO: Searching for the boot_aggregate in ${ASCII_RUNTIME_MEASUREMENTS}"
+- for hash in "${boot_aggr[@]}"; do
+- if [ "$VERBOSE" != "0" ]; then
+- echo "$hash"
+- fi
+- if grep -e " boot_aggregate$" -e " boot_aggregate.$" "${ASCII_RUNTIME_MEASUREMENTS}" | tail -n 1 | grep -q "${hash}"; then
+- echo "${GREEN}SUCCESS: boot_aggregate ${hash} found${NORM}"
+- return "$OK"
+- fi
+- done
+- echo "${RED}FAILURE: boot_aggregate not found${NORM}"
+- echo "$bootaggr"
+- return "$FAIL"
+-}
+-
+-if [ "$(id -u)" = 0 ] && [ -c "/dev/tpm0" ]; then
+- ASCII_RUNTIME_MEASUREMENTS="/sys/kernel/security/ima/ascii_runtime_measurements"
+- if [ ! -d "/sys/kernel/security/ima" ]; then
+- echo "${CYAN}SKIP: CONFIG_IMA not enabled${NORM}"
+- exit "$SKIP"
+- fi
+-else
+- BINARY_BIOS_MEASUREMENTS="./sample-binary_bios_measurements-pcrs-8-9"
+- ASCII_RUNTIME_MEASUREMENTS="./sample-ascii_runtime_measurements-pcrs-8-9"
+- export TPM_INTERFACE_TYPE="socsim"
+- export TPM_COMMAND_PORT=2321
+- export TPM_PLATFORM_PORT=2322
+- export TPM_SERVER_NAME="localhost"
+-
+- # swtpm uses the raw, unencapsulated packet format
+- export TPM_SERVER_TYPE="raw"
+-fi
+-
+-# Start and initialize a software TPM as needed
+-if [ "$(id -u)" != 0 ] || [ ! -c "/dev/tpm0" ]; then
+- if [ -f "$PCRFILE" ] || [ -f "$MISC_PCRFILE" ]; then
+- echo "${CYAN}SKIP: system has discrete TPM 1.2, sample TPM 2.0 event log test not supported.${NORM}"
+- exit "$SKIP"
+- fi
+-
+- swtpm_start
+- error=$?
+- if [ $error -eq "$SKIP" ]; then
+- echo "skip: swtpm not installed"
+- exit "$SKIP"
+- fi
+-
+- if [ $error -eq 0 ]; then
+- swtpm_init
+- if [ $? -eq "$SKIP" ]; then
+- echo "testing boot_aggregate without entries"
+- exit "$SKIP"
+- fi
+- fi
+- if [ "$VERBOSE" != "0" ]; then
+- display_pcrs
+- fi
+-fi
+-
+-expect_pass check
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-1.4-r1.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-1.4-r1.ebuild
new file mode 100644
index 00000000000..89252bd4e73
--- /dev/null
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-1.4-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 tpm"
+
+RDEPEND="
+ dev-libs/openssl:0=
+ sys-apps/keyutils:=
+ tpm? ( app-crypt/tpm2-tss:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-text/asciidoc
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ test? ( app-editors/vim-core )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4-configure-remove-automagic-TSS-dependencies.patch"
+ "${FILESDIR}/${PN}-1.4-test-Rename-bash-variable-WORKDIR-to-MYWORKDIR.patch"
+ "${FILESDIR}/${PN}-1.4-test-remove-boot_aggregate.patch"
+)
+
+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) \
+ $(use_with tpm pcrtss)
+}
+
+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 bdb4d49d4f7..f749bed88fe 100644
--- a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools git-r3
@@ -11,11 +11,12 @@ EGIT_REPO_URI="https://git.code.sf.net/p/linux-ima/ima-evm-utils"
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug test"
+IUSE="debug test tpm"
RDEPEND="
dev-libs/openssl:0=
- sys-apps/keyutils:="
+ sys-apps/keyutils:=
+ tpm? ( app-crypt/tpm2-tss:= )"
DEPEND="${RDEPEND}"
BDEPEND="
app-text/asciidoc
@@ -25,18 +26,23 @@ BDEPEND="
RESTRICT="!test? ( test )"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4-configure-remove-automagic-TSS-dependencies.patch"
+ "${FILESDIR}/${PN}-1.4-test-Rename-bash-variable-WORKDIR-to-MYWORKDIR.patch"
+ "${FILESDIR}/${PN}-1.4-test-remove-boot_aggregate.patch"
+)
+
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
+ $(use_with tpm pcrtss)
}
src_install() {
diff --git a/app-crypt/ima-evm-utils/metadata.xml b/app-crypt/ima-evm-utils/metadata.xml
index 1beb74ffb73..06e24451137 100644
--- a/app-crypt/ima-evm-utils/metadata.xml
+++ b/app-crypt/ima-evm-utils/metadata.xml
@@ -8,4 +8,7 @@
<upstream>
<remote-id type="sourceforge">linux-ima</remote-id>
</upstream>
+ <use>
+ <flag name="tpm">Enable TPM support</flag>
+ </use>
</pkgmetadata>
diff --git a/app-crypt/jitterentropy-rngd/Manifest b/app-crypt/jitterentropy-rngd/Manifest
index c933aceadc6..432b1f574f9 100644
--- a/app-crypt/jitterentropy-rngd/Manifest
+++ b/app-crypt/jitterentropy-rngd/Manifest
@@ -1,2 +1 @@
-DIST jitterentropy-rngd-1.2.5.tar.gz 45262 BLAKE2B 0fdbd513f0dd2fa216c079d55790ea2848fac26ca17846cfce06d0d338e8e88a13f2e9a7a7d55c938f0366f7cb010d22fc35d63921e4bb1408a5bda73ac9e96c SHA512 23079ff64e1145efa22960dfa772f77dd27f45f1cd950fe7b3a45d56cb75920902a7136da92a7202c686f33db0895115624ac3d809627378056ca13250e5b07b
-DIST jitterentropy-rngd-1.2.6.tar.gz 45213 BLAKE2B f193aef0d2a39792c0fac9b5a949f493377d98a282b921d9f4d01ddac5a4f423002e9d61b8e920d35e9f6a608ae2f1341f7255084ec9d501e64ebd1a1d72a9cf SHA512 fc59f84a24b2a2078c6bb4524b9feddfb2033c97390b20a9654294211208ef50399968ad8a19f7b82079eb987841e703fdb5aee98b60f1159244bd28ee43db75
+DIST jitterentropy-rngd-1.2.7.tar.gz 46546 BLAKE2B 82f0610ab5e2dd4ac42b5c2a72a59cc9c78dd65f82327302d4699b129280d45bf61a7197d44d3d141b6ccd3b512b984b0f95f1594c97a8c54f10c0d58906089c SHA512 4d89110cb7456b360f4c268121b61c2141b9d592877728eb94de0c8679928689b3b039a99579af4ee1299a1eb538c9a2d4527d9a4e98f85022c590a0d01f4811
diff --git a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.5.ebuild b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.5.ebuild
deleted file mode 100644
index 653e5d0a958..00000000000
--- a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info systemd
-
-DESCRIPTION="Jitter RNG daemon"
-HOMEPAGE="https://www.chronox.de/jent.html"
-SRC_URI="https://github.com/smuellerDD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE=""
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.1.0-do-not-strip-and-compress.patch
-)
-
-src_configure() {
- filter-flags '*'
- append-cflags '-O0'
- default
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" \
- UNITDIR="$(systemd_get_systemunitdir)" install
- newinitd "${FILESDIR}"/jitterentropy-rngd-initd jitterentropy-rngd
-}
diff --git a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.6.ebuild b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.7.ebuild
index 653e5d0a958..37d72d52b96 100644
--- a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.6.ebuild
+++ b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit flag-o-matic linux-info systemd
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/smuellerDD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="amd64 ~mips x86"
IUSE=""
PATCHES=(
diff --git a/app-crypt/jitterentropy/Manifest b/app-crypt/jitterentropy/Manifest
index f39d50927da..4084568a38b 100644
--- a/app-crypt/jitterentropy/Manifest
+++ b/app-crypt/jitterentropy/Manifest
@@ -1,2 +1,3 @@
DIST jitterentropy-2.2.0.tar.gz 25556 BLAKE2B d0a8faa9131e9fd5712fad4179725ac29ba813e0d77e5ae9dc905841b92f67fc51e79c407142b2e8c3473f92a59a5b03f03d2013bd7e5d1ae07110da52461255 SHA512 4701a7e0a82ee583cbde5edfdacb737a5f588b42c61b16434b5a11bdfb1a108e7b9df8b8b38d9e92290e702b33f2ae8774580d6a71e6e8ac3af295ffc8ff5ff9
DIST jitterentropy-3.0.1.tar.gz 31212 BLAKE2B 522e9b88e96ed1e6f57e793779c46f7799185f9d25390268f628eb309239a3522ac13277a037acf54dcce7e7b1364b2ec6e15d21a5f13aaa5a87ece7690d57fd SHA512 fd195e150ea861fcd5ff72a84f48ef8b7d0d8a3d44aae51f0fe5c39a1d1409ca98271a6cf06140fa8b6aba08d8bbbddf097cd7d99b5c1b698db08f056236e547
+DIST jitterentropy-3.3.1.tar.gz 81596 BLAKE2B ad8bf87d5a30b4bc98a3af7c1dcff442516c0330050aea90f2f05d68c4c2f1e9fe4b8db885f00dcd138ae7cb5a6ca58800686ae507f0e41596c95176a33e2b96 SHA512 7dc17c377cf90d38057bbc135e00730a3f84bc66aeed83eca1ad1b0e1c2fb89c5346ec20bdf25d3ce27f1d21893d44e52c08e96175554c18dfa1934a8d4fd9f7
diff --git a/app-crypt/jitterentropy/jitterentropy-3.3.1.ebuild b/app-crypt/jitterentropy/jitterentropy-3.3.1.ebuild
new file mode 100644
index 00000000000..92ced29204d
--- /dev/null
+++ b/app-crypt/jitterentropy/jitterentropy-3.3.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Hardware RNG based on CPU timing jitter"
+HOMEPAGE="https://github.com/smuellerDD/jitterentropy-library"
+SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# For future reference, tests/raw-entropy/validation-{restart,runtime}
+# have a weird license clause where it says:
+# The licensee IS NOT granted permission to redistribute the source code or
+# derivatives of the source code, and the binaries compiled from the source
+# code or its derivatives to any third parties.
+# Do not package these two components!
+LICENSE="BSD"
+SLOT="0/3"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
+IUSE="static-libs"
+
+S="${WORKDIR}/${PN}-library-${PV}"
+
+src_prepare() {
+ default
+
+ # Disable man page compression on install
+ sed -e '/\tgzip.*man/ d' -i Makefile || die
+}
+
+src_compile() {
+ # Upstream defines some of CFLAGS in the Makefile using '?='
+ # This allows those default flags to be overwritten by
+ # user-defined CFLAGS. Restore some of the defaults.
+ append-cflags '-fwrapv' '-fvisibility=hidden' '-fPIE'
+ # Optimizations are not allowed by upstream, which already
+ # overrides CFLAGS in Makefile. We need to handle CPPFLAGS here.
+ append-cppflags '-O0'
+ emake AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake PREFIX="${EPREFIX}/usr" \
+ LIBDIR="$(get_libdir)" \
+ DESTDIR="${D}" \
+ INSTALL_STRIP="install" \
+ install $(usex static-libs install-static '')
+}
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
index 632f59d7a16..f17408ea8cf 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -45,10 +45,12 @@ PATCHES=(
"${FILESDIR}/${P}-gcc11.patch"
)
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
pkg_setup() {
- if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_prepare() {
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
index df228200cfd..a77f1fbf419 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -45,10 +45,12 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.9.0-fix-bashism.patch
)
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
pkg_setup() {
- if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
- tc-has-openmp || die "Please switch to an OpenMP compatible compiler"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_prepare() {
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
index 684a202323c..5143d68af9a 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -53,10 +53,12 @@ PATCHES=(
"${FILESDIR}"/${P}-fix-bashism.patch
)
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
pkg_setup() {
- if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
- tc-has-openmp || die "Please switch to an OpenMP compatible compiler"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_prepare() {
@@ -89,7 +91,7 @@ src_configure() {
src_compile() {
# Uses default LD=$(CC) but if the user's set LD, it'll call it
# bug #729432.
- emake LD=$(tc-getCC) -C src
+ emake LD="$(tc-getCC)" -C src
}
src_test() {
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
index d1fbfc6ec02..0b2c68d044c 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -49,10 +49,12 @@ RDEPEND="${DEPEND}
dev-perl/Digest-GOST
!app-crypt/johntheripper"
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
pkg_setup() {
- if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
- tc-has-openmp || die "Please switch to an OpenMP compatible compiler"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_prepare() {
@@ -85,7 +87,7 @@ src_configure() {
src_compile() {
# Uses default LD=$(CC) but if the user's set LD, it'll call it
# bug #729432.
- emake LD=$(tc-getCC) -C src
+ emake LD="$(tc-getCC)" -C src
}
src_test() {
diff --git a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
index 700c4d5a878..1d4e84fe706 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
@@ -66,10 +66,12 @@ get_target() {
fi
}
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
pkg_setup() {
- if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_prepare() {
diff --git a/app-crypt/libb2/libb2-0.98.1-r2.ebuild b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
index e51689e6a0e..046c9525d1f 100644
--- a/app-crypt/libb2/libb2-0.98.1-r2.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -24,11 +24,12 @@ RDEPEND="${DEPEND}"
S=${WORKDIR}/${PN}-${GITHASH}
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
pkg_setup() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && ! tc-has-openmp; then
- ewarn "You are using a compiler without OpenMP support"
- die "Need an OpenMP capable compiler"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_prepare() {
diff --git a/app-crypt/libb2/libb2-0.98.1-r3.ebuild b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
index 3470ad02948..c0da5c1930f 100644
--- a/app-crypt/libb2/libb2-0.98.1-r3.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
LICENSE="CC0-1.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs native-cflags openmp"
DEPEND="
@@ -26,11 +26,12 @@ S=${WORKDIR}/${PN}-${GITHASH}
PATCHES=( "${FILESDIR}"/${P}-distcc.patch )
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
pkg_setup() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && ! tc-has-openmp; then
- ewarn "You are using a compiler without OpenMP support"
- die "Need an OpenMP capable compiler"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_prepare() {
diff --git a/app-crypt/libmd/libmd-1.0.4.ebuild b/app-crypt/libmd/libmd-1.0.4.ebuild
index ec9a537d5a4..95989a9ac9f 100644
--- a/app-crypt/libmd/libmd-1.0.4.ebuild
+++ b/app-crypt/libmd/libmd-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
multilib_src_configure() {
ECONF_SOURCE="${S}" econf
diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
index 7540edc0a3a..8379e4de895 100644
--- a/app-crypt/libscrypt/Manifest
+++ b/app-crypt/libscrypt/Manifest
@@ -1 +1,2 @@
DIST libscrypt-1.21.tar.gz 19425 BLAKE2B 4f9f21c6ba36bad005d95203d1d2c206f50200973233670c4819fe2cc32de6941cc100360ba1683453fc7abcb0e0e024e32417beec06d5b43cbda56bfa89be5a SHA512 0f894bc2f47016cdd043ea692a4e4b08891b1a961443265230d5ccb76820d40e50b0d4d63588c44c985cd24e214f07b126d30989d3ce4cd79366f3b8f16c4d34
+DIST libscrypt-1.22.tar.gz 19495 BLAKE2B 2c04b91dc48e807223a3433739deb31186efc1b4066cb57e3db835b68de4d08b9586d0a686d5f0f4c119582e82823fbf0556944c190d586664cc4d6f014ad5ab SHA512 3c01fd76441bdf7c90fa17534bfdda9e279469676359172eda7f7683ca65a7aae576a87d07125ce38598ef3fd2755547d53417132b9159a2b211898f70c80f51
diff --git a/app-crypt/libscrypt/libscrypt-1.21.ebuild b/app-crypt/libscrypt/libscrypt-1.21.ebuild
index b883b47b9bc..101c8f62204 100644
--- a/app-crypt/libscrypt/libscrypt-1.21.ebuild
+++ b/app-crypt/libscrypt/libscrypt-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
IUSE=""
DEPEND=""
@@ -32,5 +32,5 @@ pkg_setup() {
src_compile() {
emake \
- CC=$(tc-getCC)
+ CC="$(tc-getCC)"
}
diff --git a/app-crypt/libscrypt/libscrypt-1.22.ebuild b/app-crypt/libscrypt/libscrypt-1.22.ebuild
new file mode 100644
index 00000000000..5bf0045f688
--- /dev/null
+++ b/app-crypt/libscrypt/libscrypt-1.22.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Shared library to impliment the scrypt algorithm"
+HOMEPAGE="https://github.com/technion/libscrypt"
+SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ export LIBDIR=${PREFIX}/$(get_libdir)
+ export CFLAGS_EXTRA="${CFLAGS}"
+ export LDFLAGS_EXTRA="${LDFLAGS}"
+ export PREFIX=/usr
+ unset CFLAGS
+ unset LDFLAGS
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)"
+}
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index ba58b7a46b3..0c168c61d16 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1 +1 @@
-DIST libsecret-0.20.4.tar.xz 529916 BLAKE2B d5922dcb1eb27e4cc6bc7770926fc3191c9f4634867ff9682fd33f9373d6fa2d334c9c1b995bd208bbf178af008ec7b224bd5388427617fbd7e48d05d2e35823 SHA512 599482796af001703c25d181a710c5a3207f44d4d0036ef2001cc541bde9ef453172b71df9bb214d27d1fbd2f28c1b5a5efdbd5faca3561188c07dccdc7d7c15
+DIST libsecret-0.20.5.tar.xz 187340 BLAKE2B cde5094eaaf54f251c19afb015c39cc88435dafe6ee682ca8f9d1917dd5b3dc8cc1609cdbf2a3a42d2592c2a149bec5fe28b2f4ec179b92c0d0f07d2f14c1792 SHA512 61ca248aafd265e1f31d56c9084c68d880ebf03660ace3d4a6c6622ab306b56e921ac24647b6a60633bfa99c8a0407d4ae1aa6148511f289bf5ce2025b72692a
diff --git a/app-crypt/libsecret/files/libsecret-0.20.4-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch b/app-crypt/libsecret/files/libsecret-0.20.4-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch
deleted file mode 100644
index 99e5f6902e5..00000000000
--- a/app-crypt/libsecret/files/libsecret-0.20.4-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 92fe125ee1b9f36bd69308c173e9d6147a5fc1e1 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Thu, 10 Dec 2020 23:19:55 -0500
-Subject: [PATCH] meson: build test-vala-unstable with -DSECRET_WITH_UNSTABLE
-
-Fixes: https://gitlab.gnome.org/GNOME/libsecret/-/issues/54
----
- libsecret/meson.build | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/libsecret/meson.build b/libsecret/meson.build
-index f57e363..55e9d95 100644
---- a/libsecret/meson.build
-+++ b/libsecret/meson.build
-@@ -310,12 +310,12 @@ if get_option('introspection')
- add_languages('vala')
- valac = meson.get_compiler('vala')
-
-- valatest_names = [
-- 'test-vala-lang',
-- 'test-vala-unstable',
-- ]
-+ valatests = {
-+ 'test-vala-lang': [],
-+ 'test-vala-unstable': ['-DSECRET_WITH_UNSTABLE'],
-+ }
-
-- foreach _valatest : valatest_names
-+ foreach _valatest, extra_cflags : valatests
- test_bin = executable(_valatest,
- '@0@.vala'.format(_valatest),
- dependencies: [
-@@ -327,7 +327,7 @@ if get_option('introspection')
- ],
- link_with: mock_service_lib,
- include_directories: config_h_dir,
-- c_args: test_cflags,
-+ c_args: test_cflags + extra_cflags,
- )
-
- test(_valatest, test_bin,
---
-2.26.2
-
diff --git a/app-crypt/libsecret/libsecret-0.20.4-r1.ebuild b/app-crypt/libsecret/libsecret-0.20.4-r1.ebuild
deleted file mode 100644
index 37666f544f1..00000000000
--- a/app-crypt/libsecret/libsecret-0.20.4-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_USE_DEPEND=vapigen
-
-inherit gnome2 meson-multilib python-any-r1 vala virtualx
-
-DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
-
-LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
-SLOT="0"
-
-IUSE="+crypt gtk-doc +introspection test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
- vala? ( introspection )
- gtk-doc? ( crypt )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-
-DEPEND="
- >=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
- crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
- virtual/secret-service"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- dev-libs/libxslt
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- gtk-doc? (
- app-text/docbook-xml-dtd:4.1.2
- dev-util/gtk-doc
- )
- test? (
- $(python_gen_any_dep '
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
- introspection? ( >=dev-libs/gjs-1.32 )
- )
- vala? ( $(vala_depend) )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch
-)
-
-python_check_deps() {
- if use introspection; then
- has_version -b "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
- fi
- has_version -b "dev-python/mock[${PYTHON_USEDEP}]" &&
- has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- use vala && vala_src_prepare
- default
-
- # Remove @filename@ from the header template that would otherwise cause
- # differences dependent on the ABI
- sed -e '/enumerations from "@filename@"/d' \
- -i libsecret/secret-enum-types.h.template || die
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use crypt gcrypt)
-
- # Don't build docs multiple times
- $(meson_native_true manpage)
- $(meson_native_use_bool gtk-doc gtk_doc)
-
- $(meson_native_use_bool introspection)
- $(meson_native_use_bool vala vapi)
- )
- meson_src_configure
-}
-
-multilib_src_test() {
- virtx meson_src_test
-}
diff --git a/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild b/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
new file mode 100644
index 00000000000..bddb8f0cc18
--- /dev/null
+++ b/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_USE_DEPEND=vapigen
+
+inherit bash-completion-r1 gnome2 meson-multilib python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+
+IUSE="+crypt gtk-doc +introspection test tpm +vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+ vala? ( introspection )
+ gtk-doc? ( crypt )
+"
+
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+
+DEPEND="
+ >=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
+ crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
+ tpm? ( >=app-crypt/tpm2-tss-3.0.3:= )
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="virtual/secret-service"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ dev-libs/libxslt
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ gtk-doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ >=dev-util/gi-docgen-2021.7
+ )
+ test? (
+ $(python_gen_any_dep '
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
+ introspection? ( >=dev-libs/gjs-1.32 )
+ tpm? (
+ app-crypt/swtpm
+ app-crypt/tpm2-abrmd
+ >=app-crypt/tpm2-tss-3.2.0:=
+ )
+ )
+ vala? ( $(vala_depend) )
+"
+
+dbus_run() {
+ (
+ # start isolated dbus session bus
+ dbus_data=$(dbus-launch --sh-syntax) || exit
+ eval "${dbus_data}"
+
+ $@
+ ret=${?}
+
+ kill "${DBUS_SESSION_BUS_PID}"
+ exit "${ret}"
+ ) || die
+}
+
+tpm2_run_with_emulator() {
+ export XDG_CONFIG_HOME=${T}/.config/swtpm
+ "${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files || die
+
+ mkdir -p ${XDG_CONFIG_HOME}/mytpm1 || die
+ swtpm_setup_args=(
+ --tpm2
+ --tpmstate ${XDG_CONFIG_HOME}/mytpm1
+ --createek
+ --allow-signing
+ --decryption
+ --create-ek-cert
+ --create-platform-cert
+ --lock-nvram
+ --overwrite
+ --display
+ )
+ swtpm_setup "${swtpm_setup_args[@]}" || die
+
+ swtpm_socket_args=(
+ --tpm2
+ --tpmstate dir=${XDG_CONFIG_HOME}/mytpm1
+ --flags startup-clear
+ --ctrl type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket.ctrl
+ --server type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+ --pid file=${XDG_CONFIG_HOME}/mytpm1/swtpm.pid
+ --daemon
+ )
+ swtpm socket "${swtpm_socket_args[@]}" || die
+
+ tpm2_abrmd_args=(
+ --logger=stdout
+ --tcti=swtpm:path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+ --session
+ --flush-all
+ )
+ tpm2-abrmd "${tpm2_abrmd_args[@]}" &
+ export TCTI=tabrmd:bus_type=session
+
+ $@ || die
+
+ # When swtpm dies, tmp2-abrmd will exit
+ kill $(< ${XDG_CONFIG_HOME}/mytpm1/swtpm.pid) || die
+}
+
+python_check_deps() {
+ if use introspection; then
+ has_version -b "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+ fi
+ has_version -b "dev-python/mock[${PYTHON_USEDEP}]" &&
+ has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ use vala && vala_src_prepare
+ default
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_native_true manpage)
+ $(meson_use crypt gcrypt)
+ $(meson_native_use_bool vala vapi)
+ $(meson_native_use_bool gtk-doc gtk_doc)
+ $(meson_native_use_bool introspection)
+ -Dbashcompdir="$(get_bashcompdir)"
+ $(meson_native_enabled bash_completion)
+ $(meson_native_use_bool tpm tpm2)
+ )
+ meson_src_configure
+}
+
+multilib_src_test() {
+ if use tpm; then
+ dbus_run tpm2_run_with_emulator virtx meson test -C "${BUILD_DIR}"
+ else
+ virtx dbus-run-session meson test -C "${BUILD_DIR}"
+ fi
+}
diff --git a/app-crypt/libsecret/metadata.xml b/app-crypt/libsecret/metadata.xml
index f453528b934..7318f81748a 100644
--- a/app-crypt/libsecret/metadata.xml
+++ b/app-crypt/libsecret/metadata.xml
@@ -5,4 +5,7 @@
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
+ <use>
+ <flag name="tpm">Enable Trusted Platform Module support via <pkg>app-crypt/tpm2-tss</pkg></flag>
+ </use>
</pkgmetadata>
diff --git a/app-crypt/libu2f-host/libu2f-host-1.1.10-r1.ebuild b/app-crypt/libu2f-host/libu2f-host-1.1.10-r1.ebuild
new file mode 100644
index 00000000000..c49ed0d65a1
--- /dev/null
+++ b/app-crypt/libu2f-host/libu2f-host-1.1.10-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info udev
+
+DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
+HOMEPAGE="https://developers.yubico.com/libu2f-host/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="systemd"
+
+DEPEND="dev-libs/hidapi
+ dev-libs/json-c:="
+# The U2F device node will be owned by group 'plugdev'
+# in non-systemd configurations
+RDEPEND="${DEPEND}
+ !systemd? ( acct-group/plugdev )
+ systemd? ( sys-apps/systemd[acl] )"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~HIDRAW"
+
+PATCHES=( "${FILESDIR}/${P}-json-boolean.patch" )
+
+src_install() {
+ default
+ if use kernel_linux; then
+ udev_dorules 70-u2f.rules
+ fi
+
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ udev_reload
+
+ if ! use systemd; then
+ elog "Users must be a member of the 'plugdev' group"
+ elog "to be able to access U2F devices"
+ fi
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/app-crypt/minisign/minisign-0.10.ebuild b/app-crypt/minisign/minisign-0.10.ebuild
index 154ff1cfe79..52e8ac6a084 100644
--- a/app-crypt/minisign/minisign-0.10.ebuild
+++ b/app-crypt/minisign/minisign-0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
else
SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
LICENSE="ISC"
diff --git a/app-crypt/minisign/minisign-9999.ebuild b/app-crypt/minisign/minisign-9999.ebuild
index 154ff1cfe79..6e13605c074 100644
--- a/app-crypt/minisign/minisign-9999.ebuild
+++ b/app-crypt/minisign/minisign-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
else
SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
LICENSE="ISC"
diff --git a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r3.ebuild b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r3.ebuild
index c932cfc0e4c..6b8ddc9b0c3 100644
--- a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r3.ebuild
+++ b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="openafs-krb5-a BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86"
BDEPEND="virtual/pkgconfig"
RDEPEND=">=app-crypt/mit-krb5-1.8.0
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index a5005ab76f7..04c701bf322 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1 +1,3 @@
DIST krb5-1.19.2.tar.gz 8741053 BLAKE2B 963722721201e75381c91a2af6e982f569a5b1602beb2d1ded83d35f6f914235a6ed91e5d54f56c97e94921a32ed27c49aded258327966ee13d39485208c38d8 SHA512 b90d6ed0e1e8a87eb5cb2c36d88b823a6a6caabf85e5d419adb8a930f7eea09a5f8491464e7e454cca7ba88be09d19415962fe0036ad2e31fc584f9fc0bbd470
+DIST krb5-1.19.3.tar.gz 8741343 BLAKE2B 79e68237ee82affa85299060c509e303453c0fab965adc6b9ed305ab64a1f73bd51e65df1b3faadc60815cd506ffefaeed535765ca060d393a9141812f85b48a SHA512 18235440d6f7d8a72c5d7ca5cd8c6465e8adf091d85c483225c7b00d64b4688c1c7924cb800c2fc17e590b2709f1a9de48e6ec79f6debd11dcb7d6fa16c6f351
+DIST krb5-1.20.tar.gz 8660756 BLAKE2B fdaaab6c16dbe073c4308f312e321536b582b75fad10e5450be66b6b828825c8c775e56f5287d4a7df819d20889e5c0d9cc1d179d861c9caba185332c0db7387 SHA512 9aed84a971a4d74188468870260087ec7c3a614cceb5fe32ad7da1cb8db3d66e00df801c9f900f0131ac56eb828674b8be93df474c2d13b892b70c7977388604
diff --git a/app-crypt/mit-krb5/mit-krb5-1.19.2-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.19.2-r4.ebuild
index 5598ad9bed5..a88217f5154 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.19.2-r2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.19.2-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd"
# some tests requires network access
@@ -22,18 +22,15 @@ RESTRICT="test"
DEPEND="
!!app-crypt/heimdal
- || (
- >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
- sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
- )
+ >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
|| (
>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
)
keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
- lmdb? ( dev-db/lmdb )
+ lmdb? ( dev-db/lmdb:= )
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
- openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+ openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
xinetd? ( sys-apps/xinetd )
"
diff --git a/app-crypt/mit-krb5/mit-krb5-1.19.3-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.19.3-r2.ebuild
new file mode 100644
index 00000000000..e90b52a26eb
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.19.3-r2.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd toolchain-funcs
+
+MY_P="${P/mit-}"
+P_DIR=$(ver_cut 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd"
+
+# some tests requires network access
+RESTRICT="test"
+
+DEPEND="
+ !!app-crypt/heimdal
+ >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+ || (
+ >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+ >=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+ )
+ keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
+ lmdb? ( dev-db/lmdb:= )
+ nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+ openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
+ pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+ xinetd? ( sys-apps/xinetd )
+ "
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/yacc
+ cpu_flags_x86_aes? (
+ amd64? ( dev-lang/yasm )
+ x86? ( dev-lang/yasm )
+ )
+ doc? ( virtual/latex-base )
+ test? (
+ ${PYTHON_DEPS}
+ dev-lang/tcl:0
+ dev-util/dejagnu
+ dev-util/cmocka
+ )"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+ "${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
+ "${FILESDIR}/${PN}_dont_create_rundir.patch"
+ "${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/krb5-config
+)
+
+src_prepare() {
+ default
+ # Make sure we always use the system copies.
+ rm -rf util/{et,ss,verto}
+ sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # QA
+ append-flags -fno-strict-aliasing
+ append-flags -fno-strict-overflow
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ AR="$(tc-getAR)" \
+ WARN_CFLAGS="set" \
+ econf \
+ $(use_with openldap ldap) \
+ "$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+ $(use_enable nls) \
+ $(use_enable pkinit) \
+ $(use_enable threads thread-support) \
+ $(use_with lmdb) \
+ $(use_with keyutils) \
+ --without-hesiod \
+ --enable-shared \
+ --with-system-et \
+ --with-system-ss \
+ --enable-dns-for-realm \
+ --enable-kdc-lookaside-cache \
+ --with-system-verto \
+ --disable-rpath
+}
+
+multilib_src_compile() {
+ emake -j1
+}
+
+multilib_src_test() {
+ multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+ emake \
+ DESTDIR="${D}" \
+ EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+ install
+}
+
+multilib_src_install_all() {
+ # default database dir
+ keepdir /var/lib/krb5kdc
+
+ cd ..
+ dodoc README
+
+ if use doc; then
+ dodoc -r doc/html
+ docinto pdf
+ dodoc doc/pdf/*.pdf
+ fi
+
+ newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+ newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+ newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+ newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+ newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+ newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+ systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+ systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+ systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+ systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+ systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+ insinto /etc
+ newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+ insinto /var/lib/krb5kdc
+ newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+ if use openldap ; then
+ insinto /etc/openldap/schema
+ doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}/kpropd.xinetd" kpropd
+ fi
+}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.20.ebuild b/app-crypt/mit-krb5/mit-krb5-1.20.ebuild
new file mode 100644
index 00000000000..c808d256547
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.20.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools python-any-r1 systemd toolchain-funcs multilib-minimal
+
+MY_P="${P/mit-}"
+P_DIR=$(ver_cut 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ !!app-crypt/heimdal
+ >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+ || (
+ >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+ >=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+ )
+ keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
+ lmdb? ( dev-db/lmdb:= )
+ nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+ openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
+ pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+ xinetd? ( sys-apps/xinetd )
+ "
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/yacc
+ cpu_flags_x86_aes? (
+ amd64? ( dev-lang/yasm )
+ x86? ( dev-lang/yasm )
+ )
+ doc? ( virtual/latex-base )
+ test? ( dev-util/cmocka )
+ "
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+ "${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
+ "${FILESDIR}/${PN}_dont_create_rundir.patch"
+ "${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/krb5-config
+)
+
+src_prepare() {
+ default
+ # Make sure we always use the system copies.
+ rm -rf util/{et,ss,verto}
+ sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ AR="$(tc-getAR)" \
+ WARN_CFLAGS="set" \
+ econf \
+ $(use_with openldap ldap) \
+ $(use_enable nls) \
+ $(use_enable pkinit) \
+ $(use_enable threads thread-support) \
+ $(use_with lmdb) \
+ $(use_with keyutils) \
+ --without-hesiod \
+ --enable-shared \
+ --with-system-et \
+ --with-system-ss \
+ --enable-dns-for-realm \
+ --enable-kdc-lookaside-cache \
+ --with-system-verto \
+ --disable-rpath
+}
+
+multilib_src_compile() {
+ emake -j1
+}
+
+multilib_src_test() {
+ multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+ emake \
+ DESTDIR="${D}" \
+ EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+ install
+}
+
+multilib_src_install_all() {
+ # default database dir
+ keepdir /var/lib/krb5kdc
+
+ cd ..
+ dodoc README
+
+ if use doc; then
+ dodoc -r doc/html
+ docinto pdf
+ dodoc doc/pdf/*.pdf
+ fi
+
+ newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+ newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+ newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+ newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+ newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+ newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+ systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+ systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+ systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+ systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+ systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+ insinto /etc
+ newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+ insinto /var/lib/krb5kdc
+ newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+ if use openldap ; then
+ insinto /etc/openldap/schema
+ doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}/kpropd.xinetd" kpropd
+ fi
+}
diff --git a/app-crypt/mkp224o/Manifest b/app-crypt/mkp224o/Manifest
new file mode 100644
index 00000000000..7048da480d1
--- /dev/null
+++ b/app-crypt/mkp224o/Manifest
@@ -0,0 +1 @@
+DIST mkp224o-1.5.0-src.tar.gz 1378324 BLAKE2B 19d38fbf23328607fa428ec9329cdc909b210b4235d85e14ff372347c9b408ecf22d41dac7122bdae06725d7bca0c3d53c81cc27272c47517e714e9b8e0625dd SHA512 aa5adc91e695dbfd8ece5fdfe3ca370056d4390a5186326b35ee37402040fa24675ede5389c48b79a1e57b624b86024ff72957741fef175602f7721f20c5cc14
diff --git a/app-crypt/mkp224o/metadata.xml b/app-crypt/mkp224o/metadata.xml
new file mode 100644
index 00000000000..e9ab2692657
--- /dev/null
+++ b/app-crypt/mkp224o/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>matthew@gentoo.org</email>
+ <name>Matthew Smith</name>
+ </maintainer>
+ <use>
+ <flag name="pcre2">Search with a regex instead of prefix/suffix matching</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">cathugger/mkp224o</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/mkp224o/mkp224o-1.5.0.ebuild b/app-crypt/mkp224o/mkp224o-1.5.0.ebuild
new file mode 100644
index 00000000000..4e71a3ec031
--- /dev/null
+++ b/app-crypt/mkp224o/mkp224o-1.5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Vanity address generator for v3 Tor hidden service addresses"
+HOMEPAGE="https://github.com/cathugger/mkp224o"
+SRC_URI="https://github.com/cathugger/${PN}/releases/download/v${PV}/${PN}-${PV}-src.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="cpu_flags_x86_sse2 pcre2"
+
+DEPEND="
+ dev-libs/libsodium:=
+ pcre2? ( dev-libs/libpcre2:= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( OPTIMISATION.txt README.txt )
+
+src_configure() {
+ local myeconfargs=(
+ --enable-regex=$(usex pcre2)
+ --enable-statistics
+ )
+ use cpu_flags_x86_sse2 && myeconfargs+=( --enable-donna-sse2 )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ einstalldocs
+ dobin ${PN}
+}
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.44-no-werror.patch b/app-crypt/monkeysphere/files/monkeysphere-0.44-no-werror.patch
new file mode 100644
index 00000000000..671045d7c38
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.44-no-werror.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/832365
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,7 @@ LOCALSTATEDIR ?= /var/lib
+
+ CFLAGS += $(shell libassuan-config --cflags)
+ CFLAGS += $(shell libgcrypt-config --cflags)
+-CFLAGS += --pedantic -Wall -Werror -std=c99
++CFLAGS += --pedantic -Wall -std=c99
+ LIBS += $(shell libassuan-config --libs)
+ LIBS += $(shell libgcrypt-config --libs)
+
diff --git a/app-crypt/monkeysphere/monkeysphere-0.44.ebuild b/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
index c22ae2b8f88..f8a6c908946 100644
--- a/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
+++ b/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+inherit toolchain-funcs
+
DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
HOMEPAGE="http://web.monkeysphere.info/"
-
-LICENSE="GPL-3"
-SLOT="0/0"
-IUSE=""
SRC_URI="
mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz
http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
KEYWORDS="amd64 ~arm x86"
DOCS=( README Changelog )
-## Tests fail upstream for SSH connection. Issue has been reported.
+# Tests fail upstream for SSH connection. Issue has been reported.
RESTRICT="test"
DEPEND="acct-group/monkeysphere
@@ -26,19 +27,20 @@ DEPEND="acct-group/monkeysphere
dev-perl/Crypt-OpenSSL-RSA:0=
dev-perl/Digest-SHA1:0=
app-misc/lockfile-progs:0="
-
RDEPEND="${DEPEND}
net-misc/openssh"
-PATCHES=( "${FILESDIR}"/${PN}-0.44-install-uncompressed-man-pages.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.44-install-uncompressed-man-pages.patch
+ "${FILESDIR}"/${PN}-0.44-no-werror.patch
+)
src_prepare() {
default
- sed -i \
- -e "s#share/doc/monkeysphere#share/doc/${PF}#" \
- Makefile \
- || die
+ sed -i -e "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
+
+ tc-export CC
}
pkg_postinst() {
diff --git a/app-crypt/moolticute/files/moolticuted.init-r1 b/app-crypt/moolticute/files/moolticuted.init-r1
new file mode 100644
index 00000000000..8c4942a3493
--- /dev/null
+++ b/app-crypt/moolticute/files/moolticuted.init-r1
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/bin/moolticuted
+command_background="yes"
+pidfile=/var/run/moolticuted.pid
+command_user="nobody:usb"
+
+depend() {
+ need udev
+}
diff --git a/app-crypt/moolticute/moolticute-0.43.19-r1.ebuild b/app-crypt/moolticute/moolticute-0.43.19-r1.ebuild
new file mode 100644
index 00000000000..ea058a356a2
--- /dev/null
+++ b/app-crypt/moolticute/moolticute-0.43.19-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/mooltipass/moolticute.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/mooltipass/moolticute/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm"
+fi
+
+inherit xdg-utils qmake-utils udev
+
+DESCRIPTION="Mooltipass crossplatform daemon/tools"
+HOMEPAGE="https://github.com/mooltipass/moolticute"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/libusb-1.0.20
+ dev-qt/qtdbus:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qttest:5
+ dev-qt/qtwebsockets:5
+ dev-qt/qtwidgets:5
+"
+BDEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+ default
+
+ # Fill version.h with package version
+ if [[ ${PV} != 9999* ]]; then
+ sed -i "s/\"git\"/\"v${PV/_/-}\"/" src/version.h || die
+ fi
+}
+
+src_configure() {
+ eqmake5 PREFIX="/usr" Moolticute.pro
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+
+ udev_dorules "${FILESDIR}/50-mooltipass.rule"
+ newinitd "${FILESDIR}/moolticuted.init-r1" moolticuted
+}
+
+pkg_postinst() {
+ udev_reload
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-crypt/moolticute/moolticute-9999.ebuild b/app-crypt/moolticute/moolticute-9999.ebuild
index 08512b4847b..ea058a356a2 100644
--- a/app-crypt/moolticute/moolticute-9999.ebuild
+++ b/app-crypt/moolticute/moolticute-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -53,7 +53,7 @@ src_install() {
emake install INSTALL_ROOT="${D}"
udev_dorules "${FILESDIR}/50-mooltipass.rule"
- newinitd "${FILESDIR}/moolticuted.init" moolticuted
+ newinitd "${FILESDIR}/moolticuted.init-r1" moolticuted
}
pkg_postinst() {
diff --git a/app-crypt/nasty/nasty-0.6-r1.ebuild b/app-crypt/nasty/nasty-0.6-r2.ebuild
index 574cd87cb1d..2596a2964bf 100644
--- a/app-crypt/nasty/nasty-0.6-r1.ebuild
+++ b/app-crypt/nasty/nasty-0.6-r2.ebuild
@@ -1,32 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit toolchain-funcs
DESCRIPTION="Proof-of-concept GPG passphrase recovery tool"
HOMEPAGE="http://www.vanheusden.com/nasty/"
SRC_URI="http://www.vanheusden.com/nasty/${P}.tgz"
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-RDEPEND="app-crypt/gpgme"
-DEPEND="${RDEPEND}"
-DOCS=(
- readme.txt
-)
+RDEPEND="app-crypt/gpgme:="
+DEPEND="${RDEPEND}"
-PATCHES=(
- "${FILESDIR}/${P}-flags.patch"
-)
+PATCHES=( "${FILESDIR}"/${P}-flags.patch )
src_compile() {
emake CC="$(tc-getCC)" DEBUG=
}
src_install() {
- einstalldocs
dobin nasty
+ dodoc readme.txt
}
diff --git a/app-crypt/nwipe/Manifest b/app-crypt/nwipe/Manifest
index 46ee00ceedf..3a0c42353d1 100644
--- a/app-crypt/nwipe/Manifest
+++ b/app-crypt/nwipe/Manifest
@@ -1 +1 @@
-DIST nwipe-0.32.tar.gz 6363129 BLAKE2B 7a9eb0fe7adee67e3916121d3221cbbe43b8195786260239983d2309dbbf8931750921b31852e38b491712eee3b4fd61ed9676416cad14eb61e86c83a00a4593 SHA512 5a82a685c7c60c02061a3e115e2e2dd0bbe544c26c4fc051dd746ae00965bf6f644f43948325561ce1d991e1af8a118d5f30202f665f6a2cae9d6c79f108448d
+DIST nwipe-0.33.tar.gz 6377115 BLAKE2B d31f30b434bee50488649569721c52689535e2ec9ee4b750e8ccc8b34ecd128f53361fcb0c5261ac46e5cc2a353253f477153d0b5123a72f3e42468266d62d51 SHA512 d39537e7e53fdb8c90abeededc432fc0c0243a101818fc4b387d1808a45481aff6f563c3cf61038d3c463b602b8298f44e30c776c1cc45f8cbd57a516bfe05fa
diff --git a/app-crypt/nwipe/nwipe-0.32.ebuild b/app-crypt/nwipe/nwipe-0.33.ebuild
index b5a3312a3fe..4032e9b806f 100644
--- a/app-crypt/nwipe/nwipe-0.32.ebuild
+++ b/app-crypt/nwipe/nwipe-0.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
index e6f536daf1a..c74837410a9 100644
--- a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit desktop toolchain-funcs
+inherit desktop toolchain-funcs qmake-utils
DESCRIPTION="A time-memory-trade-off-cracker"
HOMEPAGE="https://ophcrack.sourceforge.io/"
@@ -34,6 +34,9 @@ PATCHES=( "${FILESDIR}"/ophcrack-ar.patch )
src_configure() {
tc-export AR
+ # bug #765229
+ export PATH="$(qt5_get_bindir):${PATH}"
+
econf \
$(use_enable debug) \
$(use_enable qt5 gui)
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 45951f693d8..b1ac6440b90 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,2 +1,2 @@
DIST p11-kit-0.23.22.tar.xz 830016 BLAKE2B 4e1edfd9e2441d237c07a16c003aee5ffde38f1cf545c26e435645429f2cfa4fe7ca61cdc3c3940390aa040ba991f2ee3995b14cc31bb886d5eeffa8ed5e1721 SHA512 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080
-DIST p11-kit-0.24.0.tar.xz 834392 BLAKE2B f967b51d3b021c6e95a0ddc1934527023aa4acbae2b193d64829620331ea0f094e1467fdea897a3121d05f30b1747607197a50c906a40609913230ab363c09e5 SHA512 48369d6fdae79b8c5a255c821fbdb982f0c649cce07c0d92f0ff0c16322fea8919faa94067cae2efede2da3646c0e69a71a3e399b769dc2327f247bcb113eb3c
+DIST p11-kit-0.24.1.tar.xz 838304 BLAKE2B e5cb98881279199e2674e2ff4f12d72c4d126c54429ee7ece6dd56ad1987f84abf58a67b8bf2405b19a5bca9d1106f8ec901364ac3d2488f65b3f92b51f850fe SHA512 8cf170c714bb9e0cf3df93e8ec55b8e3c55cabf2c6a27f177ac6de8b8028985df2ca0216d3215d6828dc2ae3095c4e1a4febe8cb26b88ec321defc66bb011e81
diff --git a/app-crypt/p11-kit/p11-kit-0.23.22.ebuild b/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
index d8fecbda238..5285fb5d5e1 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -44,7 +44,7 @@ src_prepare() {
multilib_src_configure() {
ECONF_SOURCE="${S}" econf \
$(use_enable trust trust-module) \
- $(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
+ $(use_with trust trust-paths "${EPREFIX}"/etc/ssl/certs/ca-certificates.crt) \
$(use_enable debug) \
$(use_with libffi) \
$(use_with asn1 libtasn1) \
diff --git a/app-crypt/p11-kit/p11-kit-0.24.0.ebuild b/app-crypt/p11-kit/p11-kit-0.24.1.ebuild
index 7366c599dd8..91ee0171c43 100644
--- a/app-crypt/p11-kit/p11-kit-0.24.0.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.24.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit multilib-minimal
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asn1 debug +libffi systemd +trust"
REQUIRED_USE="trust? ( asn1 )"
@@ -44,7 +44,7 @@ src_prepare() {
multilib_src_configure() {
ECONF_SOURCE="${S}" econf \
$(use_enable trust trust-module) \
- $(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
+ $(use_with trust trust-paths "${EPREFIX}"/etc/ssl/certs/ca-certificates.crt) \
$(use_enable debug) \
$(use_with libffi) \
$(use_with asn1 libtasn1) \
diff --git a/app-crypt/pdfcrack/pdfcrack-0.19.ebuild b/app-crypt/pdfcrack/pdfcrack-0.19.ebuild
index 9ccc4f96185..052aed0a732 100644
--- a/app-crypt/pdfcrack/pdfcrack-0.19.ebuild
+++ b/app-crypt/pdfcrack/pdfcrack-0.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
PATCHES=(
"${FILESDIR}/${PN}-0.14-cflags.patch"
diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest
index a80770139a3..e3ca7ffe3ed 100644
--- a/app-crypt/pesign/Manifest
+++ b/app-crypt/pesign/Manifest
@@ -1 +1 @@
-DIST pesign-113.tar.gz 124618 BLAKE2B 36cdface6ecdf9003251da3058b21b2ee8e94eb655e47a8668b38c4ea576d990a71860952eea277d5e029bb007039c8e3ded9918e89d47f6db404423acbd1cc7 SHA512 e71dc90c2ab8085d1b000c0d2cf9cb00ddaed1ea1393db75c2d19a96f1b1c188a26b76850533ba97ec254a3b48db6b07a69b597c329ac891e64422780a358c24
+DIST pesign-114.tar.gz 148898 BLAKE2B 0dae3b4e17c61bcea02a6f81f6a62f8d526e83954bf95d0de24726daa81e45a3b42b6867f2d64decd69f421a14f5e2ff6ff1ec26246f44d68b242b452e60d9a1 SHA512 567176718e098c3494e27ce29b61ef396ca2503137260fc36c784951f0bd2130c9f61c655461d6091e9bdb0df77c9e00cf2fde8fb1b1c5ab83e4b9c57d65fdab
diff --git a/app-crypt/pesign/files/pesign-113-enum-conversion.patch b/app-crypt/pesign/files/pesign-113-enum-conversion.patch
deleted file mode 100644
index 89a57e460fb..00000000000
--- a/app-crypt/pesign/files/pesign-113-enum-conversion.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c555fd74c009242c3864576bd5f17a1f8f4fdffd Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 18 Feb 2020 16:28:56 -0500
-Subject: [PATCH] pesigcheck: Fix a wrong assignment
-
-gcc says:
-
- pesigcheck.c: In function 'check_signature':
- pesigcheck.c:321:17: error: implicit conversion from 'enum <anonymous>' to 'enum <anonymous>' [-Werror=enum-conversion]
- 321 | reason->type = siBuffer;
- | ^
- pesigcheck.c:333:17: error: implicit conversion from 'enum <anonymous>' to 'enum <anonymous>' [-Werror=enum-conversion]
- 333 | reason->type = siBuffer;
- | ^
- cc1: all warnings being treated as errors
-
-And indeed, that line of code makes no sense at all - it was supposed to
-be reason->sig.type.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- src/pesigcheck.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/pesigcheck.c b/src/pesigcheck.c
-index 524cce3..8fa0f1a 100644
---- a/src/pesigcheck.c
-+++ b/src/pesigcheck.c
-@@ -318,7 +318,7 @@ check_signature(pesigcheck_context *ctx, int *nreasons,
- reason->type = SIGNATURE;
- reason->sig.data = data;
- reason->sig.len = datalen;
-- reason->type = siBuffer;
-+ reason->sig.type = siBuffer;
- nreason += 1;
- is_invalid = true;
- }
-@@ -330,7 +330,7 @@ check_signature(pesigcheck_context *ctx, int *nreasons,
- reason->type = SIGNATURE;
- reason->sig.data = data;
- reason->sig.len = datalen;
-- reason->type = siBuffer;
-+ reason->sig.type = siBuffer;
- nreason += 1;
- has_valid_cert = true;
- }
diff --git a/app-crypt/pesign/files/pesign-113-nss.patch b/app-crypt/pesign/files/pesign-113-nss.patch
deleted file mode 100644
index 5a227a87268..00000000000
--- a/app-crypt/pesign/files/pesign-113-nss.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b535d1ac5cbcdf18a97d97a92581e38080d9e521 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 14 May 2019 11:28:38 -0400
-Subject: [PATCH] efikeygen: Fix the build with nss 3.44
-
-NSS 3.44 adds some certificate types, which changes a type and makes
-some encoding stuff weird. As a result, we get:
-
-gcc8 -I/wrkdirs/usr/ports/sysutils/pesign/work/pesign-0.110/include -O2 -pipe -fstack-protector-strong -Wl,-rpath=/usr/local/lib/gcc8 -isystem /usr/local/include -fno-strict-aliasing -g -O0 -g -O0 -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants --std=gnu99 -D_GNU_SOURCE -Wno-unused-result -Wno-unused-function -I../include/ -I/usr/local/include/nss -I/usr/local/include/nss/nss -I/usr/local/include/nspr -Werror -fPIC -isystem /usr/local/include -DCONFIG_amd64 -DCONFIG_amd64 -c efikeygen.c -o efikeygen.o
-In file included from /usr/local/include/nss/nss/cert.h:22,
- from efikeygen.c:39:
-efikeygen.c: In function 'add_cert_type':
-/usr/local/include/nss/nss/certt.h:445:5: error: unsigned conversion from 'int' to 'unsigned char' changes value from '496' to '240' [-Werror=overflow]
- (NS_CERT_TYPE_SSL_CLIENT | NS_CERT_TYPE_SSL_SERVER | NS_CERT_TYPE_EMAIL | \
- ^
-efikeygen.c:208:23: note: in expansion of macro 'NS_CERT_TYPE_APP'
- unsigned char type = NS_CERT_TYPE_APP;
- ^~~~~~~~~~~~~~~~
-cc1: all warnings being treated as errors
-
-This is fixed by just making it an int.
-
-Fixes github issue #48.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
-Upstream-Status: Accepted
-[https://github.com/rhboot/pesign/commit/b535d1ac5cbcdf18a97d97a92581e38080d9e521]
----
- src/efikeygen.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/efikeygen.c b/src/efikeygen.c
-index ede76ef..2cd953e 100644
---- a/src/efikeygen.c
-+++ b/src/efikeygen.c
-@@ -208,7 +208,7 @@ static int
- add_cert_type(cms_context *cms, void *extHandle, int is_ca)
- {
- SECItem bitStringValue;
-- unsigned char type = NS_CERT_TYPE_APP;
-+ int type = NS_CERT_TYPE_APP;
-
- if (is_ca)
- type |= NS_CERT_TYPE_SSL_CA |
---
-2.22.0
-
diff --git a/app-crypt/pesign/files/pesign-114-format-string.patch b/app-crypt/pesign/files/pesign-114-format-string.patch
new file mode 100644
index 00000000000..2361cb4a266
--- /dev/null
+++ b/app-crypt/pesign/files/pesign-114-format-string.patch
@@ -0,0 +1,111 @@
+https://github.com/rhboot/pesign/commit/df8783ed4ed87fef850268098690985049916ee9.patch
+
+From df8783ed4ed87fef850268098690985049916ee9 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Tue, 1 Feb 2022 17:37:14 -0500
+Subject: [PATCH] Fix format strings for 32-bit arches
+
+Sadly, in 2022, this remains a thing.
+
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+---
+ src/cms_pe_common.c | 16 +++++++++-------
+ src/password.c | 7 ++++---
+ 2 files changed, 13 insertions(+), 10 deletions(-)
+
+diff --git a/src/cms_pe_common.c b/src/cms_pe_common.c
+index 964f0d9..3a3921b 100644
+--- a/src/cms_pe_common.c
++++ b/src/cms_pe_common.c
+@@ -49,7 +49,7 @@ check_pointer_and_size(cms_context *cms, Pe *pe, void *ptr, size_t size)
+
+ if (p + size > m + map_size)
+ cmsreterr(0, cms,
+- "pointer %p is above mmap end at %p (%lu is %lu bytes past EOF at %lu)",
++ "pointer %p is above mmap end at %p (%lu is %lu bytes past EOF at %zu)",
+ (void *)((uintptr_t)p + size),
+ (void *)((uintptr_t)m + map_size),
+ p + size - m,
+@@ -189,7 +189,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
+ if (!check_pointer_and_size(cms, pe, hash_base, hash_size))
+ cmsgotoerr(error, cms, "PE header is invalid");
+ dprintf("beginning of hash");
+- dprintf("digesting %lx + %lx", hash_base - map, hash_size);
++ dprintf("digesting %tx + %zx", hash_base - map, hash_size);
+ generate_digest_step(cms, hash_base, hash_size);
+
+ /* 5. Skip over the image checksum
+@@ -209,7 +209,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
+ cmsgotoerr(error, cms, "PE data directory is invalid");
+
+ generate_digest_step(cms, hash_base, hash_size);
+- dprintf("digesting %lx + %lx", hash_base - map, hash_size);
++ dprintf("digesting %tx + %zx", hash_base - map, hash_size);
+
+ /* 8. Skip over the crt dir
+ * 9. Hash everything up to the end of the image header. */
+@@ -222,7 +222,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
+ cmsgotoerr(error, cms, "PE relocations table is invalid");
+
+ generate_digest_step(cms, hash_base, hash_size);
+- dprintf("digesting %lx + %lx", hash_base - map, hash_size);
++ dprintf("digesting %tx + %zx", hash_base - map, hash_size);
+
+ /* 10. Set SUM_OF_BYTES_HASHED to the size of the header. */
+ hashed_bytes = pe32opthdr ? pe32opthdr->header_size
+@@ -265,7 +265,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
+ }
+
+ generate_digest_step(cms, hash_base, hash_size);
+- dprintf("digesting %lx + %lx", hash_base - map, hash_size);
++ dprintf("digesting %tx + %zx", hash_base - map, hash_size);
+
+ hashed_bytes += hash_size;
+ }
+@@ -285,10 +285,12 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
+ memset(tmp_array, '\0', tmp_size);
+ memcpy(tmp_array, hash_base, hash_size);
+ generate_digest_step(cms, tmp_array, tmp_size);
+- dprintf("digesting %lx + %lx", (unsigned long)tmp_array, tmp_size);
++ dprintf("digesting %tx + %zx", (ptrdiff_t)tmp_array,
++ tmp_size);
+ } else {
+ generate_digest_step(cms, hash_base, hash_size);
+- dprintf("digesting %lx + %lx", hash_base - map, hash_size);
++ dprintf("digesting %tx + %zx", hash_base - map,
++ hash_size);
+ }
+ }
+ dprintf("end of hash");
+diff --git a/src/password.c b/src/password.c
+index 644f362..05add9a 100644
+--- a/src/password.c
++++ b/src/password.c
+@@ -213,7 +213,7 @@ parse_pwfile_line(char *start, struct token_pass *tp)
+ dprintf("non-whitespace span is %zd", span);
+
+ if (line[span] == '\0') {
+- dprintf("returning %ld", (line + span) - start);
++ dprintf("returning %td", (line + span) - start);
+ return (line + span) - start;
+ }
+ line[span] = '\0';
+@@ -241,7 +241,7 @@ parse_pwfile_line(char *start, struct token_pass *tp)
+ dprintf("Setting token pass %p to { %p, %p }", tp, tp->token, tp->pass);
+ dprintf("token:\"%s\"", tp->token);
+ dprintf("pass:\"%s\"", tp->pass);
+- dprintf("returning %ld", (line + span) - start);
++ dprintf("returning %td", (line + span) - start);
+ return (line + span) - start;
+ }
+
+@@ -330,7 +330,8 @@ SECU_FilePasswd(PK11SlotInfo *slot, PRBool retry, void *arg)
+ if (c != '\0')
+ span++;
+ start += span;
+- dprintf("start is file[%ld] == '\\x%02hhx'", start - file, start[0]);
++ dprintf("start is file[%td] == '\\x%02hhx'", start - file,
++ start[0]);
+ }
+
+ qsort(phrases, nphrases, sizeof(struct token_pass), token_pass_cmp);
diff --git a/app-crypt/pesign/files/pesign-114-no-werror.patch b/app-crypt/pesign/files/pesign-114-no-werror.patch
new file mode 100644
index 00000000000..3937873e80b
--- /dev/null
+++ b/app-crypt/pesign/files/pesign-114-no-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/Make.defaults b/Make.defaults
+index fdb961a..cdbb064 100644
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -58,7 +58,7 @@ cflags = $(CFLAGS) $(ARCH3264) \
+ -Wall -Wextra -Wsign-compare -Wno-unused-result \
+ -Wno-unused-function -Wno-missing-field-initializers \
+ -Wno-analyzer-malloc-leak \
+- -Werror -Wno-error=cpp -Wno-free-nonheap-object \
++ -Wno-error=cpp -Wno-free-nonheap-object \
+ -std=gnu11 -fshort-wchar -fPIC -fno-strict-aliasing \
+ -D_GNU_SOURCE -DCONFIG_$(ARCH) -I${TOPDIR}/include \
+ '-DRUNDIR="$(rundir)"' \
diff --git a/app-crypt/pesign/files/pesign-114-wanalyzer-diagnostic.patch b/app-crypt/pesign/files/pesign-114-wanalyzer-diagnostic.patch
new file mode 100644
index 00000000000..43bc0d84c44
--- /dev/null
+++ b/app-crypt/pesign/files/pesign-114-wanalyzer-diagnostic.patch
@@ -0,0 +1,19 @@
+https://github.com/rhboot/pesign/issues/78
+
+daemon.c:922:32: error: unknown option after ‘#pragma GCC diagnostic’ kind [-Werror=pragmas]
+ 922 | #pragma GCC diagnostic ignored "-Wanalyzer-use-of-uninitialized-value"
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+cc1: all warnings being treated as errors
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -916,10 +916,6 @@ do_shutdown(context *ctx, int nsockets, struct pollfd *pollfds)
+ free(pollfds);
+ }
+
+-/* GCC -fanalyzer has trouble with realloc
+- * https://bugzilla.redhat.com/show_bug.cgi?id=2047926 */
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wanalyzer-use-of-uninitialized-value"
+ static int
+ handle_events(context *ctx)
+ {
diff --git a/app-crypt/pesign/pesign-113.ebuild b/app-crypt/pesign/pesign-114.ebuild
index 1b6a9bf475c..bd65febf96c 100644
--- a/app-crypt/pesign/pesign-113.ebuild
+++ b/app-crypt/pesign/pesign-114.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Tools for manipulating signed PE-COFF binaries"
HOMEPAGE="https://github.com/rhboot/pesign"
@@ -16,10 +16,10 @@ KEYWORDS="~amd64 ~x86"
RDEPEND="
dev-libs/nspr
dev-libs/nss
- dev-libs/openssl:0=
+ dev-libs/openssl:=
dev-libs/popt
sys-apps/util-linux
- sys-libs/efivar
+ >=sys-libs/efivar-38
"
DEPEND="${RDEPEND}
sys-boot/gnu-efi
@@ -30,28 +30,27 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-113-nss.patch
- "${FILESDIR}"/${PN}-113-enum-conversion.patch
-)
+ "${FILESDIR}"/${PN}-114-wanalyzer-diagnostic.patch
+ "${FILESDIR}"/${PN}-114-no-werror.patch
-src_configure() {
- append-cflags -O1 #721934
- default
-}
+ "${FILESDIR}"/${P}-format-string.patch
+)
src_compile() {
- emake AR="$(tc-getAR)" \
+ emake \
+ AR="$(tc-getAR)" \
ARFLAGS="-cvqs" \
AS="$(tc-getAS)" \
CC="$(tc-getCC)" \
LD="$(tc-getLD)" \
OBJCOPY="$(tc-getOBJCOPY)" \
PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- RANLIB="$(tc-getRANLIB)"
+ RANLIB="$(tc-getRANLIB)" \
+ rundir="${EPREFIX}/var/run"
}
src_install() {
- emake DESTDIR="${ED}" VERSION="${PVR}" install
+ emake DESTDIR="${ED}" VERSION="${PVR}" rundir="${EPREFIX}/var/run" install
einstalldocs
# remove some files that don't make sense for Gentoo installs
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index c80daad0add..66cf8b46770 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,2 +1 @@
-DIST pinentry-1.1.1.tar.bz2 515723 BLAKE2B f257fe552852e6d1ff2c23aeb0c1127b43e3a60e44c78dfa764d569e659ccb78528ce3ee863114af273a4b6f6c24686cda2cb14bb04995eb8c41ccd4541a9fbd SHA512 d6ab5af8ac2f3c9c05e09703e95d8e2676f9b2b7ceb97f6a31d101d0e9da7a1e106a6d3eabe86cab1bb35a4b119a7cba1380ac64bf13c61af0b3c48803116c12
DIST pinentry-1.2.0.tar.bz2 498390 BLAKE2B 6e97b55fe39e9c17f8a87fa669d23fca56c1095c2533a9eebe459fafc95a3fcb0a5ea502077aae5480b5259a3096c5f85e05d4872c0b19ad33f3d9084a220cc7 SHA512 19cea79aa3982d1f0d75220c8e24ca38d6c49475c6f4c5aa7101151b4690db23ed316096a4a411136e716ba4eb471f48f9b09556e5c9837533c2356b9b384b63
diff --git a/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild b/app-crypt/pinentry/pinentry-1.2.0-r1.ebuild
index 90e78ab8426..f3494a8189a 100644
--- a/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild
+++ b/app-crypt/pinentry/pinentry-1.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit autotools flag-o-matic qmake-utils toolchain-funcs
+inherit autotools qmake-utils
DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
HOMEPAGE="https://gnupg.org/aegypten2"
@@ -11,11 +11,10 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps efl emacs gnome-keyring gtk ncurses qt5"
DEPEND="
- >=app-eselect/eselect-pinentry-0.7.2
>=dev-libs/libassuan-2.1
>=dev-libs/libgcrypt-1.6.3
>=dev-libs/libgpg-error-1.17
@@ -36,6 +35,7 @@ BDEPEND="
sys-devel/gettext
virtual/pkgconfig
"
+IDEPEND=">=app-eselect/eselect-pinentry-0.7.2"
DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
@@ -52,8 +52,6 @@ src_prepare() {
}
src_configure() {
- [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
-
export QTLIB="$(qt5_get_libdir)"
econf \
@@ -76,6 +74,7 @@ src_configure() {
src_install() {
default
+
rm "${ED}"/usr/bin/pinentry || die
use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5
diff --git a/app-crypt/pinentry/pinentry-1.2.0.ebuild b/app-crypt/pinentry/pinentry-1.2.0.ebuild
index 90e78ab8426..22f5e9b96ef 100644
--- a/app-crypt/pinentry/pinentry-1.2.0.ebuild
+++ b/app-crypt/pinentry/pinentry-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools flag-o-matic qmake-utils toolchain-funcs
+inherit autotools qmake-utils
DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
HOMEPAGE="https://gnupg.org/aegypten2"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps efl emacs gnome-keyring gtk ncurses qt5"
DEPEND="
@@ -52,8 +52,6 @@ src_prepare() {
}
src_configure() {
- [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
-
export QTLIB="$(qt5_get_libdir)"
econf \
diff --git a/app-crypt/pius/pius-3.0.0-r1.ebuild b/app-crypt/pius/pius-3.0.0-r1.ebuild
index 49fe29ec920..c7ce49f2b85 100644
--- a/app-crypt/pius/pius-3.0.0-r1.ebuild
+++ b/app-crypt/pius/pius-3.0.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1
diff --git a/app-crypt/qca/qca-2.3.4.ebuild b/app-crypt/qca/qca-2.3.4.ebuild
index c67fc95e97e..05ecf7c8665 100644
--- a/app-crypt/qca/qca-2.3.4.ebuild
+++ b/app-crypt/qca/qca-2.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild b/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild
index cffa5b85eb9..647525cb200 100644
--- a/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild
+++ b/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
inherit wrapper
DESCRIPTION="Hash cracker that precomputes plaintext - ciphertext pairs in advance"
-HOMEPAGE="https://project-rainbowcrack.com/"
-SRC_URI="https://project-${PN}.com/${P}-linux64.zip"
+HOMEPAGE="http://project-rainbowcrack.com/"
+SRC_URI="http://project-${PN}.com/${P}-linux64.zip"
LICENSE="all-rights-reserved"
SLOT="0"
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 29794e046d2..9211a10f329 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,2 +1,2 @@
-DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
DIST rhash-1.4.2-src.tar.gz 416853 BLAKE2B 06322825116cb00aa4987b01610d967eb57c94aa29b43348ec2c31f053fd471a900fcee776714263213e9a79eaf389b2e79d7b34a5afd3e98d68198193b5cbe7 SHA512 41df57e8b3f32c93d8e6f2ac668b32aaa23eb2eaf90a83f109e61e511404a5036ea88bcf2854e19c1ade0f61960e0d9edf01f3d82e1c645fed36579e9d7a6a25
+DIST rhash-1.4.3-src.tar.gz 429290 BLAKE2B d225aeae0b3a8fb2e093a9aef50cd07a790c7e9734e91114deef2ca8492c85261b8ed5dea45958e35e049ea888885175608962ea72297bdef48b00c52f51eaca SHA512 d87ffcde28d8f25cf775c279fed457e52d24523ed9b695629dae694b3c22372247d18f6032f8ce13a0b70fa2953be408982e46659daaa7c4ab227ae89eaed9c7
diff --git a/app-crypt/rhash/files/darwin-triplet.patch b/app-crypt/rhash/files/darwin-triplet.patch
deleted file mode 100644
index 49b7e121d81..00000000000
--- a/app-crypt/rhash/files/darwin-triplet.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 35a830d1968465e4ecb079273f032b754bac6c66 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 25 Mar 2018 17:40:49 +0100
-Subject: [PATCH] configure: Add target OS clause for Darwin
-
-These triplets can also have a version number suffix, for example,
-x86_64-apple-darwin16.
----
- configure | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure b/configure
-index 5b6b710..2d8ac42 100755
---- a/configure
-+++ b/configure
-@@ -410,6 +410,7 @@ else
- amigaos) TARGET_OS=AmigaOS ;;
- mingw32*) TARGET_OS=MINGW32 ;;
- wine) TARGET_OS=Wine ;;
-+ darwin*) TARGET_OS=Darwin ;;
- esac
- }
- TARGET_OS="UNKNOWN"
diff --git a/app-crypt/rhash/files/freebsd-triplet.patch b/app-crypt/rhash/files/freebsd-triplet.patch
deleted file mode 100644
index 94b615824be..00000000000
--- a/app-crypt/rhash/files/freebsd-triplet.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 14db7f9ee87e05450853ba0e1d8e83cc34aef3e4 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@aura-online.co.uk>
-Date: Sat, 24 Mar 2018 13:51:56 +0000
-Subject: [PATCH] configure: Match FreeBSD triplets with versions
-
-Triplets such as x86_64-unknown-freebsd11.1 are common.
----
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 8ebb929..5b6b710 100755
---- a/configure
-+++ b/configure
-@@ -398,7 +398,7 @@ else
- part=$(echo $BUILD_TARGET | cut -d '-' -f $component)
- case "$(echo $part | tr '[A-Z]' '[a-z]')" in
- linux) TARGET_OS=Linux ;;
-- freebsd) TARGET_OS=FreeBSD ;;
-+ freebsd*) TARGET_OS=FreeBSD ;;
- gnu/kfreebsd) TARGET_OS=FreeBSD ;;
- netbsd) TARGET_OS=NetBSD ;;
- bsd/os) TARGET_OS=BSD/OS ;;
diff --git a/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch b/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch
deleted file mode 100644
index 9b25b29a89f..00000000000
--- a/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From c1776248a0b34a690e99ab9a7a814c34f78088ec Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 19 Mar 2018 10:47:13 +0100
-Subject: [PATCH] "echo -n" cannot be expected to work with every POSIX shell
-
-See "man 1p echo" section APPLICATION USAGE. This patch replaces "echo -n"
-with "printf '%s'".
----
- configure | 15 ++-------------
- 1 file changed, 2 insertions(+), 13 deletions(-)
-
-diff --git a/configure b/configure
-index f480f7b..2a7d485 100755
---- a/configure
-+++ b/configure
-@@ -22,17 +22,6 @@ INSTALL_LIB_STATIC=auto
- INSTALL_LIB_SHARED=auto
- INSTALL_PKGCONFIGDIR="$PKG_INSTALLDIR"
-
--case $(echo -n) in
-- -n) # SysV style
-- ECHO_N=
-- ECHO_C='\c'
-- ;;
-- *) # BSD style
-- ECHO_N='-n '
-- ECHO_C=
-- ;;
--esac
--
- # display error message and exit
- die () {
- echo
-@@ -235,7 +224,7 @@ trap remove_tmpdir EXIT
-
- str_concat()
- {
-- echo ${ECHO_N} $@ ${ECHO_C}
-+ printf '%s ' $@
- }
-
- yn_nonempty()
-@@ -246,7 +235,7 @@ yn_nonempty()
- # Use this before starting a check
- start_check() {
- echo "============ Checking for $1 ============" >> "$TMPLOG"
-- echo ${ECHO_N} "Checking for $1 ... ${ECHO_C}"
-+ printf '%s' "Checking for $1 ... "
- res_comment=""
- }
-
---
-2.16.2
-
diff --git a/app-crypt/rhash/files/unquote-cc.patch b/app-crypt/rhash/files/unquote-cc.patch
deleted file mode 100644
index 77ccc9b2c5f..00000000000
--- a/app-crypt/rhash/files/unquote-cc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4558d6753611ab1bf21765017e5b451aee8409f6 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 18 Mar 2018 14:23:28 +0000
-Subject: [PATCH] configure: Don't quote $CC when calling it
-
-It might have additional arguments.
----
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index f480f7b..8ebb929 100755
---- a/configure
-+++ b/configure
-@@ -480,7 +480,7 @@ if test "$(basename $CC)" = "icc" || test "$(basename $CC)" = "ecc"; then
- else
- CC_TMP="$CC"
- for CC in "$CC_TMP" gcc cc ; do
-- if "$CC" -v >/dev/null 2>&1; then
-+ if $CC -v >/dev/null 2>&1; then
- cc_name_tmp=$($CC -v 2>&1 | tail -n 1 | cut -d ' ' -f 1)
- if test "$cc_name_tmp" = "gcc"; then
- cc_name=$cc_name_tmp
---
-2.16.1
-
diff --git a/app-crypt/rhash/rhash-1.4.2.ebuild b/app-crypt/rhash/rhash-1.4.2.ebuild
index 95bea74843c..28eb73baa38 100644
--- a/app-crypt/rhash/rhash-1.4.2.ebuild
+++ b/app-crypt/rhash/rhash-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug nls ssl static-libs"
RDEPEND="
diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.4.3.ebuild
index 9dfdd81943a..3836fca5035 100644
--- a/app-crypt/rhash/rhash-1.3.6-r1.ebuild
+++ b/app-crypt/rhash/rhash-1.4.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit toolchain-funcs multilib-minimal
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug nls ssl static-libs"
RDEPEND="
@@ -19,19 +19,25 @@ RDEPEND="
dev-libs/openssl:0=[${MULTILIB_USEDEP}]
)"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
+DEPEND="
+ ${RDEPEND}
+"
-S="${WORKDIR}/RHash-${PV}"
+BDEPEND="
+ nls? ( sys-devel/gettext )
+"
-PATCHES=(
- "${FILESDIR}"/unquote-cc.patch
- "${FILESDIR}"/${P}-no_echon.patch
- "${FILESDIR}"/{freebsd,darwin}-triplet.patch
-)
+S="${WORKDIR}/RHash-${PV}"
src_prepare() {
default
+
+ if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
+ # we lack posix_memalign
+ sed -i -e '/if _POSIX_VERSION/s/if .*$/if 0/' \
+ librhash/util.h || die
+ fi
+
multilib_copy_sources
}
@@ -58,18 +64,17 @@ multilib_src_configure() {
"${@}" || die "configure failed"
}
-# We would add compile-gmo to the build targets but install-gmo always
-# recompiles unconditionally. :(
+multilib_src_compile() {
+ emake all \
+ $(multilib_is_native_abi && use nls && echo compile-gmo)
+}
multilib_src_install() {
# -j1 needed due to race condition.
emake DESTDIR="${D}" -j1 \
- install{,-pkg-config} \
- $(use nls && echo install-gmo) \
- $(use kernel_Winnt || echo install-lib-so-link)
-
- emake DESTDIR="${D}" -j1 \
- -C lib${PN} install-headers
+ install{,-lib-headers,-pkg-config} \
+ $(multilib_is_native_abi && use nls && echo install-gmo) \
+ $(use kernel_Winnt || echo install-lib-so-link)
}
multilib_src_test() {
diff --git a/app-crypt/sbsigntools/files/sbsigntools-0.9.4-no-werror.patch b/app-crypt/sbsigntools/files/sbsigntools-0.9.4-no-werror.patch
new file mode 100644
index 00000000000..42650929b87
--- /dev/null
+++ b/app-crypt/sbsigntools/files/sbsigntools-0.9.4-no-werror.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/832212
+https://bugs.gentoo.org/845372
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -7,7 +7,7 @@ AM_CFLAGS = -Wall -Wextra --std=gnu99
+ common_SOURCES = idc.c idc.h image.c image.h fileio.c fileio.h \
+ efivars.h $(coff_headers)
+ common_LDADD = ../lib/ccan/libccan.a $(libcrypto_LIBS)
+-common_CFLAGS = -I$(top_srcdir)/lib/ccan/ -Werror
++common_CFLAGS = -I$(top_srcdir)/lib/ccan/
+
+ sbsign_SOURCES = sbsign.c $(common_SOURCES)
+ sbsign_LDADD = $(common_LDADD)
diff --git a/app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild b/app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild
index fbf2b68c085..ba90949d3bc 100644
--- a/app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild
+++ b/app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -14,7 +14,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}.git/snapshot
LICENSE="GPL-3 LGPL-3 LGPL-2.1 CC0-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
IUSE=""
RDEPEND="
@@ -26,6 +26,10 @@ DEPEND="${RDEPEND}
sys-libs/binutils-libs
virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.4-no-werror.patch
+)
+
src_prepare() {
mv "${WORKDIR}"/lib/ccan "${S}"/lib || die "mv failed"
rmdir "${WORKDIR}"/lib || die "rmdir failed"
@@ -35,6 +39,7 @@ src_prepare() {
amd64) iarch=x86_64 ;;
arm64) iarch=aarch64 ;;
ia64) iarch=ia64 ;;
+ riscv) iarch=riscv64 ;;
x86) iarch=ia32 ;;
*) die "unsupported architecture: ${ARCH}" ;;
esac
diff --git a/app-crypt/seahorse-sharing/Manifest b/app-crypt/seahorse-sharing/Manifest
deleted file mode 100644
index e29bc69a26c..00000000000
--- a/app-crypt/seahorse-sharing/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST seahorse-sharing-58db1e5b8615d74afaa5d888237ef6556368147b.tar.gz 101549 BLAKE2B c0ac487e826426c5f0a7fcfdc1078bd9b96442751821ac6597da3ffae3f5ab06b3fa4c4cf514536f9b8375f2a36529768942e6b15d6f4ea57ada543e7d95586c SHA512 6b91a8498f6065a0ddfcc53edf96dbf7720f82a73bc904ce6af18b1f52b559459e21ad9c3d550fc24730e3200c2ff9acaa9bdfe64b5bd83939b55db97ea116d9
diff --git a/app-crypt/seahorse-sharing/metadata.xml b/app-crypt/seahorse-sharing/metadata.xml
deleted file mode 100644
index 7b343b06be8..00000000000
--- a/app-crypt/seahorse-sharing/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild
deleted file mode 100644
index 2fb2f650763..00000000000
--- a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes" # disable asserts
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="Daemon for PGP public key sharing using DNS-SD and HKP"
-HOMEPAGE="https://projects.gnome.org/seahorse/"
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/master/${PN}-58db1e5b8615d74afaa5d888237ef6556368147b.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
- app-crypt/seahorse
- dev-libs/glib:2
- >=net-dns/avahi-0.6:=[dbus]
- net-libs/libsoup:2.4
- >=x11-libs/gtk+-3:3
-
- >=app-crypt/gpgme-1
- >=app-crypt/gnupg-1.4
-"
-RDEPEND="${COMMON_DEPEND}
- !<app-crypt/seahorse-3.2
-"
-# ${PN} was part of seahorse before 3.2
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.35
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-master-58db1e5b8615d74afaa5d888237ef6556368147b"
-
-src_prepare() {
- DOCS="AUTHORS MAINTAINERS NEWS" # ChangeLog has nothing useful
- # Do not pass --enable-tests to configure - package has no tests
-
- gnome2_src_prepare
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if ! has_version net-dns/avahi && \
- ! rc-config list default | grep -q "avahi-daemon" ; then
- elog "To use ${PN}, the Avahi daemon must be running. On an OpenRC"
- elog "system, you can start the Avahi daemon by"
- elog "# /etc/init.d/avahi-daemon start"
- elog "To start Avahi automatically, add it to the default runlevel:"
- elog "# rc-update add avahi-daemon default"
- fi
-}
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 2446da87b27..948d1cb5aeb 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,2 +1,2 @@
-DIST seahorse-40.0.tar.xz 1309064 BLAKE2B dd179ef13c79454b30571959b33c02a523591fa9d59957e0c30ec5d75a52bd8e9a5b420214f85d5feac0849d69a51ddcee808ab47e4bf97d7ac99094f853bc9a SHA512 c389420fb1b3d54c1b9a1004f2c8b9e50118a1ffcba02aa8cfdd2223d1bc117368c9a1ad875c59abd319d95eb93ec3de2e9cedadbfc1d6a0997d613c8256c60b
DIST seahorse-41.0.tar.xz 1371984 BLAKE2B fdfc7c6d5ba41ab83c639d93c92fe6e1c36d42a02c7a384c2055bfe594e2a16415115bfb07597de93a886e492974e38c812fbbd59c7112c0360adeed96cb437d SHA512 cc51e27a55ed646ee376aa1b1bffe28369d80e4b8c484c9711de6bdf190694714ef208579d0399b5c199b5619491d72dede1b1f6c03b89cf3a53e8519a4d4fcf
+DIST seahorse-42.0.tar.xz 1395040 BLAKE2B ae40d587c881851014b1989af986993768598a6a530f281cef3e177f0e6dbb3a97ec5128c5f39a463f69a4dfabb5c9f95af1dd3de7af12247338b8003c102ea3 SHA512 2a961a4054360c9a4fe0e9e360d6ea621a65325db8e40365e75d747cfe751c2dc3230ff51ffe0435d24766a91e8a042b8c01183fd58a70974a7ad095af8d247e
diff --git a/app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch b/app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch
new file mode 100644
index 00000000000..2d205e49a43
--- /dev/null
+++ b/app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch
@@ -0,0 +1,29 @@
+From 38a82911f9c35617e96587e59f796e4616d62483 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Tue, 22 Mar 2022 09:37:17 +0100
+Subject: [PATCH] meson: fix gpg version check for recent gnupg
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+---
+ meson.build | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index e3242323..12ce3d56 100644
+--- a/meson.build
++++ b/meson.build
+@@ -51,7 +51,10 @@ gpgme_dep = dependency('gpgme', version: '>= 1.14.0', required: get_option('pgp-
+
+ if get_option('pgp-support')
+ gpg_version_check = run_command([gpg_check_version, gpg_bin.path(), accepted_gpg_versions ])
+- gpg_version = gpg_version_check.stdout()
++ # GnuPG now outputs e.g. 2.3.4-unknown so we need to drop this extra cruft
++ gpg_version_raw = gpg_version_check.stdout()
++ gpg_version_raw_split = gpg_version_raw.split('-')
++ gpg_version = gpg_version_raw_split[0]
+ message('GnuPG Version: @0@'.format(gpg_version))
+ if get_option('check-compatible-gpg') and gpg_version_check.returncode() != 0
+ error('Incompatible version of GnuPG. Accepted versions are: @0@'.format(accepted_gpg_versions))
+--
+2.35.1
+
diff --git a/app-crypt/seahorse/files/seahorse-40.0-fix-segfault-with-ldap-disabled.patch b/app-crypt/seahorse/files/seahorse-40.0-fix-segfault-with-ldap-disabled.patch
deleted file mode 100644
index 8454a0388ea..00000000000
--- a/app-crypt/seahorse/files/seahorse-40.0-fix-segfault-with-ldap-disabled.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6fc0e3e321cdf0bf7e047234561fe8a8084a93f9 Mon Sep 17 00:00:00 2001
-From: Xi Ruoyao <xry111@mengyan1223.wang>
-Date: Wed, 14 Apr 2021 23:18:06 +0800
-Subject: [PATCH] Fix segfault when built with ldap disabled
-
-Fixes #321.
----
- pgp/seahorse-pgp-backend.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/pgp/seahorse-pgp-backend.c b/pgp/seahorse-pgp-backend.c
-index 25febf31..8c10e7e3 100644
---- a/pgp/seahorse-pgp-backend.c
-+++ b/pgp/seahorse-pgp-backend.c
-@@ -445,7 +445,10 @@ seahorse_pgp_backend_add_remote (SeahorsePgpBackend *self,
- /* Don't persist, so just immediately create a ServerSource */
- g_autoptr(SeahorseServerSource) ssrc = NULL;
- ssrc = seahorse_server_category_create_server (uri);
-- g_list_store_append (G_LIST_STORE (self->remotes), ssrc);
-+ /* If the scheme of the uri is ldap, but ldap support is disabled
-+ * in the build, ssrc will be NULL. */
-+ if (ssrc)
-+ g_list_store_append (G_LIST_STORE (self->remotes), ssrc);
- }
- }
-
---
-GitLab
-
diff --git a/app-crypt/seahorse/seahorse-40.0-r1.ebuild b/app-crypt/seahorse/seahorse-41.0-r1.ebuild
index 935f5b5b2e6..aa0c3a9e03f 100644
--- a/app-crypt/seahorse/seahorse-40.0-r1.ebuild
+++ b/app-crypt/seahorse/seahorse-41.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit gnome.org gnome2-utils meson xdg vala
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg vala
DESCRIPTION="Manage your passwords and encryption keys"
HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
@@ -10,12 +11,12 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="0"
IUSE="ldap zeroconf"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
RDEPEND="
- >=dev-libs/glib-2.58:2
+ >=dev-libs/glib-2.66:2
>=app-crypt/gcr-3.38:=
- >=app-crypt/gpgme-1.14.0
+ >=app-crypt/gpgme-1.14.0:=
>=x11-libs/gtk+-3.24.0:3
>=app-crypt/gnupg-2.2
>=gui-libs/libhandy-1.1:1=
@@ -34,6 +35,7 @@ DEPEND="${RDEPEND}
gui-libs/libhandy:1[vala]
"
BDEPEND="
+ ${PYTHON_DEPS}
app-text/docbook-xml-dtd:4.2
app-text/docbook-xsl-stylesheets
dev-libs/appstream-glib
@@ -46,12 +48,13 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${P}-fix-segfault-with-ldap-disabled.patch
+ "${FILESDIR}"/${PV}-meson-fix-gpg-version-check-for-recent-gnupg.patch
)
src_prepare() {
- xdg_src_prepare
+ default
vala_src_prepare
+ gnome2_environment_reset
}
src_configure() {
diff --git a/app-crypt/seahorse/seahorse-41.0.ebuild b/app-crypt/seahorse/seahorse-42.0.ebuild
index abbf0c37770..0aeb990bc5c 100644
--- a/app-crypt/seahorse/seahorse-41.0.ebuild
+++ b/app-crypt/seahorse/seahorse-42.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg vala
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
DESCRIPTION="Manage your passwords and encryption keys"
HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
@@ -15,10 +16,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
RDEPEND="
>=dev-libs/glib-2.66:2
>=app-crypt/gcr-3.38:=
- >=app-crypt/gpgme-1.14.0
+ >=app-crypt/gpgme-1.14.0:=
>=x11-libs/gtk+-3.24.0:3
>=app-crypt/gnupg-2.2
- >=gui-libs/libhandy-1.1:1=
+ >=gui-libs/libhandy-1.6:1=
>=app-crypt/libsecret-0.16
dev-libs/libpwquality
net-misc/openssh
@@ -34,6 +35,7 @@ DEPEND="${RDEPEND}
gui-libs/libhandy:1[vala]
"
BDEPEND="
+ ${PYTHON_DEPS}
app-text/docbook-xml-dtd:4.2
app-text/docbook-xsl-stylesheets
dev-libs/appstream-glib
@@ -46,8 +48,9 @@ BDEPEND="
"
src_prepare() {
- xdg_src_prepare
- vala_src_prepare
+ default
+ vala_setup
+ gnome2_environment_reset
}
src_configure() {
diff --git a/app-crypt/sequoia-sq/Manifest b/app-crypt/sequoia-sq/Manifest
index dabe3f5db5a..7f285567850 100644
--- a/app-crypt/sequoia-sq/Manifest
+++ b/app-crypt/sequoia-sq/Manifest
@@ -1,251 +1,380 @@
-DIST addr2line-0.14.0.crate 30065 BLAKE2B d4c64b5584252974980bf6e8a508aebf7e93c206789569112f1d36172adb90652a95da3f8e9da04dc278cdb2444a75483036a08b0d92047810ce8d3bf4f8aafe SHA512 86891fa5e0d5b625d2f90da9e55b3ec1bb83870bfb4beb26dd6048830632f0cd250f2d0a8fc5d2e2c34ecc3ba16ee014d9e25b1338431114dbaa4b4cf25ea1ed
-DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
+DIST addr2line-0.16.0.crate 33440 BLAKE2B b59a006ba732935d408d0574799037ef0a424ad3c27b894fbd7a9c91664460972a8c464aaad4e9b82b94e4cc35ee9016490bd469fa21358e11e6d78126378038 SHA512 7ea8fffcdff7f8f25c0a588fe2ee652053988ab2e1d39ac740f5199d6e7d30beed0272403d04b86ec5de6ad5459698cdf28f8efd5caab7b6693102df7ec4889c
+DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
DIST aead-0.3.2.crate 11145 BLAKE2B 2666f7c6a9a3ecac458fdda9d7698e1c4288d56b1d7f9fcaa91664a33652f91eaeda8807bfbdc3cfe9c29a9c8c391de9673c4b65b3e13f408ca5f1a59e8f8dad SHA512 803829ea12f3fe11c1e1f4d33610c361a11b33811ab28185ad4b54d9026384b8778c3e57cdc6feff8ffc56792b482fc64a8cb7daa14805edbbcd988c2d3256ea
-DIST ahash-0.4.7.crate 51474 BLAKE2B 0974b90539398d61903ce7fcbecdfcd802fcb5c7ed631be919ec17be6951e68bc80787876cafebd33e40a80605f6e2352a86047077bc40575420bb6ee1a4915a SHA512 2f42cdbacb2b2f9bd7d94a4cc61294d7813428157ce242ba82f7c3fccb6e4b83c767f4dedd35ff26ae61a89506b388d7cf96af4e727c29a14b25b9f82b1f2126
-DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
+DIST aes-0.6.0.crate 86774 BLAKE2B e687f2839b53adc3ef990da8221705a462015aa0ea004a6e15dba7e7ecc008d9d13cad6222b03244dc48bd1717a442e7aa5aaab6e97bba1d3be28c1d914e464e SHA512 65349285e429f9b8815743d86b3ebdececd48ce556a08b6ec5ec89bf966bc9b187a7df4fbe1f3b25172db3aab219b23f8040c1160359868e9f71d67a767c90c9
+DIST aes-soft-0.6.4.crate 99980 BLAKE2B a4b3838e0348ed3d7468f9d0e19d8dd45071ec54d54d538943d5afabd3f88db139c459574e6694e7fa86e4d77eaa3f75c11e3a9376f45429848c91889530980b SHA512 620b38b2a6437caf393e84625beb27afdf448acb52d7adbc9cba1152ea385bdf05a68795eee0f48fd90b5edfc25fd9cc3d42a0f2593dfa2f90d4f4f9cc893ebe
+DIST aesni-0.10.0.crate 100248 BLAKE2B 2dba6f1004495a725acf171eeae5a6e393475323e8974eff2e4667194ac147dc3a52a9bed1b00cf7735d3671b6a2bd135cbb4dbde822d7c8c21af23692d3e71f SHA512 726e5213a81ea021d4be7c5220d952cb6f0cb0ecb6cc840b542e9f75539e37fc5d6378ad4f4d6a2bc7e7642ea07a18202ed32d3b6a212777bd7abca735c6707c
+DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST anyhow-1.0.35.crate 28928 BLAKE2B 74fec657b5c21455298198bd9feddbc5086c433f2c43de45950e33341ca9527f88f4ccb94eef248437e455394d54ec0dc13af33843deb799a0215abd1b1a874f SHA512 e93baa31f9eb04dcefc9e17fe030778337796490cec3467799f98dbfda77f55522457adde388c08b8893303e8a34292b863793f37956c4adfb7a88ba10fbd154
-DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
-DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
-DIST ascii-canvas-2.0.0.crate 10341 BLAKE2B 4f2eca605282b94facc369aa64986a723465b25b73bd4a7bdd70dfb4b845a434256bc296543462e7b9446215268888519bc4363d566a57aea3b9dbab8fecfa7e SHA512 814f1709d6863b904ba014025b01b3764592eed280df2500f8eaed9c150998315b4ae1de87d9c5d5c179f73cd0c110756e2a4515f04dba9b259f61522ef1cf57
-DIST assert_cli-0.6.3.crate 18660 BLAKE2B 783b9eb81ca21a4274f9f14791eb0993bd3562b96bce787753a24a605490c97c97298f18061d7036aa648e4d3a8076ec87bc81fedde7f0c48dcccaa5d6cd12cc SHA512 f61e7e99123c63f30889bc743fdf9e412358ad6b52be7e29c89dcac09272b8d1132284c90dc96e3152864401d36a2c969019e0b821b2458dff2fae3debf4b6ad
+DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
+DIST anyhow-1.0.44.crate 35067 BLAKE2B 19dd53abcbf5ade698f3bf5b1522fa8c1c55b777d91fd05f6c43a7a32691d00da756c7af9d991ebfc71b02fa4e8e2e257c78ce3e29f8c3034066ca43eea4c07d SHA512 d8ec44c64cf4b06121421c99157573b59e2078ab1aba7d949aad9ddd5ec4a1b585a07d0ca06807ed2349c6becaed1cba69f10f9affa2da25f749b615a70aa9ff
+DIST ascii-canvas-3.0.0.crate 10575 BLAKE2B fc40c40551e3e1b2bec6ae5a85ee8b0a1ab1ef3425cdd19ec6dd47d849205004781a2c8f51470417fe7556cf8524cc63b84a532532c5081604adbcd92d286b44 SHA512 216056640604f5faba6d46e2c94ff75234fec83d3bc2dc7cf34dd279706362874e3a513c717b23bc591da07cc3088458913c4e9aa5f280550c93d261095c8703
+DIST assert_cmd-2.0.4.crate 22581 BLAKE2B 7fc9fe4577e486f26d07b2b4419c331022ca61923d0664f4e8a25abbe6d6305600b47c739f9f065ef778bdeb59b6309ab73df2be11e5f8387cac2e7e8c70a4a2 SHA512 c389e0210153e9a6ccbba4dbc6a6c7a23533e5fe76e717dbc36415be2adbabfbc0de33a2e6d05e3d70779b7a278580edba400c688c9a6b446403b59a78d93720
DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
-DIST backtrace-0.3.55.crate 73145 BLAKE2B 51206670a26275afd43da11c210b4c581c962ace22f7da19411aa287961313d71fd0d1e09866b8870d5f25fdb25b524aa79ea65b7e66eb25cd134c12455bfae7 SHA512 c39ef484034fd10577d3fb3d1b57a2de246d882c0f401477dca29bf856b33fe0fbd9c3732dc926c3df0f29cfaeb2e2ee94f810e645ad21642e445b6f239f8e69
+DIST backtrace-0.3.62.crate 74306 BLAKE2B 75bfa1ff999e33ffba88815bc143732d324bf50e92bbee2348ccb28d51eb389c9abbe3be08aa791cb167b5db2b2db3f13172c574396a7717b4512735032caca6 SHA512 d8f5f18ea168317838c05aa169b095529bcab7d7392a93f59d76d32a9eb99ea18dc14f5eb6f9e36fa087387e2c08c23e735a1823550e509d3e110a1a7f63b1b3
DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
-DIST bindgen-0.51.1.crate 185858 BLAKE2B a6db2f20d6587bbb077d1fdd271495af8f6fa6b600ed0dbef096c4fee315aa87751c5b7331663496646acc0584d940fdaddf233483c4b4ff06a62745b614cf53 SHA512 d444ef2c9bb2718279d1673ad7ee02d452c3bce7b61ccaa884fe1b1e60193d9654adb58df01ebbc53455d19b9808edb745ed3edb59dc64721477468195d43eae
+DIST bindgen-0.57.0.crate 199132 BLAKE2B ed5d73da72116acca0124770f6f8e162c161c3375980505a704d3fc73ad20fc8cd81ce59680deb4922def8737914027c1c1e2c9fb4b181ddf114a08522657b62 SHA512 a4bf376aa0f84e625f4c5eed7bdc9775549b0ab9e9edcee708d8b56df6cb49611b7093692e772ed7ad5adb1c3d8055d81b4ff19359a193a5bfb4b200ca8a26a8
DIST bit-set-0.5.2.crate 14093 BLAKE2B 06d41a217438d9a00f8e57e592d12364b671d082f21a4d174673bc820dde28ef5ce02e782002d03c9311f71b0130eeeca7cfacbc4c1b27475069479163643ef3 SHA512 9709f35c7e69b84eed61f73da99ffe0693d1d0fa5fb94d13759cfbbb9dd4b0bb27628c3200e4b29ef29cdb0aede5fd3d7ddf663012b2c5946975bc169efbac34
DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
-DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST blake2b_simd-0.5.11.crate 34096 BLAKE2B 480fc200ce3fa3bb364ae05590fe26f59efb6f81fc2fcb7ae1593671677daa6f1b526d800099d002239e2ad435b919e9b32778021c0790954383079a49a90965 SHA512 4a7657db637869465637cb9a65cb82e7a119c554bd4d532aaf84f9cc77a494fda07d07db89c73e92e5bf4844bb1be53062fc61120e839e414e938e487e7f2257
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST bitvec-0.20.4.crate 196534 BLAKE2B aecaae6c552828f735c74c5470c0a7e729b7a7fde22c623874c97fe19d62f1acbfd5034a360636a01356cce5d4fa3f2e5debffe1c93565da11cc15aec8d4d31a SHA512 057d14aa4376714578be0a82bd5bd590a99fba4b1622d6c725187b78fd4371d83bf81ad76ba5b380ca18d8dd45f6a39354d87ebe06316e3155d3a98b3db10302
DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
DIST block-buffer-0.9.0.crate 7108 BLAKE2B 42e99ec46c6e43d5f85e8d6d0a8fcef7175c97828758c93e55505c0e18e2646ae77bf264076041bf682532e28268a4978dd9c822c0475347ee3d29c5df2601fb SHA512 2d0f8908f59d4b1cccd1fbca0c1fa3cc4b224f09549669b28a16af5acfd4369b66851e9be8d65e1df71be998fbc42fc130ad32b71e035d6055724e8fa31fbf98
+DIST block-modes-0.7.0.crate 13464 BLAKE2B 70b4b199607925e338b22e04d48fffa4591942c6d8321c684cd34ab4ca28e6ae16a75b36845867fe99fffc47af62ed5b27e5c17ee860e1b87fc5d3526f34a9df SHA512 255475599706befd36756100abe350520076aafc3eb069beb5a5daad4c017f3c547a9699e7152b935d09a59f9a8762e0b23e5e3eec5a09ee2377978d272232b6
DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
+DIST block-padding-0.2.1.crate 7672 BLAKE2B 26f682717c908886fc54606950697a01e999c8d725e39cd5ca9148b089d5b32981daf717db21128b551287d5e818363db4c34123a8d8dfa3405f940eb284c01a SHA512 d0bad6ca76cd491446f17c00986aa8caab36a78b4ee4f881a14b316074a96940566ed90460aade765f2e7ce04b359cfe21f6c323200637f50e8b5adf567017af
+DIST blowfish-0.7.0.crate 16275 BLAKE2B 56206561f9301eb93411aa86b027bb7816b62154aef7f62fb6692110f88d40fba3cf110c1bc3f634254fb64600de6330b775ea777a5f3bb3a35ff8737751f2ee SHA512 1aae8ac2647955382f9caf0f23c9c8bfd3801f49f0d0b66aed46e30e89ea08ea57c4c53401b50abc47f9653c42455c44d2339df3e0e2315e5a88d89d35a98090
+DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
+DIST bumpalo-3.8.0.crate 79835 BLAKE2B 3937c4ca9d7c5e2ffee229c8f5503c6a59f2fabfa3b7c81fefbf5df816efc5f601aaca4b606a62e647262acafa34146aa0906eedc09368e16eb76b3c6722e8e1 SHA512 c9825e7638bd54f97877adee8ac8f6a2cee308050c3f446f9da3996688ec3d779cb6eb935a440329794fb534958a6e89749b44a9bb27dfd219a963f64a6bcac1
DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
-DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
-DIST bytes-0.5.6.crate 46291 BLAKE2B 6d33ab47d04f2e469db2add31db118f95cad53002be7969738923d62a4fe3605ccbe9fbcae6d8741310c543625e80d9adac7d9e9fed01b71cb3943ddd015d920 SHA512 a1caa1f58754f4d2e54b8df8d0ca0083ee5282f5e4d3bb5b1735022933dd2e66fb3f39c7a82216bf7a7e29591695c2e10c8b7144c83ac598e34193f2425a32cc
-DIST bzip2-0.4.1.crate 15881 BLAKE2B d6015e671f9e22d54ed1fcf6f1595eca6942fbff611ba6fd9c52124f9efff87b6bbc6cd88c84fbb9a86236d04d18821ed0c5ef1085e837686ef5e8a61738a6ac SHA512 d7fd9b2f822f21ca412ef94d3c8eec50454c03d9ca0c739f5ddb418a3c132c45cb011d0cf1efd9e2a96b32ea40135862251eb02ecef1868b019f7dd41e202543
-DIST bzip2-sys-0.1.9+1.0.8.crate 632339 BLAKE2B 06d1379907c9e2993be7c4770d2b1907b79129e3c3623d38452ebcc552339e8ac0d1ef64c4204ec133a9784354f6b849520580ac99e2cc8ec232e86c507037f8 SHA512 069ff0c16f61f6c2b58fbbe11896130c666960926dc12a08e5db64073625b02f4e9628da52cc46fb2ef11ac8ac4268c735d6f37378e9eed1e2b258d5cd235145
+DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
+DIST bytes-1.1.0.crate 49640 BLAKE2B b3140dd49dc222cd0405e405da9629038eb7d71dd4c22c8d6419ade041dc1118aa46df38f3426a36a44d8e5591c368ae32a89e71850dca7e810bbfff4441c37d SHA512 d34441ea146ccaf55da4d5c645f8ffbd008eeb3204dafd5961771abc85df52751dfd1af3975fb5c91eb83d9a43da4f3589bc3aa07c8d715906d8158f3092af2d
+DIST bzip2-0.4.3.crate 34195 BLAKE2B 946ff5824531de8b82241fa042638cd33e708c4b517fa40c99e49f77ac7fd7aabe614e4b560ed8f5484ef8fd06bf19041cb20b7a622f4f1dea9ba26c5b821c5e SHA512 2d4622c336f204ab28970ccb369ba55829bfea426bfe96f15da376f2375c441a9bfb03c46f5da210990f23115740250cc15e9036309034b39a1c960dca542da2
+DIST bzip2-sys-0.1.11+1.0.8.crate 633444 BLAKE2B 01578c512443134fc786669bea4f2ec4b9c457b9936c907315299d8b67ed78045d458c83ccc119f0fad511529fb5af5feff5fa2d983fdae832d2fcc1b343e102 SHA512 d0a86b9f03acb1e4e309d5739dc2e88cab582757d467a433afe0017017f0e5d2c0282529e3a117160958ed170d8d695ecae739805888305df0e35e4dc440582b
DIST capnp-0.13.6.crate 62063 BLAKE2B 0da79e312563b49a8aa4f855a8603e78da4505ddb4eb8f51becf76248c599df5f28fe807e908a329bed07b6830c03153fd408bd7ccdea28e41245346fc3576f3 SHA512 f7973b2c89b1a9bd795ba8b01bdf9c975a40420ef1d2dde74a941fe0b21481d9e3a3045ff5080f0136125d4a0b0ad5b5a7888eaba921d7f141b67ea82859ab6d
-DIST capnp-futures-0.13.1.crate 7482 BLAKE2B 655bb4ccd1bc95a5c4acfd0bee2f64bb393317cda5713ba50904b831e0299646eba23f1c4aa3b3fb620fd2a34d00613860fd7ec0c4b42d1ca681fa49285eb4ae SHA512 da33626d7b503e744e93dac9ea16a5754754c71060f65d7184008367678f03d4a086ac3ff6105368800e1cce47a5f3cad4184c0e82892555328e472709bcef47
+DIST capnp-futures-0.13.2.crate 7630 BLAKE2B aac7ff508e646db2981d1b268a13399150ee80d0ac9f492019c847e1d09bfa81b710c05f3209ed087d0c5f5c5ff60967f7cdd8b5de858f1af3f90e1ee28a6c9a SHA512 13200ee8c905246f11bb2987a54d12c325ba07b886d27de4c20b34b5844d1742c5fb36aad3a82a7784a7cdc453ac889021b1be3fc526c1b8fd36180e2027593d
DIST capnp-rpc-0.13.1.crate 47484 BLAKE2B 1353171907ac6961dd31bce85a337b500e24ccabf626407ef2c30784f709d1f94218d3c7f2f7cb9073b6a264c461d982d2d8c9b4001178f51e0f0e0eb7843ad0 SHA512 11b304407dc540092f4078e5ae3d7bd57a0e105829e9855b35a75de402f551c5c123fd17f2d106150061682628966fa331edac3266e4b9a06ed7198fedbabab1
-DIST capnpc-0.13.1.crate 39216 BLAKE2B 610b0aff59910f5d1b852b739c4f79b40771713ebe6fc87fe2e3312e36e79e3125ced74e8c1f760d0cf2cbcc117355b6dd0eb15b73d5f95b47c4c15666e8b0cf SHA512 88e7cd7dd872187faeee26a132eed404ef7fdeef00b01a5585ff8100ca0ce31ff381cf1b424ba39a68db6e5999d6788049dcb57a9b6ec4873ce4fa790a282d33
-DIST cc-1.0.66.crate 53454 BLAKE2B fe34309ae50a3b022c36270a1dc819713f9d70e9ade2f421c33c542e865dc861e3b5191e8949de253515aef6878f786a6abe048391a819d09bf57f33054a90ce SHA512 b07a70f88fa0588fb0f6bc7376e985834672cc9914a0713afe01740af6bcf01821d15720d831e8b7ea8b42f5866dbd011a245997f35bf8febc3b13d66089723e
-DIST cexpr-0.3.6.crate 16904 BLAKE2B c809e953b1df2ff915c901fb0ca57cd9d1e023b4e933e1f929956f1ad81d921b04cc412e7d00605a39e33e9b7623bf1d7d0d05d8d22b04d7abf1a5cfe883ce5a SHA512 1f8a6dfe97b70844526ed95f42a38c460ec9056345c4c0fd62c42dc9a52e4a317cab11fc3620419cdb4d0b8eba5d7d225c7b211939a47d4a6019a0518e8c738f
+DIST cast-0.2.7.crate 11222 BLAKE2B 8a09b6493d68b08539b38fef39ac3abae829c8b899d5243bda3c3d8acada44f4c57416e3247c82a9a4b82180d7f96c96f048b8cdbf21a8fc184ca6957b237ad9 SHA512 24d204acf21366e088f721714c48bb6431895882263ef3a08f6644abbca5c06f430729fa8bbb4c9f37c95a6baa1b824d3fad95c5f0889e92587490d51bebb4d6
+DIST cast5-0.9.0.crate 36714 BLAKE2B 28aa02c1924b01f5bb20984122818080463a52c45ce7cbcdb9cfa05d808cfccb9e35d2d2f5481f651c6981198ef4f9309a2fabe61e9b8a02023c71fdf8376c85 SHA512 38e11c0851254f47f79560a2c08e9e767ea2c50a180a1e6d331894473dec9fd2126bd7108dc0755f9c7726d586c6164e55f2805d3e71c544d0fd410e89c60262
+DIST cc-1.0.71.crate 57452 BLAKE2B e49f68bb602b0649ee3c4e7b22b7a49eebc4501a1105961ad361f00718de1f2f2f998cd93b9984d8d50d4418a86348fbabbb3bcefd7d0fa3acf812f32cf654c8 SHA512 c3c94bdba52f97ccc18ef6f71b0c70e30d89ea981541bdaf19758b765732ab572161534fe944d3ec6a9d5aa72e21583245554be86251c9ba236cc7d1aed19383
+DIST cexpr-0.4.0.crate 18023 BLAKE2B 4a55c6c80f09c1d4ee86706d8af1f52219ceee99f19ecd0618825ce5bb27535184b64c0a49a540756b0c5e9cce6e39aac271545c504fbfb37c44052d04856cb2 SHA512 31592e38d80414cd07b25f7460775eafce1f91570abc1b94af7452961604574d1ca2374c0177875569b644f615a2b6fede273f37a6ee137f9adc9c0315c59b37
DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
+DIST chrono-tz-0.6.0.crate 569342 BLAKE2B 5e7500b3e234b7a6f908b975bc0530c783255a31e88a7b1d9f7022a311c8ae1a02c9376f1998371fc2a7f9dc5201614d1fec9fc1711e57671fecc11054bcffe7 SHA512 4a2af9ca6cf3fe7bf18076bd095e86dd811e73ee92ed9c771d185fa44c65be4d178e4dfe0a14bf9c37e71d361621c12503969692679078716c287616f88a6185
+DIST chrono-tz-build-0.0.2.crate 5840 BLAKE2B cf7661f2b7205c90ed664c874c230928cc7e70d3a62d758fbe8be862b4cb35312354efa13fa39a99ffb857632cf57519b168a51b65fe5f3d573ea2a0a4194f27 SHA512 9ce99c60a61e97d987a84b367832cbc239cd13e2da5f8af8661afce16fcf6fa927fa1f3a03f002a82261fc693999832b705d62ce1dbba33bb11a0a7a8c38c521
DIST cipher-0.2.5.crate 13099 BLAKE2B a728a53007340dcc55da52cc170e5b801c8ad20c4e159d31200d5ab7f8bf4407af9a60713b4385ef0d65c06cc81692cfbd7339cb7449367d1eaf7c529ca34373 SHA512 e55627f5424d9b566dfb0787eebb1fb17ae98b4016c9091e87040ed37b36e0256b7681958a0d90aaf06c125c71123270bf986128ca1e0dc125f3162a868848b9
-DIST clang-sys-0.28.1.crate 34180 BLAKE2B e4428b8e15ac70e08b9b804b838fb1f71503564d57359ffbda9de3c3c8c1d1c9b52ab490bf35cd8448ad9031fa951ed9eb7f3c0eed63bb48f68c1dbecb137760 SHA512 56818d67a45e807e651ce2426b61b8c5e026087d5709cc0cfbef26eb162177746ecb13bf07126615bf41ce0b95b515a5e29aad3b65058f714d37979fe6582a98
+DIST clang-sys-1.2.2.crate 37661 BLAKE2B cbf637171253aca4892270e28c54c43b01cd1d56311555bd6c5e6b142b5f42d561a2808e1ce0baee344d08a2fbc19be1712ca34bbc5b33356a845042ba0df5bd SHA512 7f1736bce5dbc644a4901a73926ea2f6a92a419a7399b6cb49bf8ffed6a3177e9327add6e68fdf6b9966f4b0b580b213555d6cefbe194ad7a4bee987adf555e5
DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
DIST cmac-0.5.1.crate 9684 BLAKE2B 9996639f8716d5b201191f8643f673668bca55476f484879df39c9c1fade1f074a3847257b7f899f9e8c16cfc9637595fc8754bac57eba76e06da4fa57fb2a31 SHA512 0ddcc77a62c89c27ec5e5438a5a9487e22a13506385108ac091afb5e971c996e8fe1b671137912d4ecfaffd16585091dd81239eab91434ebf50643188f7612b5
-DIST colored-1.9.3.crate 20062 BLAKE2B 43bea2edb35df0382def6b0d37a55ce0214732bb152eddafae0c23fae05c5f4c6f9f3b88c6f271c778d80990eedc52e02a46289abdf2b1e0ba692bd83d9913b6 SHA512 72a77360148b960662d62aa63313e235c155c761948ecc67d92f244a99fefc92ad133e1820634358130db841095027cd99b64a79aa6fa41a279e0d5d505aacd6
-DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
-DIST core-foundation-0.9.1.crate 25985 BLAKE2B 22e70b7b1cd1f39c4ac287f406dabc549e3ba750ecf17955f129ff83afe67bb4bdee7e7907287eac0c28597df971de27dae77619f44d0368864c08798def1ae2 SHA512 d6dae760082ef9dcfc37d18acfa9a6ad8ee491335d17ee17447c5bccad623564f1e8bdc54460fb260aebe9276ce5ea4d8a389a83b5c7d17193614906c3d2bea9
-DIST core-foundation-sys-0.8.2.crate 17461 BLAKE2B bafa6f6af67f55b34c20e50093a5426bed35c159058a97c03d28c99b6f0075305596907291d26b170ee2ce1bf0c74bd51e2c54f11ef021399791129de6cabb57 SHA512 1c66f2012c11185603a0e4c09311d32bc4ffe639ef7626e49bb15006306fbed4c963f2c53d3b853a254b29cda73c393e0236436575d217992268463441ac7348
-DIST cpuid-bool-0.1.2.crate 7173 BLAKE2B c94598ab349d87a0859112433d6fc31e46eb04ec8c0edc7ce1f15a31f9f3857f93f067c4ae35e648bf2bd4f54d1ef37ffc1507b5d6eec8c3432636c589d1d8c2 SHA512 7907fc4ec0d5ed370edde0655c8223f0df6ab06c2c297c7d3bdfa958f601550851331e777065b4fe21f01f46610604e91ea2e20aa4b4147f441319224f69597e
+DIST const-oid-0.5.2.crate 13862 BLAKE2B 3b7eb180621a97f0f9e4f9c4261546bffcb16bd914d890c4a1c77342c253619482fcf1f61f22b89c0f78364f2958e245835a751c7981c038ef473a3939292e3f SHA512 28f8d78796953a139b32ae4751a050f829180884e0b690722e04971a719c9e083f3ae5836baa47747c351ee497c92adeaafe4a91008cfcfbaed0cce81bc08112
+DIST core-foundation-0.9.2.crate 26857 BLAKE2B 9090a489f2d3cf8cbe59472530470dea0ae9e1a0838207424953be812586aae013f9f6cafc4ecbe68be302f4ca208d8c892c87b5736dadddffd6d739e6427934 SHA512 9f68929963fdeb16954e6642f27173fa5d08d39e835d74f03e18d7cb23e9077572d712e7c9afc8ab0be377fd1d845625986d0a905eb6d55331027be2a25d4f9a
+DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
+DIST cpufeatures-0.2.1.crate 10500 BLAKE2B 92e676cd9a8901cdb344340dc7cd7b6d66114a15bd72cdaf600283c79c2339fc8f89b57ac38808141037ea45ae32628e9485cb825c7bcc25abd94c41b6549407 SHA512 0db2486beb0f287b2b4f8543f0f02c4e6d00f66e65c9785a1ecd2868c460553f016b33426c24d0b0ade1417906f5853cfbdeed98ad85cfb73b4f7ad3af85a613
DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
-DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d5316540fbdb34e6b88badff8968a408b2bdbd0f86a32531f4e276b6d40a89c4834cd8e9991288a0bb8cc27d99ba2f7b978 SHA512 c9f3a513fd139dab3c8091366cd6d378ef8a4d00eb43a6c26d107361fea470a5ab180950a1204c1a8881c2ed1106500327d598ccb09c79d0eba2db11299aa286
-DIST crypto-mac-0.10.0.crate 9476 BLAKE2B c9d2507012f3e88cc6a8933db4b879f90a93f8cc16a573436a200a386c67434fd8e33b1cd6aed1298a50681de554b7b3f9ffbbaf46d411ecd3323a12218c0bcf SHA512 8b406db46a08f64d899eb26597fac99576b3fa892eb83bbe089eeef7e6452f43dd138232ed4fe75cdbac2966f94b71f92910c14c53b39e5501990a9976ed1b59
-DIST ctor-0.1.16.crate 4770 BLAKE2B d1234c086e370d0f86b3ef7011c111a0e439c94ce0aa25bf16fde3496056d3143e5798b7eee1d47c72d90f564dbba06e49d9e7cd381597276c1789b47fbcd574 SHA512 68b4a39ff49bd1ccbbf467da5f376cffb68ca10290ee9c587b063f7281c84d36a5c93ae242702e2135b53178de984d99d4dc0c246d4fbd566b8e81b573f442b3
+DIST criterion-0.3.5.crate 110662 BLAKE2B deac65befe648cabfca827b8c37a57a0c48ba1edf34b6e32799117dba9147eceee91b652244b2eb5523c88d8521ae3800d05fbec13b3b3548eabdb13a56f2763 SHA512 ad5d0cf9270c3be5d76c87ada41198d0fbdcdd9831f092ae7179b57e16df153d2aebc0bb70ad7b6fc98966240a902ed5f6fc7adf044be0420bbaa95b951e5be1
+DIST criterion-plot-0.4.4.crate 22546 BLAKE2B ab1326f804cbfbedcb415baadfee2d11b4a67544856fd94dae0f3f3a9bfe46550d23a29a0c8a3a84da6e18565dfb330580aaddfd69a42284499a36b2ae596fef SHA512 4f8fdfdf4ed5e1c410b8e133b36bf9add3d86d56bb23d75d37d92b1095b81850915209c7e4d19fd6aec7cf1b1270a9b968b8e37adc491cfc76b6df71c4619943
+DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
+DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
+DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ceb9f9446ee8cb64756b2e3d95a30c5c11bc79d9d460be4ef4b62513049e28900a96085031f805d064e81b5eae4bc297a SHA512 ad822e967e5ef45fa0c4a939f057f44146f1f051032fd032355a75c0f45ae4e0a55e1d31c80bc67c01ff8d9c87a51aba7ccfe9a440f061fd8225c879aa663064
+DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
+DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
+DIST crypto-mac-0.10.1.crate 9531 BLAKE2B 6a26505762d8d466275fe7674de1c4f95686b7a5fe107442361c892ba3123213e3f7cfb8d5516219e84c44496ef342ab534ebca724732e509d33fb9300027ef4 SHA512 39b7d966ef2df4f01a6b6f43838ec30c9df4a51106ee42d8d349f2d826722834ad5f7875bf68d7359799015d53ed45942d71a10f701fd080e264b21a89879dfe
+DIST crypto-mac-0.11.1.crate 9551 BLAKE2B 81140107f394d969d85b77050447e7d4dbfe7b2df8164293fe9a2cca04c1ed3cd245988482a232103c2ed9d35601ec6332669bd8598d903d305935dfc09af887 SHA512 3090a7a3fdb7d94b2b14841e37733d863f2e4d24d7da3c63df1726612abdd1c1df7179bba4e344eb63a94053e59a93b0988ecd1e2e5a5db0e18a4b602be4aaa9
+DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc
+DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
+DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 SHA512 18a914f5bd55172e5ff199778babad9a20dd4214f36f24cc00531db5e169af66f77eacab425e8e64d053907366ebd3b448a0c3275ee1f8244822778b62c4cb71
DIST ctr-0.6.0.crate 17092 BLAKE2B e54c7d452944d928d5777e1744208ffa4531b85a4fd0b294d26a93f1390900de97df808ab92ef9b838e8a0c59b98a16884fc3b4c081960dbc7034694fe91525c SHA512 c58c7b44de1746e560596a9409ba542eef1b33147f8ee842da6e7c9c062046044a0f4cd432d0876928f036a590d9e6c007d4372a043aa5d8317fffdd605ac993
-DIST curve25519-dalek-3.0.0.crate 506759 BLAKE2B 46f4a1d2b419965ba669586e9c08141bfb9a723222ab9e3a92b5dcd157a3478097d9ff5816b3a8cf7a710a31b03e2fca6199e88f3dbfe628eee0825d0b1832af SHA512 f179953feff8cb352632fed7a52e39bde94f596d043fa517fca24fc8c13e6c07c282ea431423fe5c6751679629fb2d640333468c9e5cf69098204db6be2dc9b5
-DIST dbl-0.3.0.crate 6207 BLAKE2B 108a1ce7599f39efd42ae330b275c2eb758b27e7971f219f714fedf3c0304ada6fdfa833d66a712a4082d69d24b44017c20ca8d29a2b31f155178e81ebc64a19 SHA512 b5c7010a2f59dcc3db83e7993e5ded1eaa47ea4197e043e292c9779b4763cd5a7b7d7bbd570f854252d83e9115d001844dc4f1163e00a4b34333ea21158bdafa
+DIST curve25519-dalek-3.2.0.crate 517530 BLAKE2B 568ca1e1f159e62682eebe93860802c6873c5675e83ecff747ab859ff7eae52eefa40e6311ef7b0429de1d0b8dc79ebfd80f8162d466ba8822b1cf64b758b0d4 SHA512 376242559e8956bb7260d7db82ed748f18107210a12fb744a741825448e63663f4cfc7e4df62ba79defbbd1ec9732174faa84592d0f84742d3ce1ce69aec7154
+DIST dbl-0.3.1.crate 6266 BLAKE2B 0c8fd10fc7f1ca91a13a85f026581898aa6509adc8fcbef89cc788faf7e3f194f0bfb970b0f0117e6f3e6cb76042abf2d71289dff081bc7bf9be0179f1cee299 SHA512 f5c3e10ed6b57d429611dbf86a97a19c99eebb919b832017be39aa1b637dbb177d6b635b7c219e95ed08c74e5e6b76b04c95244c622e61659b9cea382e577cfe
+DIST der-0.3.5.crate 41594 BLAKE2B 32f75f6a6758d66102229ea3bc40abdec82c62f166519631b0b71316bbb70618e400f8adc3ece63e9d19b042f109ba9e1e7f44ef188107479c97c9bf94f2fcff SHA512 92b2b44c88b30b6e3bde75173b1b5245f1e557436270b8c4718ddcca9c584975c813492016a41300ebb7c072ff943fce200ad3d0f352f0c0edfd0668b27a331a
+DIST des-0.6.0.crate 38058 BLAKE2B 2ee60fca93024901d398115b85304386df1fd45eb001673fd5a8b53d218a5232f7cb457dbe2d3c62062615b8b300af96c52e7120bf5064eed943b772c4b826a9 SHA512 7e4b60b87ca369645e52376d65c5f287972a5e634c9727bd7f68c886da09693d1b0987b2911ec3664f6ddab3ba41a141be985d23bdefe48a9a441e236aec40dd
+DIST deunicode-0.4.3.crate 109535 BLAKE2B e71874d5983659ce8324cc671a5b7ed86a960a9618ec4d1085d052f8e4b2c9ac92997cd425d7969abcc35c6905f1d54ef371452c899319a39d245a5b36e156c8 SHA512 f3b9ca2055cd64d2f3035799f809976a0909e59b38ebec62b56e9037f32582f5cc99b72b1774dfbcc72e4d978570946cec46eb034fe71145c67e2241b9f84cd5
DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
-DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
+DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
-DIST dirs-1.0.5.crate 12908 BLAKE2B 0a5c1428087adeca310d7db53850ca0ee4b27df34a7629f13ca0f3c69c019c0ca2339949022317ec55ca0be35aa721e0a9040d9c9d011e1516d99772ccf8f730 SHA512 12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416
DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
-DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
+DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
+DIST dirs-sys-0.3.6.crate 10626 BLAKE2B 6da8e4a1e51a4e06ab742ce5eb75155ff9b7cbe83f06947a0bfcda711ae1e0dbe51f9a1e1733ba771f2daddb2b8b14e343b9615608c1d9a8fb927b033c161b15 SHA512 79b6bfda14aafa3839365496e1b1926f763d3569e4e138a59f4acae15c38ec9a3bdcaa64293b03b536141c897c2bf68a67d7ae5670d86215080aa313e53d39e5
+DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
-DIST docopt-1.1.0.crate 39021 BLAKE2B 54a0543879a68cafd91eb61f836426ed5c8b9e02e1fff6dbb9747c44bdf03a45237087e6f094687ccfac4b82aef07c4f8e35acaf994c4afec57f227bd891ccbe SHA512 f5dd97b4dbc9109811a83dba45bb09018f394adf3f5389cc62f7d42749c90dc337b7f5efdee569150a70194f5bda777a22107123ec7341a38c4f9923bb6f9f81
-DIST dyn-clone-1.0.3.crate 9601 BLAKE2B f6a37f3e8ca06eef382cb25e36ee1449758ffa1cd7e0474460d8337ef501bd6bcefcecd5a03a21215e898c0e69768d7bc044cdd53689db8164958c899e524897 SHA512 808cc04ac56f5f64bb20d2b3509d85b7b7b0e71ba08a1a5d9def9237dcea5d589f73efb716f28275f4ffe7d123e47dc7dcaa286bdf392286972fe1750d60dcc7
+DIST dtoa-0.4.8.crate 16175 BLAKE2B 5fff15e66c2edeb9eb9da89c66389b3a9bbb891d75afc3bb7da4dcbe9cad9e50af318cc8cc01cc7e56730763e8ea8ceb33b9447d1a7fa52a8d0f0d2060a97522 SHA512 fe1701ba2c40988b92f5f4ef78a8c81718b140ff8ca2d04023b09a89440e6ddb53ef36d1ebd9dd3e948428b361ed6611bd24ec1a31b5010c220c555e1f0bf6b8
+DIST dyn-clone-1.0.4.crate 9654 BLAKE2B 210668852b04d59b1cab21d89f99dba4ff6832c6d699d4dfb929042c04fba8d16eb6e78cba0643ac8e23c166217c79ce016a064ac263dcd43428f0c7f86e6c2d SHA512 5d2f65ab4cadb16c877e9adf762f95826e07aaaab77ef64d52c888a8c7b362559fb108f3a5eb887a771dce89fd8d05d9d07fb50328474620e0cf303349c56f6a
DIST eax-0.3.0.crate 13841 BLAKE2B 3b921e66781b3388359e2c8289a4b1389abd1edbc6cd2ceb0590b6a2288126bd8bf497023ee42535c8cea3c1eeaf2518fa584cc1a2b0ba28874750cfd3033c40 SHA512 517ea3cf1e621d110ab78309059a7054c05bffe80603402d763f532c61c6f9570f4470f12df40abdad0f4ed68a2eccddfed311681f12cad1e25fe3a6e65f30d8
-DIST ed25519-1.0.3.crate 6334 BLAKE2B b4d0b793868b7120d5a07a00d9a8f741a2ad39d26a676bf9ed55c89a2514d06bf43acf06626bdbc72a36c827655f8c9e6140a2db212ae77ebaedf7f13d00cfda SHA512 c11976d193fddd1653d8e64a4bb18d392749ad73802699a9f8beb50414f8f2117ff647809e04f45edeed95aa6a69ab736f557a5856ae0aaf4dc7d3bb9a6342a8
+DIST ecdsa-0.11.1.crate 16701 BLAKE2B 9e61bef45f71d687079efb854ca84c68ca2e19efe783f4f9d2d633acaab8ea368e7a125ca8ef393067bccd5ed7643efa5f7e1aefe1cad7364871e21e0aed33b3 SHA512 e82247e2b3c55242a2181b0734c0472d383d4821c574052d70c37fe28a957edc1c5ea6be47265b466574594818c09c35022bbbc52ab987b15b82d44c4507cd13
+DIST ed25519-1.2.0.crate 7225 BLAKE2B e1519a96d00f88a28ac7c27b6da105d03afa5ddf57302cef1c5185fcd72aa41c45416e5debbd73f56b921b604eeeb4a5a81ab84a321549138039d98a02b24b55 SHA512 ef1fc02a61fde57b49a25bbd1c6ce77bc20bc7bad4d8d6327f4dcab313e9719b42326bc231b57ace4e93e56110fe77ce82d1d340650ed2b0d85c242a8e01145a
DIST ed25519-dalek-1.0.1.crate 29460 BLAKE2B b156de45f81957a0f631354b7b438e35592306045a00360df71ecc1ae3298eb737fbd436b2148c471f94dacd08ef1c04dc193feed82b1d9963809ac999decadb SHA512 e3d6c4e9a8f573783817e9ec905e5fcb76f743c91f45bfff486625cebca02e17b5fd2c222f03b73932f8bf5ed680e729e6eb81f541d3f32f6d82b7cec4df7fe5
DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
+DIST elliptic-curve-0.9.12.crate 37598 BLAKE2B 7a16e655442a2a5433420f7ce5f711538da9103c529682d9e50848330490c13fbd85f42cf13367ff37df052667595ff1e2d50b652f79cfabf09f5b9ed488a95e SHA512 84a4510acef548ee558eb1731f35e5c5db159db955448e1ebab7f9fa531d878a112cbb60bdf355edb177b7ecd8090cb4c5c60f19e932397ecb5411752357b1e3
DIST ena-0.14.0.crate 23052 BLAKE2B ac9a4141d831bd16cfd260a162572b43e9389b5cee4319cc22a23b550b25370cf49856c320fd4489633171a4fca91cf7091e974418ddbb1649fec8730c9cd2c9 SHA512 bcf842f8f5da8a7e9b8e51df50bdf3f00234534f1d59d96bb1e45b0ee4fa74847eb8b9b5ca615a66d84d23c629d7386f28294a5c64d22efdf2903bc89faab2d4
-DIST environment-0.1.1.crate 3227 BLAKE2B 19bc390268415e09b7a73587573242f3368f428bd7dab7b8ff535a459a3729d3fe34bf0490022908c7d8768678e9cf78bfbdb758466ee86046f48c37bd059b37 SHA512 17c38ebc23e559f1507b55d81dfb32122e285ce1b2a8fcaf5f37bf8fec20f5d9c485a0f9e6563b73d38bb608962f42a3203c1879680d664bd7bc7b8cdb4d7a9e
-DIST failure-0.1.8.crate 37582 BLAKE2B 007652720edab76efca83ef23a6f29dfec2a8949e88f697a4609257d158d345ebd617577df9cda69a25cae70e02f96479f427ee3059362771a4a1459bc4bd1c9 SHA512 a8762c978c286f921ef9c46dd17f57656739b339656ad237f6fb43062a8b2ad97cb98b977ae04735312d5328894b45c512fe42e33a9bdc4ea898330816b7a884
-DIST failure_derive-0.1.8.crate 4950 BLAKE2B c068f2a122e1137aa8a31e3a3c4c333f1e66f1b93df144f5a07772167f9085241292b85c55adf33851c319a418bac19fd31f4fb22b87ebbbf2814cbc815b77b3 SHA512 3f11adeb616a2d57e1a33ec2a5eb71c79a5df7946a27b74acc7c89a67c5dc6d01222731b37b405e33493570a98c96c7d2c7b8535928d7cf82536bcd9f0df809c
DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
-DIST fallible-iterator-0.2.0.crate 18509 BLAKE2B 9630fcadb2f30fbd8a2a057eb992bf33c0aa2d163e6fbd43de9c8c350e3e932ebca79a6576b215e17a0566898f6e37aef806a643d20c16a6aa73ca515fcf30c0 SHA512 c558fea3fcf3a7756acc0b63d38f76dfe7eeed4dd9c12c46b7a7e8b8bea64d00e0cc115492e8b3a1a19e86e6083477dcf7d2d72ef960b44f24d61819a3077e79
-DIST fallible-streaming-iterator-0.1.9.crate 9249 BLAKE2B cc4459b34a9ad00552a5248d090d1f25804b92838f41131e475abb83ae0b89401248feeb52a49dbffd499ccc0ba0f2f1d044f2f3e9b06662be01fe2257a4e885 SHA512 34824e2007cb944eaf54b10d6d3885bb17ef2a2976c6dd7695ff82a937cc95eb65d343dd7a5cd2fab5aa5859faae3352a9e1c78f239ff736900c1dbc3f5ef7dc
-DIST filetime-0.2.13.crate 14348 BLAKE2B cdb21f88ba00293c93f4831ec81b1c5468d6ca88fc58d3c3daa106c5476089df630ce6082280a77bf6da881dd95f3000f4abeb2469d8aad4d0efb6c3bdd80a2b SHA512 ba7d31b0946bc30782feee124dd904b4c3ba75d1bd81131e3bef06faeb019b51e7cc436a4fe86f3dc9615900fa27bce3f4965f13472ead173564054db8f6f786
+DIST fehler-1.0.0.crate 9032 BLAKE2B 02ec60e347bde84b67ec41ecc22c07de3059f53301e68f850e3c971dbfe470a805e918ceb5064c5718f16fdf5be497d1d9ee41aa7cc9bbb942de6d5dca814ae4 SHA512 37a481f4488cde37b5ec342f2f58dd3ccd4ad1284ceec2b00032777b1755c8b6fa6ed3accebfc56c7556ee434ae2af79c33612aaa8a02d8b5dba7c3644da154b
+DIST fehler-macros-1.0.0.crate 3271 BLAKE2B 738b8945869c7837368f083c9531986e1cee81d2ca1ab11a43f56731ab73d849c3c70fda8cbdfc23de64a51ca2e727f400fc20f3adeaa777098ab81b032f8983 SHA512 737b73a7f150f0ce308cdb8d069cce3df8aae47e46039dc2e342059af4340a0f35cd3435b26cba9c3c5267fbab6d2688628355c4fcb45781d1bbab8caae1c89d
+DIST ff-0.9.0.crate 9455 BLAKE2B 8922fb3ed78800ae1aef81629a7f81130e5d3cfc45069840c1f2db643ba2711231e96e6ec91da174eba9a8d28dfd650b5f6b88b7dbeb2b48adb77595ed3f990c SHA512 7a90be9df4075ff1e1feffbf745b4c380e7ca930870dff82d55acb8a71dc5d0be54077ed76b98a67d9c46a5e7fbd2240b798654f9148b9a141a0501b52b7c42d
+DIST file_diff-1.0.0.crate 282318 BLAKE2B 628bbbd75e7a8f192e54f75e3898b2c128f23c0111299fe54676f00ebfe532794f4b7fa28b27df3f94d96c8e4405fb9d2dd73e3459dbb888a38a4e99c6383389 SHA512 260313bcf0860e63d9f78523d81416fbc360a33c7c1740306d9d5b8aa1640e509b7330313c38105cd662881a47c46f89193e473f0b7da12d3848ed59d84e9905
+DIST filetime-0.2.15.crate 14511 BLAKE2B 6659bfbe4c15c639deae9734ead88b31c118e7335dccead7deef103a795521e42de2903a7fa08cf802049e9df9cecee8d619c3db3d507a7f8f9f5bd706584090 SHA512 34d320a9aa71059d0303c62936aa94b30a873ba4b0b3b78851fe636d132422a662f79596d79edc33e778e07b0a1259693b59d7035ea390aefa4849f1af459f64
DIST fixedbitset-0.2.0.crate 13597 BLAKE2B cfbdb06fefda131509b04cfa780c9e9574ef0acb902479d7ef98f32ab45b18d78cb1cc94fba78bd023267a7f2a081aab29171f81a9e90912d4aad9f5fc17ba3d SHA512 44642b270d52f71637a87e5311f70ac77baa2a377f94254d1bd728b4ff02a3176f3a5d07732c0c4fb9bf303dbeecf327432ae01e2779d966cc13b5fb97cbc28c
-DIST flate2-1.0.19.crate 73768 BLAKE2B 1cdce9db71ace32d45b90774cc0804f4f663d1193687e9487ffcb8b8962006c680449dcdabd296e1b1046bb3dc2d910a11106f24debea5c63f757b471fc33fa1 SHA512 6e802f351085ce8804afad32d9502980269e2c03e2315349b9dcdbbb6895f61c89fbde822e31504eb00d94e665e1a8186ea3d128b5b612c61323494a8dd4332e
+DIST flate2-1.0.22.crate 76026 BLAKE2B a6b7630a31a4d3768540662380f6eb1ae162174947ed76ea8781021467547bbf8733642996e391453d3f074f2101d15ce65f5995cd07834351abd8c3b759df5f SHA512 c76fa3b097774f1da884b969285bb3aa7fac489446845c93dec1afe6b94bfa11f708e6718d5e4460022b9398a698378a210c3b25e9e676d2bde9d5be1a63261f
+DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
-DIST form_urlencoded-1.0.0.crate 8412 BLAKE2B d65250a1d56cee26befb8733733ab67ffba9b9826755194158f336a22e792d38320292548ec73cedf18a56a806707334eb75833e54bb811c56a2ccfee05aa731 SHA512 193b8630b2790931c1ade898187637b2efdfed60b2c98a2dec6658380433fb7711fc2d8196834c19eecddd219ca7383e4a4946bef25c664bf4dc010388b60605
+DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50
-DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
-DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
-DIST futures-0.3.8.crate 40380 BLAKE2B d0611567ba850300949db198fcdd6ed1bb3ba8c6a98693b7824252c631cb143e283179569c60d462123a6b40e670cd70e4fca1b007a4a06f63b8dd38abb21f88 SHA512 db9d54c2a8973ab92e2ce985269b7e6e7be7d850dd9505ab3504026319e9b7612e76c06aa3962268ca1aba54724bf9d4aa18171b9290e77499d3d30afa2589d3
-DIST futures-channel-0.3.8.crate 29476 BLAKE2B 8ba88d95c43fe64734c531d2d33a4ff65296d77d482a5455226b94f4fd61ea7364f2517d6b006e0c0ac515cd6d74f615ad71c837e367b1a194f402c064e5605b SHA512 94bbde2009438d61fdf94cd455f6d9444db2e5e4db1fcda3ffc45d288476a4f8822b994887e7e3493fcdf814663d0ac81c07504fd7fca54dd1f030600917b9da
-DIST futures-core-0.3.8.crate 13857 BLAKE2B d05f0222b70e9afae1efee9cd7f421ab7663d622194a4d8386c2bbe54a637bd22fe4b9bdd803aa3265900b4b8117ea3488257c87427f75fe380e0c3a991e7688 SHA512 dc6cadd0cc3bd179259d7d686f7f5ce1bc66ea42b9c1c5537f766c68cc61e08f5c4f7bf8ba1c3a54223e5cb35708f57f2d802d4d64c510b45258abfc740dc48c
-DIST futures-executor-0.3.8.crate 16653 BLAKE2B a3d9f9b1d8bfcc4704344eb43251b1935931babe58a59940b15dc9727aca24de80a25d78d3d11ca1c1c832dba561d9b4ef97be20fec42514391c78f6ca1de781 SHA512 a932c87970fbb08a6a64bed303e4c3661b837002652b891e85aa8486553383c4f0e538a170fb4b4d4d781cd26d6ca5368fe26f882ed898cc70084de08c9df4e5
-DIST futures-io-0.3.8.crate 9131 BLAKE2B f41fd67b9ba2470c6ec8c43a3d5492484397259014bf59ef89f58049c21aca5621743e938e8bf30d47b2b37fd5e89519411de22d4d99fd3f6a92e44fda24c9ad SHA512 8bdfc84bda8f1090b5950c1d2b96ca063fd2de33a4a2bfab3c6296ecc45057f5b1c7ec22d0916b0548a5a210079df14f01f5be7a30ea9fcf82ae309deec795e0
-DIST futures-macro-0.3.8.crate 9766 BLAKE2B b7a7a0cd4ce7a3ab96a047b83e927ad219a97621fb1e331b43c056d8bf7ac8ff281a91feb3b3e75764b8b8ac84b664a6be28ce10b92cfed70024ecd936fb053f SHA512 b6d8c858905e41c778d32baa1e07334a65ae3c8fdc5d98fae1977f8a1c926fa242fafec6d26be834619f402b46c566602ab168c1289291493945fafa7e1476db
-DIST futures-sink-0.3.8.crate 7733 BLAKE2B d3a458f2dbf69847bbec045326ffa57286e34887925505cdd573c65aef0ea3c24091a42a263fcfab3f4009dbd57437952602791d154126876119cb243091eb0f SHA512 cf7e5f1bcd510eb13971cc6d33e02ed2762b30807b2127e3fd627f79655faf518c296eeb4ca225f2011fdf65bb61af1ea2f3860cf3e62d8b4dd82b19253f916f
-DIST futures-task-0.3.8.crate 11118 BLAKE2B 93cc4e7c109202246e186e6ee1341bbcf1712504fd903f125a007a087af5da71d87655df8cddc52fcbf3fd4725d7c8a19577e85637b9772157fc2adb666f480a SHA512 e4ab2e9ad9a535366fcc1b1909d77fa4dc657dfd69d04a184b35f38cf0d9323906205775da663c27edcfc59c8b93c5af0fa6e7461e607305c57b6971970dd75c
-DIST futures-util-0.3.8.crate 134020 BLAKE2B 93cfc2e246313c9bbab1b4ab7cea44a573107ff6d717d07c676a5167d920c96164c2fc0d65b113e53b9784caabace1a77a50d7e63af5b0ff58f193c9a2ba09e6 SHA512 33f72ec2a75962945686f17437d6e3458444bc876053aca9f4b94117a5a0dc84c36fa70aae1cceb6a4fe63f4b98c7945c793a64d04668db51efd98f034864eec
-DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
+DIST funty-1.1.0.crate 11631 BLAKE2B 37b246ed78132b52461dda9f3c1b52feafac998f6cd0ebc62408b90e5f826def1456ce820adc745aa1ccf07b281fde3df65af84eea561eeaf1ecedaebfab24b7 SHA512 771f42f601a0349a8e9344c8df552491c64af350b18eacc99463e972335d4a4c95416704ebf49e904503fb2d6f78bf201c8cb82fa20bfbf460ab1e7ed9f94a9e
+DIST futures-0.3.17.crate 47388 BLAKE2B aef48709c0fd15e33308ccea3adfd2966335de4c4ea24d04306e6e8d724bc6bd3355c8fc3d0392d4a26dbe85e99769267569c1ddc96ffbcdb972c2fbdcaa9149 SHA512 c2099288119c37130692cb747c7db16cb3139ac5db8fbec9754dd373eded0593f9444b8d0b003ad3fd138086959c1b74e105f2105311eeed5a65367d9ce795ac
+DIST futures-channel-0.3.17.crate 31765 BLAKE2B a1055de0a6b8812546442acd8acf8251168015b5f6be7bb7e223b7c61841a1a15ec1fbca3e4d40e0a552d5c3fc89ed2306a29c9ef33b1665f828ab9c8c0aa142 SHA512 884fed34839c9f73551a90fdbcdc542f88623c0d74d506febd6fb0308429e0d7df879f378b6d0bc818ce8c948da495a9dc210ca55331f4760273d51f627cc416
+DIST futures-core-0.3.17.crate 14478 BLAKE2B bad5d1fccef7e823d52eff0db7522545c6dcc6ba94bc0cad33c013b6abe624ebc6c8ddc6a6f5a4ede5982e175eeac48113ef929cc6633a22a18bbbd4cb1cb114 SHA512 6f290620b5051a3f3a317acade5a077f502fa3ab7fdb230b6ecd4d007c63685bf343ddcb8b8d1170b5ebeb94fbf1c495dab36918490b14885361d6e53c45bf22
+DIST futures-executor-0.3.17.crate 17102 BLAKE2B 9e9864d7fd3a38a800e3b07c22f834575f92704ea88bf0f295a95d1b52b41ed698d4e7fd89c5dbf503a99676c6ad036d9f96dd3e85bfd49c26d1127d55a6a4df SHA512 e3ac739e58dbda88dd536382c603014c56b7ebbda529c81afd0d91c16770719902fb4883a7a0dd0375e7910fc03605887058ebd30824d01ca20e2daf93f3d94a
+DIST futures-io-0.3.17.crate 9050 BLAKE2B 729fd0c2bbf5a665640fe9e8dbb9d803474cbbf4385188d1cd906f526a2b75cecfe55f75aeb0a491057af319a19fb0117420af75425375af41622c8c68567cc4 SHA512 a2b65e07bfea15b78e988c5a9d330ef51a396cd22475f171b342cc8a6520749335af851ae11d44c91f54ab06f425b0dbfb716a959c625d3c52db5765d0407e0d
+DIST futures-macro-0.3.17.crate 11830 BLAKE2B bca68c3c1ddca764ff86d36667c3da3805b8aa730b300f97d5e77dfc695d33484b4b8ee7d3b415479852e02a126c14f092ee9724d3d91a8793bc91a165dd5381 SHA512 518969498808bcb63cc797934ed7d699f776588dd7fc9f9c41c63874a05d03781b5c0241ce20cfffc8db569f01fc82da433b7ea7772f24dfc2df5eca35b5146a
+DIST futures-sink-0.3.17.crate 7663 BLAKE2B 598e864fb6f2f34cd72c67e5ced93d0e54d2e508319ba191a2779377d9565799226783b2009190cd6eea63c75562e209a526c724ea8616d22a1c7b4ae543ddd7 SHA512 39996fd6bf1fb5ebb0dbd5c0d18f9a34f21e65dfe998237c2e047d836a380ebfb9a2fea05a2c11e447e9a27dff0bffe4a9762e83df2f17aa90a717fc98ba5803
+DIST futures-task-0.3.17.crate 11712 BLAKE2B ca42fc54c3a3795e59b423fbd1235b10b4ae1903256fa61e80dc9318f35fb59fbc15ca8a3be3fed67e17809ed2d5f594f939d3f51d0d718b0dff5be069200361 SHA512 2f12d8d9d404f147b601ddc6fb9b6869e2e68a4bc55cd3851cb9f7aa8ebe6519c5cd0fa14da92e564d2003ded2ac2202f5e09e1a83e81129d1600d01ecf86844
+DIST futures-util-0.3.17.crate 147679 BLAKE2B e29d07117a7285fc52a390821299f55da901573a5d3df6a1845b852488f98b359ef35de0aa3fe05e613dc662247318cf3df5aebcb00149012c6a3ff24c171a57 SHA512 6a87b0510c3f8214ce14b7f333d212558647c523b5eb7da36dfe4f694e0ca4be3cbf97fdd7bfff5e0c7015644742d74d6184221482d644653a106d5564722fba
+DIST generator-0.7.0.crate 28814 BLAKE2B e10bb8182d020435d583d813e097b2882a00a027d1e73d91c6ce99c1b9b4edee6ff50b3e98a71f93a17e6b7ede2c2d3cfe59265047260a06e6333b2718ff71a6 SHA512 041716166736aa027b0ccc68c6f77452b1753ec5a182437e922507a26ade7a7be2dad28ea1a668c84a1cd591838fd562a202642554ddb2c76adc7dbf48b61999
+DIST generic-array-0.12.4.crate 18212 BLAKE2B 6e7d77c884ea5a2a8a2d34d7d714730709bdf52f0ebbdb232a1ec8403de4b4f431eafedfc3c2d7ea1f8a28a84660fd34b71b09117dee4bb86052912143142734 SHA512 f92002b549aa9db2a80f65c50357c1f0f490a63e104fae7a271e0b16d6c43ec9146cb7f371f00eb1575a1bfc713ded3beb51f9e96ede93f2ce66ebf78ec85cb8
DIST generic-array-0.14.4.crate 28916 BLAKE2B 41adcb738bb316d17967e029a829dcf7377427977309b010c2f2e365f16306b44991eb5f65698782497f614b129b14cad11bfeba2ae19b45efd117114492517e SHA512 34ac71fee2cd50ff786d39b4abacd9e090a8598baf4dc36ba5fecfb7171cd8e4f58e5360cbb0baf02a87eea26b7dca85b35555b82bbefe06635d2fd38f7b8b40
-DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
-DIST gimli-0.23.0.crate 702175 BLAKE2B 9acdb3afc092e43b25a11639407eba7258d25e6dd57c1f1aa18d17ac7c2ad73b422f85d850947498deb3ad8c1b8001077f9b636f7c1c11a4215b957c990483f7 SHA512 b5dce7b563ce7b8dd6cfec5258793323d370f217779d0d57265bbbe2b1eb2704dbf0f25c189ae6e9079989b6ac7d5341e10fe49457577e482a3904c745c89b5a
+DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
+DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
+DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
+DIST gimli-0.25.0.crate 705238 BLAKE2B 61b3da99b6cfa732b35d1fd71eb5bf5003b0caa5464e6da8daeb31486d8066443eeeb693b1e84d49f390a0c33f24fd3c0332aec01986127ffe26f7e770a94614 SHA512 f4e90703b8b7d83c36a63ca7a3d4ee48eec2b0762419780670558c4496ee840489b6a275eb2b635676ba25a010c0e378bae429b54aa4591b9d9868b48e0f0beb
+DIST git-testament-0.2.0.crate 9660 BLAKE2B 021cee6539fd14b778892da177eb019d70d51a7789c1a1149b460cc1336d45bfa4b225f241a33768fbebcab606ba150376efd3c6392bdc4c20a4cc1cb4948ca5 SHA512 b7dfc0fe6750a816b870ddca359b0941bc7cc2dcc79353a34aa8c924036c83b83a899303eb6e5cff61956067c3648d4ca48e54334a15c2de51298e20aebb1301
+DIST git-testament-derive-0.1.12.crate 6680 BLAKE2B 38171d0c4f6341fc1eab030ed136c4de7cac229479fcb2f40b456d26bd77224f108aaa12eb99982de7d955b120d8a5a53ab047dfff57507426991310e74f9c58 SHA512 aa55a7fa58ba76c0f3d9c1f1d676806cf27b97a832b3c26ad1d4fa4778fc7dedee478676e1efb447bee39910f95c8cb624c4fa451c862ef2c2dfcad8b86411bb
DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
-DIST h2-0.2.7.crate 156989 BLAKE2B 2f75a2f82391c994299e01fae5958dc7e21b78e38b8ade83a0c90698f54d232e6f0068bed88b98314e702bff773e8753c600ecf6b638b5bc1c7e692ef636d289 SHA512 6157bcd335d303246478f45b8740dca687f693dbbb462a0ea9560af12d1fe12a9c680c57c1e7ea0b0842137ee66cde827f273e0faa619db3b6180c5587bd0fc9
-DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
-DIST hashlink-0.6.0.crate 24952 BLAKE2B 3bc2588dd7ab04a9f49a1bfcdb633c09cd4031177d104ef4ead0caf8d3352383f60b3550bdead591bf21bbbdc097407d4de2525fbd3012d0772c40b9413162b2 SHA512 bd019fb982f8521b818d2862b739b489539d7e15d6ffbddc0c6a11a9611c9e0eaada767f3d9c9b8a966dc0c408b8cb475298fc97c7f6afcdedbd6e8cfb5e4df9
-DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
-DIST http-0.2.1.crate 102231 BLAKE2B ffefa83d03344fbdbe2e41197c2df7663ba45e6795e7c8a0c503fd666fd0dfcd05976d85ec67685bcb8486b0fbc1a29ad98211a51240e0439aab8a670d976c0c SHA512 50ebafcec96555e04749b612e221521a09b3f04899f55b79c562e07bd0d3d0a5550cb50425d2d97cf6b8bbb64fae98b59693943cc27a5c52af132923d82460df
-DIST http-body-0.3.1.crate 5394 BLAKE2B 9dd7a35cd22d22060762e17f028e9353fd66fcdc81c0fcb2f0361dc7ac86bab18b89ba774f28e2e2b451aebd01a31b01029587a3d119c5a30ff176c203482367 SHA512 0c81b2d8512be3f07d5b08534d2a27424fd6abdf175e9bad9a657b9d95a48e2916c8713bea8de3154520c7ebd097324de246a1d2ca6595f2355e1c93fd9fe6ee
-DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094d0cb12f5f4641fc4b8a312c3e1bf176a5d500a9770057fc9f9e925d437ce5173d99052d97439e773b70773c4 SHA512 97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457
-DIST httpdate-0.3.2.crate 10768 BLAKE2B b435d0a530fcab46496a921a565c3ad8654cb39ea038bc942c8fefab8dee2576e9b157f203b376e80a10690650c1c899eaa29e5af75888c8998b07d5d049fa97 SHA512 5cb56c85aac5acc0e9e2c72fe0913d2faaaaeab10a15c0479407ab779494bd81f8e3fc9675f5990186a34689e841427e83723a87a91a5204ff57188e89be98ea
-DIST hyper-0.13.9.crate 142251 BLAKE2B 6d5d787a6d08e05a474929eb93fabf70338f850ed561b8671c4fb87b7eb772300d223767bce175cb9a1ff0fe672c462d47370c9022191b708e3df394efd5e670 SHA512 6156a0fcbc22dfc753a6a3cb2872658fbe0682c9da037e9f9fffa8f584373ce8bbc125f9f166c397366f93a944ad84273110ca24711b5b0817061f0c7a2e6f23
-DIST hyper-tls-0.4.3.crate 14195 BLAKE2B 9dd7586f873554af044a6ae96858337a083d9ed5f39ccc89391a6fc6ac534a2c01ca5bc750139598329cce8bfca496cb0bcd5c4e13259d3c9014762e2272aac0 SHA512 4b16103a8490d9b39569b589747dbcad60cb5a904cfc1bbd19fd6770bb7a67ea3de0afbe46b3f08f107a8e6ad00bf74e2049d99b5d4d1cd04f1dcec4b0a3c301
-DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
-DIST indexmap-1.6.0.crate 47565 BLAKE2B 4b2c50788be5c5416973133c10caf092468444af6c101eceb5d2f53ec3502d73c034205186974efb335a1d8aa9a797b191a871fcfd573251c95ad1d13c0c47cc SHA512 f91c0d3588da037a2dc728c9cd823b4acf7edfbe7d59b28dbe1f5802294f2677eacf0ccea41235daa30b3d8187a97938653a040d8c9d2d38513440b2e82fd85e
-DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
+DIST globset-0.4.8.crate 22886 BLAKE2B 726fceb279ef00589ebd6f77bbbe0642a22a9852a12ac9d14139af679ef2af0a68bb90f51f9cbb08d44190eafc35145df72ea3ff2f346d23cf22e428c887bb42 SHA512 1a1fb9731d310ced63742b2c6f7ef7f414c89780751d9881859a6e6fbc512e91bc23c91e3743bb36114dcef6dc1962fd376d67bc536752ba6a8a2fda7aa80bec
+DIST globwalk-0.8.1.crate 13705 BLAKE2B 4d0fcc805cfddb47af24f5d8f2c4f9bcbba48a8a523e565f7ce7bea767b6d108ae5e3f5cccf6647b497b3690f862e1652812b9d83ffd02c634119d5e03d1a7e6 SHA512 3235fdd9c24ffc54994a0b37862c44e16a4c9ef6a7e1a008c5d83dc62a9683ade97e451e4da7f6db710be2532339a55038fa3bb85dbe6685d1c807cf42f6d955
+DIST group-0.9.0.crate 13327 BLAKE2B e3e3d25f14a18e2e2796fed3e20e89f936aac116008433213f385fa34bdfd35029109d6e3638ea71d7f385d9d6adcbb9d7f0615c2c677f93a5c65de178532150 SHA512 df713b6f303d74c5f7445323c2cc8c8f0bb05eb89d00bf3b2e1736041accde44dfbbb8a37a0e0ae7c7f7f46d5d2da53298e4548ac3eea65f0221d8676540d4ba
+DIST h2-0.3.7.crate 159246 BLAKE2B c75389ae07de135510d7761b8b3c7d3560cd017a59d4b286496e5049ab6846eb7ad3d27945591070ea0e329ba4b72255627206f1b420e705c8a2c28cc9edba1b SHA512 673d3690f29dae2275fb9e93a47835a00195845915a2a037f666dfaeeae70bc626db1fcefd5bc18478ad49282b5e137e0e6be3df1bb16e22067c901288e68813
+DIST half-1.8.2.crate 41874 BLAKE2B c3c5c01771f05b7af652abb8e5490dde7afd04de130537e67845fe7ed58904e7ad66c7286a4e7deca3641876a6d12c5b6e95883fee2809c8e685d2f79cf96610 SHA512 5eb128e41b8b7f9769a669834b2f8380b115395bf2a2a181732bf6c71234d978dbc4c527fddadaa7bd7fae9add77958b27616bfa1767fd123d3cfb887663292e
+DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
+DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
+DIST hmac-0.11.0.crate 11385 BLAKE2B 850527040c0fef278175f35a0c8bf77bc005708539af8ec5a85111f83e9c94a912741a2b24965c026fd75db6c58fc82a46a9c5de9454540400c9f19341561b4c SHA512 82d83071d1cea14603b1f1a85d564c78e28d982025a029779d8d83522fd5c56583303dd3a902d8023b5e9df2ddb5c5d9a5fc88000d41dba45dc026239ec81d0d
+DIST http-0.2.5.crate 106297 BLAKE2B 02917ea704475510cf9d71739b4cf3cf8f87a013fdd7b9ebbc21c702642bbfc9e33d7c7ba47e084c86cbae4d95a72a51b7f7d3c00ed5652931c9286d83f5b980 SHA512 ec56bea9a6329c82053a757b6d537834985284f22dd677f9bdd335785e8ae71acefce0e07a7fff57c6648d0fae54a8039d71d74936f10a9b5547fd90d2fdf7d0
+DIST http-body-0.4.4.crate 7836 BLAKE2B 7f417ff8520753324d5915e3f092988fdd26b2413db5e917045a1201d7d701d8308b468c05da4d4ddb9abb7b0a0eeaf82f15a786f29cb1ef621e4c168f4e4bfb SHA512 cbfa91e31e91807f004df77a9d8999b1224f862d4765ba92ad4d34d288fcab67372734295f30760a96eb32454d78fc527c6519eb45b484e341617686e743381c
+DIST httparse-1.5.1.crate 26758 BLAKE2B c2f17a601b54032c1898b88feb836ec380465b5305e240d9466760aea85bc709ed873d1677714acba0d493d27fa5f5288931cb7d62f240e50e2d6b84d4e72046 SHA512 70eec6bec5927e272d7cbd09472a14b0f33d153498d5e1894c0853bfd35981c0d249a799c3f4acc01b8499c29519a49d81efb755bdbce124e55f73eb75cf8592
+DIST httpdate-1.0.1.crate 10293 BLAKE2B f25b69244fd82beeb0c9c8f4691d1d057df6f835883f6cde069a4eb28bdbd7808b5f02c8a48b88ca4f60e14c2e0dcc84f4cadd733edea2f8f3d061bb485fff1a SHA512 1a63f11759e331e5938697d181c7f021e953e3616741116437253eaf6da862b6cdb08a0fef5808042d8367de9fac31b63ebcc917cfb81b0244b4d238f95538ab
+DIST humansize-1.1.1.crate 9131 BLAKE2B 9a9717af2c61c724f1eb224eb351c7819cbc5a8f7d53e57a1ab37ff12f886095c321099a4d269e48a90475c1243c6366ead7b19e4d5b698cfbe5c9e2357cd562 SHA512 90b25500014d7ff541b6feb496ebb25ffbf0bbdfc3ea80ce3b3a1597d08c2cea9b967c674e261d3c8c3587d3481da8d899cc5e3fb05b22c55f90e178508ebeff
+DIST hyper-0.14.14.crate 172412 BLAKE2B 637d574ae831ff7b448bc98238ccf66df9d496e27212334220ddd8be112a802e9afd3423f1716cc6dbe1abe7d89d579fc76d23be40f6c00d788f014ef176b42e SHA512 092a53af18c7d733d84de3511bd06ecc53171d32804a34ebd9d1b5ac5376aca32ede79493f50e944b0618f7ed79611594b46c6d3169df7186e6ce59461441d3a
+DIST hyper-tls-0.5.0.crate 13257 BLAKE2B 50cbe4ca7c1862fd3fff192de070341dd32bfb9f108b516e1e261ec8da7c4f7972b7b66e3d45c1497733a913b0281bef706994270ec8bd03eba7368612127aa4 SHA512 45dc16cc9ce48706e0b3575dca35ba1b6b3084dda8c2cc489d126e1c4f0bb96a9b2baa860d09f68c5e0a48c2a69e3eaf62f4f0406fffc4efefcd79d26c82896e
+DIST idea-0.3.0.crate 22733 BLAKE2B a6967134fb6bf8cc8e447e07a6ce1497c488e0d51edc1eca29647df15d26144004ed6132087cef5e948848069bdf1bf6cbc04ac38e90a81ecdf88fdfc4a24775 SHA512 9cb1b45b02cd5b4564fab6878395ef9ad95773bd7b45c9cee1c549e42fa7fb9c14b353f002a16f225908a59052268b4f5688d858ae63602868b9794cd83a58c6
+DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
+DIST ignore-0.4.18.crate 53174 BLAKE2B 41a209a310515af9fa066c88c92751e19e0859f411baf9946933203883098f52901f8c03250cab7f716abbd0da9c03c5e6fb270a5f9e26aafab4bf1d5f5bc045 SHA512 5d11a2415f015cce6ce72aa3d08a7cfb645ee7f1845b3445a924a92144438f209c992cc15d4ede3099d1eebe3fa28bde4e0eef1a3fbcb9dbced19a42051d21be
+DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
+DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
+DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
+DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
-DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
-DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST lalrpop-0.19.1.crate 222535 BLAKE2B 9bab5f6a50dd4bb0d37a816e9237ea5af4ee3c365795d8ba7cb43318c35c47505c2a82620fc0bf1601651cbf7d5694025534bc3e7e8cb601ad951eef4103c7ca SHA512 8ddd11cda2c819352548e43716a35fb4f81843d1cac20b47d36d95805780804be4e938f3f17f0e07c701a8cd874882ee6eee6a85a8f163ffb366a75ed0bfb353
-DIST lalrpop-util-0.19.1.crate 10169 BLAKE2B 8858bbe4e50ee3f95fe668893f95c00138532b62266cd6a8e00a96fd9997d45f346d8bc8f36de191cff00b203ca512f1058f69f16065b5f790d7c71cf4f72b46 SHA512 b8607cb59ffda82a77641382c5834fed4a2e27b7f085d78830668c06fcadbbfad811f2a25a2c791a90c6456b81cdde6b8c2e0966e7c3181123ac151400443467
+DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
+DIST js-sys-0.3.55.crate 70499 BLAKE2B 6108d6bf4be72dc93db5c2f45d59dcbd7b94edc02ccb368a05bdc0e259768be4708e449647b254bc3c542a366492a02f0569d08e69c00249f58b07a566cdf97a SHA512 bd51d61684b3683d5b80df42eb80cb2e4688096bf14fcbd30234503709b1730ab25c7b58112516aeb5d7f44ae20e0ba08bdfddb0518a20603bbb4ca74544d4ac
+DIST lalrpop-0.19.6.crate 227279 BLAKE2B 081aba3e6169f458892755f30fb3399b045d407b7033ce778d03119f27c73a899283e9ea30413a5b7f3a97c9c78e462efa13c596d81165bd154e5734b8e9405e SHA512 ec8fe968b606a156dffdc262ad586454d9ebad19489e0c561b61d56139545094a4f55cf2262c6a917db4affecf90982d1842da3e309bd1b4b62397e5af90edd8
+DIST lalrpop-util-0.19.6.crate 10236 BLAKE2B 24deb1ea5e38063112d228cc811329ca2b3f1d3824842226faf14a7d03b61187043e8cc03bbd7372d99927e31d0d0c48b09868e2e1e73bd119475f8ad021cd99 SHA512 b254a09f71342a7a80d469dd896db8d5e0b69b1ff4f4d9c6ccf69447bcf8722dfb1c43de666e9f8444c54a529c7b6196ead1cdb78ad50d8c49acd210e646d391
DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.81.crate 513105 BLAKE2B 789a79faf2d5079f5c4248446fa7c07b11af647bbcc32521e7989928788bea7dc2f65204f396b4fe0c7b3a6cf5248882d7775b97c028a3af1ba35e8ecdb489f8 SHA512 8e121e0dcbd8218e02c2c6536ef6398cd002a92406d433c39bf84576e9b881c5b8a66fee826da6a6189f44b825f3a9d959075eeb0501d7f604bf9cc1a8b8d437
-DIST libloading-0.5.2.crate 16420 BLAKE2B 1b73f3294830cdd97b7ad42f0458bbdc95f641a182352095c26f835ba4fdc71cf9a0fa85244511b07bb79dd1c4e913625fc69b4b1e2ec28306dada1aaec2750f SHA512 d04cb1bb220c9364c02da4f360593907c875951fc0f6de5da1455bac4e96a470128409f77b21194fd6a87550f3ba00abe3b7a3426e7637acb62b80d61da46be4
+DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
+DIST libc-0.2.105.crate 554066 BLAKE2B e8e3113ee326c02355c700ce5f16b3e037cd576cdaaa68b2b9eb1d3ab1d56083f0aa43e7ad6adfd62fb154e39de5038eae1ce43b0d283e294bd6d5454bce6077 SHA512 3e6c196dffb108c67e59bfad157e6fc2dd7e65453da562456aab68d00fea8e1ffb8c552bcbc99b6f60e74a29b3e6609747f47db6598379cdd5873d3a7c0a67ee
+DIST libloading-0.7.1.crate 26336 BLAKE2B 2dd8d1fbd0a1a3c1b07ffbdbe367f9bc248a08fd235a7ffeb121aceb7aad95d7f947fff3df276d9161e5ccb8dbc9990f834e364357bd1574a7e5cc3eef8855f2 SHA512 b06a668868bc6b4ca0c39dcd83faa71e5c28ba0be772f96f8445a61feddef797d40be1d1180f51b2dad1a77abde2a40a55204d91b1ee9033fef22544968ac0df
DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
-DIST libsqlite3-sys-0.20.1.crate 2306064 BLAKE2B 9e0276c36311a7aab2613735c13b91f8dcd77c02f98bf38bce5f84852f1139d9c8dcd077bbc6ab55560fca69b27e08d4d1a0a7ed17152465267cf1cb4477d5ef SHA512 8ba1e7c7a6a5dc11ee4a2c817879478c7e3d349b237b418edf72489a232d39904537abfa2274553b06ae2dc909f4f9e2b3d8ae91a4c75768a3215ebeb5c057d1
-DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
-DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
-DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
+DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
+DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f5159909179282c13c7e3b68d73a0acebac29438cfcb39b75cbe87bc181e981ab4ff2776134621d8ea92e7a6aaf966a SHA512 d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
+DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
+DIST loom-0.5.2.crate 62498 BLAKE2B a8d1d300fe9a630eb721c10711d079aaa6412d2ee1d30af9e375e0c95315b884b3978e360faaae3fda930f5e56f09f1b877093e8f5061113f3798b3485c4d9d3 SHA512 8e56186db3e4c6aad2d1154d1d900e31c62f3e4ae22d87f5233c4f0477ef5481b9b4c2e74a34d89cc434ec64c49b5443856d38691269551cd4241ba8b345d972
+DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
+DIST matchers-0.0.1.crate 5039 BLAKE2B 29fe248dc3e85b1c7ca5553f5b49dc2a904cbbcc44a2b6a426c0fe9aef56454ad31acddf9f14a447516bd7687107816c3d46b0f9691e96bc7c7b607cd34cae0b SHA512 a5143b4e6f9131582ffe3d77b14ef51a557cf48d794975706a9d51e0d477cbbd2022a2416e940771911cf99076696f9eefa2c866843f0ba7028206f933674c10
+DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
+DIST md-5-0.9.1.crate 15494 BLAKE2B 25218518792be16223f78ab0bd81284005b4a65defc538fba79dd3dc99c7d80dbc8b8ceeda51dbea4851bf1da86d3f66fb64dcaea86b5486a235c43719a3dc3b SHA512 300723a785c7edad2a9abf18fd9f8f9a40ba54676b394cb5712894d1170cc48199a0ca9ccd3b525f82832d5b33413c2565a0c079b6dd08c63d782f1a91fc3e0b
+DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
+DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
DIST memsec-0.6.0.crate 5494 BLAKE2B cd4c40c9ee6235fa6390ec00425faf99a7623c8ddbfe52bfb6bacc292da8fd861a994624a6784e4c0ba1d88fdb9ca4cd5bec4f29aa8bfaee8f295761fedfe14a SHA512 326bd28be5fe98720f0d57a96154e7746bd9fc5b4e8bd827361f6dcbf15f83321b5f0519ddad38f0bcbf4a043a7ef3cdec24ef6539915b007a0e85b01c584bad
-DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B bc7a152a984de061803c11255459ce3d8fa64dd5b38de9f2ed29213abc1922d68746ff523de3b99e0e95a8933ea75448a9fa1e14cbbe248549074cd5ce7b3c1d SHA512 8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7
-DIST mio-0.6.23.crate 103554 BLAKE2B 1286ea6deb7579964a5c15926509d438c5454d4f56e936753c76927826fbc5444dbe33b7465a15d0ae6c122bcc98899959391a5418bff31c176d51d7b2f33077 SHA512 ea95d15072fe36524a85b50108415a809d7ea3744deee45e4b6a1b763a11c88cda6dbabe4f8d01945a5edeb52296a74fcf457c85be3032c1311a35025860d05c
-DIST mio-named-pipes-0.1.7.crate 15140 BLAKE2B 5e19ee9baaac61efa0c683f46acec94dbb5a932a6012370976e444d265f71b7dc168c9de838389c5fd492c5bdb15dbc1f8e8956640b11fe5b4e3e09a5b7f12ea SHA512 bd78651d89c292c792c108ab5d199da436ad62097c0fa1563523b8fd5a3c7dc0a7a948df38a4ad05a8e97d7f30652de6ef15d9f0be9157653de11c790ed25c90
-DIST mio-uds-0.6.8.crate 11496 BLAKE2B e52d131f292c7c09fa116ec5c760d50e8389c27fd7b79a4418f0222ae124fba0e5943b5494866e9db75407ab9f6b1a9c7aa7fdf2c4d601e8c785dacd8166f6da SHA512 b6c752ae9f25c37fc7e23e06a8843089c5291d60e53a6e9093eed1d8baf64c9e0ff14bb2ea1c0c8815b00026b28fefab2aa34104bdbce7e99549786d0f507a73
-DIST miow-0.2.2.crate 22044 BLAKE2B bec3bbd899a080e5c97a8c1dd9dead16a57aa44cf2bcd97be03155c28345c45fb731650eabffd2fe18a633ff947e63561327cfc86560ee86c3fa71ad4d2a3b62 SHA512 e42012f67e1c5a475d1c9790bc731add53f7a3838d36f8a701f69974c3ff33d31364006220e69c8f37bae2eb31055ee704c42b64241d13be528c768ca5c3d6ba
-DIST miow-0.3.6.crate 24533 BLAKE2B 232aac1d3449f2542c8fc21c9796932f478a4317a93e505de2113c6d980bba2c03a06f74d00a3abac79b689cbfbb06b5a4fa0b6778c9866bb67053111ee16d8c SHA512 13ef93e0965a2c5e561e7252407a0db03dd0811d076f20a6174a5c2ee28c49f1c340688d0ccb913736a1cab1c764cc719b61fa670f9b707f619b70797cb81ebe
-DIST native-tls-0.2.6.crate 31552 BLAKE2B 43ff2c5abfa97ca44b0cd38090647adb97f6e2644334d3385f4405457d153c8b5867067657b68cb2212f99e996d57d022326eadc359a7f404a279835e398049a SHA512 9e20f126f680215904d4e4cd7ebb1800b941608b454562173b04d206c894dbae3019e5b296a3fa64ed6f3826230aaef01b0ccc509cc6ff2aec8c271e0fe7daa3
-DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec
-DIST nettle-7.0.0.crate 287013 BLAKE2B 778d49b00a7f9c95a98088edf7e324ddd97afefbaa27357be17a9ba2d9c7f1f1a23806c61c9890038c93017543f81068f56f3e67318d3b46280b1247963ab4ce SHA512 7a3b19593da6cd8156f3b8c89672f15289e2752f1f49afae26c5a7a0e93b9065dc6a559aa166333179cfab19fb4f8b7a4a14766a679a7f8965b0935147e93ff9
-DIST nettle-src-3.5.1-2.crate 1934376 BLAKE2B dc8b3c27759b1c3b6ec77bfac75dee0baa14192c0060ad3bfa2cba98b735a798f791fbbc1c5a1bd8049c52e65ba7d4d50da9adc389b43e85889c1a9c3fa41d1c SHA512 2b99a038e61f8ddc73fe315cb195d63427fea48b7fc92051317140b5e82445832dfe93c65f6c8d0746ed418138ac25f4e874ab36672027e0f695becfc0f77dea
-DIST nettle-sys-2.0.4.crate 24226 BLAKE2B da7c30f779465842b882cc822f60fa2155f0b20adf257f67ba453138c916e1037193411cea2aeaefed3673ff0230474a653eccad6b9bacf5ec2e95cd5731ae14 SHA512 e10b69d981e912e58fe8d4067fbf4b91432bc608f648d3e79e8d48e39f11d1d4f559960adc1337eb041c06ff5845b45b5f6ab20c93f15f294db5537a17e22942
+DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
+DIST mio-0.7.14.crate 87429 BLAKE2B b8277f844429d32b6085dac9649fcee20bfd1922eca541ea927b1ea3c61667beb4f63064a9828cf347ed55678842aab2a608af359b3ec92b595995a6544dc371 SHA512 2349691ea87a086f9bd8df5738705e9d7b59399089948f810b6a7124beffd44dee348703c89b4b1af8d84821dcb932960dc4bd9ec9543558f59a40c4806fbfd9
+DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
+DIST native-tls-0.2.8.crate 24956 BLAKE2B e5b130b717c04e3d9413d6cf45986b67060f31793e2825585b8e4026e73927340ee9edd5f5f2d6750200bc9eb0a4b8fbabe0a1578d6a8ea17208f2fb28d2a201 SHA512 3648272b1c2f10c3eb9c7121c20a26da149efcf248187522fe07fde9b506a2b687e8bde8e09c0f8f74d19db5b84ea98b19b177c6daf38bf8a0c3ec05907006a7
+DIST nettle-7.0.2.crate 287759 BLAKE2B 6ccc828d43a5d313510c58d4be9300c0dacfbb26755e2528b97a0b918bd2890c9b8bf82ccf215c055dab95fb3453653d8b6899ef2841d19623dae42174a1f5aa SHA512 4131ed46a92a5a30d42020582c06fbfeb91d671caa6c6b245e99d8646ed72117154c7db339132ce8e3260f61f8edac254175c84fba87c43d5f26791b25541503
+DIST nettle-sys-2.0.8.crate 24987 BLAKE2B dce8704c38875907e92f95a3a56b928bdf73ea1efc8d6e4943e43a62f6fa1e4eda4814252194aff9b5c8dabdf5903577290f67fd3757c7609e5c86a1c9e18539 SHA512 61e9d518d664cac12708cbb01a1a13d47caec20c627697b66b8e74b53c1eb48c5b418511e5d5151dc6057fca74907bd0137493d6392ecd69254b39a59bafa71d
DIST new_debug_unreachable-1.0.4.crate 2561 BLAKE2B 5c9831b04e2a44b2dd27816df0a331a8108991a84ebdfefe4e42f325ec3519ee50e89a99d490020a65a3d75acc371316c2253d2c6382453a0b15f4c3d5b96520 SHA512 6f964bb322aa8f2ff92078381dd720527600c6449e237b703278cbcf47b39a2581fddfc2f34ebb7cf31229e33d58de48bb5050e083fec6dad9aefddc1d771c85
-DIST nom-4.2.3.crate 115343 BLAKE2B 03c0d1cf97a0d34adab29d6e21add3da7d8eb78ee6b7987ed11b136db7fc6afeca6a8eb91e00aadc1f6047eb7bff55bc288faa8c481e6a4677e0c43512a68f72 SHA512 663567dcc6310ecd6446bab1eb700f4ebe834a3b25bc2a0054edf14bcf205a95128de5f5dfaab04adb95e1a2241d487d59c0e23c957934a0d656e4c51932bd54
+DIST no-std-compat-0.4.1.crate 7600 BLAKE2B 28c4c943ba5384ca9fb155a53b981803c87d3cca60e0690f1c6d0f877e7bda79dc679938e625407c7b5e953aeffb921dc7d242b19f4d0fe28a14a7866a681736 SHA512 0e264b0004b735b640e132cfa057472feb12b906ddfc08f1b95bfcb262f6e1286653e92fc6e83df5fc553c06f410cb931cbf80b9a9303ca7f21cd625b82a82e5
+DIST nom-5.1.2.crate 136174 BLAKE2B 32387d6ded0fbcdee8a1a0d0a08cd36bf92c38906cd199b574b6b9b24f6c245f2287e04374f7d84e2867d2785aa16d8c01ae3bd3bc811829770232681e2d33a5 SHA512 53b8ddab62475588efae46c78b5fd086a14c0fa505c84e625fbedd6dc74d4ac047e9fbed7312b797f126e9ca1f056458d8ffe0ab13f0117de685ef8b43f86aca
+DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
+DIST ntapi-0.3.6.crate 127221 BLAKE2B 5e530c90eab66c73fa1864084eb462490bb0cce58ecd9e22659d4933ae94871c722dd2e9b351f9ab620a0e45779cc2030cc65bc6badcf9ccc6263d0850c11447 SHA512 c07f2ae51e4fbbe55de9f617d333e4042a93de69e9bfcdd44acc1b342edd88cc2a360fe6710d9568594e2c0990776004400d0741e61d1a2a1cec4a645c4cb035
+DIST num-bigint-0.2.6.crate 87275 BLAKE2B a7da84e705f8aa287b6704a42ae1822ac1555d25e7f51e69b4288a808557dba2c0c15552085a67f3cbd445d518fc8d4f668f7264237263acc4248d3dd1a2c0a3 SHA512 19c1ff0ae6fdfc690ccfe4fe6008c102e50ab9bf6b1f4e4f04a348d217d4d9d538585945466b72b70713053bcfd73685d1a907e41d135265d330bde996709eb8
DIST num-bigint-dig-0.6.1.crate 123877 BLAKE2B ca58d48e2d74c2c1861f47b1e7cf9e3e5cfda14e74ff50ffde21172e710e25fc2339ec731e12c08c3fd8ad8c0cf3783634e95e62c195ec468e7ff0e8e5873550 SHA512 48cb04136d7ab9a61749014cca9edda3170da66e44fa8fb7d7cef102bb93f437328a91f36abd9b42f953c094ac64bf41ecbb0f702caf7ea7371c63c8bb956966
DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
DIST num-iter-0.1.42.crate 10450 BLAKE2B 8ef03f8f84bbac51a11d22ad79d745c74c4092bdd6e65b91c472967c006fb3cd6b944c4bef913465e39e6a2fd734ac2b1ce1f21b332b2faece823fe410b54340 SHA512 46b0e05c4f4587121ec300da51cbf02e04ee8f8441eb4dcaab5a2ccee3b40210f1badde56addf053fb876aed3749dfb5f01e757042573fdf99defc77fb265f3e
DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
-DIST object-0.22.0.crate 181505 BLAKE2B 5a7430b47954c8aa89624d7895b861dd1a8daad926a59f2cf4f6c4528bfb794c1b0715782844ab142c8f1121eabaae71958e5fb8b67c45ba801bd31053cd08d4 SHA512 9491319361ff42d19f0e3dc72186dfa2a21e28090516a0a1be5bfa78a267fc5447e1be73b16f25709586113a78ba5d49d8d6c72243c9adee3d3e4d7aa2f268e6
-DIST once_cell-1.5.2.crate 27660 BLAKE2B a5413b7826abee1f700c55d05cbd942c6348b3d387217bec8f0de5188c3c8d14c76c216353e22e1dc7e2dfe1efa848a188af31254e3656e5484eb0cab2802f61 SHA512 63e7977e10a8b1eeab4c758bc03dfe7c78cfdd38f12667fc1d4842c657b8a4a2c0e46c21d7201a0fd5ed613055bedb8351e13bd2a4fe906d7fee0d51d67097ba
+DIST object-0.27.1.crate 228030 BLAKE2B 48ebfff83ebd0c1bad5f956f79a0f8628f9cdcd75638ecb92f040ed84f625425062c16449ce44b29d9d99c3950554fc1a480046fff922bba30348ac14d68d887 SHA512 3f25b663fdbf9a38090c2b1cdc03ca40bead87fb83f99143e79a272dfa4f2fedc387a50d3412d42a53aab228bbcbc6967fdb5a0c8db0a8a3e3ae9cdcf1061589
+DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
+DIST oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9
DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
-DIST openssl-0.10.31.crate 195472 BLAKE2B 9dececcfd2725471095f72108e70adda4d69877110f85b2ef186400e5b9fa19656f6c9fbe0ff3134d961812b3167e7ec3e77284011393c4d990591eb8474acd8 SHA512 b8844e982e012a084079b77de3de6729994b724d95b05731c3e134ce41669b3b7777d468e948bdcfa57324c4e2866b8d700e42b1da02e3e5d3d14a3c3b3b18aa
-DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
-DIST openssl-sys-0.9.59.crate 51178 BLAKE2B c29fa2d5d18f0a3fed73d231ce663dbfcfa8bd71b4841dc7dec9ae0057de16d0b353582330f5bc290edf55c8dca57d7b43787d52c86f12fe4d79c9c311920304 SHA512 dfc51d3cd90978a3173f4242f5f1c1848092680a042fd0735d4ea4d5793eca435a733173110081ca50ccae5fd8f75109bd5337146b7930872edea0e84f655241
+DIST openssl-0.10.36.crate 206367 BLAKE2B d059480338da28c1e6707db85127bdd4721e931f74bf27d2c8f80315c43cf9c37a977740b9d799a03bb59a1fdf26fc1fd9ef11319863b63ac7b6ba3ddc2c1385 SHA512 bf215f7ccfe24b3f490d516541ac746785853dc61ab6cf023e303275578c206fcb14b6e5001f36de2f71b0a8c48ccb26f4f343c5b88ae38ad2cba12ccc941641
+DIST openssl-probe-0.1.4.crate 7066 BLAKE2B 656434ec1d34466e903e5c69289a277d14623aa7bd8a7c19bea974c7de57fcec9b2b4ed212f37d7f7b90fbf02a486a8ac7f7c318cfb3b3930e54e276103154b9 SHA512 c5d4ffcc6faf009b38dc715ec85fd75b3e3b0c0293041ea26071bb6d19d8d018a43ec166bf79ef1c7a126cf783bd4a7121d5dfcbed36db5ebf0fe4decb198f17
+DIST openssl-sys-0.9.67.crate 54600 BLAKE2B 8371057756351f2e77e953e2a827e812477fd404a66053047f6a1dd891d5374ff6f6666e3c8af5f858201814d351e72a4473f95ca439c2c0b02e08c89a1ed336 SHA512 cca7edceac5a11f3e3ca0c4c09aada27f94664eb9c7ada4784dc147fdd1c9cbb5eb1ad1ec145957155aff006a21e7c954363c0f72691bcd241cb43dee98b42d1
+DIST p256-0.8.1.crate 57730 BLAKE2B 7392e833da11541ebd56399568db1ec96656368b04625b582348bf99f06b827cf45cf103b79d9aa1dd856cbcf6f2e7313e291a3679bf6df65c6d00cd352c4121 SHA512 544486d1aeb154b335b60e1743e279c0cd56dcc68960a0b2c0314bc9511058ab9bcf1eead34b34e0c09042f535a80ac54cc408aa1b37d7db1b24a6a73c392ac2
+DIST pandoc-0.8.6.crate 17549 BLAKE2B 83cedf2a312f9c6caef02e11112ab289083ce4df2ef28fbae831b17ccd8aa8538673a8165b12170a7a0313d6733674c302318b4267703647fbc64ed3856e15c0 SHA512 8f0d419a5edf033bf25c55531101884bb1126b1d3471fe8eaa9bdbba3a9540124b4bf21c92540bfcf912656dfc9d8d48bf51991a0d5e198d967260b3973cd2c2
+DIST pandoc_ast-0.7.3.crate 7380 BLAKE2B 4b5544acf59efcebf1f395293f9fed84fbeca6e030e4bb30685c314bc80c825323c264867237ee011488155d337147884979068991499db878679ef8b8e4435b SHA512 c3a934b28563220ed4ea664bf96ebf78eb8c940dbabc0035b185df55aa460694511b623f30e87ba2b16e938f8abc09ff551470b2c64fb9aaea95b25d1aa3de2e
+DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
+DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
+DIST parse-zoneinfo-0.3.0.crate 76590 BLAKE2B 441e96b120e9bb4f666ace28f2999974e3bc6786a8b834b07601b4a13506505a93d2647e446f1871bb072b8a1d1c2075de259319c7c1699244dc4e0b89392017 SHA512 e87eb0feca1feda438bb44d92268779053feec9b0823a336ffc593f508fb6e918add1023d4abcb23fa334efe8a07ab41143f5fe841b4f62ac000feb23c6d840e
DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
+DIST pem-0.8.3.crate 9395 BLAKE2B 7d4cf8a8b3e55ca8fe39bc65c6616c5ea0f91bda666493688d98e06ea9fc3c83d0b0a1a10b4c5deff685efe2f9858f63fab765b82a1c79d1d5412a5e6a706dc1 SHA512 30421492b14ca94ad8bf7e3d80315f2cbc129fac18655f33e2866e4de20201f9b3e9109c273c5bcd7b45ecc0ccdb8f7e6d8ead07278890d1a043688752f572cb
DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
+DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
+DIST pest_derive-2.1.0.crate 14049 BLAKE2B b85c5a625579e9bddf22ceda1ff808e33989d259f07ddfacaf833ee313029e1a8a01f824da915cfd3d57de57394608a9b506589d642be30e8d5e6a3afcac6a9e SHA512 4d554921b35b6c2491f56b859d389e93459552807df6ff989f9913a9314171e5b6eba93cf7e03528973d6025b663cde7b841d38fabd8197c33beddafaf83fbba
+DIST pest_generator-2.1.3.crate 14227 BLAKE2B 2fba3732d71e6036a911e6455d12ec7f4a1a14331b50f762fda1d6dd244269106130b72025d21e684bdadc0b5971c4b19ccf1f113067c26aa5f1ac71c78def8d SHA512 8be05ef3fd59dc4ccb7871388f8e3cb24cbc2f64eacf7a32fb887f1d8911b528ec545fe78bdd7beb03e2c04eb7fc0ad98ac9fce8579f95ea71cc280912f07c3b
+DIST pest_meta-2.1.3.crate 27818 BLAKE2B bd96b36d47e39d6f8cc6f07ab373d1bf8b8f9907afb8b3774f62677c800914f40a0b44531f50b065ae9d11ec77a940da865b5a574d0cb0d2dc51059f718fa826 SHA512 f31492b452b58c632c0c5c3e357ba2b41ae2b5816d0ec432c1a281dfc681c5b5c2ab4f194c1049938e671ac232d85667aab91323e986df4edf6093a4e2d47ac3
DIST petgraph-0.5.1.crate 147173 BLAKE2B 3b74b2965ecdb37a82439111ad849581254698c8701d8d5bdb050f4a30cce05016511928443cf65dac394dd45584279a933435a77ef3c610a64c73cc5a68ff9a SHA512 c3d5f53b1a0900084b0693a6f3a849bb9b443b1b6fd1ad88bce8beb12ed1b45f2399b68db3366ba15f33c2d5682e052b733dbde76fb1b646b7bb1e660a38d8bd
+DIST phf-0.10.0.crate 4675 BLAKE2B 72f3436754215f51ed2041ccf61d67ff9139d9223a0615fba6252bcb3b72f86397f91aa97fb8a439b2f5b357610c0c14979e92e718d0da29e40292b94f931f89 SHA512 4784c4acd49fb4de47aaa2484d6c018ff154094fe97199ce5fd3e6a67ab53efa454fc41b549a7addd2a02f32a096e4c541e4134f71d7bd78f77da23ab9502017
+DIST phf_codegen-0.10.0.crate 3402 BLAKE2B 2d0a3d8f5fd0f8e577f6d4a5d0cf87bd5e4c0d5690d3aa331ba252351b59c478e42212cd66f167a2a88c2b9111ae7aca2c9fff3740dcba1b77d2beedc1d44483 SHA512 dab91b53c72a5b9b6c4773b9f16d2cd58f65bdd9fb975257b8d107d4509b44f5ce8b92ab59a60171207e025688cde54ef97c9973c4226a8765f10f35c4f6f1b1
+DIST phf_generator-0.10.0.crate 7525 BLAKE2B 1219f37d5699896f9dcdd367cfcbeb4ba19d3498c2e52acd02975b236ec3802f6ee57eaca40393a9742b5397809ef548923410768a727108c83139fc70562a43 SHA512 b6542d816b2e963c169df695d332f92237ba380f49bf919021514a16aef71de8f4f70b9612356db9f345f3f0d3656b2b39a4f34f8ffa8515510b81f1b19cb9f7
+DIST phf_shared-0.10.0.crate 4095 BLAKE2B 9155a2c145148f3c36ba6d6d8be86a526480b127f4af79b2b5855cb014a0080bec1ec45be466513bd57faa39c77cfde0d6ca02b6bb77d37a23d697603227da37 SHA512 f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5
DIST phf_shared-0.8.0.crate 2860 BLAKE2B db48d88ad6e7aa6bdb2f6750ab66063a55d005b4f5e92ededb59da1f1fa9b1296d30f87d32d036f08e3a74111ea4d8287e8eb6c86d0edd76b3ceb38f223696db SHA512 6ad7ac732b7cc42e7e179329fbfee7074d26652d73eb4f2b97224491d978ad9b14c66e5a539c96b84c70124ac44cfc009bf963a42c438d028bd9737b99f463f3
-DIST pin-project-0.4.27.crate 50964 BLAKE2B bc0e87a7941452591f53bafba891c758541034ce83e3849e8c6f1894e46c92f0391f4fbaee6d160706a6e7b02b39e9ff755efed35431941c96a20bcd2f2c873f SHA512 ca6537b882f0c7ce0eb0ab98e9cecc1620f168306ab1fafa7a4db13e092339f172874a30ad598db18d697898b5ef82896fc70a1b6f8e08ff0068f52a3ef5aa3a
-DIST pin-project-1.0.2.crate 54886 BLAKE2B 9feb8b1318916915f711e1a71aa5494b66ea3eec83324afed573a85a54f7d7c698105ab3077aee32aa11b21aae4dbc07e39289e1f2ba880818b7e8004ca810d7 SHA512 94e2d8cd001e6e24ad87134b2b4fa896fb278d021c1d97318a1ba1fbfe27f7424bc84391a72914e30d4de1dc664642aad57f7f0536ae6466d4f969ef3ee41317
-DIST pin-project-internal-0.4.27.crate 29739 BLAKE2B 7bc74da03503b3d8b5868e4ec297da0b69affc30a80827d220bf19e97449f30cdbdddd9c13fb2361717d152905daf373655b3df4b336c97b2bfad89a55f25c0a SHA512 435644b294be873247f2bc351a7463eed995aefab8ebe30fc29ade1ae18564f7c92bd1ad2635e2eb9d018f4bbba0b25549435588913767f58862df1337f196c9
-DIST pin-project-internal-1.0.2.crate 27379 BLAKE2B 20bf3e906e4390454b246dcbc89353b3fc5cc53bd0e301f81cd01089e4cc283c5f8052efb1f43270ccef9bc26c843eb7816d4d561f7570fbf686d9d0e0a28cf8 SHA512 664093a15749f3476ac42a5d19160ffe2a28d14682419fb7113869c3d79c51aac10cc8126378eb80739a6f5a64561d84b6a50bd2e8bc4b0e05c346ead4b34fe1
-DIST pin-project-lite-0.1.11.crate 25308 BLAKE2B 19d66c06d39de9b510d6c1230d3a0619465aa7317cc583d4852184b2a6d9f804598b908816131fa9ff96e3074cbdc8bf7bf3f9f775a4bb76d686b10e8b6a4edd SHA512 c2621d3b8ce8605eda2a117f2a60a41a59185279efb8c8e1e0bf6ea1a73dd3c81ddab62d5dfdde995f26071342f0962d602fabd4ebe97d4ca6c7e6b4f3ad701b
-DIST pin-project-lite-0.2.0.crate 29023 BLAKE2B 9955125d3b60475d6ce3b5c4183f062a63421a1b2ce1940657af7cf79b90092057edaeeaa3d8341888f66df25ef93ec1be1fe0e6f024c848a221d87cc28789ce SHA512 4b2fadd1556581e277625ad2ab0f52de78552b89c35ccc1b9fc98438042dce89c92c300aab268a7743291e5b583123675ffc1587a5c2ba6f3de5f67c4d11a9a9
+DIST pico-args-0.4.2.crate 11565 BLAKE2B 2dd0dd6679d418fba0f6bab93a8216cbb9182431dd7e0819e382db2fa1632bb5ed17cfc2bd7da90df41024066d26cc82188dd4693e6b4f7eeec44d440edfb12d SHA512 a6e46bc8d086091a37a0edf418d5414eaa5ef57a508aa81c352c66281cc2c88c97611b7eedd4f5f18c7a8169f48aa3bfdc7a5eb7b3cb570cbf871eed5e867ea1
+DIST pikchr-0.1.1.crate 75225 BLAKE2B 3a4dd9834c922723ee2ba620bf39fc9c41df65650504fc6f015f1ef086fff5b36c1baf2656daff9d1db86c106e55b9ec2bd91687c692e2a183068a359e33db48 SHA512 d3421eb1c5f5c4d8b53e77dcd5d7aa6f05e169959b075b06724b5d370171f9d60a509095185e04202fb31735df7ab658c34752e7cca6162488c4d850aea97991
+DIST pin-project-lite-0.2.7.crate 27212 BLAKE2B 71997c66fe24bbded0030acf9d460c8ecdd07f7a047007413ad5daee06ade30ce487e7f921d610f9e0bc7aa036391f6c595493d9b7d95c17e9195f5a2b23441a SHA512 c948201981269f6f54da069470c56c5b9c4c6f52e349dc7970ad828d412facfbb66a09745c0565b4320fbfd1aa7983f3664604f7ade37a30cf25ce253afe8749
DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
-DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
-DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
+DIST pkcs8-0.6.1.crate 27040 BLAKE2B 755e1fac0f37556152653d40b6986129a4f0e7af878371d2b0992481504c252f42d64cd262aff0a59de424cf9fa4881621b024a5fa1fbca3ddae770154d941d5 SHA512 f32cb6575a7d51e1235be02cc939114339dfd838acede9309d441b3f67bba6ffa3b3ad9ffeda7ed04d2e3bf6a8431642218072753d9ca00cf62fc70116cca9e6
+DIST pkg-config-0.3.22.crate 16145 BLAKE2B 346b67a2000eb91ea8867e5a861c87a7728909d6b20dd00c9b4571d89e5308a108906fc80fe3a2d014fff0411d9bb30fcde224abf8f4aaf37164107861083bdc SHA512 435b9d99a1975692db3efb3bd0e92899c43ba4003aecc4859dc71cd2175521973d5cbe1be06fc3b40af2a7bbe1b0a845be73586c0cd96dc218bc4fc7dce11107
+DIST plotters-0.3.1.crate 8595577 BLAKE2B 7c500c43c2b2875d9dc17e4eab57cbd8a470c6064deadf4e78c429abe2f1e97511f64bc67782b4e03e7cc47c8ac54aadfa5f7cc8c27d3b4453d2ee8252896c99 SHA512 c7bcdf9da56c2d1c03053f61256d44d2384fac1a9a7e0db058090c13b359bce76a2a96bbcbfde04fdcde0a9dd3db8a1a22bc57508b0b6e4a374c8b35ec6c9707
+DIST plotters-backend-0.3.2.crate 13524 BLAKE2B cfd42df0fcea4e5ee944a6b8c48e3b7fcecefd6d97f07e1c333067193c211da9eba29fb56e9fc8b861cfa2d1baa3c042fddb494bb66b9109656b26bde7901f7d SHA512 116bc6866094a2ec40a9ab9363378566ff37eeb4a4e3805562dd3e95f1d5e8664b54d3dc858a2c9974b125e308e46b77c294de2a655f836d342712c32f0242a3
+DIST plotters-svg-0.3.1.crate 7596 BLAKE2B ac8dffc5dea833c0506c472567056be0804e5519828b68f7b3bec9ee63dd59f9aa828c10732a50e004214512df06c7eaf164eb9613cda75b2753270fa358c0d6 SHA512 4d3cd02534440dc26f5eaa3b4966081901626c61d9fabe0092fed87c48929cb9be070d9c34486fc7c7bef308337ff4890d30f9581a613549e507db60dd9d8876
+DIST ppv-lite86-0.2.15.crate 22002 BLAKE2B 3f967f112ba799f18a3f897c944ea656994abdc7c912868023de90d3885a87d9544159c44b6aeeffd83c1fe0172e326bed4044c2d199ca899da4f8420629736c SHA512 6dac73153d244cca97ea00e429f783a7d03b48f10ee450cf6f8d77581010b28be5048f53322b0c888b425b5085f440b6ea90599ea00c55c641de6e29da42f0b3
DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19bc9b8c844156c831d2b550692c7e2e36bce44ecf18dd9f2d0f0511346eaf0d2a0ebe792fc288ca0e94a93933f2051846 SHA512 a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05
+DIST predicates-2.1.1.crate 23150 BLAKE2B fa8b250752f8a5d6ec30ab3aec3aca2b48e903fd8d182817180633f9f2a55e4632b1e1912c9edac453ebcded9f6624c42b38dda70ef36fd710e1dce1f1ce6346 SHA512 c850fa2541265aeb23d5c19dac6c7654dc434f1239ecc8b1cfaea89bd120112e2c45f127b491fbfba1c053db8413e8b561896729a56b6588142dd9ba9a33988b
+DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
+DIST predicates-tree-1.0.4.crate 7682 BLAKE2B 10e32e4d316bd3bb7015a6ef6d8391381d441acdce0b54a7da2ae4f741175dad7bf92c2488809e233da45360388908f200c2a2756f17210641b0e503728cf150 SHA512 f4d4f3d58c13c9b0344832709709a677d0d1f32e80a2c1e7f38a6f214efaabfc2b8e12d4bb4ac8f0c57def9a44cfe94ce9144132cacc2b6f84002a57aeb4ae5e
+DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
+DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
-DIST proc-macro-nested-0.1.6.crate 6498 BLAKE2B 6225a30c1668ac20c3c9ded7633458ab7079bd126aae538762547b112012050e9aae22389e2a18cc14696212a092a9985bc72538d4ca4d37ca0faf34a68c3833 SHA512 ed89e9bfc30e8d7a9be742a02e8f269bcedcf511d9e1487866f198b4410a2802ab576171b844ed15fa2848689247afcd208016555442dc24fef7609400e9c38f
-DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
-DIST quickcheck-0.9.2.crate 27401 BLAKE2B 673b583a26e241134d5176bf3aa9edc7934b6eab54502cca339a697841e3b010244e499dce5659f84e41fa5bf6714e196e84ae74100e224f2f0e840d5c2fcea2 SHA512 a136316dcf7daac3d879a660a61c768bd14b647fe53e7a5c2731f197106fa9a351456417ae8e588247d3b9da0c26707c6dc55c1e1fa6f8bf47e40727ce0d5030
-DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
+DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed29de12ee1ed849948e5202913371d877bb648e6880ac3e6619b8d48342e1fe105df56a0abda1b13bd62262bea4c85fff SHA512 dc5d898c6d5588d279aa0852193105bbb3824798a05875e2181c66da8c3849fcb32189d9b213cad09054242aa4ae9cb602f9c2d1b5e7302963bac244bbaa27c2
+DIST proc-macro2-1.0.32.crate 41003 BLAKE2B e8da70dae2ee75aa2c344602e55cbbf9ee5316ff6182c870b64f9fe4b33e60b9fb1a22137acf357615331f2e4079ab1e8964a2cb0234fa439d1b3d8d514c2eff SHA512 8631714c226c8a6fb330a529f42214216057eca85cfa63afd3de8600d2638e2be45efa54155ce73625883bcbabc2c56cb865ad9dda04e2c7092d955caed48abf
+DIST pulldown-cmark-0.8.0.crate 106330 BLAKE2B bb59298b605993530e2363f3264c3ac1104ec57885c2dd183dcdf3aa9dc613999d24caeb86848ca3542544238aaa4eb49d5a6599d2fdef53af50b5dbead68e22 SHA512 396ade131c0a74cdfb8454e137e41c21f0b81b7cce654ba6ae9ceb132ba0fa0a467a190e6dd69cd7d59a267efbe83f008c9c8a5c9db47665aabc31a4bb9cb967
+DIST quickcheck-1.0.3.crate 28069 BLAKE2B 5f0ddc8e22fec55e879745a95024abaa03d7bcfc6453286eec072663b36a5d6ae247b3c1622c4743e1ca9b7c4bb21da0d095aa5247f32b0bedc393f92cda6bc0 SHA512 07dd707c9d3fd0b9cedbba545bc8b4fc1ca2770d169e444f8c96f8306d3161a6a3e9189cc5d0d6b3dc4221f7dbc05887dfe2dedc914f88d5e69ab2b94179185a
+DIST quickcheck_macros-1.0.0.crate 5275 BLAKE2B 1681fbc5a476c627da442d601d9f24dfeaa147dbad7c8d6989ad73cf5a204963c29b2b5bf68513ba74c322f74ef5ceea92594953e9034921a2c8132150252779 SHA512 f7de86f76a53fc36063f10f5405979677a2e48a96d13c439a4aa98e89ec7f3c3cae324b8dd789a5236630110ac9a1763f28361442cca08d1a1ef458c7bfadd55
+DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
+DIST radium-0.6.2.crate 9930 BLAKE2B 52ae64c10b7a3195b5ee1d6e8fe6e8b8a8ae90ded5f54d391bc398b5bbc46076fab1574365c9b401c0bd19a4d412e4e7f9c4a89baac6122c14671594fb2bd164 SHA512 a1850f2c044f9ae0e56a8992226396bf61e9f3f7f288b18bea3ba60584a6533eb94ce8532507c6d084e4b263139bf61a1193f23589dc3ed8ac7127d0f34a81fd
DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
+DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
-DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
-DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
-DIST regex-1.4.2.crate 236931 BLAKE2B f316b777df1c97aef2994745e1fbd9ca676b0da6bf4ffad4e54aa11014d39aed343884ede3648b5fd676dcec5e4840e9d84f4a4faaeefaf5a2d772e2c5b9ebf6 SHA512 a9bc8061b7563b8494b21f35bf3c2af5f58dcc1b0df4e25ab8d3f99ba66527d5163e2c04b229b688fcb7934961f718fab72f22d66fef53562c5d96a2fb3887de
-DIST regex-syntax-0.6.21.crate 293572 BLAKE2B 49c499ba1c03447fe7c90f27147dc5d96daf815e330a4073fe293d3be594fab1d798d35a5e49f6af43c71befd47528927246c4ebb24b6a6a141135484bbecd31 SHA512 56507f4432804ea30820984f6cff03c3514988bc3e406b3ba3a89c36c9c5d75951e4acd000ba85b95bb83d253898ce7d7d282ed930e811e12bb644c4a5ec84fa
+DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
+DIST rayon-1.5.1.crate 160424 BLAKE2B 1c31c8e3290f76d02347271cb020e50e8f915b7a064f133a196c12e07ae1551c0e7c31883a31ec419a05198d6c71f0057be1b8ddb21f451db9ba40da511a0e1a SHA512 a68e65aae7040a6f6b0cc33b53b4c22929c15504ed4fdf54f5eb5fcaeab137c220b00c716aed96246b6a762c4f1e8be920356231d6c4a0b3e01132b9ab96ffc9
+DIST rayon-core-1.9.1.crate 64961 BLAKE2B 7201024124324d2cf2d5785b7e79d2195adc7de576b826a9c28603dc44f1b5de46d277b791a741413c85facb4f4a552bfd55989a190f6f5ea3df4bbd32042f66 SHA512 c24c34dc488171ce476df145e8c6953d35fea93412805f6c411ba8b8e9dbbd733610b291203ee91bd265b766b78e14ba15a7b587e8f0ae8bde53f60e0644ef78
+DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
+DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
+DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
+DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
+DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-DIST rpassword-5.0.0.crate 11273 BLAKE2B c92a04fc517211c5050ab7c774b70cdf3152a3ae56233618d4cc2e14d428add67489e8576530e0a10744f34a41ae3e3f5645eb04dad4591bac86f791157b55a5 SHA512 fb11b0c59dbfa6203eb68c1441505091e58fdaec75f3ebf2ebe79306f176fb09b2579d7aaa66e4167201db329c4b4f6d16e2093db6a67f1a5f0e031dca50e565
-DIST rusqlite-0.24.2.crate 120103 BLAKE2B b72c206b640a692f466afb6262ffbe16520b1ebd25e5c6c59d618dbcf3cc448c279f56baa5eaf351b98dfd7a21e42bdcb8e43ed8a74536625369ca66f7a08951 SHA512 47c7cd04c666fe42edcd667ecb3289c7a2b612446b2f95d78bf576fb691a167f372ec48e0d4cfbe973b32068b4f06e664d079fd3358a69fde895295a80d20caf
-DIST rust-argon2-0.8.3.crate 28313 BLAKE2B 2d3468c7b5dc027fbbf6ceb264d77f4ae9b03526e0634c645ffd32a4c87532f5a84c224c6c39a15c9e267d268b187ec65210a2edf7df8294913e4958fbc83352 SHA512 f336dd3f90e1a49be107b641f9e9d513b6f8098dbdd1ab8aa2bd1fae329ce6840ad11a902b599922bef45d96ffb556d52b57d61218271bdccb7c85f9fe1da033
-DIST rustc-demangle-0.1.18.crate 19913 BLAKE2B fd0b955e9f552d5a3759dec05bf5f971d151efdb8098b0b3fba0ac80f0034c4891c575ba1247b04d1271fbfc8a1585f4a65200ff3836946aecae1cd653c7a1e3 SHA512 93ebaf7630c99b6c83712452aca26a42d9a173aad8ba7e85954f65e7867486519013aae1afb0006a0507fc3d6a4688df783ca091779bc0f316c5b8c4be95b793
+DIST remove_dir_all-0.7.0.crate 9041 BLAKE2B ec298c4c6ac01bff3af5618ffa59aca535d74e06cbddf86c765318ded226c3fadb7f8277c572f173ae7d04f16c2b504375e400fa4e228d8747604860fb25660a SHA512 a4a426e7f3e9f4d3925809e22ebb61d06be04703ecabbc07aae80894458f29a146bc6aa6540ab4ac96c74a160a5520ea079ebb6ac6cca489ba036ece6678339c
+DIST ripemd160-0.9.1.crate 12087 BLAKE2B f2e0677b053cec4b93b1ba750e1a7ad603e2f4ff2f6750a659a7768627b1b30c429c91e586b61fe31531a5447d5f8d51cef1a874a8376df97b430a9629c11c7b SHA512 cd36d5b3224fd393f04b97a1f624ff190c3302ace497e37d040b5eb3a76c32cb413429de2692ae8706e62998ee82d82d13591c320b76825bf1b93ebbb3ab9ddb
+DIST roadmap-0.2.0.crate 22995 BLAKE2B 86f8095f0d3c30f6d798aeb510be31a912c83d353a8a531d994b0f335378fcac3bcc3ab879c126adb15420daa86d3c6f105f8c74fe38c25f94b35f90ceb1eb95 SHA512 a2a59b65e707c16905d309eb66012e92cd1732e538354b79fa1bd83aabadfeeee857eab7fea9a39d38fe28f9f124e0cda52b6ac3a883f07df4e2cacd8d683caa
+DIST rpassword-5.0.1.crate 11109 BLAKE2B 4d040a920673de6ad2f2cd55104a7c2dfdd7425368c77aa3c8a1f3f99e51cba4d86b2afb16ee51637d948e444ddf060f7a0c82de5d6f0696023c527e630eeb56 SHA512 bcd20c2920734a2f281b9ff924138605ea409d0bea9721ee96100f45eed14dffe65a8bdc8feed7c36d3564c8d902e78e0d2306b3736d03b8f195a9d212792feb
+DIST rsa-0.3.0.crate 40124 BLAKE2B 679de1ee93ce654c5ab442f1d8c12f91ecdfe3ee5e39ee2e31980acd333ef47f32feed30ab8dd1acadc1d88d9bcb24a6da872144394873be718201939d90fc48 SHA512 04c58f7d07babf108b7c30df94de359c413c26d1e9f044aa4782e58e4278fa2b448dd659820235f857f68e7ad428fa4fc90d69f549105b56ffa71d924b6b6a01
+DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c
DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
+DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
+DIST rustversion-1.0.5.crate 16984 BLAKE2B 314d4a7b78a91fe6a0f35d850ef7a4dda72859fec7f603307154d2b25722ef6be71d5986991b4958009ba066d3078a53131691b0d375677985b9e351876dcd15 SHA512 43f3ed12e007e0a7bf0ecbe44edec5ff092c88973903ad8032b12d678d98d8827a9e51040fa157b0d5b07d26a5b6cd314b410553fec46689b3a31b392c24770a
DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
-DIST security-framework-2.0.0.crate 54526 BLAKE2B 132382ee0dc0336ddc4b07417ef0613f44201d50b6f1ae6d6ae3cb1d53052521892bc8b4d4ad107071ea2c49a1d198b4f09b02d5982ca93eacef5d0e9139e9e8 SHA512 fa843a8638c7b4bc40041bff90cce422aec331a3b6c7ce8de32d2a817d2dbdf8689339a00236fc08d1669219ebbaf628be31693598b9574726ed06c22d3247e9
-DIST security-framework-sys-2.0.0.crate 10518 BLAKE2B 6e616e6099883bd0a55f972a81c8eae90d39cba9b36efe5c5bc612866984cdcd088bbb89ea81cc9f5f6b2ef1acb81f12ea106d9afce38662304cc04039db8a57 SHA512 43222d67cb51630575e1861470c55950b7c96db9708d70e97328198d25c858a05dbb0a19e6513cf9341c26f1dbfe534c6ddbf9cf71c4c3f8dd47290f06ec3931
-DIST sequoia-sq-v0.25.0.tar.bz2 2466222 BLAKE2B d796b059ca5e5b1201d8850f8bc37c1b126acddd9e688be61941556b7487632404ca617bc8720a4ee096128fe6c31ae04551130fce48f120d4183be6d22e1b76 SHA512 b501a808fa1ca777e46745b986421405d71c6e386a093c618ac04c87d08adf692a211367abdc92a549572ece91ce5076eea2a9fd28f1201c69533a172e52d30f
-DIST serde-1.0.118.crate 74248 BLAKE2B 0d78d29a9d97da401dba93cd6e118dfa48c73351e32ee48bdc2a649ad60f1b198574b78a5261564d466e8097f8b635e810f4c8a52592e3f39550910e250971e8 SHA512 d3b316e721ce395fad656a598fed7e83b248a3dbd98a9eced98fdc337c8fd40f415356a0af6a0e5a104a592ad10e1265d47d94b10b343ce9475797b3a74306e4
-DIST serde_derive-1.0.118.crate 50589 BLAKE2B b1328a3c7fb0fd6321f0d020969f1b7e32150488410d574cf9e75ca06bebef3d753dacfac4e45cbc0eb9626246734a1dd5b766b96a1a98b53f3f17897dcfb349 SHA512 f0909822f73e900c8a0b791a30fc5cf5be0a79e6c455766a90d6cc314408b95f2b9d7e3ef99363860d615620968e217da304457d2d6e00f60da8ab8fd2db7115
-DIST serde_json-1.0.60.crate 114828 BLAKE2B 8f8fcce30049b0f20ed4e11ce9323afb5edcb0f05a3a5e226b15770350147f27d6fc2cf242ced0f5b76c85c78694bf342ca084bcfeb18ea7d6c9e2bac5461f78 SHA512 c19262072cc2dee3f7e047e45ef3f02df121c9b1c9dc6f16a20f5fcbc0fb1bc25e87342358f9e9ac86bbd5f5d6091a9cb56256c04e22f3dac671ed23ff64d9f4
-DIST sha1collisiondetection-0.2.3.crate 822789 BLAKE2B 4665516c0647ba2e60710409d51a8841db947f80bc876e69b2314abdd7b00829a28b9f1ccea595739243acacfa8ba11182f0be9b5c9a965e75457de7c70253de SHA512 3bed4dee37e40b4a8f91cecc592c735af7acca284ea36178825c13c242693c75ffd221dfdfd4126df2198e7047349e1f2da9184e517e901f4edfb8253d260d86
-DIST sha2-0.8.2.crate 19851 BLAKE2B 9403b9b975b2a0d7ada7681f40659fe4b548e8da0c266f384e70ead2d7fe0d34e6bfd48204d43d4d97d29aec7352b565aef8bb251b3cb1ce37d92d034e0688e9 SHA512 a9c2c9ccc846fd73d12fe9120ad1fb224bc35475c7332379a9cc67a7889677ddb1c577489d3a1aeae24e98b397b321823010c20ab3aca172839b2ea1fdc89da8
-DIST sha2-0.9.2.crate 19665 BLAKE2B 436b6bcc3ddeef6cf92c047655fe3cc9602d3d35f09aa1e44fbd9dc1b624167040ce373130fb229840ed5e7183574594b85a270afaa767d60a5efc9a7cee5435 SHA512 8d028a011b22f9e89a29513f4c25b2cd551aa71ff61f5247b31bea9d3291af8fd340ec0b33496b68e4057be30072fa50d81a2d8293ce248eeab1f2035e6a05d6
+DIST scoped-tls-1.0.0.crate 9146 BLAKE2B e6cecc543760a293b9ba4e71bf0d12f3360782795bc9d0f0bb054614a1c393f081b6178e98708b896037f5b8edcf371b727e7eb80f62bca24fe09a1903456729 SHA512 f09dd404bb45349ef444e7274a2aabfeaeda7c3c9f964bf5c52c39984c137f63bdf9fb3e33df8e312e52872f7721de25951a7f3b8333a670626c51afd36d314c
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
+DIST security-framework-2.4.2.crate 64857 BLAKE2B 7ad2311ec2ab1ebe8aca0b55a5b6b1dc328ad294818896224e950cbedf39cdda3e130395c5c2dbc64ccd3fa5603d028a2c0890c38c4a18dba4a25bd22cf66380 SHA512 de4480e4bf70148cdcaaf3a9c0e52ab061cea452b3209918fbda693faa7feb8c2df56ac29139bfea74969b8f62ba3ab2b3da38654e35aedf62fdddcec420998b
+DIST security-framework-sys-2.4.2.crate 12821 BLAKE2B b1731747e2525aa3aad02be4da8076f6e25d33faf54b431e84c0bd072ca236c682ed492621a7aef725d0c1bd20a5f35ef01d0d518b06fa7bdfd2417b081f4cf6 SHA512 d2f35545223f1ec671f9265017c393a6219cd1ac551ec7b3bea6f90ac9e79cd9d9f7232fe7fca5f0c093b3f549925571d5a4f0b702f29a1e992e038446f48bd9
+DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
+DIST sequoia-sq-v0.26.0.tar.bz2 7426727 BLAKE2B ad81bdc46308bd36fc02b050585d8912a51c271f990bc79bc01e665a1b196c21f3b4c48e858e2f8ac772d10fa84f5ea54286c7eb6010a22c70c180fda9275f83 SHA512 e733e5702c4d1752fedc2dc7cd7544389e766bb74c46f9897d84d95890bee7aafc8a00c182d2811ace7f856b68bba09e919aeb3d6b3071d21bb9ba7f0f812773
+DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3
+DIST serde-aux-2.3.0.crate 10712 BLAKE2B a0df7dd1e7499768233ce2a1d9b0a5588a6f120f47943aa72d8896831b0e0ae19b6d7e798ecd58a84dd684b42c0f60ba1b1069c1da27bd7c6301614d2bf8dfc8 SHA512 ea6b884a8caa654049b299ac6e944a7e7584fd2a0d3f7f34f8f0c4b15f936750f4f6560d9b3023aaa52c452c1932e941ecad83fafc4ddb517506cfea92ea3ff7
+DIST serde_cbor-0.11.2.crate 44570 BLAKE2B facc8d16886dde89125b7d69e9e77ff586c61993c3493fe4089ff03c53e6c0808c6da45a83337d3be7414dd82f3d6a7f3d43167473e49e586a7e817d47ef3014 SHA512 12ddcbd5de0d85f2da6e078e3ccfdf2115125084d57eb93d7e9b45bca6a86daf79dcc79c8e54260c56240c3b5e814b1481ac28c3aa1d1b4b982ef5956b5cc3cd
+DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
+DIST serde_json-1.0.68.crate 114986 BLAKE2B a588a87ac9fe2b3635d7bf72c185801e3866101020a0afb8f714d37939c2dc7b5b32e2177910df7221df197e4e8a92d92187968efdb5e9f1f1616647c10d81d3 SHA512 54a0345029016873883dbdcd2094615f509759f61b04d9a496dfdbc1e27ee5361dfb3d129f209a9ad66984cc1f4c82751adfe1a564198649ecc939e8c3dd1ac5
+DIST serde_yaml-0.8.21.crate 42603 BLAKE2B 4556a2cb4f81a1cc3ce7487caed863eb6403c966f38d505fef6ddad0586813612b0b1d5d6c32ddfb3a7d8dab8a870bf4d2bd6b06321e28165ee0b14293ec2203 SHA512 82e5a6663392b2a3e049f735b88b35023bb9255167b0e396c2cc5982b014ad2e6804433d15ffd19fe2ffd6e423a6e04e9a32b4b3d2b012adaa1f4f44996a81ea
+DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd
+DIST sha-1-0.9.8.crate 14029 BLAKE2B 80fa6903880ee36841375345d1763672ae8c3b790965b0bfc7cec7ecc69744be3a35a890a6f52b2a25f9ed1b91ce6986dd04b00ee455563b00218f8acd4b6ce5 SHA512 d4708a762d5f3dfd902ed335f0383cf63b442f95b1aebbaca3643606ed2480060d2ed04f123d0c44496147ecbb06a093980b435f9d3ff9e0f5c908389736aa9f
+DIST sha1collisiondetection-0.2.4.crate 821850 BLAKE2B 1188e71c25ef354e3cbe553b10048f31cf55249c792c614a2910b198ec04e48ca7d6678fb24b620d439d125f7bae690f85c557a58f85e7facf07b8e328c75ec6 SHA512 aa8835fddaf07f2988a2c4a0b86479be5d598df3caac69815529ae84915f6244a1ac89c8bdcab5f89fe7cf5ec11069121f56e3521aac7db761fcc99491028678
+DIST sha2-0.9.8.crate 22132 BLAKE2B 233c2160961729590a2ee2b150715327fb09a1a38ca13b07c2c690ee6ed6eb7d180c54d84e9b3ca2e92e48d7ec923543e893786aa81b5942ecbca27b40ca12a6 SHA512 4bd858f67a3ee5a22769aaf4161d823884e112f99911d5461cafe746a19fafd2d8946eb3aa234953efa06a4dcf7becda70db6721c0d4a9b6f1fb670f31f6343d
+DIST sharded-slab-0.1.4.crate 52479 BLAKE2B 766d81761909006ac740cce13e8361734c3c7072cd07c8c8f611f09772e16f11aa93cabdc5273b9446f5da391b26b7e7d619be523488d8b3558c64c18f20d591 SHA512 123a9ddb126d1adf41a30a632604264d66a06bacc497db6373e9dd36164197f8321f2fc826a16247674f0f69d9f6e30aca37810f787693c4a5c2cee8c5887c55
+DIST shell-words-1.0.0.crate 9798 BLAKE2B b2511d6a956842346f672edc9a3a3554af6d424c3ccad4244c190a7edb5c6d9f18166d91a90ce2c4e86239b858cb04f36f3cb2ac0f1e64926bbc8377f3745d57 SHA512 f1de4606bb249fca7dea437464ef560aa49839382716b9c940738547a5def28337501d9ba77d96a63ecb956d3c49867d6f4742f14946448a2c9d0b1ecea9ebc9
DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
-DIST signal-hook-registry-1.2.2.crate 18127 BLAKE2B a47342d3ad3539e69a0449d6a8e526d94b858f2ca7c0ce03c52c05d095ffbaa05b803c0c585cabfef498244c647584b102d98f2bbb2da072ea5abf2fbd315657 SHA512 1d595cd19fabbb687262a4892449011ea2f8edf2d295d7a37ab05b252116271ae9c9639c336a66be94ffc82b12bc6a2aca0db2b6f31a11bc7428b39c8ae1efbd
-DIST signature-1.2.2.crate 10190 BLAKE2B cb9127622f0d6b783e4663bc4ac9fb14b28c8044cbda77a469c0ecd41f09fd91ef8fa841abbd5bccef9c81c3aff0ad2914616df089832b3ff5d4f5b905deee8b SHA512 7df5259951ae9de606ad3881ebd68a9f248249d0175f5fab072a6ba8f42b475bb53060bfa62f3f0bb5407e7102bd597ae29aaff11618b8d4eaf776d292738cfe
-DIST siphasher-0.3.3.crate 9458 BLAKE2B 02f61c68b432909711c8f8d3c9cdb641528274b9cc991cfd23c10660d4ce4fbe49dfe9c2226404ad72cca498f14813eb531ab2149229071782a9e267504aa95a SHA512 53bec96ee1edcd658886ac650a1528ce5186a203a412d4dce5a95ede4b50ab5ef9406af5150fafff220484ef96ab5a883dc9ba4b0927d6bc42321a4b0cbf454e
-DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
-DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
-DIST socket2-0.3.17.crate 49764 BLAKE2B 406e34641e72b6d639f1af8503e04dbc122b87f3401dcab7fe99ac65d89120e1f804ca3dfe505e659ef8c5d738ff572744d28bb7132cd2fe98f5429f634e1d4f SHA512 148c3d9e829dab8d99d28fc96981dbebf2889f94e73f428bc885a04aa6889ed9432cb458ad7fc7b489128e88efa091b6170a00813d78886a46479c841fb04534
+DIST signature-1.3.2.crate 10323 BLAKE2B 6e272bd0092627960039806ba9c4c6237f559c13a1f7f48e984033d1e858d85f7b052e171554b99353d29a31a3578aeacfe84e6c897a3a7ad9b847a5d8dd0c5a SHA512 15907e761b97377e4bf3c68c18da3f27cfda92ebd332845e2e9c680679cc5f954192bdfdea8c4fab4f92b634a88b3574898dde10ad7650a11ef8a8ed2c6b4665
+DIST simple_asn1-0.4.1.crate 15752 BLAKE2B 99694bf4598b2039b69058a4fed0d790e4e22ec0ca82920d202bdd1405eca0d6cef6ab660ee0d48c68466f4583c3926ba20171b8c34012df52a041df2a1630af SHA512 37211608915e6ab2408ea91fa937f93962b621bb89c1eada6a06485fbe83cfc930a116464729878f42610ad4d9d21bb1494916f71290257ddc88441317bd0ffe
+DIST siphasher-0.3.7.crate 10097 BLAKE2B 455b5ca81418aee667b4fe16092435e025353267e14cf4f911f5d48a18d9a46be04452ce1451a272f8b2073ecf606c6834b6d06b49687474bb7ac226383aa7e7 SHA512 4a8ef56085742de7ad638194b21ff3e315aef6de9b7590e736071859ffa2aa4a28cdea7e05ecfa781fa35a40505086a36d84bdb3ec40d679f9b83c2edffc4d3d
+DIST slab-0.4.5.crate 15888 BLAKE2B da43a90a8c1e8b8e0d353751cfac036076be56421f80ca5c911f6e30fd19f43e2ab50be7163f22b2e9785286941d62f036a6778b62f2c9f640f48501276eec78 SHA512 9ab2db11b5da437148486a7da44f06eae2572a735764711145738f9da66b1ccbb8b974ebe3600d1ff7a6ddf07d1fa9dd04c9207c4ba54eaa8311c41d317182ca
+DIST slug-0.1.4.crate 6640 BLAKE2B 7ea78865af7de57fdfea3f861da655f9f191bd6048c57655da2fa90675a46263a5d4c085ed4c206b5cbe4595b86d79466765138f0167c141c4ce6580de637422 SHA512 2c85dabcca9400c5e2a3b409997403a6acb17357449df4ef9a7b27511c5a979bfcb1a4d80b7e7c36122233ee6d47e59507631dd6ac9e93d1610f54b9b160ee96
+DIST smallvec-1.7.0.crate 27459 BLAKE2B a740a4b7448a4c8d1bef59cfb6dc9a52145e40eeb38028c64c880f31800cd3a4cb8be17394742239dfa7fb692c749f9edf70e6df02abd7a1bff288eec38ba24e SHA512 d061e0059cd6bd1636424374848aa1d4edd21f75605844a7855ff5d343dbdb71e6eb14bd70de7947ae7ab58f04ff096a5e77aa9a1ac14cef59f657685c846156
+DIST socket2-0.3.19.crate 33782 BLAKE2B 1ab3c61a439c1594e19c4a14958d0a85b54666532d16eaa9a1e40e586b7707b1c7b5a751fb373f16bcc26510abc25e0321808e721c0b33b7b04416b9f6cbc5bb SHA512 113d902ca0b966bc0bcad71e3b7d715c79cd075d9dd7fc4140a042bac91b3ce692fb0f1fd0216fa3f6286920b4a92e1a4c342d7ae8d1d98ded36e7480ddafec9
+DIST socket2-0.4.2.crate 41721 BLAKE2B 453dd4071889bb0f27b8f99cc00230214a51c6855832401e85fefcc66cb6e4599d22fb64e50c805622d438271e80b7c90c349396721a49aca60c927fa9c2d4d8 SHA512 af4641d98737bbc4d14e82d91791af4705f9dbbec4d8b3a25e7e990a5c7ac25b48eea6c4a743b09db52a037c67a7b676147087688f4e29d6541dd1ad7ff9688b
DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
-DIST string_cache-0.8.1.crate 14423 BLAKE2B af0c9b9f52a246d5537ac2831be6aea462ce253b086baf6fb1773f760d566ba70917b686c2c732f60cff4c30068c5800b7c26f73763e9ef825b2fa619f6a7c00 SHA512 476aa99da2d83de7eabe68b3dc2d064cb549e2caa2b708459f883cc0a8f27bed1b1607abb1481959cc26046cfd4c44886bb87bbef5aba95a195a9d850311915b
+DIST spki-0.3.0.crate 7877 BLAKE2B 6425efeca07316ad3d6e428891640dfe096ca3e4762bfe260b969674197b525d61ce72f2937ebb7fe61f3f3cbc4cd48ecae1183ea8d0feebef20ce687b147c40 SHA512 21179f7e0fc9539c610bc468b899eeb7ab2ddec4294c8d2c366cb1baa0ef25f96dfd1e843c63112d5fb1793d7cf82300fa215b6d685c94dbf3462e9720dabfdf
+DIST state-0.5.2.crate 30371 BLAKE2B c6b859095f8b999aa44736c32cf034bfcf62af270f03370daffed70bd4be9a045029b53142d8b9359387a923ffad43b0a077a08c558e68c69444c0c3ec115575 SHA512 8d61d62a18a5c5d402d7b734eb788a02e796f4be147a16fc382a41b6d2fe9fff32a6bcf141d48b55c438891d3418de90e9a29f4113518a86d7ab07b705ca96b8
+DIST string_cache-0.8.2.crate 15770 BLAKE2B 36e2984684931fb15371dd0aeb30d93312153daf65f8b8c720c16327b169078763c0c7b70a00c9670a0c8c3b1099c9a98488c893f8e90eb03952cc0e694b6fe2 SHA512 d4ae1fbea4de469e342ba1a0d4c0f26386633dcc46c0cb9adbb7983e565476a57aedf1798e65f21ee5326f96880ee2bb4a5dc1621ff7e7d0ca23fb3536dc98aa
DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
-DIST subtle-2.3.0.crate 11096 BLAKE2B 02910abc8afab86a2a0931b7bc452ad1d0d0f1ddc99dac6595af3020fbfd2af6b1847afc631cf0f9766826a1e7ff0f5c8078300bf45b63512e21e37ec5739baf SHA512 80c61e908a94c449a77ba412531496c089da3a2a583017f05b55bfd1e8eaca215db2358222ca06696d0bbd7a79027dca8fb4031f63df314fad646ae10c6d55a7
-DIST syn-1.0.54.crate 228322 BLAKE2B bf4455927b913902fcf1804284660c0b7c9fbe3c50a9f854b8e44d3fc726825fcde85c563f3df4404406d51b517299eda19dbd085bde552dfe5d4f0d9a7510f4 SHA512 2cbed3fafcb3c628623273b83678238d0e66f899599e3364a6511c59c881ad4a3299b806462c06f19ddabfade096c1a7dedea95273461ea3f8ae347a2b3c1ecb
-DIST synstructure-0.12.4.crate 18105 BLAKE2B 8e7efdfa8681da8473903aa22e8cc55abcede012b29a91d65076042c89a21048b44b774ca5c3f788222dd32fa634ac20f58ce241eff610498cac19f659280d29 SHA512 ab3024644719c4afc9c06a4d3c499fd4934c104409d38197a46d62c9ce30414f88b3e7bcdd7f245cfd207489fb54ba41e5cfc1db94b0dd12fb01e9c00c861c47
-DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
-DIST term-0.5.2.crate 37638 BLAKE2B 58a496673b9033416f40e29a0a53c0b8d50e413d3922d3685252c96fd880659961b4ee48281ece5b9d6d97e895d81839cdf886fb0a6945af25b873a905b09700 SHA512 421b04f067f66ddecb615d715c828c98d3fa351b3490ec76bfa02bf430039717da5a168c20033399d5544ded5aed35c2aa4c9e6ea5018211bfe615389d18f3d6
+DIST structopt-0.3.25.crate 52296 BLAKE2B 07fb1f601ff0233c5ccc15fdc45ccc6bc06636c261c96c7554c516c4cfd1f38a9541cca67c670985bfe7984da04a0cfcbdf37a83479ce1aeea9b795c7d323889 SHA512 f07c505fbabfd880ee5f931e8a3ed8a1d01fc0a66a78c0cc04a2600d2f5cb2d699ac41719062c5c4d2cb06a64ce1433641837bb7d9fb755018ce95844216811d
+DIST structopt-derive-0.4.18.crate 20996 BLAKE2B 2ae17e0d365a7ce7a4d0e007513623ee0d5acf45afdc3844114e02975b855fd1a9f7df404a24044cf33a3a4cc4142eccc34d1e97925646d54d460a89baa28275 SHA512 68a7f9c2ed987993fdd8bb7e81c31969a1fdf5351c58cba9de61a2f5957aba1626be4b0742f31d4de502301675ba24b0d91dd3acb24f5607bdeec83070626a57
+DIST subplot-0.3.1.crate 122561 BLAKE2B 21309912f9476267cbb92a648341a95f9875f237a67fed69c6df221c1f05255794a617a825a21cca023ed5ca047b6746da6f0007170c1163f39ea7ad669cc261 SHA512 83c7c8743fb8140356d74fcff6126d8a746bef1e9202cc4f8fe9f7c56e72faf01b257e967e1dcc705e16a7146f5eb375d246a6b42aab77d1ddf1464830a7517b
+DIST subplot-build-0.1.0.crate 2077 BLAKE2B e174547d07bc4b9d84e7e0f94983869d9ef5112c62f3cdaae84ce39e91e5d5fffde237c10b764c8075033fe418db6296417d0747cb34f06973bd9f596b4e6046 SHA512 568e5e9abe1dcb851747e12b3f2f3e5ace7e358d8890370f577d2ee6dac0ca9cb4f06d4a9a94bb44a0430aa4f2132477ed10564accd0d123d481b68316d65266
+DIST subplotlib-0.1.1.crate 20323 BLAKE2B d2d9878cd436f582fbc2508d45b00d954c48b013187759ba730ccb9014336969c5e989b669189917dc38595ef624ffec5980ab3a8405adde63159726163fbbb7 SHA512 33e16cff56c63390dde5839f02f400db312211ac7304aa0d5d442372291c3076ec616b3dbb644ea4db0e3fc3e90f75a86cdaf728071cc9e768990fd01cb9d77b
+DIST subplotlib-derive-0.1.0.crate 4401 BLAKE2B 0caf642c76677535a9d22b30b61713b927e423473bd8b6726246ae4b7c07dea61edec7a775f5c5c34be9065e4f801887438e12f0eb6ee9f7023d08cfabdea710 SHA512 6f6fe8d03bc3bc2a6c10be0e5be60c63edab75750cbb15b9e9d75053a87e8418cc3b84fb8bd620bfa7b412090d938c16947d7fa81a2e4b44b876011a24562d80
+DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a
+DIST syn-1.0.81.crate 234144 BLAKE2B 7258c4a0ad0eb0c807912c297233eeb195d22b44cb2078e13e43eb90f1c82ecda6f7672ab072832ce130ccb953c1bb23c8440a3df77b714f462fe39cc6e6e1a3 SHA512 288ddaf4dc5ad2fdb3bc36800d94b53e2bfe9ac74a61a5d158bfcad3728955bebac6a900a5881c7d4abde4f3759515a1dd877e1421c226b85aff99a5ee649390
+DIST synstructure-0.12.6.crate 18429 BLAKE2B 7666cd83f82910e036e5b57600dec9a1c2e559453ccc2f1201e2ee4ba64f2ee62cfc1046ded5cae64dd183967b9d71cbfe4b60a88bcb93706eedd0c4ab69be4f SHA512 6ec5dd7ade904fb6d79c2be595886289846e064b8c4100f780d8adfcbb41e6ca67f4b1d682212f4673c2169f889a042049b31161ec3cebc3f399751124f01f9c
+DIST tap-1.0.1.crate 11316 BLAKE2B 60786fd5f12c2f06097330c26809fdcfce62716586d2e1985f8c01406d356ed0ab730a04dfe72ee3e1d6208a53c76c66883d45a76130750b41ba5b82aa721b83 SHA512 d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995
+DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
+DIST tempfile-fast-0.3.4.crate 8991 BLAKE2B 98fae1979a2be1aef1d9c6abafdffb6b90df92328af5c74d19ea4991539f8c3be7cd823e980c13e90f16300611d222c1d81b7eac4c55b7a3da3c38abe385cc36 SHA512 b0d44bbf78e9991784a9d20f3f3ea8d5e59e95d74d782889a3f38f732a0fb06920ec81295c8abdff7603675c55c43c3ff7d9f4bcc094f403ad83bfb96a9ceb1f
+DIST tera-1.13.0.crate 96667 BLAKE2B 0374dfc1de4b33e590eb9a4f3b4d6e95dc4573f439797dbf4d9f076b50b6178a58991184a58098626e589651ae6916d4e341b5383a09cb6f5b96a235cbc4caa6 SHA512 26ef7b4c8ffeae83a5bffdf646fb4b2d9fc647237d1907372cec1f9fa1361eb8d35af628a70a02645ed3f6ab7d199ac7577b338e05f9abbf90041193f12c9c86
+DIST term-0.7.0.crate 37082 BLAKE2B cb7947c696f71fc68bab3b25cc6cbde74b92380fdde5447399b06de99534b0cb2160963792824ac74a350444ce41a4fa16d6a9792a68d84578a15ab37ab76ca2 SHA512 9de6e836f1fd205b3b58645ec880eaabfc0fd8991e3980ef90bc6184b370a14676edb688a2a75bce412dd8ebd97345aef742afe5b964250e2b6f84e6b15b486a
DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
+DIST termtree-0.2.3.crate 6926 BLAKE2B 390aad5f90602785674fddf6dd5ffe5ddb37b5f2eea7cfd330e04e4b3f482c8ab3bca63fa595ee409a8bed3ffd27684bc6a1227ca679763f94cf5a75ad55ee93 SHA512 183a99ece5ba686e6fc9884c3dc702083a6f7918514a20e3af460195d8f171d9ec91fccb8e2a93319f844ca7164455c9490e4a6478ef096f44c1b57e532a7a76
DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thiserror-1.0.22.crate 16603 BLAKE2B 71ae07ccd907b1fe8a5d743e13b1384fb045d51760191419204fa1d1d2c1f4b47a6acf12291e817ab762bca21e8d623b28b3c33a3a120d2b0270d2bf72b43664 SHA512 0a21c41c2271e30721fc486c1387ee0ef1b7082e04904d3c13608d60a99fd67d3f60c20274486398fc2f6d50c41c9cfdcfe022940c2a77df380de06e3cd5ff85
-DIST thiserror-impl-1.0.22.crate 13289 BLAKE2B 6b90e705d6515d93cf43f584dd598ec96642cea5ad00ae8e01dc0db2d28aa82df45afaa9b56a0c56768debefc92e39a5c27be7bdc1b5cf9601cdbf9402ec4711 SHA512 b33dc2b4f135830a342f8f36abb72c06ac600f525c30b61485b2c34e5de8f2163a2796c3c53cbbe22a84b87cf6b0ccdced8d4d261e3c7e135ee251220df36c80
-DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
-DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
-DIST tinyvec-1.1.0.crate 39037 BLAKE2B 8033a336c2c346df70d5c6161233043a7e196a2994b62c15aa022b7053f7aee686092fc7e2db551cd1a09ee5e4a038e777120c5c33c891bb47b71c78cac60e92 SHA512 29830cec393506651b20d045c584e3df5ce5f13fdf70e866d4d6b7e97fe4f6b07ccf2a2c64ced5b092d5d963af74f826930d96d817db90bc0e4ad112a399926e
+DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
+DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
+DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
+DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
+DIST tiny-keccak-2.0.2.crate 20129 BLAKE2B 105a2d2af36cc053cd95721ea563108f33b8a3feb2ae84c75a04a65ed5d548dfe35d8b2e48977a82f725c0ebcf914f21157c547f4a74bb4d98c2e894385139be SHA512 c0219f23361eb07e0a68575c461a36b7286d9bdebae89080d9e259178d402b0c7762ccf33e65a16951ea168392322c44a24eb55189cf143e22d09d6dfc4acec1
+DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
+DIST tinyvec-1.5.0.crate 42745 BLAKE2B 24d6f60d08b53e067ef783db4f6e51a9edd9f73fa9e3511791c1c00a861c6676f18043127351ecfc49771a760eeb7db53b584ee882dee6bdaefe5e6ba5053cda SHA512 b4d1624965ed6b7e8ea45d80fd7332b5733d7b5e78f8167d13c9b9e8eaf3c586268c2f88ea0c51211808def997f8e751214e3de757b19076807adf7aca8aba82
DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
-DIST tokio-0.2.24.crate 413332 BLAKE2B fb6bd655864a1af82e74422457fa067a634c4cd74b7045851af735682fb336ccf5ebdf107d4de61d7da47f6c4ee0297250551eca429672b9eae917d2f140dfe7 SHA512 3d4a8175e44fbd28004a8c9c8e779e7ef147b0bb87e22950bfc4022eb840d0ae08159191d6487a64ecae1c4289238c8cd2839e9bc90c4b223ab1200bb8ba4a5e
-DIST tokio-macros-0.2.6.crate 6460 BLAKE2B 239493963b5fb28eb9ea7dd568576db4d38c7e6b8ead4d072862891ca5aa096a8ae61481f3cc256d1bba2a2ae9a62660a8a0ac3a1b0408cf33f4b204a252d095 SHA512 1e3f7f42dcece16d8785e500816768ecdef944b0297bea9ca215c15aadf1dc89030061cd4ac01fc9d3c32ee83c6471dccbf7e99ff8f2385853e831e08954a51f
-DIST tokio-tls-0.3.1.crate 22517 BLAKE2B 05be1ca4abb345fc859677bb1b4e49064324ef7858c5bff7301b4a5110e4a6339857f5d85037bbd66b433a3c2439eb3c15edc63648fe04df2da9bfe1c93b8e08 SHA512 46ac00d839415a8dc9d9709967414e3812606a23c2c1e0e9dc9aa6aff70b24afb44e4c5a231d0d857ea8d06d07c254c97a459713122006cf1afbc6d4f7b7b6dd
-DIST tokio-util-0.3.1.crate 27233 BLAKE2B 96e43dd3f6f6209a6436e6ef3a40739f44507312b02a83f0316c7500dd6a59b5a71af005a98818d9b1db0e33aed4a9330e4cf955855925c8a428132762985db2 SHA512 301a5d9a8a9537653e17d3360dc27d41c95aa28bcda3e0815923dca0ac735071b01b9fc8c1d53e826e0cd1e6e5f98cc233f1e9dea906ba06c6b5192608ae7ae8
-DIST tower-service-0.3.0.crate 5321 BLAKE2B 267a8276baf4dd10c168f6db5b206ab9433be45532bd7fc5389952b3492e104fbe5301857f20044d7ba0c1af9572178d51a6f3dd723a6034a25e0c3dfd48e9a8 SHA512 9b46928c2ac13c738e56a1c4e9fdb512f17aa8f4e95669ae4fb9a9f9a4b094114d7869b923186779f87b45b2915ecf778f95dba415b6d4b2e6c20c34efdc6a6b
-DIST tracing-0.1.22.crate 65320 BLAKE2B 88a955a431c5d732014d7229362393d6cdb9c270099d7a4d77860ec09c86b686abe74603b94efeefb485bf510c6997e3844de9f7622556c799446d883911cf03 SHA512 e85ac933dcec140051deb32abf222560adad621e77c4bfc9a139ed2dccb12127625fc36f92915d1db93d1d7d89132575fd4f64cd4e1e37df147d12f8484540eb
-DIST tracing-core-0.1.17.crate 47774 BLAKE2B 6c13692d90ed3f84110c15a1834b5ca527cd950dd9a141b06ac2632bee718b67e46615e26567f58e4c3129b4d38abcfff515c6420c906ed4f957bacdeaadada8 SHA512 202fa2bf6999d1568f4ac4d92a2d29b3ea79b5d93bb57347927eda60c8d5b430b366889d45a4d5d22d4e1c46e62ffcc39b3091a91f79a26fd6b7827fcd7c230d
-DIST tracing-futures-0.2.4.crate 10274 BLAKE2B b0af839a01d49c387240f5c9a976c8258b80b24c21b395e2e8479860596709c098d11ded6daef458c5c906b90d76ca25b714a4f694710d8a4a6f48041931b4c7 SHA512 861606307c4ce5db60537ef66def5a41b5d4c7fe6f37b7b8b3f94dcce1398dac8d1665edae91b551408758f82334be293c747be59026d640448d9b270881612a
+DIST tokio-1.14.0.crate 534070 BLAKE2B 5e15babc9a2ff9c74e71174bcaee4f34fc88038983a870aba7cb4beffa79eb5ac1a4bd54718971cf193bd85f2664c274395090105b4ae74f86e81c23aceee9fa SHA512 b9961d0be60b0ff6d5b11dc74b69ae8406e748201de74d3789d1c8b2c996d8db6359a7089123ef24c5b1a1e86f3e282b6e031a5b99a73b6ee9e8b24a6fa1c7fc
+DIST tokio-macros-1.6.0.crate 9225 BLAKE2B 0fd8eead025eb5789d57af750414ddcbc05597a5e06ab953611201db3b34ef4bbfe182c25463f63b9012e5c4916c4dd239679934c2f7cfd6114fa7780104c4c2 SHA512 f39958e210300341d1fcc2cc5f44f0a41d493727e9b50216d4cadc574cff46a7d29999a72dc1a39b29c85cb3044fcb941847198d1ac6557e7aaed10be829931a
+DIST tokio-native-tls-0.3.0.crate 20759 BLAKE2B 5073c5d93f5fa08170ffc76e21404b67100df5d944daa9cfe73420d4cb2409ca2617a0b1c25058a8b356b51fc4815972692aed7baa47ee3a11574a3109ce1691 SHA512 a8aa7586f15a3347ba9152497db84a098e751797c06df1a75d9b108689e14d6692b4efc6e5b49b5bf8f8fdb3bfc4f1157f56b3b0c9d9e753a8b31a61e65dfc4d
+DIST tokio-util-0.6.8.crate 74116 BLAKE2B f47f61a1566b721ef5294526f6b0fc08a5662eee2b12def6b699de38e6888e3cb61623a76a52a71843449a5657ce3829bd5fdf2826428e370b6d912320c5863c SHA512 b81ee8086a069de580bb2769145a77d12d3ae2c4d8a689d979c58988c64b221ffeeeb0f159181f92f402011931eda8549ff173b227433d6597492dc7f024b7bd
+DIST tower-service-0.3.1.crate 6299 BLAKE2B f56562faebe3a933f39f8e2093af65378bd307c59f9695408510ea9ca2230c68228c6726a0a2c7c42943002837dd9d86ce0a1d4b7849ba5c61df28df7632d909 SHA512 d23f9db2d6632f561970b55eaeaac22a20c8b9af18931cd564db193688eb2a2973127b440e175cfd7358f3d0ead53f7a759e34b7b86c293751079af9c2181ba7
+DIST tracing-0.1.29.crate 72444 BLAKE2B 637f52a1890ee8b2ce20eabb8491b100de680088792be87008107455e5404c9efdb2d2e97129fbed6ce29296a880ecfca370535ccefdea2fea49d9457ad6b683 SHA512 8b9c58aa6d236485cbd8e6c3b39a1cc05d30169dd9ddb377ba464ba72c774af69b0eecce1551660d26fa6735e5483f45463cfcd196513c0b4c351c900cf4c7d8
+DIST tracing-appender-0.1.2.crate 14062 BLAKE2B 6adfcd0fdcdf1c21c8cf239f65f2f859b3a5a6c0eaa80400d056f97da878d1f612461809f1392593fa42455f778e44b707359c1989882981704de0b591c15c33 SHA512 4b494c25c3d47dde482f872e31dcd53b41890930cd3abef9028cb8cc1d5f2a0972b3bf5c59a658b896c642e82ea302c0791b997f5106c1bced69b190f77d95a7
+DIST tracing-attributes-0.1.18.crate 22779 BLAKE2B 46fe07f2e2b8df2e510624981a8e882c27cdebac3e6b6cb282bbc5acc69fe8335461203f0ce4b87dd23c5412108aa3ab2ebb906ba40ce5f2bd2669a5a90c5d8b SHA512 69417ae19fb88742ce609724113945fcc3c28615c84780ee169f4149d3f479dec5fcd39c95aeb2b64a4a2678ec72f53a93cc02996ce2f46a0d3f1ef4754216d3
+DIST tracing-core-0.1.21.crate 50683 BLAKE2B dc48e0fd6586b8ac0059469a26049c6746b44a06a4e7768d129822bbd2f6ce719c63964ee3e4f9543ce278566efda8fd957c8b4be8b696ef12724f899b2830dc SHA512 2c3e00674c02023ee3e9a114878ad8941253a9489312082b2cf9a163b04fb8d23767f00892874645f59f30b6f620dfb83dab8680c64db5510208678b52f2db9c
+DIST tracing-log-0.1.2.crate 14915 BLAKE2B 72967c7262a8fb2b1b9c693ae19d84424a037e09b9f1b1b94852e39caa0a0ca30c846b2cfcf94b378c9ccd2aab67af2e4809e2e733d22f173cd57a3842a022fa SHA512 c4e146026ea7b27e79c630da9994dfafb90f9bdd581f51cbd5a5f985b0e60b2412937214e0365203148eb91f0a5ef3644e64757dadaa10287a097ad85989b620
+DIST tracing-serde-0.1.2.crate 6362 BLAKE2B 81eaa1f5fd51de57a2e2d7c78c1441513e1df1afd434ec6bcd955c933fecf165a690429d62fd919960250eb931989a0a9681d6b17253208cb7b297418c5e0680 SHA512 1f9c1690ab9f94588169454fa7d9e9e164aea5827073e4f5c29f1aba80cddfc11cf9e60b05dbb7951024c2fd0b0b46d278867f85d4df69d85631d39d63b5cf96
+DIST tracing-subscriber-0.2.25.crate 149469 BLAKE2B 4624243b66571b88ade80cdd7ea4a9ab1ddb44f62bd0c373b3d4b121103f4001ed6c0276fd25920dd308dbf3aa73b98f04fb5105224eafe14d721bc27ab24a81 SHA512 edefa55a94b4abc1641df4190ad4da121320d402f8c413d00697b05d35100133f8955ab672c32bd795fc0965ac5b5e6ce09cab5147e8c77c262b8f9340647712
DIST try-lock-0.2.3.crate 4158 BLAKE2B d8bb2fd8ba10285871ac3dee069474d4225e312c0a13b6bc238604c5207fe33437541abfdb507a6b400fc3359b78d39a7e9a5bebca426692b5dab4622b09c192 SHA512 ebae7ba9227e6fc20499b48ab85169943765342d4790bb4a31ac33a2be0af9401e2854c8e00b9d3b7e225d16875c90700b1c3fa99af07833d3b7a91b7a414fc3
-DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
-DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
-DIST unicode-normalization-0.1.16.crate 92805 BLAKE2B 556b0b95b6d21f95ad99181e999d2f2a1291951db14e95cdaa4596b159323e999a135380ca0f795c996f97ffaa0c25465bfe5884bebc8903130bfd7437d4b86a SHA512 c1f83a79b0fffd2f0e1b8a579ae4e5021c4cffd74c259d065919b937bdd78b9ef83650cfd777010e7008ceb51e072777b195dd2483e1a85798a98b72f8648ead
-DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
-DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
-DIST url-2.2.0.crate 42787 BLAKE2B 115380294b06c833fe183423b26f32b7a0cb3eb7bbb53380c41b32c031d6d34ed55f11153d5ed8f3e82effc13b9571f3b27d9889fe61cf63a68ea3767ef63cc8 SHA512 5474daa20242552fc76f8e21a28f8880c011627773fed74061fdf15afd5a33cc1b09baf6583112126a1b8287ad71a22055d2bbf78a73a0d82a115db1334d05ee
-DIST vcpkg-0.2.11.crate 12600 BLAKE2B 1c44c8df531a75f686c0497e70a72aa0c1b554c02ed256e6b08407b17066ed949f03bda42645d56e1227b50dc4c0e3865f10856605c2eadab3b74f55f005789b SHA512 d67bc244c81827165bf976808f79fd02f9149a19006898e60ff8ef11df2d72657c56bc9fc14c8f91b091075ceb23c3f96a3df81be345bb01881679eb47a0e6e9
+DIST twofish-0.5.0.crate 11649 BLAKE2B 1c000f9c218bb33e8730a84d5da66a75c27b87b51e5283ab9f46bb74acf4f8df4195617b755d08f748a7394d7e485cf29448846367c05c9d8b846f6d1148c7c8 SHA512 f281f2e77495a6ab2077d4595a3398d27784bac65d27152c336f8f08617305171ddc9d3d03599a7448e68d599341f9063308e25cf57312b3ac82b5b020385dd3
+DIST typenum-1.14.0.crate 40518 BLAKE2B ff6d77c28e41cddc1956619bca522f4ae5680cedf313d4a12a4d40f191f85ed10d673a32bdd811d7774a01a1b9b5adf9990269ae230737237249faad16ba7070 SHA512 e9739a24936563e9471213060d53d970f8cbbdd163892a22e98f1972d10861009ca1eb568c3bb5d1d78299482372fbe7e6bf42ec8f4f5f30df0a7446933a312c
+DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
+DIST uncased-0.9.6.crate 10413 BLAKE2B 67c9c7da6c706e6e51831453b5c8140568efd046588ec4d972bbf895c191da95ed8d7e5ebd65f6b1ce83544bcaed4dd4f631c002daf7495e2b47eb1a7e8df254 SHA512 8d0f29b60cf800afc92d08fc4d4b92f5ca80c6ad4f38c64c2cff88b959cdb7e59952eda1200c65eae1c379e3e3d55b946a8588c393e60938a776538492af9989
+DIST unescape-0.1.0.crate 2412 BLAKE2B d373b1deeb116af0cdf177086bdfb2228cb9a1cdf56845a4fa37d92c700e1b71cc959617687d163e0f5d062f73ca48e9121dce56bc278374340189ecb8f110da SHA512 8900083c068fa12f719ac6a08436b22945a35ddddc61bba85fe47015e449026191f543c3ab15e436925f0799f8611acacb1d016646a1b0742a77617886533eac
+DIST unic-char-property-0.9.0.crate 6809 BLAKE2B d2bb66259b66e59e831ad74d89528882336a7cf6dfac7a9f49308a70a3d61d5ab88f3ade9df2c086f27ff4a6eae0d2d2b8e63bd154ce3e700cc525769f34542a SHA512 ef969968c61eae6a7d68e6ccb0b40f6618a69bfc4714b51bf4ee8c5ec4532d10b9c6675a4cd5121c904a578ceec7c6471d1496fedbf121059f076ad1c5ccb70d
+DIST unic-char-range-0.9.0.crate 7020 BLAKE2B ab79b4298b999a9fbb769bf191f83e259b40b8d06cc5cb82abac48434162216a283fa82c1bc9af8b40656c2d06e5b6a919ff7888852eabb9001a92db12fa48d7 SHA512 bb0ede1695f4f016bdf9ec83bb49639527248c175c71d24993b8651ea6be0a411251ed8518893101dd5e96fd2913cf15ec27799c677ddb08b8e408da06ae0ceb
+DIST unic-common-0.9.0.crate 2558 BLAKE2B 4efd81198a61076ed45f6fff73561de21b5b7500277de206ed41cfb01ce8e5046a1e2c5f90ac75c03eb1897b7f54a14cf0a8f6d9cb39f624b3a9fac375468e58 SHA512 9212f99afd4c694a3a671963d63e5349f81adde6d5f50c92ec39d15e7ee24aa91eee63ba578a857c8b21380937860968a8e13cd16bb0ee0c0ccd96b3094ad155
+DIST unic-segment-0.9.0.crate 34848 BLAKE2B cf04b1d875ebc835758b17f8fa0937da8e47b5c3aa3d2389b9ee35160805b1a0696c3a654d68b60a515fd31dba0571b0a087e97f6815ebd075e1bfeefd0a623a SHA512 cc2a27459dca554a78ce24fee42f0e4d0fbac37c42b4c5a1275f9e3b412cd1c813a4b4864857ddc33b549d99f10c9ce9c277b00f9fa7d93f130f5e47106d8fb3
+DIST unic-ucd-segment-0.9.0.crate 39262 BLAKE2B 73a2f0bfeb17ee731c17e7eb4b7188a800fcd3745c5c6480916240d087df5a856e4f51556e1aaee1e6668b216377acdaf4879beee6b285da040f6871f0c04e6b SHA512 04aab71f97785453dce7f561acfb2382a23d60a68735f3664577015a256191463dd6b1f90694e4440c4889eb9b6380c16c7a0ec2dfc2d49fc44a284eeca43c09
+DIST unic-ucd-version-0.9.0.crate 2246 BLAKE2B c546ee182387db997e6cd699a25bc201fc943306d8e87f96edc1a3dc1cd5ab8ad96f34e8275721a5604765aa6fb6f81e3d8d9eae690d04e5ba71325a769b065b SHA512 153219ff18be02e23ff3dc90bba11fa8c7cda11b972e0d84500d9a0742fb7d84466f2cc63ee278a24098c39634e50742af3317cd942f4ea882ef5a2a8e003d7b
+DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
+DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf
+DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
+DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
+DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
+DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
+DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
+DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
-DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
-DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
+DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
+DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
+DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404
-DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
+DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
+DIST wasm-bindgen-0.2.78.crate 162111 BLAKE2B a3311e67900961b35a59ead7a8972dcee37671921c0f524895c821658a7b1246403d4674bee1735f1b2b94aa789d5376edd02afe4c8ebda110f4344ef58c9225 SHA512 bedeb2828d1e74b1e373bdf34dc2eaec70dd523e9ed96a341da1ab3729a7cf8470a828ddb9cfd4cf15af6e2fff75b4368553ab4f6f02c8dec9419dcdd7578de9
+DIST wasm-bindgen-backend-0.2.78.crate 25576 BLAKE2B 03dc6b255ab9e30f9eb54f81638eb02a05a0b994ddd51f47852bca376a02080fcce596453d688f5e8e7b5a814fd081b9709c1215f7e9f9fec0e4a7a6cba1000c SHA512 00a0ec9afb65c084b64cf9d25f778ab03bf2368a1e0ff213e07b8fe742a125ddae00c7b4d693225d6d798618b0441d4dea3c175cacdb37fdd75b0a46ba3a287b
+DIST wasm-bindgen-macro-0.2.78.crate 11700 BLAKE2B 9f1538d79a39555f643b9ac6bfe026c259dfd129c45fdcc33cfbeeba2acb2a26ff4c9df83a3d11674c5ef8e9393af7a4d0cd7e3bd08b7eca0fa55986c893c5e3 SHA512 3389922198b0d5c19163f4de345e0cd7a3c0609d48ff933bd5af0cfb205463632878b5d60bfeeb8dd8f8a98f28f23c5185dd6d8389f599f31176297c944b595d
+DIST wasm-bindgen-macro-support-0.2.78.crate 17858 BLAKE2B 8378f639a94797d2d149f2cd836f56143a498d3be5fc30eced6fe4fc2e1bfe14a70f3165cdc5cc1c88f0162efec75b64e56aa9819596984afa97003601b933ce SHA512 84d9867407a7caa942ab11f0ad1c343839bf51793930cdc3ebc5279ca370062eda006540448cc401f6afa078dbb1523b348ae69f4c6d7ccc9a7b8fa1ff895236
+DIST wasm-bindgen-shared-0.2.78.crate 7206 BLAKE2B ee60946d3a90a2760d8cb045657de659c6367aed2d98efd60074cb57f6b06aedf9ac44fed3d41c20299c5edc095cac5537a365fdb01183f3e60b6323da581935 SHA512 a808b7a7909e4a287ccced1b251ad4c1230399c84c05e246127b6a91fa4ed328d6a24316dbdc1843db71a5bd78cfd80113424f9984e0777323d74e3125607134
+DIST web-sys-0.3.55.crate 664827 BLAKE2B 1864f320e6c9b80c6b4b4fd8941d66cf9368a9b0cebcb86d3486b99f65456748b46c507a1bb761611c4825d412986f5bd8c8fc38c3bda3dad2e9de213467ee51 SHA512 ddf191f009d49388bf60ee31650eff1ff884f01822989a226c559b9560aebd90681fadd34e7437f555d627a0a3139ebe267375618eadac8c17ace5fd47650764
DIST win-crypto-ng-0.4.0.crate 44313 BLAKE2B 42d1058b73ac9899f5399ab7aec08276cc5d431b5634a16d69dde1ebbdb46af8b4199097efd51e2f22b3bb9710db2a6897a1573f93742b762575fc93f18ca2d0 SHA512 2e5428680678c78ca5867ad25204d6c16e823ecccdf0d4efd3df7f7cebb21f6ea633c1802d76402d44f977df47a7be2f9a9db222697cc27522c38302aa239d46
-DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
-DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
+DIST wyz-0.2.0.crate 12926 BLAKE2B dd4de5ec403e57d8362a15efea78e5217164dfd6b22c16458ffff8722e8cd3f28b567a2b9b1bc2774d6c8ba153d37e350929e98b38c82d022f7890052da30e37 SHA512 3a16c3e81d3595ddf1e7816e698eb4d07c7455dec579fd5e97b5d8b77e626cda52f3cdaee71e234e5e500a7ac58b9d1d5f12b17264686f3f225d5e5b0d315de7
+DIST x25519-dalek-1.1.1.crate 84499 BLAKE2B b4dd353f5876dd04ae404b75a6599434428e382931bb071aa518bd6b75d0b75f98f0d5ef8f677092b75348ecf2349cc5a2bc43f9a43f4b249cc117ee89c6b7c2 SHA512 e9b95168997c57d1493792eba8ad1d85e856313c65d0f51bcd545547d8780ea4840f490dc2a0bcf2b5a35b64a944bee06dbb72ea4a5871883f1c0079b03b496a
+DIST xxhash-rust-0.8.2.crate 16721 BLAKE2B 898102bd731013bc18557e5087aa03e8df362004d658705af7c931964e4f436862c8aff53e135e2777c3234f54df36f7b3227715d17e3bd80d17b9644292c916 SHA512 083afaad3e36e18b370eb7ca457289c9aa37c806f45615d65a83f7f6f74ca619181bae3d3bef315fd1625ee23706490606ea61dbe628714940bb53e3a4b85762
+DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
DIST zbase32-0.1.2.crate 8721 BLAKE2B d7f5881c8d3f06f5fd78669ae6943ffa5ebe35b5e34db2718825e88e5602fa03bbc33c11589021ad2e8754414b355b86a9391335e4df9361627aede9336b14d3 SHA512 50d703350a6404f0084b4d341ac1aef16f7a5f8924662c4d180ffaece00d295aec3f9925168d39c20837c7306ef88f98ffc5ef4c945d01c7fc6e5078c5dfb4bc
-DIST zeroize-1.2.0.crate 15450 BLAKE2B 1f3c2688cf84d8bc22f777cc06673c29c9306b2c246bec67404729dac01570dd550c4ebe1f9cbd04c3d6a2711bf7106c45a34d01bb0ab7b73d3a15a65bf66eb7 SHA512 9bc0242824908909669e473029990a582efb884ce8f37d153d3a92083f64afe7b3bb26821dff8f39af74ea7935024d9414d458cf61c2e6291ca3611e896ae390
-DIST zeroize_derive-1.0.1.crate 8047 BLAKE2B c43d99d7f80d104ec43708742d2c13080a3b96d0b8ffac099f86c82bce33d263313a42ebec42ed5dbeaeac397d1717e6cf089980dd7934b1efc7228b737a5f21 SHA512 cbb7fe8d9ecb38c0f6fd11e491afa289cc9d8719f2460f4569816d7d55ec17fc88aa9a167aafb83809e2122481e016039b055e3bc4edfdeaf009fc0d65212dc7
+DIST zeroize-1.3.0.crate 15913 BLAKE2B 571d96420e85e3d12100dcaff00d4721eae7296465cafce83db81293e801cd5a1f78b19986dc537fab208519a48e6a7df344d8e8a7053b094c1aa5bb90de083b SHA512 352a668a4c491cbd644368eb19f797709a41f3abf9a09028b6c1c4077710d48b74c3018e65112762a31403917f000340a0e57bc095a745e3f99300d6c25ca8bb
+DIST zeroize_derive-1.1.1.crate 8820 BLAKE2B 59f83251c44b9994ef1b629d5cc2229f37941d7578da651fda67e1ec502a15837a196ce81254b653211779a524cb50739ebb68abdc5196ab35182e356885f66e SHA512 03d3c6af77ac1a0c73eb8955f488dbb986bbc22bc1485ddb5fe8017cc50659be8708fd02c2c2c83d283c67c999390ab3c53daf7ef3f1c8ac693b17ca102a5df8
diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.25.0.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.25.0.ebuild
deleted file mode 100644
index 6b62fad8ffc..00000000000
--- a/app-crypt/sequoia-sq/sequoia-sq-0.25.0.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
- addr2line-0.14.0
- adler-0.2.3
- aead-0.3.2
- ahash-0.4.7
- aho-corasick-0.7.15
- ansi_term-0.11.0
- anyhow-1.0.35
- arrayref-0.3.6
- arrayvec-0.5.2
- ascii-canvas-2.0.0
- assert_cli-0.6.3
- atty-0.2.14
- autocfg-0.1.7
- autocfg-1.0.1
- backtrace-0.3.55
- base64-0.13.0
- bindgen-0.51.1
- bit-set-0.5.2
- bit-vec-0.6.3
- bitflags-1.2.1
- blake2b_simd-0.5.11
- block-buffer-0.7.3
- block-buffer-0.9.0
- block-padding-0.1.5
- byte-tools-0.3.1
- byteorder-1.3.4
- bytes-0.5.6
- bzip2-0.4.1
- bzip2-sys-0.1.9+1.0.8
- capnp-0.13.6
- capnp-futures-0.13.1
- capnp-rpc-0.13.1
- capnpc-0.13.1
- cc-1.0.66
- cexpr-0.3.6
- cfg-if-0.1.10
- cfg-if-1.0.0
- chrono-0.4.19
- cipher-0.2.5
- clang-sys-0.28.1
- clap-2.33.3
- cmac-0.5.1
- colored-1.9.3
- constant_time_eq-0.1.5
- core-foundation-0.9.1
- core-foundation-sys-0.8.2
- cpuid-bool-0.1.2
- crc32fast-1.2.1
- crossbeam-utils-0.8.1
- crypto-mac-0.10.0
- ctor-0.1.16
- ctr-0.6.0
- curve25519-dalek-3.0.0
- dbl-0.3.0
- diff-0.1.12
- difference-2.0.0
- digest-0.8.1
- digest-0.9.0
- dirs-1.0.5
- dirs-2.0.2
- dirs-sys-0.3.5
- doc-comment-0.3.3
- docopt-1.1.0
- dyn-clone-1.0.3
- eax-0.3.0
- ed25519-1.0.3
- ed25519-dalek-1.0.1
- either-1.6.1
- ena-0.14.0
- environment-0.1.1
- failure-0.1.8
- failure_derive-0.1.8
- fake-simd-0.1.2
- fallible-iterator-0.2.0
- fallible-streaming-iterator-0.1.9
- filetime-0.2.13
- fixedbitset-0.2.0
- flate2-1.0.19
- fnv-1.0.7
- foreign-types-0.3.2
- foreign-types-shared-0.1.1
- form_urlencoded-1.0.0
- fs2-0.4.3
- fuchsia-zircon-0.3.3
- fuchsia-zircon-sys-0.3.3
- futures-0.3.8
- futures-channel-0.3.8
- futures-core-0.3.8
- futures-executor-0.3.8
- futures-io-0.3.8
- futures-macro-0.3.8
- futures-sink-0.3.8
- futures-task-0.3.8
- futures-util-0.3.8
- generic-array-0.12.3
- generic-array-0.14.4
- getrandom-0.1.15
- gimli-0.23.0
- glob-0.3.0
- h2-0.2.7
- hashbrown-0.9.1
- hashlink-0.6.0
- hermit-abi-0.1.17
- http-0.2.1
- http-body-0.3.1
- httparse-1.3.4
- httpdate-0.3.2
- hyper-0.13.9
- hyper-tls-0.4.3
- idna-0.2.0
- indexmap-1.6.0
- iovec-0.1.4
- itertools-0.9.0
- itoa-0.4.6
- kernel32-sys-0.2.2
- lalrpop-0.19.1
- lalrpop-util-0.19.1
- lazy_static-1.4.0
- libc-0.2.81
- libloading-0.5.2
- libm-0.2.1
- libsqlite3-sys-0.20.1
- log-0.4.11
- matches-0.1.8
- memchr-2.3.4
- memsec-0.6.0
- miniz_oxide-0.4.3
- mio-0.6.23
- mio-named-pipes-0.1.7
- mio-uds-0.6.8
- miow-0.2.2
- miow-0.3.6
- native-tls-0.2.6
- net2-0.2.37
- nettle-7.0.0
- nettle-src-3.5.1-2
- nettle-sys-2.0.4
- new_debug_unreachable-1.0.4
- nom-4.2.3
- num-bigint-dig-0.6.1
- num-integer-0.1.44
- num-iter-0.1.42
- num-traits-0.2.14
- num_cpus-1.13.0
- object-0.22.0
- once_cell-1.5.2
- opaque-debug-0.2.3
- opaque-debug-0.3.0
- openssl-0.10.31
- openssl-probe-0.1.2
- openssl-sys-0.9.59
- peeking_take_while-0.1.2
- percent-encoding-2.1.0
- petgraph-0.5.1
- phf_shared-0.8.0
- pin-project-0.4.27
- pin-project-1.0.2
- pin-project-internal-0.4.27
- pin-project-internal-1.0.2
- pin-project-lite-0.1.11
- pin-project-lite-0.2.0
- pin-utils-0.1.0
- pkg-config-0.3.19
- ppv-lite86-0.2.10
- precomputed-hash-0.1.1
- proc-macro-hack-0.5.19
- proc-macro-nested-0.1.6
- proc-macro2-1.0.24
- quickcheck-0.9.2
- quote-1.0.7
- rand-0.7.3
- rand_chacha-0.2.2
- rand_core-0.5.1
- rand_hc-0.2.0
- redox_syscall-0.1.57
- redox_users-0.3.5
- regex-1.4.2
- regex-syntax-0.6.21
- remove_dir_all-0.5.3
- rpassword-5.0.0
- rusqlite-0.24.2
- rust-argon2-0.8.3
- rustc-demangle-0.1.18
- rustc-hash-1.1.0
- ryu-1.0.5
- schannel-0.1.19
- security-framework-2.0.0
- security-framework-sys-2.0.0
- serde-1.0.118
- serde_derive-1.0.118
- serde_json-1.0.60
- sha1collisiondetection-0.2.3
- sha2-0.8.2
- sha2-0.9.2
- shlex-0.1.1
- signal-hook-registry-1.2.2
- signature-1.2.2
- siphasher-0.3.3
- slab-0.4.2
- smallvec-1.6.1
- socket2-0.3.17
- spin-0.5.2
- string_cache-0.8.1
- strsim-0.8.0
- strsim-0.9.3
- subtle-2.3.0
- syn-1.0.54
- synstructure-0.12.4
- tempfile-3.1.0
- term-0.5.2
- term_size-0.3.2
- textwrap-0.11.0
- thiserror-1.0.22
- thiserror-impl-1.0.22
- thread_local-1.0.1
- time-0.1.44
- tinyvec-1.1.0
- tinyvec_macros-0.1.0
- tokio-0.2.24
- tokio-macros-0.2.6
- tokio-tls-0.3.1
- tokio-util-0.3.1
- tower-service-0.3.0
- tracing-0.1.22
- tracing-core-0.1.17
- tracing-futures-0.2.4
- try-lock-0.2.3
- typenum-1.12.0
- unicode-bidi-0.3.4
- unicode-normalization-0.1.16
- unicode-width-0.1.8
- unicode-xid-0.2.1
- url-2.2.0
- vcpkg-0.2.11
- vec_map-0.8.2
- version_check-0.1.5
- version_check-0.9.2
- want-0.3.0
- wasi-0.9.0+wasi-snapshot-preview1
- wasi-0.10.0+wasi-snapshot-preview1
- win-crypto-ng-0.4.0
- winapi-0.2.8
- winapi-0.3.9
- winapi-build-0.1.1
- winapi-i686-pc-windows-gnu-0.4.0
- winapi-x86_64-pc-windows-gnu-0.4.0
- ws2_32-sys-0.2.1
- zbase32-0.1.2
- zeroize-1.2.0
- zeroize_derive-1.0.1
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="CLI of the Sequoia OpenPGP implementation"
-HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia"
-
-SRC_URI="
- https://gitlab.com/sequoia-pgp/sequoia/-/archive/sq/v${PV}/${PN}-v${PV}.tar.bz2
- $(cargo_crate_uris)
-"
-
-LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 GPL-2 GPL-2+ GPL-3 GPL-3+ ISC LGPL-2+ LGPL-3 LGPL-3+ MIT MPL-2.0 Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-QA_FLAGS_IGNORED="usr/bin/sq"
-
-COMMON_DEPEND="
- dev-libs/gmp:=
- dev-libs/nettle:=
- dev-libs/openssl:=
-"
-
-DEPEND="
- sys-devel/clang
- ${COMMON_DEPEND}
-"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="
- virtual/pkgconfig
-"
-
-src_compile() {
- cd sq || die
- # Setting CARGO_TARGET_DIR is required to have the build system
- # create the bash and zsh completion files.
- CARGO_TARGET_DIR="${S}/target" cargo_src_compile
-}
-
-src_test() {
- cd sq || die
- cargo_src_test
-}
-
-src_install() {
- cargo_src_install --path sq
-
- doman sq/man-sq-net-autocrypt/*
-
- newbashcomp target/sq.bash sq
-
- insinto /usr/share/zsh/site-functions
- doins target/_sq
-
- insinto /usr/share/fish/vendor_completions.d
- doins target/sq.fish
-}
diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.26.0.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.26.0.ebuild
new file mode 100644
index 00000000000..c9ab4003ba0
--- /dev/null
+++ b/app-crypt/sequoia-sq/sequoia-sq-0.26.0.ebuild
@@ -0,0 +1,449 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Generate base ebuild via
+# cargo-ebuild ebuild --manifest-path sq/Cargo.toml --package-name sequoia-sq
+# and then extract contents of CRATES variable.
+
+EAPI=8
+
+CRATES="
+ addr2line-0.16.0
+ adler-1.0.2
+ aead-0.3.2
+ aes-0.6.0
+ aes-soft-0.6.4
+ aesni-0.10.0
+ aho-corasick-0.7.18
+ ansi_term-0.11.0
+ ansi_term-0.12.1
+ anyhow-1.0.44
+ ascii-canvas-3.0.0
+ assert_cmd-2.0.4
+ atty-0.2.14
+ autocfg-0.1.7
+ autocfg-1.0.1
+ backtrace-0.3.62
+ base64-0.13.0
+ bindgen-0.57.0
+ bit-set-0.5.2
+ bit-vec-0.6.3
+ bitflags-1.3.2
+ bitvec-0.20.4
+ block-buffer-0.7.3
+ block-buffer-0.9.0
+ block-modes-0.7.0
+ block-padding-0.1.5
+ block-padding-0.2.1
+ blowfish-0.7.0
+ bstr-0.2.17
+ bumpalo-3.8.0
+ byte-tools-0.3.1
+ byteorder-1.4.3
+ bytes-1.1.0
+ bzip2-0.4.3
+ bzip2-sys-0.1.11+1.0.8
+ capnp-0.13.6
+ capnp-futures-0.13.2
+ capnp-rpc-0.13.1
+ cast-0.2.7
+ cast5-0.9.0
+ cc-1.0.71
+ cexpr-0.4.0
+ cfg-if-0.1.10
+ cfg-if-1.0.0
+ chrono-0.4.19
+ chrono-tz-0.6.0
+ chrono-tz-build-0.0.2
+ cipher-0.2.5
+ clang-sys-1.2.2
+ clap-2.33.3
+ cmac-0.5.1
+ const-oid-0.5.2
+ core-foundation-0.9.2
+ core-foundation-sys-0.8.3
+ cpufeatures-0.2.1
+ crc32fast-1.2.1
+ criterion-0.3.5
+ criterion-plot-0.4.4
+ crossbeam-channel-0.5.1
+ crossbeam-deque-0.8.1
+ crossbeam-epoch-0.9.5
+ crossbeam-utils-0.8.5
+ crunchy-0.2.2
+ crypto-mac-0.10.1
+ crypto-mac-0.11.1
+ csv-1.1.6
+ csv-core-0.1.10
+ ctor-0.1.21
+ ctr-0.6.0
+ curve25519-dalek-3.2.0
+ dbl-0.3.1
+ der-0.3.5
+ des-0.6.0
+ deunicode-0.4.3
+ diff-0.1.12
+ difflib-0.4.0
+ digest-0.8.1
+ digest-0.9.0
+ dirs-2.0.2
+ dirs-next-2.0.0
+ dirs-sys-0.3.6
+ dirs-sys-next-0.1.2
+ doc-comment-0.3.3
+ dtoa-0.4.8
+ dyn-clone-1.0.4
+ eax-0.3.0
+ ecdsa-0.11.1
+ ed25519-1.2.0
+ ed25519-dalek-1.0.1
+ either-1.6.1
+ elliptic-curve-0.9.12
+ ena-0.14.0
+ fake-simd-0.1.2
+ fehler-1.0.0
+ fehler-macros-1.0.0
+ ff-0.9.0
+ file_diff-1.0.0
+ filetime-0.2.15
+ fixedbitset-0.2.0
+ flate2-1.0.22
+ float-cmp-0.9.0
+ fnv-1.0.7
+ foreign-types-0.3.2
+ foreign-types-shared-0.1.1
+ form_urlencoded-1.0.1
+ fs2-0.4.3
+ funty-1.1.0
+ futures-0.3.17
+ futures-channel-0.3.17
+ futures-core-0.3.17
+ futures-executor-0.3.17
+ futures-io-0.3.17
+ futures-macro-0.3.17
+ futures-sink-0.3.17
+ futures-task-0.3.17
+ futures-util-0.3.17
+ generator-0.7.0
+ generic-array-0.12.4
+ generic-array-0.14.4
+ getopts-0.2.21
+ getrandom-0.1.16
+ getrandom-0.2.3
+ gimli-0.25.0
+ git-testament-0.2.0
+ git-testament-derive-0.1.12
+ glob-0.3.0
+ globset-0.4.8
+ globwalk-0.8.1
+ group-0.9.0
+ h2-0.3.7
+ half-1.8.2
+ hashbrown-0.11.2
+ heck-0.3.3
+ hermit-abi-0.1.19
+ hmac-0.11.0
+ http-0.2.5
+ http-body-0.4.4
+ httparse-1.5.1
+ httpdate-1.0.1
+ humansize-1.1.1
+ hyper-0.14.14
+ hyper-tls-0.5.0
+ idea-0.3.0
+ idna-0.2.3
+ ignore-0.4.18
+ indexmap-1.7.0
+ instant-0.1.12
+ itertools-0.8.2
+ itertools-0.9.0
+ itertools-0.10.1
+ itoa-0.4.8
+ js-sys-0.3.55
+ lalrpop-0.19.6
+ lalrpop-util-0.19.6
+ lazy_static-1.4.0
+ lazycell-1.3.0
+ libc-0.2.105
+ libloading-0.7.1
+ libm-0.2.1
+ linked-hash-map-0.5.4
+ lock_api-0.4.5
+ log-0.4.14
+ loom-0.5.2
+ maplit-1.0.2
+ matchers-0.0.1
+ matches-0.1.9
+ md-5-0.9.1
+ memchr-2.4.1
+ memoffset-0.6.4
+ memsec-0.6.0
+ miniz_oxide-0.4.4
+ mio-0.7.14
+ miow-0.3.7
+ native-tls-0.2.8
+ nettle-7.0.2
+ nettle-sys-2.0.8
+ new_debug_unreachable-1.0.4
+ no-std-compat-0.4.1
+ nom-5.1.2
+ normalize-line-endings-0.3.0
+ ntapi-0.3.6
+ num-bigint-0.2.6
+ num-bigint-dig-0.6.1
+ num-integer-0.1.44
+ num-iter-0.1.42
+ num-traits-0.2.14
+ num_cpus-1.13.0
+ object-0.27.1
+ once_cell-1.8.0
+ oorandom-11.1.3
+ opaque-debug-0.2.3
+ opaque-debug-0.3.0
+ openssl-0.10.36
+ openssl-probe-0.1.4
+ openssl-sys-0.9.67
+ p256-0.8.1
+ pandoc-0.8.6
+ pandoc_ast-0.7.3
+ parking_lot-0.11.2
+ parking_lot_core-0.8.5
+ parse-zoneinfo-0.3.0
+ peeking_take_while-0.1.2
+ pem-0.8.3
+ percent-encoding-2.1.0
+ pest-2.1.3
+ pest_derive-2.1.0
+ pest_generator-2.1.3
+ pest_meta-2.1.3
+ petgraph-0.5.1
+ phf-0.10.0
+ phf_codegen-0.10.0
+ phf_generator-0.10.0
+ phf_shared-0.8.0
+ phf_shared-0.10.0
+ pico-args-0.4.2
+ pikchr-0.1.1
+ pin-project-lite-0.2.7
+ pin-utils-0.1.0
+ pkcs8-0.6.1
+ pkg-config-0.3.22
+ plotters-0.3.1
+ plotters-backend-0.3.2
+ plotters-svg-0.3.1
+ ppv-lite86-0.2.15
+ precomputed-hash-0.1.1
+ predicates-2.1.1
+ predicates-core-1.0.2
+ predicates-tree-1.0.4
+ proc-macro-error-1.0.4
+ proc-macro-error-attr-1.0.4
+ proc-macro-hack-0.5.19
+ proc-macro-nested-0.1.7
+ proc-macro2-1.0.32
+ pulldown-cmark-0.8.0
+ quickcheck-1.0.3
+ quickcheck_macros-1.0.0
+ quote-1.0.10
+ radium-0.6.2
+ rand-0.7.3
+ rand-0.8.4
+ rand_chacha-0.2.2
+ rand_chacha-0.3.1
+ rand_core-0.5.1
+ rand_core-0.6.3
+ rand_hc-0.2.0
+ rand_hc-0.3.1
+ rayon-1.5.1
+ rayon-core-1.9.1
+ redox_syscall-0.2.10
+ redox_users-0.4.0
+ regex-1.5.4
+ regex-automata-0.1.10
+ regex-syntax-0.6.25
+ remove_dir_all-0.5.3
+ remove_dir_all-0.7.0
+ ripemd160-0.9.1
+ roadmap-0.2.0
+ rpassword-5.0.1
+ rsa-0.3.0
+ rustc-demangle-0.1.21
+ rustc-hash-1.1.0
+ rustc_version-0.4.0
+ rustversion-1.0.5
+ ryu-1.0.5
+ same-file-1.0.6
+ schannel-0.1.19
+ scoped-tls-1.0.0
+ scopeguard-1.1.0
+ security-framework-2.4.2
+ security-framework-sys-2.4.2
+ semver-1.0.4
+ serde-1.0.130
+ serde-aux-2.3.0
+ serde_cbor-0.11.2
+ serde_derive-1.0.130
+ serde_json-1.0.68
+ serde_yaml-0.8.21
+ sha-1-0.8.2
+ sha-1-0.9.8
+ sha1collisiondetection-0.2.4
+ sha2-0.9.8
+ sharded-slab-0.1.4
+ shell-words-1.0.0
+ shlex-0.1.1
+ signature-1.3.2
+ simple_asn1-0.4.1
+ siphasher-0.3.7
+ slab-0.4.5
+ slug-0.1.4
+ smallvec-1.7.0
+ socket2-0.3.19
+ socket2-0.4.2
+ spin-0.5.2
+ spki-0.3.0
+ state-0.5.2
+ string_cache-0.8.2
+ strsim-0.8.0
+ structopt-0.3.25
+ structopt-derive-0.4.18
+ subplot-0.3.1
+ subplot-build-0.1.0
+ subplotlib-0.1.1
+ subplotlib-derive-0.1.0
+ subtle-2.4.1
+ syn-1.0.81
+ synstructure-0.12.6
+ tap-1.0.1
+ tempfile-3.2.0
+ tempfile-fast-0.3.4
+ tera-1.13.0
+ term-0.7.0
+ term_size-0.3.2
+ termtree-0.2.3
+ textwrap-0.11.0
+ thiserror-1.0.30
+ thiserror-impl-1.0.30
+ thread_local-1.1.3
+ time-0.1.43
+ tiny-keccak-2.0.2
+ tinytemplate-1.2.1
+ tinyvec-1.5.0
+ tinyvec_macros-0.1.0
+ tokio-1.14.0
+ tokio-macros-1.6.0
+ tokio-native-tls-0.3.0
+ tokio-util-0.6.8
+ tower-service-0.3.1
+ tracing-0.1.29
+ tracing-appender-0.1.2
+ tracing-attributes-0.1.18
+ tracing-core-0.1.21
+ tracing-log-0.1.2
+ tracing-serde-0.1.2
+ tracing-subscriber-0.2.25
+ try-lock-0.2.3
+ twofish-0.5.0
+ typenum-1.14.0
+ ucd-trie-0.1.3
+ uncased-0.9.6
+ unescape-0.1.0
+ unic-char-property-0.9.0
+ unic-char-range-0.9.0
+ unic-common-0.9.0
+ unic-segment-0.9.0
+ unic-ucd-segment-0.9.0
+ unic-ucd-version-0.9.0
+ unicase-2.6.0
+ unicode-bidi-0.3.7
+ unicode-normalization-0.1.19
+ unicode-segmentation-1.8.0
+ unicode-width-0.1.9
+ unicode-xid-0.2.2
+ url-2.2.2
+ vcpkg-0.2.15
+ vec_map-0.8.2
+ version_check-0.9.3
+ wait-timeout-0.2.0
+ walkdir-2.3.2
+ want-0.3.0
+ wasi-0.9.0+wasi-snapshot-preview1
+ wasi-0.10.2+wasi-snapshot-preview1
+ wasm-bindgen-0.2.78
+ wasm-bindgen-backend-0.2.78
+ wasm-bindgen-macro-0.2.78
+ wasm-bindgen-macro-support-0.2.78
+ wasm-bindgen-shared-0.2.78
+ web-sys-0.3.55
+ win-crypto-ng-0.4.0
+ winapi-0.3.9
+ winapi-i686-pc-windows-gnu-0.4.0
+ winapi-util-0.1.5
+ winapi-x86_64-pc-windows-gnu-0.4.0
+ wyz-0.2.0
+ x25519-dalek-1.1.1
+ xxhash-rust-0.8.2
+ yaml-rust-0.4.5
+ zbase32-0.1.2
+ zeroize-1.3.0
+ zeroize_derive-1.1.1
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="CLI of the Sequoia OpenPGP implementation"
+HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia"
+
+SRC_URI="
+ https://gitlab.com/sequoia-pgp/sequoia/-/archive/sq/v${PV}/${PN}-v${PV}.tar.bz2
+ $(cargo_crate_uris)
+"
+
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 GPL-2 GPL-2+ GPL-3 GPL-3+ ISC LGPL-2+ LGPL-3 LGPL-3+ MIT MPL-2.0 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+QA_FLAGS_IGNORED="usr/bin/sq"
+
+COMMON_DEPEND="
+ dev-libs/gmp:=
+ dev-libs/nettle:=
+ dev-libs/openssl:=
+"
+
+DEPEND="
+ sys-devel/clang
+ ${COMMON_DEPEND}
+"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+src_compile() {
+ cd sq || die
+ # Setting CARGO_TARGET_DIR is required to have the build system
+ # create the bash and zsh completion files.
+ CARGO_TARGET_DIR="${S}/target" cargo_src_compile
+}
+
+src_test() {
+ cd sq || die
+ cargo_src_test
+}
+
+src_install() {
+ cargo_src_install --path sq
+
+ doman sq/man-sq-net-autocrypt/*
+
+ newbashcomp target/sq.bash sq
+
+ insinto /usr/share/zsh/site-functions
+ doins target/_sq
+
+ insinto /usr/share/fish/vendor_completions.d
+ doins target/sq.fish
+}
diff --git a/app-crypt/sequoia-sqv/sequoia-sqv-1.1.0.ebuild b/app-crypt/sequoia-sqv/sequoia-sqv-1.1.0.ebuild
index f5575397933..6d67fc76f14 100644
--- a/app-crypt/sequoia-sqv/sequoia-sqv-1.1.0.ebuild
+++ b/app-crypt/sequoia-sqv/sequoia-sqv-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -166,7 +166,7 @@ SRC_URI="
LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 GPL-2 GPL-2+ GPL-3 ISC LGPL-3 LGPL-3+ MIT MPL-2.0 ZLIB"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
QA_FLAGS_IGNORED="usr/bin/sqv"
diff --git a/app-crypt/signify/signify-30-r2.ebuild b/app-crypt/signify/signify-30-r2.ebuild
index 6ca05ee0441..242864f5557 100644
--- a/app-crypt/signify/signify-30-r2.ebuild
+++ b/app-crypt/signify/signify-30-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="BSD-1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
RDEPEND="!net-mail/signify
>=dev-libs/libbsd-0.7"
diff --git a/app-crypt/signing-party/Manifest b/app-crypt/signing-party/Manifest
index a4ae2d2c546..683cb862c0d 100644
--- a/app-crypt/signing-party/Manifest
+++ b/app-crypt/signing-party/Manifest
@@ -1,2 +1 @@
-DIST signing-party_2.10.orig.tar.gz 222778 BLAKE2B b2225ba3038037a8f841e5f2ee8c5f08f3fe294e617c42396269aadf348965a17151bb31b11a76b2d84806e060cb0eb1093963f72e17bb5549ac6fbec0e332fb SHA512 82e51b91c282a72e9d16d920b87560c66aeafc0219e91615ea47d2f1a5df903fb459201f34368e6fa7ea1e2d2ca46a73096f30a068c8c35322af2f3ea256b269
DIST signing-party_2.11.orig.tar.gz 224706 BLAKE2B 6ef03d9e7e5652b7da77facc3206d25de63958a56ef64c0393b9964e1653c099dc022be5c80a02041418aee9dcb74e4fc0c448198b1deade79e59372cb8308c0 SHA512 9a34bde415bf779859b48eaab12e5c6a1a3f08d0292cd5cd691518e398fe40a73b878926d3ea1ef12ccca40179933478d03ec16ec4d9200fb726aaade541505d
diff --git a/app-crypt/signing-party/signing-party-2.10-r1.ebuild b/app-crypt/signing-party/signing-party-2.10-r1.ebuild
deleted file mode 100644
index 8cd2f3ebb11..00000000000
--- a/app-crypt/signing-party/signing-party-2.10-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs autotools
-
-DESCRIPTION="A collection of several tools related to OpenPGP"
-HOMEPAGE="https://salsa.debian.org/signing-party-team/signing-party"
-SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="dev-lang/perl
- app-crypt/libmd"
-RDEPEND="${DEPEND}
- >=app-crypt/gnupg-1.3.92
- dev-perl/GnuPG-Interface
- dev-perl/Text-Template
- dev-perl/MIME-tools
- net-mail/qprint
- >=dev-perl/MailTools-1.62
- dev-perl/Net-IDN-Encode
- virtual/mailx
- virtual/mta
- || (
- dev-perl/libintl-perl
- dev-perl/Text-Iconv
- app-text/recode
- )"
-
-src_prepare() {
- default
-
- # app-crypt/keylookup
- rm -r keylookup || die
- sed -i -e 's#keylookup/keylookup##' Makefile || die
-
- # media-gfx/springgraph
- rm -r springgraph || die
-
- find . -name Makefile | xargs sed -i -e 's/CFLAGS:=/CFLAGS=/' -e 's/CPPFLAGS:=/CPPFLAGS=/' -e 's/LDFLAGS:=/LDFLAGS=/'
-
- sed -i -e 's/autoreconf/true/g' keyanalyze/Makefile || die
- pushd keyanalyze/pgpring || die
- eautoreconf
- popd || die
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- CPPFLAGS="${CPPFLAGS}" \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- STRIP=true
-}
-
-src_install() {
- einstalldocs
-
- # Check Makefile when a new tool is introduced to this package.
- # caff
- dobin caff/caff caff/pgp-clean caff/pgp-fixkey
- docinto caff
- dodoc caff/{README*,THANKS,TODO,caffrc.sample}
- # gpgdir
- dobin gpgdir/gpgdir
- docinto gpgdir
- dodoc gpgdir/{VERSION,LICENSE,README,INSTALL,CREDITS,ChangeLog*}
- # gpg-key2ps
- dobin gpg-key2ps/gpg-key2ps
- docinto gpg-key2ps
- dodoc gpg-key2ps/README
- # gpglist
- dobin gpglist/gpglist
- # gpg-mailkeys
- dobin gpg-mailkeys/gpg-mailkeys
- docinto gpg-mailkeys
- dodoc gpg-mailkeys/{example.gpg-mailkeysrc,README}
- # gpgparticipants
- dobin gpgparticipants/gpgparticipants
- # gpgwrap
- dobin gpgwrap/bin/gpgwrap
- docinto gpgwrap
- dodoc gpgwrap/{LICENSE,NEWS,README}
- doman gpgwrap/doc/gpgwrap.1
- # gpgsigs
- dobin gpgsigs/gpgsigs
- insinto /usr/share/signing-party
- # keyanalyze
- # TODO: some of the scripts are intended for webpages, and not really
- # packaging, so they are NOT installed yet.
- newbin keyanalyze/pgpring/pgpring pgpring-keyanalyze
- dobin keyanalyze/{keyanalyze,process_keys}
- docinto keyanalyze
- dodoc keyanalyze/{README,Changelog}
- # See app-crypt/keylookup instead
- #dobin keylookup/keylookup
- #docinto keylookup
- #dodoc keylookup/NEWS
- # sig2dot
- dobin sig2dot/sig2dot
- dodoc sig2dot/README.sig2dot
- # gog-key2latex
- dobin gpg-key2latex/gpg-key2latex
- # See media-gfx/springgraph instead
- #dobin springgraph/springgraph
- #dodoc springgraph/README.springgraph
- # all other manpages, and the root doc
- doman */*.1
- dodoc README
-}
diff --git a/app-crypt/signing-party/signing-party-2.11.ebuild b/app-crypt/signing-party/signing-party-2.11.ebuild
index 9b85ae41781..b152b15cee9 100644
--- a/app-crypt/signing-party/signing-party-2.11.ebuild
+++ b/app-crypt/signing-party/signing-party-2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
DEPEND="dev-lang/perl
app-crypt/libmd"
diff --git a/app-crypt/ssss/ssss-0.5.7.ebuild b/app-crypt/ssss/ssss-0.5.7-r1.ebuild
index 53234e2029f..ce73f892435 100644
--- a/app-crypt/ssss/ssss-0.5.7.ebuild
+++ b/app-crypt/ssss/ssss-0.5.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit toolchain-funcs
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index d968d227148..ce286fe6d27 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -1,2 +1 @@
-DIST swtpm-0.6.1.tar.gz 326488 BLAKE2B 46c53cbd4195cfc1d45ef5e56b1f78c59dcb9f859349e161f07d9933ce720ec3511343cf29236119d08162410355fc50cb5d15745c84db78d860b006812c169f SHA512 a44e36820ad61e84d62b330f3adf0c463c98438056d74c5ba30916d956e722633e0198ae87be8352a0ab909ae5a4bbc3826410d2166186c43bba067f533fec85
-DIST swtpm-0.7.0.tar.gz 353641 BLAKE2B a9169affdfd09cec887667e21d4db72b7d4b489bf3ecf5e43da9ae2d59ef3f15b94627ce22ed1f6fca69f46da40293ba1ef3d129fab7de3ca32c4b12ffc51544 SHA512 32096309bf710e51d7565f013db32627423682fb2bfa9358976126102a0bf07401146bae9346af389c932c038f3d03217739375cef01a2ff10b01c7bd004b55e
+DIST swtpm-0.7.3.tar.gz 354088 BLAKE2B 687e3161cbc08be68427648187ba2fb05749bcaaf9929b951eea4884bd4210c6105a2494f5e7d51915e5be1b700b13889cd83c96d22e00d621ea9336221ee67b SHA512 7f4cdf7ca2539f28e3a78e2a081b24983f3305905c7cafcac0957b14f5c06c8ee9485a0adaf3710561091f9ee85e00822fe1ff874389808218c1e17f938c45d9
diff --git a/app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch b/app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch
deleted file mode 100644
index 3880385256e..00000000000
--- a/app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index d035653..0728a2e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -325,21 +325,11 @@ fi
- AM_CONDITIONAL([WITH_GNUTLS], [test "x$with_gnutls" = "xyes"])
- AC_SUBST([GNUTLS_LIBS])
-
--AC_PATH_PROG([EXPECT], expect)
--if test "x$EXPECT" = "x"; then
-- AC_MSG_ERROR([expect is required: expect package])
--fi
--
- AC_PATH_PROG([GAWK], gawk)
- if test "x$GAWK" = "x"; then
- AC_MSG_ERROR([gawk is required: gawk package])
- fi
-
--AC_PATH_PROG([SOCAT], socat)
--if test "x$SOCAT" = "x"; then
-- AC_MSG_ERROR([socat is required: socat package])
--fi
--
- AC_PATH_PROG([BASE64], base64)
- if test "x$BASE64" = "x"; then
- AC_MSG_ERROR([base64 is required: base64 package])
diff --git a/app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch b/app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch
new file mode 100644
index 00000000000..b17e1c2470f
--- /dev/null
+++ b/app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch
@@ -0,0 +1,42 @@
+configure.ac: Conditionalize test dependencies
+
+Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
+--- a/configure.ac
++++ b/configure.ac
+@@ -369,20 +369,25 @@ else
+ fi
+ AC_SUBST([DEFAULT_PCR_BANKS])
+
+-AC_PATH_PROG([EXPECT], expect)
+-if test "x$EXPECT" = "x"; then
+- AC_MSG_ERROR([expect is required: expect package])
+-fi
++AC_ARG_ENABLE([test],
++ [AS_HELP_STRING([--enable-test],
++ [enable tests (default is yes)])],
++ [enable_test=$enableval],
++ [enable_test=yes])
++
++AS_IF([test "x$enable_test" != xno],
++ [AC_PATH_PROG([EXPECT], expect)
++ AS_IF([test "x$EXPECT" = "x"],
++ AC_MSG_ERROR([expect is required: expect package]))
++ AC_PATH_PROG([SOCAT], socat)
++ AS_IF([test "x$SOCAT" = "x"],
++ AC_MSG_ERROR([socat is required: socat package]))])
+
+ AC_PATH_PROG([GAWK], gawk)
+ if test "x$GAWK" = "x"; then
+ AC_MSG_ERROR([gawk is required: gawk package])
+ fi
+
+-AC_PATH_PROG([SOCAT], socat)
+-if test "x$SOCAT" = "x"; then
+- AC_MSG_ERROR([socat is required: socat package])
+-fi
+
+ AC_PATH_PROG([BASE64], base64)
+ if test "x$BASE64" = "x"; then
+--
+2.34.1
+
diff --git a/app-crypt/swtpm/swtpm-0.6.1.ebuild b/app-crypt/swtpm/swtpm-0.6.1.ebuild
deleted file mode 100644
index edfcad7512f..00000000000
--- a/app-crypt/swtpm/swtpm-0.6.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Libtpms-based TPM emulator"
-HOMEPAGE="https://github.com/stefanberger/swtpm"
-SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="fuse +gnutls seccomp test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="fuse? (
- dev-libs/glib:2
- sys-fs/fuse:0
- )
- gnutls? (
- dev-libs/libtasn1:=
- >=net-libs/gnutls-3.1.0:=[tools,pkcs11]
- )
- seccomp? ( sys-libs/libseccomp )
- acct-group/tss
- acct-user/tss
- dev-libs/openssl:0=
- dev-libs/json-glib
- dev-libs/libtpms
- ${PYTHON_DEPS}"
-
-DEPEND="${RDEPEND}
- test? (
- net-misc/socat
- dev-tcltk/expect
- )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
- "${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
-)
-
-src_prepare() {
- use test || eapply "${FILESDIR}/${PN}-0.5.0-disable-test-dependencies.patch"
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-openssl \
- --without-selinux \
- $(use_with fuse cuse) \
- $(use_with gnutls) \
- $(use_with seccomp)
-}
-
-src_install() {
- default
- fowners -R tss:root /var/lib/swtpm-localca
- fperms 750 /var/lib/swtpm-localca
- keepdir /var/lib/swtpm-localca
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/swtpm/swtpm-0.7.0.ebuild b/app-crypt/swtpm/swtpm-0.7.3.ebuild
index f4adc4ae102..cc9d50f697b 100644
--- a/app-crypt/swtpm/swtpm-0.7.0.ebuild
+++ b/app-crypt/swtpm/swtpm-0.7.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8,9,10} )
-inherit autotools python-single-r1
+inherit autotools python-any-r1
DESCRIPTION="Libtpms-based TPM emulator"
HOMEPAGE="https://github.com/stefanberger/swtpm"
@@ -13,12 +13,10 @@ SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
IUSE="fuse +gnutls seccomp test"
RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
RDEPEND="fuse? (
dev-libs/glib:2
sys-fs/fuse:0
@@ -32,8 +30,7 @@ RDEPEND="fuse? (
acct-user/tss
dev-libs/openssl:0=
dev-libs/json-glib
- dev-libs/libtpms
- ${PYTHON_DEPS}"
+ dev-libs/libtpms"
DEPEND="${RDEPEND}
test? (
@@ -41,13 +38,15 @@ DEPEND="${RDEPEND}
dev-tcltk/expect
)"
+BDEPEND="${PYTHON_DEPS}"
+
PATCHES=(
"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
+ "${FILESDIR}/${PN}-0.7.2-Conditionalize-test-dependencies.patch"
)
src_prepare() {
- use test || eapply "${FILESDIR}/${PN}-0.5.0-disable-test-dependencies.patch"
default
eautoreconf
}
@@ -58,7 +57,8 @@ src_configure() {
--without-selinux \
$(use_with fuse cuse) \
$(use_with gnutls) \
- $(use_with seccomp)
+ $(use_with seccomp) \
+ $(use_enable test)
}
src_install() {
diff --git a/app-crypt/tc-play/tc-play-2.0-r1.ebuild b/app-crypt/tc-play/tc-play-2.0-r1.ebuild
index b8022d5f11a..401465c26b6 100644
--- a/app-crypt/tc-play/tc-play-2.0-r1.ebuild
+++ b/app-crypt/tc-play/tc-play-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -40,9 +40,9 @@ pkg_setup() {
EXTRA_MAKE_FLAGS=(
PBKDF_BACKEND="${backend}"
WARNFLAGS=""
- CC=$(tc-getCC)
- AR=$(tc-getAR)
- PREFIX=/usr \
+ CC="$(tc-getCC)"
+ AR="$(tc-getAR)"
+ PREFIX=/usr
LIBDIR=/usr/$(get_libdir)
)
}
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index d9f218e7e51..ab9d8884a85 100644
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -1 +1 @@
-DIST tpm2-abrmd-2.4.0.tar.gz 575440 BLAKE2B 20c1fa772b016879adf28a67966450d64924bc1ac22b3111cf7376706335dc92fa8de97183d89c9d3ff5955dfb2a7617869469e9da61eb05847fd29b4a0208fd SHA512 c2ef05ca2db5a33d3067052779aa4c2485a63bd357d5fd90ef9d4644530b37aa28b906064eed3b15729131697a2a9d6b9cc3f05bea04810fd6601e405af48110
+DIST tpm2-abrmd-2.4.1.tar.gz 577259 BLAKE2B 7d97e1069a171f3693fb11b8e2ce0243993f4352aae9fd691bfbf1b8fcef8615b79957f8f662ac00fe59bf7e3830d8abb79c67790f7be1cd3140fd1c7b1ed560 SHA512 0335285678cfceca4f185981ded90d213ff796cadddc9b5d6dbf2db533f81023a0f1089bbd8a8017bccb95190889be23b24d38a176d3368d221479aff4ff7d6c
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.0.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.1-r1.ebuild
index c8f8f974a8e..ed4032c44ca 100644
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.0.ebuild
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools systemd
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
IUSE="static-libs test"
RESTRICT="!test? ( test )"
@@ -20,11 +20,11 @@ RDEPEND="acct-group/tss
acct-user/tss
sys-apps/dbus
dev-libs/glib:=
- app-crypt/tpm2-tss"
+ app-crypt/tpm2-tss:="
DEPEND="${RDEPEND}
test? (
app-crypt/swtpm
- >=app-crypt/tpm2-tss-3.0.0
+ >=app-crypt/tpm2-tss-3.0.0:=
dev-util/cmocka
)"
BDEPEND="virtual/pkgconfig
@@ -49,6 +49,12 @@ src_configure() {
src_install() {
default
+
+ if [[ ${PV} != $(sed -n -e 's/^Version: //p' "${ED}/usr/$(get_libdir)/pkgconfig/tss2-tcti-tabrmd.pc" || die) ]] ; then
+ # Safeguard for bug #833887
+ die "pkg-config file version doesn't match ${PV}! Please report a bug!"
+ fi
+
find "${D}" -name '*.la' -delete || die
newinitd "${FILESDIR}"/${PN}.initd ${PN}
diff --git a/app-crypt/tpm2-pkcs11/Manifest b/app-crypt/tpm2-pkcs11/Manifest
index b9c3a72ad07..44be70f79ef 100644
--- a/app-crypt/tpm2-pkcs11/Manifest
+++ b/app-crypt/tpm2-pkcs11/Manifest
@@ -1 +1 @@
-DIST tpm2-pkcs11-1.7.0.tar.gz 1386693 BLAKE2B bf53a76be712bda374a8d107910440bab087fdb6c34fee3c748128d471a7a84b08f887ff97c8cdfef632679dd4343cf020e9459b96553cd5feecf76e65d6e290 SHA512 eb2736a7ef00fefa91bb70cc96d94d1c7b6ce3701ab12301658b7b076d8fca93bc590c7cdba5a84934b6bd09dad252b13670804c686e76a65b03c7ef6d96427d
+DIST tpm2-pkcs11-1.8.0.tar.gz 1393977 BLAKE2B c959e9e593dde903eac4b26ac85a39d1c73bfb9b6be558d7338dae1a710eb836385b08ddca27689f0573242d40ee072fa5d6685186a50e10ea42b8679389cf92 SHA512 599feb4d888c25a3359927b1d408f9ce85ba69d8a0e7af7ae9f3736e8940ec8d5f58b3094bef3b6515c0b1810249ea98cd73dbce592cb63de3b45ff976adda80
diff --git a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.7.0.ebuild b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.8.0.ebuild
index 407c9604607..5a58280d4e3 100644
--- a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.7.0.ebuild
+++ b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="sqlite"
-inherit distutils-r1
+inherit python-single-r1
DESCRIPTION="A PKCS#11 interface for TPM2 hardware"
HOMEPAGE="https://tpm2-software.github.io/"
@@ -17,27 +17,34 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE="fapi test"
+REQUIRED_USE="( ${PYTHON_REQUIRED_USE} )"
# Units tests only for now
RESTRICT="!test? ( test )"
-RDEPEND="app-crypt/p11-kit
+RDEPEND="${PYTHON_DEPS}
+ app-crypt/p11-kit
app-crypt/tpm2-abrmd
app-crypt/tpm2-tools[fapi?]
- !fapi? ( app-crypt/tpm2-tss )
- fapi? ( >=app-crypt/tpm2-tss-3.0.1[fapi] )
+ !fapi? ( app-crypt/tpm2-tss:= )
+ fapi? ( >=app-crypt/tpm2-tss-3.0.1:=[fapi] )
dev-db/sqlite:3
dev-libs/libyaml
dev-libs/openssl:=
+ $(python_gen_cond_dep '
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}]
+ dev-python/tpm2-pytss[${PYTHON_USEDEP}]
+ ')
+"
DEPEND="test? ( dev-util/cmocka )
${RDEPEND}"
-BDEPEND="sys-devel/autoconf-archive
+BDEPEND="${PYTHON_DEPS}
+ sys-devel/autoconf-archive
virtual/pkgconfig"
src_configure() {
@@ -46,20 +53,9 @@ src_configure() {
$(use_enable test unit)
}
-src_compile() {
- default
- cd "${S}/tools" || die
- BUILD_DIR="${S}/tools" python_foreach_impl distutils-r1_python_compile
-}
-
src_install() {
default
- cd "${S}/tools" || die
- BUILD_DIR="${S}/tools" python_foreach_impl distutils-r1_python_install
- dobin "${S}/tools/tpm2_ptool"
+ python_domodule tools/tpm2_pkcs11
+ python_newscript tools/tpm2_ptool.py tpm2_ptool
find "${ED}" -name '*.la' -delete || die
}
-
-src_test() {
- default
-}
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index d710f2982f6..e7303ed6665 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,2 +1 @@
-DIST tpm2-tools-4.3.2.tar.gz 887708 BLAKE2B ee6fe3d0566138d6289d1a91252ccb106d36ff80d55f2d6f9ee30c8e16338d706e80085ac5f4f56a79bcb339e5dcb240efcf71d4003bcffdad366f3cd7a1165b SHA512 1aa47c62c3d2a83195ec649e50c0be2c8be39f926806d8d7cb96edc499c385d527661813e02024e98f83ae9ebcb22d7dadc507ddfab48be9bbe428d9439d7ee1
DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2 SHA512 9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch b/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch
deleted file mode 100644
index caa3fac23bf..00000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 7b5c2196..d07d5433 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -210,7 +210,6 @@ AS_IF([test x"$enable_hardening" != x"no"], [
-
- 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-tools/tpm2-tools-4.3.2.ebuild b/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
deleted file mode 100644
index fc76619d179..00000000000
--- a/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+fapi"
-
-# Integration test are now run as part of the testing suite, which will fail
-# because none of the supported TPM emulators are in Portage. In a future
-# version of tpm2-tools, swtpm will be supported and the tests can be run.
-RESTRICT="test"
-
-RDEPEND="net-misc/curl:=
- >=app-crypt/tpm2-tss-2.4.0:=[fapi?]
- dev-libs/openssl:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- sys-devel/autoconf-archive"
-PATCHES=(
- "${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
-)
-
-src_prepare() {
- sed -i \
- "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
- "${S}/configure.ac" || die
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable fapi) \
- --enable-hardening
-}
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
index 9b7629c2cc9..8438c854a1c 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools bash-completion-r1 python-single-r1
+inherit autotools bash-completion-r1 python-any-r1
DESCRIPTION="Tools for the TPM 2.0 TSS"
HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
@@ -16,13 +16,11 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="+fapi test"
RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1[fapi?]
+RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
dev-libs/openssl:=
net-misc/curl
- sys-libs/efivar:=
- ${PYTHON_DEPS}"
+ sys-libs/efivar:="
DEPEND="${RDEPEND}
test? (
app-crypt/swtpm
@@ -34,7 +32,7 @@ BDEPEND="virtual/pkgconfig
test? (
app-editors/vim-core
dev-tcltk/expect
- $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+ $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
)
${PYTHON_DEPS}"
diff --git a/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild b/app-crypt/tpm2-totp/tpm2-totp-0.3.0-r1.ebuild
index 67e6798a565..0908aaaa181 100644
--- a/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild
+++ b/app-crypt/tpm2-totp/tpm2-totp-0.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,14 +16,14 @@ IUSE="plymouth test"
REQUIRED_USE="test? ( plymouth )"
-RDEPEND="app-crypt/tpm2-tss
+RDEPEND="app-crypt/tpm2-tss:=
media-gfx/qrencode
plymouth? ( sys-boot/plymouth )"
DEPEND="${RDEPEND}
test? (
app-crypt/swtpm
app-crypt/tpm2-tools
- >=app-crypt/tpm2-tss-3.0.0
+ >=app-crypt/tpm2-tss-3.0.0:=
sys-apps/fakeroot
sys-auth/oath-toolkit
)"
diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r1.ebuild
index 00b662bda57..a737e7269f5 100644
--- a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0.ebuild
+++ b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ KEYWORDS="~amd64"
IUSE="test"
RESTRICT="!test? ( test )"
-RDEPEND="app-crypt/tpm2-tss
+RDEPEND="app-crypt/tpm2-tss:=
dev-libs/openssl:0="
DEPEND="${RDEPEND}
test? ( dev-util/cmocka )"
@@ -37,5 +37,6 @@ src_configure() {
src_install () {
default
+ find "${ED}" -name '*.la' -delete || die
dobashcomp bash-completion/*
}
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index bcc65f26237..fbe1511216d 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,3 +1 @@
-DIST tpm2-tss-2.4.5.tar.gz 1439394 BLAKE2B 644d917f545e93dd81856611522329caf4ff038e4ddb04d761f03339cc7308095abc1c9b46a4d601cad67deea6f917ee5e4236c59f3d7042a7fdf2d33630dd3f SHA512 2c92af07ed1cc3665c19479c00ce5608883081f311192a264a4f7d9119c75ac582596c53b910534c4b66dbb60de2ffd3d6218169748332609c2e0fc89f519259
-DIST tpm2-tss-2.4.6.tar.gz 1472883 BLAKE2B e007de07c759e77e377f8569c0c5d94ab57597ea3cb452fb598a47c9b404714a7816c86221d4eacad962436fc7625066d4066f433cd957c37b92d51b0455e2a0 SHA512 f7f7f067605ea30661ac891e22095238689856e22e45f11a6b603cb36ed1ae0724ae52d36f0ee5dd72208da8520457667676ae08107647faa5441a0c9b642f7a
-DIST tpm2-tss-3.1.0.tar.gz 1584690 BLAKE2B cee2807a030b8bab653045cb11dfc7a6a3f7b1e60c1ce4650ba5f0549f29f36ff307e7d53fb5ef9c950b4dae720bdaf35f7cd1e59ebc07b3f16740035e1d5738 SHA512 8967f172c92f1e3e5ba324dbe8afe07bf1bc7179dd755cef9812105f32634f312ee7cc7dfe8e13af69dc219432463f5dc9b93477743de47aba6af1d70b252405
+DIST tpm2-tss-3.2.0.tar.gz 1629211 BLAKE2B a89aa4d89a50bdfb5a9652874d30e2138747bd022049f2be2d0b56e296329d0c41254033ec3a062dbd64fde54a62e952f54446c551e5788231827cd53fae045a SHA512 cabb411f074dfa94919ba914849aac77a0ac2f50622e28a1406cf575369148774748e0e2b7a7c566ec83561a96d4b883bac5a3b1763f4cf48668a0c5d68c0a23
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch
deleted file mode 100644
index 111c3d75c69..00000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 94cc338b0c5b97702e994ec628d684ee2c114547 Mon Sep 17 00:00:00 2001
-From: Tadeusz Struk <tadeusz.struk@intel.com>
-Date: Tue, 24 Mar 2020 16:42:14 -0700
-Subject: [PATCH] configure.ac: wrap PKG_CHECK_MODULES in braces
-
-PKG_CHECK_MODULES needs to be wrapped inside squere
-brackets when inside AS_IF, or it spit out errors:
-
-./configure: line 13054: JSONC_CFLAGS: command not found
-./configure: line 13055: C: command not found
-./configure: line 13056: JSONC_LIBS: command not found
-./configure: line 13155: CURL_CFLAGS: command not found
-./configure: line 13156: CURL_LIBS: command not found
-
-Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
----
- Makefile.am | 2 +-
- configure.ac | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 85683f9b..9144a5ad 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -467,7 +467,7 @@ src_tss2_fapi_libtss2_fapi_la_LIBADD = $(libtss2_sys) $(libtss2_mu) $(libtss2_e
-
- src_tss2_fapi_libtss2_fapi_la_SOURCES = $(TSS2_FAPI_SRC)
- src_tss2_fapi_libtss2_fapi_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/tss2-fapi
--src_tss2_fapi_libtss2_fapi_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LIBS) $(JSON_C_LIBS) $(CURL_LIBS)
-+src_tss2_fapi_libtss2_fapi_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LIBS) $(JSONC_LIBS) $(CURL_LIBS)
- if HAVE_LD_VERSION_SCRIPT
- src_tss2_fapi_libtss2_fapi_la_LDFLAGS += -Wl,--version-script=$(srcdir)/lib/tss2-fapi.map
- endif # HAVE_LD_VERSION_SCRIPT
-diff --git a/configure.ac b/configure.ac
-index a202d4a6..2edf609e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -165,10 +165,10 @@ AS_IF([test "x$enable_fapi" != xno -a "x$with_crypto" != "xossl"],
- AC_MSG_ERROR([FAPI has to be compiled with OpenSSL]))
-
- AS_IF([test "x$enable_fapi" = xyes ],
-- PKG_CHECK_MODULES([JSON_C], [json-c]))
-+ [PKG_CHECK_MODULES([JSONC], [json-c])])
-
- AS_IF([test "x$enable_fapi" = xyes ],
-- PKG_CHECK_MODULES([CURL], [libcurl]))
-+ [PKG_CHECK_MODULES([CURL], [libcurl])])
-
- AC_ARG_WITH([tctidefaultmodule],
- [AS_HELP_STRING([--with-tctidefaultmodule],
---
-2.26.2
-
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch
deleted file mode 100644
index c37a73531c0..00000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 322415b8..39e09063 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -602,10 +602,6 @@ endif #FAPI
- EXTRA_DIST += dist/tpm-udev.rules
-
- install-dirs:
--if HOSTOS_LINUX
-- (systemd-sysusers && systemd-tmpfiles --create) || \
-- ($(call make_tss_user_and_group) && $(call make_fapi_dirs) && ($call set_fapi_permissions)) || true
--endif
-
- install-data-hook: install-dirs
- -if [ ! -z "$(udevrulesprefix)" ]; then \
diff --git a/app-crypt/tpm2-tss/metadata.xml b/app-crypt/tpm2-tss/metadata.xml
index 42f4f7e8b1b..0a726fa2d17 100644
--- a/app-crypt/tpm2-tss/metadata.xml
+++ b/app-crypt/tpm2-tss/metadata.xml
@@ -11,7 +11,6 @@
</maintainer>
<use>
<flag name="fapi">Enable feature API (requires openssl as crypto backend)</flag>
- <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> as crypto engine</flag>
<flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as crypto engine</flag>
<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as crypto engine</flag>
</use>
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild
deleted file mode 100644
index 2db31aefd06..00000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="doc +fapi gcrypt +openssl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( gcrypt openssl )
- fapi? ( openssl !gcrypt )"
-
-RDEPEND="acct-group/tss
- acct-user/tss
- fapi? (
- dev-libs/json-c
- net-misc/curl
- )
- gcrypt? ( dev-libs/libgcrypt:0= )
- openssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
- test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch"
- "${FILESDIR}/${PN}-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch"
-)
-
-pkg_setup() {
- local CONFIG_CHECK=" \
- ~TCG_TPM
- "
- linux-info_pkg_setup
- kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --localstatedir=/var \
- $(use_enable doc doxygen-doc) \
- $(use_enable fapi) \
- $(use_enable static-libs static) \
- $(use_enable test unit) \
- --disable-tcti-mssim \
- --disable-defaultflags \
- --disable-weakcrypto \
- --with-crypto="$(usex gcrypt gcrypt ossl)" \
- --with-runstatedir=/run \
- --with-udevrulesdir="$(get_udevdir)/rules.d" \
- --with-udevrulesprefix=60- \
- --with-sysusersdir="/usr/lib/sysusers.d" \
- --with-tmpfilesdir="/usr/lib/tmpfiles.d"
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- tmpfiles_process tpm2-tss-fapi.conf
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild
deleted file mode 100644
index 2db31aefd06..00000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="doc +fapi gcrypt +openssl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( gcrypt openssl )
- fapi? ( openssl !gcrypt )"
-
-RDEPEND="acct-group/tss
- acct-user/tss
- fapi? (
- dev-libs/json-c
- net-misc/curl
- )
- gcrypt? ( dev-libs/libgcrypt:0= )
- openssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
- test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch"
- "${FILESDIR}/${PN}-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch"
-)
-
-pkg_setup() {
- local CONFIG_CHECK=" \
- ~TCG_TPM
- "
- linux-info_pkg_setup
- kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --localstatedir=/var \
- $(use_enable doc doxygen-doc) \
- $(use_enable fapi) \
- $(use_enable static-libs static) \
- $(use_enable test unit) \
- --disable-tcti-mssim \
- --disable-defaultflags \
- --disable-weakcrypto \
- --with-crypto="$(usex gcrypt gcrypt ossl)" \
- --with-runstatedir=/run \
- --with-udevrulesdir="$(get_udevdir)/rules.d" \
- --with-udevrulesprefix=60- \
- --with-sysusersdir="/usr/lib/sysusers.d" \
- --with-tmpfilesdir="/usr/lib/tmpfiles.d"
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- tmpfiles_process tpm2-tss-fapi.conf
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.1.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild
index 705b46ab69b..0eeb09b9420 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-3.1.0.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools linux-info tmpfiles udev
+inherit autotools linux-info multilib-minimal tmpfiles udev
DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-IUSE="doc +fapi +openssl mbedtls static-libs test"
+SLOT="0/3"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
+IUSE="doc +fapi +openssl mbedtls static-libs test"
RESTRICT="!test? ( test )"
@@ -21,12 +21,16 @@ REQUIRED_USE="^^ ( mbedtls openssl )
RDEPEND="acct-group/tss
acct-user/tss
- fapi? ( dev-libs/json-c
- net-misc/curl )
- mbedtls? ( net-libs/mbedtls:= )
- openssl? ( dev-libs/openssl:= )"
+ fapi? ( dev-libs/json-c:=[${MULTILIB_USEDEP}]
+ >=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] )
+ mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+ openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )"
+
DEPEND="${RDEPEND}
- test? ( dev-util/cmocka )"
+ test? ( app-crypt/swtpm
+ dev-libs/uthash
+ dev-util/cmocka
+ fapi? ( >=net-misc/curl-7.80.0 ) )"
BDEPEND="sys-apps/acl
virtual/pkgconfig
doc? ( app-doc/doxygen )"
@@ -45,17 +49,25 @@ pkg_setup() {
src_prepare() {
default
+
+ # See bug #833887 (and similar); eautoreconf means .pc file gets wrong version.
+ sed -i \
+ "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
+ "configure.ac" || die
+
eautoreconf
}
-src_configure() {
- econf \
+multilib_src_configure() {
+ ECONF_SOURCE=${S} econf \
--localstatedir=/var \
$(use_enable doc doxygen-doc) \
$(use_enable fapi) \
$(use_enable static-libs static) \
- $(use_enable test unit) \
- --disable-tcti-mssim \
+ $(multilib_native_use_enable test unit) \
+ $(multilib_native_use_enable test integration) \
+ $(multilib_native_use_enable test self-generated-certificate) \
+ --disable-tcti-libtpms \
--disable-defaultflags \
--disable-weakcrypto \
--with-crypto="$(usex mbedtls mbed ossl)" \
@@ -66,11 +78,22 @@ src_configure() {
--with-tmpfilesdir="/usr/lib/tmpfiles.d"
}
-src_install() {
+multilib_src_install() {
default
+
+ if [[ ${PV} != $(sed -n -e 's/^Version: //p' "${ED}/usr/$(get_libdir)/pkgconfig/tss2-sys.pc" || die) ]] ; then
+ # Safeguard for bug #833887
+ die "pkg-config file version doesn't match ${PV}! Please report a bug!"
+ fi
+
find "${D}" -name '*.la' -delete || die
}
pkg_postinst() {
tmpfiles_process tpm2-tss-fapi.conf
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
}
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 84891c9a886..4556d86ce76 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -1,2 +1 @@
-DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
DIST trousers-0.3.15.tar.gz 4699936 BLAKE2B 53c60498ed6a9d3d87295b00676e5d0d82452918c35af6b98c7979ffa2dc04dd817e7cd3f4a33ca17c30b90eab53d80b2bb25306fe9db7bda2125019edfed280 SHA512 769c7d891c6306c1b3252448f86e3043ee837e566c9431f5b4353512113e2907f6ce29c91e8044c420025b79c5f3ff2396ddce93f73b1eb2a15ea1de89ac0fdb
diff --git a/app-crypt/trousers/files/tcsd.confd b/app-crypt/trousers/files/tcsd.confd
deleted file mode 100644
index 78bedb9fda3..00000000000
--- a/app-crypt/trousers/files/tcsd.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/conf.d/tscd
-
-# Configuration file for the TrouSerS' TCS daemon (tcsd) init script
-# Have a look on /etc/tcsd.conf too, there is more to configure there.
-
-# TPM_MODULES: name of the module(s) that should be loaded. You only need to
-# set this if your driver is not compiled in kernel and is not already loaded
-# on boot. (default: unset)
-#TPM_MODULES="tpm_atmel"
diff --git a/app-crypt/trousers/files/tcsd.initd b/app-crypt/trousers/files/tcsd.initd
index c9c050cb06d..9b18c48e1ee 100644
--- a/app-crypt/trousers/files/tcsd.initd
+++ b/app-crypt/trousers/files/tcsd.initd
@@ -1,38 +1,19 @@
#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+command=/usr/sbin/tcsd
+description="TrouSerS' TCS daemon (tcsd)"
+command_user="tss:tss"
+
depend() {
use logger
need net
}
-checkconfig() {
- local mod
- if [ -n "${TPM_MODULES}" ] ; then
- for mod in ${TPM_MODULES} ; do
- lsmod | grep -q "^${mod}\b" \
- || modprobe ${mod} &>/dev/null \
- || ewarn "Failed to load module ${mod}"
- done
- # Should we sleep or something to wait for device creation?
- fi
+start_pre() {
if [ ! -c /dev/tpm ] && [ ! -c /dev/tpm0 ] ; then
eerror "No TPM device found!"
return 1
fi
- return 0
-}
-
-start() {
- ebegin "Starting TrouSerS' TCS daemon (tcsd)"
- checkconfig || eend $?
- start-stop-daemon --start --user tss --exec /usr/sbin/tcsd
- eend $?
-}
-
-stop() {
- ebegin "Stopping TrouSerS' TCS daemon (tcsd)"
- start-stop-daemon --stop --quiet --exec /usr/sbin/tcsd --user tss
- eend $?
}
diff --git a/app-crypt/trousers/files/trousers-0.3.14-fno-common.patch b/app-crypt/trousers/files/trousers-0.3.14-fno-common.patch
deleted file mode 100644
index 5046bc70883..00000000000
--- a/app-crypt/trousers/files/trousers-0.3.14-fno-common.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/include/tcsd.h b/src/include/tcsd.h
-index 5b9462b..05bae97 100644
---- a/src/include/tcsd.h
-+++ b/src/include/tcsd.h
-@@ -166,8 +166,8 @@ void thread_signal_init();
-
- /* signal handling */
- #ifndef __APPLE__
--struct sigaction tcsd_sa_int;
--struct sigaction tcsd_sa_chld;
-+extern struct sigaction tcsd_sa_int;
-+extern struct sigaction tcsd_sa_chld;
- #endif
-
- #endif
diff --git a/app-crypt/trousers/files/trousers-0.3.14-tcsd-fixes.patch b/app-crypt/trousers/files/trousers-0.3.14-tcsd-fixes.patch
deleted file mode 100644
index 10031e08829..00000000000
--- a/app-crypt/trousers/files/trousers-0.3.14-tcsd-fixes.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Index: trousers-0.3.14/src/tcs/ps/tcsps.c
-===================================================================
---- trousers-0.3.14.orig/src/tcs/ps/tcsps.c
-+++ trousers-0.3.14/src/tcs/ps/tcsps.c
-@@ -72,7 +72,7 @@ get_file()
- }
-
- /* open and lock the file */
-- system_ps_fd = open(tcsd_options.system_ps_file, O_CREAT|O_RDWR, 0600);
-+ system_ps_fd = open(tcsd_options.system_ps_file, O_CREAT|O_RDWR|O_NOFOLLOW, 0600);
- if (system_ps_fd < 0) {
- LogError("system PS: open() of %s failed: %s",
- tcsd_options.system_ps_file, strerror(errno));
-Index: trousers-0.3.14/src/tcsd/svrside.c
-===================================================================
---- trousers-0.3.14.orig/src/tcsd/svrside.c
-+++ trousers-0.3.14/src/tcsd/svrside.c
-@@ -473,6 +473,7 @@ main(int argc, char **argv)
- }
- return TCSERR(TSS_E_INTERNAL_ERROR);
- }
-+ setgid(pwd->pw_gid);
- setuid(pwd->pw_uid);
- #endif
- #endif
-Index: trousers-0.3.14/src/tcsd/tcsd_conf.c
-===================================================================
---- trousers-0.3.14.orig/src/tcsd/tcsd_conf.c
-+++ trousers-0.3.14/src/tcsd/tcsd_conf.c
-@@ -743,7 +743,7 @@ conf_file_init(struct tcsd_config *conf)
- #ifndef SOLARIS
- struct group *grp;
- struct passwd *pw;
-- mode_t mode = (S_IRUSR|S_IWUSR);
-+ mode_t mode = (S_IRUSR|S_IWUSR|S_IRGRP);
- #endif /* SOLARIS */
- TSS_RESULT result;
-
-@@ -798,15 +798,15 @@ conf_file_init(struct tcsd_config *conf)
- }
-
- /* make sure user/group TSS owns the conf file */
-- if (pw->pw_uid != stat_buf.st_uid || grp->gr_gid != stat_buf.st_gid) {
-+ if (stat_buf.st_uid != 0 || grp->gr_gid != stat_buf.st_gid) {
- LogError("TCSD config file (%s) must be user/group %s/%s", tcsd_config_file,
-- TSS_USER_NAME, TSS_GROUP_NAME);
-+ "root", TSS_GROUP_NAME);
- return TCSERR(TSS_E_INTERNAL_ERROR);
- }
-
-- /* make sure only the tss user can manipulate the config file */
-+ /* make sure only the tss user can read (but not manipulate) the config file */
- if (((stat_buf.st_mode & 0777) ^ mode) != 0) {
-- LogError("TCSD config file (%s) must be mode 0600", tcsd_config_file);
-+ LogError("TCSD config file (%s) must be mode 0640", tcsd_config_file);
- return TCSERR(TSS_E_INTERNAL_ERROR);
- }
- #endif /* SOLARIS */
diff --git a/app-crypt/trousers/trousers-0.3.14-r3.ebuild b/app-crypt/trousers/trousers-0.3.14-r3.ebuild
deleted file mode 100644
index 72418a365fc..00000000000
--- a/app-crypt/trousers/trousers-0.3.14-r3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info readme.gentoo-r1 systemd udev
-
-DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
-HOMEPAGE="http://trousers.sf.net"
-SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
-
-LICENSE="CPL-1.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~m68k ~ppc ppc64 ~s390 x86"
-IUSE="doc selinux" # gtk
-
-# gtk support presently does NOT compile.
-# gtk? ( >=x11-libs/gtk+-2 )
-
-DEPEND="acct-group/tss
- acct-user/tss
- >=dev-libs/glib-2
- >=dev-libs/openssl-0.9.7:0=
- "
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-tcsd )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
- "${FILESDIR}/${P}-fno-common.patch"
- "${FILESDIR}/${P}-Makefile.am-Mark-tddl.a-nodist.patch"
- "${FILESDIR}/${P}-tcsd-fixes.patch"
-)
-
-DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
-
-DOC_CONTENTS="
- If you have problems starting tcsd, please check permissions and
- ownership on /dev/tpm* and ~tss/system.data
-"
-S="${WORKDIR}"
-
-CONFIG_CHECK="~TCG_TPM"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # econf --with-gui=$(usex gtk gtk openssl)
- econf --with-gui=openssl
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-
- keepdir /var/lib/tpm
- use doc && dodoc doc/*
- newinitd "${FILESDIR}"/tcsd.initd tcsd
- newconfd "${FILESDIR}"/tcsd.confd tcsd
- systemd_dounit "${FILESDIR}"/tcsd.service
- udev_dorules "${FILESDIR}"/61-trousers.rules
- fowners tss:tss /var/lib/tpm
- readme.gentoo_create_doc
-}
diff --git a/app-crypt/trousers/trousers-0.3.15.ebuild b/app-crypt/trousers/trousers-0.3.15.ebuild
index b3b23fa8f5c..c68d0d95bcc 100644
--- a/app-crypt/trousers/trousers-0.3.15.ebuild
+++ b/app-crypt/trousers/trousers-0.3.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -57,9 +57,16 @@ src_install() {
keepdir /var/lib/tpm
use doc && dodoc doc/*
newinitd "${FILESDIR}"/tcsd.initd tcsd
- newconfd "${FILESDIR}"/tcsd.confd tcsd
systemd_dounit "${FILESDIR}"/tcsd.service
udev_dorules "${FILESDIR}"/61-trousers.rules
fowners tss:tss /var/lib/tpm
readme.gentoo_create_doc
}
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 5694ebad124..7833eba62e3 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1 +1,3 @@
DIST veracrypt-1.24_p8.tar.gz 25116825 BLAKE2B fccab3e7de7637f6f3a7f448a9dcc6671198ea6155e8f6741844c5bd844819c639f968e4cc6e13c274c90f2ba8e540a020b98cb12617a109d5911ce8dd9cb991 SHA512 16139d055e2b2dda6c38ecf156cf5d15cd4788253fe0c85e42050eafd8afbd5c5908e590e53a7b5220767ebbb3b9e81d0049a910b322e42f1c29d2c131bd29d0
+DIST veracrypt-1.25.7.tar.gz 26108318 BLAKE2B e3974e6abec3ff462239b6c7a775ebfde4138dde295863c8788de88b593bc4bcd69db66eb81dd08333055b0efed2cccccf24d5f038099f6fc25b8f550cb90347 SHA512 955d5354d7401625196f1bd43d5e40695f4a2ebc7742cdfe0850d3b974a02126446346fe7e3174e16a38de39b507fc436b45b5e43d6fb714f37a4b8b394843dd
+DIST veracrypt-1.25.9.tar.gz 26200897 BLAKE2B e48f060343f875a0660040dde35fa826ca87c3659d97a039c2b84193276075b4d3596119bde6727e51eead0c876c91a5a1a3ea77717e74061d5d20a4ea1a6fed SHA512 e83bf7ca52d3893347dd06295db0534931f6f388fc6b0f26dc80ffef77f13918bf9558ab8ac2e6225945415f3291646d7c1c8de382dbe8e468ab1e927251982c
diff --git a/app-crypt/veracrypt/veracrypt-1.25.7.ebuild b/app-crypt/veracrypt/veracrypt-1.25.7.ebuild
new file mode 100644
index 00000000000..41d225cd1ba
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.25.7.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+inherit desktop flag-o-matic linux-info pax-utils toolchain-funcs wxwidgets
+
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
+SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
+
+# The modules not linked against in Linux include (but not limited to):
+# libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
+# Tested by actually removing the source files and performing a build
+# For this reason, we don't have to worry about their licenses
+LICENSE="Apache-2.0 BSD truecrypt-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+ sys-fs/lvm2
+ sys-fs/fuse:0
+ x11-libs/wxGTK:${WX_GTK_VER}[X?]
+ app-admin/sudo
+ dev-libs/pkcs11-helper"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ asm? ( dev-lang/yasm )"
+
+CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+
+src_configure() {
+ setup-wxwidgets
+
+ # https://bugs.gentoo.org/786741
+ # std::byte clashes with src/Common/Tcdefs.h typedef
+ append-cxxflags -std=c++14
+}
+
+src_compile() {
+ local myemakeargs=(
+ NOSTRIP=1
+ NOTEST=1
+ VERBOSE=1
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ AR="$(tc-getAR)"
+ RANLIB="$(tc-getRANLIB)"
+ TC_EXTRA_CFLAGS="${CFLAGS}"
+ TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+ TC_EXTRA_LFLAGS="${LDFLAGS}"
+ WX_CONFIG="${WX_CONFIG}"
+ $(usex X "" "NOGUI=1")
+ $(usex asm "" "NOASM=1")
+ $(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
+ $(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
+ $(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
+ )
+
+ emake "${myemakeargs[@]}"
+}
+
+src_test() {
+ ./Main/veracrypt --text --test || die "tests failed"
+}
+
+src_install() {
+ local DOCS=( Readme.txt )
+
+ dobin Main/veracrypt
+ if use doc; then
+ DOCS+=( "${S}"/../doc/EFI-DCS )
+ docompress -x /usr/share/doc/${PF}/EFI-DCS
+ HTML_DOCS=( "${S}"/../doc/html/. )
+ fi
+ einstalldocs
+
+ newinitd "${FILESDIR}"/veracrypt.init veracrypt
+
+ if use X; then
+ local s
+ for s in 16 48 128 256; do
+ newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
+ done
+ make_desktop_entry veracrypt "VeraCrypt" veracrypt "Utility;Security"
+ fi
+
+ pax-mark -m "${ED}"/usr/bin/veracrypt
+}
+
+pkg_postinst() {
+ ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+ ewarn "of the limitations on redistribution of binaries or modified source."
+}
diff --git a/app-crypt/veracrypt/veracrypt-1.25.9.ebuild b/app-crypt/veracrypt/veracrypt-1.25.9.ebuild
new file mode 100644
index 00000000000..41d225cd1ba
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.25.9.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+inherit desktop flag-o-matic linux-info pax-utils toolchain-funcs wxwidgets
+
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
+SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
+
+# The modules not linked against in Linux include (but not limited to):
+# libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
+# Tested by actually removing the source files and performing a build
+# For this reason, we don't have to worry about their licenses
+LICENSE="Apache-2.0 BSD truecrypt-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+ sys-fs/lvm2
+ sys-fs/fuse:0
+ x11-libs/wxGTK:${WX_GTK_VER}[X?]
+ app-admin/sudo
+ dev-libs/pkcs11-helper"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ asm? ( dev-lang/yasm )"
+
+CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+
+src_configure() {
+ setup-wxwidgets
+
+ # https://bugs.gentoo.org/786741
+ # std::byte clashes with src/Common/Tcdefs.h typedef
+ append-cxxflags -std=c++14
+}
+
+src_compile() {
+ local myemakeargs=(
+ NOSTRIP=1
+ NOTEST=1
+ VERBOSE=1
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ AR="$(tc-getAR)"
+ RANLIB="$(tc-getRANLIB)"
+ TC_EXTRA_CFLAGS="${CFLAGS}"
+ TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+ TC_EXTRA_LFLAGS="${LDFLAGS}"
+ WX_CONFIG="${WX_CONFIG}"
+ $(usex X "" "NOGUI=1")
+ $(usex asm "" "NOASM=1")
+ $(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
+ $(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
+ $(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
+ )
+
+ emake "${myemakeargs[@]}"
+}
+
+src_test() {
+ ./Main/veracrypt --text --test || die "tests failed"
+}
+
+src_install() {
+ local DOCS=( Readme.txt )
+
+ dobin Main/veracrypt
+ if use doc; then
+ DOCS+=( "${S}"/../doc/EFI-DCS )
+ docompress -x /usr/share/doc/${PF}/EFI-DCS
+ HTML_DOCS=( "${S}"/../doc/html/. )
+ fi
+ einstalldocs
+
+ newinitd "${FILESDIR}"/veracrypt.init veracrypt
+
+ if use X; then
+ local s
+ for s in 16 48 128 256; do
+ newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
+ done
+ make_desktop_entry veracrypt "VeraCrypt" veracrypt "Utility;Security"
+ fi
+
+ pax-mark -m "${ED}"/usr/bin/veracrypt
+}
+
+pkg_postinst() {
+ ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+ ewarn "of the limitations on redistribution of binaries or modified source."
+}
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 3a07aa90136..c574d0033cc 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,2 +1 @@
-DIST xca-2.3.0.tar.gz 1354154 BLAKE2B 31a4ac96819e8d2f7e5f623cc343f0cbff18c931ed0699dbe093dcb963c3431a3943c4dcd8f3d727896104c05a565d062b9678169bf2a8d3f7cf7748c311b53b SHA512 35522aa308e1022a739f3255f13fcf63f481000f9b7411027a009a185e33ddceeb5cf9b55406a4899d2393c7e5ace10354ff24b3b2b0c3045d110f679756b0b8
DIST xca-2.4.0.tar.gz 1778572 BLAKE2B 2e90ef264dc53019cc37700b37d5eb0c48904ca371ae1ce0cfe2ad61be8765951ea918d356c1f2764e73d846693a66c903cba1381df5d1a588aae8bb45f8c195 SHA512 e93e2cf9dc48ed43ee9b51e977f825d81ff08835eb4d77fcbe8f9dc8ce31c77c1da879b48c25ab535717542d1fe84faa6e46c410c116edbee02072040c59667c
diff --git a/app-crypt/xca/files/xca-2.3.0-bug-733000.patch b/app-crypt/xca/files/xca-2.3.0-bug-733000.patch
deleted file mode 100644
index 044575475c8..00000000000
--- a/app-crypt/xca/files/xca-2.3.0-bug-733000.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/doc/Makefile b/doc/Makefile
-index d481c5a..dc5b49a 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -5,13 +5,9 @@ endif
-
- DELFILES=xca*.html xca.1.gz changelog.html database_schema.html
-
--doc: xca.1.gz xca.html changelog.html database_schema.html
-+doc: xca.1 xca.html changelog.html database_schema.html
- include $(TOPDIR)/Rules.mak
-
--%.1.gz: %.1
-- @$(PRINT) " MAN [$(BASENAME)] $@"
-- gzip -9 <$^ >$@
--
- xca.html: xca.sgml
- rm -f xca*.html
- echo 'The documentation for XCA can be viewed online at: <a href="http://hohnstaedt.de/documentation">http://hohnstaedt.de/documentation</a>.' > $@
-@@ -23,7 +19,7 @@ install: $(doc)
- $(ENABLE_DOC)install -m 755 -d $(DESTDIR)$(htmldir)
- $(ENABLE_DOC)install -m 644 xca*.html $(DESTDIR)$(htmldir)
- install -m 755 -d $(DESTDIR)$(mandir)/man1
-- install -m 644 *.1.gz $(DESTDIR)/$(mandir)/man1
-+ install -m 644 *.1 $(DESTDIR)/$(mandir)/man1
-
- app: xca.html
- mkdir -p $(APPDIR)/Resources
diff --git a/app-crypt/xca/xca-2.3.0-r1.ebuild b/app-crypt/xca/xca-2.3.0-r1.ebuild
deleted file mode 100644
index e0b579e762e..00000000000
--- a/app-crypt/xca/xca-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit xdg-utils
-
-DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
-HOMEPAGE="https://hohnstaedt.de/xca/"
-SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bindist doc"
-
-RDEPEND="
- dev-libs/libltdl:0=
- dev-qt/qtgui:5
- dev-qt/qtsql:5[sqlite]
- dev-qt/qtwidgets:5
- dev-libs/openssl:0=[bindist(-)=]
- doc? ( app-text/linuxdoc-tools )"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.0-desktop.patch"
- "${FILESDIR}/${P}-bug-733000.patch"
-)
-
-src_configure() {
- econf \
- --with-qt-version=5 \
- $(use_enable doc) \
- STRIP=true
-}
-
-src_prepare() {
- sed '/^CFLAGS/s@-O2 -ggdb@@' -i Local.mak.in || die
- default
-}
-
-src_compile() {
- # enforce all to avoid the automatic silent rules
- emake all
-}
-
-src_install() {
- default
-
- insinto /etc/xca
- doins misc/*.txt
-
- ewarn "Make a backup copy of your database!"
- ewarn "Version 2 completely changes the database format to SQL(ite)"
- ewarn "Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database."
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-crypt/xca/xca-2.4.0-r1.ebuild b/app-crypt/xca/xca-2.4.0-r1.ebuild
deleted file mode 100644
index 5fc4696731f..00000000000
--- a/app-crypt/xca/xca-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit xdg-utils
-
-DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
-HOMEPAGE="https://hohnstaedt.de/xca/"
-SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bindist doc"
-
-RDEPEND="
- dev-libs/libltdl:0=
- dev-qt/qthelp:5
- dev-qt/qtgui:5
- dev-qt/qtsql:5[sqlite]
- dev-qt/qtwidgets:5
- >=dev-libs/openssl-1.1.0:0=[bindist(-)=]
- doc? ( app-text/linuxdoc-tools )"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.0-desktop.patch"
- "${FILESDIR}/${P}-bug-733000.patch"
-)
-
-src_configure() {
- econf \
- --with-qt-version=5 \
- $(use_enable doc) \
- STRIP=true
-}
-
-src_prepare() {
- sed '/^CFLAGS/s@-O2 -ggdb@@' -i Local.mak.in || die
- default
-}
-
-src_compile() {
- # enforce all to avoid the automatic silent rules
- emake all
-}
-
-src_install() {
- default
-
- insinto /etc/xca
- doins misc/*.txt
-
- ewarn "Make a backup copy of your database!"
- ewarn "Version 2 completely changes the database format to SQL(ite)"
- ewarn "Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database."
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index dc291e5ea5f..eb25dcd6f82 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,2 +1 @@
-DIST yubikey-manager-4.0.5.tar.gz 142197 BLAKE2B c48a9c6ae5f2d54b24888b750c6263eb501e68be56beb9fb964e8b9ea5131a608786b2e67d0d092ebcfacb15b09cae3eec19f4271893ac77eba70eee28b6d06d SHA512 f8bddf3121c0c509fcacb56500f1c1885354aff5c00b3347d9ca84cdf1df65276ed744209d9653474909b6cba7595bc5529cd4b37ec34c35d2d2c3cf2ff850de
-DIST yubikey-manager-4.0.7.tar.gz 143622 BLAKE2B 1ea768b4b95a65dc2cbc34f1e796a1012b534495154f475c7deb9ec7dbc807ff688d864abba8001752d3717034acbf39cd1cb17f147842fc38d27a83cb8c8ddc SHA512 7ba11488cddcc7d4bb15e673b7d8d82d8e85c52d8a4a3a13c6681cc494ecf33b88eb54556785783e6ec458292f155668bac0bb3a38a2df1702a24f623f8b084e
+DIST yubikey-manager-4.0.8.tar.gz 147076 BLAKE2B efdefb15c3939bfb2171766aec195fb776668894d4439565840587d14387999e052aee6eb225b9332662f1ebdbf1db24fceb606393e23d591ff61b91c1ee96f5 SHA512 87352bbb133eead48d1588df2db5420687278a9f76ceb283a53af8eab3d29e30c86e01a588a6da2884e6dac6af192ad355a28745f2f8505ef6cd0e96dea3e9c7
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.5-r1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.5-r1.ebuild
deleted file mode 100644
index 6ea12c8bda0..00000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-4.0.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-
-inherit distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
-# the official source for tarballs, not Github
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-RESTRICT="test" # Tests require non-existing package makefun
-
-# app-crypt/ccid required for
-# - 'ykman oath'
-# - 'ykman openpgp'
-# - 'ykman piv'
-RDEPEND="
- app-crypt/ccid
- dev-python/click[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/fido2:0/0.9[${PYTHON_USEDEP}]
- dev-python/pyscard[${PYTHON_USEDEP}]"
-
-python_install_all() {
- distutils-r1_python_install_all
- doman man/ykman.1
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.8.ebuild
index 8d71a30afad..946c6bf3f77 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-4.0.8.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+DISTUTILS_USE_PEP517=poetry
inherit distutils-r1
@@ -17,7 +17,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-RESTRICT="test" # Tests require non-existing package makefun
+IUSE="ssl"
# app-crypt/ccid required for
# - 'ykman oath'
@@ -26,9 +26,15 @@ RESTRICT="test" # Tests require non-existing package makefun
RDEPEND="
app-crypt/ccid
dev-python/click[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
+ <dev-python/cryptography-39[${PYTHON_USEDEP}]
dev-python/fido2:0/0.9[${PYTHON_USEDEP}]
- dev-python/pyscard[${PYTHON_USEDEP}]"
+ dev-python/pyscard[${PYTHON_USEDEP}]
+ ssl? ( >=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}] )"
+BDEPEND="test? (
+ dev-python/makefun[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
python_install_all() {
distutils-r1_python_install_all