From nobody Mon Mar 03 21:37:25 2025 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z6Bx16M4nz5nlP7; Mon, 03 Mar 2025 21:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z6Bx1471Nz3G9B; Mon, 03 Mar 2025 21:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741037845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LzUYvGkq3uOxFvZPgHcqhHVpB5E/cVdp5eIPBkXab2c=; b=k/fru3CZN851TQ9A2o64pDqIlkBYwq+PEkJJW5SE9JkFuV5+OnziLeB83StxUP0l3TZeeV fmTHuZsPoXDMGwM1KDZBzId7Y8CcKJ/BX9uV6XFy5ZLBsqLsONJl54azEOWtrk3hAHA95P QSLu5gOk8Q0VIu7yOTquuKpIAWCQACD8e8i3YR9luQtKzxQkZn4yDXj9gi/E/cos1lfDiA 2/DIToNFcaoKD74jAVrlaHza3UVWwch+Mml+RWlPgUgIEDaa4DrbHL66dCTn4e6oGbqHdc BRIwUYympEWqPlEkxrpupL/+W5t6mZaDYu9JXPPIw6RwnMIuf2YSaP/GU5dovw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741037845; a=rsa-sha256; cv=none; b=b9j2Xnx77cSpvx+hkwBWFIV+0oMhCXkEBLqaGWlQfa1ElUYXzgtUDKMfKL8sQB18IOM23x J/x1ketmtTqpXDqFXB/Ry4Mrh11F8u8CYdIEpnVRcXV/p2WZqGIfvHjNzxtP7lz5UJ3ViC ABAKqcip/+NAoo909F/CHymHnKDPb4em/MnFZOsewYSmdrllSsls9y+bBIbOdDo8+KwGK8 S9+y9CmL2OiEet0TE9pVJpa6LCNcxrQa3POg95V4KIqmeWsVwIaHvdlOVroF2iVXQXpZMa lKUlhj+EHuC19NiffU0TzWoLH9+mFvyO5ssDB96KrJ6iy719O8pS4dIVQIX4Zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741037845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LzUYvGkq3uOxFvZPgHcqhHVpB5E/cVdp5eIPBkXab2c=; b=QQjEi8K7jbSeQ9KcIjp6tN0Zgh9tbsYvC6NvLApjcHUa5sNJ5Atw7oPrmj11bNkcHzRtIT 3J33ia0wDDpgfqrOWDCbkh28gvZSCubllc4gWWZBG6abf95RekDvNrPFkzo6R+zhCzC+P6 4cLGiODltqUzo5ePwh942/j5rZ0U6qBR7EAYjS1cgWHLS6MwwLEY+5aKE0TDcGxK5ASo3v tzfFwIBh63tqYaRRpJYd0vpqOe3cKkDuRBgomYNS6w1ljzIn6yFuptKr0U7H8Ny2kSXKUD uH/t2RAle684Pph8KXlFbcYqBmQciuuYeo4x9do3XgxkjRYVX2UBvXt0uE1Atw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z6Bx132YNz14Dy; Mon, 03 Mar 2025 21:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 523LbPGj007289; Mon, 3 Mar 2025 21:37:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 523LbPi2007286; Mon, 3 Mar 2025 21:37:25 GMT (envelope-from git) Date: Mon, 3 Mar 2025 21:37:25 GMT Message-Id: <202503032137.523LbPi2007286@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Juraj Lutter Subject: git: 40984f5f8c0b - 2025Q1 - net-mgmt/zabbix6-server: Update to 6.0.39 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: 40984f5f8c0b5fce93ec8d74ebacec8224ca4d3c Auto-Submitted: auto-generated The branch 2025Q1 has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=40984f5f8c0b5fce93ec8d74ebacec8224ca4d3c commit 40984f5f8c0b5fce93ec8d74ebacec8224ca4d3c Author: Juraj Lutter AuthorDate: 2025-01-30 21:24:20 +0000 Commit: Juraj Lutter 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 @@ -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