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 CFF4315802F for ; Tue, 28 Mar 2023 06:09:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E43B2E07B3; Tue, 28 Mar 2023 06:09:48 +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 B3CC3E07B3 for ; Tue, 28 Mar 2023 06:09:48 +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 92ABA340EE3 for ; Tue, 28 Mar 2023 06:09:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F0CF1999 for ; Tue, 28 Mar 2023 06:09:45 +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: <1679983095.3b07c647aede24e06652a22b1d72b446fc7735d2.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-3.0.30-security-disable-PidFile.patch net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch X-VCS-Directories: net-analyzer/zabbix/files/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 3b07c647aede24e06652a22b1d72b446fc7735d2 X-VCS-Branch: master Date: Tue, 28 Mar 2023 06:09:45 +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: 811945e6-1619-4bbc-bb81-9c5384a3886e X-Archives-Hash: 4703bf47f02cd2290d6147187b55b0cb commit: 3b07c647aede24e06652a22b1d72b446fc7735d2 Author: Miroslav Šulc gentoo org> AuthorDate: Tue Mar 28 05:58:15 2023 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Tue Mar 28 05:58:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b07c647 net-analyzer/zabbix/files: scrubbed patches Signed-off-by: Miroslav Šulc gentoo.org> .../zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch | 8 -------- net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch | 4 ++-- net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch | 9 --------- net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch | 9 --------- 4 files changed, 2 insertions(+), 28 deletions(-) diff --git a/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch b/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch index e0fd74de51c7..b2635ff7d8a1 100644 --- a/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch +++ b/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch @@ -1,5 +1,3 @@ -diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf -index b73bd45..c10daca 100644 --- a/conf/zabbix_agentd.conf +++ b/conf/zabbix_agentd.conf @@ -5,6 +5,7 @@ @@ -10,8 +8,6 @@ index b73bd45..c10daca 100644 # # Mandatory: no # Default: -diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf -index 082f14e..de0284d 100644 --- a/conf/zabbix_proxy.conf +++ b/conf/zabbix_proxy.conf @@ -109,6 +109,7 @@ LogFile=/tmp/zabbix_proxy.log @@ -22,8 +18,6 @@ index 082f14e..de0284d 100644 # # Mandatory: no # Default: -diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf -index 9f754ca..3999196 100644 --- a/conf/zabbix_server.conf +++ b/conf/zabbix_server.conf @@ -62,6 +62,7 @@ LogFile=/tmp/zabbix_server.log @@ -34,8 +28,6 @@ index 9f754ca..3999196 100644 # # Mandatory: no # Default: -diff --git a/src/libs/zbxnix/pid.c b/src/libs/zbxnix/pid.c -index baa8415..04c7e0c 100644 --- a/src/libs/zbxnix/pid.c +++ b/src/libs/zbxnix/pid.c @@ -26,6 +26,8 @@ static int fdpid = -1; diff --git a/net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch b/net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch index c0d1650fb85c..3e4ed297ebc0 100644 --- a/net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch +++ b/net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch @@ -1,5 +1,5 @@ ---- zabbix-4.0.1/configure 2018-10-29 10:36:05.000000000 -0700 -+++ zfx/configure 2018-11-07 16:59:28.015968345 -0800 +--- zabbix-4.0.1/configure ++++ zfx/configure @@ -12510,7 +12510,7 @@ CURL_SSL_CERT_LOCATION="${datadir}/zabbix/ssl/certs" CURL_SSL_KEY_LOCATION="${datadir}/zabbix/ssl/keys" 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 index 353dac72b876..537c3491bb5f 100644 --- 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 @@ -4,13 +4,6 @@ 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 { @@ -21,8 +14,6 @@ index f0e4df0b55c..dda25380f40 100644 } } -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[] = 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 index 2649e118151e..3cb4b74fb15d 100644 --- 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 @@ -4,13 +4,6 @@ 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 { @@ -21,8 +14,6 @@ index 0abaf05fb3b..1d8a94b5924 100644 } } -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[] =