commit: d5dd5c2ca9fdc5b2bd4ab310d99ef251b6a62322 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sun Jun 16 23:05:47 2024 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sun Jun 16 23:07:01 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5dd5c2c
www-servers/caddy: drop 2.7.6-r1 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> www-servers/caddy/Manifest | 1 - www-servers/caddy/caddy-2.7.6-r1.ebuild | 129 -------------------------------- 2 files changed, 130 deletions(-) diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest index 631af198827c..bfd4a8eabc22 100644 --- a/www-servers/caddy/Manifest +++ b/www-servers/caddy/Manifest @@ -1,5 +1,4 @@ DIST caddy-2.7.6-docs.tar.gz 24583 BLAKE2B d3dbbb701d86cbfaf538f10911fdd3613b8c3c0f49ef9e229487d2a4fcef9eff79b56e9852d5c1ccd5a8d1d1898861fc8183c343c129901562b03a9092af9e61 SHA512 62e534d41e714b47265fd8089ad9e03a1a89903460976d8af27fa5f71173e076bab8574282213595e495be701b769e1a70ff9e7ec9576fbf8e821e672207faa5 -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 diff --git a/www-servers/caddy/caddy-2.7.6-r1.ebuild b/www-servers/caddy/caddy-2.7.6-r1.ebuild deleted file mode 100644 index 5397520fab65..000000000000 --- a/www-servers/caddy/caddy-2.7.6-r1.ebuild +++ /dev/null @@ -1,129 +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' -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;}') - sed -i -e "${LINE_NO:?}a \ _ \"$1\"" cmd/caddy/main.go || die -} - -src_unpack() { - if [[ "${PV}" == 9999* ]]; then - # clone main git repo - git-r3_src_unpack - - # get extra modules - if use events-handlers-exec; then - pushd "${P}" - add_custom_module 'github.com/mholt/caddy-events-exec' || die - ego get github.com/mholt/caddy-events-exec - popd - fi - - # 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 - 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 - - if use events-handlers-exec && [[ "${PV}" != 9999* ]]; then - add_custom_module 'github.com/mholt/caddy-events-exec' || die - cat <<-EOF >> go.sum || die - github.com/mholt/caddy-events-exec v0.0.0-20231121214933-055bfd2e8b82 h1:uRsPaFNQJRDrYcSsgnH0hFhCWFXfgB8QVH8yjX+u154= - github.com/mholt/caddy-events-exec v0.0.0-20231121214933-055bfd2e8b82/go.mod h1:Y9JjT8YLxpmk7PeUkvsWAhzzRdC6rXP7QjAHiwmvjD0= - EOF - - cat <<-EOF >> go.mod || die - require ( - github.com/mholt/caddy-events-exec v0.0.0-20231121214933-055bfd2e8b82 // indirect - ) - EOF - 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-"${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/* -}
