From d855918b46ba8714cf1320fe63b55fd0ed1748a6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Jun 2024 08:00:25 +0100 Subject: gentoo auto-resync : 29:06:2024 - 08:00:25 --- www-servers/Manifest.gz | Bin 4700 -> 4691 bytes www-servers/caddy/Manifest | 10 +-- www-servers/caddy/caddy-2.8.0_beta2.ebuild | 133 ----------------------------- www-servers/caddy/caddy-2.8.4.ebuild | 131 ++++++++++++++++++++++++++++ www-servers/caddy/caddy-9999.ebuild | 8 +- www-servers/gunicorn/Manifest | 2 +- www-servers/gunicorn/metadata.xml | 4 - 7 files changed, 140 insertions(+), 148 deletions(-) delete mode 100644 www-servers/caddy/caddy-2.8.0_beta2.ebuild create mode 100644 www-servers/caddy/caddy-2.8.4.ebuild (limited to 'www-servers') diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz index 391d9f3890df..68b1f62834ba 100644 Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest index 0678379a5c4c..73a4fe975611 100644 --- a/www-servers/caddy/Manifest +++ b/www-servers/caddy/Manifest @@ -5,10 +5,10 @@ AUX remove-binary-altering-commands-2.7.5.patch 2269 BLAKE2B a87a3f7fc6dcb4754f8 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 EBUILD caddy-2.7.6-r2.ebuild 3264 BLAKE2B bbf3b4e68064269d510c5f4a7b03ea26952d59e882b7c7d909f4536643a22d45d70b5b44fa81ad5952691c7509cb8adce110d2b5fff25663ea9728592beb58db SHA512 9803cd8094c42d845f6139f37f4d221009f6124d82eec36027d70f9a9ca4548b3ced4257b6e02a5ad306301ee232dc78534cb1a0a798f9b50f719f7c7f19f71a -EBUILD caddy-2.8.0_beta2.ebuild 3287 BLAKE2B aa0c713f1a3743cdf02c5af08898c935014b848c0a544c570fd3c6ac100052dfa5ba458a3557bea1d5b80696c23fe5a4afc44e6ce5fa8973c343b3a982884b20 SHA512 f909abcd9eba665ae65a8e2a7c3c59a27222adf9b9c7e88435eb1d4758070a6051839fb936a094037f72f15e67b91b1368fd8d3ae8444ed217f94c17a2b936c3 -EBUILD caddy-9999.ebuild 3383 BLAKE2B 14c684f4db78d7a3666d6eb57edbf0096d3ea8787875cb649fed182ba42969c5d8c51e7920fe72bfdbf4eeef81885b4cf19e430003e5779f27eceb930a6fcbc7 SHA512 e0bbc7c0dd1bab605199dc90ed6eaa2a1e64a7f2f220277dbdf0cc6ba60a7a8a9eed60fdf62dde47eada44d40ed46c1174ecc3ac7326acb5fe189e86828f0e14 +EBUILD caddy-2.8.4.ebuild 3240 BLAKE2B 23f62d20d52aef5adb90970e863335f24d010b0d873d3e8a45a250171b948dac5f45cfe1b686794d91c6a677dc9f1a9af9cdbe9056d599652d5daca729ab0a99 SHA512 9f3ea82c74b08e48329e0ffb7149035193f4adc9b9cab96d0be064430ed104f9df5e57ae6b51c971cb052f1a617f5cc88812608f263f4ddbedfaa92ee29c2854 +EBUILD caddy-9999.ebuild 3288 BLAKE2B 982ffc4305109c2fb20f70e31ffbf933ceca6658d4f30aa507347a1917e2ab881e9cc04445673b5dc953ba012480819463cd9c4bc2053434199c6f751a4eac1d SHA512 18c549f002135e6a8e0c7f403dba8e3c2a30bf8252760674ee960de177bbf983069d2957aa10eb4695721bfe9e172b913f210cdea32737827ea09826df5d37f3 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 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/* -} diff --git a/www-servers/caddy/caddy-2.8.4.ebuild b/www-servers/caddy/caddy-2.8.4.ebuild new file mode 100644 index 000000000000..6857e8e83659 --- /dev/null +++ b/www-servers/caddy/caddy-2.8.4.ebuild @@ -0,0 +1,131 @@ +# 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-9999.ebuild b/www-servers/caddy/caddy-9999.ebuild index c66b0a78cfe2..da0106f31184 100644 --- a/www-servers/caddy/caddy-9999.ebuild +++ b/www-servers/caddy/caddy-9999.ebuild @@ -13,15 +13,13 @@ if [[ "${PV}" == 9999* ]]; then 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://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/caddyserver/dist/archive/refs/tags/v${PV/_beta/-beta.}.tar.gz -> ${P}-docs.tar.gz + https://github.com/caddyserver/dist/archive/refs/tags/v${PV}.tar.gz -> ${P}-docs.tar.gz " - [[ ${PV} != *beta* ]] && \ - KEYWORDS="~amd64 ~arm64 ~loong ~riscv" + KEYWORDS="~amd64 ~arm64 ~loong ~riscv" fi -S="${WORKDIR}/${PN}-${PV/_beta/-beta.}" # MAIN LICENSE="Apache-2.0" # deps diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest index 07ea19d8bb00..b5c723df9514 100644 --- a/www-servers/gunicorn/Manifest +++ b/www-servers/gunicorn/Manifest @@ -1,3 +1,3 @@ DIST gunicorn-22.0.0.gh.tar.gz 368152 BLAKE2B 9d3e2955140d299af86b9370c352d0d7ae2b631a5cdf72200550d3ac8b2e5f51edbc686475d3507f8dfb5f4249ef261e29a6d5fa172e5356777297f5497c7c20 SHA512 cb366cfc2875a32e1e6ddd3bd521650cb87a51c29b036b2cfbd9f8371307d1ffefafbcc85d45753c29186a92def77112e2ddd49fdc2116d2d32702635e88ba53 EBUILD gunicorn-22.0.0.ebuild 1101 BLAKE2B 252d1bf5fb84872ac4d4c94ee828f4de437be57ba2326912b84b2763baa61aaf18e722a44f17635cc1f576fd572911dc2e3266c1f3879b17e6c45a7a7e06405d SHA512 162868a7cc6ba409c682519077bf129f392b28eccb05f67dbfe0399c3334d5a913f37d796e463a182d53381b250b9292358187f6fc0f6373f1f0e94630f9a38f -MISC metadata.xml 821 BLAKE2B aa75468eafd9c717f3b3b55b4c91917cd94e612f591e752c93bec95b57e5abd4f46fd98de88c52ca5c624dc00f6d45afbd03f04743f962f87be9321902142712 SHA512 c7746b7036159f99a67dcc688a839ec06adf85d2bfb2214a2ec0b961bfcbd9a72fb5f2dd66dc3868f0d50e5d99386e4a4251f872afd7ad932dc4cca6fc33dff3 +MISC metadata.xml 715 BLAKE2B 4d0e3c4d2940ee439c3e65bd475421afe9e1eaecc0c3fcb8c543418e78af1c0ab6b0064aff27c95b1006e587a17a40bec6f5314f598cd271a9f456dbcf791b61 SHA512 6bb8ba00899f478cfbda4862f8c86edf272f68f4ce9a48c59297722068e53535805c18b5f5b839e3538e83fb6549ad835f5f900eb5ee4dd06612504a9831c0f9 diff --git a/www-servers/gunicorn/metadata.xml b/www-servers/gunicorn/metadata.xml index 9f54d4f8956d..cea1904b8344 100644 --- a/www-servers/gunicorn/metadata.xml +++ b/www-servers/gunicorn/metadata.xml @@ -1,10 +1,6 @@ - - marecki@gentoo.org - Marek Szuba - python@gentoo.org Python -- cgit v1.2.3