summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2023-04-27 08:42:59 +0200
committerMiroslav Šulc <fordfrog@gentoo.org>2023-04-27 08:43:06 +0200
commitee4bbb47f64acc7873009fb99895d40c568a311b (patch)
tree18085aa912914a9dceb2d5c9915868aa4f5d2577 /net-analyzer
parentnet-misc/curl: Stabilize 8.0.1 ppc, #905145 (diff)
downloadgentoo-ee4bbb47f64acc7873009fb99895d40c568a311b.tar.gz
gentoo-ee4bbb47f64acc7873009fb99895d40c568a311b.tar.bz2
gentoo-ee4bbb47f64acc7873009fb99895d40c568a311b.zip
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@gentoo.org>
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/zabbix/files/zabbix-6.4.0-configure-sscanf.patch12
-rw-r--r--net-analyzer/zabbix/zabbix-6.4.0-r1.ebuild (renamed from net-analyzer/zabbix/zabbix-6.4.0.ebuild)6
-rw-r--r--net-analyzer/zabbix/zabbix-6.4.1-r1.ebuild (renamed from net-analyzer/zabbix/zabbix-6.4.1.ebuild)6
-rw-r--r--net-analyzer/zabbix/zabbix-6.4.2-r1.ebuild (renamed from net-analyzer/zabbix/zabbix-6.4.2.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
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
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
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