commit: b2a67573d780909220d3eb592f1fc3a105ec4abe
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 08:26:48 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue May 12 08:27:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2a67573
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 <AT> gentoo.org>
.../zabbix-4.0.18-security-disable-PidFile.patch | 49 ----------------------
net-analyzer/zabbix/zabbix-3.0.31.ebuild | 4 +-
net-analyzer/zabbix/zabbix-4.0.19.ebuild | 2 +-
net-analyzer/zabbix/zabbix-4.0.20.ebuild | 2 +-
4 files changed, 4 insertions(+), 53 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 f6a6187b3fc..00000000000
--- 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 e92843dc7b0..ff07f82291b 100644
--- 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 c3238bd4661..b93d1c5ef9e 100644
--- 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 c9d90c43e3e..3313b71565c 100644
--- 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"
)
