diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2023-03-28 07:58:15 +0200 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2023-03-28 07:58:15 +0200 |
| commit | 3b07c647aede24e06652a22b1d72b446fc7735d2 (patch) | |
| tree | c0507614ea5781d76ade1a8653b13df2444d508f /net-analyzer | |
| parent | net-analyzer/zabbix: bump to 5.0.33 (diff) | |
| download | gentoo-3b07c647aede24e06652a22b1d72b446fc7735d2.tar.gz gentoo-3b07c647aede24e06652a22b1d72b446fc7735d2.tar.bz2 gentoo-3b07c647aede24e06652a22b1d72b446fc7735d2.zip | |
net-analyzer/zabbix/files: scrubbed patches
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'net-analyzer')
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 <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 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 <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 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[] = |