From nobody Mon Jan 03 07:23:18 2022 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 EA131192AA20; Mon, 3 Jan 2022 07:23:18 +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 4JS6fZ4jwFz4SLB; Mon, 3 Jan 2022 07:23:18 +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 827C720EDA; Mon, 3 Jan 2022 07:23:18 +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 2037NI3W045177; Mon, 3 Jan 2022 07:23:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2037NINF045175; Mon, 3 Jan 2022 07:23:18 GMT (envelope-from git) Date: Mon, 3 Jan 2022 07:23:18 GMT Message-Id: <202201030723.2037NINF045175@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: b3d1562709b1 - 2022Q1 - audio/jamulus: Fix jamulus-server arguments 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: b3d1562709b1135f1792dc40b47af195622325bc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641194598; 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=gjI9Y+4az++lgelSxUqGeuqzUA6PwUMlhiGoViopvSg=; b=CCa/8DyCHwXArv6krTGabDuuM3oHB/UbxFknsljekCuui+UuXFUnlDOuoHwOjlwCngaIFn hoLqZfaZnVLDKe4gAOMQsiEMAuTG4/oP+yGP/TFHQP0oUN4SWtlNOPnQWK+JuD+ELpvEnm DHnCFr7lAUS/0I4lM2LH4I7dbAnk8hyq8x9BeNv4fyIPPQHf+OnT2r9Qsuz6m5D8rQX7J1 Xu6O/8lhCgiWFRIsREFrPv7X9hjv1nv6RlMxH+BeKykWCxk2HHIMe507+EUqaxRcb6utVb aSOCbn0RdwUR82x8FAPWpDg3BPBJpv53Nc8Uh8aGvbidMyr+DRER4DYJ4qaxxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641194598; a=rsa-sha256; cv=none; b=FS7JETImURNlZEPcgCBQKw+y0NMvNV8ZGY7bZc0RvVZH75mopXpBgoHxXGoQwQTUj3PoaG F2CFVd9qe1+tgECTGdhwZNG19NJ9WmHbTgDMukaKaoObfMlFWVmTeel33xtXMCooQyTgLW noflGTKDMFz30FZ4OMdyFFCy9D8dhnjszRNpG0MqaWllKRy5784MwaPYg2IYe9XYm7xaAv HxFjHrvf9f0OSXjF/g6/j9eI7Yz9xZbq/blYOuQq68d8pz2Zjp8Q2z8vmF/KIgGwPwS2P/ nO1XTHyJ/gymmgYj7yqO7xxAuQrpp9RBHhMfaTS0DdkaVHU+QKDkJsSOzuoZpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=b3d1562709b1135f1792dc40b47af195622325bc commit b3d1562709b1135f1792dc40b47af195622325bc Author: Yuri Victorovich AuthorDate: 2022-01-03 07:05:56 +0000 Commit: Yuri Victorovich CommitDate: 2022-01-03 07:23:10 +0000 audio/jamulus: Fix jamulus-server arguments * allow to override user name for the daemon with jamulus_server_uname * allow to set server arguments with jamulus_server_args PR: 260860 Reported by: Stefan Bethke (cherry picked from commit 5e56a22d7125752516dcbf1b89534d38de0bbb9a) --- audio/jamulus/Makefile | 1 + audio/jamulus/files/jamulus-server.in | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/audio/jamulus/Makefile b/audio/jamulus/Makefile index 750323eec68d..75e98cd1293e 100644 --- a/audio/jamulus/Makefile +++ b/audio/jamulus/Makefile @@ -1,6 +1,7 @@ PORTNAME= jamulus DISTVERSIONPREFIX= r DISTVERSION= 3_8_1 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= yuri@FreeBSD.org diff --git a/audio/jamulus/files/jamulus-server.in b/audio/jamulus/files/jamulus-server.in index 9ff0da5f678d..d1d135048e2c 100644 --- a/audio/jamulus/files/jamulus-server.in +++ b/audio/jamulus/files/jamulus-server.in @@ -5,9 +5,11 @@ # KEYWORD: shutdown # Add the following lines to /etc/rc.conf to enable jamulus_server: -# jamulus_server_enable : set to "YES" to enable the daemon, default is "NO" -# jamulus_server_flags : any extra flags, default is "" -# - list of all possible flags: https://jamulus.io/wiki/Command-Line-Options +# jamulus_server_enable : set to "YES" to enable the daemon, default is "NO" +# jamulus_server_uname : user to run jamulus-server as, default is "%%USER%%" +# jamulus_server_flags : extra flags to pass to daemon(8), default is "" +# jamulus_server_args : any arguments to pass to jamulus-server, default is "" +# - list of all possible arguments: https://jamulus.io/wiki/Command-Line-Options . /etc/rc.subr @@ -17,12 +19,14 @@ rcvar=jamulus_server_enable load_rc_config $name jamulus_server_enable=${jamulus_server_enable:-"NO"} +jamulus_server_uname=${jamulus_server_uname:-"%%USER%%"} jamulus_server_flags=${jamulus_server_flags:-""} +jamulus_server_args=${jamulus_server_args:-""} logfile="/var/log/${name}.log" procname=%%PREFIX%%/bin/jamulus-server command="/usr/sbin/daemon" -command_args="-u %%USER%% -o ${logfile} -t ${name} %%PREFIX%%/bin/jamulus-server -s ${jamulus_server_flags}" +command_args="-u ${jamulus_server_uname} -o ${logfile} -t ${name} %%PREFIX%%/bin/jamulus-server -s ${jamulus_server_args}" run_rc_command "$1"