gentoo auto-resync : 13:05:2024 - 00:01:18

4 files changed, 149 insertions, 10 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 9e0cc4f981a6..bf3517d807c9 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index cdbac29791b7..a4812326ca53 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -6,7 +6,11 @@ DIST caddy-2.7.6-docs.tar.gz 24583 BLAKE2B d3dbbb701d86cbfaf538f10911fdd3613b8c3
 DIST caddy-2.7.6-r1-deps.tar.xz 129331604 BLAKE2B 50b83c012c70637936c83ec765758cdcd80014ca224d76a746de8640a6b36ae15ce11ec57d9fdb20a5f7b3add946209c6dde7bb4e4bd4a47ffe3ffc8971725db SHA512 a4bc56de4f7ec8e9967dde3d7ca4cbb74cba9ce0b8906ffe16f8dae3f52fff1164827942df8154eadbae80cce3ee603535b9135cf8a5126d84a9017e8aece078
 DIST caddy-2.7.6-r2-deps.tar.xz 8511804 BLAKE2B ad3c78ee483474754ad83284fabf249c376423217c2929740cd171446d0e755f121e380130c80f291422d39ca69ea7e6ac52f5ce5cdec740616099b665cef5af SHA512 c48d299d9a0b27ebe467f64dc433625de26293674d8153122ad6798a6b95ed4fe55f764a18d3e9211a8e2f966724d20996f1789e2e84dbb0181cfcf5340303fb
 DIST caddy-2.7.6.tar.gz 606077 BLAKE2B 1237edc164ec6095c9dff27c332925c4ce9d91a60e629770463bbffb1503b8b11e36033e852df3eb5bb69ffa448833b6ee2891dc0ba6dc9b43b6cce27d492179 SHA512 ef0cb6fd7f6f2a296290b4bb520300e043ad31cc612e734632ffa25cdaa23fd7d601ac4ceaa1c76285d54a07ee773360f795103ef3c2ec79516a4f18a5e844b5
+DIST caddy-2.8.0_beta2-deps.tar.xz 9983432 BLAKE2B 5ce369219b03688a18f01d7e0f14158a4831bdb02f90c9d4cd2554c8a516f8575155473134197c58c6b65b8752b2fc6a2cdf56b4eaacde20a01233c3f5b1dd38 SHA512 e4fd9432adb4cc98b1f765d5b7f3920030fc433e838a5b7f388f8ba220fe0f23e0c0ce5da01507e3241d03f3e7f010a49dde6ba49402f363fb005bb879c2c1a6
+DIST caddy-2.8.0_beta2-docs.tar.gz 24678 BLAKE2B 5e03bada381b63a4549715c25f651e51eed81fc97d9e89cadb1128db55ba8344335590b10ac57a70395f7b57aa8ece93c5a8c2b6f4dd8e199f703bbed2147631 SHA512 d185e77d8020e7afd05a8dd7798fc29a9688268088129be8f813768f2fdd19abbd9e14440d80445c16844976f0740f5aa377ffc8084263c337d313c03adf7556
+DIST caddy-2.8.0_beta2.tar.gz 656863 BLAKE2B 6d1364798629949611c8cc5094e0f91928c9a50fc7de2a084b85402cce07e553d9da2652f1fa55daac8c94c877beb08de7226b7f3befd57367b901e593be1d2c SHA512 64c3f6fb4e32947ff55307f71b416aeb8610d8fd3273514c59c6ebcf323a3552ceea0e3f6281ba4a879d24f1fa02d232e6f634e53fa9edebbce76f78c174032d
 EBUILD caddy-2.7.6-r1.ebuild 3452 BLAKE2B 6834808498445fc62ccd707e59e3c7124ca17ae27233dd15e4ad46c958d31ae562f16dd7e35c460c0fb9a9e2f8159bc1e72bef8c7cbe56643059d400b8d33179 SHA512 ee135d4f0087c6510af3036652ffbfd717989d6264766f0890a94773fc40038bbda19d5e8e47927ef69bbe0c230ac03a09af0aafd665ba54fadf5d1a6444167f
 EBUILD caddy-2.7.6-r2.ebuild 3265 BLAKE2B 860d481606dbab25ad6d88e4a5bc2e2202954907c5ea87b4c3bac1f0b91b7fcb96cbb984b27c68b3d4b85b724a92efec4b3af2c005bc1b3aef1e5477c8dd24ae SHA512 bc77962001e938021de085f0fb84ae3515693b8c6b1510df4c405da290c07effcd9f9a34c83911cc88876d6bcc3c565fda93640e74393c00286c06bafec2105a
-EBUILD caddy-9999.ebuild 3314 BLAKE2B 590bb030a9fd575a4bbe3c5cef9ac6f3603612746878ca46c3f3979478d1fdd66110a4eee8287a1dd57c080a371be7c466f696c3b0fa3b3a9928226429a855d1 SHA512 dd3eaaf24d70ebbb7f63d4d9050d37163aca5b4f3f65733505f45bffee81a79cd3acd3b85c8ef9e40579761abc731fdd7563de46531280c4632a411d6e36fea1
+EBUILD caddy-2.8.0_beta2.ebuild 3287 BLAKE2B aa0c713f1a3743cdf02c5af08898c935014b848c0a544c570fd3c6ac100052dfa5ba458a3557bea1d5b80696c23fe5a4afc44e6ce5fa8973c343b3a982884b20 SHA512 f909abcd9eba665ae65a8e2a7c3c59a27222adf9b9c7e88435eb1d4758070a6051839fb936a094037f72f15e67b91b1368fd8d3ae8444ed217f94c17a2b936c3
+EBUILD caddy-9999.ebuild 3383 BLAKE2B 14c684f4db78d7a3666d6eb57edbf0096d3ea8787875cb649fed182ba42969c5d8c51e7920fe72bfdbf4eeef81885b4cf19e430003e5779f27eceb930a6fcbc7 SHA512 e0bbc7c0dd1bab605199dc90ed6eaa2a1e64a7f2f220277dbdf0cc6ba60a7a8a9eed60fdf62dde47eada44d40ed46c1174ecc3ac7326acb5fe189e86828f0e14
 MISC metadata.xml 1212 BLAKE2B d5395939287c1f47d7c6e6590492ead98297a229620056bfe220c5b19b5d980f51c3ace25415e5c8f2c30cf65ff6690861b20871cf7088763f7509c799e94242 SHA512 947fba49f76b506cdf9889fd120acf0eaa6b82243c649944319d37232dc8cdf7c4ab1b3c418761c99ff0404e92f7957a61e5be8e44ca2635f93b9c2161e36dc5
diff --git a/www-servers/caddy/caddy-2.8.0_beta2.ebuild b/www-servers/caddy/caddy-2.8.0_beta2.ebuild
new file mode 100644
index 000000000000..d28390c3b0f9
--- /dev/null
+++ b/www-servers/caddy/caddy-2.8.0_beta2.ebuild
@@ -0,0 +1,133 @@
+# 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/_beta/-beta.}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz
+		https://dev.gentoo.org/~zmedico/dist/${P}-docs.tar.gz
+"
+	[[ ${PV} != *beta* ]] && \
+		KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+fi
+
+S="${WORKDIR}/${PN}-${PV/_beta/-beta.}"
+# 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-9999.ebuild b/www-servers/caddy/caddy-9999.ebuild
index 86a00c5d6ef9..c66b0a78cfe2 100644
--- a/www-servers/caddy/caddy-9999.ebuild
+++ b/www-servers/caddy/caddy-9999.ebuild
@@ -13,13 +13,15 @@ if [[ "${PV}" == 9999* ]]; then
 	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/caddyserver/caddy/archive/v${PV/_beta/-beta.}.tar.gz -> ${P}.tar.gz
 		https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz
-		https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz -> ${P}-docs.tar.gz
+		https://github.com/caddyserver/dist/archive/refs/tags/v${PV/_beta/-beta.}.tar.gz -> ${P}-docs.tar.gz
 "
-	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+	[[ ${PV} != *beta* ]] && \
+		KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
 fi
 
+S="${WORKDIR}/${PN}-${PV/_beta/-beta.}"
 # MAIN
 LICENSE="Apache-2.0"
 # deps
@@ -81,10 +83,10 @@ src_unpack() {
 
 src_prepare() {
 	default
-	sed -i -e "s|User=caddy|User=http|g;s|Group=caddy|Group=http|g;" ../dist-"${PV}"/init/*service || die
+	sed -i -e "s|User=caddy|User=http|g;s|Group=caddy|Group=http|g;" ../dist-*/init/*service || die
 
 	if [[ "${PV}" != 9999* ]]; then
-		mv ../vendor ./ || die
+		ln -sv ../vendor ./ || die
 		eapply ../go-mod-sum.patch
 
 		for moo in ${MY_MODULES}; do
@@ -114,18 +116,18 @@ src_install() {
 
 	dobin "${PN}"
 	insinto /etc/"${PN}"
-	doins ../dist-"${PV}"/config/Caddyfile
-	systemd_dounit ../dist-"${PV}"/init/*.service
+	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-"${PV}"/welcome/index.html
+	doins ../dist-*/welcome/index.html
 
 	newbashcomp completion.bash "${PN}"
 	newfishcomp completion.fish "${PN}".fish
 	newzshcomp completion.zsh _"${PN}"
-	newdoc ../dist-"${PV}"/init/README.md systemd-services-README.md
+	newdoc ../dist-*/init/README.md systemd-services-README.md
 	doman manpages/*
 }