From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C36F0158091 for ; Wed, 8 Jun 2022 07:07:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89128E08C4; Wed, 8 Jun 2022 07:07:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 49991E08C4 for ; Wed, 8 Jun 2022 07:07:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0D93E340FCD for ; Wed, 8 Jun 2022 07:07:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8F2FE4F5 for ; Wed, 8 Jun 2022 07:07:13 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1654672031.013a859248d449a387ae5754d3fc443491a9cf72.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zabbix/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/zabbix/files/zabbix-5.4.12-system.sw.packages.patch X-VCS-Directories: net-analyzer/zabbix/files/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 013a859248d449a387ae5754d3fc443491a9cf72 X-VCS-Branch: master Date: Wed, 8 Jun 2022 07:07:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 22f345b6-07d0-48ef-86dd-7755ab972c5c X-Archives-Hash: b9d4fcb0297ee7bdc5fe38118a651b7f commit: 013a859248d449a387ae5754d3fc443491a9cf72 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Jun 7 16:35:25 2022 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Wed Jun 8 07:07:11 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=013a8592 net-analyzer/zabbix: remove unused patch Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/25797 Signed-off-by: Miroslav Šulc gentoo.org> .../files/zabbix-5.4.12-system.sw.packages.patch | 35 ---------------------- 1 file changed, 35 deletions(-) diff --git a/net-analyzer/zabbix/files/zabbix-5.4.12-system.sw.packages.patch b/net-analyzer/zabbix/files/zabbix-5.4.12-system.sw.packages.patch deleted file mode 100644 index 54a5299ee791..000000000000 --- a/net-analyzer/zabbix/files/zabbix-5.4.12-system.sw.packages.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ee5ed14f0f858eb0f776f5b8c4c1a1e740787bfa Mon Sep 17 00:00:00 2001 -From: Alexey Shvetsov -Date: Mon, 21 Mar 2022 11:23:54 +0300 -Subject: [PATCH] Allow to use system.sw.packages on gentoo linux - -Signed-off-by: Alexey Shvetsov ---- - src/go/plugins/system/sw/sw.go | 1 + - src/libs/zbxsysinfo/linux/software.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/go/plugins/system/sw/sw.go b/src/go/plugins/system/sw/sw.go -index 6ff354fd711..db9a4b763f7 100644 ---- a/src/go/plugins/system/sw/sw.go -+++ b/src/go/plugins/system/sw/sw.go -@@ -163,6 +163,7 @@ func getManagers() []manager { - {"pkgtools", "[ -d /var/log/packages ] && echo true", "ls /var/log/packages", parseRegex}, - {"rpm", "rpm --version 2> /dev/null", "rpm -qa", parseRegex}, - {"pacman", "pacman --version 2> /dev/null", "pacman -Q", parseRegex}, -+ {"portage", "emerge --version 2> /dev/null", "qlist -IRCv", parseRegex}, - } - } - -diff --git a/src/libs/zbxsysinfo/linux/software.c b/src/libs/zbxsysinfo/linux/software.c -index 24f8e93eed8..8dcf01a3e47 100644 ---- a/src/libs/zbxsysinfo/linux/software.c -+++ b/src/libs/zbxsysinfo/linux/software.c -@@ -176,6 +176,7 @@ static ZBX_PACKAGE_MANAGER package_managers[] = - {"pkgtools", "[ -d /var/log/packages ] && echo true", "ls /var/log/packages", NULL}, - {"rpm", "rpm --version 2> /dev/null", "rpm -qa", NULL}, - {"pacman", "pacman --version 2> /dev/null", "pacman -Q", NULL}, -+ {"portage", "emerge --version 2> /dev/null", "qlist -IRCv", NULL}, - {NULL} - }; -