diff options
Diffstat (limited to 'www-servers')
38 files changed, 236 insertions, 633 deletions
diff --git a/www-servers/adsf/Manifest b/www-servers/adsf/Manifest index c964593c3ec9..55e53ed02666 100644 --- a/www-servers/adsf/Manifest +++ b/www-servers/adsf/Manifest @@ -1 +1,2 @@ DIST adsf-1.5.2.tar.gz 185809 BLAKE2B c4853e9f182ec97009e78c9675a4f7d40d2612c12a8b488cf0278435c0924a93088a4ad04e8372e9a2b6dacb7c77c917059b6bcc5a0557db3b2bb3cab2f4defb SHA512 df6ccd28432f527836f551d5e441f4bfccc91766ad1039dbcbdb2e6ef03d69d1adea17b146d45892c2fb8fca14c742206736b191b6317762e66d73a4dd45722a +DIST adsf-1.5.3.tar.gz 186147 BLAKE2B 1b416cc6832c1c6bc94039d6da6fc4ee21aedff64c231aa98d41dacfb25e2ec6630247830b286e12f855d2583163a2ec2f28d7c6bb6a037d559cc62f70ac8274 SHA512 51ee3204aa8b71c9ba8f0993574c0b384b3533eed5d2c5a86318e47034dbe4b95bcd884a95866927321e406c533d703258637f71b04f39748cb563bd12ac0182 diff --git a/www-servers/adsf/adsf-1.5.3.ebuild b/www-servers/adsf/adsf-1.5.3.ebuild new file mode 100644 index 000000000000..d22704027f19 --- /dev/null +++ b/www-servers/adsf/adsf-1.5.3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +USE_RUBY="ruby32 ruby33 ruby34" + +RUBY_FAKEGEM_EXTRADOC="NEWS.md ../README.md" + +RUBY_FAKEGEM_RECIPE_DOC="none" + +RUBY_FAKEGEM_GEMSPEC="adsf.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="A Dead Simple Fileserver is a static file server that can launch in a directory" +HOMEPAGE="https://github.com/denisdefreyne/adsf/" +SRC_URI="https://github.com/denisdefreyne/adsf/archive/${PV}.tar.gz -> ${P}.tar.gz" +RUBY_S="${P}/adsf" +LICENSE="MIT" + +SLOT="0" +KEYWORDS="~amd64 ~riscv" +IUSE="test" + +ruby_add_rdepend " + || ( dev-ruby/rack:3.2 dev-ruby/rack:3.1 dev-ruby/rack:3.0 dev-ruby/rack:2.2 ) + >=dev-ruby/rackup-2.1:2 + || ( dev-ruby/webrick www-servers/puma ) +" + +ruby_add_bdepend "test? ( dev-ruby/rack-test dev-ruby/webrick )" + +all_ruby_prepare() { + sed -i -e '/simplecov/,/SimpleCov.command_name/ s:^:#:' \ + -e '/websocket/ s:^:#:' test/helper.rb || die + sed -e '/test_receives_update/,/^ end/ s:^:#:' \ + -e '/test_non_local_interfaces/askip "networking"' \ + -e '/test_default_config__serve_index_html_in_subdir_missing_slash/askip "encoding"' \ + -e /'test_auto_extenion__defers_to_subdir_with_index/askip "encoding"' \ + -i test/test_server.rb || die + sed -i -e '/rubocop/I s:^:#:' Rakefile || die + rm -f test/test_version.rb || die + + sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die +} diff --git a/www-servers/apache/apache-2.4.65.ebuild b/www-servers/apache/apache-2.4.65.ebuild index 6e2585452931..ba13c6ee514f 100644 --- a/www-servers/apache/apache-2.4.65.ebuild +++ b/www-servers/apache/apache-2.4.65.ebuild @@ -147,7 +147,7 @@ HOMEPAGE="https://httpd.apache.org/" # some helper scripts are Apache-1.1, thus both are here LICENSE="Apache-2.0 Apache-1.1" SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris" DEPEND="${RDEPEND}" diff --git a/www-servers/apache/apache-2.4.66.ebuild b/www-servers/apache/apache-2.4.66.ebuild index 76fd06af9157..d92d5175976a 100644 --- a/www-servers/apache/apache-2.4.66.ebuild +++ b/www-servers/apache/apache-2.4.66.ebuild @@ -147,7 +147,7 @@ HOMEPAGE="https://httpd.apache.org/" # some helper scripts are Apache-1.1, thus both are here LICENSE="Apache-2.0 Apache-1.1" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris" DEPEND="${RDEPEND}" diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest index f4c0542fbf43..fbcf03c29f34 100644 --- a/www-servers/caddy/Manifest +++ b/www-servers/caddy/Manifest @@ -1,16 +1,9 @@ -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-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 -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 -DIST caddy-2.9.0-deps.tar.xz 10147016 BLAKE2B 3f33fa41cea04e47ef30f3eba5de7b88731154e1598fd37bc55cb63905a98c2c3ee1119a7b386b2c9f278465484c6d4d00dd8bc90962d472fe0acd559f8675fa SHA512 74124dcb80f87eff1d6834569ac3e8428d55b99044f6cac043f6e997e3b2de1e31089ab712c1b2f4fb0d64b6732291dd30316bfc92c6b9000bd2cda39b4d0a90 -DIST caddy-2.9.0-docs.tar.gz 24713 BLAKE2B c022672d818bf56160a561c307bc2526f0e0c6cc920286a744fc800273c9240e2852955c8c7035edad7591a168a177bf5c15822bbaee8704c4c3ca44bc44314d SHA512 f6f8a8d465373b4b2672bdf5a8124d3cedc90c8eea933f1494e6e6eab85ee788320a04c6ca7ccedac0ecbb8a335e0e179a8dd4ba07aeca685f297e525d21c368 -DIST caddy-2.9.0.tar.gz 700749 BLAKE2B 299e5bcda972af0b50d51c135a844221222fef91a1b38d9fda70113087f3587253c8c1d6efda1895a1b64a42444b4d95cd4a80822bc9af7979b55b93b3e6a492 SHA512 e2e7f38d11a69159ef347acb93779a35778267440d55a80b90da75739aabc95ee385fb9256eb79e25326d5e16cf831746d98dc03ccfe97e11d8d52f521154a68 DIST caddy-2.9.1-deps.tar.xz 10115764 BLAKE2B a5dbfe050f1e71dd40feea375f93ef94a31bd75dd6605e460265351719130be04e3883523e550256fe03dd976dbf117292b5f9f44ce8c70030c0f9def423ebb2 SHA512 5a794d5afff72eed255badfcb4043e4714a47ed44ad724d16cf6d3f5b73015700951cf67c3f4d7916a44553ad3c0e629d0f257fe6132dcfd8f882c914a04b1af DIST caddy-2.9.1-docs.tar.gz 24734 BLAKE2B 5c9dd78cd43cd2960f477f1fa89b8a6c4fc4e3d2c1b656051bde06afed8bebf5d1768fff77aab9fd8d5260044159e09e70474dd678cff245632fa7e14dcf05a0 SHA512 91efb7b10f68ab5e6bbfd2789a6f79c325d20692cb84a7651cce0487c97cd7699929e351ca78922ad34716958ebbf9b237e97465abdb263592745f4529cb4909 DIST caddy-2.9.1.tar.gz 701830 BLAKE2B cb36a2dae6f5944ebe44e4233e1e558389394c2176725c8f771d98a69c81de523fa04aed504a9ab7ae97fea4dce7c774d62b799a255a2af658d8677e8c079471 SHA512 2ed36bfe8de3a2c7270e202b2d9ab4c3c78174fcd09c02e38d61d1bd57afa6471a2a690f15edcf91f2bfb105dbf2b0c2186d0c5e6f20ec169e98c66f8f71d0f8 diff --git a/www-servers/caddy/caddy-2.10.0.ebuild b/www-servers/caddy/caddy-2.10.2-r1.ebuild index 22777d05a6d7..d7d5ba3607c5 100644 --- a/www-servers/caddy/caddy-2.10.0.ebuild +++ b/www-servers/caddy/caddy-2.10.2-r1.ebuild @@ -14,10 +14,11 @@ 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" + KEYWORDS="~amd64 ~arm64 ~loong ~riscv" fi # MAIN @@ -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-2.8.4.ebuild b/www-servers/caddy/caddy-2.8.4.ebuild deleted file mode 100644 index 6857e8e83659..000000000000 --- a/www-servers/caddy/caddy-2.8.4.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2024 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://dev.gentoo.org/~zmedico/dist/${PF}-deps.tar.xz - 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='events-handlers-exec security' -RESTRICT="test" - -RDEPEND=" - acct-user/http - acct-group/http" -DEPEND="${RDEPEND}" - -FILECAPS=( - -m 755 'cap_net_bind_service=+ep' usr/bin/"${PN}" -) - -PATCHES=( - "${FILESDIR}"/remove-binary-altering-commands-2.7.5.patch -) - -# 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 events-handlers-exec && { MOOMODULES[exec]="github.com/mholt/caddy-events-exec" || die ; } - use security && { MOOMODULES[sec]="github.com/greenpau/caddy-security" || 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 - ln -sv ../vendor ./ || die - eapply ../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/caddy-2.9.0.ebuild b/www-servers/caddy/caddy-2.9.0.ebuild deleted file mode 100644 index d537a7b8cd57..000000000000 --- a/www-servers/caddy/caddy-2.9.0.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# 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://dev.gentoo.org/~zmedico/dist/${PF}-deps.tar.xz - 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='events-handlers-exec security' -RESTRICT="test" - -RDEPEND=" - acct-user/http - acct-group/http" -DEPEND="${RDEPEND}" - -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 events-handlers-exec && { MOOMODULES[exec]="github.com/mholt/caddy-events-exec" || die ; } - use security && { MOOMODULES[sec]="github.com/greenpau/caddy-security" || 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 - ln -sv ../vendor ./ || die - eapply ../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/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 diff --git a/www-servers/h2o/h2o-2.3.0_pre20250130.ebuild b/www-servers/h2o/h2o-2.3.0_pre20250130.ebuild index e8e359e5c3db..33f27a6ef730 100644 --- a/www-servers/h2o/h2o-2.3.0_pre20250130.ebuild +++ b/www-servers/h2o/h2o-2.3.0_pre20250130.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyr |