gentoo resync : 12.05.2022

3 files changed, 50 insertions, 2 deletions

diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index d5aa5eadbd9c..25f997d5f200 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -7,6 +7,8 @@ DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20180421153158-65cc252bf669.mod 22 BLAKE2B c
 DIST bitbucket.org%2Fcreachadair%2Fshell%2F@v%2Fv0.0.6.mod 48 BLAKE2B 97b2e5e0f91c66c301db92f58f064d0c91a85b0766ee77d85a8298269e1ac8c82acd1880664e302517143892b98b1f011688d3003ff595a1f9adf0fe8df6e8ac SHA512 eb5c512e9be3b38de69c2708418456ce71dc4285f64abb5e5bea738375576ea1d9ac2f4bd46163af34e7a7f7ae554ca3439a8122e2dbbeedc60221865bbfc2b4
 DIST caddy-2.0.0.tar.gz 350050 BLAKE2B 5cf53b85fa267d6686ce00754d4653013aab56e1fd076f4c4f8c864d57f924ab3fedaba4bce24972159e83ce7ae3889b75d5d0e259c8d77a0620e0b53b3888e2 SHA512 b7393f117e33529990424a78804c0e04a86ff8af8393564134066ab7b6a1d64a141b73708928209c1f29147a2f8fd94b2056f11642b8205b6de4ede6a783f2af
 DIST caddy-2.4.6.tar.gz 471625 BLAKE2B 43cabb5ca092f21eedb34941d58384feacbd021acdd408eaaf486e25f92e367c7d2e6a193f983b57ae374f6200dc8c04728ea2dfae45ec411b2bdab58dd81d32 SHA512 adbf59825fc7b2ad561db936e77272d2f6867212e1dd0099df80a0aefd41d1c67ad112094a4aa3a14492aa3818b02d331ab51987c3d84fdf980954ad1fa6852b
+DIST caddy-2.5.1-deps.tar.xz 133130008 BLAKE2B 1ef818f057a46109cea61d4821981909a8da93227eb691611a1356415d56d829b4ae922e6dc0b67e7252e2bf5a2738935b4e15e0131c85d7e9a40781410ad202 SHA512 5c0c52d2e5349c32c59211de8b210f4e9a49d21ce0182f2b3999d4dfb220e9c99a5981b155db3ab425325615509e2ed7443654cfc72e11a186bb479e2471e631
+DIST caddy-2.5.1.tar.gz 524858 BLAKE2B 727dbdecce1d16d7f53db0e1fd0a83d3739b0d19226683ed41a3831a8701c657aa49240f05f5985a1f381fc45a68e54420356bab56980e7b1afc85e47b942747 SHA512 fe110e9f71f58cd090f695dfaf3e129cd03e4eefabfeddc4d92b2ae8686c849fc7d0e3911014f9a0ce214add9af28b8668af383b83d3dd833ff3666cd14c66b8
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.31.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
@@ -2107,5 +2109,6 @@ DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B e8f36
 DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 35 BLAKE2B ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7 SHA512 4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
 DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv1.0.0.mod 76 BLAKE2B 2b8d5265d8f690bdfe78bc571e24d3b5f51dd9dadbf87cd5a5019ddf5a54cd8a9f895e65ecf216bad03687115d404d8e8637a6b2b5aafb19c6988340a1da3574 SHA512 c8b52c1a238330c05e1baf979ab78726f8276944b1d9ab93334f9020c7ca2cd3fb39008e1e56c5399916a6da6a1ff896346c6616ea1fe2cbacc01202a2d56e06
 EBUILD caddy-2.0.0.ebuild 66030 BLAKE2B 6b32af19bfa3a76058d88fc019f16e1b03d07fb6e1e15cd8c8d455f6aded141270fa1726f1a6b816a5349025f88dfda20345eb8eae963d61632f94abd1f8e759 SHA512 453fefda0c13df71a2fec8f31ed21edb32e0d1b5ab1a9249b72f32cca901d993ccfbcdf0ce3092afe598783e55767906808720616098ce0464602e7140a3e1f8
-EBUILD caddy-2.4.6.ebuild 84951 BLAKE2B 0680f5522cf57fcb5e36eb9dd2fafd82ed9a5e5d89d7b164d3c4ec3525a499caef8fbd3fa9fcae983cfe07945d9f6dc4f89c9d947a2be397e89cc7b9635bdecb SHA512 e2242d7aacfd372ea8e70f81b473214622510281b2b2f2fc08ebac19fea08a941f8064f4f375972aa45462b72caf25ee5d1b301a609eaa2a853809f189773b3c
+EBUILD caddy-2.4.6.ebuild 84950 BLAKE2B 5c918615924debe833d25a6a3204570959c6adb9888e93e3d3bf8c833f92b6a6bb0cee5b3438a5cd9c2650856d23cffc4933fe82645db9931eed0ed0447198f7 SHA512 4c029884677bda87c234ac0db0cd51b29d732317c159919a44d7b607b6d0ee85e692859e1ed859f9e78fa928ab79dbcbecc82e88bc4d96887401aacdd66fce6c
+EBUILD caddy-2.5.1.ebuild 1036 BLAKE2B 486d26f6727ecc957bc973b1851f684d8f8dfab06be959540838744c9b273c2a68a4dbeed6bd05581443fd63f9cfe4b5ef1df2581aafff94dc3b81902ef9f2fd SHA512 16a33de564002ed83c2d0be5163bb34508571ef5062a24e1987302e3c52609cbba158586c10aba13fecea818888cc065972dd452268a701296ac10195abc039e
 MISC metadata.xml 327 BLAKE2B c733fe2ddb3626e38631dea64fc3edf837fc52c8454ed7a37f2859a9759db43db0ef018753649276f846cf4a67b705f2080d7bf55856848c8fb2a2a5db43cb4a SHA512 c52162e031367163930279cf1ebb06b5a59a5d0d13769fe79f6ee146c4752865ac6e4bb13fb8087a569be125dc6d8ee0b2d052088f27d2ae327ba6a31160252b
diff --git a/www-servers/caddy/caddy-2.4.6.ebuild b/www-servers/caddy/caddy-2.4.6.ebuild
index 028e4f7bda66..b03f10936176 100644
--- a/www-servers/caddy/caddy-2.4.6.ebuild
+++ b/www-servers/caddy/caddy-2.4.6.ebuild
@@ -1585,7 +1585,7 @@ SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0 BSD ECL-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 RDEPEND="
 	acct-user/http
 	acct-group/http"
diff --git a/www-servers/caddy/caddy-2.5.1.ebuild b/www-servers/caddy/caddy-2.5.1.ebuild
new file mode 100644
index 000000000000..12a995b0d9e9
--- /dev/null
+++ b/www-servers/caddy/caddy-2.5.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit fcaps go-module systemd
+
+DESCRIPTION="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
+HOMEPAGE="https://caddyserver.com"
+SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD ECL-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+RDEPEND="
+	acct-user/http
+	acct-group/http"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test"
+
+FILECAPS=(
+	-m 755 'cap_net_bind_service=+ep' usr/bin/${PN}
+)
+
+src_compile() {
+	ego build ./cmd/caddy
+}
+
+src_install() {
+	dobin caddy
+	dodoc README.md
+	keepdir /etc/caddy
+	insinto /etc/caddy
+	newins "${FILESDIR}"/caddy_config.json caddy_config.json.example
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newinitd "${FILESDIR}/initd" "${PN}"
+	newconfd "${FILESDIR}/confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotated" "${PN}"
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+}