public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zabbix/files/
Date: Wed,  8 Jun 2022 07:07:13 +0000 (UTC)	[thread overview]
Message-ID: <1654672031.013a859248d449a387ae5754d3fc443491a9cf72.fordfrog@gentoo> (raw)

commit:     013a859248d449a387ae5754d3fc443491a9cf72
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun  7 16:35:25 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> 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 <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25797
Signed-off-by: Miroslav Šulc <fordfrog <AT> 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 <alexxy@gentoo.org>
-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 <alexxy@gentoo.org>
----
- 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}
- };
- 


             reply	other threads:[~2022-06-08  7:07 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-08  7:07 Miroslav Šulc [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-14  7:09 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zabbix/files/ Joonas Niilola
2023-03-28  6:09 Miroslav Šulc
2022-01-13  8:06 Miroslav Šulc
2017-01-17 22:54 Patrice Clement

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1654672031.013a859248d449a387ae5754d3fc443491a9cf72.fordfrog@gentoo \
    --to=fordfrog@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox