gentoo auto-resync : 11:12:2023 - 05:14:30

4 files changed, 101 insertions, 7 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 28064ac89b7d..47a76b6eecb8 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index 0a42296ec09d..6f66d56e8d0e 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -12,8 +12,12 @@ DIST caddy-2.7.4.tar.gz 625647 BLAKE2B be4749a2298d2e00e2a24324ee31090847be9ec4d
 DIST caddy-2.7.5-deps.tar.xz 161234532 BLAKE2B 130e3fd75d7d2976ef27c2afe0cede8da957ad1c8db7b2140ef69a732cf25c6a04bde43c836832a0f7c14dbb4ab9cd48b496b8ea644da411181ba79b4116d892 SHA512 3dcc834e8cc9851f114d173a812de4b3a5256f8458f2d20ed0c66109d1ede1ee8e1d85053347a194818495cdfcaab2bf86d1b12f94fe2f917e22bf25b8d9c411
 DIST caddy-2.7.5-docs.tar.gz 24578 BLAKE2B e08bfa37b157d8d4300198384bfc4c19cb0f539cc293311eaedcddffd4469026605c92f4388202db68beeadb2353666860daf3845ff5d69bb11afdb29eefe02b SHA512 635fdc1f2767cceacbddbbf56ba7207d558475c66ff9434a2b6edffd59d3711be0c6a4b4ffd2a6cf2eee53dcf22097c2b11eb44f0e9cc1d8455c1ea7c01bc498
 DIST caddy-2.7.5.tar.gz 611282 BLAKE2B 86c28922f80f931452e81b0c3fa52ed0b86b2325eb2a1adf1de830a7a339772063955fd3cb5ee888cbf8c1c905b98bb6a292b592a2983012ad4fefe33c361e82 SHA512 45f6790b7c3683a8001445e932d5678fd27d204500f7301d92c4d8421f24574e113bf7c335bd277b16abe07eb3d24258358f87c68cee38905fa6d0e6bcc1c24c
+DIST caddy-2.7.6-deps.tar.xz 128958740 BLAKE2B ffbe682df64a88dac9f50e9712f1d6697e58f2d9854c270321f7a0325f0b5ead7f93316756136a4435b70c5e08742c7130ce507ee4aa4696f4fb906f4eba8754 SHA512 f467144e235e09a7718cffe5ed3c40ec2d63038a6a948fe4f85d34717877af8a9959ef7e2c3ac32fd0cce522d693ccac883877f061f5cefc9512f7eed556b336
+DIST caddy-2.7.6-docs.tar.gz 24583 BLAKE2B d3dbbb701d86cbfaf538f10911fdd3613b8c3c0f49ef9e229487d2a4fcef9eff79b56e9852d5c1ccd5a8d1d1898861fc8183c343c129901562b03a9092af9e61 SHA512 62e534d41e714b47265fd8089ad9e03a1a89903460976d8af27fa5f71173e076bab8574282213595e495be701b769e1a70ff9e7ec9576fbf8e821e672207faa5
+DIST caddy-2.7.6.tar.gz 606077 BLAKE2B 1237edc164ec6095c9dff27c332925c4ce9d91a60e629770463bbffb1503b8b11e36033e852df3eb5bb69ffa448833b6ee2891dc0ba6dc9b43b6cce27d492179 SHA512 ef0cb6fd7f6f2a296290b4bb520300e043ad31cc612e734632ffa25cdaa23fd7d601ac4ceaa1c76285d54a07ee773360f795103ef3c2ec79516a4f18a5e844b5
 EBUILD caddy-2.7.4-r1.ebuild 2170 BLAKE2B 2935ddec1231907e4baae92fbcbac0d295f5d729e78732491e5d00a1bd6b27b2b3d637eb091455cc36533fb39becfbaaff3cc1207982c1a19159fe02ef5092db SHA512 060e5d6a4d5adfb92f19d055d07b504fd6a480a80301f076ac9dc29ddd14476a104ca903b437cd7f65bd6d6aec1c0df842a7c461c0f247ebca5a2ed5e9a05ee0
 EBUILD caddy-2.7.4.ebuild 1051 BLAKE2B 0b8c0c2488872aa55de08268187639b2b32d963d96cd9d1ac9403493b4337e86edf0a88a90f147c6618e0a9bacaba546b422052ef7a96931f1676a85873645fe SHA512 b6d76553c27ff5c152399728783cb4a71327ddcfc4d103b8134a90ddf8f9e5c52b29bbb8dd0766c6c3aeb5517be6d1ae0b1ca789481b0b6c0ec9738d881cf562
 EBUILD caddy-2.7.5.ebuild 2468 BLAKE2B 3807de02e87cabf997015d2b2d2b3effe285d3ad141587cdb8c95658606fdb06ea35c13ff160bd27760d2e9e6618f80be5a35436aad6d4e4e3dc43b509dbf336 SHA512 4220d31c8c5d2b2c9c3706a59c73efdef5025a1a3854371bafdb71a65d283e033687c29523e7d21385e39b390d36ff0c8718e93d3619b395a532cc6f9caa9b17
-EBUILD caddy-9999.ebuild 2518 BLAKE2B 5b466755e527dbefa752787d5899b873136e25a47377549f78544391cdaf22eea91cfcc08e45e93f94185a9b655108700cd83dc88eb58d7d87722702dcbfd96e SHA512 3d772453408f3a86555b94578e44a005b58c84181fefc370e00d67bea6475263184f4737bae5daa860c0b9053450cb602eb9aa836011849f5220e0d9ca82ba30
+EBUILD caddy-2.7.6.ebuild 2427 BLAKE2B 863892c4c49e27f456d84efa02d16fd8919895d792344baae9cfb18a38c0c0d664a6e0b46b087e93f0719e5d6bf63bffd6b3b347bf37a13dea6e9a947ba26243 SHA512 2f0faf593ae6cefb996b92543242d32087c4bf59908c00764ecdf81c01e2be6303155d35fc2c68e8744004566a6e36fcfb8475b4a46c130e707982d7a1f3f8ce
+EBUILD caddy-9999.ebuild 2476 BLAKE2B cf0b64b1fdcd1cf49b72198feff6ce24b3fc45d8cac2a4ff262d085a9e6a4e98a1f18b66b6520b0e7f46db3b57d4a838efe642a6ef36fd80bb9ed733905787e3 SHA512 9bb04a07dde701e066cce3d563068c85b3fa312ab9e5537f9f4315523e9a95b2aa192afe2cc14b0f5441220e93a013eee46ce8ced58434272d336f4373b3c299
 MISC metadata.xml 716 BLAKE2B 386d335cb5905f692bc8b198b3311c183f208953f9c7ad1a4b2916aa935b1b305310871f7cc74567b278ad5dcd47222b8dd00e3e5547005f17b2c8262726bb06 SHA512 4640c9692255cb305dad2b8f8ba30fc67079d9bb875114f6de4fc5fc7a50eeb5330054aabd8a3527d82a14d4d79ad72cc4b8795071860e43861a9e384e26ace3
diff --git a/www-servers/caddy/caddy-2.7.6.ebuild b/www-servers/caddy/caddy-2.7.6.ebuild
new file mode 100644
index 000000000000..46bbcab0df3e
--- /dev/null
+++ b/www-servers/caddy/caddy-2.7.6.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 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"
+	SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+	SRC_URI+=" https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz -> ${P}-docs.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+fi
+
+LICENSE="Apache-2.0"
+LICENSE+=" BSD ECL-2.0 MIT CC0-1.0"
+SLOT="0"
+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
+)
+
+src_unpack() {
+	if [[ "${PV}" == 9999* ]]; then
+		# unpack code
+		git-r3_src_unpack
+
+		# unpack 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
+		go-module_src_unpack
+	fi
+}
+
+src_prepare(){
+	default
+	sed -i -e "s|User=caddy|User=http|g;s|Group=caddy|Group=http|g;" ../dist-"${PV}"/init/*service || die
+}
+
+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-"${PV}"/config/Caddyfile
+	systemd_dounit ../dist-"${PV}"/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
+
+	newbashcomp completion.bash "${PN}"
+	newfishcomp completion.fish "${PN}".fish
+	newzshcomp completion.zsh _"${PN}"
+	newdoc ../dist-"${PV}"/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 4940f75d7169..5657c0607730 100644
--- a/www-servers/caddy/caddy-9999.ebuild
+++ b/www-servers/caddy/caddy-9999.ebuild
@@ -8,7 +8,7 @@ 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
+if [[ "${PV}" == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/caddyserver/caddy.git"
 else
@@ -36,7 +36,7 @@ PATCHES=(
 )
 
 src_unpack() {
-	if [[ "${PV}" == *9999* ]]; then
+	if [[ "${PV}" == 9999* ]]; then
 		# unpack code
 		git-r3_src_unpack
 
@@ -92,7 +92,3 @@ src_install() {
 	newdoc ../dist-"${PV}"/init/README.md systemd-services-README.md
 	doman manpages/*
 }
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-}