gentoo resync : 14.05.2020

1 files changed, 0 insertions, 49 deletions

diff --git a/net-analyzer/zabbix/files/zabbix-4.0.18-security-disable-PidFile.patch b/net-analyzer/zabbix/files/zabbix-4.0.18-security-disable-PidFile.patch
deleted file mode 100644
index f6a6187b3fc0..000000000000
--- a/net-analyzer/zabbix/files/zabbix-4.0.18-security-disable-PidFile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf
-index 73f1621..825715c 100644
---- a/conf/zabbix_agentd.conf
-+++ b/conf/zabbix_agentd.conf
-@@ -5,6 +5,7 @@
- 
- ### Option: PidFile
- #	Name of PID file.
-+# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884)
- #
- # Mandatory: no
- # Default:
-diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf
-index 7498ffa..de6b579 100644
---- a/conf/zabbix_proxy.conf
-+++ b/conf/zabbix_proxy.conf
-@@ -133,6 +133,7 @@ LogFile=/tmp/zabbix_proxy.log
- 
- ### Option: PidFile
- #	Name of PID file.
-+# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884)
- #
- # Mandatory: no
- # Default:
-diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf
-index 760e685..3a252ae 100644
---- a/conf/zabbix_server.conf
-+++ b/conf/zabbix_server.conf
-@@ -62,6 +62,7 @@ LogFile=/tmp/zabbix_server.log
- 
- ### Option: PidFile
- #	Name of PID file.
-+# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884)
- #
- # Mandatory: no
- # Default:
-diff --git a/src/libs/zbxnix/pid.c b/src/libs/zbxnix/pid.c
-index 6b1a333..7a9578a 100644
---- a/src/libs/zbxnix/pid.c
-+++ b/src/libs/zbxnix/pid.c
-@@ -26,6 +26,8 @@ static int	fdpid = -1;
- 
- int	create_pid_file(const char *pidfile)
- {
-+	return SUCCEED;
-+
- 	int		fd;
- 	zbx_stat_t	buf;
- 	struct flock	fl;