From nobody Fri Jan 31 11:39:27 2025 X-Original-To: dev-commits-ports-main@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 4Ykv7M36Ybz5mThk; Fri, 31 Jan 2025 11:39:27 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ykv7M2Xfkz4MnS; Fri, 31 Jan 2025 11:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738323567; 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=HNwo7XqMarvqyMJDFdTB3R4Y4Cv8/+uLTMxd3xY+HgY=; b=DoWOO5Vs2G6VguFTg3WFSBsrOeRLH8Wpj2crGk0dEuBFoBm3dBlUPYX3R0Dz6HQXdB1MMe A+Cl4IKbYWr/qGAIo0IbKhijG31smme4YfEComkoU78Gy9l+sm9vhNPyPBTzjefGazWyfV Qwabz99myP+eTPsNxcfLfRXQpDt+Ro7MVGjvFgbdQSJnV9hwWJE84m2A0wO1ZtfPIitTLv eQd/WgyXF+18aFRPweis/uvX41QZZDAdFAM5ouUJlnOcIH/CWbIo8Iu3O1Ic7BJkxSit0L cHgTgrSLYm7BQUiZXJoBkVn7OjBGLzaqBqi9+ToLsftfYrAbsvIbKNJalkGe7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738323567; 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=HNwo7XqMarvqyMJDFdTB3R4Y4Cv8/+uLTMxd3xY+HgY=; b=c7PJPgySyMqc+2WCq8ptAw5eELZduCOfo4Ud3BLtEBdcwIzIdgfVl/U80dgG9YoMzYcZ9Y 6akUbXYhusmP0iPLQwFdHkAgLORF+F0m6x52mbmZvxhDIuQZyGfRpV9Kq5ZrJl00NlvLPt eVO6XjPzfI08tzmnAD8v7PjpR2hYxO+ia9oW9v+8sI/mo3S0erPaJAY65YWXLiYL/NOTuC xJgy1RItI0kdstGhqL4WLVHMRNIEEmL/QjDvwXhW+w8CSl7983Dn8lnGlbhLW3uC+nhdsZ Q2HIPFOji1LALGPMSF1RkcwJVzMXqQiatRYwwSi8eWTK49tZVRhSKstM/whD6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738323567; a=rsa-sha256; cv=none; b=sk/P6OqvS5iUnYp7FhbWYQBOcBjVH34Ox7BKBfJYVDwRHrWEPxaq4GvMFJNE7tfXeffRHz OdFCHEZO0aWmaLb0rr5A7fgxC9k5lr6gJ01xkx3vD+YwnMywKyx5fkX6BcqDqvbT2rq8Ua 7oRwnaNvCkAM0ndNbM8nWSegrotLjK0A0yRDCUTUtMRBHpxQqRkYLDw6tcD7Cf5oL8tG6/ 1jpaYj1rQRi/nGUEUqwfvGqoTv2OfNZ6V6sVWgB+i8NZbg0pOZduc+1U34objNKseJG7wX aY+uIPHOp4bG7U8DndfuxC9wijRldNXJQo/4l0KbksWgSJRUD9U/5aDQDNkaFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ykv7M1ddzz1fl; Fri, 31 Jan 2025 11:39:27 +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 50VBdRxk034245; Fri, 31 Jan 2025 11:39:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50VBdRop034242; Fri, 31 Jan 2025 11:39:27 GMT (envelope-from git) Date: Fri, 31 Jan 2025 11:39:27 GMT Message-Id: <202501311139.50VBdRop034242@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: fc6655bd2577 - main - net-mgmt/zabbix6-server: Fix pkg-plist List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: fc6655bd257715b2f26a99e2037640aec705288e Auto-Submitted: auto-generated The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=fc6655bd257715b2f26a99e2037640aec705288e commit fc6655bd257715b2f26a99e2037640aec705288e Author: Juraj Lutter AuthorDate: 2025-01-31 11:37:31 +0000 Commit: Juraj Lutter CommitDate: 2025-01-31 11:37:31 +0000 net-mgmt/zabbix6-server: Fix pkg-plist Some of the database files were moved deeper into directory structure and some of them were renamed. Catch up with the changes. --- net-mgmt/zabbix6-server/Makefile | 3 ++- net-mgmt/zabbix6-server/pkg-plist | 34 +++++++++++++++++----------------- net-mgmt/zabbix6-server/pkg-plist.java | 6 +++--- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/net-mgmt/zabbix6-server/Makefile b/net-mgmt/zabbix6-server/Makefile index e4c854f5bc36..91f52521cf63 100644 --- a/net-mgmt/zabbix6-server/Makefile +++ b/net-mgmt/zabbix6-server/Makefile @@ -234,7 +234,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/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