gentoo auto-resync : 01:04:2024 - 14:13:28

6 files changed, 127 insertions, 2 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index fc8423248f7c..6dd48f14128c 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index 23193bd4e32e..a402d5192184 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -4,5 +4,8 @@ AUX consul-template.logrotated 103 BLAKE2B 66f91c1a2cd0c926da67e99ccf0535c6ff5ed
 AUX consul-template.service 398 BLAKE2B 94a30973f6e0ee114dc844bf9b83e423d72a2fc0a3bc0fb6a01668fdc268c7a4f7d550c67f2f6f5e5de3140d6f14aba99eb65702ee8e335e2c3750a8aba6d7ef SHA512 6f0621088475a392c142ff8cc7236850a61f2fdcb10d456a29a68dff1c12cd52f66cdb37ae2d7c84ba7513f430dc8cea6fd5f128a559b4de708c5b517aab75e1
 DIST consul-template-0.29.4-deps.tar.xz 59446648 BLAKE2B 9ccd689f38eff50ad448a4226de918920c7acca9eb1e23d4e30f9999afc124224bb8f123b3dff4a1d433ea683ed523cd604a41472f50cb1919483040fc18c848 SHA512 3c60d88fdb82744f250cf02be3b3423f74360f18a43f4c4204ee97f73c370b878ecdbd5a300f96b74ffd9c7cde66f6c8b974392f7acc07a113b85ab6f1b6d8e9
 DIST consul-template-0.29.5.tar.gz 262722 BLAKE2B 1e3ddf259d76cf487872cebbe8c8b5bb313b89d073b26496340d39cc55c4e56ec531cbefec4bc1c0dd5c8bb3bd707c9bebfd15011e421badf12ea59a5bbbdbe3 SHA512 f753c2ec7f6c97ac73b34820b40568b5b16a3b8d4bebc7390905614a96744e8d4afd4a63b8b911989ba084ea91d85a21e3283d67a36bf65a685aa63154361a14
+DIST consul-template-0.37.4-deps.tar.xz 1548760 BLAKE2B 34a4e7926f41578071e60c715c534a8a50c49db3a78b06ae6ee49ed1a1c857faea753f27921cb6345bbc94f44ab81da58d3ffd1d27a0e29220bd2631bb35b58a SHA512 e28e29034407a5fbf78f9872b2cd85c0d6414cb5ec3c4b023b080c227583ae34ead6ab5b98c6ff4e1d278d9af137e895cedc79def10017d073f2b99561f1d483
+DIST consul-template-0.37.4.tar.gz 288565 BLAKE2B 69fc82a482c7fce4201621ee43aca689b328be4e34bb99e1cd552ba844787744a97fb64364adc7d9a180fd424d30881deaed45077851bc10fa037799ea99d189 SHA512 e36a5e444801c8700577df28fb3fbc7398b825d8f549d620c07445d86099a7597d0e95d56ce24daedd44eb573cc33e40dd1bb1e7a6def2c2a1788133bb811c38
 EBUILD consul-template-0.29.5.ebuild 1281 BLAKE2B 23ccbe86f4a595439f4a8631f02113a7ea1efa4809ae8dea8387553ada6a134cd3a3ab699f3e05ed605df7a130f7379ac8931fe26a5f0efaec7c518c40a8c03f SHA512 1bec1d319fe99c05e751654f41cac807e54eb3797d6a776256d0c91c354b3c66124ad70a11532b228184a41f17579f4e8fea3c7235947060cc6b69fea33de6e2
+EBUILD consul-template-0.37.4.ebuild 1286 BLAKE2B 80efa330acc17b5dc0fd007e78eaeb8f29aa561261d17afb2524dfe35356cf1972a451ce8d57c6946f9f089ec3cb4a06cd6e080b375571b2213b43eb658f7347 SHA512 b59061d01988ce58de748a79bcf95820669bb394aa89a3c24f66d2f996673e37672a9b6c226be4655beb5da7938660328098a2be5802b51d8fa82343f9f75e80
 MISC metadata.xml 317 BLAKE2B d2427e36d0eec88eb97a7db510b4b45659b3d07b24228903eb5ed80807167c66cde6a3f1e63b1f55117974242ea9c06a78d58cca62359c775750ee34fe328ca0 SHA512 1e6e09983a77466e8671cfd7c848df28c2f35830a28a11c6c78369234fd35f35cb1dce8cbedfc97d2e5b1c4258db730e94c4d452d88b9841dc37e306d68d65b2
diff --git a/app-admin/consul-template/consul-template-0.37.4.ebuild b/app-admin/consul-template/consul-template-0.37.4.ebuild
new file mode 100644
index 000000000000..adf2f99b89be
--- /dev/null
+++ b/app-admin/consul-template/consul-template-0.37.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Generic template rendering and notifications with Consul"
+HOMEPAGE="https://github.com/hashicorp/consul-template"
+SRC_URI="https://github.com/hashicorp/consul-template/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="MPL-2.0"
+LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="
+	acct-group/consul-template
+	acct-user/consul-template"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# TODO: debug test failures
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	# remove -s and -w from the linker flags
+	sed \
+		-e '/-s \\/d' \
+		-e '/-w \\/d' \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake GOBIN="${S}"/bin dev
+}
+
+src_test() {
+	emake GOBIN="${S}"/bin test
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md README.md
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index e8ada4914885..f3dd65f09657 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -9,7 +9,10 @@ DIST consul-1.15.10-vendor.tar.gz 46702348 BLAKE2B a04d6f5a4d2f6f8885207f9f72537
 DIST consul-1.15.11-deps.tar.xz 9566892 BLAKE2B 9459a93d78d3e4b991d0cdcfac22603c628c8f9fdacd8d50524a4c826cca66a575f6cd0bdf5fa9033e32b50336c53192567610ed73386f89c3c4e810c1412144 SHA512 d3876433b4ad3e7a062e059ef250bcfba23ede0595d8491f4b39c73c427e28c677b9f6e41317cf853ab8b3b2ce25151a4adf1a13b13a6a73c6e16de7382d2d05
 DIST consul-1.15.11.tar.gz 28951114 BLAKE2B 02378088d1bbc4313ec62d644b583c328bc9cc40ccc18516a1a14ae0d7f8d12007f1a5fa7c5e455ec2e782ba986ce60d37b92369b1f89f7dd69871702cd97b31 SHA512 1c5c8f9a3ad79aa34fd82a49e92ef5a21fb0470d60e3f3413901305121cbb677c75f72ffd5405554424b336d4e5ec426b7c35f458c04b1d5ab9350c2649cd688
 DIST consul-1.15.3-vendor.tar.gz 43434721 BLAKE2B 7595c98cdecf67e9fb412d8fea1d790dc6b1c29f7bc427e1d0872045a05f8873dc6107f196cea04fe0a2f2553d4fbb1f8d501e5e107b2bea3ae841e5d94eda64 SHA512 b69e3a7c1ebb01c7a64f2c6167e63e8a530b81be9aad8b591d0a71f512f5157ba9a564b46f9effe52a5abd3ae61732e7af10c5ba002110f745eb3d94ebcec256
+DIST consul-1.18.1-deps.tar.xz 10161908 BLAKE2B da7e3e63470f082bf0f1e92252a2d30cce90c4268e5ad3d180ab4bfed6601e92e26e0a108fe7477a1d596cf44114e97551712bce4c2b3d13c06c3fae0fa948e5 SHA512 f0d3961de4c38052209d79817ba6570fc43f3b9c472c959d591cc8fd23029f32070a98c59c70c02f56b80c214ae60d4a2711ca2ec31472758209538ba00ef786
+DIST consul-1.18.1.tar.gz 34424463 BLAKE2B 1c205471fa5d2500e4421eae37159dc3a3f8ebb46ab50266440302ca814834d39fddf0c27f4da5e78a103a2d7411eebf74bd256153b3954c6bc3c384de660a2f SHA512 023ee6f2dff82343f9c3382b531c8fa7f032e1820e09d18f67201c8ae839dfc89b145a8197be2f9c241709541a915a073dd117f5523e17ba0cdaa665bffc2f4c
 EBUILD consul-1.15.10.ebuild 1529 BLAKE2B 1ff7af8d282ef96ffe4db4216c50c5442901a2ef318fa364206f92ab8289b399937bb72f543d799de8533bf8a010cd889c96920f8cc0f3218a01eb69a8d807da SHA512 548bdc401ee0cee8b5a5dfe377c92972d1d7741b94dc4692685ccb393d9cf7a783cfd89ab2254a60d9a09c954d572056d22c91e86473b112e8eafceea7c4531e
-EBUILD consul-1.15.11.ebuild 1597 BLAKE2B 6a26764cca85d90f50286430840ad5cd75ed6e10681e892f90d2d8fadda1a82802be1eb672e02d026eed0d024fd7744ddf15ebcf9736f7659740053be997b513 SHA512 3cdd17959cd48b93a18091a782170c8cc5c1b89bc1f20852ab1e95d2ab54bc5f351a260c1ca50727ff6f1c98b11d1700ac17e0739eb1849674d3917b82345f5f
+EBUILD consul-1.15.11.ebuild 1596 BLAKE2B 042a8ef2dfbd403ad46515f2bc408a0d2209faf44aee9f6638d0e44ba992fa106db11c09dcea395ab275a77c0f4727c7d1c1263469901c6c43612775351fb5e7 SHA512 06bd16ea9b8425fcd81b6505943cb799a08b096d086c71bc7841bccb9702d6f8cc3f04255167ca5cecdc0009d29cc9fe5e81e0de606f6509f89bbd04e0316cbd
 EBUILD consul-1.15.3.ebuild 1528 BLAKE2B 2891bd50fc5724c581c1a22744facad77fad5245448e9e23452cefc0107093732917c35c608fadbe305f100e04b363d85160de181b479b38195dce3b4dbedc0c SHA512 d2b62e8516431314efd38428eafa50bd6a7048db64684b89c1f16073b1f5871dc66d27c3d8d78750b38f3248a6814112ea98e4a434384159df92948fd6b2083d
+EBUILD consul-1.18.1.ebuild 1574 BLAKE2B cfad215359a5c9912bbb01fb77ccd22f46f4aadfe1a25a3c65262353fdf919b1b370a5dc5b3c4b206a2d2d6f45d92099a50484c058604334b5ba5aa107408c39 SHA512 0c467eb5b4e57d00226fb4f50d0d400355f0b00107a4d7a7c01f07bcf3324fd8e2ce4bb4bd5f53ee5d186a3362b745f79b9849fefcdcceecf020d5938008236d
 MISC metadata.xml 392 BLAKE2B 4995d973307987bb70802d4328dbb1d5e052683a2e1900912b40be5e345969740b1df9e8e1b3bcbf76fb90066ed43ac5ce91e8e11a0ad19c9d587c7204f45419 SHA512 92d4589b5294df0ddcee6fbafa5db5288b3e892dbec6d84bf0e53beb2b0a30e385f9166c536462e51aeaa9ee8799dd1ae3634b7b13e452e3059ba2853c5b77f1
diff --git a/app-admin/consul/consul-1.15.11.ebuild b/app-admin/consul/consul-1.15.11.ebuild
index d5549a6d2665..f0597622b535 100644
--- a/app-admin/consul/consul-1.15.11.ebuild
+++ b/app-admin/consul/consul-1.15.11.ebuild
@@ -11,7 +11,7 @@ GIT_COMMIT="4fc94919996f7b7e5d16145f8d89cc5ee644b094"
 SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
 LICENSE="BUSL-1.1 MPL-2.0"
-LICENSE=+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+LICENSE+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
 RESTRICT="test"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
diff --git a/app-admin/consul/consul-1.18.1.ebuild b/app-admin/consul/consul-1.18.1.ebuild
new file mode 100644
index 000000000000..b54c5f6b26e6
--- /dev/null
+++ b/app-admin/consul/consul-1.18.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+GIT_COMMIT="98cb473cc11f2de0ccb61106381b0c7e92819c58"
+
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+LICENSE="BUSL-1.1 MPL-2.0"
+LICENSE+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+SLOT="0"
+RESTRICT="test"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+	acct-group/consul
+	acct-user/consul"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	default
+	sed -e 's|^GIT_DATE=.*|GIT_DATE=2024-03-26T21:59:08Z|' -i Makefile || die
+}
+
+src_compile() {
+	if use x86; then
+		#924629 pie breaks build on x86
+		GOFLAGS=${GOFLAGS//-buildmode=pie}
+	fi
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${GIT_COMMIT}" \
+	emake dev-build
+}
+
+src_install() {
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/consul
+	fowners consul:consul /var/log/consul
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}