From 77d1bb6f8d47023aa21aaee830bf3229837233d1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Mar 2025 01:46:50 +0000 Subject: gentoo auto-resync : 05:03:2025 - 01:46:50 --- app-crypt/certbot/Manifest | 4 +- app-crypt/certbot/certbot-3.2.0-r100.ebuild | 18 ++- app-crypt/certbot/certbot-9999.ebuild | 229 +++++++++++++++++++++++++++- 3 files changed, 234 insertions(+), 17 deletions(-) (limited to 'app-crypt/certbot') diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest index ad8adbaf24df..2cf076317a99 100644 --- a/app-crypt/certbot/Manifest +++ b/app-crypt/certbot/Manifest @@ -8,7 +8,7 @@ EBUILD certbot-2.11.0-r3.ebuild 1532 BLAKE2B cbb39b14012b2e7575bf75535536c2c006b 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-3.2.0-r100.ebuild 6699 BLAKE2B 3a612895bdca020cc34f2f939817f375509130ac93d994d5c20b8f268dc6b2143a1ae64d3579715dc57038fd917683575f0b640bfd6f874990b20d8435ea7a0d SHA512 c45daf603d6bae056975de47167a1f16a002ea296756458a1eeb481a5845e646f7eaf351c18bacbace30e5c6dab4c1b4fb7dd7d9a78f91de4e73a1e94f3fc001 EBUILD certbot-3.2.0.ebuild 1572 BLAKE2B f70a02b18dfe12e3768ee98be8392c6d9d753dcb5a69f37aa488634748c7bf685abb6a5ffcbb8330f5b82808d6b9fcf7146c129c3b637134418710d9f65b9fac SHA512 4f0815c0a793bce1d2870480069dd67bcee5795638bb5b5cbf61334a019ea0cb31135df4f57c2488e67d23d928190f1f2d7d9ea6a54e59a8ec975eb46161b372 -EBUILD certbot-9999.ebuild 1572 BLAKE2B 0200fb1f4425354e788fce567e63a4e302afa1409c73085491c3f32e7bce0d9830521e2907ad7c03f29f8e9ce10931a53bb11d385a643ee21417194c5767d453 SHA512 dd4680db1d2157a551d76639a4586b4ff6e9d68677e969009f78697a1b50a5e9799765102602a8075b3da41f93980060756c22f13a03f7152d92072eb4287e66 +EBUILD certbot-9999.ebuild 6699 BLAKE2B 3a612895bdca020cc34f2f939817f375509130ac93d994d5c20b8f268dc6b2143a1ae64d3579715dc57038fd917683575f0b640bfd6f874990b20d8435ea7a0d SHA512 c45daf603d6bae056975de47167a1f16a002ea296756458a1eeb481a5845e646f7eaf351c18bacbace30e5c6dab4c1b4fb7dd7d9a78f91de4e73a1e94f3fc001 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 index dd7cd3d9d641..c14b47d5ff54 100644 --- a/app-crypt/certbot/certbot-3.2.0-r100.ebuild +++ b/app-crypt/certbot/certbot-3.2.0-r100.ebuild @@ -71,15 +71,15 @@ BDEPEND=" # See each setup.py for dependencies # Also discard the previous related packages +# except their transition step 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/configargparse-1.5.3[${PYTHON_USEDEP}] @@ -137,6 +137,8 @@ RDEPEND=" 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 diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild index c075f01eda7d..c14b47d5ff54 100644 --- a/app-crypt/certbot/certbot-9999.ebuild +++ b/app-crypt/certbot/certbot-9999.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 @@ -19,48 +19,263 @@ else https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz " - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + #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://github.com/certbot/certbot https://pypi.org/project/certbot/ https://letsencrypt.org/ " -S="${WORKDIR}/${P}/${PN}" 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 certbot/setup.py for acme >= dep +# See each setup.py for dependencies +# Also discard the previous related packages +# except their transition step 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/cryptography-43.0.0[${PYTHON_USEDEP}] >=dev-python/distro-1.0.1[${PYTHON_USEDEP}] >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}] =dev-python/parsedatetime-2.4[${PYTHON_USEDEP}] + >=dev-python/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/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}" +} -- cgit v1.2.3