gentoo resync : 12.05.2022

3 files changed, 94 insertions, 5 deletions

diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 082fd8fe13bc..71dfbace03f7 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -5,8 +5,11 @@ AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea8
 AUX vault.service 677 BLAKE2B 0d9c6636c841ff33fa38afca10f10c62d273dc1c6419e35e2fa844472de0c963e177c80a6db3e95230db6f641ab50148843085cb4f141fa2dd2765aecf8457d3 SHA512 15951d095181fb1b1a5f79e0f385bdb96812a517ea59e05017141a29ed880d0e6f29d377e7c4bc53d5b70175122785a39923297b8e3304fc46a63835d2d2ec50
 DIST vault-1.10.0-vendor.tar.gz 47809365 BLAKE2B 5c44d03edda57b77d2760ed6909876beae1ac713e50569a1130a571fe824ec841ba935c6789b35102e936f0e5c3814965630d86eabd70cc0ef550851f923af2c SHA512 972946177d8e4902c60784112b3835cc5b8982ee5e941e9075248d76c34526117aa43c6b4d7c0222d07ba6e0e4fe45ba9fed87df55d0cb88cd76021f129bd692
 DIST vault-1.10.0-webui.tar.xz 1257948 BLAKE2B 8af0f71e81fec28b12099ea6076f9ea1668c5acb701c52c0f8c22fccb3232852d4bb1dac00635cb54196ea7981b9857aa56c77c36ea890f3432d332f9b273309 SHA512 bb60008376fef3b1e93ae892ab79ae2c752a645f14f26522d60d2ff54fe7eca4aca15fc7eda936469ddc095373ed16503cdfdfb93db9e1492b8b68b3c3576004
-DIST vault-1.9.4-vendor.tar.gz 44536444 BLAKE2B 0ad5eb4b621f3dba4cd996516850d30085293b70938967e15e76c65c34e153fcfba4f3b62fbec0163e046fcd4b7f8e30baeb98fc610c59b0d36e5ed067aacc70 SHA512 6710af7e72ddccce143450ad49fba2ec225a5be84b5d84c59efe1eea0f2d193a994b2d4a0aa194e8ef853dcd5ddff733522fca08cfa58de120e24da9b308a26b
-DIST vault-1.9.4-webui.tar.xz 1088656 BLAKE2B da1b0de1a1cd1630639c8bd31ecb20a9e3bbec9df60bdc6cc6e3f160b6b3d00717cec8039683ccd540332c7521fb40d9735d3a734c6df5b54e39628b56d2bb81 SHA512 c166420857bee3189cc56be13e268da33ece298c3a00a16582537edb96e57bdf38e1c7e214e54779d128f6b7aa97af7b120b5f94ade19582dd4128c7ab43f722
+DIST vault-1.10.1-vendor.tar.gz 48104919 BLAKE2B 03e663c946a57b5bdb68d884bdbcdd93e4c7e712e56d0be9c53e467a8f990131fcdf4341d83b365ae8227470e31a51bca56037c0acf9c5201a284d2128f28528 SHA512 64c7e6be590babff46f20c7773a4dad4788b944b9d371dbfdbef09736463f02b229327f2e72a354236ab1a183774489e549025e2994676c65027599521e16c69
+DIST vault-1.10.1-webui.tar.xz 1258128 BLAKE2B ff4fd043494a67a4ce3c23d805cdef33f2e21ef9f8a1e3a5e5b9b2c92438886af15ac0fc1a574edc0822e94992df9b6c83c7dd527ad85934132aca520aa0a9fe SHA512 95637e5864e5913dc6c32a2a1518a79fd4cbda502d49aceffb7416ce18a25116ec9d3afc2a4bb20dae8e801e6b6a7c374b0ff592e3e7b22fed7cfcfe8379e591
+DIST vault-1.10.2-vendor.tar.gz 48105354 BLAKE2B 4e50985e05b53ff8940b9d2e07b0e5f4326a2f682dab8f88ac64fcf3f036dc946cd315c355012ac5b53ac0c3b0f6f44e0e3f45bfe712c5ab8f139712f67e09b2 SHA512 b2d92647c69c7246d3f41f1e6d58b42751f22b1f3091d8f174fc085c688d099943325cae039e4fa4ff63864521ec5f01cf021aea37d62a9d49cf597a79b3cfb4
+DIST vault-1.10.2-webui.tar.xz 1258016 BLAKE2B c7848513730329af3708c31053bc29a49a683ccceb8628ca6c566c54391d95fc29160d09880b7238e558172fc4484b778ba5dd48236f96474cd2d2092afecc51 SHA512 6d172db7c63d2241826e5c2f69e026d6e3f27f642e5bc3641046b833d867e53f61e1f8318951b3a38d1ea49af367ad599dd29cf7871f5b6098f6e57f0e0f54d3
 EBUILD vault-1.10.0.ebuild 2017 BLAKE2B ae390a3a48d018b3489ad6d51a0208825fd96e9cee81aa3dbfd3930b5e6ca7f0d3cd2c04c6f6b98a8ba5a80703c5ea580c2fe69f1acbe334ae2d91a4a3723e0c SHA512 95b049300934c56b508eb3a58d90bb59f94d04e730209ef8396657684425949d70314c00191e9187d034fd11d24df7668e5ab441df9ab66c7c3fb6877e3c6ccc
-EBUILD vault-1.9.4.ebuild 1979 BLAKE2B a9c481e5b4e0863368cb9eee8ebf33e3d449c52407df7040f11f9c74df456f6984bcdbe3619ec7dec2a634fa116cdd8caeb7e8cb1eca538f7a08e9b091e47b7d SHA512 c81542bc2d06e456fa4df1232d28ab2a44d7232317978d2ccb6e0346b2e71402684606dcc67e4ca2fd591a3b570463aca34fda82107cd7a385bdd753db2a784b
+EBUILD vault-1.10.1.ebuild 2018 BLAKE2B 6eaac4c675d8fc86e62e21f18b5008f510c5ae5dbb7ba1320343296863061d37619c90ee8d965a7157fae1311d2da42882310f958158ac9ceb7f2d0132b68dd7 SHA512 806161ab5c7ae0b76c8936eca79b72a3f867e90bc54a9416a460997e3c4cd1656cdd22d48d2162f850e2fe1897a303b521c49b60da85f7a67237d74f474e5d27
+EBUILD vault-1.10.2.ebuild 2018 BLAKE2B 6eaac4c675d8fc86e62e21f18b5008f510c5ae5dbb7ba1320343296863061d37619c90ee8d965a7157fae1311d2da42882310f958158ac9ceb7f2d0132b68dd7 SHA512 806161ab5c7ae0b76c8936eca79b72a3f867e90bc54a9416a460997e3c4cd1656cdd22d48d2162f850e2fe1897a303b521c49b60da85f7a67237d74f474e5d27
 MISC metadata.xml 372 BLAKE2B 8e18e03d14e17a6a5d8c6b7bdb0d87ef6aec8530e203edc579a66b0c6ba0809bbddf4d68943281483ed841daa18a87ee13bed427162e40cd6c2fe3c45b0ec4fb SHA512 07bd140cd5152ccf7e9c39a0ad45a9361b56306b773176155fceaee3dbfa4645d74dba5a21a131f0221419aed5a9aeed4a5aef7c4eec2750c803e11c96621b02
diff --git a/app-admin/vault/vault-1.9.4.ebuild b/app-admin/vault/vault-1.10.1.ebuild
index 838ba5c5e27b..34df6d35c25c 100644
--- a/app-admin/vault/vault-1.9.4.ebuild
+++ b/app-admin/vault/vault-1.10.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz
 
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="+webui"
 
 BDEPEND="
@@ -51,10 +51,11 @@ src_prepare() {
 		-e "s/gofumpt/gofmt/g" \
 		-i Makefile || die
 	if [[ -d "${WORKDIR}/http/web_ui" ]]; then
+		rm -rf "${S}/http/web_ui" || die
 		mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
 			die "mv failed"
 	else
-		mkdir "${S}/http/web_ui" || die
+		mkdir -p "${S}/http/web_ui" || die
 		touch "${S}/http/web_ui/no_web_ui" || die
 	fi
 }
diff --git a/app-admin/vault/vault-1.10.2.ebuild b/app-admin/vault/vault-1.10.2.ebuild
new file mode 100644
index 000000000000..34df6d35c25c
--- /dev/null
+++ b/app-admin/vault/vault-1.10.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
+	webui? (
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+webui"
+
+BDEPEND="
+	app-arch/zip
+	dev-go/gox
+	>=dev-lang/go-1.15.3"
+COMMON_DEPEND="acct-group/vault
+	acct-user/vault"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+RESTRICT+=" test"
+S=${WORKDIR}/${P}-vendor
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i scripts/build.sh || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-e "s/gofumpt/gofmt/g" \
+		-i Makefile || die
+	if [[ -d "${WORKDIR}/http/web_ui" ]]; then
+		rm -rf "${S}/http/web_ui" || die
+		mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
+			die "mv failed"
+	else
+		mkdir -p "${S}/http/web_ui" || die
+		touch "${S}/http/web_ui/no_web_ui" || die
+	fi
+}
+
+src_compile() {
+	mkdir "${T}"/bin || die
+	BUILD_TAGS="$(usex webui ui '')" \
+	GOPATH="${T}" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake bin
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}