From 48e7f15d37baf7167041b2ab0e2a19a703e5c99f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 1 Apr 2024 08:13:46 +0100 Subject: gentoo auto-resync : 01:04:2024 - 08:13:46 --- app-admin/Manifest.gz | Bin 32020 -> 32017 bytes app-admin/consul/Manifest | 5 +-- app-admin/consul/consul-1.15.11.ebuild | 62 +++++++++++++++++++++++++++++++++ app-admin/consul/consul-1.15.7.ebuild | 61 -------------------------------- 4 files changed, 65 insertions(+), 63 deletions(-) create mode 100644 app-admin/consul/consul-1.15.11.ebuild delete mode 100644 app-admin/consul/consul-1.15.7.ebuild (limited to 'app-admin') diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index 6193973dff06..fc8423248f7c 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest index 40d4794e5eca..e8ada4914885 100644 --- a/app-admin/consul/Manifest +++ b/app-admin/consul/Manifest @@ -6,9 +6,10 @@ AUX consul.service 359 BLAKE2B 04a42a1546d2e4dbf57b9d75b32feddd4d0f4f8b6f750b1b4 AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e25606fb97b252be16f2d3f50630092be39be378821f7e17e4914557a55c620156e7d07ced151d1f977689 SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d DIST consul-1.15.10-vendor.tar.gz 46702348 BLAKE2B a04d6f5a4d2f6f8885207f9f72537d4ea1a3adc5aab64873edf7f710984d3b25a602fb93cecc44ed82249280b51bbe1131701ab09f7ebb1b444c80e013fe271d SHA512 7aade3f90ee689ddca3058f12e7c9f2a691c4eba966993d770d8dc7b171cad54c3c8b6c3f52e03128a8d1b159dd66b6c8b284050c5475d77b51f9a22c4a6af8a +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.15.7-vendor.tar.gz 46252048 BLAKE2B c63d69fb206895c535ffd60ada3589d99ec6aec81d7abe6b27169d4638bcc272f5d7c0b37d0bbe6be54f5e2d32f1e40fa1f4088da7fb4931f0c5c10007838197 SHA512 1e52f133f822cf11ee8498b7e92a7460c74d3ed4736c02e0957e3d950608f4aeaec8e8df7e9eb72ae7d4c31c4dcf5d827c9c42bdc7c4b991be53df22c150658a 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.3.ebuild 1528 BLAKE2B 2891bd50fc5724c581c1a22744facad77fad5245448e9e23452cefc0107093732917c35c608fadbe305f100e04b363d85160de181b479b38195dce3b4dbedc0c SHA512 d2b62e8516431314efd38428eafa50bd6a7048db64684b89c1f16073b1f5871dc66d27c3d8d78750b38f3248a6814112ea98e4a434384159df92948fd6b2083d -EBUILD consul-1.15.7.ebuild 1529 BLAKE2B 83e65bf30039b8611e99c0fa8aab0a39b0b774035e84a990762d66e2e88cca4048caacf7bea8130206138d5e2905330389714a68af9f718d438ed356c1aadab9 SHA512 48e65f342998cb81e4a6a7113c0aa523bc557b2d9aa6e58f44c8a3f2afc9c9fcccc88270e47f3e7d9a38ae70b7be54b530986321c148270b157e3c94e43a8b33 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 new file mode 100644 index 000000000000..d5549a6d2665 --- /dev/null +++ b/app-admin/consul/consul-1.15.11.ebuild @@ -0,0 +1,62 @@ +# 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="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" +RESTRICT="test" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +BDEPEND="dev-go/gox" +COMMON_DEPEND=" + acct-group/consul + acct-user/consul" + DEPEND="${COMMON_DEPEND}" + RDEPEND="${COMMON_DEPEND}" + +S=${WORKDIR}/${P} + +src_prepare() { + default + sed -e 's|^GIT_DATE=.*|GIT_DATE=2024-03-26T21:43:41Z|' -i GNUmakefile || 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" +} diff --git a/app-admin/consul/consul-1.15.7.ebuild b/app-admin/consul/consul-1.15.7.ebuild deleted file mode 100644 index 2b693c361655..000000000000 --- a/app-admin/consul/consul-1.15.7.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# 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="8e803db6b98d10b2d310800f2aef7e20d3add03c" - -SRC_URI="https://github.com/zmedico/consul/archive/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz" - -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" -RESTRICT="test" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -BDEPEND="dev-go/gox" -COMMON_DEPEND=" - acct-group/consul - acct-user/consul" - DEPEND="${COMMON_DEPEND}" - RDEPEND="${COMMON_DEPEND}" - -S=${WORKDIR}/${P}-vendor - -src_prepare() { - default - sed -e 's|^GIT_DATE=.*|GIT_DATE=2023-10-31T14:10:44Z|' -i GNUmakefile || 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" -} -- cgit v1.2.3