From d5a3bf626ffa3a66de6f82a8bc41ba09fcc7e9cb Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Mon, 6 Feb 2023 17:39:10 +0100
Subject: [PATCH 1/3] Update zigbee-herdsman-converters to 15.0.38-hotfix.0

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 87d9e163b..55a2bbed3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
         "winston-transport": "^4.5.0",
         "ws": "^8.12.0",
         "zigbee-herdsman": "0.14.89",
-        "zigbee-herdsman-converters": "15.0.38",
+        "zigbee-herdsman-converters": "15.0.38-hotfix.0",
         "zigbee2mqtt-frontend": "0.6.124"
       },
       "bin": {
@@ -9072,9 +9072,9 @@
       }
     },
     "node_modules/zigbee-herdsman-converters": {
-      "version": "15.0.38",
-      "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-15.0.38.tgz",
-      "integrity": "sha512-g0cJw/MAMNHxESDTRWkPhYLI52xqL4mm3YVJO1fqoidy5y7NhCmiKHtLwT9x3dYPLT/XTZOXAFBLGxf+sv38fQ==",
+      "version": "15.0.38-hotfix.0",
+      "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-15.0.38-hotfix.0.tgz",
+      "integrity": "sha512-I/p0ppkN579d81NvWVbha3CHmBLEJOLPiYxmV9+zB2hTCG+tS7lB5Fc8Wi/SYOa8Hw5hUmPytfYanoqDKxQTrA==",
       "dependencies": {
         "axios": "^1.3.0",
         "buffer-crc32": "^0.2.13",
@@ -15734,9 +15734,9 @@
       }
     },
     "zigbee-herdsman-converters": {
-      "version": "15.0.38",
-      "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-15.0.38.tgz",
-      "integrity": "sha512-g0cJw/MAMNHxESDTRWkPhYLI52xqL4mm3YVJO1fqoidy5y7NhCmiKHtLwT9x3dYPLT/XTZOXAFBLGxf+sv38fQ==",
+      "version": "15.0.38-hotfix.0",
+      "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-15.0.38-hotfix.0.tgz",
+      "integrity": "sha512-I/p0ppkN579d81NvWVbha3CHmBLEJOLPiYxmV9+zB2hTCG+tS7lB5Fc8Wi/SYOa8Hw5hUmPytfYanoqDKxQTrA==",
       "requires": {
         "axios": "^1.3.0",
         "buffer-crc32": "^0.2.13",
diff --git a/package.json b/package.json
index 5468f11ec..2c56a3a5f 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "winston-transport": "^4.5.0",
     "ws": "^8.12.0",
     "zigbee-herdsman": "0.14.89",
-    "zigbee-herdsman-converters": "15.0.38",
+    "zigbee-herdsman-converters": "15.0.38-hotfix.0",
     "zigbee2mqtt-frontend": "0.6.124"
   },
   "devDependencies": {

From 3420cf508b42018ad38333df253f062ef2fda613 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <xoxys@rknet.org>
Date: Sat, 4 Feb 2023 14:12:24 +0100
Subject: [PATCH 2/3] disable buildx provenance in the ci build command
 (#16495)

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2b5bb4d29..4c97b7afe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,8 +40,6 @@ jobs:
       uses: docker/setup-buildx-action@v2
       with:
         version: latest
-        # disabled provenance generation until support of OCI multi-arch image manifests with provenance information has been fixed in all necessary places. Cf. https://github.com/Koenkk/zigbee2mqtt/issues/16201 and https://github.com/docker/buildx/issues/1509
-        provenance: false
     - name: Docker build dev
       if: github.ref == 'refs/heads/dev' && github.event_name == 'push'
       run: |
@@ -49,6 +47,7 @@ jobs:
           --build-arg COMMIT=$(git rev-parse --short HEAD) \
           --platform linux/arm64/v8,linux/386,linux/amd64,linux/arm/v6,linux/arm/v7 \
           -f docker/Dockerfile \
+          --provenance=false \
           --push \
           -t koenkk/zigbee2mqtt:latest-dev -t ghcr.io/koenkk/zigbee2mqtt:latest-dev \
           .
@@ -60,6 +59,7 @@ jobs:
           --build-arg COMMIT=$(git rev-parse --short HEAD) \
           --platform linux/arm64/v8,linux/386,linux/amd64,linux/arm/v6,linux/arm/v7 \
           -f docker/Dockerfile \
+          --provenance=false \
           --push \
           -t koenkk/zigbee2mqtt:latest -t "koenkk/zigbee2mqtt:$TAG" -t ghcr.io/koenkk/zigbee2mqtt:latest -t "ghcr.io/koenkk/zigbee2mqtt:$TAG" \
           .

From eb878d3d8ee47f77e27c771452e2d2c77ca83bb5 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Mon, 6 Feb 2023 17:42:06 +0100
Subject: [PATCH 3/3] 1.30.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 55a2bbed3..d7df722f3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "zigbee2mqtt",
-  "version": "1.30.0",
+  "version": "1.30.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "zigbee2mqtt",
-      "version": "1.30.0",
+      "version": "1.30.1",
       "license": "GPL-3.0",
       "dependencies": {
         "ajv": "^8.12.0",
diff --git a/package.json b/package.json
index 2c56a3a5f..b84507def 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zigbee2mqtt",
-  "version": "1.30.0",
+  "version": "1.30.1",
   "description": "Zigbee to MQTT bridge using Zigbee-herdsman",
   "main": "index.js",
   "repository": {