Update zigbee2mqtt and fix init

inode64 · inode64 · commit a218d6efc9c6 · 2023-12-05T12:03:15.000+01:00
Signed-off-by: INODE64 &lt;web@inode64.com&gt;
diff --git a/app-misc/zigbee2mqtt/Manifest b/app-misc/zigbee2mqtt/Manifest
@@ -1,7 +1,7 @@
-AUX zigbee2mqtt 632 BLAKE2B 5cb0d8852f0755fa43444eba7d39a536c0c4f79325fef66338228d92530397e6294ce72c0c4d9d4b6f6bbfb0044b77746e6daf9d2dc7b269211cefaed7a99189 SHA512 0a26ef5e136b5536fa4b5d7fe9953b76e5c2fedf433abe91877e78701bb661744ce4dccb642911a28270e9740b7c7af78e75e8c0914c804d1cf0e76698999d70
+AUX zigbee2mqtt 636 BLAKE2B 4038660a30ac62410d4a05c41cc42cf7abdd25c1c3a0375830890b5bb15e8daa9c273cce43566f89c572b6977a5c16abd42602c95b4b64b835d6a861a8b34d54 SHA512 3442a8afdb9568f106e7db8c4967a7f8de0c1f206a41f48fdc66c070156304332f23fb735f2cc19451e1f567089d82fcad51e9b467566c6c864fdd701d26cba8
 AUX zigbee2mqtt.conf 176 BLAKE2B f1003f37135e10a32c3fe7b387da9f4194cae82339edf77928c2d55e08dcac1f212d27f5bd41a0f20887847fd98f569aaf0ca5f17504be1f3c8d87d38c2f5b87 SHA512 105e618af8ee335a591d791c701ffdbdccc4e967d29433a9d9f6997f5f6c3f50eb3dfe56a3fcd617b0a52ed1380fb889747ef70a148c07d6871c7e3c2beb9dab
-AUX zigbee2mqtt.service 870 BLAKE2B d680edf72f182e2545d15063786d281bbf31d8e8cb899b0aa103da6dd8180b8afd7d5bef21c760991c27db98151bb48bd569b26318477ddcb71e8a90cbf193af SHA512 f02d59509f632c458cd9e95ecd97421df3aba8a78bac41d55075d8f054e4f3293b414885d0c1337a38a179496e5e2851c00170ca36f8546a6a37d2473811a46a
-DIST zigbee2mqtt-1.33.2-node_modules.tar.xz 17115112 BLAKE2B 1f60034e5651a00b705a9d8e16b3151b9c28a1458ee2ffff8f6367ec4d9839e8178c82c2c5e3c3249674ec2bda73548a66590baa59c071532b8db3b13166aa5b SHA512 e2b393d9f084917bac3157c85fe39d0bffed6930a5714f811aca771e65b9cdec980dfa107380431bfcc2d0d1ff73da4e49cebb3a5df81f681279b08925351f38
-DIST zigbee2mqtt-1.33.2.tar.gz 566167 BLAKE2B eaf1f023f0925571a793324d272937a46a7ffab0582ba15eba9e38ab6e8484cf0612e3ee457dccd6da16443481a6273171bd8615dd5864a83a0af9c122d8689d SHA512 986a0eeca4e72fd9da39c909a2f47e64f23fed96970b5fdaa226a69c4316ebb9e158b9ca8f94e84d0450ec688e30533e50d6a9d4033b8aeb48dddd08191491fc
-EBUILD zigbee2mqtt-1.33.2.ebuild 1789 BLAKE2B a099d20877b0003fa802be8e008ffc1754428b11ca41f317819a007a499c1ee1f5875cab6094a43579c78d0aa87d6b6b1d8cc86ada911b5a06364e2c199cc4a0 SHA512 cd6715a6a3e2e79af05d7a99f892f4fa2377ffd5e166f6af1d8df9861c12a1ba6b418d942001d428e884ccdae24e1755c9e8d0e797a92a046fd5ac84cfbb6412
+AUX zigbee2mqtt.service 874 BLAKE2B fc017e66d0cfbdcec76bc2f94078e51a618bf4b99246e9b4588bb0d6135d64f3deb798aaf4b473eebcef2529f6d90b8660e8946e3f344b7b6c9cc9b27d6b0527 SHA512 06f662784a116f0145466dcd6da02ebbd8dd0455a7c5e12e8cedab2404d511a6d37dba66096bbace187643a086c62fed0c2c06df356c217f91d33762f4b610ad
+DIST zigbee2mqtt-1.34.0-node_modules.tar.xz 15715552 BLAKE2B 1c957c93cdfbdb7f930e49395528afd767d7d209cf08b8e308ea7d04068dc20086492d4515ae1b43198ba8e403747c113b37afe01e9a726599cd30d13a19f18b SHA512 639cf919b93c14698844402739e013e5c9b13cc2585e75d9f1676bf38befe0e55791b8976a0933663885df8d40cf74875bcf809401ad2ac7a8ac5da2b39c3785
+DIST zigbee2mqtt-1.34.0.tar.gz 569310 BLAKE2B 3cf52b4286f6674836d1f25f909583de2277b1418b1ed5b943eb6f10fa5ee63b88d38e65e43bc58df6082af515b51cd478a9cb9d4369d39a8d3b9dd65ba2d07e SHA512 594a1466b84a3a988292d175cceee1870a84275968f0caf161d32911006e0032dfa9b765ea18c2e55177a4bc8656040d0e2aeba4c0c7a18aea4b0582a4650ad4
+EBUILD zigbee2mqtt-1.34.0.ebuild 1789 BLAKE2B a099d20877b0003fa802be8e008ffc1754428b11ca41f317819a007a499c1ee1f5875cab6094a43579c78d0aa87d6b6b1d8cc86ada911b5a06364e2c199cc4a0 SHA512 cd6715a6a3e2e79af05d7a99f892f4fa2377ffd5e166f6af1d8df9861c12a1ba6b418d942001d428e884ccdae24e1755c9e8d0e797a92a046fd5ac84cfbb6412
 MISC metadata.xml 480 BLAKE2B dc80fdb17a73b1f63ef970674d5bb1a950b14d6d318276ad3303157dd93fbba9165a9e2b70a0380cbf70b77ecf31ed856698f7887ae0bc09a5d71c66ff7d4b42 SHA512 e7cbfb9fb939af0066a1a779af9af60df9a45d7b42b16706f6dcd321e4bd5b9b432120321b9cfe0d28809cd207f8aba36f9119c07b6adefe109acd207a15e51d
diff --git a/app-misc/zigbee2mqtt/files/zigbee2mqtt b/app-misc/zigbee2mqtt/files/zigbee2mqtt
@@ -13,7 +13,7 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --user zigbee2mqtt:zigbee2mqtt --env ZIGBEE2MQTT_DATA=/var/lib/${SVCNAME} --chdir /usr/lib64/node_modules/zigbee2mqtt --exec /usr/bin/npm --background --make-pidfile --pidfile /run/${SVCNAME}.pid -- start
+	start-stop-daemon --start --user zigbee2mqtt:zigbee2mqtt --env ZIGBEE2MQTT_DATA=/var/lib/${SVCNAME} --chdir /usr/lib64/node_modules/zigbee2mqtt --exec /usr/bin/node --background --make-pidfile --pidfile /run/${SVCNAME}.pid -- index.js
 	eend $?
 }
 
diff --git a/app-misc/zigbee2mqtt/files/zigbee2mqtt.service b/app-misc/zigbee2mqtt/files/zigbee2mqtt.service
@@ -4,7 +4,7 @@ After=network.target
 Wants=mosquitto.service
 
 [Service]
-ExecStart=npm start
+ExecStart=node index.js
 WorkingDirectory=/usr/lib64/node_modules/zigbee2mqtt
 Environment=ZIGBEE2MQTT_DATA=/var/lib/zigbee2mqtt
 StandardOutput=inherit
diff --git a/app-misc/zigbee2mqtt/zigbee2mqtt-1.34.0.ebuild b/app-misc/zigbee2mqtt/zigbee2mqtt-1.34.0.ebuild

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ checkconfig() {`
`13`	`13`	`start() {`
`14`	`14`	`checkconfig \|\| return 1`
`15`	`15`	`ebegin "Starting ${SVCNAME}"`
`16`		`- start-stop-daemon --start --user zigbee2mqtt:zigbee2mqtt --env ZIGBEE2MQTT_DATA=/var/lib/${SVCNAME} --chdir /usr/lib64/node_modules/zigbee2mqtt --exec /usr/bin/npm --background --make-pidfile --pidfile /run/${SVCNAME}.pid -- start`
	`16`	`+ start-stop-daemon --start --user zigbee2mqtt:zigbee2mqtt --env ZIGBEE2MQTT_DATA=/var/lib/${SVCNAME} --chdir /usr/lib64/node_modules/zigbee2mqtt --exec /usr/bin/node --background --make-pidfile --pidfile /run/${SVCNAME}.pid -- index.js`
`17`	`17`	`eend $?`
`18`	`18`	`}`
`19`	`19`