[gentoo-commits] repo/gentoo:master commit in: net-analyzer/zabbix/, net-analyzer/zabbix/files/

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     ee4bbb47f64acc7873009fb99895d40c568a311b
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 06:42:59 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 06:43:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee4bbb47

net-analyzer/zabbix: fixed patches not being applied in 6.4.x + added configure patch

Bug: https://bugs.gentoo.org/900046
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../zabbix/files/zabbix-6.4.0-configure-sscanf.patch         | 12 ++++++++++++
 .../zabbix/{zabbix-6.4.0.ebuild => zabbix-6.4.0-r1.ebuild}   |  6 +++++-
 .../zabbix/{zabbix-6.4.1.ebuild => zabbix-6.4.1-r1.ebuild}   |  6 +++++-
 .../zabbix/{zabbix-6.4.2.ebuild => zabbix-6.4.2-r1.ebuild}   |  6 +++++-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/zabbix/files/zabbix-6.4.0-configure-sscanf.patch b/net-analyzer/zabbix/files/zabbix-6.4.0-configure-sscanf.patch
new file mode 100644
index 000000000000..0a95780c4505
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-6.4.0-configure-sscanf.patch
@@ -0,0 +1,12 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -952,8 +952,9 @@ dnl Check for %qu format (FreeBSD 4.x)
+ dnl FreeBSD 4.x does not support %llu
+ AC_MSG_CHECKING(for long long format)
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
++#include <stdio.h>
+ #include <sys/types.h>
+-int main()
++int main(void)
+ {
+         uint64_t i;

diff --git a/net-analyzer/zabbix/zabbix-6.4.0.ebuild b/net-analyzer/zabbix/zabbix-6.4.0-r1.ebuild
similarity index 99%
rename from net-analyzer/zabbix/zabbix-6.4.0.ebuild
rename to net-analyzer/zabbix/zabbix-6.4.0-r1.ebuild
index 21333f63c79d..0c7469cad01a 100644
--- a/net-analyzer/zabbix/zabbix-6.4.0.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.4.0-r1.ebuild
@@ -117,7 +117,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
 	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
 )
 
 S=${WORKDIR}/${MY_P}
@@ -143,6 +143,10 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
+src_prepare() {
+	default
+}
+
 src_configure() {
 	local econf_args=(
 		--with-libpcre2

diff --git a/net-analyzer/zabbix/zabbix-6.4.1.ebuild b/net-analyzer/zabbix/zabbix-6.4.1-r1.ebuild
similarity index 99%
rename from net-analyzer/zabbix/zabbix-6.4.1.ebuild
rename to net-analyzer/zabbix/zabbix-6.4.1-r1.ebuild
index f3edadcff0ce..e43f9f4d55ac 100644
--- a/net-analyzer/zabbix/zabbix-6.4.1.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.4.1-r1.ebuild
@@ -117,7 +117,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
 	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
 )
 
 S=${WORKDIR}/${MY_P}
@@ -143,6 +143,10 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
+src_prepare() {
+	default
+}
+
 src_configure() {
 	local econf_args=(
 		--with-libpcre2

diff --git a/net-analyzer/zabbix/zabbix-6.4.2.ebuild b/net-analyzer/zabbix/zabbix-6.4.2-r1.ebuild
similarity index 99%
rename from net-analyzer/zabbix/zabbix-6.4.2.ebuild
rename to net-analyzer/zabbix/zabbix-6.4.2-r1.ebuild
index f3edadcff0ce..e43f9f4d55ac 100644
--- a/net-analyzer/zabbix/zabbix-6.4.2.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.4.2-r1.ebuild
@@ -117,7 +117,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
 	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
 )
 
 S=${WORKDIR}/${MY_P}
@@ -143,6 +143,10 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
+src_prepare() {
+	default
+}
+
 src_configure() {
 	local econf_args=(
 		--with-libpcre2