misc/openhab: Update to 4.0.0.

freebsd · Jul 26, 2023 · 5ae8f57 · 5ae8f57
1 parent b3a3ffe
commit 5ae8f57
Show file tree

Hide file tree

Showing 8 changed files with 232 additions and 171 deletions.
diff --git a/UPDATING b/UPDATING
@@ -5,6 +5,23 @@ 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.
 
+20230726:
+  AFFECTS: users of misc/openhab
+  AUTHOR: netchild@FreeBSD.org
+
+  The update to openhab 4.0.0 may require changes to the running 3.x setup.
+  Read the release notes at
+    https://github.com/openhab/openhab-distro/releases/tag/4.0.0
+  and the blog entry at
+    https://www.openhab.org/blog/2023-07-23-openhab-4-0-release.html
+  for manual changes which are required before updating the port.
+
+  After the update the pkg-message provides some more info about manual
+  changes which are required to perform before the first start of 4.0.0.
+
+  Note, this includes a switch from java 11 to java 17. You can deinstall
+  openjdk11 afterwards, if it is not needed for something else.
+
 20230723:
   AFFECTS: users of security/py-cryptography
   AUTHOR: tcberner@FreeBSD.org

diff --git a/misc/openhab-addons/Makefile b/misc/openhab-addons/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openhab-addons
-PORTVERSION=	3.4.4
+PORTVERSION=	4.0.0
 CATEGORIES=	misc java
 MASTER_SITES=	https://openhab.jfrog.io/artifactory/libs-release-local/org/openhab/distro/openhab-addons/${PORTVERSION}/
 DISTNAME=	openhab-addons-${PORTVERSION}

diff --git a/misc/openhab-addons/distinfo b/misc/openhab-addons/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683531923
-SHA256 (openhab-addons-3.4.4.kar) = 852671e13fa35170947e49cf7a7b3423b4229807c84f1e26d681f4efd138e8da
-SIZE (openhab-addons-3.4.4.kar) = 378496598
+TIMESTAMP = 1690367656
+SHA256 (openhab-addons-4.0.0.kar) = fec9aac5b6add6bcd388c9174ccf8bb402714bbeeef983e9f9a9aea7c3d38464
+SIZE (openhab-addons-4.0.0.kar) = 393951468
diff --git a/misc/openhab/Makefile b/misc/openhab/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openhab
-PORTVERSION=	3.4.4
+PORTVERSION=	4.0.0
 PORTREVISION=	0
 CATEGORIES=	misc java
 MASTER_SITES=	https://openhab.jfrog.io/artifactory/libs-release-local/org/openhab/distro/openhab/${PORTVERSION}/
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 USES=		cpe zip
 USE_JAVA=	yes
-JAVA_VERSION=	11
+JAVA_VERSION=	17
 JAVA_RUN=	yes
 USE_RC_SUBR=	openhab
 SUB_FILES=	pkg-message

diff --git a/misc/openhab/distinfo b/misc/openhab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683531251
-SHA256 (openhab-3.4.4.zip) = 0b52f189fdad894dde2fbae63bf1143da2169e8d0d77ddd966f1cc199963d504
-SIZE (openhab-3.4.4.zip) = 104330146
+TIMESTAMP = 1690367365
+SHA256 (openhab-4.0.0.zip) = 3871ae84eb53b1de26f025ff109fdc305648a328c1dd71f390c3a044538e8a11
+SIZE (openhab-4.0.0.zip) = 104034005
diff --git a/misc/openhab/files/openhab.in b/misc/openhab/files/openhab.in
@@ -60,7 +60,7 @@ export OPENHAB_USERDATA="${openhab_userdata_dir}"
 export OPENHAB_LOGDIR="${openhab_log_dir}"
 # for UTF-8 encoding, language can be set inside openhab:
 export LC_ALL=en_US.UTF-8
-export JAVA_VERSION=11
+export JAVA_VERSION=17
 
 pidfile=/var/run/${name}/${name}.pid
 

diff --git a/misc/openhab/files/pkg-message.in b/misc/openhab/files/pkg-message.in
@@ -30,12 +30,35 @@ If you upgrade from a pevious version, make a backup of
 and read about the breaking changes in the release notes at
 	https://github.com/openhab/openhab-distro/releases/
 
+You need to change some configs:
+	export OPENHAB_USERDATA=/var/db/openhab/userdata
+	sed -i'.bak' -e "s:,javascript::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+	sed -i'.bak' -e "s:javascript,::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+	sed -i'.bak' -e "s:javascript::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+	sed -i'.bak' -e "s:,cometvisu-php::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+	sed -i'.bak' -e "s:cometvisu-php,::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+	sed -i'.bak' -e "s:cometvisu-php::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+	sed -i'.bak' -e "s:,innogysmarthome::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+	sed -i'.bak' -e "s:innogysmarthome,::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+	sed -i'.bak' -e "s:innogysmarthome::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+	sed -i'.bak' -e "s:,imperihome::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+	sed -i'.bak' -e "s:imperihome,::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+	sed -i'.bak' -e "s:imperihome::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+	sed -i'.bak' -e "s:,darksky::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+	sed -i'.bak' -e "s:darksky,::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+	sed -i'.bak' -e "s:darksky::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+
 You may have to update the files in
 	/var/db/openhab/userdata/etc/
 from
 	%%DATADIR%%/etc/
 by hand.
 
+At the end you need to run
+	export JAVA_VERSION=17
+	export OPENHAB_USERDATA=/var/db/openhab/userdata
+	java -jar "%%LOCALBASE%%/libexec/openhab/runtime/bin/upgradetool.jar"
+
 In case you see issues in the logfile or outdated info in the webinterface,
 you may want to remove the cache and restart:
 	rm -r /var/db/openhab/userdata/cache/org.eclipse.osgi
@@ -48,12 +71,35 @@ If you upgrade from a pevious version, make a backup of
 and read about the breaking changes in the release notes at
 	https://github.com/openhab/openhab-distro/releases/
 
+You need to change some configs:
+OPENHAB_USERDATA=/var/db/openhab/userdata
+sed -i'.bak' -e "s:,javascript::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+sed -i'.bak' -e "s:javascript,::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+sed -i'.bak' -e "s:javascript::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+sed -i'.bak' -e "s:,cometvisu-php::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+sed -i'.bak' -e "s:cometvisu-php,::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+sed -i'.bak' -e "s:cometvisu-php::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+sed -i'.bak' -e "s:,innogysmarthome::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+sed -i'.bak' -e "s:innogysmarthome,::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+sed -i'.bak' -e "s:innogysmarthome::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+sed -i'.bak' -e "s:,imperihome::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+sed -i'.bak' -e "s:imperihome,::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+sed -i'.bak' -e "s:imperihome::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+sed -i'.bak' -e "s:,darksky::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+sed -i'.bak' -e "s:darksky,::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+sed -i'.bak' -e "s:darksky::g" "$OPENHAB_USERDATA/config/org/openhab/addons.config"
+
 You may have to update the files in
 	/var/db/openhab/userdata/etc/
 from
 	%%DATADIR%%/etc/
 by hand.
 
+At the end you need to run
+	export JAVA_VERSION=17
+	export OPENHAB_USERDATA=/var/db/openhab/userdata
+	java -jar "%%LOCALBASE%%/libexec/openhab/runtime/bin/upgradetool.jar"
+
 In case you see issues in the logfile or outdated info in the webinterface,
 you may want to remove the cache and restart:
         rm -r /var/db/openhab/userdata/cache/org.eclipse.osgi