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

3 files changed, 65 insertions, 2 deletions

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"
+}