git: 40984f5f8c0b - 2025Q1 - net-mgmt/zabbix6-server: Update to 6.0.39
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 03 Mar 2025 21:37:25 UTC
The branch 2025Q1 has been updated by otis:
URL: https://cgit.FreeBSD.org/ports/commit/?id=40984f5f8c0b5fce93ec8d74ebacec8224ca4d3c
commit 40984f5f8c0b5fce93ec8d74ebacec8224ca4d3c
Author: Juraj Lutter <otis@FreeBSD.org>
AuthorDate: 2025-01-30 21:24:20 +0000
Commit: Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2025-03-03 21:19:07 +0000
net-mgmt/zabbix6-server: Update to 6.0.39
This commit has also intermediate fixes between 6.0.38 and 6.0.39 pulled
in.
Release notes: https://www.zabbix.com/rn/rn6.0.39
PR: 285091
(cherry picked from commit 891c2b8c1de5f8bed884c0c89e2ef28cc23e6159)
---
net-mgmt/zabbix6-server/Makefile | 6 ++++--
net-mgmt/zabbix6-server/distinfo | 6 +++---
net-mgmt/zabbix6-server/pkg-plist | 34 +++++++++++++++++-----------------
net-mgmt/zabbix6-server/pkg-plist.java | 6 +++---
4 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/net-mgmt/zabbix6-server/Makefile b/net-mgmt/zabbix6-server/Makefile
index 4e16a211591d..37337ae773b5 100644
--- a/net-mgmt/zabbix6-server/Makefile
+++ b/net-mgmt/zabbix6-server/Makefile
@@ -1,5 +1,5 @@
PORTNAME= zabbix6
-DISTVERSION= 6.0.37
+DISTVERSION= 6.0.39
PORTREVISION?= 0
CATEGORIES= net-mgmt
MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/
@@ -169,6 +169,7 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
.if ${ZABBIX_BUILD} == "java"
USES+= java
+JAVA_VERSION= 11+
.endif
.include <bsd.port.pre.mk>
@@ -234,7 +235,8 @@ post-install:
.if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
${MKDIR} ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database
- @${RM} ${WRKSRC}/database/*/Makefile*
+ ${FIND} ${WRKSRC}/database -type f -name 'Makefile*' -exec ${RM} {} +
+ # @${RM} ${WRKSRC}/database/*/*/Makefile*
(cd ${WRKSRC}/database/ && \
${COPYTREE_SHARE} "mysql oracle postgresql sqlite3" \
${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/)
diff --git a/net-mgmt/zabbix6-server/distinfo b/net-mgmt/zabbix6-server/distinfo
index 3c5ab47fe60f..540868aa7e72 100644
--- a/net-mgmt/zabbix6-server/distinfo
+++ b/net-mgmt/zabbix6-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734707045
-SHA256 (zabbix-6.0.37.tar.gz) = a611e4cbdf074b889b6ff4ed60453ad432d9e40eaaa19531822974a71e59ecc2
-SIZE (zabbix-6.0.37.tar.gz) = 40479472
+TIMESTAMP = 1741027077
+SHA256 (zabbix-6.0.39.tar.gz) = e1a874bac0f72c71d89812f1f997d810c8c58daecb2628f9b7cc0577c6f43585
+SIZE (zabbix-6.0.39.tar.gz) = 41030406
diff --git a/net-mgmt/zabbix6-server/pkg-plist b/net-mgmt/zabbix6-server/pkg-plist
index b80cd18c43dc..3fdd8ddde6e1 100644
--- a/net-mgmt/zabbix6-server/pkg-plist
+++ b/net-mgmt/zabbix6-server/pkg-plist
@@ -1,29 +1,29 @@
%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/data.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/double.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/history_pk_prepare.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/option-patches/double.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/option-patches/history_pk_prepare.sql
%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/images.sql
%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/schema.sql
%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/data.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/double.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/history_pk_prepare.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/option-patches/double.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/option-patches/history_pk_prepare.sql
%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/images.sql
%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/schema.sql
%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/data.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/double.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/history_pk_prepare.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/option-patches/double.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/option-patches/history_pk_prepare.sql
%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/images.sql
%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/schema.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_log.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_str.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_text.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_uint.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_log.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_str.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_text.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_uint.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/schema.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/without-compression/history_pk.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/without-compression/history_pk_log.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/without-compression/history_pk_str.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/without-compression/history_pk_text.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/without-compression/history_pk_uint.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/with-compression/history_pk.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/with-compression/history_pk_log.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/with-compression/history_pk_str.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/with-compression/history_pk_text.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/with-compression/history_pk_uint.sql
%%DATADIR%%/%%ZABBIX_BUILD%%/database/sqlite3/schema.sql
@sample %%ETCDIR%%/zabbix_%%ZABBIX_BUILD%%.conf.sample
%%PROXY%%bin/zabbix_proxy_js
diff --git a/net-mgmt/zabbix6-server/pkg-plist.java b/net-mgmt/zabbix6-server/pkg-plist.java
index 3c583b91a9e9..50007bf2909a 100644
--- a/net-mgmt/zabbix6-server/pkg-plist.java
+++ b/net-mgmt/zabbix6-server/pkg-plist.java
@@ -1,9 +1,9 @@
sbin/zabbix_java/shutdown.sh
sbin/zabbix_java/lib/logback-console.xml
-sbin/zabbix_java/lib/logback-core-1.2.9.jar
-sbin/zabbix_java/lib/logback-classic-1.2.9.jar
+sbin/zabbix_java/lib/logback-classic-1.5.16.jar
+sbin/zabbix_java/lib/logback-core-1.5.16.jar
sbin/zabbix_java/lib/logback.xml
-sbin/zabbix_java/lib/slf4j-api-1.7.32.jar
+sbin/zabbix_java/lib/slf4j-api-2.0.16.jar
sbin/zabbix_java/lib/android-json-4.3_r3.1.jar
@sample sbin/zabbix_java/settings.sh.sample
sbin/zabbix_java/startup.sh