summaryrefslogtreecommitdiff
path: root/app-crypt
diff options
context:
space:
mode:
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/Manifest.gzbin25070 -> 25078 bytes
-rw-r--r--app-crypt/certbot/Manifest4
-rw-r--r--app-crypt/certbot/certbot-3.2.0-r100.ebuild279
-rw-r--r--app-crypt/certbot/metadata.xml21
-rw-r--r--app-crypt/tpm2-openssl/Manifest7
-rw-r--r--app-crypt/tpm2-openssl/files/tpm2-openssl-1.2.0-Makefile-add-run-with-simulator-to-extra-dists.patch28
-rw-r--r--app-crypt/tpm2-openssl/files/tpm2-openssl-1.2.0-tests-run-with-simulator-in-container.patch132
-rw-r--r--app-crypt/tpm2-openssl/files/tpm2-openssl-1.3.0-tests-remove-systemd-ism.patch12
-rw-r--r--app-crypt/tpm2-openssl/tpm2-openssl-1.3.0.ebuild (renamed from app-crypt/tpm2-openssl/tpm2-openssl-1.2.0.ebuild)5
9 files changed, 320 insertions, 168 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index f51d6df475b2..e84757fa044d 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
Binary files differ
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index bc2d5802e52c..8c87d04a2ceb 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -2,10 +2,12 @@ DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263
DIST certbot-2.11.0.gh.tar.gz 2322114 BLAKE2B d266483d1ffc9f9274df3d5e389ed961758e77e9455a7324132bb2bfe4896db663642a98ac7250d35fbbd60d6aef0d6d2a58f98ad17130958dcfcd61283c2479 SHA512 ba47fc98faaf47278c58e107356371c06039f70ad539d2ca1ac39462bb45c7a6c55ed525d8bd8b11cd35cf807f3423e19309022751a492ba19ded79cfbb6d7f4
DIST certbot-3.0.1.gh.tar.gz 2325233 BLAKE2B 247505fb500c829de875aa0886f27727de4ccc4f474dd13957b524b84af99e6ee5d1e86f09577422932a498ec9fda24ae36377d117365531ad1f8eddb0148272 SHA512 7aec63ec7705f4e13acb7cef5d770f103222ddf3dca30760c42cd3aeb0531d630111518960c299d89bccba4134b544a329fa02659fac5f977c9ca0321b2d1e2e
DIST certbot-3.1.0.gh.tar.gz 2299990 BLAKE2B 596f11d4ebb161ee6ba67f4f150a77e081399f11f4e4652923c94297661149c9cb889afc51b46b6111847820823d90edc3a7f1e14c451122f88e6e777bf48795 SHA512 efd0b0c1540a6e3b631fa80eac65c9e8b31b1e5e1242f56d3723ca7e1b1b2121dfe1bf8e122fe9a9b994460553f1fa085b11d1369b3160f5c51c939b2cccd638
+DIST certbot-3.2.0.gh.tar.gz 2309823 BLAKE2B 30ff3f40dc4d7724ad7b9a5eaf48f15fa579d49902dd23d21d8b2d36a4371da05f8c9417b0b2bf49a12565ba9dec180a9d805f22e0e8d1342ae5ea64b43d5219 SHA512 8fc3753dcdc954e143da31a0308269b99abadcdefc008c54c2cabac14a3bf99e757f1007349806a7dabf4a8fe19fd3a365ddea85c1dbeb3b453ae91503ea2288
EBUILD certbot-2.10.0.ebuild 1528 BLAKE2B 34449bcf95187bed02f610a3ab4b5252e241b48385705c53bcf6afa140a4a5d7c216b50f0d2910d32b9f2dec37de298b29cc4106bcb91cf914938c2634725625 SHA512 c52d34a393a7788ae9062a752e3205218301a6b84b6716ebece6cc3b4568197b841cec020f14b71c66cc7790e1076b833bf286f950aeaf80015159e9187493fe
EBUILD certbot-2.11.0-r3.ebuild 1532 BLAKE2B cbb39b14012b2e7575bf75535536c2c006b25ddb458eeeca91a0536e55a2ddd8f4661a19d9bad4b6d460eae5ee36f80fc10336e5ea879cc10eacb750b13ca8de SHA512 4d11ee2ca9aa12139d677a35382fc60ff6226fe594ded11e5256afb5d769ac2db25bb854959b78521e5b50a1266133f5004b8ef63586593c3673fdb2208e29f8
EBUILD certbot-2.11.0.ebuild 1528 BLAKE2B 34449bcf95187bed02f610a3ab4b5252e241b48385705c53bcf6afa140a4a5d7c216b50f0d2910d32b9f2dec37de298b29cc4106bcb91cf914938c2634725625 SHA512 c52d34a393a7788ae9062a752e3205218301a6b84b6716ebece6cc3b4568197b841cec020f14b71c66cc7790e1076b833bf286f950aeaf80015159e9187493fe
EBUILD certbot-3.0.1.ebuild 1572 BLAKE2B 0200fb1f4425354e788fce567e63a4e302afa1409c73085491c3f32e7bce0d9830521e2907ad7c03f29f8e9ce10931a53bb11d385a643ee21417194c5767d453 SHA512 dd4680db1d2157a551d76639a4586b4ff6e9d68677e969009f78697a1b50a5e9799765102602a8075b3da41f93980060756c22f13a03f7152d92072eb4287e66
EBUILD certbot-3.1.0.ebuild 1572 BLAKE2B 92f7bef4a2b4eaa3251d20fd44b33544687acd4cdc7aa2dc7d7bfea69a30163c13c19b2b4e0b78c9fc3c977054e35937d4bba387aa4bc3dce76ca573539e150e SHA512 f43cf0ceb6fb9644aa963b2e74f22cb5104ffcd5564b3d860ab449463a62f934aa34497119916825d6bf1eb701916caa48bb62b701344d167619ca778ee46c3a
+EBUILD certbot-3.2.0-r100.ebuild 6569 BLAKE2B c1bee15c1b8b04ec82ef46701aed25eac0820528c12ad2cc7e4e69fb535de22bd8a35feebaead266a56966f7bab77bd61b2c6bf8a5edadb6ae117e8ea43de6ca SHA512 3f77673f981f585a260a9d40ccf75f09072cd35f9a86e9047729a3274e70f400f001a13a1856f23ef7b302b3a1e8cbded498f42cfc566110e86a2cde4532e8e4
EBUILD certbot-9999.ebuild 1572 BLAKE2B 0200fb1f4425354e788fce567e63a4e302afa1409c73085491c3f32e7bce0d9830521e2907ad7c03f29f8e9ce10931a53bb11d385a643ee21417194c5767d453 SHA512 dd4680db1d2157a551d76639a4586b4ff6e9d68677e969009f78697a1b50a5e9799765102602a8075b3da41f93980060756c22f13a03f7152d92072eb4287e66
-MISC metadata.xml 404 BLAKE2B 81266457a8db353ea7c650478797e49ba61828d9cf0116a94fc62e5ee7a87272b25660f45741cf98843cfc2a5c286284b59f568ad8f4ad33d2bce60bc04549dc SHA512 d7b1e2417cba958f59b05cac02fee15e361fe9657f28d53d6308011767637d838dc09dd4ce21ba56d5174af0fa4cb6a7fee5771f780d7127d9de5a9e628172fd
+MISC metadata.xml 1684 BLAKE2B 10bc000ed0b87bd03b7e58882c36e7100654a71a9d0e0ebaf29018524af20ab5fdbeb1ce950ab16a5fa33f99ccc3936c5070cc200e92700ecf21a74a44233fdd SHA512 db04143763a2a42fb026bbc51eae9128e30214873b134ccb4d4ad8fcbe7e1c7284b7928fcec2b6c6ea58dd49acc5cf33312c4fe0af3f001f69fc441032972369
diff --git a/app-crypt/certbot/certbot-3.2.0-r100.ebuild b/app-crypt/certbot/certbot-3.2.0-r100.ebuild
new file mode 100644
index 000000000000..dd7cd3d9d641
--- /dev/null
+++ b/app-crypt/certbot/certbot-3.2.0-r100.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2025 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"
+ # Only for amd64, arm64 and x86 because of dev-python/python-augeas
+ #KEYWORDS="~amd64 ~arm64 ~x86"
+ # Only for amd64 and x86 because of dev-python/dns-lexicon
+ KEYWORDS="~amd64 ~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/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# acme required for certbot, and then required for modules
+CERTBOT_BASE=(acme certbot)
+# List of "subpackages" from tools/_release.sh (without acme which is already above)
+CERTBOT_MODULES_EXTRA=(
+ apache
+ #dns-cloudflare # Requires missing packages, already in GURU
+ #dns-digitalocean # Requires missing packages, already in GURU
+ dns-dnsimple
+ dns-dnsmadeeasy
+ dns-gehirn
+ dns-google
+ dns-linode
+ dns-luadns
+ dns-nsone
+ dns-ovh
+ dns-rfc2136
+ dns-route53
+ dns-sakuracloud
+ nginx
+)
+
+IUSE="selinux"
+for module in "${CERTBOT_MODULES_EXTRA[@]}"; do
+ IUSE+=" certbot-${module}"
+done
+
+BDEPEND="
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ )
+"
+
+# See each setup.py for dependencies
+# Also discard the previous related packages
+RDEPEND="
+ !app-crypt/acme
+ !app-crypt/certbot-apache
+ !app-crypt/certbot-nginx
+ !app-crypt/certbot-dns-dnsimple
+ !app-crypt/certbot-dns-nsone
+ !app-crypt/certbot-dns-cloudflare
+ !app-crypt/certbot-dns-desec
+ !app-crypt/certbot-dns-rfc2136
+
+ dev-python/chardet[${PYTHON_USEDEP}]
+ >=dev-python/configargparse-1.5.3[${PYTHON_USEDEP}]
+ >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-43.0.0[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
+ <dev-python/josepy-2[${PYTHON_USEDEP}]
+ >=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-25.0.0[${PYTHON_USEDEP}]
+ dev-python/pyrfc3339[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+ certbot-apache? (
+ dev-python/python-augeas[${PYTHON_USEDEP}]
+ )
+ certbot-dns-dnsimple? (
+ >=dev-python/dns-lexicon-3.14.1[${PYTHON_USEDEP}]
+ )
+ certbot-dns-dnsmadeeasy? (
+ >=dev-python/dns-lexicon-3.14.1[${PYTHON_USEDEP}]
+ )
+ certbot-dns-gehirn? (
+ >=dev-python/dns-lexicon-3.14.1[${PYTHON_USEDEP}]
+ )
+ certbot-dns-google? (
+ >=dev-python/google-api-python-client-1.6.5[${PYTHON_USEDEP}]
+ >=dev-python/google-auth-2.16.0[${PYTHON_USEDEP}]
+ )
+ certbot-dns-linode? (
+ >=dev-python/dns-lexicon-3.14.1[${PYTHON_USEDEP}]
+ )
+ certbot-dns-luadns? (
+ >=dev-python/dns-lexicon-3.14.1[${PYTHON_USEDEP}]
+ )
+ certbot-dns-nsone? (
+ >=dev-python/dns-lexicon-3.14.1[${PYTHON_USEDEP}]
+ )
+ certbot-dns-ovh? (
+ >=dev-python/dns-lexicon-3.15.1[${PYTHON_USEDEP}]
+ )
+ certbot-dns-rfc2136? (
+ >=dev-python/dnspython-2.6.1[${PYTHON_USEDEP}]
+ )
+ certbot-dns-route53? (
+ >=dev-python/boto3-1.15.15[${PYTHON_USEDEP}]
+ )
+ certbot-dns-sakuracloud? (
+ >=dev-python/dns-lexicon-3.14.1[${PYTHON_USEDEP}]
+ )
+ certbot-nginx? (
+ >=dev-python/pyopenssl-25.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pyparsing-2.4.7[${PYTHON_USEDEP}]
+ )
+ selinux? ( sec-policy/selinux-certbot )
+"
+# RDEPEND+="
+# >=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}] # @TODO is still necessary?
+# certbot-dns-cloudflare? (
+# # Available in GURU
+# >=dev-python/cloudflare-2.19[${PYTHON_USEDEP}]
+# <dev-python/cloudflare-2.20[${PYTHON_USEDEP}]
+# )
+# certbot-dns-digitalocean? (
+# # Available in GURU
+# >=dev-python/digitalocean-1.11[${PYTHON_USEDEP}]
+# )
+# "
+
+distutils_enable_sphinx docs \
+ dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+src_prepare() {
+ local S_BACKUP="${S}"
+
+ local certbot_dirs=()
+ local base module dir
+ for base in "${CERTBOT_BASE[@]}"; do
+ certbot_dirs+=("${base}")
+ done
+ for module in "${CERTBOT_MODULES_EXTRA[@]}"; do
+ use "certbot-${module}" \
+ && certbot_dirs+=("certbot-${module}")
+ done
+
+ for dir in "${certbot_dirs[@]}"; do
+ S="${WORKDIR}/${P}/${dir}"
+ pushd "${S}" > /dev/null || die
+ distutils-r1_src_prepare
+ popd > /dev/null || die
+ done
+
+ # Restore S
+ S="${S_BACKUP}"
+}
+
+src_configure() {
+ local S_BACKUP="${S}"
+
+ local certbot_dirs=()
+ local base module dir
+ for base in "${CERTBOT_BASE[@]}"; do
+ certbot_dirs+=("${base}")
+ done
+ for module in "${CERTBOT_MODULES_EXTRA[@]}"; do
+ use "certbot-${module}" \
+ && certbot_dirs+=("certbot-${module}")
+ done
+
+ for dir in "${certbot_dirs[@]}"; do
+ S="${WORKDIR}/${P}/${dir}"
+ pushd "${S}" > /dev/null || die
+ distutils-r1_src_configure
+ popd > /dev/null || die
+ done
+
+ # Restore S
+ S="${S_BACKUP}"
+}
+
+src_compile() {
+ local S_BACKUP="${S}"
+
+ local certbot_dirs=()
+ local base module dir
+ for base in "${CERTBOT_BASE[@]}"; do
+ certbot_dirs+=("${base}")
+ done
+ for module in "${CERTBOT_MODULES_EXTRA[@]}"; do
+ use "certbot-${module}" \
+ && certbot_dirs+=("certbot-${module}")
+ done
+
+ for dir in "${certbot_dirs[@]}"; do
+ S="${WORKDIR}/${P}/${dir}"
+ pushd "${S}" > /dev/null || die
+ distutils-r1_src_compile
+ popd > /dev/null || die
+ done
+
+ # Restore S
+ S="${S_BACKUP}"
+}
+
+python_test() {
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ epytest
+}
+
+src_test() {
+ local S_BACKUP="${S}"
+
+ local certbot_dirs=()
+ local base module dir
+ for base in "${CERTBOT_BASE[@]}"; do
+ certbot_dirs+=("${base}")
+ done
+ for module in "${CERTBOT_MODULES_EXTRA[@]}"; do
+ use "certbot-${module}" \
+ && certbot_dirs+=("certbot-${module}")
+ done
+
+ for dir in "${certbot_dirs[@]}"; do
+ S="${WORKDIR}/${P}/${dir}"
+ pushd "${S}" > /dev/null || die
+ distutils-r1_src_test
+ popd > /dev/null || die
+ done
+
+ # Restore S
+ S="${S_BACKUP}"
+}
+
+src_install() {
+ local S_BACKUP="${S}"
+
+ local certbot_dirs=()
+ local base module dir
+ for base in "${CERTBOT_BASE[@]}"; do
+ certbot_dirs+=("${base}")
+ done
+ for module in "${CERTBOT_MODULES_EXTRA[@]}"; do
+ use "certbot-${module}" \
+ && certbot_dirs+=("certbot-${module}")
+ done
+
+ for dir in "${certbot_dirs[@]}"; do
+ S="${WORKDIR}/${P}/${dir}"
+ pushd "${S}" > /dev/null || die
+ distutils-r1_src_install
+ popd > /dev/null || die
+ done
+
+ # Restore S
+ S="${S_BACKUP}"
+}
diff --git a/app-crypt/certbot/metadata.xml b/app-crypt/certbot/metadata.xml
index 2f0d5e01680c..1df6e8f7f8c8 100644
--- a/app-crypt/certbot/metadata.xml
+++ b/app-crypt/certbot/metadata.xml
@@ -10,4 +10,25 @@
<remote-id type="github">certbot/certbot</remote-id>
<remote-id type="pypi">certbot</remote-id>
</upstream>
+ <use>
+ <flag name="certbot-apache">Enable Apache plugin.</flag>
+ <!--
+ <flag name="certbot-dns-cloudflare">Enable Cloudflare DNS Authenticator plugin.</flag>
+ -->
+ <!--
+ <flag name="certbot-dns-digitalocean">Enable DigitalOcean DNS Authenticator plugin.</flag>
+ -->
+ <flag name="certbot-dns-dnsimple">Enable DNSimple Authenticator plugin.</flag>
+ <flag name="certbot-dns-dnsmadeeasy">Enable DNS Made Easy DNS Authenticator plugin.</flag>
+ <flag name="certbot-dns-gehirn">Enable Gehirn Infrastructure Service DNS Authenticator plugin.</flag>
+ <flag name="certbot-dns-google">Enable Google Cloud DNS Authenticator plugin.</flag>
+ <flag name="certbot-dns-linode">Enable Linode DNS Authenticator plugin plugin.</flag>
+ <flag name="certbot-dns-luadns">Enable LuaDNS Authenticator plugin.</flag>
+ <flag name="certbot-dns-nsone">Enable NS1 DNS Authenticator plugin.</flag>
+ <flag name="certbot-dns-ovh">Enable OVH DNS Authenticator plugin.</flag>
+ <flag name="certbot-dns-rfc2136">Enable RFC 2136 DNS Authenticator plugin.</flag>
+ <flag name="certbot-dns-route53">Enable Route53 DNS Authenticator plugin.</flag>
+ <flag name="certbot-dns-sakuracloud">Enable Sakura Cloud DNS Authenticator plugin.</flag>
+ <flag name="certbot-nginx">Enable Nginx plugin.</flag>
+ </use>
</pkgmetadata>
diff --git a/app-crypt/tpm2-openssl/Manifest b/app-crypt/tpm2-openssl/Manifest
index 11808a412dde..f4211a38ff48 100644
--- a/app-crypt/tpm2-openssl/Manifest
+++ b/app-crypt/tpm2-openssl/Manifest
@@ -1,6 +1,5 @@
AUX tpm2-openssl-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch 975 BLAKE2B 6a7b744513e026cbcc916543d3aa17300a63185eb112c3f1afb1eb4ffb0a02554c18759106c0c7d82efab9bc7b8c9e9f8809f06959edf763d6b38458416d160e SHA512 a4bc43d08f4cd70ba39a3396351894454edbb4ef284344a3184c8538685b15d85a8554619077d03d694e1355dcac5ab57976531f47158f5d2575c5bf7207e966
-AUX tpm2-openssl-1.2.0-Makefile-add-run-with-simulator-to-extra-dists.patch 800 BLAKE2B 8e7795ec80c60308e1c2f4a20ff1fb41cada0479a0a5fc6ad393d066174460e9088728f535b4b5cff1cb57392f3eef683639255e8684274b346632db42d9f6e8 SHA512 946891b571d109272a8c82efd985cac4071ef97cd5be7109cc14652a1e92b27f05d4df0cab27ab2ac7bf0cd54181ae9b480123dbc97c6ab0c6400d33f7c4bd30
-AUX tpm2-openssl-1.2.0-tests-run-with-simulator-in-container.patch 3843 BLAKE2B 12447aa593fed49b360b6a6f51d53c363b5034f434fb9a8ae5099d13199a11b2359b79ed6a5d8af41a4ca98d77426ca652b72b322dbc7e830dfd722ed5c43b25 SHA512 1b26c5aef886cbfebd012088ecec6782d7abb63ef2dde27cd21fce0982c8394445686e08efc6760a4b0217bfb45560aa6594c242f61bb59fd35706110cc7cae1
-DIST tpm2-openssl-1.2.0.tar.gz 424967 BLAKE2B 9bcdc47b2eb94329caace24f10e8c234cdd92250ee7fdd4f6156c278328c0103a2285234e64f48f951f5e1b77e72341eb129ee996e628641a4032849fe5a62ce SHA512 4a12c83a0687768cd972a8d7e544f4bba2debcd24d7da2d2ee9adb097d1565bb1d69d1c448edff05f040b95700847293a8e33bfe92f43e536d13bc734ded1e1d
-EBUILD tpm2-openssl-1.2.0.ebuild 1083 BLAKE2B 7fcacbfd8cfe0569513244b5084897d9566027f00132f44a98370da2b3ac90424eafc089c31404b98a30fa375238a908b97d183469ad2e94946245647a0c6d0f SHA512 493e5735afb7b29c1b5ae5ad4af17d99f0d1ee15d269b2dec54bd490f810af73f0bd443056b2af2dbefd5127667ca456e87bd719e822011f36414253203d0c34
+AUX tpm2-openssl-1.3.0-tests-remove-systemd-ism.patch 369 BLAKE2B 0b476e113e58ce5ab5ed832aaa09ed25b8fd1ad2e47fc29fa6e5d14b129e7f13b77987ca0ed3c910c81703c0e16d261b22d72a45815a5b703d62f4df2bd1ae8f SHA512 aeb0568c9b5a803872f6b13630006132fe153163f7af90c487345b8017e79b0a6e46c30a47cab17e39140cb2e8f41ee2e88e6f5d26741fe7fbc2cb9c1bc6ad40
+DIST tpm2-openssl-1.3.0.tar.gz 432730 BLAKE2B 458cf61324f28b6c9c7d970afa7a4fe4b22f556db986e6ae4db823e876e680e338145b5519b1e351006e43adaf6b7ee7639f42cd7d1ef0b9d96f833b6016c1e4 SHA512 7f226a7a3040fb33863e24d2c3712b2cc816d872c907ac4e05f38502bf52a979a522cad5a27f1984d3ce6cc75b6d4c5098ba025cce9eedac1b7f605300210650
+EBUILD tpm2-openssl-1.3.0.ebuild 990 BLAKE2B 317d87daca6663816f1841f879eb47ed2a1f17b5734de3637b2c8efdeeba2cc6ff3d57ddd2c7ccc5604f570ba5298d706a3230d4cc2aa217b17e32b9cb8052e7 SHA512 37d71c1fd01839db3f91fa5938648a0117689cf20326f5acc7bfb75d0e9708583c1249fe7d7a59c5fae2c0ebaf005912acb6551784a729413ae23a1773797e3d
MISC metadata.xml 495 BLAKE2B 2859f35839200edede18d42a8c1e04c3eb2a8983e35a6aa73352d20f5f1a9b8e2685091ab6c121442bbc23ef232ab701cfe1e5eb2f1e2fbd8c3fa1cafd51b749 SHA512 cf93a17e4ef6cf8e9294fadd0b7a33ccf21196bf648f1239a99cb0d8675c130e7e5ab7990b9a292f0814072ee3d234085d92e250f72b86ad854d81a68a642879
diff --git a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.2.0-Makefile-add-run-with-simulator-to-extra-dists.patch b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.2.0-Makefile-add-run-with-simulator-to-extra-dists.patch
deleted file mode 100644
index 326fb10767f9..000000000000
--- a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.2.0-Makefile-add-run-with-simulator-to-extra-dists.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From be35c35ace48647bb73ae5028db7e8caaccd038d Mon Sep 17 00:00:00 2001
-From: Adrian Freihofer <adrian.freihofer@gmail.com>
-Date: Fri, 8 Dec 2023 14:24:17 +0100
-Subject: [PATCH 1/2] Makefile: add run-with-simulator to extra dists
-
-The run-with-simulator script is executed by the make check step of
-the rpm build process. Therefore it should be packaged into the release
-tar bundles.
-
-Signed-off-by: Adrian Freihofer <adrian.freihofer@gmail.com>
----
- Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 160d84e..994a8e3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -143,5 +143,6 @@ EXTRA_DIST = \
- VERSION \
- $(TESTS_SHELL) \
- $(SH_LOG_COMPILER) \
-+ test/run-with-simulator \
- test/ec_pki/openssl.cnf \
- test/rsa_pki/etc
---
-2.43.0
-
diff --git a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.2.0-tests-run-with-simulator-in-container.patch b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.2.0-tests-run-with-simulator-in-container.patch
deleted file mode 100644
index 33b51b6b1028..000000000000
--- a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.2.0-tests-run-with-simulator-in-container.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/home/salahx/Downloads/run-with-simulator b/home/salahx/Downloads/run-with-simulator
-new file mode 100755
-index 000000000000..e29b591f8d8b
---- /dev/null
-+++ b/test/run-with-simulator
-@@ -0,0 +1,126 @@
-+#!/bin/bash
-+# SPDX-License-Identifier: BSD-3-Clause
-+
-+SIM_PORT_DATA=2321
-+SIM_PORT_CMD=$((SIM_PORT_DATA+1))
-+
-+# Run from top dir of this repository
-+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-+TOP_DIR="$(realpath "$SCRIPT_DIR/..")"
-+cd "$TOP_DIR" || { echo "Error: cd to cd $TOP_DIR failed"; exit 1; }
-+
-+
-+verify_simulator_is_running() {
-+ local pid_tpm=$1
-+
-+ sleep 1
-+ ss -lntp4 2> /dev/null | grep "${pid_tpm}" | grep -q "${SIM_PORT_DATA}"
-+ ret_data=$?
-+ ss -lntp4 2> /dev/null | grep "${pid_tpm}" | grep -q "${SIM_PORT_CMD}"
-+ ret_cmd=$?
-+ if [ $ret_data -eq 0 ] && [ $ret_cmd -eq 0 ]; then
-+ echo "Simulator with PID ${pid_tpm} bound to port ${SIM_PORT_DATA} and ${SIM_PORT_CMD} successfully."
-+ return 0
-+ else
-+ echo "Error: Port conflict? Cleaning up PID: ${pid_tpm}"
-+ return 1
-+ fi
-+}
-+
-+build_tpm2_simulator_ibm() (
-+ test -d ibmtpm && return
-+ echo "---> compiling IBM tpm simulator"
-+ mkdir ibmtpm
-+ curl -Ls https://downloads.sourceforge.net/project/ibmswtpm2/ibmtpm1682.tar.gz | tar xz -C ibmtpm
-+ cd ibmtpm/src && make
-+)
-+
-+start_tpm2_simulator_ibm () {
-+ build_tpm2_simulator_ibm || return 1
-+
-+ echo "---> starting IBM tpm simulator"
-+ ibmtpm/src/tpm_server &
-+ pid_tpm=$!
-+ verify_simulator_is_running $pid_tpm
-+}
-+
-+start_tpm2_simulator_swtpm () {
-+ echo "---> starting swtpm simulator"
-+ swtpm socket --tpm2 \
-+ --server port=$SIM_PORT_DATA \
-+ --ctrl type=tcp,port=$SIM_PORT_CMD \
-+ --flags not-need-init \
-+ --tpmstate dir="$PWD" \
-+ --seccomp action=none &
-+ pid_tpm=$!
-+ verify_simulator_is_running $pid_tpm
-+}
-+
-+start_dbusd () {
-+ echo "---> starting dbus daemon"
-+ dbus-daemon --session --print-address > /tmp/bus-socket-path.txt &
-+ sleep 1
-+ DBUS_SESSION_BUS_ADDRESS="$(tail -n1 /tmp/bus-socket-path.txt)"
-+ export DBUS_SESSION_BUS_ADDRESS
-+}
-+
-+start_tpm2_abrmd() {
-+ local tabrmd_tcti=$1
-+
-+ echo "---> starting abrmd"
-+ local tabrmd_name="com.intel.tss2.Tabrmd${SIM_PORT_DATA}"
-+ tpm2-abrmd --session --dbus-name="${tabrmd_name}" --tcti "${tabrmd_tcti}:host=localhost,port=${SIM_PORT_DATA}" &
-+ TCTI_ADDRESS="tabrmd:bus_name=${tabrmd_name},bus_type=session"
-+ TPM2TOOLS_TCTI="$TCTI_ADDRESS"
-+ TPM2OPENSSL_TCTI="$TCTI_ADDRESS"
-+ export TPM2TOOLS_TCTI
-+ export TPM2OPENSSL_TCTI
-+ sleep 1
-+# busctl --address="${DBUS_SESSION_BUS_ADDRESS}" list | grep "$tabrmd_name"
-+}
-+
-+start_tpm2_sim_env() {
-+ local sim_type=$1
-+
-+ start_dbusd
-+
-+ if [ "$sim_type" = "swtpm" ]; then
-+ start_tpm2_simulator_swtpm || return 1
-+ start_tpm2_abrmd swtpm || return 1
-+ elif [ "$sim_type" = "ibm" ]; then
-+ start_tpm2_simulator_ibm || return 1
-+ start_tpm2_abrmd mssim || return 1
-+ else
-+ echo "invalid tpm simulator typ"
-+ return 1
-+ fi
-+}
-+
-+make_check () {
-+ echo "Running make check"
-+ openssl version
-+ tpm2_getcap properties-fixed | head -n 20
-+ make check
-+}
-+
-+function cleanup()
-+{
-+ pkill -P $$
-+}
-+trap cleanup EXIT
-+
-+build_tpm2_openssl() {
-+ ./bootstrap
-+ ./configure CC=gcc --enable-op-digest --enable-op-cipher
-+ make
-+}
-+
-+SIM_TYPE=${1:-swtpm}
-+SKIP_BUILD=${2:-build}
-+if [ "$SKIP_BUILD" = "skip-build" ]; then
-+ echo "Skipping the build"
-+else
-+ build_tpm2_openssl || { echo "Compiling tpm2-openssl failed"; exit 1; }
-+fi
-+start_tpm2_sim_env "${SIM_TYPE}" || { echo "Starting tpm2 simulator failed ($SIM_TYPE)"; exit 1; }
-+make_check || { echo "tpm2-openssl make check failed"; exit 1; }
diff --git a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.3.0-tests-remove-systemd-ism.patch b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.3.0-tests-remove-systemd-ism.patch
new file mode 100644
index 000000000000..128b47c18cbe
--- /dev/null
+++ b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.3.0-tests-remove-systemd-ism.patch
@@ -0,0 +1,12 @@
+diff --git a/test/run-with-simulator b/test/run-with-simulator
+index e29b591..570e7a5 100755
+--- a/test/run-with-simulator
++++ b/test/run-with-simulator
+@@ -76,7 +76,6 @@ start_tpm2_abrmd() {
+ export TPM2TOOLS_TCTI
+ export TPM2OPENSSL_TCTI
+ sleep 1
+- busctl --address="${DBUS_SESSION_BUS_ADDRESS}" list | grep "$tabrmd_name"
+ }
+
+ start_tpm2_sim_env() {
diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.2.0.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.3.0.ebuild
index 03767401d089..a8b8ade64d07 100644
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.2.0.ebuild
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -29,9 +29,8 @@ BDEPEND="
virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}/${PN}-1.2.0-tests-run-with-simulator-in-container.patch"
- "${FILESDIR}/${PN}-1.2.0-Makefile-add-run-with-simulator-to-extra-dists.patch"
"${FILESDIR}/${PN}-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch"
+ "${FILESDIR}/${PN}-1.3.0-tests-remove-systemd-ism.patch"
)
src_prepare() {
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-03 10:23:43 +0000