From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jan 14 20:00:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 72B9148E for ; Mon, 14 Jan 2013 20:00:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 43DD775D for ; Mon, 14 Jan 2013 20:00:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r0EK0182085435 for ; Mon, 14 Jan 2013 20:00:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0EK01nM085434; Mon, 14 Jan 2013 20:00:01 GMT (envelope-from gnats) Resent-Date: Mon, 14 Jan 2013 20:00:01 GMT Resent-Message-Id: <201301142000.r0EK01nM085434@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Mark Felder Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E5612234 for ; Mon, 14 Jan 2013 19:53:28 +0000 (UTC) (envelope-from feld@feld.me) Received: from feld.me (feld.me [66.170.3.2]) by mx1.freebsd.org (Postfix) with ESMTP id C8701722 for ; Mon, 14 Jan 2013 19:53:28 +0000 (UTC) Received: from feld by feld.me with local (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1Tuq61-0008Oc-Mf for FreeBSD-gnats-submit@freebsd.org; Mon, 14 Jan 2013 13:53:25 -0600 Message-Id: Date: Mon, 14 Jan 2013 13:53:25 -0600 From: Mark Felder To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/175305: [PATCH] net/freeswitch-core-devel: [SUMMARIZE CHANGES] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2013 20:00:01 -0000 >Number: 175305 >Category: ports >Synopsis: [PATCH] net/freeswitch-core-devel: [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jan 14 20:00:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: feld >Release: FreeBSD 9.1-RELEASE amd64 >Organization: >Environment: System: FreeBSD mwi1.coffeenet.org 9.1-RELEASE FreeBSD 9.1-RELEASE #6 r243808: Mon Dec 3 07:51:34 >Description: remove stupid sleep, make the "sofia recover" only run if you've set freeswitch_cluster so it doesn't break the ability to start the daemon. Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: suffix) >How-To-Repeat: >Fix: --- freeswitch-core-devel-1.2.3.patch begins here --- diff -ruN --exclude=CVS ../freeswitch-core-devel.orig/files/freeswitch.in ./files/freeswitch.in --- ../freeswitch-core-devel.orig/files/freeswitch.in 2013-01-14 13:22:07.000000000 -0600 +++ ./files/freeswitch.in 2013-01-14 13:51:20.041361307 -0600 @@ -19,10 +19,11 @@ load_rc_config $name -: ${freeswitch_enable="NO"} -: ${freeswitch_user="freeswitch"} -: ${freeswitch_group="freeswitch"} -: ${freeswitch_flags="-nc -waste"} +: ${freeswitch_enable=NO} +: ${freeswitch_cluster=NO} +: ${freeswitch_user=freeswitch} +: ${freeswitch_group=freeswitch} +: ${freeswitch_flags=-nc -waste} command=%%PREFIX%%/bin/freeswitch command_args="-u ${freeswitch_user} -g ${freeswitch_group}" @@ -42,8 +43,10 @@ freeswitch_prestart () { install -d -o ${freeswitch_user} -m755 /var/run/${name} - sleep 7.7 - %%PREFIX%%/bin/fs_cli -x "sofia recover" + + if checkyesno freeswitch_cluster; then + %%PREFIX%%/bin/fs_cli -x "sofia recover" + fi } run_rc_command "$1" --- freeswitch-core-devel-1.2.3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: