net-analyzer/zabbix: fixed paths to patches in 3.0.31, 4.0.{19,20}

Closes: https://bugs.gentoo.org/722298
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

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 (file)
index f6a6187..0000000
--- 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;

diff --git a/net-analyzer/zabbix/zabbix-3.0.31.ebuild b/net-analyzer/zabbix/zabbix-3.0.31.ebuild
index e92843dc7b000ae3ab2a41d7fccbe5bb431c8d63..ff07f82291b2fa8574fc72e9f3de452d58a023b0 100644 (file)
--- a/net-analyzer/zabbix/zabbix-3.0.31.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.0.31.ebuild
@@ -91,8 +91,8 @@ BDEPEND="
 "
 
 PATCHES=(
-       "${FILESDIR}/${P}-security-disable-PidFile.patch"
-       "${FILESDIR}/${P}-mysql8.patch"
+       "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+       "${FILESDIR}/${PN}-3.0.30-mysql8.patch"
 )
 
 S=${WORKDIR}/${MY_P}

diff --git a/net-analyzer/zabbix/zabbix-4.0.19.ebuild b/net-analyzer/zabbix/zabbix-4.0.19.ebuild
index c3238bd4661f3ad2a382a95a7efa9f36722a30d0..b93d1c5ef9ed6483279e6291bc0f76287881b89f 100644 (file)
--- a/net-analyzer/zabbix/zabbix-4.0.19.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.19.ebuild
@@ -91,7 +91,7 @@ BDEPEND="
 "
 
 PATCHES=(
-       "${FILESDIR}/${P}-modulepathfix.patch"
+       "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
        "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
 )
 

diff --git a/net-analyzer/zabbix/zabbix-4.0.20.ebuild b/net-analyzer/zabbix/zabbix-4.0.20.ebuild
index c9d90c43e3eba2385be085e23bcfb074ab2388f4..3313b71565c9c4ff88f881e830cc4423b3f43e40 100644 (file)
--- a/net-analyzer/zabbix/zabbix-4.0.20.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.20.ebuild
@@ -91,7 +91,7 @@ BDEPEND="
 "
 
 PATCHES=(
-       "${FILESDIR}/${P}-modulepathfix.patch"
+       "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
        "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
 )