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.9.ebuild (renamed from app-crypt/acme-sh/acme-sh-3.0.7.ebuild)2
-rw-r--r--app-crypt/acme/Manifest1
-rw-r--r--app-crypt/acme/acme-2.11.0.ebuild64
-rw-r--r--app-crypt/adcli/adcli-0.9.2.ebuild4
-rw-r--r--app-crypt/aescrypt/Manifest1
-rw-r--r--app-crypt/aescrypt/aescrypt-3.14.ebuild71
-rw-r--r--app-crypt/aescrypt/files/aescrypt-3.14-iconv.patch40
-rw-r--r--app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch20
-rw-r--r--app-crypt/argon2/argon2-20190702-r1.ebuild2
-rw-r--r--app-crypt/asekey/asekey-3.7.ebuild32
-rw-r--r--app-crypt/badkeys/Manifest1
-rw-r--r--app-crypt/badkeys/badkeys-0.0.12.ebuild26
-rw-r--r--app-crypt/ccid/Manifest2
-rw-r--r--app-crypt/ccid/ccid-1.5.1.ebuild45
-rw-r--r--app-crypt/ccid/ccid-1.5.4.ebuild55
-rw-r--r--app-crypt/ccid/ccid-1.5.5.ebuild2
-rw-r--r--app-crypt/ccid/files/ccid-1.5.4-remove-flex-configure-dependency.patch71
-rw-r--r--app-crypt/certbot/Manifest1
-rw-r--r--app-crypt/certbot/certbot-2.11.0-r1.ebuild69
-rw-r--r--app-crypt/certbot/certbot-2.11.0.ebuild65
-rw-r--r--app-crypt/certbot/files/certbot-2.11.0-workaround-cryptography-deprecation-warnings.patch36
-rw-r--r--app-crypt/coolkey/coolkey-1.1.0-r9.ebuild2
-rw-r--r--app-crypt/debian-archive-keyring/debian-archive-keyring-2023.4.ebuild4
-rw-r--r--app-crypt/dieharder/dieharder-3.31.1-r4.ebuild2
-rw-r--r--app-crypt/easy-rsa/Manifest4
-rw-r--r--app-crypt/easy-rsa/easy-rsa-3.1.6.ebuild25
-rw-r--r--app-crypt/easy-rsa/easy-rsa-3.1.7.ebuild25
-rw-r--r--app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild2
-rw-r--r--app-crypt/easy-rsa/easy-rsa-3.2.1.ebuild (renamed from app-crypt/easy-rsa/easy-rsa-3.1.2.ebuild)6
-rw-r--r--app-crypt/eid-mw/Manifest2
-rw-r--r--app-crypt/eid-mw/eid-mw-5.1.19.ebuild (renamed from app-crypt/eid-mw/eid-mw-5.1.18.ebuild)31
-rw-r--r--app-crypt/eid-mw/eid-mw-9999.ebuild32
-rw-r--r--app-crypt/eid-mw/files/0001-Do-not-build-xpi-module.patch38
-rw-r--r--app-crypt/eid-mw/files/0001-Fix-libdir-for-manifestdir.patch30
-rw-r--r--app-crypt/eid-mw/files/0001-Remove-uml-build.patch48
-rw-r--r--app-crypt/gcr/gcr-3.41.1-r2.ebuild2
-rw-r--r--app-crypt/gcr/gcr-4.2.1.ebuild2
-rw-r--r--app-crypt/glep63-check/glep63-check-11.ebuild2
-rw-r--r--app-crypt/gnupg-pkcs11-scd/Manifest1
-rw-r--r--app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2-r1.ebuild48
-rw-r--r--app-crypt/gnupg/Manifest2
-rw-r--r--app-crypt/gnupg/gnupg-2.2.42-r4.ebuild2
-rw-r--r--app-crypt/gnupg/gnupg-2.2.43-r1.ebuild2
-rw-r--r--app-crypt/gnupg/gnupg-2.4.5-r1.ebuild2
-rw-r--r--app-crypt/gnupg/gnupg-2.4.5-r2.ebuild4
-rw-r--r--app-crypt/gnupg/gnupg-2.5.1.ebuild197
-rw-r--r--app-crypt/gpgme/files/ecd0c86d62351d267bdc9566286c532a394c711b.patch40
-rw-r--r--app-crypt/gpgme/gpgme-1.23.2-r1.ebuild (renamed from app-crypt/gpgme/gpgme-1.23.2.ebuild)5
-rw-r--r--app-crypt/gpgme/gpgme-1.23.2-r2.ebuild232
-rw-r--r--app-crypt/hashalot/hashalot-0.3-r2.ebuild2
-rw-r--r--app-crypt/heimdal/heimdal-7.8.0-r1.ebuild190
-rw-r--r--app-crypt/heimdal/heimdal-7.8.0-r2.ebuild191
-rw-r--r--app-crypt/heimdal/heimdal-7.8.0-r3.ebuild2
-rw-r--r--app-crypt/jitterentropy-rngd/Manifest1
-rw-r--r--app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.7.ebuild31
-rw-r--r--app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.8.ebuild1
-rw-r--r--app-crypt/jitterentropy/Manifest1
-rw-r--r--app-crypt/jitterentropy/jitterentropy-3.4.1.ebuild2
-rw-r--r--app-crypt/jitterentropy/jitterentropy-3.6.0.ebuild48
-rw-r--r--app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild2
-rw-r--r--app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild2
-rw-r--r--app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild2
-rw-r--r--app-crypt/keysmith/Manifest2
-rw-r--r--app-crypt/keysmith/keysmith-23.08.5.ebuild35
-rw-r--r--app-crypt/keysmith/keysmith-24.05.2.ebuild2
-rw-r--r--app-crypt/keysmith/keysmith-24.08.1.ebuild36
-rw-r--r--app-crypt/libb2/libb2-0.98.1-r3.ebuild2
-rw-r--r--app-crypt/libmd/libmd-1.0.4.ebuild2
-rw-r--r--app-crypt/libmd/libmd-1.1.0.ebuild2
-rw-r--r--app-crypt/libsecret/libsecret-0.21.1.ebuild2
-rw-r--r--app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.1.ebuild2
-rw-r--r--app-crypt/mhash/mhash-0.9.9.9-r3.ebuild2
-rw-r--r--app-crypt/minisign/minisign-0.11-r1.ebuild2
-rw-r--r--app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r3.ebuild2
-rw-r--r--app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r4.ebuild2
-rw-r--r--app-crypt/mit-krb5/Manifest1
-rw-r--r--app-crypt/mit-krb5/mit-krb5-1.21.2.ebuild152
-rw-r--r--app-crypt/mit-krb5/mit-krb5-1.21.3.ebuild2
-rw-r--r--app-crypt/moolticute/moolticute-1.00.1-r1.ebuild (renamed from app-crypt/moolticute/moolticute-1.01.0.ebuild)6
-rw-r--r--app-crypt/moolticute/moolticute-1.01.0-r1.ebuild (renamed from app-crypt/moolticute/moolticute-1.00.1.ebuild)6
-rw-r--r--app-crypt/moolticute/moolticute-1.03.0-r1.ebuild (renamed from app-crypt/moolticute/moolticute-1.03.0.ebuild)6
-rw-r--r--app-crypt/moolticute/moolticute-9999.ebuild6
-rw-r--r--app-crypt/osslsigncode/Manifest6
-rw-r--r--app-crypt/osslsigncode/files/osslsigncode-2.9-missing-import.patch27
-rw-r--r--app-crypt/osslsigncode/metadata.xml1
-rw-r--r--app-crypt/osslsigncode/osslsigncode-2.5.ebuild58
-rw-r--r--app-crypt/osslsigncode/osslsigncode-2.9.ebuild57
-rw-r--r--app-crypt/p11-kit/Manifest1
-rw-r--r--app-crypt/p11-kit/p11-kit-0.25.3-r2.ebuild4
-rw-r--r--app-crypt/p11-kit/p11-kit-0.25.5.ebuild73
-rw-r--r--app-crypt/pgpdump/Manifest1
-rw-r--r--app-crypt/pgpdump/pgpdump-0.35.ebuild26
-rw-r--r--app-crypt/pinentry/Manifest2
-rw-r--r--app-crypt/pinentry/pinentry-1.2.1-r7.ebuild111
-rw-r--r--app-crypt/pinentry/pinentry-1.2.1-r8.ebuild111
-rw-r--r--app-crypt/pinentry/pinentry-1.3.0-r3.ebuild2
-rw-r--r--app-crypt/pinentry/pinentry-1.3.1.ebuild2
-rw-r--r--app-crypt/pius/metadata.xml9
-rw-r--r--app-crypt/pius/pius-3.0.0-r1.ebuild34
-rw-r--r--app-crypt/pius/pius-3.0.0-r2.ebuild4
-rw-r--r--app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild55
-rw-r--r--app-crypt/qca/files/qca-2.3.7-use-sha256-not-sha1.patch29
-rw-r--r--app-crypt/qca/qca-2.3.9.ebuild2
-rw-r--r--app-crypt/qca/qca-9999.ebuild2
-rw-r--r--app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild2
-rw-r--r--app-crypt/rhash/rhash-1.4.3.ebuild2
-rw-r--r--app-crypt/rhash/rhash-1.4.4-r1.ebuild2
-rw-r--r--app-crypt/rhash/rhash-1.4.4.ebuild2
-rw-r--r--app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch31
-rw-r--r--app-crypt/rotix/rotix-0.83-r1.ebuild36
-rw-r--r--app-crypt/rotix/rotix-0.83-r3.ebuild2
-rw-r--r--app-crypt/rpm-sequoia/rpm-sequoia-1.6.0.ebuild3
-rw-r--r--app-crypt/rpm-sequoia/rpm-sequoia-1.7.0.ebuild3
-rw-r--r--app-crypt/sbctl/Manifest3
-rw-r--r--app-crypt/sbctl/sbctl-0.15.4.ebuild45
-rw-r--r--app-crypt/seahorse/seahorse-43.0-r3.ebuild2
-rw-r--r--app-crypt/seahorse/seahorse-43.0-r4.ebuild2
-rw-r--r--app-crypt/shash/shash-0.2.6-r4.ebuild2
-rw-r--r--app-crypt/ssss/ssss-0.5.7-r2.ebuild (renamed from app-crypt/ssss/ssss-0.5.7-r1.ebuild)6
-rw-r--r--app-crypt/tpm2-tools/Manifest4
-rw-r--r--app-crypt/tpm2-tools/files/tpm2-tools-5.6-bashism.patch47
-rw-r--r--app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch123
-rw-r--r--app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog.sh-Fix-accidental-deletions.patch68
-rw-r--r--app-crypt/tpm2-tools/files/tpm2-tools-5.7-tests-Eliminate-dependency-on-which.patch42
-rw-r--r--app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild66
-rw-r--r--app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild81
-rw-r--r--app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild87
-rw-r--r--app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild3
-rw-r--r--app-crypt/ubuntu-keyring/ubuntu-keyring-2023.11.28.1.ebuild4
-rw-r--r--app-crypt/xca/Manifest1
-rw-r--r--app-crypt/xca/xca-2.6.0.ebuild2
-rw-r--r--app-crypt/xca/xca-2.7.0.ebuild76
-rw-r--r--app-crypt/yubikey-manager/Manifest4
-rw-r--r--app-crypt/yubikey-manager/yubikey-manager-5.2.0.ebuild53
-rw-r--r--app-crypt/yubikey-manager/yubikey-manager-5.4.0-r1.ebuild53
-rw-r--r--app-crypt/yubikey-manager/yubikey-manager-5.4.0.ebuild53
-rw-r--r--app-crypt/yubioath-flutter-bin/Manifest1
-rw-r--r--app-crypt/yubioath-flutter-bin/yubioath-flutter-bin-7.1.0.ebuild82
-rw-r--r--app-crypt/zulucrypt/Manifest2
-rw-r--r--app-crypt/zulucrypt/files/zulucrypt-5.5.0_pre20180223-fno-common.patch11
-rw-r--r--app-crypt/zulucrypt/zulucrypt-7.0.0.ebuild (renamed from app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild)28
142 files changed, 1453 insertions, 2349 deletions
diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
index 7cfc680ef19a..7e9c651e8b29 100644
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@@ -1 +1 @@
-DIST acme.sh-3.0.7.tar.gz 284269 BLAKE2B 2e3d81446772049660d3a7b8005b82a890238d33ef16211b304ecd9b996063de9e788095ff958422f90d2e20615f84943d6085959ac2f27d6ad51a8eeffb2800 SHA512 83d080b461662bf2c5cfa9cb51aaf41d7f873f54908e2e5f94d7e3fe8e3f6953d73aafb66adc97455aa958f37c72ef77ba475c7d7cbb3ca3c5bbffb4937c4bae
+DIST acme.sh-3.0.9.tar.gz 298025 BLAKE2B 166e311c63801cb6b4c8aade7afff63cba48ad74932c64b16a0ceb330176465548d9d99da5216b3c00146c59d37b48b24fb4c4bb1220bc5b7ea652d9000fddb1 SHA512 5f7431051de74ec1feca90d743233ddcec2a955e789e5237730498930c910d2a728c3f5e447a09f470a007ed9a4c90de329be58867d15a0fd13f6f18dca49bd0
diff --git a/app-crypt/acme-sh/acme-sh-3.0.7.ebuild b/app-crypt/acme-sh/acme-sh-3.0.9.ebuild
index 321de0c3a864..541a699d4997 100644
--- a/app-crypt/acme-sh/acme-sh-3.0.7.ebuild
+++ b/app-crypt/acme-sh/acme-sh-3.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 1bfef9091904..146d3e9121af 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1 +1,2 @@
DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd
+DIST certbot-2.11.0.gh.tar.gz 2322114 BLAKE2B d266483d1ffc9f9274df3d5e389ed961758e77e9455a7324132bb2bfe4896db663642a98ac7250d35fbbd60d6aef0d6d2a58f98ad17130958dcfcd61283c2479 SHA512 ba47fc98faaf47278c58e107356371c06039f70ad539d2ca1ac39462bb45c7a6c55ed525d8bd8b11cd35cf807f3423e19309022751a492ba19ded79cfbb6d7f4
diff --git a/app-crypt/acme/acme-2.11.0.ebuild b/app-crypt/acme/acme-2.11.0.ebuild
new file mode 100644
index 000000000000..7cc340a48d80
--- /dev/null
+++ b/app-crypt/acme/acme-2.11.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+PARENT_PN="certbot"
+PARENT_P="${PARENT_PN}-${PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ EGIT_SUBMODULES=()
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+ SRC_URI="
+ https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+ -> ${PARENT_P}.gh.tar.gz
+ "
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="
+ https://github.com/certbot/certbot/
+ https://pypi.org/project/acme/
+ https://letsencrypt.org/
+"
+
+S="${WORKDIR}/${PARENT_P}/${PN}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND="
+ test? (
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ )
+"
+# The requirement is really 17.5.0 but easier to require latest stable >= 23.1.1
+# to avoid broken 23.1.0.
+RDEPEND="
+ dev-python/chardet[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-3.2.1[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-23.1.1[${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
+
+python_test() {
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ epytest
+}
diff --git a/app-crypt/adcli/adcli-0.9.2.ebuild b/app-crypt/adcli/adcli-0.9.2.ebuild
index d4fcead6bfc5..ba038ec845b4 100644
--- a/app-crypt/adcli/adcli-0.9.2.ebuild
+++ b/app-crypt/adcli/adcli-0.9.2.ebuild
@@ -31,5 +31,7 @@ src_prepare() {
}
src_configure() {
- econf $(use_enable doc)
+ econf \
+ $(use_enable doc) \
+ KRB5_CONFIG="${ESYSROOT}"/usr/bin/krb5-config
}
diff --git a/app-crypt/aescrypt/Manifest b/app-crypt/aescrypt/Manifest
index b75e3dd1293c..0f211bfd2b8c 100644
--- a/app-crypt/aescrypt/Manifest
+++ b/app-crypt/aescrypt/Manifest
@@ -1,2 +1 @@
-DIST aescrypt-3.14.tgz 38742 BLAKE2B 7122cb0246e28fd1301c58c13145c47ea3e20c8af61efc4115eec8a7ade720ecf2093f2e0156c05eb6cbb6e403bbeb3624745609f0ec1f2fd477edbd876e3373 SHA512 ac06604e2121f0c0f098e87d43c493b7285c58ac7419c284e6a93218dfa7381d4ca69ee775842fde89226092e05978d662eddefe734afe38f67b28df68d87b68
DIST aescrypt-3.16.tgz 39167 BLAKE2B 622976f55e33e98ede6488ee874d2f3371f928a8827d7973d967ddf253112eeb96036d2a7d4f8df7c1c9013e104d39fa5df9c28a7fce121cd11590a98e960c3a SHA512 b6d4fda92bb465c36a9930de0d86777111d2da67f2aa274fb98fcd99629c7ff2d88d8faffdbeeae25c44dc99f0f29b2872867128b7e3a384deada744ce21cdd0
diff --git a/app-crypt/aescrypt/aescrypt-3.14.ebuild b/app-crypt/aescrypt/aescrypt-3.14.ebuild
deleted file mode 100644
index 51a5d8403d18..000000000000
--- a/app-crypt/aescrypt/aescrypt-3.14.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic desktop xdg
-
-DESCRIPTION="Advanced file encryption using AES"
-HOMEPAGE="https://www.aescrypt.com/"
-SRC_URI="https://www.aescrypt.com/download/v$(ver_cut 1)/linux/${P}.tgz"
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="static X"
-RDEPEND="X? (
- || ( gnome-extra/zenity kde-apps/kdialog )
- dev-lang/perl
- )
- "
-
-PATCHES=(
- "${FILESDIR}/${P}-iconv.patch"
- "${FILESDIR}/${P}-ldflags.patch"
-)
-
-src_prepare() {
- xdg_src_prepare
- sed -i \
- -e 's:Icon=/usr/share/aescrypt/SmallLock.png:Icon=SmallLock:' \
- -e 's|Categories=Application;Utility;TextEditor;|Categories=Utility;TextEditor;|' \
- gui/AESCrypt.desktop || die
-}
-
-src_compile() {
- if use static; then
- append-cflags "-DDISABLE_ICONV"
- append-ldflags "-static"
- fi
- cd src || die
- emake \
- CFLAGS="${CFLAGS} -Wall -Wextra -pedantic -std=c99 -D_FILE_OFFSET_BITS=64" \
- LDFLAGS="${LDFLAGS}" \
- CC="$(tc-getCC)"
-}
-
-src_test() {
- cd src || die
- emake -j1 test \
- CFLAGS="${CFLAGS} -Wall -Wextra -pedantic -std=c99 -D_FILE_OFFSET_BITS=64" \
- LDFLAGS="${LDFLAGS}" \
- CC="$(tc-getCC)"
-}
-
-src_install() {
- dobin src/{aescrypt,aescrypt_keygen}
- doman man/*
- doicon gui/SmallLock.png
- domenu gui/AESCrypt.desktop
- dobin gui/aescrypt-gui
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- if use X; then
- einfo 'The .desktop file for aescrypt is only supposed to be used with "Open With"'
- einfo 'to encrypt and decrypt files.'
- einfo 'See:'
- einfo ' https://www.aescrypt.com/linux_aes_crypt.html'
- einfo 'for more information'
- fi
-}
diff --git a/app-crypt/aescrypt/files/aescrypt-3.14-iconv.patch b/app-crypt/aescrypt/files/aescrypt-3.14-iconv.patch
deleted file mode 100644
index 8232f80aebbc..000000000000
--- a/app-crypt/aescrypt/files/aescrypt-3.14-iconv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 337cc9367a3cb4450eee245c6ceb615d0f05499d Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 2 Feb 2013 01:18:08 +0200
-Subject: [PATCH 2/2] build: support disable iconv for static build
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- password.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/password.c b/password.c
-index 9a2c1f8..dee79da 100644
---- a/src/password.c
-+++ b/src/password.c
-@@ -232,6 +232,15 @@ int passwd_to_utf16(unsigned char *in_passwd,
- size_t ic_inbytesleft,
- ic_outbytesleft;
-
-+#ifdef DISABLE_ICONV
-+ /* support only latin */
-+ int i;
-+ for (i=0;i<length+1;i++) {
-+ out_passwd[i*2] = in_passwd[i];
-+ out_passwd[i*2+1] = 0;
-+ }
-+ return length*2;
-+#else
- /* Max length is specified in character, but this function deals
- * with bytes. So, multiply by two since we are going to create a
- * UTF-16 string.
-@@ -273,5 +282,6 @@ int passwd_to_utf16(unsigned char *in_passwd,
- }
- iconv_close(condesc);
- return (max_length - ic_outbytesleft);
-+#endif
- }
-
---
-1.7.12.4
-
diff --git a/app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch b/app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch
deleted file mode 100644
index 757f0e4e7fcb..000000000000
--- a/app-crypt/aescrypt/files/aescrypt-3.14-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naru a/src/Makefile b/src/Makefile
---- a/src/Makefile 2021-07-14 09:25:15.509797042 +0200
-+++ b/src/Makefile 2021-07-14 09:25:46.689797121 +0200
-@@ -27,13 +27,13 @@
- all: aescrypt aescrypt_keygen
-
- aescrypt: $(AESCRYPT_OBJS)
-- $(CC) $(CFLAGS) $(LIBS) -o $@ $(AESCRYPT_OBJS)
-+ $(CC) $(CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $(AESCRYPT_OBJS)
-
- aescrypt_keygen: $(KEYGEN_OBJS)
-- $(CC) $(CFLAGS) $(LIBS) -o $@ $(KEYGEN_OBJS)
-+ $(CC) $(CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $(KEYGEN_OBJS)
-
- %.o: %.c %.h
-- $(CC) $(CFLAGS) -c $*.c
-+ $(CC) $(CFLAGS) $(LDFLAGS) -c $*.c
-
- install: aescrypt
- install -o root -g root -m 755 aescrypt /usr/bin
diff --git a/app-crypt/argon2/argon2-20190702-r1.ebuild b/app-crypt/argon2/argon2-20190702-r1.ebuild
index c36974b6a533..fd4e03641a32 100644
--- a/app-crypt/argon2/argon2-20190702-r1.ebuild
+++ b/app-crypt/argon2/argon2-20190702-r1.ebuild
@@ -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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~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}"
diff --git a/app-crypt/asekey/asekey-3.7.ebuild b/app-crypt/asekey/asekey-3.7.ebuild
deleted file mode 100644
index a6c2a097c9bc..000000000000
--- a/app-crypt/asekey/asekey-3.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-DESCRIPTION="ASEKey USB SIM Card Reader"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://dev.gentoo.org/~sam/distfiles/app-crypt/asekey/${P}.tar.bz2"
-LICENSE="BSD LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="sys-apps/pcsc-lite[udev]
- virtual/libusb:0"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${P}-bundle.patch"
-)
-
-src_prepare() {
- default
- sed -i -e 's/GROUP="pcscd"/ENV{PCSCD}="1"/' "92_pcscd_${PN}.rules" || die
-}
-
-src_configure() {
- econf --with-udev-rules-dir="$(get_udevdir)/rules.d"
-}
diff --git a/app-crypt/badkeys/Manifest b/app-crypt/badkeys/Manifest
index e1f41ddcbe2f..b039e6825149 100644
--- a/app-crypt/badkeys/Manifest
+++ b/app-crypt/badkeys/Manifest
@@ -1 +1,2 @@
DIST badkeys-0.0.11.tar.gz 374536 BLAKE2B d06ffa109ab99c6d747349fc01e0039900c7674524bec50e6dd25fe1f20bed6ad723087ab3f4726d7821bf89da098fcd54255d5286ea3a79e4ec87a855fe20ef SHA512 72e24935caacda35e20234a801e844f801422d59b7d6d5f831bada4e8e184ff5ce831d6aee677b9ac43eb8f49b6621ad479310a8dbd34bed03eafa33f0763cbd
+DIST badkeys-0.0.12.tar.gz 374956 BLAKE2B 4d9670d12bccb72e3ce3cc686967c58602da559da4cbf2157576f5122c3064059def1154b2c7bda1bc6f9e13f8dc8a1cd341917610ffb36e0bf10616c614d955 SHA512 b76dd0b6cd10b4136d83d8b2e44adc8b8fb7d4ef7ae78ec404826283de2410356c3abecaac8c1434e181b8ccd0b77b6ae1dd5eaf568be15c8124868c25027e96
diff --git a/app-crypt/badkeys/badkeys-0.0.12.ebuild b/app-crypt/badkeys/badkeys-0.0.12.ebuild
new file mode 100644
index 000000000000..9af1570815ed
--- /dev/null
+++ b/app-crypt/badkeys/badkeys-0.0.12.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
+
+DESCRIPTION="Check cryptographic keys for known weaknesses"
+HOMEPAGE="https://badkeys.info/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dkim ssh"
+
+DEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/gmpy[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+ dkim? ( dev-python/dnspython[${PYTHON_USEDEP}] )
+ ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )"
+# TODO: add optional binary-file-search dependency once
+# it is packaged.
+DOCS=( README.md )
+
+distutils_enable_tests unittest
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index e6910d3ce7d2..f933cfb4c212 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,3 +1 @@
-DIST ccid-1.5.1.tar.bz2 702586 BLAKE2B 7b9e3c6daf03c186f34ac9b13bd960293a6481f9237ee52937ece1040bd3a79b7dab318e1244205a7feae992261ab5e82292d80ae023a4f621e0e7af7cdb9df5 SHA512 492bde96f5752e2a5316693c44e35e2d041785a00d15e094905c0aafad392f5329009d12801899367276328a582936ee53a1c5239c1813c4536001cb8a608f2e
-DIST ccid-1.5.4.tar.bz2 706834 BLAKE2B 8b7f08145808ac94d085eef62c204f8146892cb11f2ce811e46e674272cab016d602afb945c6e808ce3957a80e847c0de2815fedaf15fc8c935cafaccf102762 SHA512 4b30f4768aebf49486a1b1e959615fa077bd393bfdd9e52c15bdc8d6ed63ce27fa7cf82a067d1f80d8b3534c66194036925d3fea5af64b6a775779d38267c757
DIST ccid-1.5.5.tar.bz2 708374 BLAKE2B a82986ead2dbb3241ef419ad16eb0fac835c5ab4fa988e5ee53cd1608a30a9381210a6fd013b6a059ca2835d55b4a41afa4064575e91b8eb356bff6d01d19add SHA512 9d2aebe645a5880bfad7d420ddab96811d1fd989c79afa28f5471ae53f36b6d45ee5e13b32ac4afcf59fc762ae835db7e6312ad6642b263158c2d9a30c7651bd
diff --git a/app-crypt/ccid/ccid-1.5.1.ebuild b/app-crypt/ccid/ccid-1.5.1.ebuild
deleted file mode 100644
index d2baa0389016..000000000000
--- a/app-crypt/ccid/ccid-1.5.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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 +usb"
-
-RDEPEND="
- >=sys-apps/pcsc-lite-1.8.3
- twinserial? ( dev-lang/perl )
- usb? ( virtual/libusb:1 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
- econf \
- LEX=: \
- $(use_enable twinserial) \
- $(use_enable usb libusb)
-}
-
-src_install() {
- default
- udev_newrules src/92_pcscd_ccid.rules 92-pcsc-ccid.rules
-}
-
-pkg_postinst() {
- udev_reload
- einfo "Check https://github.com/LudovicRousseau/CCID/blob/master/INSTALL"
- einfo "for more info about how to configure and use ccid"
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/app-crypt/ccid/ccid-1.5.4.ebuild b/app-crypt/ccid/ccid-1.5.4.ebuild
deleted file mode 100644
index 005b7c99b1e9..000000000000
--- a/app-crypt/ccid/ccid-1.5.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools 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 +usb"
-
-RDEPEND="
- >=sys-apps/pcsc-lite-1.8.3
- twinserial? ( dev-lang/perl )
- usb? ( virtual/libusb:1 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-remove-flex-configure-dependency.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- LEX=: \
- $(use_enable twinserial) \
- $(use_enable usb libusb)
-}
-
-src_install() {
- default
- udev_newrules src/92_pcscd_ccid.rules 92-pcsc-ccid.rules
-}
-
-pkg_postinst() {
- udev_reload
- einfo "Check https://github.com/LudovicRousseau/CCID/blob/master/INSTALL"
- einfo "for more info about how to configure and use ccid"
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/app-crypt/ccid/ccid-1.5.5.ebuild b/app-crypt/ccid/ccid-1.5.5.ebuild
index a7a1290a0795..e5153164d98b 100644
--- a/app-crypt/ccid/ccid-1.5.5.ebuild
+++ b/app-crypt/ccid/ccid-1.5.5.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
IUSE="twinserial +usb"
RDEPEND="
diff --git a/app-crypt/ccid/files/ccid-1.5.4-remove-flex-configure-dependency.patch b/app-crypt/ccid/files/ccid-1.5.4-remove-flex-configure-dependency.patch
deleted file mode 100644
index b0c8122b6ec6..000000000000
--- a/app-crypt/ccid/files/ccid-1.5.4-remove-flex-configure-dependency.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 5bd94d9670ad10df9f14349dfa098d0a2e40ab08 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Mon, 10 Jun 2024 22:02:37 -0400
-Subject: [PATCH] make building work again when flex is not installed
-
-This explicitly reverts commit eec7cdf03dda2bd26e320ead73b91da5a9d86443
-because it was a bad idea.
-
-The motivating bug report was https://github.com/LudovicRousseau/PCSC/issues/124
-and the issue there occurred when building from a git clone, running
-./bootstrap && ./configure && make, and having:
-
-- configure succeed
-- make "succeeeds" at having $LEX run, do nothing and fail to generate
- required sources
-- compiling nonexistent files fail with highly confusing errors
-
-The autoconf manual has always documented the correct way to handle this
-is to check if lex is unavailable, and set it to the famous automake
-wrapper "missing", which checks if a program is missing at build time
-rather than at ./configure time, and fails the build if the rule cannot
-be run. This means:
-
-When building from a git clone, if flex is not available then
-- configure succeeds
-- make fails to run $LEX, and tells you to install flex
-
-The previous attempt to fix the highly confusing error instead resulted
-in configure erroring out, and saying flex is required, even when it is
-*not* required because a `make dist` tarball was used, which contains
-pregenerated tokenparser.c for the express purpose of making flex
-unnecessary.
-
-See autoconf documentation on $LEX:
-https://www.gnu.org/software/autoconf/manual/autoconf-2.72/html_node/Particular-Programs.html#index-AC_005fPROG_005fLEX-1
-
-And automake documentation on why to use "missing":
-https://www.gnu.org/software/automake/manual/html_node/maintainer_002dmode.html
-
-Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
----
- configure.ac | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d291f2b..a5af2eb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,10 +33,10 @@ AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- AC_PROG_LN_S
- AC_PROG_LEX([noyywrap])
--if test $LEX = ":"
--then
-- AC_MSG_ERROR([no lex or flex found])
--fi
-+AS_IF([test $LEX = ":"], [
-+ AM_MISSING_PROG(MISSINGLEX, [flex])
-+ LEX=$MISSINGLEX]
-+)
- AM_PROG_AR
- PKG_PROG_PKG_CONFIG
-
-@@ -354,4 +354,3 @@ AC_CONFIG_FILES(Makefile
- examples/Makefile)
-
- AC_OUTPUT
--
---
-2.44.2
-
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 1bfef9091904..146d3e9121af 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1 +1,2 @@
DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd
+DIST certbot-2.11.0.gh.tar.gz 2322114 BLAKE2B d266483d1ffc9f9274df3d5e389ed961758e77e9455a7324132bb2bfe4896db663642a98ac7250d35fbbd60d6aef0d6d2a58f98ad17130958dcfcd61283c2479 SHA512 ba47fc98faaf47278c58e107356371c06039f70ad539d2ca1ac39462bb45c7a6c55ed525d8bd8b11cd35cf807f3423e19309022751a492ba19ded79cfbb6d7f4
diff --git a/app-crypt/certbot/certbot-2.11.0-r1.ebuild b/app-crypt/certbot/certbot-2.11.0-r1.ebuild
new file mode 100644
index 000000000000..7787932d9c6a
--- /dev/null
+++ b/app-crypt/certbot/certbot-2.11.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+if [[ "${PV}" == *9999 ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ EGIT_SUBMODULES=()
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+else
+ SRC_URI="
+ https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+ "
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Let’s Encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="
+ https://github.com/certbot/certbot/
+ https://pypi.org/project/certbot/
+ https://letsencrypt.org/
+"
+
+S="${WORKDIR}/${P}/${PN}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="selinux"
+
+BDEPEND="
+ test? (
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ )
+"
+
+# See certbot/setup.py for acme >= dep
+RDEPEND="
+ >=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+ >=dev-python/ConfigArgParse-1.5.3[${PYTHON_USEDEP}]
+ >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-3.2.1[${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}]
+ selinux? ( sec-policy/selinux-certbot )
+"
+
+PATCHES=(
+ "${FILESDIR}"/certbot-2.11.0-workaround-cryptography-deprecation-warnings.patch
+)
+
+distutils_enable_sphinx docs \
+ dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+python_test() {
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ epytest
+}
diff --git a/app-crypt/certbot/certbot-2.11.0.ebuild b/app-crypt/certbot/certbot-2.11.0.ebuild
new file mode 100644
index 000000000000..7762dd3262d4
--- /dev/null
+++ b/app-crypt/certbot/certbot-2.11.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+if [[ "${PV}" == *9999 ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ EGIT_SUBMODULES=()
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+else
+ SRC_URI="
+ https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+ "
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Let’s Encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="
+ https://github.com/certbot/certbot/
+ https://pypi.org/project/certbot/
+ https://letsencrypt.org/
+"
+
+S="${WORKDIR}/${P}/${PN}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="selinux"
+
+BDEPEND="
+ test? (
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ )
+"
+
+# See certbot/setup.py for acme >= dep
+RDEPEND="
+ >=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+ >=dev-python/ConfigArgParse-1.5.3[${PYTHON_USEDEP}]
+ >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-3.2.1[${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}]
+ selinux? ( sec-policy/selinux-certbot )
+"
+
+distutils_enable_sphinx docs \
+ dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+python_test() {
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ epytest
+}
diff --git a/app-crypt/certbot/files/certbot-2.11.0-workaround-cryptography-deprecation-warnings.patch b/app-crypt/certbot/files/certbot-2.11.0-workaround-cryptography-deprecation-warnings.patch
new file mode 100644
index 000000000000..b0d59594d03f
--- /dev/null
+++ b/app-crypt/certbot/files/certbot-2.11.0-workaround-cryptography-deprecation-warnings.patch
@@ -0,0 +1,36 @@
+https://github.com/certbot/certbot/issues/9967
+https://bugs.gentoo.org/937889
+--- a/certbot/ocsp.py
++++ b/certbot/ocsp.py
+@@ -4,6 +4,7 @@ from datetime import timedelta
+ import logging
+ import re
+ import subprocess
++import warnings
+ from subprocess import PIPE
+ from typing import Optional
+ from typing import Tuple
+@@ -235,12 +236,17 @@ def _check_ocsp_response(response_ocsp: 'ocsp.OCSPResponse', request_ocsp: 'ocsp
+ # https://github.com/openssl/openssl/blob/ef45aa14c5af024fcb8bef1c9007f3d1c115bd85/crypto/ocsp/ocsp_cl.c#L338-L391
+ # thisUpdate/nextUpdate are expressed in UTC/GMT time zone
+ now = datetime.now(pytz.UTC).replace(tzinfo=None)
+- if not response_ocsp.this_update:
+- raise AssertionError('param thisUpdate is not set.')
+- if response_ocsp.this_update > now + timedelta(minutes=5):
+- raise AssertionError('param thisUpdate is in the future.')
+- if response_ocsp.next_update and response_ocsp.next_update < now - timedelta(minutes=5):
+- raise AssertionError('param nextUpdate is in the past.')
++ with warnings.catch_warnings():
++ # Workaround for deprecation warnings w/ newer cryptography
++ # https://github.com/certbot/certbot/issues/9967 (bug #937889)
++ warnings.filterwarnings("ignore",category=DeprecationWarning)
++
++ if not response_ocsp.this_update:
++ raise AssertionError('param thisUpdate is not set.')
++ if response_ocsp.this_update > now + timedelta(minutes=5):
++ raise AssertionError('param thisUpdate is in the future.')
++ if response_ocsp.next_update and response_ocsp.next_update < now - timedelta(minutes=5):
++ raise AssertionError('param nextUpdate is in the past.')
+
+
+ def _check_ocsp_response_signature(response_ocsp: 'ocsp.OCSPResponse',
diff --git a/app-crypt/coolkey/coolkey-1.1.0-r9.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r9.ebuild
index d388df3391b7..b0d1dd56116f 100644
--- a/app-crypt/coolkey/coolkey-1.1.0-r9.ebuild
+++ b/app-crypt/coolkey/coolkey-1.1.0-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://directory.fedora.redhat.com/download/coolkey/${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug"
RDEPEND=">=sys-apps/pcsc-lite-1.6.4
diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2023.4.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2023.4.ebuild
index 47f1db2a04c5..0b3b3cb4c158 100644
--- a/app-crypt/debian-archive-keyring/debian-archive-keyring-2023.4.ebuild
+++ b/app-crypt/debian-archive-keyring/debian-archive-keyring-2023.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}_all.deb"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
IUSE=""
S="${WORKDIR}"
diff --git a/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild b/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild
index 19afb57f878c..66653aaa6ebb 100644
--- a/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild
+++ b/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild
@@ -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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="doc"
RESTRICT="test" # Way too long
diff --git a/app-crypt/easy-rsa/Manifest b/app-crypt/easy-rsa/Manifest
index 7963daf36975..c7f9b3f9ce6f 100644
--- a/app-crypt/easy-rsa/Manifest
+++ b/app-crypt/easy-rsa/Manifest
@@ -1,4 +1,2 @@
-DIST easy-rsa-3.1.2.tar.gz 6424018 BLAKE2B fef84b90875837c151bf9d71f71587d81aba79579948f4ff29ec3632cd17b0de82bf64c7d25b93720a696d339acdbf520b3a366e3ab214789acd17629d5db5ba SHA512 f36d3e11488ee98be4d901a8ae4f6cf08f4f0efc95bec38d1f1cde3ebd9dd133fe493cab2ebbbbbc99e803e318f93536e6a45ae677adb65c94d998114278035a
-DIST easy-rsa-3.1.6.tar.gz 6814828 BLAKE2B e61fa195e8edeb4b529c86f5814f47f8b10746dfe2effe48685651edd43e4ec9efe4acc2df4d5d13e4348455e36d0623bf5d1a78f2b0f68fb0e63afcee8630d4 SHA512 fb4cb25d63c2ca81cb1723d2ad0f321ff78b519fbde99ebbb97cea82d69292d283a5b927583f9721e91d157587615ecb7c918364d3aca0676b4e2ee624883074
-DIST easy-rsa-3.1.7.tar.gz 6553099 BLAKE2B d1f8b5d6062d834e0e76111a724eb05bd554238c9e418db703ca216f348fd55d741294c49d24957e23f054c81eb85c2c45995a17fb24a91f388b766d33537118 SHA512 8569121fb2d0d1c0810413b8b533fd2cbb27faa5df28bf60c35fddbef1696280c95fe0cd30e286c994596e46ec6709f650c2e6ea5ec07715cdc90da9dcbba5d2
DIST easy-rsa-3.2.0.tar.gz 7033408 BLAKE2B ad1779d6eec3d3b36b7f1c13e73c29bbebe7709c0ef91da1b53482eeab01ad56335bf0ec7bc83331976df926dbb316fc35fc7b83934955c72c9c60b5ecb207f6 SHA512 410453cd170400fafa85547a49a2b4072683bd8c33fba64f81506cb571cd9da8c4c13d13108120c55541aabfe5ceaf3fd491d8f7105c5cc4e4082505777e8282
+DIST easy-rsa-3.2.1.tar.gz 7043742 BLAKE2B 7bc6d5534e47fed6b22de745b9d8ba579f1be49ad52a2d985d81cd1b2e22914b796c47b1a2aab8ca3944eaca37152c30d73659a200f870d1bff1a4bd87830557 SHA512 cdaf5167c31bfa506f7837e664837659a251f317ed3a5a1fcadd1ade4d25e4e8b855bccd3a8c26a14b87f65d8906990e01e87ffe4c6faad83bd008df3ebb3939
diff --git a/app-crypt/easy-rsa/easy-rsa-3.1.6.ebuild b/app-crypt/easy-rsa/easy-rsa-3.1.6.ebuild
deleted file mode 100644
index c35bb375fc0c..000000000000
--- a/app-crypt/easy-rsa/easy-rsa-3.1.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Small RSA key management package, based on OpenSSL"
-HOMEPAGE="https://openvpn.net/"
-SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-DEPEND=">=dev-libs/openssl-0.9.6:0="
-RDEPEND="${DEPEND}"
-
-src_install() {
- exeinto /usr/share/easy-rsa
- doexe easyrsa3/easyrsa
- insinto /usr/share/easy-rsa
- doins -r easyrsa3/{vars.example,openssl-easyrsa.cnf,x509-types}
- dodoc README.quickstart.md ChangeLog
- dodoc -r doc
- doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
-}
diff --git a/app-crypt/easy-rsa/easy-rsa-3.1.7.ebuild b/app-crypt/easy-rsa/easy-rsa-3.1.7.ebuild
deleted file mode 100644
index c35bb375fc0c..000000000000
--- a/app-crypt/easy-rsa/easy-rsa-3.1.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Small RSA key management package, based on OpenSSL"
-HOMEPAGE="https://openvpn.net/"
-SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-DEPEND=">=dev-libs/openssl-0.9.6:0="
-RDEPEND="${DEPEND}"
-
-src_install() {
- exeinto /usr/share/easy-rsa
- doexe easyrsa3/easyrsa
- insinto /usr/share/easy-rsa
- doins -r easyrsa3/{vars.example,openssl-easyrsa.cnf,x509-types}
- dodoc README.quickstart.md ChangeLog
- dodoc -r doc
- doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
-}
diff --git a/app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild b/app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild
index eff3260da50a..50845933ba8c 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.2.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
DEPEND=">=dev-libs/openssl-0.9.6:0="
RDEPEND="${DEPEND}"
diff --git a/app-crypt/easy-rsa/easy-rsa-3.1.2.ebuild b/app-crypt/easy-rsa/easy-rsa-3.2.1.ebuild
index 90c88ae0cde0..af86a09c2dfe 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.1.2.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,14 +9,14 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
DEPEND=">=dev-libs/openssl-0.9.6:0="
RDEPEND="${DEPEND}"
src_install() {
exeinto /usr/share/easy-rsa
- doexe easyrsa3/easyrsa
+ doexe easyrsa3/easyrsa dev/easyrsa-tools.lib
insinto /usr/share/easy-rsa
doins -r easyrsa3/{vars.example,openssl-easyrsa.cnf,x509-types}
dodoc README.quickstart.md ChangeLog
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 623c7a009f28..996fa9e7d6a9 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1 +1 @@
-DIST eid-mw-5.1.18.tar.gz 16299966 BLAKE2B 417b92ad366f32da42c112828d9d01c5beee59045750b4fc69bbcfdea338e1e5d2db00765cae5dab5d22f36122437aa113a968620aefa013f893aebb74208d76 SHA512 1e6e9056fdadbeae623039f1a0e8e6b6e4e80ab313e0fed31824035a32b3173a042f18c254c06bb57d918afbf5162eb23990b51bb0c525e7929128466c74b4d7
+DIST eid-mw-5.1.19.tar.gz 16299622 BLAKE2B a66c861c1120851ecbfd66de4b61db2c2f0951735982365ad516f2cf31249e7241180829e2992738821ecbd09c0fd83a0cba11cf34b23cdc45bfd9899072777a SHA512 9383fa4661a6e46510c3c0f1509aa9c9ee772b7222faacdad3de9433529591c9e7b102d954363f345e47104f4f0473e241c0be57d1049936842e67dac45adc2f
diff --git a/app-crypt/eid-mw/eid-mw-5.1.18.ebuild b/app-crypt/eid-mw/eid-mw-5.1.19.ebuild
index bd390d5174b7..905a49b49f47 100644
--- a/app-crypt/eid-mw/eid-mw-5.1.18.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.1.19.ebuild
@@ -30,6 +30,12 @@ BDEPEND="virtual/pkgconfig"
REQUIRED_USE="dialogs? ( gtk )"
+PATCHES=(
+ "${FILESDIR}/0001-Do-not-build-xpi-module.patch"
+ "${FILESDIR}/0001-Fix-libdir-for-manifestdir.patch"
+ "${FILESDIR}/0001-Remove-uml-build.patch"
+ )
+
src_prepare() {
default
@@ -38,31 +44,6 @@ src_prepare() {
# 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 manifestdir
- sed -i \
- -e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
- -e "/managed_storage_manifestdir/ s:prefix)/lib:libdir):" \
- cardcomm/pkcs11/src/Makefile.am || die
-
- # 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
}
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 3c461d2daa95..6b11be857dc4 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -29,34 +29,14 @@ BDEPEND="virtual/pkgconfig"
REQUIRED_USE="dialogs? ( gtk )"
+PATCHES=(
+ "${FILESDIR}/0001-Do-not-build-xpi-module.patch"
+ "${FILESDIR}/0001-Fix-libdir-for-manifestdir.patch"
+ "${FILESDIR}/0001-Remove-uml-build.patch"
+ )
+
src_prepare() {
default
-
- # 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 manifestdir
- sed -i \
- -e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
- -e "/managed_storage_manifestdir/ s:prefix)/lib:libdir):" \
- cardcomm/pkcs11/src/Makefile.am || die
-
- # 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
}
diff --git a/app-crypt/eid-mw/files/0001-Do-not-build-xpi-module.patch b/app-crypt/eid-mw/files/0001-Do-not-build-xpi-module.patch
new file mode 100644
index 000000000000..6bea1b0056a6
--- /dev/null
+++ b/app-crypt/eid-mw/files/0001-Do-not-build-xpi-module.patch
@@ -0,0 +1,38 @@
+From 2e5b6e80acc9ffc42afe329facdcb443dca21a34 Mon Sep 17 00:00:00 2001
+From: Vincent Hardy <vincent.hardy.be@gmail.com>
+Date: Thu, 8 Aug 2024 10:30:27 +0200
+Subject: [PATCH] Do not build xpi module
+
+xpi module has to be installed by the users
+---
+ Makefile.am | 2 +-
+ configure.ac | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 209a83c85..1073a8141 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I scripts/m4
+ EXTRA_DIST = scripts/build-aux/config.rpath scripts/build-aux/genver.sh .version debian rpm doc
+
+-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/v240 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/chrome_pkcs11 tests/fuzz
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/v240 plugins_tools/util tests/unit plugins_tools/chrome_pkcs11 tests/fuzz
+
+ if GTK
+ SUBDIRS += plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
+diff --git a/configure.ac b/configure.ac
+index 845e8487c..b729bb870 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -275,6 +275,5 @@ AC_CONFIG_FILES([Makefile
+ plugins_tools/eid-viewer/gtk/eid-viewer.desktop.sh
+ plugins_tools/eid-viewer/uml/Makefile
+ rpm/eid-mw.spec])
+-AC_CONFIG_SUBDIRS([plugins_tools/xpi])
+
+ AC_OUTPUT
+--
+2.44.2
+
diff --git a/app-crypt/eid-mw/files/0001-Fix-libdir-for-manifestdir.patch b/app-crypt/eid-mw/files/0001-Fix-libdir-for-manifestdir.patch
new file mode 100644
index 000000000000..4121c208725c
--- /dev/null
+++ b/app-crypt/eid-mw/files/0001-Fix-libdir-for-manifestdir.patch
@@ -0,0 +1,30 @@
+From feb0032d95568e7f0dd1736ac773363cc778ce59 Mon Sep 17 00:00:00 2001
+From: Vincent Hardy <vincent.hardy.be@gmail.com>
+Date: Thu, 8 Aug 2024 10:58:44 +0200
+Subject: [PATCH] Fix libdir for manifestdir
+
+See also https://github.com/Fedict/eid-mw/pull/199
+---
+ cardcomm/pkcs11/src/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
+index 33201b147..ddc410fb4 100644
+--- a/cardcomm/pkcs11/src/Makefile.am
++++ b/cardcomm/pkcs11/src/Makefile.am
+@@ -211,10 +211,10 @@ beid_spr_changepin_LDADD = @GTK_LIBS@
+ metainfodir = $(datarootdir)/metainfo
+ dist_metainfo_DATA = be.belgium.eid.eidmw.metainfo.xml
+
+-pkcs11_manifestdir = $(prefix)/lib/mozilla/pkcs11-modules
++pkcs11_manifestdir = $(libdir)/mozilla/pkcs11-modules
+ pkcs11_manifest_DATA = beidpkcs11.json beidpkcs11_alt.json
+
+-managed_storage_manifestdir = $(prefix)/lib/mozilla/managed-storage
++managed_storage_manifestdir = $(libdir)/mozilla/managed-storage
+ managed_storage_manifest_DATA = belgiumeid@eid.belgium.be.json
+
+ pkgconfig_DATA=libbeidpkcs11.pc
+--
+2.44.2
+
diff --git a/app-crypt/eid-mw/files/0001-Remove-uml-build.patch b/app-crypt/eid-mw/files/0001-Remove-uml-build.patch
new file mode 100644
index 000000000000..6ff056a9876a
--- /dev/null
+++ b/app-crypt/eid-mw/files/0001-Remove-uml-build.patch
@@ -0,0 +1,48 @@
+From 3ad7dc89bdcae1607b90909cb2a5598363da74cf Mon Sep 17 00:00:00 2001
+From: Vincent Hardy <vincent.hardy.be@gmail.com>
+Date: Thu, 8 Aug 2024 15:02:00 +0200
+Subject: [PATCH] Remove uml build
+
+See bug #811270
+---
+ cardcomm/pkcs11/src/Makefile.am | 3 +--
+ plugins_tools/eid-viewer/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
+index 33201b147..5decdfb26 100644
+--- a/cardcomm/pkcs11/src/Makefile.am
++++ b/cardcomm/pkcs11/src/Makefile.am
+@@ -148,7 +148,6 @@ noinst_HEADERS = \
+ dialogs/dialogsgtk/gtk_dialog_names.h \
+ fuzz/beid_fuzz.h
+
+-SUBDIRS = cardlayer/uml
+ if NO_DIALOGS
+ libbeidpkcs11_la_CXXFLAGS += -DNO_DIALOGS
+ libbeidpkcs11_la_LIBADD += libbeidcommon.la
+@@ -171,7 +170,7 @@ libdialogs_la_SOURCES = \
+ dialogs/dialogsgtk/dlgs_gtk.cpp \
+ dialogs/dialogsgtk/single_dialog.c
+ libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
+-SUBDIRS += dialogs/dialogsgtk/po
++SUBDIRS = dialogs/dialogsgtk/po
+ endif
+ endif
+
+diff --git a/plugins_tools/eid-viewer/Makefile.am b/plugins_tools/eid-viewer/Makefile.am
+index a25746d3d..0a631d41c 100644
+--- a/plugins_tools/eid-viewer/Makefile.am
++++ b/plugins_tools/eid-viewer/Makefile.am
+@@ -139,7 +139,7 @@ libeidviewer_la_LIBADD = $(top_builddir)/plugins_tools/util/liblabels.la $(top_b
+ libeidviewer_la_LDFLAGS = -version-info 1:0:1
+ AM_CFLAGS = @GTK_CFLAGS@ -I. -I$(srcdir)/include -Igtk -DDATAROOTDIR='"$(datarootdir)"' -I$(top_srcdir)/doc/sdk/include/v240 -I$(top_srcdir)/cardcomm/pkcs11/src/fuzz -I$(top_srcdir)/plugins_tools/util @SSL_CFLAGS@ @GIO_CFLAGS@ @XML2_CFLAGS@ @CURL_CFLAGS@ @libproxy_CFLAGS@ -fvisibility=hidden @FUZZING@
+ AM_CXXFLAGS = $(AM_CFLAGS) -std=c++98
+-SUBDIRS = . gtk/po test uml
++SUBDIRS = . gtk/po test
+
+ resources/%.c: resources/%.png
+ printf '%s\n' '#include <gdk-pixbuf/gdk-pixdata.h>' '#if __GNUC__ >= 4' '#pragma GCC diagnostic push' '#pragma GCC diagnostic ignored "-Wpointer-sign"' '#endif' > $@
+--
+2.44.2
+
diff --git a/app-crypt/gcr/gcr-3.41.1-r2.ebuild b/app-crypt/gcr/gcr-3.41.1-r2.ebuild
index 4be077ac83ef..eeba4912e1a0 100644
--- a/app-crypt/gcr/gcr-3.41.1-r2.ebuild
+++ b/app-crypt/gcr/gcr-3.41.1-r2.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
DEPEND="
>=dev-libs/glib-2.44.0:2
diff --git a/app-crypt/gcr/gcr-4.2.1.ebuild b/app-crypt/gcr/gcr-4.2.1.ebuild
index ed823652b725..37cdf93e2b8d 100644
--- a/app-crypt/gcr/gcr-4.2.1.ebuild
+++ b/app-crypt/gcr/gcr-4.2.1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
DEPEND="
>=dev-libs/glib-2.68.0:2
diff --git a/app-crypt/glep63-check/glep63-check-11.ebuild b/app-crypt/glep63-check/glep63-check-11.ebuild
index 5c8ed0f1b659..219a87590c93 100644
--- a/app-crypt/glep63-check/glep63-check-11.ebuild
+++ b/app-crypt/glep63-check/glep63-check-11.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit distutils-r1
diff --git a/app-crypt/gnupg-pkcs11-scd/Manifest b/app-crypt/gnupg-pkcs11-scd/Manifest
index 2a93cd938d41..3b993f14bc5e 100644
--- a/app-crypt/gnupg-pkcs11-scd/Manifest
+++ b/app-crypt/gnupg-pkcs11-scd/Manifest
@@ -1,2 +1 @@
DIST gnupg-pkcs11-scd-0.10.0.tar.bz2 149036 BLAKE2B 7282850ddb953a32114a3b28e9f1992dd73cc64d065c00308479276750bdfd52533c3347361d86fb6ddc8ae01fcfabe5b375501280c9bd93e6a6d4e209c63e98 SHA512 47b9afdc3552fc9a741a725c6732cd31cd2643d7483a50d26222d68d0557b700addff37d8598ee1076575b8bc1e1134a52e06b67d4f94dda7c90141a57ca4182
-DIST gnupg-pkcs11-scd-0.9.2.tar.bz2 147337 BLAKE2B 52784721bd91929c9d6efdae599893f5425d02e5621ded69d5bc2b5dfa5dd56ca6e0989d99879a2de245e53ba7add3fdacd58fb3b1200135b0a0e618163ade2d SHA512 6afb9f0c50976636df611a0204edb0ec75aa194ba332314e3c2d7228ecf798e5f79923202f8f189b1e4aefa236a46165a5e3f0e0d98320dc4fac2bd9ac38249e
diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2-r1.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2-r1.ebuild
deleted file mode 100644
index 96b4bdf1f3fe..000000000000
--- a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="PKCS#11 support for GnuPG"
-HOMEPAGE="https://sourceforge.net/projects/gnupg-pkcs11/"
-SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="proxy"
-
-DEPEND="
- dev-libs/openssl:0=
- dev-libs/libassuan:=
- dev-libs/libgcrypt:=
- dev-libs/libgpg-error:=
- dev-libs/pkcs11-helper:=
-"
-RDEPEND="
- ${DEPEND}
- proxy? (
- acct-group/gnupg-pkcs11
- acct-group/gnupg-pkcs11-scd-proxy
- acct-user/gnupg-pkcs11-scd-proxy
- )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
- local myeconfargs=(
- $(use_enable proxy)
- --with-proxy-socket=/run/gnupg-pkcs11-scd-proxy/cmd
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if use proxy; then
- newinitd "${FILESDIR}/gnupg-pkcs11-scd-proxy.initd" gnupg-pkcs11-scd-proxy
- newconfd "${FILESDIR}/gnupg-pkcs11-scd-proxy.confd" gnupg-pkcs11-scd-proxy
- fi
-}
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 59f7652f5ad6..8b4089714cd8 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -4,3 +4,5 @@ DIST gnupg-2.2.43.tar.bz2 7435426 BLAKE2B ddf5c89d317e6ce8d1a5348f0ef81ffa1c61c9
DIST gnupg-2.2.43.tar.bz2.sig 119 BLAKE2B 38fd3790f5065d67d6b5323ef7abbb79facf00e5b9daba98e5078302fc3887423173ba434c7eff1e64faecef88d87aab9c057c570d6e96e8d0808f07f32d8fa1 SHA512 47c5354869b1825e56fa4276826fcde1ee41c70aab9b411686cf2733f4d1df9c006049e49e066b22e475bd37b337f9ffc97f8bbca0c62c0f32296909464a0643
DIST gnupg-2.4.5.tar.bz2 7889060 BLAKE2B a8b80cd4dfbb377066efb5c9f1b6cdc6d0cd1b18358c962781b5c06de1545117b13038a4655ae627c36bfd2e5fee127692df8729d6b23e1b31051ab6d897b733 SHA512 4d54744f09399c5899144d0cb5fdc2756e45b058db41b9ea9df3be03e80b914509e16ef35aa0248e7561185b80f7a5f9fd6afcab8ccff75ff82ed555448a38ff
DIST gnupg-2.4.5.tar.bz2.sig 238 BLAKE2B b236e7d62f49c8385f4fb81389bf10715d9c0a0cb5c0b4c20fb6ff1465d05a3c3657061284db23af988a1ca16c9fa393af3ce5cbd27934501eb41a4f448fff0a SHA512 5a06970e499d1eb5213b142a8a182e46f5f21b7cb32785a9e5069378797c124e151ce74727382003820042d60fd7a2f909143f44aa9ef282605875e1cab04aef
+DIST gnupg-2.5.1.tar.bz2 8126739 BLAKE2B 46955d2eebe14395adc0fdf81e89a32f3f9baaabfe1eee78f256a1fab25ce6fdb96b873678cfeb5e4abf4894c7ab4908359ed04cc6571ff442dcc5325b3ccd66 SHA512 733a11ff24145e23dd7d34d954a70c25bf70ecb1d517b8e15cc34bf690786c9f7007e4e99cde573500ac012852e91b29568fed00491f8c8254b3fb63ca5777cd
+DIST gnupg-2.5.1.tar.bz2.sig 238 BLAKE2B cd024a63ecb82a12e92444cbff8dbc9bef6a4e436d59957aae77927cce0baf9e282e63df7a5159a521c7c8694a0dbe96d6537ad3ec5f779c7c0dea8d02b5e70d SHA512 8ffd5cc72a2907972bf1854e804f6c215ff66ba2d6e91952700f49b2b5ba8bab035d0f42efdb0d3c3166301cda6e716394928bdd9c0d0d1e1789a02c7aa1a926
diff --git a/app-crypt/gnupg/gnupg-2.2.42-r4.ebuild b/app-crypt/gnupg/gnupg-2.2.42-r4.ebuild
index 94c5b5230669..06f010973e05 100644
--- a/app-crypt/gnupg/gnupg-2.2.42-r4.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.42-r4.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/gnupg/gnupg-2.2.43-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.43-r1.ebuild
index 8b7c10b78f89..9ccaeb24401c 100644
--- a/app-crypt/gnupg/gnupg-2.2.43-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.43-r1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/gnupg/gnupg-2.4.5-r1.ebuild b/app-crypt/gnupg/gnupg-2.4.5-r1.ebuild
index cc4974e12dd2..9a5e81d91c5e 100644
--- a/app-crypt/gnupg/gnupg-2.4.5-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.4.5-r1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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 )"
diff --git a/app-crypt/gnupg/gnupg-2.4.5-r2.ebuild b/app-crypt/gnupg/gnupg-2.4.5-r2.ebuild
index 5b6cf6eaca80..bb88f4014f42 100644
--- a/app-crypt/gnupg/gnupg-2.4.5-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.4.5-r2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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 )"
@@ -136,7 +136,7 @@ my_src_configure() {
--enable-large-secmem
CC_FOR_BUILD="$(tc-getBUILD_CC)"
- ac_cv_path_GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config"
+ GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config"
$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
)
diff --git a/app-crypt/gnupg/gnupg-2.5.1.ebuild b/app-crypt/gnupg/gnupg-2.5.1.ebuild
new file mode 100644
index 000000000000..382e366f6c0d
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.5.1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
+# in-source builds are not supported: https://dev.gnupg.org/T6313#166339
+inherit flag-o-matic out-of-source multiprocessing 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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 )"
+
+# Existence of executables is checked during configuration.
+# Note: On each bump, update dep bounds on each version from configure.ac!
+DEPEND="
+ >=dev-libs/libassuan-2.5.0:=
+ >=dev-libs/libgcrypt-1.9.1:=
+ >=dev-libs/libgpg-error-1.46
+ >=dev-libs/libksba-1.6.3
+ >=dev-libs/npth-1.2
+ >=net-misc/curl-7.10
+ sys-libs/zlib
+ bzip2? ( app-arch/bzip2 )
+ 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.2:0= )
+"
+RDEPEND="
+ ${DEPEND}
+ nls? ( virtual/libintl )
+ selinux? ( sec-policy/selinux-gpg )
+ wks-server? ( virtual/mta )
+"
+PDEPEND="
+ app-crypt/pinentry
+"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( sys-apps/texinfo )
+ nls? ( sys-devel/gettext )
+ verify-sig? ( sec-keys/openpgp-keys-gnupg )
+"
+
+DOCS=(
+ ChangeLog NEWS README THANKS TODO VERSION
+ doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
+ "${FILESDIR}"/${PN}-2.4.5-revert-rfc4880bis.patch # bug #926186
+)
+
+src_prepare() {
+ default
+
+ GNUPG_SYSTEMD_UNITS=(
+ dirmngr.service
+ dirmngr.socket
+ gpg-agent-browser.socket
+ gpg-agent-extra.socket
+ gpg-agent.service
+ gpg-agent.socket
+ gpg-agent-ssh.socket
+ )
+
+ cp "${GNUPG_SYSTEMD_UNITS[@]/#/${FILESDIR}/}" "${T}" || die
+
+ # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
+ # idea borrowed from libdbus, see
+ # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
+ #
+ # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
+ # which in turn requires discovery in Autoconf, something that upstream deeply resents.
+ sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
+ -i "${T}"/gpg-agent-ssh.socket || die
+
+ # definition of getpeername etc uses different things like socket_fd_t
+ [[ ${CHOST} == *-solaris* ]] &&
+ append-cflags $(test-flags-CC -Wno-incompatible-pointer-types)
+}
+
+my_src_configure() {
+ # Upstream don't support LTO, bug #854222.
+ filter-lto
+
+ local myconf=(
+ $(use_enable bzip2)
+ $(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)
+
+ # 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
+ # by wks-client & wks-server; and if it's autodetected but not not exist at
+ # build time, then then 'gpg-wks-client --send' functionality will not
+ # work. This has an unwanted side-effect in stage3 builds: there was a
+ # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+ # the build where the install guide previously make the user chose the
+ # logger & mta early in the install.
+ --with-mailprog=/usr/libexec/sendmail
+
+ --disable-ntbtls
+ --enable-gpgsm
+ --enable-large-secmem
+
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+ GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config"
+
+ $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+ )
+
+ if use prefix && use usb; then
+ # bug #649598
+ append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0"
+ fi
+
+ # 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
+ tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
+
+ econf "${myconf[@]}"
+}
+
+my_src_compile() {
+ default
+
+ use doc && emake -C doc html
+}
+
+my_src_test() {
+ export TESTFLAGS="--parallel=$(makeopts_jobs)"
+
+ default
+}
+
+my_src_install() {
+ emake DESTDIR="${D}" install
+
+ use tools && dobin tools/{gpgconf,gpgsplit,gpg-check-pattern} tools/make-dns-cert
+
+ dosym gpg /usr/bin/gpg2
+ dosym gpgv /usr/bin/gpgv2
+ echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+ echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+ use doc && dodoc doc/gnupg.html/*
+}
+
+my_src_install_all() {
+ einstalldocs
+
+ use tools && dobin tools/{convert-from-106,mail-signed-keys,lspgpot}
+ use doc && dodoc doc/*.png
+
+ # Dropped upstream in https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=eae28f1bd4a5632e8f8e85b7248d1c4d4a10a5ed.
+ dodoc "${FILESDIR}"/README-systemd
+ systemd_douserunit "${GNUPG_SYSTEMD_UNITS[@]/#/${T}/}"
+}
diff --git a/app-crypt/gpgme/files/ecd0c86d62351d267bdc9566286c532a394c711b.patch b/app-crypt/gpgme/files/ecd0c86d62351d267bdc9566286c532a394c711b.patch
new file mode 100644
index 000000000000..5e7a37d9ff01
--- /dev/null
+++ b/app-crypt/gpgme/files/ecd0c86d62351d267bdc9566286c532a394c711b.patch
@@ -0,0 +1,40 @@
+From ecd0c86d62351d267bdc9566286c532a394c711b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
+Date: Mon, 2 Sep 2024 15:33:25 +0200
+Subject: [PATCH] build,python: Fix build with setuptools 72.2.0+
+
+* lang/python/setup.py.in (BuildExtFirstHack.run): Extend members of the
+extension instead of lists that were passed to the extension.
+--
+
+setuptools 72.2.0 integrated changes in distutils which included
+"Support for Pathlike objects in data files and extensions". With this
+change the extensions now take a copy of the sources list passed to the
+constructor instead of keeping a reference to the passed list. Hence,
+modifying the sources list that was passed to the extension didn't
+change the sources list of the extension anymore. This is fixed by
+modifying the sources list of the extension directly. For consistency
+we do the same for the swig_opts list.
+
+GnuPG-bug-id: 7281
+---
+ lang/python/setup.py.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
+index 7b64ba7b..d6f537e0 100755
+--- a/lang/python/setup.py.in
++++ b/lang/python/setup.py.in
+@@ -217,9 +217,9 @@ class BuildExtFirstHack(build):
+ def run(self):
+ self._generate()
+
+- swig_sources.extend((self._in_build_base('gpgme.i'),
+- self._in_build_base('helpers.c')))
+- swig_opts.extend([
++ swige.sources.extend((self._in_build_base('gpgme.i'),
++ self._in_build_base('helpers.c')))
++ swige.swig_opts.extend([
+ '-I' + self.build_base, '-outdir',
+ os.path.join(self.build_lib, 'gpg')
+ ])
diff --git a/app-crypt/gpgme/gpgme-1.23.2.ebuild b/app-crypt/gpgme/gpgme-1.23.2-r1.ebuild
index 4a1dffbc2557..d2971998fa7e 100644
--- a/app-crypt/gpgme/gpgme-1.23.2.ebuild
+++ b/app-crypt/gpgme/gpgme-1.23.2-r1.ebuild
@@ -33,7 +33,7 @@ LICENSE="GPL-2 LGPL-2.1"
# Bump FUDGE if a release is made which breaks ABI without changing SONAME.
# (Reset to 0 if FUDGE != 0 if libgpgme/libgpgmepp/libqpggme change.)
SLOT="1/11.6.15.2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="common-lisp static-libs +cxx python qt5 qt6 test"
RESTRICT="!test? ( test )"
REQUIRED_USE="
@@ -69,6 +69,8 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.18.0-tests-start-stop-agent-use-command-v.patch
"${FILESDIR}"/${PN}-1.23.1-tests-gnupg-no-tofu.patch
+ # backport fix for setuptools 72.2 breakage
+ "${FILESDIR}"/ecd0c86d62351d267bdc9566286c532a394c711b.patch
)
src_prepare() {
@@ -152,6 +154,7 @@ gpgme_src_configure() {
$(use test || echo "--disable-gpgconf-test --disable-gpg-test --disable-gpgsm-test --disable-g13-test")
--enable-languages="${languages[*]}"
$(use_enable static-libs static)
+ GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config"
)
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
diff --git a/app-crypt/gpgme/gpgme-1.23.2-r2.ebuild b/app-crypt/gpgme/gpgme-1.23.2-r2.ebuild
new file mode 100644
index 000000000000..e91f23abe68a
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.23.2-r2.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
+
+# in-source builds are not supported:
+# * https://dev.gnupg.org/T6313#166339
+# * https://dev.gnupg.org/T6673#174545
+inherit distutils-r1 libtool flag-o-matic multibuild qmake-utils toolchain-funcs verify-sig
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="https://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.FUDGE>
+# Bump FUDGE if a release is made which breaks ABI without changing SONAME.
+# (Reset to 0 if FUDGE != 0 if libgpgme/libgpgmepp/libqpggme change.)
+SLOT="1/11.6.15.2"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="common-lisp static-libs +cxx python qt5 qt6 test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+ qt5? ( cxx )
+ qt6? ( cxx )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# - 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.46-r1:=
+ python? ( ${PYTHON_DEPS} )
+ qt5? ( dev-qt/qtcore:5 )
+ qt6? ( dev-qt/qtbase:6 )
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ qt5? ( dev-qt/qttest:5 )
+ )
+"
+#doc? ( app-text/doxygen[dot] )
+BDEPEND="
+ python? (
+ ${PYTHON_DEPS}
+ ${DISTUTILS_DEPS}
+ dev-lang/swig
+ )
+ verify-sig? ( sec-keys/openpgp-keys-gnupg )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.18.0-tests-start-stop-agent-use-command-v.patch
+ "${FILESDIR}"/${PN}-1.23.1-tests-gnupg-no-tofu.patch
+ # backport fix for setuptools 72.2 breakage
+ "${FILESDIR}"/ecd0c86d62351d267bdc9566286c532a394c711b.patch
+)
+
+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"
+
+ # Qt 5 and Qt 6 are mutually exclusive in the gpgme build. We don't have
+ # to do three builds (normal, qt5, qt6), and we can instead just
+ # do normal+qt5 or normal+qt6. For now, we pessimise qt6 by making it
+ # be a separate build, but in time, we can swap it so qt5 has to be
+ # the separate one so some build time gets saved in the common case.
+ MULTIBUILD_VARIANTS=(
+ base
+ $(usev qt6 qt6)
+ )
+
+ gpgme_create_builddir() {
+ mkdir -p "${BUILD_DIR}" || die
+ }
+
+ multibuild_foreach_variant gpgme_create_builddir
+}
+
+src_configure() {
+ multibuild_foreach_variant gpgme_src_configure
+}
+
+gpgme_src_configure() {
+ # bug #847955
+ append-lfs-flags
+
+ cd "${BUILD_DIR}" || die
+
+ local languages=()
+
+ case ${MULTIBUILD_VARIANT} in
+ base)
+ languages=(
+ $(usev common-lisp 'cl')
+ $(usev cxx 'cpp')
+ $(usev qt5 'qt5')
+ )
+
+ if use qt5; then
+ #use doc ||
+ export DOXYGEN=true
+ export MOC="$(qt5_get_bindir)/moc"
+ fi
+
+ ;;
+ *)
+ # Sanity check for refactoring, the non-base variant is only for Qt 6
+ use qt6 || die "Non-base variant shouldn't be built without Qt 6! Please report at bugs.gentoo.org."
+
+ languages=(
+ cpp
+ qt6
+ )
+
+ export MOC="$(qt6_get_libdir)/qt6/libexec/moc"
+
+ ;;
+ esac
+
+ local myeconfargs=(
+ $(use test || echo "--disable-gpgconf-test --disable-gpg-test --disable-gpgsm-test --disable-g13-test")
+ --enable-languages="${languages[*]}"
+ $(use_enable static-libs static)
+ GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config"
+ )
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+ if [[ ${MULTIBUILD_VARIANT} == base ]] && use python ; then
+ emake -C lang/python prepare
+
+ pushd lang/python > /dev/null || die
+ top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_configure
+ popd > /dev/null || die
+ fi
+}
+
+src_compile() {
+ multibuild_foreach_variant gpgme_src_compile
+}
+
+gpgme_src_compile() {
+ cd "${BUILD_DIR}" || die
+
+ emake
+
+ if [[ ${MULTIBUILD_VARIANT} == base ]] && use python ; then
+ pushd lang/python > /dev/null || die
+ top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_compile
+ popd > /dev/null || die
+ fi
+}
+
+src_test() {
+ multibuild_foreach_variant gpgme_src_test
+}
+
+gpgme_src_test() {
+ cd "${BUILD_DIR}" || die
+
+ emake check
+
+ if [[ ${MULTIBUILD_VARIANT} == base ]] && use python ; then
+ distutils-r1_src_test
+ fi
+}
+
+python_test() {
+ emake -C lang/python/tests check \
+ PYTHON=${EPYTHON} \
+ PYTHONS=${EPYTHON} \
+ TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+}
+
+src_install() {
+ einstalldocs
+ multibuild_foreach_variant gpgme_src_install
+}
+
+gpgme_src_install() {
+ cd "${BUILD_DIR}" || die
+
+ emake DESTDIR="${D}" install
+
+ if [[ ${MULTIBUILD_VARIANT} == base ]] && use python ; then
+ pushd lang/python > /dev/null || die
+ top_builddir="../.." srcdir="${S}/lang/python" CPP="$(tc-getCPP)" distutils-r1_src_install
+ popd > /dev/null || die
+ fi
+
+ find "${ED}" -type f -name '*.la' -delete || die
+
+ # Backward compatibility for gentoo
+ # (in the past, we had slots)
+ dodir /usr/include/gpgme
+ dosym -r /usr/include/gpgme.h /usr/include/gpgme/gpgme.h
+}
diff --git a/app-crypt/hashalot/hashalot-0.3-r2.ebuild b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
index 7f65384a9edd..85497b2e9391 100644
--- a/app-crypt/hashalot/hashalot-0.3-r2.ebuild
+++ b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
@@ -9,4 +9,4 @@ SRC_URI="https://www.paranoiacs.org/~sluskyb/hacks/hashalot/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/app-crypt/heimdal/heimdal-7.8.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.8.0-r1.ebuild
deleted file mode 100644
index 2db7d36fe6fe..000000000000
--- a/app-crypt/heimdal/heimdal-7.8.0-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use multilib-minimal python-any-r1 virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="https://www.heimdal.software/"
-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"
-IUSE="afs +berkdb caps gdbm hdb-ldap +lmdb otp selinux ssl static-libs test X"
-RESTRICT="!test? ( test )"
-
-# 717740
-REQUIRED_USE="otp? ( berkdb )"
-
-CDEPEND="
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- ssl? (
- >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
- )
- berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
- gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
- 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/ncurses:0=
- >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
- afs? ( net-fs/openafs )
- hdb-ldap? ( >=net-nds/openldap-2.3.0:= )
- X? (
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXt
- )
- !!app-crypt/mit-krb5
- !!app-crypt/mit-krb5-appl"
-
-DEPEND="${CDEPEND}
- ${PYTHON_DEPS}
- dev-perl/JSON
- virtual/pkgconfig
- sys-apps/texinfo
- >=dev-build/autoconf-2.62
- test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-kerberos )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/krb5-types.h
- /usr/include/cms_asn1.h
- /usr/include/digest_asn1.h
- /usr/include/hdb_asn1.h
- /usr/include/krb5_asn1.h
- /usr/include/pkcs12_asn1.h
- /usr/include/pkinit_asn1.h
- /usr/include/rfc2459_asn1.h
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/krb5-config
-)
-
-PATCHES=(
- "${FILESDIR}/heimdal_disable-check-iprop.patch"
- "${FILESDIR}/heimdal_tinfo.patch"
- "${FILESDIR}/heimdal_build-headers-before-use.patch"
- "${FILESDIR}/heimdal_fix-db60.patch"
- "${FILESDIR}/heimdal-7.8.0-CVE-2022-45142.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # QA
- append-flags -fno-strict-aliasing
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --enable-kcm
- --disable-osfc2
- --enable-shared
- --with-libintl="${EPREFIX}"/usr
- --with-readline="${EPREFIX}"/usr
- --with-sqlite3="${EPREFIX}"/usr
- --libexecdir="${EPREFIX}"/usr/sbin
- --enable-pthread-support
- --enable-kx509
- --enable-pk-init
- --with-ipv6
- $(use_enable afs afs-support)
- $(use_enable gdbm ndbm-db)
- $(use_enable lmdb mdb-db)
- $(use_enable otp)
- $(use_enable static-libs static)
- $(multilib_native_use_with caps capng)
- $(multilib_native_use_with hdb-ldap openldap "${EPREFIX}"/usr)
- $(use_with ssl openssl "${EPREFIX}"/usr)
- $(multilib_native_use_with X x)
- )
- if use berkdb; then
- myeconfargs+=(
- --with-berkeley-db
- --with-berkeley-db-include="$(db_includedir)"
- )
- else
- myeconfargs+=(
- --without-berkeley-db
- )
- fi
-
- CONFIG_SHELL="${BROOT}"/bin/bash ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- else
- emake -C include
- emake -C lib
- emake -C kdc
- emake -C tools
- emake -C tests/plugin
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
- else
- emake -C include DESTDIR="${D}" install
- emake -C lib DESTDIR="${D}" install
- emake -C kdc DESTDIR="${D}" install
- emake -C tools DESTDIR="${D}" install
- emake -C tests/plugin DESTDIR="${D}" install
- fi
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog* README NEWS TODO
-
- # client rename
- mv "${ED}"/usr/share/man/man1/{,k}su.1
- mv "${ED}"/usr/bin/{,k}su
-
- newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
- newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
- newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
- newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
- newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
- newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
- newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
- newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
- insinto /etc
- newins "${S}"/krb5.conf krb5.conf.example
-
- if use hdb-ldap; then
- insinto /etc/openldap/schema
- doins "${S}/lib/hdb/hdb.schema"
- fi
-
- if ! use static-libs ; then
- find "${ED}" -name "*.la" -delete || die
- fi
-
- # default database dir
- keepdir /var/heimdal
-}
diff --git a/app-crypt/heimdal/heimdal-7.8.0-r2.ebuild b/app-crypt/heimdal/heimdal-7.8.0-r2.ebuild
deleted file mode 100644
index 8645dd099c0d..000000000000
--- a/app-crypt/heimdal/heimdal-7.8.0-r2.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use multilib-minimal python-any-r1 virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="https://www.heimdal.software/"
-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"
-IUSE="afs +berkdb caps gdbm hdb-ldap +lmdb otp selinux ssl static-libs test X"
-RESTRICT="!test? ( test )"
-
-# 717740
-REQUIRED_USE="otp? ( berkdb )"
-
-CDEPEND="
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- ssl? (
- >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
- )
- berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
- gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
- 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/ncurses:0=
- >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
- afs? ( net-fs/openafs )
- hdb-ldap? ( >=net-nds/openldap-2.3.0:= )
- X? (
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXt
- )
- !!app-crypt/mit-krb5
- !!app-crypt/mit-krb5-appl"
-
-DEPEND="${CDEPEND}
- ${PYTHON_DEPS}
- dev-perl/JSON
- virtual/pkgconfig
- sys-apps/texinfo
- >=dev-build/autoconf-2.62
- test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-kerberos )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/krb5-types.h
- /usr/include/cms_asn1.h
- /usr/include/digest_asn1.h
- /usr/include/hdb_asn1.h
- /usr/include/krb5_asn1.h
- /usr/include/pkcs12_asn1.h
- /usr/include/pkinit_asn1.h
- /usr/include/rfc2459_asn1.h
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/krb5-config
-)
-
-PATCHES=(
- "${FILESDIR}/heimdal_disable-check-iprop.patch"
- "${FILESDIR}/heimdal_tinfo.patch"
- "${FILESDIR}/heimdal_build-headers-before-use.patch"
- "${FILESDIR}/heimdal_fix-db60.patch"
- "${FILESDIR}/heimdal-7.8.0-CVE-2022-45142.patch"
- "${FILESDIR}/heimdal-7.8.0-configure-clang16.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # QA
- append-flags -fno-strict-aliasing
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --enable-kcm
- --disable-osfc2
- --enable-shared
- --with-libintl="${EPREFIX}"/usr
- --with-readline="${EPREFIX}"/usr
- --with-sqlite3="${EPREFIX}"/usr
- --libexecdir="${EPREFIX}"/usr/sbin
- --enable-pthread-support
- --enable-kx509
- --enable-pk-init
- --with-ipv6
- $(use_enable afs afs-support)
- $(use_enable gdbm ndbm-db)
- $(use_enable lmdb mdb-db)
- $(use_enable otp)
- $(use_enable static-libs static)
- $(multilib_native_use_with caps capng)
- $(multilib_native_use_with hdb-ldap openldap "${EPREFIX}"/usr)
- $(use_with ssl openssl "${EPREFIX}"/usr)
- $(multilib_native_use_with X x)
- )
- if use berkdb; then
- myeconfargs+=(
- --with-berkeley-db
- --with-berkeley-db-include="$(db_includedir)"
- )
- else
- myeconfargs+=(
- --without-berkeley-db
- )
- fi
-
- CONFIG_SHELL="${BROOT}"/bin/bash ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- else
- emake -C include
- emake -C lib
- emake -C kdc
- emake -C tools
- emake -C tests/plugin
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
- else
- emake -C include DESTDIR="${D}" install
- emake -C lib DESTDIR="${D}" install
- emake -C kdc DESTDIR="${D}" install
- emake -C tools DESTDIR="${D}" install
- emake -C tests/plugin DESTDIR="${D}" install
- fi
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog* README NEWS TODO
-
- # client rename
- mv "${ED}"/usr/share/man/man1/{,k}su.1
- mv "${ED}"/usr/bin/{,k}su
-
- newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
- newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
- newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
- newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
- newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
- newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
- newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
- newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
- insinto /etc
- newins "${S}"/krb5.conf krb5.conf.example
-
- if use hdb-ldap; then
- insinto /etc/openldap/schema
- doins "${S}/lib/hdb/hdb.schema"
- fi
-
- if ! use static-libs ; then
- find "${ED}" -name "*.la" -delete || die
- fi
-
- # default database dir
- keepdir /var/heimdal
-}
diff --git a/app-crypt/heimdal/heimdal-7.8.0-r3.ebuild b/app-crypt/heimdal/heimdal-7.8.0-r3.ebuild
index b40684f69353..5c703d0db52e 100644
--- a/app-crypt/heimdal/heimdal-7.8.0-r3.ebuild
+++ b/app-crypt/heimdal/heimdal-7.8.0-r3.ebuild
@@ -14,7 +14,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 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="afs +berkdb caps gdbm hdb-ldap +lmdb otp selinux static-libs test X"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/jitterentropy-rngd/Manifest b/app-crypt/jitterentropy-rngd/Manifest
index 74c99ee7cd19..dd4573cb71cf 100644
--- a/app-crypt/jitterentropy-rngd/Manifest
+++ b/app-crypt/jitterentropy-rngd/Manifest
@@ -1,2 +1 @@
-DIST jitterentropy-rngd-1.2.7.tar.gz 46546 BLAKE2B 82f0610ab5e2dd4ac42b5c2a72a59cc9c78dd65f82327302d4699b129280d45bf61a7197d44d3d141b6ccd3b512b984b0f95f1594c97a8c54f10c0d58906089c SHA512 4d89110cb7456b360f4c268121b61c2141b9d592877728eb94de0c8679928689b3b039a99579af4ee1299a1eb538c9a2d4527d9a4e98f85022c590a0d01f4811
DIST jitterentropy-rngd-1.2.8.tar.gz 46950 BLAKE2B 67e6a590bf5d535a6f8cf465b8c6f59ccc101e699979573e117432545800e42393e2232f5a3404f03f7806eb79c4a3148a14eb35f660233926ac874ad5207779 SHA512 9cc2c66388f592e2e4df89e0e9950dc83af168658dd456c9b1af9883cce7ce5f6ece37089d7dbfb0bb61433a52bf596d129819b3328551f2ec29a5d74f94ea47
diff --git a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.7.ebuild b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.7.ebuild
deleted file mode 100644
index 37d72d52b963..000000000000
--- a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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.8.ebuild b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.8.ebuild
index a4b7ead3be06..f30f4e698c65 100644
--- a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.8.ebuild
+++ b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.8.ebuild
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/smuellerDD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~mips x86"
-IUSE=""
PATCHES=(
"${FILESDIR}"/${PN}-1.1.0-do-not-strip-and-compress.patch
diff --git a/app-crypt/jitterentropy/Manifest b/app-crypt/jitterentropy/Manifest
index 7da1002321d2..3851d1a1f269 100644
--- a/app-crypt/jitterentropy/Manifest
+++ b/app-crypt/jitterentropy/Manifest
@@ -1 +1,2 @@
DIST jitterentropy-3.4.1.tar.gz 86110 BLAKE2B 729ef7d01a17c9eb16cc352da0286bd292f2faae63754b06036dbb44d52e85e2e2e0d2a38ac57d4350eaebbc47457f0457a988a657f7fe6c5d782d50922552d2 SHA512 c832b33c084a8c56fb9ee0c0f7397fa9206cbd6fcbea047495e543566fc0d9b5d8978c8668103203d87b5b70c0e177f9ef7cc614b3ce689b90fbb8b85e6fedbb
+DIST jitterentropy-3.6.0.tar.gz 96456 BLAKE2B 5e4fc185f16b59456a681e37f90de3b1e381bd6269bf72294822c1b8db11bbd5fe48640f2f38257c9b1238df38df7d95c2d1b9136b12364dde6e5cf3395c2e6e SHA512 8b234d0ac8115d004e8b1f41318e42d72324dfcbea0b3ba96499a6f9d740e13659c5bea032f77baad8d8ea3846fcd628665df573ab12b6111785f4bb5954834c
diff --git a/app-crypt/jitterentropy/jitterentropy-3.4.1.ebuild b/app-crypt/jitterentropy/jitterentropy-3.4.1.ebuild
index 42a147c26dbe..55793288ccc8 100644
--- a/app-crypt/jitterentropy/jitterentropy-3.4.1.ebuild
+++ b/app-crypt/jitterentropy/jitterentropy-3.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.
# Do not package these two components!
LICENSE="BSD"
SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86"
IUSE="static-libs"
S="${WORKDIR}/${PN}-library-${PV}"
diff --git a/app-crypt/jitterentropy/jitterentropy-3.6.0.ebuild b/app-crypt/jitterentropy/jitterentropy-3.6.0.ebuild
new file mode 100644
index 000000000000..987687b0feb5
--- /dev/null
+++ b/app-crypt/jitterentropy/jitterentropy-3.6.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 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"
+S="${WORKDIR}/${PN}-library-${PV}"
+
+# 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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="static-libs"
+
+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_p20230717.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild
index 368d59abb709..c5012306a202 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20230717.ebuild
@@ -17,7 +17,7 @@ else
SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/john-${HASH_COMMIT}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
fi
LICENSE="GPL-2"
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild
index d4b9287e610c..1b05f5211215 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20240102.ebuild
@@ -16,7 +16,7 @@ else
HASH_COMMIT="9daf16b5743b2c521d23c281e13ae8cdbd37b1eb"
SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/john-${HASH_COMMIT}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
fi
LICENSE="GPL-2"
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
index d4b9287e610c..1b05f5211215 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
@@ -16,7 +16,7 @@ else
HASH_COMMIT="9daf16b5743b2c521d23c281e13ae8cdbd37b1eb"
SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/john-${HASH_COMMIT}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
fi
LICENSE="GPL-2"
diff --git a/app-crypt/keysmith/Manifest b/app-crypt/keysmith/Manifest
index b6d5aa94e987..2ddb420879ed 100644
--- a/app-crypt/keysmith/Manifest
+++ b/app-crypt/keysmith/Manifest
@@ -1,2 +1,2 @@
-DIST keysmith-23.08.5.tar.xz 163456 BLAKE2B b7338decbf1ccfe9f07d208decdcc1ea5133df9d7f53ff4e543c46782e5218e146e35f8d8348f8300021f7223d4edc8cf85a36ca777b00c52a5c13590c9ce12c SHA512 4c53ac7a217cd2f82cb0e270df1e4e7382d6fe3f7a7ff5008e392ae50418b6bf505f596d17c009921532bfbccba3d33f81cc934433ea63d9ba65c1187b4cba69
DIST keysmith-24.05.2.tar.xz 171756 BLAKE2B 5059579e9529f834814a3f586dbab5aad1a5235759c0fa76a7c7cf5588bb3b2fd64ca381d0d749d88cf74446ca5a380cb6f49eebe005e34a6f184e3f8fbcf7dd SHA512 fd2964b4fc754ac71d5fc2b273e2e70671f4b8a4cdf95e340ade20a234d7ddbfc81e0a6bfbde3178b49ba94b3219a2e1169903eac4d707b1f130df7ed7478f77
+DIST keysmith-24.08.1.tar.xz 171424 BLAKE2B 79f3f12c533245749e17c98e6cc4c3f7856d393b4a01f208b611a7ba354145c3c44d93a078ed1728e592c62c4b05783870da1b643ddf74ea06f1f2d08801b1ec SHA512 c1386053249c65c626a5c2d2a84c7a036a4b702c5fd240217f5bc26de55e6eadcd0a7e3235a0a949dc8862fc96400fb3b8d26da476dc9d0e89969bdaea6079cc
diff --git a/app-crypt/keysmith/keysmith-23.08.5.ebuild b/app-crypt/keysmith/keysmith-23.08.5.ebuild
deleted file mode 100644
index 76d10a60f84a..000000000000
--- a/app-crypt/keysmith/keysmith-23.08.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="utilities"
-ECM_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="OTP client for Plasma Mobile and Desktop"
-HOMEPAGE="https://apps.kde.org/keysmith/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/kirigami-addons:5
- dev-libs/libsodium:=
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
- >=dev-qt/qtconcurrent-${QTMIN}:5
-"
diff --git a/app-crypt/keysmith/keysmith-24.05.2.ebuild b/app-crypt/keysmith/keysmith-24.05.2.ebuild
index 682ba722ec48..bb6b9b405e71 100644
--- a/app-crypt/keysmith/keysmith-24.05.2.ebuild
+++ b/app-crypt/keysmith/keysmith-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/keysmith/"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
IUSE=""
COMMON_DEPEND="
diff --git a/app-crypt/keysmith/keysmith-24.08.1.ebuild b/app-crypt/keysmith/keysmith-24.08.1.ebuild
new file mode 100644
index 000000000000..592cdbe13527
--- /dev/null
+++ b/app-crypt/keysmith/keysmith-24.08.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="utilities"
+ECM_TEST="true"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="OTP client for Plasma Mobile and Desktop"
+HOMEPAGE="https://apps.kde.org/keysmith/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ dev-libs/kirigami-addons:6
+ dev-libs/libsodium:=
+ >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ >=dev-qt/qtsvg-${QTMIN}:6
+ >=kde-frameworks/kdbusaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kirigami-${KFMIN}:6
+ >=kde-frameworks/kwindowsystem-${KFMIN}:6
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+RDEPEND="${COMMON_DEPEND}
+ >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+"
diff --git a/app-crypt/libb2/libb2-0.98.1-r3.ebuild b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
index 0137d18d8f28..17751b670871 100644
--- a/app-crypt/libb2/libb2-0.98.1-r3.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
@@ -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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="static-libs native-cflags openmp"
DEPEND="
diff --git a/app-crypt/libmd/libmd-1.0.4.ebuild b/app-crypt/libmd/libmd-1.0.4.ebuild
index 1cae95fb395f..dfc759395da4 100644
--- a/app-crypt/libmd/libmd-1.0.4.ebuild
+++ b/app-crypt/libmd/libmd-1.0.4.ebuild
@@ -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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
PATCHES=(
"${FILESDIR}/${P}-fix-version-script-linker-support-detection.patch"
diff --git a/app-crypt/libmd/libmd-1.1.0.ebuild b/app-crypt/libmd/libmd-1.1.0.ebuild
index 3d3edc297844..9b42d0144f69 100644
--- a/app-crypt/libmd/libmd-1.1.0.ebuild
+++ b/app-crypt/libmd/libmd-1.1.0.ebuild
@@ -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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~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/libsecret/libsecret-0.21.1.ebuild b/app-crypt/libsecret/libsecret-0.21.1.ebuild
index 5b17eac59d1e..0cd65d714b41 100644
--- a/app-crypt/libsecret/libsecret-0.21.1.ebuild
+++ b/app-crypt/libsecret/libsecret-0.21.1.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
gtk-doc? ( crypt )
"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
DEPEND="
>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.1.ebuild b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.1.ebuild
index 467544ceb089..00f67816b903 100644
--- a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.1.ebuild
+++ b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.1.ebuild
@@ -55,7 +55,7 @@ src_unpack() {
if use verify-sig; then
einfo "Unpacking ${MY_P}.tar.xz ..."
verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
- < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x)) "${BROOT}"/usr/share/openpgp-keys/karelzak.asc
+ < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -)) "${BROOT}"/usr/share/openpgp-keys/karelzak.asc
assert "Unpack failed"
verify-sig_verify_detached "${DISTDIR}"/${LOOPAES_P}.tar.bz2{,.sign}
diff --git a/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild b/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild
index 9a04113bf6bf..ed01e8b388cf 100644
--- a/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild
+++ b/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/mhash/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="static-libs"
BDEPEND="dev-lang/perl" # pod2html
diff --git a/app-crypt/minisign/minisign-0.11-r1.ebuild b/app-crypt/minisign/minisign-0.11-r1.ebuild
index adf0b7060096..cbf58300c3be 100644
--- a/app-crypt/minisign/minisign-0.11-r1.ebuild
+++ b/app-crypt/minisign/minisign-0.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
DEPEND="
dev-libs/libsodium:=[-minimal(-)]
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 6b8ddc9b0c32..50e520eade22 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
@@ -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 ~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-appl/mit-krb5-appl-1.0.3-r4.ebuild b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r4.ebuild
index 3155167a82d3..60e927514503 100644
--- a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r4.ebuild
+++ b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r4.ebuild
@@ -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 ~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 185c64f6f211..655ded545df1 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,2 +1 @@
-DIST krb5-1.21.2.tar.gz 8622513 BLAKE2B 2afb3ff962a343bc07182fdab0c0ffb221632ff38baab74278cfc721ae72deacc260221470de36e420584f00b780e13221d2e511d4831bca8e1270b7f3d9e824 SHA512 4e09296b412383d53872661718dbfaa90201e0d85f69db48e57a8d4bd73c95a90c7ec7b6f0f325f6bc967f8d203b256b071c0191facf080aca0e2caec5d0ac49
DIST krb5-1.21.3.tar.gz 9136145 BLAKE2B e909a55eaedab68e5c829bb7bbd26cec5db2d7b8d97f3b034de94d8f957003f16977ac619afee3b862f288e59f05c5e44f41e65b8883961c8b22a26e2f4733bc SHA512 87bc06607f4d95ff604169cea22180703a42d667af05f66f1569b8bd592670c42820b335e5c279e8b4f066d1e7da20f1948a1e4def7c5d295c170cbfc7f49c71
diff --git a/app-crypt/mit-krb5/mit-krb5-1.21.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.21.2.ebuild
deleted file mode 100644
index 8f94ab10df74..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.21.2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools flag-o-matic 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"
-S=${WORKDIR}/${MY_P}/src
-
-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}
- app-alternatives/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 )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.12_warn_cflags.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() {
- # lto-type-mismatch (bug #854225)
- filter-lto
-
- multilib-minimal_src_configure
-}
-
-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/mit-krb5/mit-krb5-1.21.3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.21.3.ebuild
index 9c5de12c588a..7456a0e9e8c8 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.21.3.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.21.3.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}/src
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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux test xinetd"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/moolticute/moolticute-1.01.0.ebuild b/app-crypt/moolticute/moolticute-1.00.1-r1.ebuild
index d7fa4843bf98..fd840ecf9eb0 100644
--- a/app-crypt/moolticute/moolticute-1.01.0.ebuild
+++ b/app-crypt/moolticute/moolticute-1.00.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,6 @@ HOMEPAGE="https://github.com/mooltipass/moolticute"
LICENSE="GPL-3"
SLOT="0"
-IUSE="systemd"
RDEPEND="
>=dev-libs/libusb-1.0.20
@@ -29,8 +28,7 @@ RDEPEND="
dev-qt/qttest:5
dev-qt/qtwebsockets:5
dev-qt/qtwidgets:5
- systemd? ( sys-apps/systemd )
- !systemd? ( sys-apps/systemd-utils )
+ virtual/libudev:=
"
BDEPEND="${RDEPEND}
dev-qt/linguist-tools:5
diff --git a/app-crypt/moolticute/moolticute-1.00.1.ebuild b/app-crypt/moolticute/moolticute-1.01.0-r1.ebuild
index d7fa4843bf98..fd840ecf9eb0 100644
--- a/app-crypt/moolticute/moolticute-1.00.1.ebuild
+++ b/app-crypt/moolticute/moolticute-1.01.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,6 @@ HOMEPAGE="https://github.com/mooltipass/moolticute"
LICENSE="GPL-3"
SLOT="0"
-IUSE="systemd"
RDEPEND="
>=dev-libs/libusb-1.0.20
@@ -29,8 +28,7 @@ RDEPEND="
dev-qt/qttest:5
dev-qt/qtwebsockets:5
dev-qt/qtwidgets:5
- systemd? ( sys-apps/systemd )
- !systemd? ( sys-apps/systemd-utils )
+ virtual/libudev:=
"
BDEPEND="${RDEPEND}
dev-qt/linguist-tools:5
diff --git a/app-crypt/moolticute/moolticute-1.03.0.ebuild b/app-crypt/moolticute/moolticute-1.03.0-r1.ebuild
index 706c83a1a2da..583d9b162471 100644
--- a/app-crypt/moolticute/moolticute-1.03.0.ebuild
+++ b/app-crypt/moolticute/moolticute-1.03.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,6 @@ HOMEPAGE="https://github.com/mooltipass/moolticute"
LICENSE="GPL-3"
SLOT="0"
-IUSE="systemd"
RDEPEND="
>=dev-libs/libusb-1.0.20
@@ -29,8 +28,7 @@ RDEPEND="
dev-qt/qttest:5
dev-qt/qtwebsockets:5
dev-qt/qtwidgets:5
- systemd? ( sys-apps/systemd )
- !systemd? ( sys-apps/systemd-utils )
+ virtual/libudev:=
"
BDEPEND="${RDEPEND}
dev-qt/linguist-tools:5
diff --git a/app-crypt/moolticute/moolticute-9999.ebuild b/app-crypt/moolticute/moolticute-9999.ebuild
index d7fa4843bf98..fd840ecf9eb0 100644
--- a/app-crypt/moolticute/moolticute-9999.ebuild
+++ b/app-crypt/moolticute/moolticute-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,6 @@ HOMEPAGE="https://github.com/mooltipass/moolticute"
LICENSE="GPL-3"
SLOT="0"
-IUSE="systemd"
RDEPEND="
>=dev-libs/libusb-1.0.20
@@ -29,8 +28,7 @@ RDEPEND="
dev-qt/qttest:5
dev-qt/qtwebsockets:5
dev-qt/qtwidgets:5
- systemd? ( sys-apps/systemd )
- !systemd? ( sys-apps/systemd-utils )
+ virtual/libudev:=
"
BDEPEND="${RDEPEND}
dev-qt/linguist-tools:5
diff --git a/app-crypt/osslsigncode/Manifest b/app-crypt/osslsigncode/Manifest
index c685ec090a50..2b5d54ee6558 100644
--- a/app-crypt/osslsigncode/Manifest
+++ b/app-crypt/osslsigncode/Manifest
@@ -1,6 +1,2 @@
-DIST osslsigncode-2.5.tar.gz 154421 BLAKE2B 44b406f8f2cbac6c89e63ea5aba98e5571e26ecd7f86695879a13199a11025d2689d3e369838cb69c0de7be6c3d06fc7d8709a57ee2132cd25348137d5094417 SHA512 aa491518e6383bad4209616e88cec46e047596afd54067d02be8e7c87030999b6dc715983214e389c2f58fb5b10350b36dfe28e6179b9893fc5266172b2dae01
DIST osslsigncode-2.8.tar.gz 747274 BLAKE2B 62472d0830b53b2d182b37585a225f0699600bcc2bad5915a64a52b5b7c3fab6f7e936ba82e41907e41c9b0cc1f8ff5f47aa79feb8c5742b16d1fe101baf3db0 SHA512 dd7349e3a64c1d6f63379a14450c8e643c006d2824dc41ce9ecde64ba276466772c440e577aca4a805a49c7ba88aa0dcf5ea73c323abcc4945491407b20e8e96
-DIST osslsigncode-test-unsigned.cat 394 BLAKE2B 77a9ebd80feb7ec4f26c0899a760b6463f88ed2301fd3c65c4d72417f7d7d61f0e51c0ca87870500bec51f900aafe05216f4cec888db6c76b292760862da7d00 SHA512 3f4212a4a0822079ba46a90aa80f725d0068bc30e8be057019b2c500633d502f6d879c4ba332c54e1194c148a1fd4d7551a2ba7cb143f2fe53cef5fe94d9364c
-DIST osslsigncode-test-unsigned.ex_ 120 BLAKE2B 7036b07cfa8f7d1bcdfc1293671aaa01780bffee0339aa5b63b8db77dd2d77a75ffa51363385c2d40d62d057adf4627afa47f099f8e1206c4eeda67af01bd8fc SHA512 373592e6bffe1da907cfa464fa70d1b64c177beb7fd76325553afb0d721263d35b40508e3ede0a64bd016abb2ce97e104417fa472cd2bb0d92f5d14d5001349c
-DIST osslsigncode-test-unsigned.exe 96150 BLAKE2B fd0da9e64473fed792572606f38de8c71e285a557883ac29201b113abc533a32c80ed17330860dd30b9913302ea44433c41d21ba236789ed6d25083f5909960b SHA512 afed867e6a680d7bdfe27e537ccf6496572d79b8b8a90e1886a83d9b8a67c815a54b7bd929819a0cab7b3243c276dd676e51b267a918ace448689d4b424d948b
-DIST osslsigncode-test-unsigned.msi 9728 BLAKE2B eb253cce75c5419d1815682c10f1b10357af90317b1dfa71d3b888e5b158017b8f2b3154ae2073bed1fd5f9fd515c2006a0cb0692a70d1876221f3fe5b048f33 SHA512 3c3afa76d5a76dd7eff35b5d8e8b5a5bbcccd23f213591d3a8d0b4e5e97a8dbabb97345b7a93bb459fded5269f5ce1d7afa66baf623c8b8573f95b68fb4a93c1
+DIST osslsigncode-2.9.tar.gz 1033420 BLAKE2B 63897907102f7e3ee241d4a0436ac2c217351cbdf330c302344ad648cc5d7962ea9936b1c1ccfe6072c3188f6e49f892b323eecc0c87476071effb6d02f9e0e0 SHA512 c88d3050b0f4af5cf4ec899ac1935cd04833ed8c7690298ab1bf0c00c4e53bf5a4f9ee31940d63e29350a6babf43f212e56aa480a67745b6d715a30a8093e3a6
diff --git a/app-crypt/osslsigncode/files/osslsigncode-2.9-missing-import.patch b/app-crypt/osslsigncode/files/osslsigncode-2.9-missing-import.patch
new file mode 100644
index 000000000000..4385aba12b46
--- /dev/null
+++ b/app-crypt/osslsigncode/files/osslsigncode-2.9-missing-import.patch
@@ -0,0 +1,27 @@
+From a8c1bf9838610bbb8362b1d425cdd3e2ecfecc8b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
+Date: Sun, 1 Sep 2024 14:59:49 +0200
+Subject: [PATCH] tests: add import for python-cryptography >= 43.0.0
+
+write_pkcs12_container method raises following error message with
+python-cryptography-43.0.0:
+
+ Error: module 'cryptography.hazmat.primitives.serialization' has no attribute 'pkcs12'
+
+Explicit import of the pkcs12 module resolves the issue.
+
+Upstream-PR: https://github.com/mtrojnar/osslsigncode/pull/407
+
+diff --git a/tests/make_certificates.py b/tests/make_certificates.py
+index 6fb03ac2..ea14a7ed 100644
+--- a/tests/make_certificates.py
++++ b/tests/make_certificates.py
+@@ -10,6 +10,8 @@
+ from cryptography.hazmat.primitives import serialization
+ from cryptography.hazmat.primitives.asymmetric import rsa
+
++import cryptography.hazmat.primitives.serialization.pkcs12
++
+ RESULT_PATH = os.getcwd()
+ CERTS_PATH = os.path.join(RESULT_PATH, "./Testing/certs/")
+
diff --git a/app-crypt/osslsigncode/metadata.xml b/app-crypt/osslsigncode/metadata.xml
index 7c529bd10048..efa2c3eb8359 100644
--- a/app-crypt/osslsigncode/metadata.xml
+++ b/app-crypt/osslsigncode/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
- <remote-id type="sourceforge">osslsigncode</remote-id>
<remote-id type="github">mtrojnar/osslsigncode</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-crypt/osslsigncode/osslsigncode-2.5.ebuild b/app-crypt/osslsigncode/osslsigncode-2.5.ebuild
deleted file mode 100644
index c0d1773bcf38..000000000000
--- a/app-crypt/osslsigncode/osslsigncode-2.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-OSSLSIGNCODE_TEST_FILES=( unsigned.{cat,ex_,exe,msi} )
-inherit cmake python-any-r1
-
-DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files"
-HOMEPAGE="https://github.com/mtrojnar/osslsigncode"
-SRC_URI="https://github.com/mtrojnar/osslsigncode/releases/download/${PV}/${P}.tar.gz"
-
-for test_file in "${OSSLSIGNCODE_TEST_FILES[@]}" ; do
- SRC_URI+=" test? ( https://github.com/mtrojnar/osslsigncode/raw/${PV}/tests/files/${test_file} -> ${PN}-test-${test_file} )"
-done
-unset test_file
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/openssl:=
- curl? ( net-misc/curl )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- if use test ; then
- local test_file
- for test_file in "${OSSLSIGNCODE_TEST_FILES[@]}" ; do
- cp "${DISTDIR}"/${PN}-test-${test_file} tests/files/${test_file} || die
- done
- unset test_file
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package curl CURL)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- cmake_src_test -j1
-}
diff --git a/app-crypt/osslsigncode/osslsigncode-2.9.ebuild b/app-crypt/osslsigncode/osslsigncode-2.9.ebuild
new file mode 100644
index 000000000000..7974b492fea1
--- /dev/null
+++ b/app-crypt/osslsigncode/osslsigncode-2.9.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit bash-completion-r1 cmake python-any-r1
+
+DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files"
+HOMEPAGE="https://github.com/mtrojnar/osslsigncode"
+SRC_URI="
+ https://github.com/mtrojnar/${PN}/archive/refs/tags/${PV}.tar.gz
+ -> ${P}.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ sys-libs/zlib:=
+ >=dev-libs/openssl-3:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ test? (
+ $(python_gen_any_dep '
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-missing-import.patch"
+)
+
+python_check_deps() {
+ use test || return 0
+ python_has_version "dev-python/cryptography[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_test() {
+ cmake_src_test -j1
+}
+
+src_install() {
+ cmake_src_install
+
+ mv "${D}$(get_bashcompdir)/${PN}"{.bash,} || die #927196
+}
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 1eb1dc12f8c7..851345f5f638 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1 +1,2 @@
DIST p11-kit-0.25.3.tar.xz 991528 BLAKE2B 5c695c1ef95edf4bbbab001aa634076c433df0bc89cb8104deaec2ce00c6908640e467755b49c6900e5d7d5d81e1a3871f4978a212c6f6ae088386ac0b95289a SHA512 ad2d393bf122526cbba18dc9d5a13f2c1cad7d70125ec90ffd02059dfa5ef30ac59dfc0bb9bc6380c8f317e207c9e87e895f1945634f56ddf910c2958868fb4c
+DIST p11-kit-0.25.5.tar.xz 1002056 BLAKE2B 96d6a9c2807586abafae4da4df89f566672733963997d6a83e00aaf83a7a0c0e2995638f505e98fb87a90c60bde28814f1e8b7d5071bf0af96bb0467105a1ddc SHA512 177ec6ff5eb891901078306dce2bf3f5c1a0e5c2a8c493bdf5a08ae1ff1240fdf6952961e973c373f80ac3d1d5a9927e07f4da49e4ff92269d992e744889fc94
diff --git a/app-crypt/p11-kit/p11-kit-0.25.3-r2.ebuild b/app-crypt/p11-kit/p11-kit-0.25.3-r2.ebuild
index 6721dbb81193..f27bbaf48cf6 100644
--- a/app-crypt/p11-kit/p11-kit-0.25.3-r2.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.25.3-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit bash-completion-r1 meson-multilib python-any-r1
DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
@@ -12,7 +12,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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="+libffi gtk-doc nls systemd test"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/p11-kit/p11-kit-0.25.5.ebuild b/app-crypt/p11-kit/p11-kit-0.25.5.ebuild
new file mode 100644
index 000000000000..0c23a73251f2
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.25.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit bash-completion-r1 meson-multilib python-any-r1
+
+DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
+HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
+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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+libffi gtk-doc nls systemd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-misc/ca-certificates
+ >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}]
+ libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
+ systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )
+ nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+ default
+
+ # Relies on dlopen which won't work for multilib tests (bug #913971)
+ cat <<-EOF > "${S}"/p11-kit/test-server.sh || die
+ #!/bin/sh
+ exit 77
+ EOF
+}
+
+multilib_src_configure() {
+ # Disable unsafe tests, bug#502088
+ export FAKED_MODE=1
+
+ local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local
+
+ # p11-kit doesn't need this to build and castxml needs Clang. To get
+ # a deterministic non-automagic build, always disable the search for
+ # castxml.
+ cat >> ${native_file} <<-EOF || die
+ [binaries]
+ castxml='castxml-falseified'
+ EOF
+
+ local emesonargs=(
+ --native-file "${native_file}"
+ -Dbashcompdir="$(get_bashcompdir)"
+ -Dtrust_module=enabled
+ -Dtrust_paths="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+ $(meson_feature libffi)
+ $(meson_use nls)
+ $(meson_use test)
+ $(meson_native_use_bool gtk-doc gtk_doc)
+ $(meson_native_true man)
+ $(meson_native_use_feature systemd)
+ )
+
+ meson_src_configure
+}
diff --git a/app-crypt/pgpdump/Manifest b/app-crypt/pgpdump/Manifest
index 6fe6dfea742c..7208c1695cbd 100644
--- a/app-crypt/pgpdump/Manifest
+++ b/app-crypt/pgpdump/Manifest
@@ -1,2 +1 @@
-DIST pgpdump-0.35.tar.gz 77580 BLAKE2B 2c0b8d69bccf37a0d9a192273f901c52d74fa2423f32084a9ddda9c70c2055a0b594113b486cb9bcd8e9566cef781938186400dc139e9e00439db067b38307cb SHA512 03579d7d89d98f19f50c9722c063f059904887f7ca7da3eb99a4aadc6c5361b5161c891767a93087bfb42641aa2e24a9ad6560b1e4396370217afec61a988015
DIST pgpdump-0.36.tar.gz 77084 BLAKE2B 35fb10acd70ca4e2408bc8fdc2cbebe37d2b1ecbd96fdb847688fe1c15ef78e993bddb30015da42847ab50d2dea6ba44d97d958f395095725947120119c10aaf SHA512 0e8917893ff824b4fcb1656727f3bb120b1772259047f50f56931750ac74548eddb89a75baeaa2da4e39db8045af0db3c4f5ccbcda7e129ca4949c0abf7d4dd2
diff --git a/app-crypt/pgpdump/pgpdump-0.35.ebuild b/app-crypt/pgpdump/pgpdump-0.35.ebuild
deleted file mode 100644
index 82da34560146..000000000000
--- a/app-crypt/pgpdump/pgpdump-0.35.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A PGP packet visualizer"
-HOMEPAGE="https://www.mew.org/~kazu/proj/pgpdump/"
-SRC_URI="https://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc sparc x86"
-
-DEPEND="app-arch/bzip2
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.32-respect-ldflags.patch
-)
-
-src_install() {
- dobin pgpdump
- doman pgpdump.1
- dodoc CHANGES README.md
-}
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index cc830bd7a039..48c3c169c493 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,5 +1,3 @@
-DIST pinentry-1.2.1.tar.bz2 547698 BLAKE2B aa47612aa3a6f74c3676bf4018780356cb22ed4078792c1f466f9e0465199428c151c0e20dfbe6c784ef93c2b42b673daff0b6adc74c8c98fed9921e65ed42ea SHA512 a665315628f4dcf07e16a22db3f3be15d7e7e93b3deec0546c7275b71b0e3bd65535a08af5e12d6339fd6595132df86529401d9d12bd17c428a3466e8dfafab6
-DIST pinentry-1.2.1.tar.bz2.sig 238 BLAKE2B 01ba3dc296a8e76c546d21d0bb0cd13778476d5d5b3ef55a3401c6a0353a56d79250d11555afb31c77c5a77e63847ded0f8eaef395bb0dc2ee3ff1d6a4ed83bd SHA512 d0e8435dc169a58f111f057f1c9fbb6c70da32a850f1107d6abdf41357c1714832728109ae61507db313d7eaef9596e5faf92fd21bed78adcc46a8c8a590430b
DIST pinentry-1.3.0.tar.bz2 610363 BLAKE2B a55b80754ef37d18ebdf0bd50e134a7b1bf6362b859b7069a9e4ebd86cd7e733d51f3c21a16779a18aa0d0dfab1f7a3df070d4f7e39e0840339078c4e9cb58bc SHA512 1bbac81c6811cffc8969a46494e6daa6b8447802f47ff6fa3e4dc9ac244cf6e5f629834c9b6a60770d06bff6c9932ad4059f10d2fdf93fd9e26fd5d21c0e3732
DIST pinentry-1.3.0.tar.bz2.sig 119 BLAKE2B 0f11126761b2a06f8b08cf971f5d610cacbde1a5ee419523a6e704ac21fef4cce26495a160a51bee5ed5f68eca7d6864dfa03efa48030ba2cf783e767b925e1c SHA512 77a61877adf241d67caeea3af4c12a2c7c13ddc423ac001fab79bcec463a5853d8806052d61504fae0c67e0a9d1edf6a12d24b560ff7b4083eea5e86f9b54a90
DIST pinentry-1.3.1.tar.bz2 611233 BLAKE2B 47a510b3746fc8cdd83b56302132f4f4d9c61324fc857ce0867387f70f79490dad375bca4dc72e5d1cdca707bf89a16e1c9a20bf1aa0e857d69e59dc59403afd SHA512 3b72034dc1792b1475acb6d605ff7c1bd7647a0f02d1b6bdcd475acdef24bc802f49e275055436c3271261c4b7a64168477a698aab812a145962146b2f67a0e2
diff --git a/app-crypt/pinentry/pinentry-1.2.1-r7.ebuild b/app-crypt/pinentry/pinentry-1.2.1-r7.ebuild
deleted file mode 100644
index 3ddf24c5674c..000000000000
--- a/app-crypt/pinentry/pinentry-1.2.1-r7.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
-inherit autotools qmake-utils verify-sig
-
-DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="https://gnupg.org/related_software/pinentry/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="caps efl emacs gtk keyring ncurses qt5 wayland X"
-
-DEPEND="
- >=dev-libs/libassuan-2.1:=
- >=dev-libs/libgcrypt-1.6.3
- >=dev-libs/libgpg-error-1.17
- efl? ( dev-libs/efl[X] )
- keyring? ( app-crypt/libsecret )
- ncurses? ( sys-libs/ncurses:= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- wayland? ( kde-plasma/kwayland:5 )
- X? (
- dev-qt/qtx11extras:5
- x11-libs/libX11
- )
- )
-"
-RDEPEND="
- ${DEPEND}
- gtk? ( app-crypt/gcr:0[gtk] )
-"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
- verify-sig? ( sec-keys/openpgp-keys-gnupg )
-"
-PDEPEND="emacs? ( app-emacs/pinentry )"
-IDEPEND=">=app-eselect/eselect-pinentry-0.7.2"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.0-AR.patch"
- "${FILESDIR}/${PN}-1.2.1-automagic-capslock.patch" # bug #819939, bug #837719
-)
-
-src_prepare() {
- default
-
- unset FLTK_CONFIG
-
- # bug #934771
- rm m4/libassuan.m4 || die
-
- eautoreconf
-}
-
-src_configure() {
- export PATH="$(qt5_get_bindir):${PATH}"
- export QTLIB="$(qt5_get_libdir)"
-
- local myeconfargs=(
- $(use_enable efl pinentry-efl)
- $(use_enable emacs pinentry-emacs)
- $(use_enable keyring libsecret)
- $(use_enable gtk pinentry-gnome3)
- $(use_enable ncurses fallback-curses)
- $(use_enable ncurses pinentry-curses)
- $(use_enable qt5 pinentry-qt)
- $(use_enable wayland kf5-wayland)
- $(use_enable X qtx11extras)
- $(use_with X x)
-
- --enable-pinentry-tty
- --disable-pinentry-fltk
- --disable-pinentry-gtk2
-
- MOC="$(qt5_get_bindir)"/moc
- GPG_ERROR_CONFIG="${ESYSROOT}"/usr/bin/${CHOST}-gpg-error-config
- LIBASSUAN_CONFIG="${ESYSROOT}"/usr/bin/libassuan-config
-
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- rm "${ED}"/usr/bin/pinentry || die
-
- use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5
-}
-
-pkg_postinst() {
- eselect pinentry update ifunset
-}
-
-pkg_postrm() {
- eselect pinentry update ifunset
-}
diff --git a/app-crypt/pinentry/pinentry-1.2.1-r8.ebuild b/app-crypt/pinentry/pinentry-1.2.1-r8.ebuild
deleted file mode 100644
index 7f097b060824..000000000000
--- a/app-crypt/pinentry/pinentry-1.2.1-r8.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
-inherit autotools qmake-utils verify-sig
-
-DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="https://gnupg.org/related_software/pinentry/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="caps efl emacs gtk keyring ncurses qt5 wayland X"
-
-DEPEND="
- >=dev-libs/libassuan-2.1:=
- >=dev-libs/libgcrypt-1.6.3
- >=dev-libs/libgpg-error-1.17
- efl? ( dev-libs/efl[X] )
- keyring? ( app-crypt/libsecret )
- ncurses? ( sys-libs/ncurses:= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- wayland? ( kde-plasma/kwayland:5 )
- X? (
- dev-qt/qtx11extras:5
- x11-libs/libX11
- )
- )
-"
-RDEPEND="
- ${DEPEND}
- gtk? ( app-crypt/gcr:0[gtk] )
-"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
- verify-sig? ( sec-keys/openpgp-keys-gnupg )
-"
-PDEPEND="emacs? ( app-emacs/pinentry )"
-IDEPEND=">=app-eselect/eselect-pinentry-0.7.2"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.0-AR.patch"
- "${FILESDIR}/${PN}-1.2.1-automagic-capslock.patch" # bug #819939, bug #837719
- "${FILESDIR}/${PN}-1.2.1-include-memory.patch"
-)
-
-src_prepare() {
- default
-
- unset FLTK_CONFIG
-
- # bug #934771
- rm m4/libassuan.m4 || die
-
- eautoreconf
-}
-
-src_configure() {
- export PATH="$(qt5_get_bindir):${PATH}"
- export QTLIB="$(qt5_get_libdir)"
-
- local myeconfargs=(
- $(use_enable efl pinentry-efl)
- $(use_enable emacs pinentry-emacs)
- $(use_enable keyring libsecret)
- $(use_enable gtk pinentry-gnome3)
- $(use_enable ncurses fallback-curses)
- $(use_enable ncurses pinentry-curses)
- $(use_enable qt5 pinentry-qt)
- $(use_enable wayland kf5-wayland)
- $(use_enable X qtx11extras)
- $(use_with X x)
-
- --enable-pinentry-tty
- --disable-pinentry-fltk
- --disable-pinentry-gtk2
-
- MOC="$(qt5_get_bindir)"/moc
- ac_cv_path_GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config"
-
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- rm "${ED}"/usr/bin/pinentry || die
-
- use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5
-}
-
-pkg_postinst() {
- eselect pinentry update ifunset
-}
-
-pkg_postrm() {
- eselect pinentry update ifunset
-}
diff --git a/app-crypt/pinentry/pinentry-1.3.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.3.0-r3.ebuild
index 93734b1fa10d..7801015f9ed2 100644
--- a/app-crypt/pinentry/pinentry-1.3.0-r3.ebuild
+++ b/app-crypt/pinentry/pinentry-1.3.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="caps efl emacs gtk keyring ncurses qt5 qt6 wayland X"
DEPEND="
diff --git a/app-crypt/pinentry/pinentry-1.3.1.ebuild b/app-crypt/pinentry/pinentry-1.3.1.ebuild
index be893ab7c6ba..fa9064e3c4d7 100644
--- a/app-crypt/pinentry/pinentry-1.3.1.ebuild
+++ b/app-crypt/pinentry/pinentry-1.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="caps efl emacs gtk keyring ncurses qt5 qt6 wayland X"
DEPEND="
diff --git a/app-crypt/pius/metadata.xml b/app-crypt/pius/metadata.xml
index 702fa93f9162..996495923376 100644
--- a/app-crypt/pius/metadata.xml
+++ b/app-crypt/pius/metadata.xml
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>nickaristocrates@gmail.com</email>
- <name>Nicholas Meyer</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
<longdescription lang="en">
The PGP Individual UID Signer (PIUS) is a tool for individually
signing all of the UIDs on a set of keys and encrypt-emailing each
diff --git a/app-crypt/pius/pius-3.0.0-r1.ebuild b/app-crypt/pius/pius-3.0.0-r1.ebuild
deleted file mode 100644
index cf60ccbe13a5..000000000000
--- a/app-crypt/pius/pius-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool for signing and email all UIDs on a set of PGP keys"
-HOMEPAGE="https://www.phildev.net/pius/ https://github.com/jaymzh/pius"
-SRC_URI="https://github.com/jaymzh/pius/releases/download/v${PV}/pius-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=app-crypt/gnupg-2.0.0"
-RDEPEND="${DEPEND}
- dev-lang/perl"
-
-PATCHES=(
- "${FILESDIR}/${P}-Fix-typos-132.patch"
- "${FILESDIR}/${P}-pius-keyring-mgr-Fix-constants-134.patch"
- "${FILESDIR}/${P}-Fix-typo-in-readme-135.patch"
- "${FILESDIR}/${P}-Minor-fixes-for-pius-report-137.patch"
-)
-
-python_test() {
- ${EPYTHON} -m unittest discover -s test/* -v || die
-}
diff --git a/app-crypt/pius/pius-3.0.0-r2.ebuild b/app-crypt/pius/pius-3.0.0-r2.ebuild
index 184aaf851b53..c6f48e76ca35 100644
--- a/app-crypt/pius/pius-3.0.0-r2.ebuild
+++ b/app-crypt/pius/pius-3.0.0-r2.ebuild
@@ -3,12 +3,12 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit distutils-r1
DESCRIPTION="A tool for signing and email all UIDs on a set of PGP keys"
-HOMEPAGE="https://www.phildev.net/pius/ https://github.com/jaymzh/pius"
+HOMEPAGE="https://github.com/jaymzh/pius"
SRC_URI="https://github.com/jaymzh/pius/releases/download/v${PV}/pius-${PV}.tar.bz2"
LICENSE="GPL-2"
diff --git a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
deleted file mode 100644
index 202b59ce9a9f..000000000000
--- a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="PkZip cipher breaker"
-HOMEPAGE="https://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack.html"
-SRC_URI="https://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/${P}.tar.gz"
-
-LICENSE="pkcrack"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!<app-text/html-xml-utils-5.3"
-BDEPEND="test? ( app-arch/zip[crypt] )"
-
-DOCS=(
- doc/KNOWN_BUGS
- doc/appnote.iz.txt
- doc/README.W32
- doc/pkzip.ps.gz
- doc/CHANGES
- doc/LIESMICH
- doc/README.html
- doc/README
-)
-
-PATCHES=(
- "${FILESDIR}/${P}-build.patch"
-)
-
-src_compile() {
- cd src
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" all
-}
-
-src_test() {
- cd test
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" all
-}
-
-src_install() {
- einstalldocs
- cd src
- dobin pkcrack zipdecrypt findkey makekey
- newbin extract "${PN}-extract"
-}
-
-pkg_postinst() {
- ewarn "Due to file collision, extract utility was renamed to ${PN}-extract,"
- ewarn "see bug#247394"
-}
diff --git a/app-crypt/qca/files/qca-2.3.7-use-sha256-not-sha1.patch b/app-crypt/qca/files/qca-2.3.7-use-sha256-not-sha1.patch
deleted file mode 100644
index e16fa76f6c57..000000000000
--- a/app-crypt/qca/files/qca-2.3.7-use-sha256-not-sha1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 123123453bd4f3ac87ca6dd641a9028e6e7a29f0 Mon Sep 17 00:00:00 2001
-From: Albert Vaca Cintora <albertvaka@gmail.com>
-Date: Mon, 24 Jul 2023 13:32:30 +0000
-Subject: [PATCH] Sign self-signed certs with SHA256
-
----
- plugins/qca-ossl/qca-ossl.cpp | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
-index 893631c9..f340ee2f 100644
---- a/plugins/qca-ossl/qca-ossl.cpp
-+++ b/plugins/qca-ossl/qca-ossl.cpp
-@@ -3470,10 +3470,8 @@ public:
- X509_EXTENSION *ex;
-
- const EVP_MD *md;
-- if (priv.key()->type() == PKey::RSA)
-- md = EVP_sha1();
-- else if (priv.key()->type() == PKey::DSA)
-- md = EVP_sha1();
-+ if (priv.key()->type() == PKey::RSA || priv.key()->type() == PKey::DSA)
-+ md = EVP_sha256();
- else
- return false;
-
---
-GitLab
-
diff --git a/app-crypt/qca/qca-2.3.9.ebuild b/app-crypt/qca/qca-2.3.9.ebuild
index d55ba464ac80..7ed751df06e3 100644
--- a/app-crypt/qca/qca-2.3.9.ebuild
+++ b/app-crypt/qca/qca-2.3.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="2"
KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 +qt5 qt6 sasl softstore +ssl test"
+IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 qt5 +qt6 sasl softstore +ssl test"
REQUIRED_USE="|| ( qt5 qt6 )"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/qca/qca-9999.ebuild b/app-crypt/qca/qca-9999.ebuild
index df6544b73a42..3ccb568c5478 100644
--- a/app-crypt/qca/qca-9999.ebuild
+++ b/app-crypt/qca/qca-9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://userbase.kde.org/QCA"
LICENSE="LGPL-2.1"
SLOT="2"
KEYWORDS=""
-IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 +qt5 qt6 sasl softstore +ssl test"
+IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 qt5 +qt6 sasl softstore +ssl test"
REQUIRED_USE="|| ( qt5 qt6 )"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild b/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
index cf3e384b549a..37ae97591b61 100644
--- a/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
+++ b/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://linux.netpimpz.com/quickcrypt/download/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc sparc x86"
DEPEND=">=dev-lang/perl-5.6
virtual/perl-Digest-MD5"
diff --git a/app-crypt/rhash/rhash-1.4.3.ebuild b/app-crypt/rhash/rhash-1.4.3.ebuild
index 416de743289a..5ec40aeb2f88 100644
--- a/app-crypt/rhash/rhash-1.4.3.ebuild
+++ b/app-crypt/rhash/rhash-1.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tar.gz"
LICENSE="0BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="debug nls ssl static-libs"
RDEPEND="
diff --git a/app-crypt/rhash/rhash-1.4.4-r1.ebuild b/app-crypt/rhash/rhash-1.4.4-r1.ebuild
index 0f75fbc1bd3a..8972252ec97a 100644
--- a/app-crypt/rhash/rhash-1.4.4-r1.ebuild
+++ b/app-crypt/rhash/rhash-1.4.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tar.gz"
LICENSE="0BSD"
SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="debug nls ssl static-libs"
RDEPEND="
diff --git a/app-crypt/rhash/rhash-1.4.4.ebuild b/app-crypt/rhash/rhash-1.4.4.ebuild
index 01f9f0849a56..364c986148de 100644
--- a/app-crypt/rhash/rhash-1.4.4.ebuild
+++ b/app-crypt/rhash/rhash-1.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tar.gz"
LICENSE="0BSD"
SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="debug nls ssl static-libs"
RDEPEND="
diff --git a/app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch b/app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch
deleted file mode 100644
index ab23372e768f..000000000000
--- a/app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: rotix-0.83/Makefile
-===================================================================
---- rotix-0.83.orig/Makefile
-+++ rotix-0.83/Makefile
-@@ -22,12 +22,6 @@
-
- include Makefile.settings
-
--ifdef DEBUG
--CFLAGS += -g3
--else
--CFLAGS += -O3
--endif
--
- ifdef I18N
- CFLAGS += -DPACKAGE=\"${PACKAGE}\" -D LOCALEDIR=\"${LOCALE}\"
- endif
-@@ -39,12 +33,7 @@ endif
- all : rotix po
-
- rotix : rot.o help.o rotix.o
-- $(CC) -Wall $(CFLAGS) -o rotix rot.o help.o rotix.o
--ifdef STRIP
--ifndef DEBUG
-- $(STRIP) rotix
--endif
--endif
-+ $(CC) -Wall $(CFLAGS) $(LDFLAGS) -o rotix rot.o help.o rotix.o
-
- ifdef I18N
- CFLAGS += -D I18N=1
diff --git a/app-crypt/rotix/rotix-0.83-r1.ebuild b/app-crypt/rotix/rotix-0.83-r1.ebuild
deleted file mode 100644
index 31d10f900b4b..000000000000
--- a/app-crypt/rotix/rotix-0.83-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="Rotix allows you to generate rotational obfuscations"
-HOMEPAGE="https://github.com/shemminga/rotix"
-SRC_URI="https://github.com/shemminga/${PN}/releases/download/${PV}/${PN}_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="sys-devel/gettext"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/0.83-respect-CFLAGS-and-dont-strip.patch
- "${FILESDIR}"/rotix-0.83-locale.patch
- "${FILESDIR}"/rotix-0.83-interix.patch
-)
-
-src_prepare() {
- default
-}
-
-src_configure() {
- use elibc_glibc || append-flags -lintl
- econf --i18n=1
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-}
diff --git a/app-crypt/rotix/rotix-0.83-r3.ebuild b/app-crypt/rotix/rotix-0.83-r3.ebuild
index 3d01c7aeb3a8..6fcfee5a9083 100644
--- a/app-crypt/rotix/rotix-0.83-r3.ebuild
+++ b/app-crypt/rotix/rotix-0.83-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shemminga/${PN}/releases/download/${PV}/${PN}_${PV}.
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="nls"
BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0.ebuild b/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0.ebuild
index 2a08f5e3c9eb..da34f4210ca1 100644
--- a/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0.ebuild
+++ b/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0.ebuild
@@ -294,5 +294,6 @@ src_install() {
dosym librpm_sequoia.so.1 /usr/$(get_libdir)/librpm_sequoia.so
insinto /usr/$(get_libdir)/pkgconfig
- doins "$(cargo_target_dir)"/rpm-sequoia.pc
+ # build.rs sets the output dir to be target/<PROFILE>, so don't use helper.
+ doins target/$(usex debug debug release)/rpm-sequoia.pc
}
diff --git a/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0.ebuild b/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0.ebuild
index 62ee66a20875..082e1f09d371 100644
--- a/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0.ebuild
+++ b/app-crypt/rpm-sequoia/rpm-sequoia-1.7.0.ebuild
@@ -306,5 +306,6 @@ src_install() {
dosym librpm_sequoia.so.1 /usr/$(get_libdir)/librpm_sequoia.so
insinto /usr/$(get_libdir)/pkgconfig
- doins "$(cargo_target_dir)"/rpm-sequoia.pc
+ # build.rs sets the output dir to be target/<PROFILE>, so don't use helper.
+ doins target/$(usex debug debug release)/rpm-sequoia.pc
}
diff --git a/app-crypt/sbctl/Manifest b/app-crypt/sbctl/Manifest
index a96d507722c3..f5c9b71057cb 100644
--- a/app-crypt/sbctl/Manifest
+++ b/app-crypt/sbctl/Manifest
@@ -4,3 +4,6 @@ DIST sbctl-0.13.tar.gz.sig 566 BLAKE2B e0996fc4732501b1e66b7c65c9f4523a0c9f4b714
DIST sbctl-0.14-deps.tar.xz 114919252 BLAKE2B a2baa7cca501d924c1353404725999fb8372b52e88a3e2bd7760cf04da4900c676a326c3687adb58169acfb032e4009bb35be66cef3547cf888767325a0baecb SHA512 75122f835dc4f2bd41a8dbdd2b5ed6ad4c9c2f2f802f989245d08c55620d4eb992d23c78812bc761b96fb6b44b6eb6b6ae702b32d8b8f60ad23ac8a76f7e70bd
DIST sbctl-0.14.tar.gz 17809255 BLAKE2B a59eb3c5a32cb73cb2993c785d16798cbc83b70186eda8c8ce064a17fc338d3e70b93b277ad55c20991952e8d807c77f2a23ae4467c045019ba717ba342d5442 SHA512 a541324ec0b42503f5b5837b18e5f3076aa6fbe3c32041c3362945be52c281c6d057a856512cd134df37bf133106061af34d2b4fbfc377852ae4a86078e65fd8
DIST sbctl-0.14.tar.gz.sig 566 BLAKE2B a5ec700d7ebf42393114c7b193483218df285977622f8ca6c2fb50b622478889647083b34c008fe8618244232416b374f099dd0ca7fce0f961949ef8b9cddbd8 SHA512 8508cc4a77e8bd08d77b2119d59c65d8724ace4576e1d233d0801c0b470afaac96981915c86a185ad0a29e94b7ad6aae1c6c3d52574f353d75d20d11cd503b0f
+DIST sbctl-0.15.4-deps.tar.xz 123785076 BLAKE2B c54b60e89b4ea0bf6ce414198a74465b5e176a5a200f070e092fa536f81d48945a2c2ac88fdcaadfd4d7bc6511c32cbfe9e8c8a4c30c7ea8ea9947af9fdf9545 SHA512 7c5ca431e8832e576cef662d5ba806b4be07a23567d86f7b8e8cb16c57167aaeafe8bafa8875806db2ba7aced9979d5999b837dccd1d90ade60c029de244b242
+DIST sbctl-0.15.4.tar.gz 17822565 BLAKE2B a2c7f1c49ac3052a30af9245b015c730cdc0cc9d9bca011e52de967da5d733f0de0bee2da8ba28da00418553ce4d86cfd3859a5f029f44ae8cfec6f18da50102 SHA512 98278b816c14f61191d3aadeb7bcf22b5482315b36b201764ce88d3287420f488b7c9cb2cc1468800bfa2351cb0e8c8dbc32ecabbe4f6ab275f375859379fc03
+DIST sbctl-0.15.4.tar.gz.sig 566 BLAKE2B 678351ba31138e2b1bb90e2dbfe20f0af333b47c6f1cfb5caf5d473efa716d5ac00d407f858ab6510130430a0f54fc61edb8e261f2c11faa49763a97395850d5 SHA512 3cc14391c4d2446a64bd9f34b29816f05e1e2ff2db2c65228b536298bca0035eb991322264f03f5c68e7b488af0df09fb77276d942b265e43f831e5d9777fcfe
diff --git a/app-crypt/sbctl/sbctl-0.15.4.ebuild b/app-crypt/sbctl/sbctl-0.15.4.ebuild
new file mode 100644
index 000000000000..26ab1494e604
--- /dev/null
+++ b/app-crypt/sbctl/sbctl-0.15.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module optfeature verify-sig
+
+DESCRIPTION="Secure Boot key manager"
+HOMEPAGE="https://github.com/Foxboron/sbctl"
+SRC_URI="https://github.com/Foxboron/${PN}/releases/download/${PV}/${P}.tar.gz
+ verify-sig? ( https://github.com/Foxboron/${PN}/releases/download/${PV}/${P}.tar.gz.sig )"
+SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="app-text/asciidoc
+ verify-sig? ( sec-keys/openpgp-keys-foxboron )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/foxboron.asc"
+
+src_unpack() {
+ if use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sig}
+ fi
+
+ default
+}
+
+src_install() {
+ emake PREFIX="${ED}/usr" install
+}
+
+pkg_postinst() {
+ optfeature "automatically signing installed kernels with sbctl keys on each kernel installation" \
+ "sys-kernel/installkernel[systemd]"
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ elog "Newer versions of sbctl move configuration from"
+ elog "/usr/share/secureboot to /var/lib/sbctl. sbctl will emit a"
+ elog "warning to run 'sbctl setup --migrate' upon invocation"
+ elog "until the migration is performed."
+ fi
+}
diff --git a/app-crypt/seahorse/seahorse-43.0-r3.ebuild b/app-crypt/seahorse/seahorse-43.0-r3.ebuild
index 3d17bcbbd3f2..f2850ce46df5 100644
--- a/app-crypt/seahorse/seahorse-43.0-r3.ebuild
+++ b/app-crypt/seahorse/seahorse-43.0-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="0"
IUSE="ldap zeroconf"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
RDEPEND="
>=dev-libs/glib-2.66:2
diff --git a/app-crypt/seahorse/seahorse-43.0-r4.ebuild b/app-crypt/seahorse/seahorse-43.0-r4.ebuild
index 422476ec2fd6..ed61112c1b29 100644
--- a/app-crypt/seahorse/seahorse-43.0-r4.ebuild
+++ b/app-crypt/seahorse/seahorse-43.0-r4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="0"
IUSE="ldap zeroconf"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
RDEPEND="
>=dev-libs/glib-2.66:2
diff --git a/app-crypt/shash/shash-0.2.6-r4.ebuild b/app-crypt/shash/shash-0.2.6-r4.ebuild
index 2094f2880276..90f637047de1 100644
--- a/app-crypt/shash/shash-0.2.6-r4.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="static"
DEPEND="
diff --git a/app-crypt/ssss/ssss-0.5.7-r1.ebuild b/app-crypt/ssss/ssss-0.5.7-r2.ebuild
index f847746a60e5..c9c3277abf1a 100644
--- a/app-crypt/ssss/ssss-0.5.7-r1.ebuild
+++ b/app-crypt/ssss/ssss-0.5.7-r2.ebuild
@@ -25,8 +25,10 @@ src_prepare() {
tc-export CC
- # Respect users [CL]FLAGS and don't strip, as portage does this part
- sed -e 's/-O2/$(CFLAGS) -lgmp $(LDFLAGS)/g' -e '/strip/d' -i Makefile || die
+ # Respect users [CL]FLAGS
+ # Don't strip, as portage does this part
+ # Don't use 'which'
+ sed -e 's/-O2/$(CFLAGS) -lgmp $(LDFLAGS)/g' -e '/strip/d' -e 's/which/type -P/g' -i Makefile || die
}
src_install() {
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index de6dabd7afff..46c013c241bf 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,5 +1 @@
-DIST tpm2-tools-5.5.tar.gz 1241390 BLAKE2B 2225f9e0835988351f84ed06f914616e25fd65bacaa93b51d0bb04185314efb9a6f60eb3539b250f54b2c2ba590f1b76594df3e625e45c8d37e38d13371bea26 SHA512 24f72a3e9840d531d900e96771a863baae1c71a76fcad0fda8020dff06acd8e3b65b86401ace21f034766403caf9ae97ce710ff6013bb7ed25657a6ecf325470
-DIST tpm2-tools-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch.xz 47916 BLAKE2B 1bbc84f58ad46507417c89be1b4ce2450fb33cf3abe8f080c23890d96be85379f135ef1dbf4b580e1a386fa6d5ebc4fbaab351b5238bbf1011bb97b0f49a847b SHA512 3db0daa39a8dc756d7cb25e3673149dc3eeafd7410f2c6537464431b501e3704a886d9b7a9acd71440d6d419649dd471fd6f9247d593c89a30b05774a8d1b3de
-DIST tpm2-tools-5.6.1.tar.gz 1255474 BLAKE2B 7fda0084283bbd592c3323605f598ebb77ba267ebb900e62b2eff2742257378d95f99b48aab090f80438a6c86f168e1863f9350c18571a23e17eea90a1b9bdd9 SHA512 7a5903db0578a1364c44ca8ac3672c3cae745e2b0ab66ddf6a91fdb75146441af32dfe4ccad6825bea343fea74bed97f9e45bf752594ee56f32e4cb7be2bed33
-DIST tpm2-tools-5.6.tar.gz 1266731 BLAKE2B fe88722c26d62128cd6dfbdd8ef2568656a75fe27b1443fed28387d0db1f50b7d0651819d34dfa98acde785b4cfb4e7c11420b110bb5333ed2bb6b67cdd4fc70 SHA512 14216f29ed3ecca5fbe356ed3744c8b6b25a62ff11b2aed596d11101328c8bfd29a02f6ca5a218f9a4477a5e9648c50f0ae96e71de0b4ff5ea1f98ebeeb73cd7
DIST tpm2-tools-5.7.tar.gz 1339035 BLAKE2B 3984f25176e0b092793a33a0b40b396bc650de989e0b600989d11439cccdf7bc410535c01e1a0e985ab67b36b63eb02d392342aa1746b86727ba22d67d522389 SHA512 629b0b1826815877f452935285f7b3fe0f32bd24fe9130eb169a2dc9b7b254a737797043af9eea68be706b87c32ab2b7189151360c9c00bc5c31dce62a799670
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-bashism.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-bashism.patch
deleted file mode 100644
index 01ce4301d4e3..000000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-bashism.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://github.com/tpm2-software/tpm2-tools/pull/3339
-
-From 9f244c3f74747b7f79c8c6813657b2f2f8a1c844 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 21 Jan 2024 08:08:28 +0000
-Subject: [PATCH] configure.ac: fix bashisms
-
-configure scripts need to be runnable with a POSIX-compliant /bin/sh.
-
-On many (but not all!) systems, /bin/sh is provided by Bash, so errors
-like this aren't spotted. Notably Debian defaults to /bin/sh provided
-by dash which doesn't tolerate such bashisms as '=='.
-
-This retains compatibility with bash.
-
-Fixes configure warnings/errors like:
-```
-checking for libcurl... yes
-./configure: 15201: test: xauto: unexpected operator
-./configure: 15286: test: xauto: unexpected operator
-checking for efivar/efivar.h... yes
-```
-
-This fixes a build error later on too:
-```
-/usr/lib/gcc/x86_64-pc-linux-gnu/14/../../../../x86_64-pc-linux-gnu/bin/ld: lib/libcommon.a(libcommon_a-tpm2_eventlog_yaml.o): in function `yaml_devicepath':
-tpm2_eventlog_yaml.c:(.text.yaml_devicepath+0x2f): undefined reference to `efidp_format_device_path'
-/usr/lib/gcc/x86_64-pc-linux-gnu/14/../../../../x86_64-pc-linux-gnu/bin/ld: tpm2_eventlog_yaml.c:(.text.yaml_devicepath+0x61): undefined reference to `efidp_format_device_path'
-```
-
-Bug: https://bugs.gentoo.org/922592
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -94,9 +94,9 @@ AC_ARG_WITH([efivar],
- )
-
- # use the true program to avoid failing hard
--AS_IF([test "x$with_efivar" == "xauto"],
-+AS_IF([test "x$with_efivar" = "xauto"],
- [PKG_CHECK_MODULES([EFIVAR], [efivar], [AC_CHECK_HEADERS([efivar/efivar.h], , [true])], [true])],
-- [test "x$with_efivar" == "xyes"],
-+ [test "x$with_efivar" = "xyes"],
- [PKG_CHECK_MODULES([EFIVAR], [efivar], [AC_CHECK_HEADERS([efivar/efivar.h])])],
- )
-
-
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch
deleted file mode 100644
index f24cf50aff5c..000000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 9cd74df24dbeee81b408e12ac10a98a088008d07 Mon Sep 17 00:00:00 2001
-From: Juergen Repp <juergen_repp@web.de>
-Date: Mon, 20 Nov 2023 13:55:36 +0100
-Subject: [PATCH] test eventlog: fix check eventlog.sh if efivar.h exists
-
-If efivar.h exist a pretty print function for the DevicePath
-is executed. Therefore two yaml test files are needed for
-the bin test file uefiservices.
-Fixes #3302.
-
-Signed-off-by: Juergen Repp <juergen_repp@web.de>
----
- Makefile.am | 13 ++++++
- configure.ac | 3 ++
- .../event-uefiservices.bin.yaml.pretty | 45 +++++++++++++++++++
- ...n.yaml => event-uefiservices.bin.yaml.raw} | 0
- 4 files changed, 61 insertions(+)
- create mode 100644 test/integration/fixtures/event-uefiservices.bin.yaml.pretty
- rename test/integration/fixtures/{event-uefiservices.bin.yaml => event-uefiservices.bin.yaml.raw} (100%)
-
-diff --git a/Makefile.am b/Makefile.am
-index 413345cd..ef76dca8 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -352,6 +352,7 @@ TEST_EXTENSIONS = .sh
-
- check-hook:
- rm -rf .lock_file
-+ rm -f $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml
-
- EXTRA_DIST_IGNORE = \
- .gitignore \
-@@ -647,6 +648,18 @@ dist-hook:
- for f in $(EXTRA_DIST_IGNORE); do \
- rm -rf `find $(distdir) -name $$f`; \
- done;
-+
-+prepare-check:
-+if HAVE_EFIVAR_H
-+ cp $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml.pretty \
-+ $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml
-+else
-+ cp $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml.raw \
-+ $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml
-+endif
-+
-+check: prepare-check
-+
- if !HAVE_PANDOC
- # If pandoc is not enabled, we want to complain that you need pandoc for make dist,
- # so hook the target and complain.
-diff --git a/configure.ac b/configure.ac
-index 362ae0aa..54224048 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,6 +97,9 @@ AS_IF([test "x$with_efivar" == "xauto"],
- [PKG_CHECK_MODULES([EFIVAR], [efivar], [AC_CHECK_HEADERS([efivar/efivar.h])])],
- )
-
-+AC_CHECK_HEADERS([efivar/efivar.h],[efivar_h=yes ], [efivar = no ])
-+AM_CONDITIONAL([HAVE_EFIVAR_H], [test "$efivar_h" = yes])
-+
- # backwards compat with older pkg-config
- # - pull in AC_DEFUN from pkg.m4
- m4_ifndef([PKG_CHECK_VAR], [
-diff --git a/test/integration/fixtures/event-uefiservices.bin.yaml.pretty b/test/integration/fixtures/event-uefiservices.bin.yaml.pretty
-new file mode 100644
-index 00000000..f0819f70
---- /dev/null
-+++ b/test/integration/fixtures/event-uefiservices.bin.yaml.pretty
-@@ -0,0 +1,45 @@
-+---
-+version: 1
-+events:
-+- EventNum: 0
-+ PCRIndex: 0
-+ EventType: EV_NO_ACTION
-+ Digest: "0000000000000000000000000000000000000000"
-+ EventSize: 37
-+ SpecID:
-+ - Signature: Spec ID Event03
-+ platformClass: 0
-+ specVersionMinor: 0
-+ specVersionMajor: 2
-+ specErrata: 0
-+ uintnSize: 2
-+ numberOfAlgorithms: 2
-+ Algorithms:
-+ - Algorithm[0]:
-+ algorithmId: sha1
-+ digestSize: 20
-+ - Algorithm[1]:
-+ algorithmId: sha256
-+ digestSize: 32
-+ vendorInfoSize: 0
-+- EventNum: 1
-+ PCRIndex: 2
-+ EventType: EV_EFI_BOOT_SERVICES_DRIVER
-+ DigestCount: 2
-+ Digests:
-+ - AlgorithmId: sha1
-+ Digest: "855685b4dbd4b67d50e0594571055054cfe2b1e9"
-+ - AlgorithmId: sha256
-+ Digest: "dd8576b4ff346c19c56c3e4f97ce55c5afa646f9c669be0a7cdd05057a0ecdf3"
-+ EventSize: 84
-+ Event:
-+ ImageLocationInMemory: 0x7dcf6018
-+ ImageLengthInMemory: 171464
-+ ImageLinkTimeAddress: 0x0
-+ LengthOfDevicePath: 52
-+ DevicePath1: 'PciRoot(0x0)/Pci(0x2,0x0)/Pci(0x0,0x0)/Offset(0x12600,0x3c3ff)'
-+pcrs:
-+ sha1:
-+ 2 : 0x5b5f4d5c31664f01670a98a5796a36473671befc
-+ sha256:
-+ 2 : 0x35fcf9d737c52c971f7c74058d36937dbd7824177fa0f1de3eba3934fcb83b9d
-diff --git a/test/integration/fixtures/event-uefiservices.bin.yaml b/test/integration/fixtures/event-uefiservices.bin.yaml.raw
-similarity index 100%
-rename from test/integration/fixtures/event-uefiservices.bin.yaml
-rename to test/integration/fixtures/event-uefiservices.bin.yaml.raw
---
-2.41.0
-
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog.sh-Fix-accidental-deletions.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog.sh-Fix-accidental-deletions.patch
deleted file mode 100644
index 7274ee40827a..000000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog.sh-Fix-accidental-deletions.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 4dec5295361d753c3466bc9e8b0ae3a3cc58dff5 Mon Sep 17 00:00:00 2001
-From: Juergen Repp <juergen_repp@web.de>
-Date: Thu, 4 Apr 2024 09:42:51 +0200
-Subject: [PATCH] test eventlog.sh Fix accidental deletions.
-
-* Accidental deletions made in commit 196e3d439407e81040ced054a8ed302489348a9d
- are undone.
-* python3 is used as default instead of python.
-
-Signed-off-by: Juergen Repp <juergen_repp@web.de>
----
- test/integration/tests/eventlog.sh | 33 ++++++++++++++++++++++++++++--
- 1 file changed, 31 insertions(+), 2 deletions(-)
-
-diff --git a/test/integration/tests/eventlog.sh b/test/integration/tests/eventlog.sh
-index 9d5290f0..e7c13706 100755
---- a/test/integration/tests/eventlog.sh
-+++ b/test/integration/tests/eventlog.sh
-@@ -3,7 +3,7 @@
- set -E
- shopt -s expand_aliases
-
--alias python=${PYTHON-python}
-+alias python=${PYTHON-python3}
-
- yaml_validate() {
- cmd=$1
-@@ -88,7 +88,36 @@ expect_pass() {
- expect_fail
- expect_fail foo
- expect_fail foo bar
--expect_fail ${srcdir}/test/integration/fix
-+expect_fail ${srcdir}/test/integration/fixtures/event-bad.bin
-+
-+expect_pass ${srcdir}/test/integration/fixtures/specid-vendordata.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event-uefivar.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event-uefiaction.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event-uefiservices.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event-uefi-sha1-log.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event-bootorder.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event-postcode.bin
-+
-+# Make sure that --eventlog-version=2 works on complete TPM2 logs
-+expect_pass ${srcdir}/test/integration/fixtures/event-arch-linux.bin --eventlog-version=2
-+expect_pass ${srcdir}/test/integration/fixtures/event-gce-ubuntu-2104-log.bin --eventlog-version=2
-+expect_pass ${srcdir}/test/integration/fixtures/event-sd-boot-fedora37.bin --eventlog-version=2
-+expect_pass ${srcdir}/test/integration/fixtures/event-moklisttrusted.bin --eventlog-version=2
-+
-+# Pick an event with leading whitespace and validate we have
-+# preserved it correctly after parsing the YAML
-+event=$(yaml_validate "print(y['events'][80]['Event']['String'])" < ${srcdir}/test/integration/fixtures/event-moklisttrusted.bin.yaml | tr -d '\0')
-+expect=$(echo -e "grub_cmd: menuentry UEFI Firmware Settings --id uefi-firmware {\n\t\tfwsetup\n\t}")
-+if test "$event" != "$expect"
-+then
-+ echo "Got $event"
-+ echo "Want $expect"
-+ exit 1
-+fi
-+
-+# Compare strings generated by tpm2_eventlog with binary data of the corresponding
-+# events.
- hex_file="${srcdir}/test/integration/fixtures/event-moklisttrusted-hex.yaml"
- tool_file="${srcdir}/test/integration/fixtures/event-moklisttrusted.bin.yaml"
-
---
-2.43.2
-
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.7-tests-Eliminate-dependency-on-which.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.7-tests-Eliminate-dependency-on-which.patch
new file mode 100644
index 000000000000..1872d7d2389e
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-5.7-tests-Eliminate-dependency-on-which.patch
@@ -0,0 +1,42 @@
+From e9af1553f26ebad6e8db14b599dc74bab5663806 Mon Sep 17 00:00:00 2001
+From: Christopher Byrne <salah.coronya@gmail.com>
+Date: Tue, 16 Apr 2024 09:32:30 -0500
+Subject: [PATCH] tests: Eliminate dependency on 'which'
+
+See https://lwn.net/Articles/874049/
+
+Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
+---
+ test/integration/tests/pcrevent.sh | 2 +-
+ test/integration/tests/symlink.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/integration/tests/pcrevent.sh b/test/integration/tests/pcrevent.sh
+index 5484cfbe..d7166789 100644
+--- a/test/integration/tests/pcrevent.sh
++++ b/test/integration/tests/pcrevent.sh
+@@ -44,7 +44,7 @@ yaml_verify $hash_out_file
+ while IFS='' read -r l || [[ -n "$l" ]]; do
+
+ alg=`echo -n $l | cut -d\: -f 1-1`
+- if ! which "$alg"sum >/dev/null 2>&1; then
++ if ! command -v "$alg"sum >/dev/null 2>&1; then
+ echo "Ignore checking $alg algorithm due to unavailable \"${alg}sum\" program"
+ continue
+ fi
+diff --git a/test/integration/tests/symlink.sh b/test/integration/tests/symlink.sh
+index 606e1a1a..f65a7567 100644
+--- a/test/integration/tests/symlink.sh
++++ b/test/integration/tests/symlink.sh
+@@ -17,7 +17,7 @@ start_up
+ # Positive tests:
+ #
+ fail=0
+-TPM2_TOOL="$(which tpm2)"
++TPM2_TOOL="$(command -v tpm2)"
+
+ if [ -z "$TPM2_TOOL" ]; then
+ echo "unable to locate tpm2 tool"
+--
+2.45.2
+
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
deleted file mode 100644
index 866f1e799d24..000000000000
--- a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 flag-o-matic python-any-r1
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="+fapi test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
- dev-libs/openssl:=
- net-misc/curl
- sys-libs/efivar:="
-DEPEND="${RDEPEND}
- test? (
- app-crypt/swtpm
- app-crypt/tpm2-abrmd
- dev-util/cmocka
- )"
-BDEPEND="virtual/pkgconfig
- dev-build/autoconf-archive
- test? (
- app-editors/vim-core
- dev-tcltk/expect
- $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
- )
- ${PYTHON_DEPS}"
-
-python_check_deps() {
- python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
- # tests fail with LTO enabbled. See bug 865275 and 865277
- filter-lto
- econf \
- $(use_enable fapi) \
- $(use_enable test unit) \
- --with-bashcompdir=$(get_bashcompdir) \
- --enable-hardening
-}
-
-src_install() {
- default
- mv "${ED}"/$(get_bashcompdir)/tpm2{_completion.bash,} || die
- local utils=( "${ED}"/usr/bin/tpm2_* )
- utils=("${utils[@]##*/}")
- # these utiltites don't have bash completions
- local nobashcomp=( tpm2_encodeobject tpm2_getpolicydigest tpm2_sessionconfig )
- mapfile -d $'\0' -t utils < <(printf '%s\0' "${utils[@]}" | grep -Ezvw "${nobashcomp[@]/#/-e}")
- bashcomp_alias tpm2 "${utils[@]}"
-}
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild
deleted file mode 100644
index ab59eed9520d..000000000000
--- a/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools bash-completion-r1 flag-o-matic python-any-r1
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/tpm2-tools-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+fapi test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
- dev-libs/openssl:=
- net-misc/curl
- sys-libs/efivar:="
-DEPEND="${RDEPEND}
- test? (
- app-crypt/swtpm
- app-crypt/tpm2-abrmd
- dev-util/cmocka
- )"
-BDEPEND="virtual/pkgconfig
- dev-build/autoconf-archive
- test? (
- app-editors/vim-core
- dev-tcltk/expect
- $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
- )
- ${PYTHON_DEPS}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch"
- "${WORKDIR}/${PN}-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch"
- "${FILESDIR}/${PN}-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch"
- "${FILESDIR}/${PN}-5.6-bashism.patch"
- "${FILESDIR}/${PN}-5.6-test-eventlog.sh-Fix-accidental-deletions.patch"
-)
-
-python_check_deps() {
- python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # tests fail with LTO enabbled. See bug 865275 and 865277
- filter-lto
- econf \
- $(use_enable fapi) \
- $(use_enable test unit) \
- --with-bashcompdir=$(get_bashcompdir) \
- --enable-hardening
-}
-
-src_install() {
- default
- mv "${ED}"/$(get_bashcompdir)/tpm2{_completion.bash,} || die
- local utils=( "${ED}"/usr/bin/tpm2_* )
- utils=("${utils[@]##*/}")
- # these utiltites don't have bash completions
- local nobashcomp=( tpm2_encodeobject tpm2_getpolicydigest\
- tpm2_sessionconfig tpm2_tr_encode)
- mapfile -d $'\0' -t utils < <(printf '%s\0' "${utils[@]}" | grep -Ezvw "${nobashcomp[@]/#/-e}")
- bashcomp_alias tpm2 "${utils[@]}"
-}
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
deleted file mode 100644
index f8ad3a1b74c9..000000000000
--- a/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools bash-completion-r1 flag-o-matic python-any-r1
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/tpm2-tools-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
-IUSE="+fapi test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
- dev-libs/openssl:=
- net-misc/curl
- sys-libs/efivar:="
-DEPEND="${RDEPEND}
- test? (
- app-crypt/swtpm
- app-crypt/tpm2-abrmd
- dev-util/cmocka
- )"
-BDEPEND="virtual/pkgconfig
- dev-build/autoconf-archive
- test? (
- app-editors/vim-core
- dev-tcltk/expect
- $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
- )
- ${PYTHON_DEPS}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch"
- "${WORKDIR}/${PN}-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch"
- "${FILESDIR}/${PN}-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch"
- "${FILESDIR}/${PN}-5.6-test-eventlog.sh-Fix-accidental-deletions.patch"
-)
-
-python_check_deps() {
- python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # tests fail with LTO enabbled. See bug 865275 and 865277
- filter-lto
- econf \
- $(use_enable fapi) \
- $(use_enable test unit) \
- --with-bashcompdir=$(get_bashcompdir) \
- --enable-hardening
-}
-
-src_install() {
- default
- mv "${ED}"/$(get_bashcompdir)/tpm2{_completion.bash,} || die
- local utils=( "${ED}"/usr/bin/tpm2_* )
- utils=("${utils[@]##*/}")
- # these utiltites don't have bash completions
- local nobashcomp=( tpm2_encodeobject tpm2_getpolicydigest\
- tpm2_sessionconfig tpm2_tr_encode)
- mapfile -d $'\0' -t utils < <(printf '%s\0' "${utils[@]}" | grep -Ezvw "${nobashcomp[@]/#/-e}")
- bashcomp_alias tpm2 "${utils[@]}"
-}
-
-src_test() {
-# This hook doesn't get invoked consisently, so call it manually
-# else one of the tests will fail
- emake prepare-check
- default
-}
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild
index 99c2a66f1a7f..530587f97e2d 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit autotools bash-completion-r1 flag-o-matic python-any-r1
DESCRIPTION="Tools for the TPM 2.0 TSS"
@@ -38,6 +38,7 @@ BDEPEND="virtual/pkgconfig
PATCHES=(
"${FILESDIR}/${PN}-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch"
+ "${FILESDIR}/${PN}-5.7-tests-Eliminate-dependency-on-which.patch"
)
python_check_deps() {
diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2023.11.28.1.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2023.11.28.1.ebuild
index 2d9eb9a3825e..f66937cde963 100644
--- a/app-crypt/ubuntu-keyring/ubuntu-keyring-2023.11.28.1.ebuild
+++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2023.11.28.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~loong ~ppc64 ~x86"
S="${WORKDIR}"/${PN}
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 5a4928531739..3fb99d8bf3fc 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,2 +1,3 @@
DIST xca-2.5.0.tar.gz 1850445 BLAKE2B e12666fc0513cd04bd61d4e182851c055c120425ad8d2fb2698396429b7afb4cc57c77be6d6cc3f63f9d49d5a179123b336d43dde57ef4a3274e7ba1a06f22f7 SHA512 8b283509849c9ac34d5250c780dc0c7a6319eb3201ae892fc2c38e5257d7db4e565e88167a687ffc1ca436068a41cd48fad59d3ecc8235678d46cf026280bd5e
DIST xca-2.6.0.tar.gz 1874590 BLAKE2B a6a83df88209d6c929bfd5781f6d56b01498d3b9d296a66f4e513f279fc3c14749e1af1f765e863b26e49807a00f5c11e40f8e16f965e23025d835b58eaf4dfc SHA512 4797445e818545c92ded8f611e53f36cab85b527772a531d7a3fae5c5fdb87e1be34139ffeb906239bc3a02221807e2d7c286990ce68f92c1964545cb8fd7986
+DIST xca-2.7.0.tar.gz 1893082 BLAKE2B e37f622864ea20dcf9796640ab7628205823ed2bc8cfeba54fe5dc815be60fba318e9b180d880258ad3d9d2b58b98fd688ee87969da0e2cc8017d98c0cce5680 SHA512 ac441a88c3a4548d78256509ba47cdcb438113e021d76367cbbb91f2a6f6ade2f6ee50c9132d2e89f3843263a7fbd4af73fcada0c32573c819781c0228939f62
diff --git a/app-crypt/xca/xca-2.6.0.ebuild b/app-crypt/xca/xca-2.6.0.ebuild
index c9e4d8aa423b..366990d5e502 100644
--- a/app-crypt/xca/xca-2.6.0.ebuild
+++ b/app-crypt/xca/xca-2.6.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/xca-RELEASE.${PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc"
RDEPEND="
diff --git a/app-crypt/xca/xca-2.7.0.ebuild b/app-crypt/xca/xca-2.7.0.ebuild
new file mode 100644
index 000000000000..b0d629e4d5b1
--- /dev/null
+++ b/app-crypt/xca/xca-2.7.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit cmake virtualx 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/xca/archive/refs/tags/RELEASE.${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/xca-RELEASE.${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc qt5 qt6"
+
+RDEPEND="
+ dev-libs/libltdl:0=
+ !qt6? ( dev-qt/qthelp:5 dev-qt/qtgui:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 )
+ qt6? ( dev-qt/qtbase:6[sqlite,widgets] dev-qt/qttools:6[assistant] )
+ dev-libs/openssl:*
+ doc? ( app-text/linuxdoc-tools )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ !qt6? ( dev-qt/linguist-tools:5 dev-qt/qttest:5 )
+ qt6? ( dev-qt/qttools:6[linguist] )
+ doc? ( dev-python/sphinx dev-python/sphinxcontrib-htmlhelp dev-python/sphinxcontrib-qthelp )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.0-desktop.patch"
+ "${FILESDIR}/${PN}-2.4.0-man-page.patch"
+)
+
+src_configure() {
+ local qt_version=Qt5
+
+ if use qt6; then
+ qt_version=Qt6
+ fi
+
+ local mycmakeargs=(
+ -DQTFIXEDVERSION=$qt_version
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+}
+
+src_test() {
+ virtx default
+}
+
+src_install() {
+ cmake_src_install
+
+ insinto /etc/xca
+ doins misc/*.txt
+
+ dosym xca /usr/bin/xca-console
+}
+
+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 728d3a63804b..c27f3efe94e5 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,6 +1,2 @@
-DIST yubikey_manager-5.2.0.tar.gz 184873 BLAKE2B 09041c23e23ff01cad2d126face63006d1648dfe8d2e7a47b7113deed990143c83a36b6c60458dc9cbf55a71ddf286b8259c97ee982044dbc554231655fb82e2 SHA512 988c25f378e0ce5b53ba5a47aac5fd5a136653f1592af5e9c7440eef7336903cf459a567b4be02119262dba70c3058f5d9f26049dc21c1d934dcf8897eedc03d
-DIST yubikey_manager-5.2.0.tar.gz.sig 309 BLAKE2B bb1a012832c99aaa94404717560e72fb93352b82dd3c0091cb492cde65706c39b9e2411e38a36150d77e72f6397d98cef643d0b392c1751e9c109de3468c9a39 SHA512 926a7a7c40d38bcc0a48e3b44f3eb673c16f7bed73701f5cb6f9ac4418c9f2a242b8d2af9459093ec10e8c188410412a8ba8c05a0fd4774a738629a4b0f874d4
-DIST yubikey_manager-5.4.0.tar.gz 188859 BLAKE2B e83d74b0d512b7a1076bf6de0860c3a29259e337ccf508e81572e5802b1b1dced4c098ea21b4a3d63294b51a042780bf875536c30f65d46ce76b7a80c0bc1fce SHA512 c773895957d17ceac8e944958435071fbb3a80469016a22aa13785a5bc009406870366e5b65d3d2ddbd2ed1722f84b377a49101f4db67f0d3c04daee852301b3
-DIST yubikey_manager-5.4.0.tar.gz.sig 310 BLAKE2B 933a6638b754a8d3f23486f8adeb03e1b9c54d313370675f3e9e517751b495a5f3afae048b9740360459c86bef754618d9b8308cc30d8ae027421ee6f972fef1 SHA512 825d3e455b9cb9263a1336ac2d601fc2e25146ca45f143c16e559c5374c2aa0fc27f0330f5114e58186e02784e1ebda5e864726fea009dfb47377dcf5a3a32f4
DIST yubikey_manager-5.5.1.tar.gz 215683 BLAKE2B c7c16d4eaaeff5894c4913a0da69675491434f0f48555addbb8778e0f9781c6872c4392ec81f4a142f2e1eb63bea837e394b5d33e07f497c948ead92ee89059a SHA512 67e2e5a5833f746441d91684a5b0889bd9b9b46aeaee0da875c7e6dac46db619a8436e12bd77c38e525121db8fc52736071bc141ac80c6d79e64919e100510f9
DIST yubikey_manager-5.5.1.tar.gz.sig 310 BLAKE2B 9d5f3d18ccdde1a03a6433223677706164d559af2b270d636adb4074377deb774869d9c6d12af083388f7e907fa4b8e7b881ccd58981d2696ef017d8ec492dfe SHA512 0c436a608fe64236045019ba7db175a65f1e1d1d125049b968c484963abe138573fa31d1b8c942d9cdcaa06099029bd3c1d9057ae622e5c6358427188c454efd
diff --git a/app-crypt/yubikey-manager/yubikey-manager-5.2.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-5.2.0.ebuild
deleted file mode 100644
index 278c8aa54fe4..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-5.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=poetry
-
-inherit distutils-r1 verify-sig
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# According to https://github.com/Yubico/yubikey-manager/issues/518 the release
-# tarballs on Yubico Web site and on GitHub should be identical, and at least
-# for recent releases the latter are signed as well. Only the automatically
-# generated "Source code (tar.gz)" tarballs should not be used.
-# Still, prefer the former if available.
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz
- verify-sig? ( https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz.sig )"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="ssl"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/yubico.com.asc"
-
-# app-crypt/ccid required for
-# - 'ykman oath'
-# - 'ykman openpgp'
-# - 'ykman piv'
-RDEPEND="
- app-crypt/ccid
- >=dev-python/click-8.0[${PYTHON_USEDEP}]
- <dev-python/cryptography-44[${PYTHON_USEDEP}]
- dev-python/fido2:0/1.0[${PYTHON_USEDEP}]
- >=dev-python/keyring-23.4[${PYTHON_USEDEP}]
- >=dev-python/pyscard-2.0[${PYTHON_USEDEP}]
- ssl? ( >=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}] )"
-BDEPEND="
- test? ( dev-python/makefun[${PYTHON_USEDEP}] )
- verify-sig? ( >=sec-keys/openpgp-keys-yubico-20220824 )"
-
-S="${WORKDIR}"/${MY_P}
-
-distutils_enable_tests pytest
-
-python_install_all() {
- distutils-r1_python_install_all
- doman man/ykman.1
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-5.4.0-r1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-5.4.0-r1.ebuild
deleted file mode 100644
index d9c5c0279a7d..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-5.4.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=poetry
-
-inherit distutils-r1 verify-sig
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# According to https://github.com/Yubico/yubikey-manager/issues/518 the release
-# tarballs on Yubico Web site and on GitHub should be identical, and at least
-# for recent releases the latter are signed as well. Only the automatically
-# generated "Source code (tar.gz)" tarballs should not be used.
-# Still, prefer the former if available.
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz
- verify-sig? ( https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz.sig )"
-
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="ssl"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/yubico.com.asc"
-
-# app-crypt/ccid required for
-# - 'ykman oath'
-# - 'ykman openpgp'
-# - 'ykman piv'
-RDEPEND="
- app-crypt/ccid
- >=dev-python/click-8.0[${PYTHON_USEDEP}]
- <dev-python/cryptography-45[${PYTHON_USEDEP}]
- dev-python/fido2:0/1.0[${PYTHON_USEDEP}]
- dev-python/keyring[${PYTHON_USEDEP}]
- >=dev-python/pyscard-2.0[${PYTHON_USEDEP}]
- ssl? ( >=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}] )"
-BDEPEND="
- test? ( dev-python/makefun[${PYTHON_USEDEP}] )
- verify-sig? ( >=sec-keys/openpgp-keys-yubico-20220824 )"
-
-distutils_enable_tests pytest
-
-python_install_all() {
- distutils-r1_python_install_all
- doman man/ykman.1
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-5.4.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-5.4.0.ebuild
deleted file mode 100644
index a3f8053a2c6a..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-5.4.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=poetry
-
-inherit distutils-r1 verify-sig
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# According to https://github.com/Yubico/yubikey-manager/issues/518 the release
-# tarballs on Yubico Web site and on GitHub should be identical, and at least
-# for recent releases the latter are signed as well. Only the automatically
-# generated "Source code (tar.gz)" tarballs should not be used.
-# Still, prefer the former if available.
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz
- verify-sig? ( https://developers.yubico.com/${PN}/Releases/${MY_P}.tar.gz.sig )"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="ssl"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/yubico.com.asc"
-
-# app-crypt/ccid required for
-# - 'ykman oath'
-# - 'ykman openpgp'
-# - 'ykman piv'
-RDEPEND="
- app-crypt/ccid
- >=dev-python/click-8.0[${PYTHON_USEDEP}]
- <dev-python/cryptography-45[${PYTHON_USEDEP}]
- dev-python/fido2:0/1.0[${PYTHON_USEDEP}]
- <dev-python/keyring-25[${PYTHON_USEDEP}]
- >=dev-python/pyscard-2.0[${PYTHON_USEDEP}]
- ssl? ( >=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}] )"
-BDEPEND="
- test? ( dev-python/makefun[${PYTHON_USEDEP}] )
- verify-sig? ( >=sec-keys/openpgp-keys-yubico-20220824 )"
-
-S="${WORKDIR}"/${MY_P}
-
-distutils_enable_tests pytest
-
-python_install_all() {
- distutils-r1_python_install_all
- doman man/ykman.1
-}
diff --git a/app-crypt/yubioath-flutter-bin/Manifest b/app-crypt/yubioath-flutter-bin/Manifest
index 42ac477b742f..862921a3e3f4 100644
--- a/app-crypt/yubioath-flutter-bin/Manifest
+++ b/app-crypt/yubioath-flutter-bin/Manifest
@@ -1,3 +1,4 @@
DIST yubico-authenticator-6.1.0-linux.tar.gz 46363854 BLAKE2B f50f8dc6cdca9044c9c1a0f370cc71d627358038bd00f34bb3801d9b5cc31a5fc904ba817e5ad613c6947c9546691d965e6b373c89e220314747a5eb0321e217 SHA512 e4a63aa40e06ae4cbeee5fc32b749bcc94c9a22b86104ff32e8f94dcd34cf0a0e61e686efd4a21ea8965f37e997f53d452739bb4c332af2387473dccd5b72b99
DIST yubico-authenticator-6.4.0-linux.tar.gz 34381501 BLAKE2B 472de3d5a3a0dc2f604f3626d50850dd28ab1ae70219dff9d98b91005f2899643f1aa2e7ceb9d7019acc42aaa61fad9b14f6adf8465e1cb0a0ad8bbb19872a00 SHA512 a9cb633233ed142edf288483f3e0e109c10fa01cf3639388403983ac8336df7fcd47d4dedfe76c7fa7b35fa643668a06a185fe1ae4875a7e3729db9b738c8f86
DIST yubico-authenticator-7.0.0-linux.tar.gz 46533619 BLAKE2B af77608a7f37efa15464113769bf76fa9e92e99ffb8a459d5b5bb5f5c88e0c023d05f5477774722a4d5933522531ab06e7134fad77ac19af4fc57cff5b7d66b6 SHA512 f9010ff6a6e009ca878ac00a99e3714d1a1b92af4dd22f6568f19ab908dd477635afa187139a46de45d1769a19bf7b0f9d329f678cdaf7e64241f7975b418bd6
+DIST yubico-authenticator-7.1.0-linux.tar.gz 47062304 BLAKE2B 17cd8e09dc18d765cac6e6ae27e74bc2eb658f9dcdba3f26d16ce4156278c0999d57fa4e7ca1d9f4be93d86c2c17be069fea414de05397a619881c9e466b923a SHA512 6c22cf63cb491b1d35ecdedc5028eba0c29e4258bae530f62864fbed4f21c4a156f1bd7feef40bbdcb9f1572097f3ce6895ddd0df38ddb9804a585d64cf9d3bc
diff --git a/app-crypt/yubioath-flutter-bin/yubioath-flutter-bin-7.1.0.ebuild b/app-crypt/yubioath-flutter-bin/yubioath-flutter-bin-7.1.0.ebuild
new file mode 100644
index 000000000000..d9791c330cb2
--- /dev/null
+++ b/app-crypt/yubioath-flutter-bin/yubioath-flutter-bin-7.1.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="Yubico Authenticator for TOTP"
+HOMEPAGE="
+ https://developers.yubico.com/yubioath-flutter/
+ https://github.com/Yubico/yubioath-flutter"
+SRC_URI="https://github.com/Yubico/yubioath-flutter/releases/download/${PV}/yubico-authenticator-${PV}-linux.tar.gz"
+S="${WORKDIR}/yubico-authenticator-${PV}-linux"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+ app-accessibility/at-spi2-core:2
+ app-crypt/ccid
+ dev-libs/glib:2
+ media-libs/fontconfig
+ media-libs/harfbuzz
+ media-libs/libepoxy
+ sys-libs/glibc
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libnotify
+ x11-libs/libxcb
+ x11-libs/pango"
+BDEPEND="app-admin/chrpath"
+
+# "Modern" app, built using Google's flutter framework.
+#
+# Don't even *think* about unbundling the dependencies, they're all
+# hardcoded into the main binary and the helper, including but not
+# limited to a full-fledged python interpreter that gets dlopen'd, an
+# assortment of python packages, the X11 kitchen sink, random GCC
+# libraries, and OpenSSL 1.1, oftentimes using git checkouts instead of
+# released versioned libraries.
+#
+# The only way to avoid this mess would be to build flutter from source,
+# but unfortunately life is too short to be dealing with whatever is
+# Google's framework-de-jour on a regular basis.
+QA_PREBUILT="opt/yubico-authenticator/*"
+
+src_install() {
+ einstalldocs
+ rm -r README* || die
+
+ sed -e 's|@EXEC_PATH/authenticator|authenticator|' \
+ -e 's|@EXEC_PATH/linux_support/com.yubico.yubioath.png|com.yubico.yubioath|g' \
+ -i linux_support/com.yubico.authenticator.desktop || die
+ domenu linux_support/com.yubico.authenticator.desktop
+ doicon -s 128 linux_support/com.yubico.yubioath.png
+ rm -r linux_support || die
+
+ exeinto /opt/yubico-authenticator
+ doexe authenticator
+ rm authenticator || die
+
+ exeinto /opt/yubico-authenticator/helper
+ doexe helper/authenticator-helper
+ rm helper/authenticator-helper || die
+
+ # prevent rpath_security_checks() trigger
+ chrpath -d helper/_internal/libjpeg-*.so* helper/_internal/pillow.libs/libjpeg-*.so* || die
+
+ insinto /opt/yubico-authenticator
+ doins -r .
+
+ dosym ../../opt/yubico-authenticator/authenticator /usr/bin/authenticator
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ elog "Make sure you are a member of the pcscd group"
+ elog "and the pcscd service is running."
+}
diff --git a/app-crypt/zulucrypt/Manifest b/app-crypt/zulucrypt/Manifest
index c0223dd70eed..85569e67cec4 100644
--- a/app-crypt/zulucrypt/Manifest
+++ b/app-crypt/zulucrypt/Manifest
@@ -1 +1 @@
-DIST zulucrypt-5.5.0_pre20180223.tar.gz 2162535 BLAKE2B 7d098ec20b7f355be6ad863121f7016d6b1ccbcc133438b616cfbd805110b24ae91dc74b0c2daf3137511fcb72e0338663c3c743c6c3d2b761883c57c590c0e5 SHA512 38ea9442a48c02741e11e59759b745ce3d6d6ca5f37d8b685526be76308a8fa1f7db7fd38038e5ce50e2a8afd8740b0a683a3458cb1df6f0b70c41fbf8035c15
+DIST zulucrypt-7.0.0.tar.xz 1159544 BLAKE2B 9ba2aa751f4224a87636993983523d25dbcf23e70bc9dfbe5476cb44e1af8cc1b75ac450f77997fb6e3cf65ec3425d424c325dfdb4e4da9ec39e100e623cff9c SHA512 f131f423da2796d760e4eaa50a7e56e0283bdf6d5e46ff32bd9bf0edc127a087e947e0f7d39fd99fd28cc4566c89cde9e1a85dd67e50e1cb7d6c9de31d7918bf
diff --git a/app-crypt/zulucrypt/files/zulucrypt-5.5.0_pre20180223-fno-common.patch b/app-crypt/zulucrypt/files/zulucrypt-5.5.0_pre20180223-fno-common.patch
deleted file mode 100644
index ea5bcd7a6d18..000000000000
--- a/app-crypt/zulucrypt/files/zulucrypt-5.5.0_pre20180223-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/zuluCrypt-cli/bin/security.h
-+++ b/zuluCrypt-cli/bin/security.h
-@@ -35,7 +35,7 @@ extern "C" {
- * set the function to be called when an attempt to evelate or downgrade privileges fail
- * zuluCryptSecurityPrivilegeElevationError global variable is defined in security.c
- */
--void ( *zuluCryptSecurityPrivilegeElevationError )( const char * ) ;
-+extern void ( *zuluCryptSecurityPrivilegeElevationError )( const char * ) ;
-
- void zuluCryptSecuritySetPrivilegeElevationErrorFunction( void ( * ) ( const char * ) ) ;
-
diff --git a/app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild b/app-crypt/zulucrypt/zulucrypt-7.0.0.ebuild
index 413d47c9f966..46db21703bce 100644
--- a/app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild
+++ b/app-crypt/zulucrypt/zulucrypt-7.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,43 +7,37 @@ inherit cmake xdg
DESCRIPTION="Front end to cryptsetup"
HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"
-EGIT_COMMIT="76637bb05af13744bf1734b56f67d6d5cc2343b1"
-SRC_URI="https://github.com/mhogomchungu/zuluCrypt/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/zuluCrypt-${EGIT_COMMIT}"
+SRC_URI="https://github.com/mhogomchungu/${PN}/releases/download/${PV}/${P}.tar.xz"
+S="${WORKDIR}/zuluCrypt-${PV}"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="keyring kwallet +qt5 udev"
-REQUIRED_USE="kwallet? ( qt5 )"
+IUSE="keyring kwallet +qt6 udev"
+REQUIRED_USE="kwallet? ( qt6 )"
DEPEND="
dev-libs/libgcrypt:0=
sys-fs/cryptsetup:=
keyring? ( app-crypt/libsecret )
- qt5? (
+ qt6? (
dev-libs/libpwquality
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- kwallet? ( kde-frameworks/kwallet:5 )
+ dev-qt/qtbase:6[gui,network,widgets]
+ kwallet? ( kde-frameworks/kwallet:6 )
)"
RDEPEND="${DEPEND}
udev? ( virtual/udev )"
BDEPEND="virtual/pkgconfig"
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
src_configure() {
local mycmakeargs=(
+ -DBUILD_WITH_QT6=ON
+ -DINTERNAL_ZULUPLAY=ON
-DLIB_SUFFIX="$(get_libdir)"
-DNOGNOME=$(usex !keyring)
-DNOKDE=$(usex !kwallet)
- -DNOGUI=$(usex !qt5)
- -DQT5=true
+ -DNOGUI=$(usex !qt6)
-DUDEVSUPPORT=$(usex udev)
- -DINTERNAL_ZULUPLAY=true
)
cmake_src_configure
}