From nobody Tue Dec 21 08:03:07 2021 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 767901901FBC; Tue, 21 Dec 2021 08:03:08 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJ88X1GGPz3lrL; Tue, 21 Dec 2021 08:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 0054825CBB; Tue, 21 Dec 2021 08:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BL837OO085860; Tue, 21 Dec 2021 08:03:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BL837ZZ085859; Tue, 21 Dec 2021 08:03:07 GMT (envelope-from git) Date: Tue, 21 Dec 2021 08:03:07 GMT Message-Id: <202112210803.1BL837ZZ085859@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexander Leidinger Subject: git: 274a774af71a - main - misc/openhab,+addons: update to 3.2.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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: netchild X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 274a774af71a4ce55153d3e17e2ed0becc262970 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640073788; 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=dJRkWwY9AAbuEb80bTCkCuvHWmIqIBs1p9sk1+OXwno=; b=SCbPRpta0mUM6UyVy5AYwJVBefiUPUB3cMXkHRjYulE3HBMehq4hCU4Ln/S30BtOCScgEW Njw9ntJvN1UoL0HgY5qb71Yh75Xo+HNohIK/PLPENVQWzF7+QTgbYjTOJzJr5exVUBVteT z9RAoq80pFotzIWhfFASYGlWotaYmU56cdr1p8nH4bMIJfbxHM1zmC2tk3ZWxBBORG0oRJ nrBiJWYr/dr2Sf47KihXde66P6mJC1NmwlQIRKb2x8pMwx7Fvae02GJaywFr7ECTgZ+bOV hjceaP0lGLF0CZv3B8tOzj8koJ0h5faBGmHyQVO1rvNEFh8ln9mDX7zY+Zrhew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640073788; a=rsa-sha256; cv=none; b=mYc2EBjhUIIwrKrhpKlQywkYzp9LaMfBllRFPpzSMIuAVI0FbhoNNjt+ncsDRcGPlYy+rA vEr5EO4/PxtgQFqqjKz44mglpqTZzBnsI3dEjWhuPjU91Wmw4CKim/F3/e4PvRzpwvx3dD wyu0WM2c801ZwjLRPgPt8ZrIV0RD0cb9zmWCUudh4YgYFsLZumwfrPq+hY6CYWc1tB1x5/ NWbFAdeUdO4/e8HeTlOcPj02aDNHAxtYwVttQlRkyfLhIw6x2seiQrPfph27lscJBOKL9h 7Q4S5H6x7sm579Eb1NHOXRHltx0zvXXrVedr5CAqy43H0bGAKonIHlHp7uYKhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/ports/commit/?id=274a774af71a4ce55153d3e17e2ed0becc262970 commit 274a774af71a4ce55153d3e17e2ed0becc262970 Author: Alexander Leidinger AuthorDate: 2021-12-21 07:56:20 +0000 Commit: Alexander Leidinger CommitDate: 2021-12-21 08:03:03 +0000 misc/openhab,+addons: update to 3.2.0 Update to 3.2.0: - https://github.com/openhab/openhab-distro/releases/tag/3.2.0 - switches from log4j mitigation to updated log4j (2.17.0) https://community.openhab.org/t/log4j-vulnerability/129863/73 - add CPE for addons PR: 260421 --- misc/openhab-addons/Makefile | 7 +- misc/openhab-addons/distinfo | 6 +- misc/openhab/Makefile | 2 +- misc/openhab/distinfo | 6 +- misc/openhab/files/pkg-message.in | 27 ++++ misc/openhab/pkg-plist | 294 +++++++++++++++++++------------------- 6 files changed, 187 insertions(+), 155 deletions(-) diff --git a/misc/openhab-addons/Makefile b/misc/openhab-addons/Makefile index 664ac5e9d4e2..9ed85ea38551 100644 --- a/misc/openhab-addons/Makefile +++ b/misc/openhab-addons/Makefile @@ -1,5 +1,5 @@ PORTNAME= openhab-addons -PORTVERSION= 3.1.0 +PORTVERSION= 3.2.0 CATEGORIES= misc java MASTER_SITES= https://openhab.jfrog.io/artifactory/libs-release-local/org/openhab/distro/openhab-addons/${PORTVERSION}/ DISTNAME= openhab-addons-${PORTVERSION} @@ -12,16 +12,19 @@ LICENSE= EPL RUN_DEPENDS= ${LOCALBASE}/libexec/openhab/addons/README:misc/openhab +USES= cpe zip + USERS= openhab GROUPS= openhab -USES= zip NO_WRKSUBDIR= yes NO_BUILD= yes EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS="-v" EXTRACT_AFTER_ARGS="${EXTRACT_WRKDIR}" +CPE_PRODUCT= openhab + PLIST_FILES= libexec/openhab/addons/openhab-addons-${PORTVERSION}.kar do-install: diff --git a/misc/openhab-addons/distinfo b/misc/openhab-addons/distinfo index 734242143dce..e8fa21d6b476 100644 --- a/misc/openhab-addons/distinfo +++ b/misc/openhab-addons/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624869020 -SHA256 (openhab-addons-3.1.0.kar) = 692bb54f536119bd5c04c0e77ded524eabeb11dc50d013035ba31cd8e27a260b -SIZE (openhab-addons-3.1.0.kar) = 241979494 +TIMESTAMP = 1640072371 +SHA256 (openhab-addons-3.2.0.kar) = 543d3bfa6dce921fb9fcfb97105846da4aa2d5cacdad6be910a340c5c30007ac +SIZE (openhab-addons-3.2.0.kar) = 283512900 diff --git a/misc/openhab/Makefile b/misc/openhab/Makefile index 81470c5bd001..c0439b617a29 100644 --- a/misc/openhab/Makefile +++ b/misc/openhab/Makefile @@ -1,5 +1,5 @@ PORTNAME= openhab -PORTVERSION= 3.1.1 +PORTVERSION= 3.2.0 PORTREVISION= 0 CATEGORIES= misc java MASTER_SITES= https://openhab.jfrog.io/artifactory/libs-release-local/org/openhab/distro/openhab/${PORTVERSION}/ diff --git a/misc/openhab/distinfo b/misc/openhab/distinfo index c18c37e32a73..cdb15875fa7a 100644 --- a/misc/openhab/distinfo +++ b/misc/openhab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1639381765 -SHA256 (openhab-3.1.1.zip) = 31290f483402548065752683004ebd8cb53482ae14f049d70a03683d3ac23049 -SIZE (openhab-3.1.1.zip) = 99213841 +TIMESTAMP = 1640069209 +SHA256 (openhab-3.2.0.zip) = 5ba8fdcd0cd6065c9d5589f6f498947d7b4afe16a81e65cd3885b65ef7827af8 +SIZE (openhab-3.2.0.zip) = 99044071 diff --git a/misc/openhab/files/pkg-message.in b/misc/openhab/files/pkg-message.in index d33488eb7d75..1547c76480af 100644 --- a/misc/openhab/files/pkg-message.in +++ b/misc/openhab/files/pkg-message.in @@ -29,6 +29,33 @@ If you upgrade from a pevious version, make a backup of /var/db/openhab and read about the breaking changes in the release notes at https://github.com/openhab/openhab-distro/releases/ + +You may have to update the files in + /var/db/openhab/userdata/etc/ +from + %%DATADIR%%/etc/ +by hand. + +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 EOM } +{ type: upgrade + message: <