From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 30 10:20:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E82A106564A for ; Wed, 30 Apr 2008 10:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6EFE18FC37 for ; Wed, 30 Apr 2008 10:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m3UAK2ai017347 for ; Wed, 30 Apr 2008 10:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m3UAK2P2017346; Wed, 30 Apr 2008 10:20:02 GMT (envelope-from gnats) Resent-Date: Wed, 30 Apr 2008 10:20:02 GMT Resent-Message-Id: <200804301020.m3UAK2P2017346@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, Ruben van Staveren Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1D4E310656B6 for ; Wed, 30 Apr 2008 10:18:16 +0000 (UTC) (envelope-from ruben@helium.verweg.com) Received: from helium.verweg.com (tunnel41.ipv6.xs4all.nl [IPv6:2001:888:10:29::2]) by mx1.freebsd.org (Postfix) with ESMTP id 885648FC22 for ; Wed, 30 Apr 2008 10:18:15 +0000 (UTC) (envelope-from ruben@helium.verweg.com) Received: from helium.verweg.com (ruben@localhost.verweg.com [127.0.0.1]) by helium.verweg.com (8.14.2/8.14.1) with ESMTP id m3UAI92e007782 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Wed, 30 Apr 2008 12:18:14 +0200 (CEST) (envelope-from ruben@helium.verweg.com) Received: (from ruben@localhost) by helium.verweg.com (8.14.2/8.14.1/Submit) id m3UAI9Ft007781; Wed, 30 Apr 2008 12:18:09 +0200 (CEST) (envelope-from ruben) Message-Id: <200804301018.m3UAI9Ft007781@helium.verweg.com> Date: Wed, 30 Apr 2008 12:18:09 +0200 (CEST) From: Ruben van Staveren To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/123254: let mu-conference honour different pid file location X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Ruben van Staveren List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Apr 2008 10:20:02 -0000 >Number: 123254 >Category: ports >Synopsis: let mu-conference honour different pid file location >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: Wed Apr 30 10:20:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Ruben van Staveren >Release: FreeBSD 7.0-STABLE i386 >Organization: >Environment: System: FreeBSD helium.verweg.com 7.0-STABLE FreeBSD 7.0-STABLE #21: Tue Apr 22 12:41:05 CEST 2008 root@helium.verweg.com:/usr/obj/usr/cvsup/7-stable/src/sys/HELIUM-SMP i386 >Description: etc/rc.d/mu-conference sets pidfile before the rc.d configuration is read, making it a non operation >How-To-Repeat: set pidfile location in rc.conf and see that it is not honoured >Fix: move pidfile stuff after rc configuration loading diff -Nur mu-conference.orig/files/mu-conference.in mu-conference/files/mu-conference.in --- mu-conference.orig/files/mu-conference.in 2008-04-30 11:20:23.000000000 +0200 +++ mu-conference/files/mu-conference.in 2008-04-30 11:21:24.000000000 +0200 @@ -25,7 +25,6 @@ rcvar=`set_rcvar` command="%%PREFIX%%/bin/mu-conference" -pidfile=${mu_conference_pidfile:-"%%JABBER_PIDDIR%%/mu-conference.pid"} stop_postcmd="mu_conference_stop_post" @@ -38,7 +37,9 @@ : ${mu_conference_config="%%PREFIX%%/etc/muc.xml"} : ${mu_conference_enable="NO"} : ${mu_conference_user="%%JABBER_USER%%"} +: ${mu_conference_pidfile="%%JABBER_PIDDIR%%/mu-conference.pid"} +pidfile=${mu_conference_pidfile} command_args="-c ${mu_conference_config} -B >/dev/null 2>&1" run_rc_command "$1" >Release-Note: >Audit-Trail: >Unformatted: