Date: Fri, 21 Nov 2014 17:39:29 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r373005 - in branches/2014Q4/net: asterisk asterisk/files asterisk11 asterisk11/files Message-ID: <201411211739.sALHdTZs061897@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Fri Nov 21 17:39:28 2014 New Revision: 373005 URL: https://svnweb.freebsd.org/changeset/ports/373005 QAT: https://qat.redports.org/buildarchive/r373005/ Log: MFH: r372448 - Update net/asterisk to 1.8.32.0 - Update net/asterisk11 to 11.14.0 - Allow customizing startup options used by rc script [1] - While here, fix some rclint warnings Reported/Requested by: Emmanuel Coulon <silicium at orange.fr> [1] Approved by: ports-secteam (rea) Modified: branches/2014Q4/net/asterisk/Makefile branches/2014Q4/net/asterisk/distinfo branches/2014Q4/net/asterisk/files/asterisk.in branches/2014Q4/net/asterisk11/Makefile branches/2014Q4/net/asterisk11/distinfo branches/2014Q4/net/asterisk11/files/asterisk.in Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/net/asterisk/Makefile ============================================================================== --- branches/2014Q4/net/asterisk/Makefile Fri Nov 21 17:22:06 2014 (r373004) +++ branches/2014Q4/net/asterisk/Makefile Fri Nov 21 17:39:28 2014 (r373005) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 1.8.31.1 +PORTVERSION= 1.8.32.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ Modified: branches/2014Q4/net/asterisk/distinfo ============================================================================== --- branches/2014Q4/net/asterisk/distinfo Fri Nov 21 17:22:06 2014 (r373004) +++ branches/2014Q4/net/asterisk/distinfo Fri Nov 21 17:39:28 2014 (r373005) @@ -1,2 +1,2 @@ -SHA256 (asterisk-1.8.31.1.tar.gz) = 430e095e937a29ec13e58c2cab6b8299caec5bbe7a6af0f396a9f29fbc926e7d -SIZE (asterisk-1.8.31.1.tar.gz) = 29630590 +SHA256 (asterisk-1.8.32.0.tar.gz) = 37dee258431baf3ef726fb89f5d590b3e5498654f5080afed649697a0a227a8f +SIZE (asterisk-1.8.32.0.tar.gz) = 29639709 Modified: branches/2014Q4/net/asterisk/files/asterisk.in ============================================================================== --- branches/2014Q4/net/asterisk/files/asterisk.in Fri Nov 21 17:22:06 2014 (r373004) +++ branches/2014Q4/net/asterisk/files/asterisk.in Fri Nov 21 17:39:28 2014 (r373005) @@ -9,35 +9,48 @@ # # Add the following lines to /etc/rc.conf to enable asterisk: # -# asterisk_enable="YES" +# asterisk_enable (bool): Set it to "YES" to enable asterisk +# Default is "NO" +# asterisk_user (string): User asterisk runs as +# Default is %%ASTERISK_USER%% +# asterisk_args (string): Extra argumeents to pass to asterisk at startup +# Default is "-n" +# asterisk_pidfile (string): Location of the asterisk pid file +# Default is /var/run/asterisk/asterisk.pid # . /etc/rc.subr name=asterisk rcvar=asterisk_enable +desc="Asterisk PBX server" -extra_commands="reload" +load_rc_config $name + +: ${asterisk_enable:=NO} +: ${asterisk_user:=%%ASTERISK_USER%%} +: ${asterisk_args=-n} +: ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid} + +extra_commands=reload -stop_cmd="asterisk_stop" -reload_cmd="asterisk_reload" +stop_cmd=asterisk_stop +reload_cmd=asterisk_reload command="%%PREFIX%%/sbin/asterisk" -command_args="-n -F -U %%ASTERISK_USER%%" -pidfile=${asterisk_pidfile:-"/var/run/asterisk/asterisk.pid"} +command_args="${asterisk_args} -F -U ${asterisk_user}" +pidfile=${asterisk_pidfile} -asterisk_stop() { - echo 'Stopping asterisk' - $command -nqrx 'core stop now' +asterisk_stop() +{ + echo 'Stopping asterisk' + $command -nqrx 'core stop now' } -asterisk_reload() { - echo 'Reloading asterisk' - $command -nqrx 'reload' +asterisk_reload() +{ + echo 'Reloading asterisk' + $command -nqrx 'reload' } -load_rc_config $name - -asterisk_enable=${asterisk_enable:-"NO"} - run_rc_command "$1" Modified: branches/2014Q4/net/asterisk11/Makefile ============================================================================== --- branches/2014Q4/net/asterisk11/Makefile Fri Nov 21 17:22:06 2014 (r373004) +++ branches/2014Q4/net/asterisk11/Makefile Fri Nov 21 17:39:28 2014 (r373005) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 11.13.1 +PORTVERSION= 11.14.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ Modified: branches/2014Q4/net/asterisk11/distinfo ============================================================================== --- branches/2014Q4/net/asterisk11/distinfo Fri Nov 21 17:22:06 2014 (r373004) +++ branches/2014Q4/net/asterisk11/distinfo Fri Nov 21 17:39:28 2014 (r373005) @@ -1,2 +1,2 @@ -SHA256 (asterisk-11.13.1.tar.gz) = 382e914f3025f746d3a36cd218bc35f6a0f335b58226f35eaf4cc664b228d351 -SIZE (asterisk-11.13.1.tar.gz) = 34959077 +SHA256 (asterisk-11.14.0.tar.gz) = ad4710aba7f21c75bf1d16159a349034a04d3d36895243c262059a89f892098a +SIZE (asterisk-11.14.0.tar.gz) = 34975152 Modified: branches/2014Q4/net/asterisk11/files/asterisk.in ============================================================================== --- branches/2014Q4/net/asterisk11/files/asterisk.in Fri Nov 21 17:22:06 2014 (r373004) +++ branches/2014Q4/net/asterisk11/files/asterisk.in Fri Nov 21 17:39:28 2014 (r373005) @@ -9,35 +9,48 @@ # # Add the following lines to /etc/rc.conf to enable asterisk: # -# asterisk_enable="YES" +# asterisk_enable (bool): Set it to "YES" to enable asterisk +# Default is "NO" +# asterisk_user (string): User asterisk runs as +# Default is %%ASTERISK_USER%% +# asterisk_args (string): Extra argumeents to pass to asterisk at startup +# Default is "-n" +# asterisk_pidfile (string): Location of the asterisk pid file +# Default is /var/run/asterisk/asterisk.pid # . /etc/rc.subr name=asterisk rcvar=asterisk_enable +desc="Asterisk PBX server" -extra_commands="reload" +load_rc_config $name + +: ${asterisk_enable:=NO} +: ${asterisk_user:=%%ASTERISK_USER%%} +: ${asterisk_args=-n} +: ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid} + +extra_commands=reload -stop_cmd="asterisk_stop" -reload_cmd="asterisk_reload" +stop_cmd=asterisk_stop +reload_cmd=asterisk_reload command="%%PREFIX%%/sbin/asterisk" -command_args="-n -F -U %%ASTERISK_USER%%" -pidfile=${asterisk_pidfile:-"/var/run/asterisk/asterisk.pid"} +command_args="${asterisk_args} -F -U ${asterisk_user}" +pidfile=${asterisk_pidfile} -asterisk_stop() { - echo 'Stopping asterisk' - $command -nqrx 'core stop now' +asterisk_stop() +{ + echo 'Stopping asterisk' + $command -nqrx 'core stop now' } -asterisk_reload() { - echo 'Reloading asterisk' - $command -nqrx 'reload' +asterisk_reload() +{ + echo 'Reloading asterisk' + $command -nqrx 'reload' } -load_rc_config $name - -asterisk_enable=${asterisk_enable:-"NO"} - run_rc_command "$1"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411211739.sALHdTZs061897>