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: <