From nobody Mon Sep 04 17:22:52 2023 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 4Rfb7K1zj3z4sVZN; Mon, 4 Sep 2023 17:22:53 +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 4Rfb7J721wz4Ylh; Mon, 4 Sep 2023 17:22:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693848173; 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=wW62v8RgYu7eJGfL5t8aoTGmXtiZ0Dyld+26ovLoKqs=; b=Pusc9PYVxpuE6QU0CbsbOcVMGJKtnX0h+YX/ti8tJ7K+cVhi3DfMhU7Xem9yhsTNp0+9gC to11npLey/AKAtVYC3842UO8FKzoTB2xTgetvGYGuA9NhAtXOZiWXxTwkXWJTOhUWiHHYW EFR6tmBCgL5gA2gXQlquhWQSKvuG/okpNOMfLZNCI9vrrn8JrdcfBrKkUvAYKvEC0Ybmkc znw92sm1D8SbckocSFTtwHz/usTh2dJgxjbf3Xxu0AH2JjAHullqcx8RMMTZlIGoaBOY3n pSJmZGLo89d8+NdlkOQFHA77QTOMfUbY588EyVbQCN0U1cGCkKR3HFe7zRb/JA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693848173; a=rsa-sha256; cv=none; b=LZg9gZs1voiOxKrLAmu0pNv6d5srMQTI6/96eROHvgY//eDvNylQZIrY35GvcCmZFkEKp2 ybqYeCuvSRMhIjeyULgFSqLJDqbvGOkycKJIBgGBoHALLgE4Ngy4r2/YF9A6boznaxWdP/ gAxf94nUZRSPTVlrHVfboPew18sZ2yLs2f3IDfypxaeIGp0MspfBGX9EA2GIALYLGuGXS+ fhxL4Oo8ObV1jXrf54lffV1Y4o0HGtTOfYvYJX0xpanGK6bhgks8vNfoXqw/9Aissk96PJ 8m7IvZYkKe5hKw9OdvZ2KW8+d4jduB0OuPt1m4TuD431AGao1WfXXV+nMXO9pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693848173; 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=wW62v8RgYu7eJGfL5t8aoTGmXtiZ0Dyld+26ovLoKqs=; b=a6+HFWstpzyi3RUYujnjual1lb6mwFSgUe04d6jFEUMjlcx4axyRAhEITePOZlAZLiFBDS YMm/O7JHQw7Aa0Bo2nJb/cz5ZIMM4f3UWQ2oVYKPH4udD5MGHFjLi59VQfqPd2jOBPkgSD E7YfNFSC4mdOBT/lM/BexcVpBsH9d/ps/KGy9kxk73BjpQDV+R7Pm1bgJ0e+x5Dtnk8ldH feXYDFFRmrxUoHRxAQCdaW0UG2n9wLXszksM54DHOxv7xujRi8cR1ydIgPx2xkM6iEI5N3 Iju/1niuVE8dlQNKyUqqss/NTK4/cX6SVkbQcKUqkmGDlejJjAzKHy907FAkzA== 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 4Rfb7J67qjz1F33; Mon, 4 Sep 2023 17:22:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384HMqvO079586; Mon, 4 Sep 2023 17:22:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384HMqC4079583; Mon, 4 Sep 2023 17:22:52 GMT (envelope-from git) Date: Mon, 4 Sep 2023 17:22:52 GMT Message-Id: <202309041722.384HMqC4079583@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: c3383035389f - main - misc/openhab: take runtime user into account, fix piddir handling 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: c3383035389f393897c1287ab1682afb3c0ffea3 Auto-Submitted: auto-generated The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/ports/commit/?id=c3383035389f393897c1287ab1682afb3c0ffea3 commit c3383035389f393897c1287ab1682afb3c0ffea3 Author: Alexander Leidinger AuthorDate: 2023-09-04 17:20:47 +0000 Commit: Alexander Leidinger CommitDate: 2023-09-04 17:22:49 +0000 misc/openhab: take runtime user into account, fix piddir handling The rc.d script lost the runtime user handling and the piddir was not set which caused warnings in the prestart routine. Noticed by: Martin ehk --- UPDATING | 11 +++++++++++ misc/openhab/Makefile | 2 +- misc/openhab/files/openhab.in | 6 +++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/UPDATING b/UPDATING index 7ded41161f91..24e99771a386 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,17 @@ 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. +20230904: + AUTHOR: netchild@FreeBSD.org + AFFECTS: users of misc/openhab + + The rc.d script of 4.0.2 had an error which didn't take the user to + run openhab into account. After installing the update and stopping + openhab run (for the default settings) + chown -R openhab:openhab /var/db/openhab/userdata /var/log/openhab + If you use other directories for the userdata and logs, you need to + adapt accordingly. + 20230822: AUTHOR: arrowd@FreeBSD.org AFFECTS: users of sysutils/polkit together with sysutils/consolekit2 diff --git a/misc/openhab/Makefile b/misc/openhab/Makefile index 4e2313d4e650..c33dd44857e6 100644 --- a/misc/openhab/Makefile +++ b/misc/openhab/Makefile @@ -1,6 +1,6 @@ PORTNAME= openhab PORTVERSION= 4.0.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= misc java MASTER_SITES= https://openhab.jfrog.io/artifactory/libs-release-local/org/openhab/distro/openhab/${PORTVERSION}/ DISTNAME= openhab-${PORTVERSION} diff --git a/misc/openhab/files/openhab.in b/misc/openhab/files/openhab.in index 5c2ce115c27e..7acec2be6e34 100644 --- a/misc/openhab/files/openhab.in +++ b/misc/openhab/files/openhab.in @@ -58,7 +58,7 @@ eval "_openhab_conf_dir=\${${name}_conf_dir:-'%%PREFIX%%/etc/openhab'}" eval "_openhab_runtime_dir=\${${name}_runtime_dir:-'%%PREFIX%%/libexec/openhab/runtime'}" eval "_openhab_userdata_dir=\${${name}_userdata_dir:-'/var/db/openhab/userdata'}" eval "_openhab_log_dir=\${${name}_log_dir:-'/var/log/openhab'}" -eval "_openhab_piddir=\${${name}_piddir}" +eval "_openhab_piddir=\${${name}_piddir:-/var/run/${name}}" eval "_openhab_java_opts=\${${name}_java_opts:-''}" @@ -78,12 +78,12 @@ export OPENHAB_LOGDIR="${_openhab_log_dir}" export LC_ALL=en_US.UTF-8 export JAVA_VERSION=17 -pidfile=/var/run/${name}/${name}.pid +pidfile=${_openhab_piddir}/${name}.pid start_precmd="openhab_prestart" command=/usr/sbin/daemon -command_args="-p ${pidfile} -c -t openhab ${OPENHAB_HOME}/start.sh server" +command_args="-u ${_openhab_user} -p ${pidfile} -c -t openhab ${OPENHAB_HOME}/start.sh server" openhab_prestart() { # Make sure we have our RUNDIR, even if it's on a tmpfs