commit: 9da7218228b91375591da3f4d548d2c3316ad0f1 Author: Rahil Bhimjiani <me <AT> rahil <DOT> rocks> AuthorDate: Tue Dec 16 17:24:22 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Dec 18 08:40:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9da72182
www-servers/caddy: 2.10.2-r1 add more dns providers 8 more DNS providers added: - dns-dynv6 - dns-gandi - dns-godaddy - dns-linode - dns-namecheap - dns-netlify - dns-powerdns - dns-route53 Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks> Part-of: https://github.com/gentoo/gentoo/pull/45049 Signed-off-by: Sam James <sam <AT> gentoo.org> www-servers/caddy/Manifest | 2 ++ .../{caddy-9999.ebuild => caddy-2.10.2-r1.ebuild} | 20 ++++++++++---- www-servers/caddy/caddy-9999.ebuild | 20 ++++++++++---- www-servers/caddy/metadata.xml | 31 ++++++++++++++++++++++ 4 files changed, 63 insertions(+), 10 deletions(-) diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest index f4c0542fbf43..64dab23a1198 100644 --- a/www-servers/caddy/Manifest +++ b/www-servers/caddy/Manifest @@ -3,6 +3,8 @@ DIST caddy-2.10.0-docs.tar.gz 24740 BLAKE2B 9ddb6f57c69ce9692819282876eb55b1713a 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-r1-deps.tar.xz 12283836 BLAKE2B 52fdb35f8261216a42f3fb3064fa31ccebc73042280f17f41caac9356d11ea435f2e1e98138970a43f9d2548fba198d436c48d686bdbc97498d6f8b555db12f5 SHA512 4e2eaa10f828605b4ce65fade8af0cc691ce51c88d905575ec1f62f751982ef286aaf59acebd3c2ccc5786f280b68656da18e8e6cf17ff3d73581f997ffbf8c5 +DIST caddy-2.10.2-r1-go-mod-sum.patch 151305 BLAKE2B 7b3d5cf700d6f29aa9338b77e0692d00188a120f2dcb6870a3f64c1d0cb4190e7a492dbe6258baa77cad52645617aa6934f128faca6ab88e5278849907201f04 SHA512 9a7a4040f1fe7b8e9bd84b22d06a5f2b67a9e039562d86fe3319a15c1063524ce52361263f03a252ee6df38748eaa3b8b56cf16e99599d783862f70fbb5d2b8b 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 diff --git a/www-servers/caddy/caddy-9999.ebuild b/www-servers/caddy/caddy-2.10.2-r1.ebuild similarity index 75% copy from www-servers/caddy/caddy-9999.ebuild copy to www-servers/caddy/caddy-2.10.2-r1.ebuild index b915a487f9c7..d7d5ba3607c5 100644 --- a/www-servers/caddy/caddy-9999.ebuild +++ b/www-servers/caddy/caddy-2.10.2-r1.ebuild @@ -14,7 +14,8 @@ if [[ "${PV}" == 9999* ]]; then else SRC_URI=" https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz + https://github.com/rahilarious/gentoo-distfiles/releases/download/${PF}/deps.tar.xz -> ${PF}-deps.tar.xz + https://github.com/rahilarious/gentoo-distfiles/releases/download/${PF}/go-mod-sum.patch -> ${PF}-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" @@ -26,7 +27,7 @@ LICENSE="Apache-2.0" LICENSE+=" BSD ECL-2.0 MIT CC0-1.0" SLOT="0" -IUSE='dynamicdns dns-azure dns-cloudflare dns-cloudns dns-digitalocean dns-duckdns dns-googleclouddns dns-hetzner dns-mailinabox dns-netcup dns-ovh dns-porkbun dns-rfc2136 dns-vultr events-handlers-exec security webdav' +IUSE='dynamicdns dns-alidns dns-azure dns-cloudflare dns-cloudns dns-digitalocean dns-duckdns dns-dynv6 dns-gandi dns-godaddy dns-googleclouddns dns-he dns-hetzner dns-huaweicloud dns-linode dns-mailinabox dns-namecheap dns-netcup dns-netlify dns-ovh dns-porkbun dns-powerdns dns-rfc2136 dns-route53 dns-vultr events-handlers-exec security webdav' RESTRICT="test" RDEPEND=" @@ -54,19 +55,29 @@ src_unpack() { # 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-dynv6 && { MOOMODULES[dynv6]="github.com/caddy-dns/dynv6" || die ; } + use dns-gandi && { MOOMODULES[gandi]="github.com/caddy-dns/gandi" || die ; } + use dns-godaddy && { MOOMODULES[godaddy]="github.com/caddy-dns/godaddy" || 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-linode && { MOOMODULES[linode]="github.com/caddy-dns/linode" || die ; } use dns-mailinabox && { MOOMODULES[miabox]="github.com/caddy-dns/mailinabox" || die ; } + use dns-namecheap && { MOOMODULES[namecheap]="github.com/caddy-dns/namecheap" || die ; } use dns-netcup && { MOOMODULES[netcup]="github.com/caddy-dns/netcup" || die ; } + use dns-netlify && { MOOMODULES[netlify]="github.com/caddy-dns/netlify" || 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-powerdns && { MOOMODULES[powerdns]="github.com/caddy-dns/powerdns" || die ; } use dns-rfc2136 && { MOOMODULES[rfc]="github.com/caddy-dns/rfc2136" || die ; } + use dns-route53 && { MOOMODULES[route53]="github.com/caddy-dns/route53" || die ; } use dns-vultr && { MOOMODULES[vultr]="github.com/caddy-dns/vultr" || die ; } export MY_MODULES="${MOOMODULES[@]}" || die @@ -99,8 +110,7 @@ src_prepare() { sed -i -e "s|User=caddy|User=http|g;s|Group=caddy|Group=http|g;" ../dist-*/init/*service || die if [[ "${PV}" != 9999* ]]; then - ln -sv ../vendor ./ || die - eapply ../go-mod-sum.patch + eapply "${DISTDIR}/${PF}"-go-mod-sum.patch for moo in ${MY_MODULES}; do add_custom_module "${moo}" diff --git a/www-servers/caddy/caddy-9999.ebuild b/www-servers/caddy/caddy-9999.ebuild index b915a487f9c7..d7d5ba3607c5 100644 --- a/www-servers/caddy/caddy-9999.ebuild +++ b/www-servers/caddy/caddy-9999.ebuild @@ -14,7 +14,8 @@ if [[ "${PV}" == 9999* ]]; then else SRC_URI=" https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz + https://github.com/rahilarious/gentoo-distfiles/releases/download/${PF}/deps.tar.xz -> ${PF}-deps.tar.xz + https://github.com/rahilarious/gentoo-distfiles/releases/download/${PF}/go-mod-sum.patch -> ${PF}-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" @@ -26,7 +27,7 @@ LICENSE="Apache-2.0" LICENSE+=" BSD ECL-2.0 MIT CC0-1.0" SLOT="0" -IUSE='dynamicdns dns-azure dns-cloudflare dns-cloudns dns-digitalocean dns-duckdns dns-googleclouddns dns-hetzner dns-mailinabox dns-netcup dns-ovh dns-porkbun dns-rfc2136 dns-vultr events-handlers-exec security webdav' +IUSE='dynamicdns dns-alidns dns-azure dns-cloudflare dns-cloudns dns-digitalocean dns-duckdns dns-dynv6 dns-gandi dns-godaddy dns-googleclouddns dns-he dns-hetzner dns-huaweicloud dns-linode dns-mailinabox dns-namecheap dns-netcup dns-netlify dns-ovh dns-porkbun dns-powerdns dns-rfc2136 dns-route53 dns-vultr events-handlers-exec security webdav' RESTRICT="test" RDEPEND=" @@ -54,19 +55,29 @@ src_unpack() { # 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-dynv6 && { MOOMODULES[dynv6]="github.com/caddy-dns/dynv6" || die ; } + use dns-gandi && { MOOMODULES[gandi]="github.com/caddy-dns/gandi" || die ; } + use dns-godaddy && { MOOMODULES[godaddy]="github.com/caddy-dns/godaddy" || 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-linode && { MOOMODULES[linode]="github.com/caddy-dns/linode" || die ; } use dns-mailinabox && { MOOMODULES[miabox]="github.com/caddy-dns/mailinabox" || die ; } + use dns-namecheap && { MOOMODULES[namecheap]="github.com/caddy-dns/namecheap" || die ; } use dns-netcup && { MOOMODULES[netcup]="github.com/caddy-dns/netcup" || die ; } + use dns-netlify && { MOOMODULES[netlify]="github.com/caddy-dns/netlify" || 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-powerdns && { MOOMODULES[powerdns]="github.com/caddy-dns/powerdns" || die ; } use dns-rfc2136 && { MOOMODULES[rfc]="github.com/caddy-dns/rfc2136" || die ; } + use dns-route53 && { MOOMODULES[route53]="github.com/caddy-dns/route53" || die ; } use dns-vultr && { MOOMODULES[vultr]="github.com/caddy-dns/vultr" || die ; } export MY_MODULES="${MOOMODULES[@]}" || die @@ -99,8 +110,7 @@ src_prepare() { sed -i -e "s|User=caddy|User=http|g;s|Group=caddy|Group=http|g;" ../dist-*/init/*service || die if [[ "${PV}" != 9999* ]]; then - ln -sv ../vendor ./ || die - eapply ../go-mod-sum.patch + eapply "${DISTDIR}/${PF}"-go-mod-sum.patch for moo in ${MY_MODULES}; do add_custom_module "${moo}" diff --git a/www-servers/caddy/metadata.xml b/www-servers/caddy/metadata.xml index fbc27f98926d..c3bf63c4d631 100644 --- a/www-servers/caddy/metadata.xml +++ b/www-servers/caddy/metadata.xml @@ -42,6 +42,17 @@ Adds module which allows to manage Duck DNS hosted DNS zones using Caddy https://caddyserver.com/docs/modules/dns.providers.duckdns </flag> + <flag name="dns-dynv6"> + Adds module which allows to manage Dynv6 hosted DNS zones using Caddy + </flag> + <flag name="dns-gandi"> + Adds module which allows to manage Gandi hosted DNS zones using Caddy + https://caddyserver.com/docs/modules/dns.providers.gandi + </flag> + <flag name="dns-godaddy"> + Adds module which allows to manage Godaddy hosted DNS zones using Caddy + https://caddyserver.com/docs/modules/dns.providers.godaddy + </flag> <flag name="dns-googleclouddns"> Adds module which allows to manage Google Cloud hosted DNS zones using Caddy https://caddyserver.com/docs/modules/dns.providers.googleclouddns @@ -58,14 +69,26 @@ 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-linode"> + Adds module which allows to manage Linode hosted DNS zones using Caddy + https://caddyserver.com/docs/modules/dns.providers.linode + </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 </flag> + <flag name="dns-namecheap"> + Adds module which allows to manage Namecheap hosted DNS zones using Caddy + https://caddyserver.com/docs/modules/dns.providers.namecheap + </flag> <flag name="dns-netcup"> Adds module which allows to manage netcup hosted DNS zones using Caddy https://caddyserver.com/docs/modules/dns.providers.netcup </flag> + <flag name="dns-netlify"> + Adds module which allows to manage Netlify hosted DNS zones using Caddy + https://caddyserver.com/docs/modules/dns.providers.netlify + </flag> <flag name="dns-ovh"> Adds module which allows to manage OVHcloud hosted DNS zones using Caddy https://caddyserver.com/docs/modules/dns.providers.ovh @@ -74,10 +97,18 @@ Adds module which allows to manage porkbun hosted DNS zones using Caddy https://caddyserver.com/docs/modules/dns.providers.porkbun </flag> + <flag name="dns-powerdns"> + Adds module which allows to manage DNS zones of <pkg>net-dns/pdns</pkg> using Caddy + https://caddyserver.com/docs/modules/dns.providers.powerdns + </flag> <flag name="dns-rfc2136"> Adds module which allows to manage DNS zones using RFC2136 Dynamic Updates within Caddy https://caddyserver.com/docs/modules/dns.providers.rfc2136 </flag> + <flag name="dns-route53"> + Adds module which allows to manage AWS route53 hosted DNS zones using Caddy + https://caddyserver.com/docs/modules/dns.providers.route53 + </flag> <flag name="dns-vultr"> Adds module which allows to manage Vultr hosted DNS zones using Caddy https://caddyserver.com/docs/modules/dns.providers.vultr
