[gentoo-commits] repo/gentoo:master commit in: profiles/, app-metrics/prometheus-bin/files/, app-metrics/prometheus-bin/

[Jakov Smolić]

commit:     16a7694e781f11239293b97de2e8786873d87fb0
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 18:19:22 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 18:31:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16a7694e

app-metrics/prometheus-bin: treeclean

Bug: https://bugs.gentoo.org/883637
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 app-metrics/prometheus-bin/Manifest                |  4 --
 app-metrics/prometheus-bin/files/prometheus.confd  |  2 -
 app-metrics/prometheus-bin/files/prometheus.initd  | 34 ---------------
 .../prometheus-bin/files/prometheus.service        | 22 ----------
 app-metrics/prometheus-bin/metadata.xml            | 15 -------
 .../prometheus-bin/prometheus-bin-2.26.1.ebuild    | 51 ----------------------
 .../prometheus-bin/prometheus-bin-2.27.1.ebuild    | 51 ----------------------
 .../prometheus-bin/prometheus-bin-2.28.1.ebuild    | 51 ----------------------
 .../prometheus-bin/prometheus-bin-2.31.1.ebuild    | 51 ----------------------
 profiles/package.mask                              |  6 ---
 10 files changed, 287 deletions(-)

diff --git a/app-metrics/prometheus-bin/Manifest b/app-metrics/prometheus-bin/Manifest
deleted file mode 100644
index 46fea86b718c..000000000000
--- a/app-metrics/prometheus-bin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST prometheus-2.26.1.linux-amd64.tar.gz 65179092 BLAKE2B 631dfbaf9d8553297bd763b2a1ce7cb97d66ec90bff126466868a59b0a0fe074fc13866e2c99f085c7257c3047ab4105f16508c1397de76a1420b4df0b203455 SHA512 53cbbef86204973a01e0d20b287cdbe2c1743dc2add0449d10da55dd3fbed95eaa5beb0a2cd08b4a33fb1825440c91633ef7680616d89838868216fafcd27c55
-DIST prometheus-2.27.1.linux-amd64.tar.gz 69491886 BLAKE2B 7739bd6d84570d4d0db987a0b027ba875728245ded5fac17f89adddfd9b14543cd9594664a8d42392a7a018477ece69ac47367f03442c0f5b11a1e76140ad7c6 SHA512 df43385e178f698806181ab67db0b75600d356c7792f2dcfe6e3390a8a7b449f180ea8fccbc58c10ad0118cea1ba8d5664676de9741e5f91a1a4ec897baeb88f
-DIST prometheus-2.28.1.linux-amd64.tar.gz 71109475 BLAKE2B fe487ec0157e4c6de5319cdacaf99bba9784156b21b29245b65c1b090951bac182b6b2f5ab98615ac0424eb0984dcbea1fffaa680a9d424addbc73c2f923c483 SHA512 a58280f9013f3013a917019ad850f9150f9636e579a87a0408a7de943b3f807a65135452b5c65b75aeca7f62dccf5958a420755088cd3955cd6a556893ed68e4
-DIST prometheus-2.31.1.linux-amd64.tar.gz 73079452 BLAKE2B 8b62141d8a7a10ec488f9a2f964fc47e3aabf6d4d26683bc7fee1517c123d74b46ac73fb2ec1b85504e624ecbd372c45eeb55e08f41c1fae9cf4585693fbc6a9 SHA512 7b356111e30bd59317967f4ebb018bea53e44b3799056bd43ee0d2c557b8d43534196cede34c2977f1f885f36a5832b72ceda15eb880b3018708e1d225fc750e

diff --git a/app-metrics/prometheus-bin/files/prometheus.confd b/app-metrics/prometheus-bin/files/prometheus.confd
deleted file mode 100644
index 93b41b31624c..000000000000
--- a/app-metrics/prometheus-bin/files/prometheus.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# arguments for Prometheus
-command_args=""

diff --git a/app-metrics/prometheus-bin/files/prometheus.initd b/app-metrics/prometheus-bin/files/prometheus.initd
deleted file mode 100644
index f7371f8ca060..000000000000
--- a/app-metrics/prometheus-bin/files/prometheus.initd
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prometheus monitoring system and time series database"
-pidfile=/var/run/${RC_SVCNAME}.pid
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-command_user=${user}:${group}
-
-command="/usr/bin/prometheus"
-command_args="${command_args:---config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/data}"
-command_background="true"
-error_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
-output_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
-
-extra_started_commands="reload"
-
-depend() {
-	after net
-}
-
-reload() {
-	ebegin "Reloading configuration for ${RC_SVCNAME}"
-	case "$supervisor" in
-		supervise-daemon)
-		supervise-daemon ${RC_SVCNAME} --signal HUP
-		;;
-		*)
-		start-stop-daemon --signal HUP --pidfile "${pidfile}"
-		;;
-	esac
-	eend $? "Failed to reload ${RC_SVCNAME}"
-}

diff --git a/app-metrics/prometheus-bin/files/prometheus.service b/app-metrics/prometheus-bin/files/prometheus.service
deleted file mode 100644
index ebd8a901d1fd..000000000000
--- a/app-metrics/prometheus-bin/files/prometheus.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=Prometheus
-Wants=network-online.target
-After=network-online.target
-
-[Service]
-Type=simple
-User=prometheus
-Group=prometheus
-ExecStart=/usr/bin/prometheus \
-  --web.enable-lifecycle \
-  --config.file=/etc/prometheus/prometheus.yml \
-  --storage.tsdb.path="/var/lib/prometheus/data" \
-  --web.console.templates=/etc/prometheus/consoles \
-  --web.console.libraries=/etc/prometheus/console_libraries \
-  --web.listen-address=0.0.0.0:9090 \
-  --web.enable-admin-api 
-
-Restart=always
-
-[Install]
-WantedBy=multi-user.target

diff --git a/app-metrics/prometheus-bin/metadata.xml b/app-metrics/prometheus-bin/metadata.xml
deleted file mode 100644
index c76d474d3f87..000000000000
--- a/app-metrics/prometheus-bin/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>williamh@g.o</email>
-		<name>William Hubbs</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>zlogene@g.o</email>
-		<name>Mikle Kolyada</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">prometheus/prometheus</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/app-metrics/prometheus-bin/prometheus-bin-2.26.1.ebuild b/app-metrics/prometheus-bin/prometheus-bin-2.26.1.ebuild
deleted file mode 100644
index da63a8595d37..000000000000
--- a/app-metrics/prometheus-bin/prometheus-bin-2.26.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="prometheus monitoring system and time series database"
-HOMEPAGE="https://prometheus.io"
-MY_PN=${PN%%-bin}
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/prometheus/prometheus/releases/download/v${PV}/${MY_P}.linux-amd64.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT=".*"
-RESTRICT="strip"
-
-DEPEND="acct-group/prometheus
-	acct-user/prometheus
-	!app-metrics/prometheus"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}.linux-amd64"
-
-src_install() {
-	dobin prometheus promtool
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	insinto /etc/prometheus
-	doins prometheus.yml
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-
-	systemd_dounit "${FILESDIR}"/prometheus.service
-	newinitd "${FILESDIR}"/prometheus.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
-	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
-		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
-		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
-		ewarn "This release requires a clean storage directory and is not compatible with"
-		ewarn "files created by previous beta releases"
-	fi
-}

diff --git a/app-metrics/prometheus-bin/prometheus-bin-2.27.1.ebuild b/app-metrics/prometheus-bin/prometheus-bin-2.27.1.ebuild
deleted file mode 100644
index da63a8595d37..000000000000
--- a/app-metrics/prometheus-bin/prometheus-bin-2.27.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="prometheus monitoring system and time series database"
-HOMEPAGE="https://prometheus.io"
-MY_PN=${PN%%-bin}
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/prometheus/prometheus/releases/download/v${PV}/${MY_P}.linux-amd64.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT=".*"
-RESTRICT="strip"
-
-DEPEND="acct-group/prometheus
-	acct-user/prometheus
-	!app-metrics/prometheus"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}.linux-amd64"
-
-src_install() {
-	dobin prometheus promtool
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	insinto /etc/prometheus
-	doins prometheus.yml
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-
-	systemd_dounit "${FILESDIR}"/prometheus.service
-	newinitd "${FILESDIR}"/prometheus.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
-	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
-		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
-		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
-		ewarn "This release requires a clean storage directory and is not compatible with"
-		ewarn "files created by previous beta releases"
-	fi
-}

diff --git a/app-metrics/prometheus-bin/prometheus-bin-2.28.1.ebuild b/app-metrics/prometheus-bin/prometheus-bin-2.28.1.ebuild
deleted file mode 100644
index da63a8595d37..000000000000
--- a/app-metrics/prometheus-bin/prometheus-bin-2.28.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="prometheus monitoring system and time series database"
-HOMEPAGE="https://prometheus.io"
-MY_PN=${PN%%-bin}
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/prometheus/prometheus/releases/download/v${PV}/${MY_P}.linux-amd64.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT=".*"
-RESTRICT="strip"
-
-DEPEND="acct-group/prometheus
-	acct-user/prometheus
-	!app-metrics/prometheus"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}.linux-amd64"
-
-src_install() {
-	dobin prometheus promtool
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	insinto /etc/prometheus
-	doins prometheus.yml
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-
-	systemd_dounit "${FILESDIR}"/prometheus.service
-	newinitd "${FILESDIR}"/prometheus.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
-	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
-		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
-		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
-		ewarn "This release requires a clean storage directory and is not compatible with"
-		ewarn "files created by previous beta releases"
-	fi
-}

diff --git a/app-metrics/prometheus-bin/prometheus-bin-2.31.1.ebuild b/app-metrics/prometheus-bin/prometheus-bin-2.31.1.ebuild
deleted file mode 100644
index 855250a0e333..000000000000
--- a/app-metrics/prometheus-bin/prometheus-bin-2.31.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="prometheus monitoring system and time series database"
-HOMEPAGE="https://prometheus.io"
-MY_PN=${PN%%-bin}
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/prometheus/prometheus/releases/download/v${PV}/${MY_P}.linux-amd64.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT=".*"
-RESTRICT="strip"
-
-DEPEND="acct-group/prometheus
-	acct-user/prometheus
-	!app-metrics/prometheus"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}.linux-amd64"
-
-src_install() {
-	dobin prometheus promtool
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	insinto /etc/prometheus
-	doins prometheus.yml
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-
-	systemd_dounit "${FILESDIR}"/prometheus.service
-	newinitd "${FILESDIR}"/prometheus.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
-	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
-		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
-		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
-		ewarn "This release requires a clean storage directory and is not compatible with"
-		ewarn "files created by previous beta releases"
-	fi
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 371d3803761b..f5c683aadb55 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1061,12 +1061,6 @@ app-editors/emacs:24
 # openssl-1.1. Removal in 30 days. Bug #696936.
 sys-apps/ucspi-ssl
 
-# John Helmert III <ajak@g.o> (2022-11-29)
-# Authentication bypass vulnerability, unmaintained in Gentoo, source
-# package available. Use app-metrics/prometheus instead. Removal in 30
-# days. Bug #883637.
-app-metrics/prometheus-bin
-
 # Piotr Karbowski <slashbeast@g.o> (2022-11-29)
 # Multiple stability issues, deadlocks on exit, broken API.
 # Bug #883559