commit: 7842a161b5f0454e24358bcee4dd647aa0457d76 Author: jinqiang zhang <peeweep <AT> 0x0 <DOT> ee> AuthorDate: Fri Sep 26 22:01:59 2025 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Tue Sep 30 01:54:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7842a161
www-servers/caddy: add 2.10.2 Changes: * Add dns-he dns-alidns dns-huaweicloud USE flags * Move go-mod-sum.patch out of vendor tarball since vendor tarball is generated by CI * Drop vendor symlink, vendor directory is now properly included as caddy-2.10.2/vendor in the tarball Closes: https://bugs.gentoo.org/963371 Signed-off-by: jinqiang zhang <peeweep <AT> 0x0.ee> Closes: https://github.com/gentoo/gentoo/pull/43953 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> www-servers/caddy/Manifest | 4 + www-servers/caddy/caddy-2.10.2.ebuild | 150 ++++++++++++++++++++++++++++++++++ www-servers/caddy/metadata.xml | 12 +++ 3 files changed, 166 insertions(+) diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest index 72fb165e4193..f4c0542fbf43 100644 --- a/www-servers/caddy/Manifest +++ b/www-servers/caddy/Manifest @@ -1,6 +1,10 @@ DIST caddy-2.10.0-deps.tar.xz 11532252 BLAKE2B a532a09d254ed6c9d24c9204a9f91b941279198ff2e5b49b771634ec54d8a020e1188b6d3be5ef0803b6857e5e470d65267237a22f239835134058d602990d11 SHA512 25451724076b316f1238cfa418c758d6484eeb5c56e9d316268554addd8b6085337b0b9c6ff0882b1be707c30962e2fb0ba4d58e3f65631cc775d3fb8f593e69 DIST caddy-2.10.0-docs.tar.gz 24740 BLAKE2B 9ddb6f57c69ce9692819282876eb55b1713a6b1992a77868d5fd9e374b4a135727212934c51651660e05c02870562bf0c69a8450baff318603baa970ce64db13 SHA512 b09dc312e7d120114a57da0fd6c06e7a44996ebdb6c2409e122e4e0bf1be99784513b9378d9955b318cdee6f9ccff9dd2f6811f2cc1217ec638a1f9eb7077892 DIST caddy-2.10.0.tar.gz 727478 BLAKE2B 7447724f1e42d98efeea7ead4db2c1e267b97f43a8cdec3ab1e8b45fb2015f459cee6e38f72e8d441cc84fac5597311087e151884106bc2d5d3ffdd7ea8f57ef SHA512 9f0448b6108d088c5b9f59af8977df9adb73d62ebfc9fce038b07d927984873e39234d7d7dfd64c20e9527eccc400bd54930c5ffa21ec899a117e2c13b6ae229 +DIST caddy-2.10.2-docs.tar.gz 24741 BLAKE2B dc6a483d2fefcb984d5a56b868206c660a22f2480eabc6f7fd12a527c4307a080da4db5caa98b56921038021970a40d1c7317712b7ad6f468b6c8b5a49dc27ea SHA512 281dff2e6cce1f9c9e4273bab4832356baf9e4b0119f854cb9b839dd44fa55e394d4e08ad067e2ed01ac75a39189d66ad79c73ad1738b3012af21543b280dde4 +DIST caddy-2.10.2-go-mod-sum.patch 73510 BLAKE2B c00fd231d49a990ec2baf4ee605108eee6d8d0680891ee1b3aa2798b16e0b156a1391f6097a51a50bc314d66373661dbe18a51e2f3b17e9fd515c276ea4f5dfd SHA512 8490bfce3b3a5dcb75ce6de964940451f42ee0168e75aedc16b390b018acf84800ddc240b858d943f4a5fef9b5f72fbf06296e00c98ba9f92c9dccf16219c685 +DIST caddy-2.10.2-vendor.tar.xz 11897372 BLAKE2B 90e4e82d45d4320a3492724160b0dab969dbd5fabe2c7d6dac1a998d5d7fd0131f9626ad1c1f3a10b09c3c94ebacb86eb76404891986c890066b57f5975a93e1 SHA512 ac5d312dff4ea1004ecf3e9c7574c389796fe377d42365ed129b7d0d8e243bedad677d0a5adebcb693fc24cb4576f247777c778f2d7517947c9a2f6f1cee01ef +DIST caddy-2.10.2.tar.gz 735883 BLAKE2B 3413f0406ae2a1a329fb65cac84dd3eeb1d41466d8603ff67533a320ea37dbe70592ae621d66ec14d4783bf4773425d86e991ed62f14f6057b91522ff2a7f46b SHA512 986b11e26cdaa4fbe554cf7b6bb333404fc33190945ef995122518a3fe2fe582a4cf4d2a8ab463e045857650e9deb88123f8d86a93dbdc465635755b00356205 DIST caddy-2.8.4-deps.tar.xz 9995236 BLAKE2B c19901a458eae2d395fddb9ef8b02225f56e1cf5032a85493de58a9f797369997cb8be8fe52d6ec85333d26d879316f48af73fbd429ae2a4a3c6d2a5e57caea0 SHA512 2ff16025abb9b9a26abd2e2261b487ac34c31c09227ab573cdacad3a5206603a74a5585fa08041c2372469651d8a2a3410f2c562041aef3038c7ecc4fc8baec8 DIST caddy-2.8.4-docs.tar.gz 24660 BLAKE2B 39628524c155b97f20ba00dec592d33e363086278ef96bd216807347d7b61a1a10d7bb50be84f84f3c4a6a972ff5034840700bf2bcd763cbcec75414a667b964 SHA512 c40a3e2b911ac106706e54022563685a0c920e35fe4716d878b79a3ebd8f422aa3bec847b3a0767a53453e40d8b21a3af1804a3c7bf62ddf61fc290c4129de0b DIST caddy-2.8.4.tar.gz 662064 BLAKE2B 77aa671c22e55dff6bab3d251fa9f0a082e41176bf82f5cc9be5b9bee4a234e568c73b8865da116d0db26efbccdd58eeadac80f9160a06946426277640cec11c SHA512 5c354d0ceb3e927b918594c8c7de51f658aba798ac23d41b751c55b728f9fc5c46fa1f8c2e86c838e58d7b3514bc11937a765b36fd87971ea1757c92a70e9665 diff --git a/www-servers/caddy/caddy-2.10.2.ebuild b/www-servers/caddy/caddy-2.10.2.ebuild new file mode 100644 index 000000000000..d0a45f278ef1 --- /dev/null +++ b/www-servers/caddy/caddy-2.10.2.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps go-module systemd shell-completion + +DESCRIPTION="Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS" +HOMEPAGE="https://caddyserver.com"; + +if [[ "${PV}" == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/caddyserver/caddy.git"; +else + SRC_URI=" + https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/gentoo-zh/gentoo-deps/releases/download/${P}/${P}-vendor.tar.xz + https://github.com/peeweep/caddy/commit/87a8af35.patch -> ${P}-go-mod-sum.patch + https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz -> ${P}-docs.tar.gz +" + KEYWORDS="~amd64 ~arm64 ~loong ~riscv" +fi + +# MAIN +LICENSE="Apache-2.0" +# deps +LICENSE+=" BSD ECL-2.0 MIT CC0-1.0" +SLOT="0" + +IUSE='dynamicdns dns-alidns dns-azure dns-cloudflare dns-cloudns dns-digitalocean dns-duckdns dns-googleclouddns dns-he dns-hetzner dns-huaweicloud dns-mailinabox dns-netcup dns-ovh dns-porkbun dns-rfc2136 dns-vultr events-handlers-exec security webdav' +RESTRICT="test" + +RDEPEND=" + acct-user/http + acct-group/http" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-lang/go-1.25.0" + +FILECAPS=( + -m 755 'cap_net_bind_service=+ep' usr/bin/"${PN}" +) + +# takes a module as an only arg +add_custom_module() { + local LINE_NO=$(grep -n 'plug in Caddy modules here' cmd/caddy/main.go | awk -F: '{print $1;}' || die) + sed -i -e "${LINE_NO:?}a \ _ \"$1\"" cmd/caddy/main.go || die +} + +src_unpack() { + declare -A MOOMODULES || die + + use dynamicdns && { MOOMODULES[ddns]="github.com/mholt/caddy-dynamicdns" || die ; } + use events-handlers-exec && { MOOMODULES[exec]="github.com/mholt/caddy-events-exec" || die ; } + use security && { MOOMODULES[sec]="github.com/greenpau/caddy-security" || die ; } + use webdav && { MOOMODULES[webdav]="github.com/mholt/caddy-webdav" || die ; } + + # alphabetically sorted popular DNS providers plugins + # more info on https://caddyserver.com/docs/modules/ + # providers not working with 2.10: dnsimple, gandi, namecheap, powerdns, route53 + use dns-alidns && { MOOMODULES[alidns]="github.com/caddy-dns/alidns" || die ; } + use dns-azure && { MOOMODULES[azure]="github.com/caddy-dns/azure" || die ; } + use dns-cloudflare && { MOOMODULES[cloudflare]="github.com/caddy-dns/cloudflare" || die ; } + use dns-cloudns && { MOOMODULES[cloudns]="github.com/caddy-dns/cloudns" || die ; } + use dns-digitalocean && { MOOMODULES[do]="github.com/caddy-dns/digitalocean" || die ; } + use dns-duckdns && { MOOMODULES[duck]="github.com/caddy-dns/duckdns" || die ; } + use dns-googleclouddns && { MOOMODULES[gcpdns]="github.com/caddy-dns/googleclouddns" || die ; } + use dns-he && { MOOMODULES[he]="github.com/caddy-dns/he" || die ; } + use dns-hetzner && { MOOMODULES[hetzner]="github.com/caddy-dns/hetzner" || die ; } + use dns-huaweicloud && { MOOMODULES[huaweicloud]="github.com/caddy-dns/huaweicloud" || die ; } + use dns-mailinabox && { MOOMODULES[miabox]="github.com/caddy-dns/mailinabox" || die ; } + use dns-netcup && { MOOMODULES[netcup]="github.com/caddy-dns/netcup" || die ; } + use dns-ovh && { MOOMODULES[ovh]="github.com/caddy-dns/ovh" || die ; } + use dns-porkbun && { MOOMODULES[porkbun]="github.com/caddy-dns/porkbun" || die ; } + use dns-rfc2136 && { MOOMODULES[rfc]="github.com/caddy-dns/rfc2136" || die ; } + use dns-vultr && { MOOMODULES[vultr]="github.com/caddy-dns/vultr" || die ; } + + export MY_MODULES="${MOOMODULES[@]}" || die + + if [[ "${PV}" == 9999* ]]; then + # clone main git repo + git-r3_src_unpack + + # get extra modules + pushd "${P}" || die + for moo in ${MY_MODULES}; do + add_custom_module "${moo}" + ego get "${moo}" + done + popd || die + + # clone dist repo (docs and misc) + EGIT_REPO_URI="https://github.com/caddyserver/dist.git"; + EGIT_CHECKOUT_DIR="${WORKDIR}/dist-${PV}" + git-r3_src_unpack + + go-module_live_vendor + else + default + fi +} + +src_prepare() { + default + sed -i -e "s|User=caddy|User=http|g;s|Group=caddy|Group=http|g;" ../dist-*/init/*service || die + + if [[ "${PV}" != 9999* ]]; then + eapply "${DISTDIR}"/${P}-go-mod-sum.patch + + for moo in ${MY_MODULES}; do + add_custom_module "${moo}" + done + fi +} + +src_compile() { + # https://github.com/caddyserver/caddy/blob/master/caddy.go#L843 + if [[ ${PV} == 9999* ]]; then + local CUSTOM_VER="git-$(git rev-parse --short HEAD)" + else + local CUSTOM_VER="${PV}" + fi + + ego build -ldflags "-X github.com/caddyserver/caddy/v2.CustomVersion=${CUSTOM_VER}" ./cmd/caddy + local sh + for sh in bash fish zsh; do + ./caddy completion "${sh}" > completion."${sh}" || die + done + ./caddy manpage -o manpages || die +} + +src_install() { + default + + dobin "${PN}" + insinto /etc/"${PN}" + doins ../dist-*/config/Caddyfile + systemd_dounit ../dist-*/init/*.service + newinitd "${FILESDIR}"/initd-2.7.5 "${PN}" + newconfd "${FILESDIR}"/confd-2.7.5 "${PN}" + insinto /etc/logrotate.d + newins "${FILESDIR}/logrotated" "${PN}" + insinto /usr/share/"${PN}" + doins ../dist-*/welcome/index.html + + newbashcomp completion.bash "${PN}" + newfishcomp completion.fish "${PN}".fish + newzshcomp completion.zsh _"${PN}" + newdoc ../dist-*/init/README.md systemd-services-README.md + doman manpages/* +} diff --git a/www-servers/caddy/metadata.xml b/www-servers/caddy/metadata.xml index 92d78dce8a6e..fbc27f98926d 100644 --- a/www-servers/caddy/metadata.xml +++ b/www-servers/caddy/metadata.xml @@ -18,6 +18,10 @@ Adds module which allows querying an endpoint to get dynamic public IP and updating records with DNS providers https://caddyserver.com/docs/modules/dynamic_dns </flag> + <flag name="dns-alidns"> + Adds module which allows to manage Aliyun DNS zones using Caddy + https://caddyserver.com/docs/modules/dns.providers.alidns + </flag> <flag name="dns-azure"> Adds module which allows to manage Azure hosted DNS zones using Caddy https://caddyserver.com/docs/modules/dns.providers.azure @@ -42,10 +46,18 @@ Adds module which allows to manage Google Cloud hosted DNS zones using Caddy https://caddyserver.com/docs/modules/dns.providers.googleclouddns </flag> + <flag name="dns-he"> + Adds module which allows to manage Hurricane Electric hosted DNS zones using Caddy + https://caddyserver.com/docs/modules/dns.providers.he + </flag> <flag name="dns-hetzner"> Adds module which allows to manage Hetzner hosted DNS zones using Caddy https://caddyserver.com/docs/modules/dns.providers.hetzner </flag> + <flag name="dns-huaweicloud"> + Adds module which allows to manage Huawei Cloud hosted DNS zones using Caddy + https://caddyserver.com/docs/modules/dns.providers.huaweicloud + </flag> <flag name="dns-mailinabox"> Adds module which allows to manage Mail-in-a-Box hosted DNS zones using Caddy https://caddyserver.com/docs/modules/dns.providers.mailinabox
