From nobody Wed Jan 08 09:57:14 2025 X-Original-To: dev-commits-ports-all@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 4YSjy253ZQz5k6Gp; Wed, 08 Jan 2025 09:57:14 +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 4YSjy24mxxz4L6F; Wed, 8 Jan 2025 09:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736330234; 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=9FymcA4t2JmfEuyWQhR2XUHUD9J9gWrEfv85EBuOIbY=; b=JegspavN3jrt1nqhaJDJA92mmW/AIcYmgXzZvRahp6BPF78qNc+ru5MrVRZWSh3ONGGxqh 60V2F00kUh+K8LFJnVftGNlS7Hv49k22XNEtBTPSuCMrpGKq/ctLEPE+olVYfrxudrNswq Zg/GRD7YH+NrRLc2eKn86PpVJ76SReXSD4j4WGwlKbxvYS1c8iMzuzMVgaEV8howRhBYcW h2VLgoL5e01kH9Hz8wUjWF5DsrzoutJeJPc4sAFPMeq1r4izdAgVcdIYO5dqkwBo1YOp/h B02wdl+VeYYE2RiIBmkScMREEpKs2Xj1HWXlqglKMc2C1E0dzCVqrQgSBjz4MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736330234; 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=9FymcA4t2JmfEuyWQhR2XUHUD9J9gWrEfv85EBuOIbY=; b=TdUBnleQmFGfUVxRQmxdb2RnavRjkmgoYX5wrCBeiMPk/fA5DCrrgNWX4ebHysaY42yEet K34PEXOkDwAL8vwSbjqGz03WAnXY2n6Juf8eDcR98sVpRalsjLArYx70/x5qcJLYhbAy43 mKpPNe/+Ejhmk1CYvFoc6UQsZq6v/9TdpZsZU0aKcGcgS+sR0dER9DKPtLt56LfZ0DhG2S gPGrMQfIwLvkrmbpc1qJlDGP0IFlRUcPfrUZlrUPM0P/2Vcstxf5Hz9T24wFQdU0x6ZcL4 kAw5p88PAqu9NQFq5u2n5CUSllMAO1USSpEWW2D8yVLpy01Xniu5W2CGfAyqWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736330234; a=rsa-sha256; cv=none; b=dcYPwMqLReR9Zgz8jlszKMNBbbF38F+fLVmFVHqW0J3oYjQj18x4dvjRt1qG3qhTTiQEWP tAUbdZ1LiT2pJjyi3GH9Dt84k3YJGfV7QXQxFg+7fzSD6+P+pFdea4E0ct6HZMZ9GY1hMm D4SDTH+CDRrOegGhLryjMUZrbacPyJB3htFfhXZtk1eAWDT4REZEioabc/jXP7VMNhDNWz 5IsTNaVLnHi5oYqTM2x2gfHffT5KzlHPhRdw3q3OnAMoYUb4/hmiJDG3SgwJNH7OguJz8S rnsCDgXR9Z415V8AAKFf5P/+LDD/JffQmvf5M1y9jNouDZ1UUoxjJskA8nIXmg== 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 4YSjy24FGyzrtY; Wed, 08 Jan 2025 09:57:14 +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 5089vEl4086217; Wed, 8 Jan 2025 09:57:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5089vEVL086212; Wed, 8 Jan 2025 09:57:14 GMT (envelope-from git) Date: Wed, 8 Jan 2025 09:57:14 GMT Message-Id: <202501080957.5089vEVL086212@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: aaf018836150 - main - comms/zigbee2html: Update to 2.0.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: aaf018836150fad57d5bf0fa9b7439f44d740b56 Auto-Submitted: auto-generated The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=aaf018836150fad57d5bf0fa9b7439f44d740b56 commit aaf018836150fad57d5bf0fa9b7439f44d740b56 Author: Juraj Lutter AuthorDate: 2025-01-06 22:17:01 +0000 Commit: Juraj Lutter CommitDate: 2025-01-08 09:56:49 +0000 comms/zigbee2html: Update to 2.0.0 Update to 2.0.0, see https://github.com/Koenkk/zigbee2mqtt/discussions/24198 and/or UPDATING entry for details. --- UPDATING | 10 + comms/zigbee2mqtt/Makefile | 17 +- comms/zigbee2mqtt/distinfo | 10 +- comms/zigbee2mqtt/files/configuration.yaml.in | 12 +- comms/zigbee2mqtt/files/pkg-message.in | 19 + comms/zigbee2mqtt/pkg-plist | 17985 ++++++++++-------------- 6 files changed, 7648 insertions(+), 10405 deletions(-) diff --git a/UPDATING b/UPDATING index 3e1d0850ddea..629c4c91d04d 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,16 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20250106: + AFFECTS: users of comms/zigbee2mqtt + AUTHOR: otis@FreeBSD.org + + There are possibly breaking changes, see + https://github.com/Koenkk/zigbee2mqtt/discussions/24198 for full details. + + Users are STRONGLY advised to take backup of /var/db/z2m directory + prior to the upgrade. + 20241230: AFFECTS: users of net/xrdp-devel AUTHOR: meta@FreeBSD.org diff --git a/comms/zigbee2mqtt/Makefile b/comms/zigbee2mqtt/Makefile index fe852436caf4..79d043a5dbd0 100644 --- a/comms/zigbee2mqtt/Makefile +++ b/comms/zigbee2mqtt/Makefile @@ -1,5 +1,5 @@ PORTNAME= zigbee2mqtt -DISTVERSION= 1.42.0 +DISTVERSION= 2.0.0 CATEGORIES= comms MASTER_SITES= LOCAL/otis/:nodemodules DISTFILES= ${DISTCACHEFILES_nodemodules}:nodemodules @@ -58,7 +58,7 @@ post-extract: .prettierrc .release-please-manifest.json CHANGELOG.md \ CODE_OF_CONDUCT.md CONTRIBUTING.md README.md docker \ update.sh \ - data; do \ + data test; do \ ${RM} -rf ${WRKSRC}/$${f}; \ done @@ -69,13 +69,22 @@ do-install: cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${Z2M_HOME} ${INSTALL_DATA} ${WRKDIR}/configuration.yaml ${STAGEDIR}${Z2M_DATADIR}/configuration.yaml.sample ${INSTALL} -lrs ${STAGEDIR}${Z2M_DATADIR} ${STAGEDIR}${Z2M_HOME}/data + ${RM} ${STAGEDIR}${Z2M_HOME}/scripts/zigbee2socat_installer.sh # This should be run after DISTVERSION change +# Required global node modules: +# - pnpm +# - rimraf +# - typescript +# +# Then run: +# make create-caches-tarball create-caches-tarball: ${WRKSRC} cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} npm install --ignore-scripts --no-progress --no-audit --no-fund && \ + ${SETENV} ${MAKE_ENV} pnpm install --ignore-scripts && \ + ${SETENV} ${MAKE_ENV} pnpm run prepack && \ ${FIND} ${WRKSRC}/node_modules -type d -a \( -name build -o -name dist \) -print0 | xargs -0 ${RM} -rf && \ ${TAR} czf ${WRKDIR}/zigbee2mqtt-nodemodules-${PKGVERSION}.tar.gz \ - node_modules package-lock.json + node_modules pnpm-lock.yaml .include diff --git a/comms/zigbee2mqtt/distinfo b/comms/zigbee2mqtt/distinfo index 7775ec036428..1094ff0c200c 100644 --- a/comms/zigbee2mqtt/distinfo +++ b/comms/zigbee2mqtt/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1733088278 -SHA256 (zigbee2mqtt-nodemodules-1.42.0.tar.gz) = 691168209b2a7fa3edcf785ce40fb9e4bb315649d421c44a34d1bd1301898651 -SIZE (zigbee2mqtt-nodemodules-1.42.0.tar.gz) = 18290432 -SHA256 (Koenkk-zigbee2mqtt-1.42.0_GH0.tar.gz) = 8bdc6e3570241b4c9a5b676396456b3845b66040844a80084bc456f7a774c1dd -SIZE (Koenkk-zigbee2mqtt-1.42.0_GH0.tar.gz) = 561234 +TIMESTAMP = 1736197927 +SHA256 (zigbee2mqtt-nodemodules-2.0.0.tar.gz) = 8c3364b4b606e39738b3dc4b0bdbe5fc893493595bf10651ef0232343fc67aed +SIZE (zigbee2mqtt-nodemodules-2.0.0.tar.gz) = 20423896 +SHA256 (Koenkk-zigbee2mqtt-2.0.0_GH0.tar.gz) = bfa4ecc34b9bcbc980c7bfaf8f7bb0ad60712423e244bbf67831e2a443a7d922 +SIZE (Koenkk-zigbee2mqtt-2.0.0_GH0.tar.gz) = 527663 diff --git a/comms/zigbee2mqtt/files/configuration.yaml.in b/comms/zigbee2mqtt/files/configuration.yaml.in index 80efe9950540..9280d73054f9 100644 --- a/comms/zigbee2mqtt/files/configuration.yaml.in +++ b/comms/zigbee2mqtt/files/configuration.yaml.in @@ -21,12 +21,22 @@ mqtt: serial: # Location of ITead Sonoff Zigbee 3.0 USB Dongle Plus port: /dev/ttyU0 + # See https://github.com/Koenkk/zigbee2mqtt.io/blob/dev/docs/guide/configuration/adapter-settings.md#basic-configuration + # for more details. + adapter: zstack + +# Disable device legacy options +device_options: + legacy: false # Advanced settings advanced: + homeassistant_legacy_entity_attributes: false + homeassistant_legacy_triggers: false + legacy_api: false + legacy_availability_payload: false log_output: [ "file" ] log_level: info log_symlink_current: true log_directory: "%%Z2M_LOGDIR%%/%TIMESTAMP%" log_file: "z2m.log" - diff --git a/comms/zigbee2mqtt/files/pkg-message.in b/comms/zigbee2mqtt/files/pkg-message.in index 3579549325df..666b4d7a2942 100644 --- a/comms/zigbee2mqtt/files/pkg-message.in +++ b/comms/zigbee2mqtt/files/pkg-message.in @@ -6,4 +6,23 @@ zigbee2mqtt file locations are as following: - log directory is %%Z2M_LOGDIR%% EOM } +{ type: upgrade + minimum_version: "1.42.0" + message: <