gentoo resync : 28.04.2021

5 files changed, 42 insertions, 129 deletions

diff --git a/app-metrics/blackbox_exporter/Manifest b/app-metrics/blackbox_exporter/Manifest
index 824263277d95..01d67273f26e 100644
--- a/app-metrics/blackbox_exporter/Manifest
+++ b/app-metrics/blackbox_exporter/Manifest
@@ -1,10 +1,7 @@
 AUX blackbox_exporter.confd 110 BLAKE2B c3cb7ed7d314ea8b347b4db9839e7c987c91c78378a6085473d687a5f3460f06ca6825567fbe832c3114906156290d00d505e15e3c2461eb844acb4e56937af0 SHA512 aa8720c03c4bf21ad5f789a4e9c6df6059fb71413cfdc605f8868bcd54eab899aa527afa9d847c7780042a8d4d72468145a97f8d732ef6aad861dcbf96bdf2ed
 AUX blackbox_exporter.initd 615 BLAKE2B fce98f2c0740db2309d0395cf1e7e3f8b3b305c688cbafbf14a1787d952d49933ddebee1a688b844a66c95d02c38c38e943ff73e4dce68a1069c69c91540cc47 SHA512 f5ecc87e592fe85e4cfed759f06a1d88a4bbd05a474cb7955aae296ee29ae2ddf875a427bfcc7ff8369367eb8892c85bcc5051d273f8c2693395c8851b5f8669
 AUX blackbox_exporter.logrotated 107 BLAKE2B 255c64f5f0cee8b0b7a3bf2b3a55725f87f3f8067f840a94e9c70819820d1d42b3c2a7727323edf00d32797aab45060d0033fb5d5762263d502e4f0f1ad3d492 SHA512 2bb4782f925f9f416addf9f0a20ada0f0b61d964667eb8114b5fbdc758f69c07c91bf8e6fd18758d3ec21a7e41c931bd9bf42d16d3dfc45e2718126ffb0f21a6
-DIST blackbox_exporter-0.15.1.tar.gz 2120525 BLAKE2B c21a621dce663ccbc184c87b66e894ddc6a94bee9bbd2b9fb432a4d349afb35410f07ad150e946c5f8eb9ec8e6e7f2e6d4cbcafe118e8b2efe34902fbd0bf38a SHA512 2c7d0989bc70982a0fd528c7c6ed5ec6686f5e93db0a90db2b06e4e578503443da0750aaa2d6a01ae4fcd4c722eef522c0e06b019aa59a2eb837f233e317d4e2
-DIST blackbox_exporter-0.16.0.tar.gz 2121367 BLAKE2B 92c55dbc3f47d7a2d8c37ad116857dd1d7314a6684d9f228039b09cc086edf72bdf5e0c2cc770ce45d687c45a38f6de72e612c0491ec66f836bed28b75b2e5a9 SHA512 85103b62e345ab5d59626e658047ac75649f9ef991c9bbaff32b95ea75ec2da2bf916573e664520766158805c6cf24163f2850c885a594d32b4f9c4c9dbed1a8
-DIST blackbox_exporter-0.17.0.tar.gz 2615179 BLAKE2B 3746ceef8ffdfe017921a78873c09f196d82c3874aa24a0795b56d8858c355f2a4f9f557c65708037358fdbe8445a680c56a3725e7af4d634ef9396419bb4221 SHA512 9e79d083c5c8caebbc19b6feef04dd189bc91a72dcb3aa946a96543fbe28ae2c49cafeed3f42618747661421897adc17988ffc6cf0d7054cf0a385b85eeafc61
-EBUILD blackbox_exporter-0.15.1.ebuild 1559 BLAKE2B c27b5940d73adecf5fb91c804cca2aa01ae303cf6d828ebf5af883d4b16cd7fc99ce115b29134116911e63a2ad676b6b63ed927998612d1c5825e81a20ed629c SHA512 b2b434684e1303c98ae868161cbc65814be5324c2593ba8e15988d3c1fc518e1ef0954ff369e5a3f48f1e069962985cbd60672de90068c65c9787e921a27d9f1
-EBUILD blackbox_exporter-0.16.0.ebuild 1559 BLAKE2B dbbca41eec9dd2cec880afdc6c8246e59264aa065640779621a585ae154ee3467102ef1eaf71c3efca486392f170ca43f387075a14417bf8b933fb78588003f2 SHA512 eb15af2b26b2bdbb044cbbdccc221c8d71eecb079840d0c80948b8a9d7fd6ec7d69adada283107446365337b88d6c29397b8dc288188afca247fafe9e5eccd7b
-EBUILD blackbox_exporter-0.17.0.ebuild 1306 BLAKE2B a32595440f64d2b8f808d97593aa45acc9c1b270986db22a4373fdea496e8c58b12064d05ce90352a7242f48a33d2e3f21e0469a58cbaecd2342723341f7e174 SHA512 192bf5c4bbcead884f60d4b09bb9c16bcaa71585d8b6fab4a32abb578071200c30aa4dd1c0f4c7b82853c14777715f83948c5f88cd7c3ebdda950459a451c585
+AUX blackbox_exporter.service 656 BLAKE2B 0c02ed1d5851215489bcaf655c290da84d3b85a852c2183bc2aa50ddcdd74beebeb09b1f1f4da4c23c0b2cfd1c72b9570303458e76651046d958ccdff77124d1 SHA512 92fd0935497f7c7df897c9dd6e5553e43be8b06e6089c78cc5891a11eb3e4bd4fdadf3f6b03f8852f544a1c33492025694408a44c6d14cddefceb60f35bd5bd0
+DIST blackbox_exporter-0.18.0.tar.gz 2614990 BLAKE2B 8c6681f3b122b3d83980c74d888442bde4bbbbd02e34a33f1560494d724f4f596e87d2b87a0702d4c860e7bbc3720d70d49d8e08ae9e74b8a6e9abed907d74bd SHA512 6579d190c755515d4e5f05e2b6ed4d811010874dba1e16eaf6052e97c655f87aec33550f22ff173d2f3bbc77d091fb4fccad059f62ca6fbb33a372d48ae692f0
+EBUILD blackbox_exporter-0.18.0-r1.ebuild 1428 BLAKE2B 9f542aea6341871458c38564fac5500f11cfc4b2888d862892c2c2a1ecdd9edaedd81d75c3c5a0c4a97e06a5048198beba29d61400712d635e4f6a149af1a7b1 SHA512 a6c56f6c735053073bffe6ff18db7b18e8922bd008da8dfd4bc0586fcf1ed01bcdb7eb565bde5fe8af20c83952d99f921e1873198120bb2f3cec5dc666c089a8
 MISC metadata.xml 341 BLAKE2B 30f7b2aac9cbea1444b1555a5a1279a07dfce5908bf507dff2d032daf3ecab8b98588d6e916d3e3e3cc04a5c70ed287504913f685e30aa87dcaad96abebff506 SHA512 65a7d67649765acc64976c511fc26f6f35c172538b03945367bcab3ed9c9766130c2a72a581a2e5b62068c7cf31d9ec2f39c3d7b5f580060a9e9c99035f7663f
diff --git a/app-metrics/blackbox_exporter/blackbox_exporter-0.15.1.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.15.1.ebuild
deleted file mode 100644
index 52e9c480877c..000000000000
--- a/app-metrics/blackbox_exporter/blackbox_exporter-0.15.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit fcaps user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/blackbox_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-BLACKBOX_EXPORTER_COMMIT="7dd86a5"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
-HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12
-	dev-util/promu"
-
-FILECAPS=(
-	cap_net_raw usr/bin/blackbox_exporter
-)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${BLACKBOX_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GO111MODULE=on GOPATH="${S}" promu build -v --prefix blackbox_exporter || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin blackbox_exporter/blackbox_exporter
-	dodoc {README,CONFIGURATION}.md blackbox.yml
-	insinto /etc/blackbox_exporter
-	newins example.yml blackbox.yml.example
-	popd || die
-	keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
-	fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-}
diff --git a/app-metrics/blackbox_exporter/blackbox_exporter-0.16.0.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.16.0.ebuild
deleted file mode 100644
index 82e0d20ed7f4..000000000000
--- a/app-metrics/blackbox_exporter/blackbox_exporter-0.16.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit fcaps user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/blackbox_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-BLACKBOX_EXPORTER_COMMIT="991f898"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
-HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12
-	dev-util/promu"
-
-FILECAPS=(
-	cap_net_raw usr/bin/blackbox_exporter
-)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${BLACKBOX_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GO111MODULE=on GOPATH="${S}" promu build -v --prefix blackbox_exporter || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin blackbox_exporter/blackbox_exporter
-	dodoc {README,CONFIGURATION}.md blackbox.yml
-	insinto /etc/blackbox_exporter
-	newins example.yml blackbox.yml.example
-	popd || die
-	keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
-	fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-}
diff --git a/app-metrics/blackbox_exporter/blackbox_exporter-0.17.0.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.18.0-r1.ebuild
index 9d7d5ee5b741..5ad5f52b6d2c 100644
--- a/app-metrics/blackbox_exporter/blackbox_exporter-0.17.0.ebuild
+++ b/app-metrics/blackbox_exporter/blackbox_exporter-0.18.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit fcaps go-module user
+
+inherit fcaps go-module systemd
 
 EGO_PN=github.com/prometheus/blackbox_exporter
 MY_PV="v${PV/_rc/-rc.}"
@@ -15,19 +16,17 @@ SRC_URI="https://github.com/prometheus/blackbox_exporter/archive/${MY_PV}.tar.gz
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 BDEPEND="dev-util/promu"
 
+DEPEND="
+	acct-group/blackbox_exporter
+	acct-user/blackbox_exporter"
+
 FILECAPS=(
 	cap_net_raw usr/bin/blackbox_exporter
 )
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
 src_prepare() {
 	default
 	sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
@@ -40,11 +39,13 @@ src_compile() {
 
 src_install() {
 	dobin bin/*
+	dosym  ../../usr/bin/blackbox_exporter-${PV} /usr/bin/blackbox_exporter
 	dodoc {README,CONFIGURATION}.md blackbox.yml
 	insinto /etc/blackbox_exporter
-	newins example.yml blackbox.yml.example
+	newins example.yml blackbox.yml
 	keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
 	fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter
+	systemd_dounit "${FILESDIR}"/blackbox_exporter.service
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 	insinto /etc/logrotate.d
diff --git a/app-metrics/blackbox_exporter/files/blackbox_exporter.service b/app-metrics/blackbox_exporter/files/blackbox_exporter.service
new file mode 100644
index 000000000000..a29ee2b7c24a
--- /dev/null
+++ b/app-metrics/blackbox_exporter/files/blackbox_exporter.service
@@ -0,0 +1,29 @@
+[Unit]
+Description=Prometheus blackbox Exporter
+After=network.target
+
+[Service]
+User=blackbox_exporter
+Group=blackbox_exporter
+ExecStart=/usr/bin/blackbox_exporter --config.file="/etc/blackbox_exporter/blackbox.yml"
+ExecReload=/bin/kill -HUP $MAINPID
+DynamicUser=true
+
+NoNewPrivileges=true
+ProtectSystem=full
+ProtectKernelModules=true
+ProtectKernelTunables=true
+PrivateTmp=true
+LockPersonality=true
+ProtectHostname=true
+ProtectHome=true
+ProtectControlGroups=true
+ProtectKernelLogs=true
+PrivateDevices=true
+RestrictRealtime=true
+CapabilityBoundingSet=
+MemoryDenyWriteExecute=true
+CapabilityBoundingSet=CAP_NET_RAW
+AmbientCapabilities=CAP_NET_RAW
+
+[Install]