From owner-svn-ports-all@freebsd.org Mon Sep 14 16:28:43 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0DB9E3DB6C5; Mon, 14 Sep 2020 16:28:43 +0000 (UTC) (envelope-from madpilot@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BqsHZ6bLDz3gFd; Mon, 14 Sep 2020 16:28:42 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C609D198F1; Mon, 14 Sep 2020 16:28:42 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08EGSgX7055231; Mon, 14 Sep 2020 16:28:42 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08EGSgKA055229; Mon, 14 Sep 2020 16:28:42 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <202009141628.08EGSgKA055229@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 14 Sep 2020 16:28:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548625 - in head/net/asterisk13: . files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head/net/asterisk13: . files X-SVN-Commit-Revision: 548625 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Sep 2020 16:28:43 -0000 Author: madpilot Date: Mon Sep 14 16:28:42 2020 New Revision: 548625 URL: https://svnweb.freebsd.org/changeset/ports/548625 Log: Add to support for configurable umask to asterisk startup script. PR: 249177 Submitted by: mickey242@gmx.net Modified: head/net/asterisk13/Makefile head/net/asterisk13/files/asterisk.in Modified: head/net/asterisk13/Makefile ============================================================================== --- head/net/asterisk13/Makefile Mon Sep 14 16:15:44 2020 (r548624) +++ head/net/asterisk13/Makefile Mon Sep 14 16:28:42 2020 (r548625) @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 13.36.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ Modified: head/net/asterisk13/files/asterisk.in ============================================================================== --- head/net/asterisk13/files/asterisk.in Mon Sep 14 16:15:44 2020 (r548624) +++ head/net/asterisk13/files/asterisk.in Mon Sep 14 16:28:42 2020 (r548625) @@ -19,6 +19,7 @@ # Default is /var/run/asterisk/asterisk.pid # asterisk_stopsleep (int): Number of seconds to sleep before sending stop command # Default is 0, which disables it +# asterisk_umask (string): File creation mode mask to run asterisk with # . /etc/rc.subr @@ -27,14 +28,6 @@ name=asterisk rcvar=asterisk_enable desc="Asterisk PBX server" -load_rc_config $name - -: ${asterisk_enable:=NO} -: ${asterisk_user:=%%ASTERISK_USER%%} -: ${asterisk_args=-n} -: ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid} -: ${asterisk_stopsleep:=0} - extra_commands=reload start_precmd=asterisk_precmd @@ -42,8 +35,6 @@ stop_cmd=asterisk_stop reload_cmd=asterisk_reload command="%%PREFIX%%/sbin/asterisk" -command_args="${asterisk_args} -F -U ${asterisk_user}" -pidfile=${asterisk_pidfile} asterisk_precmd() { @@ -51,6 +42,9 @@ asterisk_precmd() if [ ! -d $rundir ] ; then install -d -m 0755 -o asterisk -g asterisk $rundir fi + if [ -n "${asterisk_umask}" ]; then + umask ${asterisk_umask} + fi } asterisk_stop() @@ -77,5 +71,16 @@ asterisk_reload() echo 'Reloading asterisk.' $command -nqrx 'reload' } + +load_rc_config $name + +: ${asterisk_enable:=NO} +: ${asterisk_user:=%%ASTERISK_USER%%} +: ${asterisk_args=-n} +: ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid} +: ${asterisk_stopsleep:=0} + +command_args="${asterisk_args} -F -U ${asterisk_user}" +pidfile=${asterisk_pidfile} run_rc_command "$1"