From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- .../files/zabbix-5.0.22-system.sw.packages.patch | 35 ++++++++++++++++++++++ .../files/zabbix-5.4.12-system.sw.packages.patch | 35 ++++++++++++++++++++++ .../files/zabbix-6.0.3-system.sw.packages.patch | 35 ++++++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch create mode 100644 net-analyzer/zabbix/files/zabbix-5.4.12-system.sw.packages.patch create mode 100644 net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch (limited to 'net-analyzer/zabbix/files') diff --git a/net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch b/net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch new file mode 100644 index 000000000000..353dac72b876 --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch @@ -0,0 +1,35 @@ +From 884982a87fc14918b062f09aa2bc3f8d2f777a14 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 f0e4df0b55c..dda25380f40 100644 +--- a/src/go/plugins/system/sw/sw.go ++++ b/src/go/plugins/system/sw/sw.go +@@ -164,6 +164,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 2ee885ac14a..c950e65d607 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} + }; + 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 new file mode 100644 index 000000000000..54a5299ee791 --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-5.4.12-system.sw.packages.patch @@ -0,0 +1,35 @@ +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} + }; + diff --git a/net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch b/net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch new file mode 100644 index 000000000000..2649e118151e --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch @@ -0,0 +1,35 @@ +From 1869f67549ea9491377269ef11a99ed5fc38e3cc 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 0abaf05fb3b..1d8a94b5924 100644 +--- a/src/go/plugins/system/sw/sw.go ++++ b/src/go/plugins/system/sw/sw.go +@@ -165,6 +165,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 749deaa9258..3a6ee97ec4c 100644 +--- a/src/libs/zbxsysinfo/linux/software.c ++++ b/src/libs/zbxsysinfo/linux/software.c +@@ -177,6 +177,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} + }; + -- cgit v1.2.3