commit: 57b07ef09499f3b181a8849dcc8bf7c9a51e4358 Author: Rahil Bhimjiani <me <AT> rahil <DOT> rocks> AuthorDate: Thu Jun 13 14:06:16 2024 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sat Jun 29 03:15:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57b07ef0
www-servers/caddy: cleanup old versions Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks> Closes: https://github.com/gentoo/gentoo/pull/37141 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> www-servers/caddy/Manifest | 3 - www-servers/caddy/caddy-2.8.0_beta2.ebuild | 133 ----------------------------- 2 files changed, 136 deletions(-) diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest index 2038371954be..093a34e468d7 100644 --- a/www-servers/caddy/Manifest +++ b/www-servers/caddy/Manifest @@ -1,9 +1,6 @@ DIST caddy-2.7.6-docs.tar.gz 24583 BLAKE2B d3dbbb701d86cbfaf538f10911fdd3613b8c3c0f49ef9e229487d2a4fcef9eff79b56e9852d5c1ccd5a8d1d1898861fc8183c343c129901562b03a9092af9e61 SHA512 62e534d41e714b47265fd8089ad9e03a1a89903460976d8af27fa5f71173e076bab8574282213595e495be701b769e1a70ff9e7ec9576fbf8e821e672207faa5 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 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 diff --git a/www-servers/caddy/caddy-2.8.0_beta2.ebuild b/www-servers/caddy/caddy-2.8.0_beta2.ebuild deleted file mode 100644 index d28390c3b0f9..000000000000 --- a/www-servers/caddy/caddy-2.8.0_beta2.ebuild +++ /dev/null @@ -1,133 +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/_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/* -}
