From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 19 15:40:03 2009 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 2933B1065690 for ; Wed, 19 Aug 2009 15:40:03 +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 052F38FC68 for ; Wed, 19 Aug 2009 15:40:03 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n7JFe1X3005621 for ; Wed, 19 Aug 2009 15:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n7JFe1R4005620; Wed, 19 Aug 2009 15:40:01 GMT (envelope-from gnats) Resent-Date: Wed, 19 Aug 2009 15:40:01 GMT Resent-Message-Id: <200908191540.n7JFe1R4005620@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, Sevan Janiyan Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE3811065690 for ; Wed, 19 Aug 2009 15:36:30 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id C28DB8FC45 for ; Wed, 19 Aug 2009 15:36:30 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n7JFaUTu093729 for ; Wed, 19 Aug 2009 15:36:30 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n7JFaUZu093728; Wed, 19 Aug 2009 15:36:30 GMT (envelope-from nobody) Message-Id: <200908191536.n7JFaUZu093728@www.freebsd.org> Date: Wed, 19 Aug 2009 15:36:30 GMT From: Sevan Janiyan To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/137967: update to net-mgmt/chillispot rc script X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Aug 2009 15:40:03 -0000 >Number: 137967 >Category: ports >Synopsis: update to net-mgmt/chillispot rc script >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Aug 19 15:40:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Sevan Janiyan >Release: 8-BETA2 >Organization: >Environment: >Description: drop the .sh extension from the chillispot rc script update the rc script so that it's simplified remove ipfilter from the BEFORE statement in the rc script so that chillispot now starts correctly during boot. use the current correct way to stop chillispot during uninstall. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN net-mgmt/chillispot.orig/Makefile net-mgmt/chillispot/Makefile --- net-mgmt/chillispot.orig/Makefile 2009-08-19 16:15:34.000000000 +0100 +++ net-mgmt/chillispot/Makefile 2009-08-19 18:20:00.000000000 +0100 @@ -7,7 +7,7 @@ PORTNAME= chillispot PORTVERSION= 1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt MASTER_SITES= http://www.chillispot.info/download/ \ http://www.geeklan.co.uk/files/ \ @@ -20,7 +20,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS=-sysconfdir=${PREFIX}/etc -USE_RC_SUBR= chillispot.sh +USE_RC_SUBR= chillispot SUB_FILES= pkg-message MAN8= chilli.8 diff -urN net-mgmt/chillispot.orig/files/chillispot.in net-mgmt/chillispot/files/chillispot.in --- net-mgmt/chillispot.orig/files/chillispot.in 1970-01-01 01:00:00.000000000 +0100 +++ net-mgmt/chillispot/files/chillispot.in 2009-08-19 18:11:13.000000000 +0100 @@ -0,0 +1,21 @@ +#!/bin/sh + +# PROVIDE: chillispot +# REQUIRE: netif +# BEFORE: pf ipfw +# KEYWORD: nojail + +. %%RC_SUBR%% + +name="chillispot" +rcvar=${name}_enable + +command="%%PREFIX%%/sbin/chilli" +pidfile=/var/run/chilli.pid + +load_rc_config $name + +: ${chillispot_enable="NO"} +: ${chillispot_flags="--conf=/usr/local/etc/chilli.conf"} + +run_rc_command "$1" diff -urN net-mgmt/chillispot.orig/files/chillispot.sh.in net-mgmt/chillispot/files/chillispot.sh.in --- net-mgmt/chillispot.orig/files/chillispot.sh.in 2009-08-19 16:15:34.000000000 +0100 +++ net-mgmt/chillispot/files/chillispot.sh.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -#!/bin/sh - -# PROVIDE: chillispot -# REQUIRE: netif -# BEFORE: pf ipfw ipfilter -# KEYWORD: nojail - -. /etc/rc.subr - -chillispot_enable=${chillispot_enable-"NO"} -chillispot_flags=${chillispot_flags-"--conf=/usr/local/etc/chilli.conf"} -chillispot_pidfile=${utility_pidfile-"/var/run/chilli.pid"} - -. /etc/rc.subr - -name="chillispot" -rcvar=`set_rcvar` -command="/usr/local/sbin/chilli" - -load_rc_config $name - -pidfile="${chillipot_pidfile}" - -start_cmd="echo \"Starting ${name}.\"; /usr/bin/nice -5 ${command} ${chillispot_flags} ${command_args}" - -run_rc_command "$1" diff -urN net-mgmt/chillispot.orig/pkg-plist net-mgmt/chillispot/pkg-plist --- net-mgmt/chillispot.orig/pkg-plist 2009-08-19 16:15:34.000000000 +0100 +++ net-mgmt/chillispot/pkg-plist 2009-08-19 18:29:30.000000000 +0100 @@ -1,4 +1,4 @@ -@unexec %D/etc/rc.d/chillispot forcestop 2>/dev/null || true +@stopdaemon chillispot sbin/chilli %%PORTDATA%%%%DATADIR%%/chilli.conf.sample %%PORTDATA%%%%DATADIR%%/dictionary.chillispot >Release-Note: >Audit-Trail: >Unformatted: