From 5dddb11d91be06d9241cdaaa486816676bdaefe8 Mon Sep 17 00:00:00 2001 From: Thibaud CANALE Date: Thu, 14 May 2026 22:18:14 +0200 Subject: [PATCH] app-crypt/certbot: add 5.6.0, update live Does not yet integrate DNS module "cloudflare". Closes: https://bugs.gentoo.org/975145 Signed-off-by: Thibaud CANALE Part-of: https://github.com/gentoo/gentoo/pull/46272 Signed-off-by: Matthew Thode --- app-crypt/certbot/Manifest | 1 + app-crypt/certbot/certbot-5.6.0.ebuild | 221 +++++++++++++++++++++++++ app-crypt/certbot/certbot-9999.ebuild | 2 +- 3 files changed, 223 insertions(+), 1 deletion(-) create mode 100644 app-crypt/certbot/certbot-5.6.0.ebuild diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest index 6e0ef31003d77..f66bc77ebe1be 100644 --- a/app-crypt/certbot/Manifest +++ b/app-crypt/certbot/Manifest @@ -2,3 +2,4 @@ DIST certbot-4.0.0.gh.tar.gz 2309431 BLAKE2B ddf38b29fe0db9a0434291b85c11f40b894 DIST certbot-5.3.1.gh.tar.gz 2333227 BLAKE2B 43a10de248432da214963c0561301e726815a36227634a323439153bcb5ecac77ae03c601f27b597cf68d3ff031e64db34ab1354547856a29617222873e36f63 SHA512 a68d5bec688f7de7f6de3497f336e74c2d573a2902a8fb2c561127792e460f625ea2e840ea058f68dc568f64c9492d0e896479b48ba1cb61d2fa5c3d8d4ee747 DIST certbot-5.4.0.gh.tar.gz 2334507 BLAKE2B d4c2ad540856a4bd16fd3da0707f0deb35a22fcb745df8492742e104e7b1767c2bf5d96e34c5a85d9f9b179f27e772fc881786f066a61583357db7c9b2464fe9 SHA512 9e7b25fa8bc1f36e8ba4cc5818200f366d581707a0a36c599b862659a6b992804bd8d5fc6aae013f8e06e850be7d5abecde395cf2900457d2330385a20950498 DIST certbot-5.5.0.gh.tar.gz 2339278 BLAKE2B 0b0a7402540db95180f1b04497958f2a368fe28fbf31cfb7bcdc8f6960dc6cc1e06b8c2ad5f5e72d221c5d2eba7fe16a4ed0ed9c55bbb0097d5a465a8f460d25 SHA512 5e9bbbdc35fa1a13b777d4323b56a8aaa813faeee42718bf2ba964ae77f2448f48af57545658350fe7a4e48ae36ed33e9e4945c49b5040ef8177fc82667c3870 +DIST certbot-5.6.0.gh.tar.gz 2345701 BLAKE2B 3c726dc351294e93aeecd1b9dfe449ff765d2b2a1bf5d27572ea37311923b1b60c10d80b4f1d845f7b846eb2ae0467d75de7ce1577902fc941a639c28e508db3 SHA512 ee047f8b4c1ca461995b1d5df935316ca11e424dd77223ce49713c550d0e2c8bf8945f774aaa896e9fe7b90b0970997b50fd603113f17bb31f03e2e3d3bc6427 diff --git a/app-crypt/certbot/certbot-5.6.0.ebuild b/app-crypt/certbot/certbot-5.6.0.ebuild new file mode 100644 index 0000000000000..e15d4c9eddf1f --- /dev/null +++ b/app-crypt/certbot/certbot-5.6.0.ebuild @@ -0,0 +1,221 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{12..14} ) + +inherit distutils-r1 toolchain-funcs + +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/ +" + +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 +# except their transition step +RDEPEND=" + >=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.7.0[${PYTHON_USEDEP}] + >=dev-python/josepy-2.0.0[${PYTHON_USEDEP}] + >=dev-python/parsedatetime-2.6[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-25.0.0[${PYTHON_USEDEP}] + dev-python/pyrfc3339[${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-3.0.0[${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.15.0[${PYTHON_USEDEP}] +# ) +# " + +# Note: "docs" is not an actual directory under "S", they are actually +# under each modules, see python_compile_all redefinition, but keep +# this instruction enabled for dependency configuration. +distutils_enable_sphinx docs \ + dev-python/sphinx-rtd-theme +distutils_enable_tests pytest + +CERTBOT_DIRS=() +# Stores temporary modules docs in each subdirectories, +# will be used for HTML_DOCS +CERTBOT_DOCS="${T}/docs" + +src_prepare() { + default + + # set CERTBOT_DIRS + local base module + 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 + + # Used to build documentation + mkdir "${CERTBOT_DOCS}" || die + + # Remove "broken" symbolic link used as documentation. + # Copy actual file, removing source breaks wheel building. + rm -f "${S}/README.rst" + cp "${S}/certbot/README.rst" "${S}/README.rst" || die +} + +python_compile() { + local dir + for dir in "${CERTBOT_DIRS[@]}"; do + pushd "${dir}" > /dev/null || die + + distutils-r1_python_compile + + popd > /dev/null || die + done +} + +# Used to build documentation +python_compile_all() { + use doc || return + + local dir + for dir in "${CERTBOT_DIRS[@]}"; do + # There is no documentation in certbot-apache or certbot-nginx. + if has "${dir}" "certbot-apache" "certbot-nginx"; then + continue + fi + + pushd "${dir}" > /dev/null || die + + sphinx_compile_all + + # Note: discard the `/.` in last entry suffix to avoid error + # with `mv` command. + mv "${HTML_DOCS[-1]%/.}" "${CERTBOT_DOCS}/${dir}" || die + + popd > /dev/null || die + done + + # And finally give the result. + # Note: the suffix `/.` here is to discard the holding directory. + HTML_DOCS=( "${CERTBOT_DOCS}/." ) +} + +python_test() { + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + + tc-has-64bit-time_t || EPYTEST_DESELECT+=( + 'certbot/_internal/tests/storage_test.py::RenewableCertTests::test_time_interval_judgments' + ) + + # Change for pytest rootdir is required. + cd "${BUILD_DIR}/install$(python_get_sitedir)" || die + epytest +} diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild index 05e778eebc34d..e15d4c9eddf1f 100644 --- a/app-crypt/certbot/certbot-9999.ebuild +++ b/app-crypt/certbot/certbot-9999.ebuild @@ -72,7 +72,7 @@ RDEPEND=" >=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/distro-1.7.0[${PYTHON_USEDEP}] >=dev-python/josepy-2.0.0[${PYTHON_USEDEP}] >=dev-python/parsedatetime-2.6[${PYTHON_USEDEP}] >=dev-python/pyopenssl-25.0.0[${PYTHON_USEDEP}]