Date: Wed, 19 Aug 2009 15:36:30 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/137967: update to net-mgmt/chillispot rc script Message-ID: <200908191536.n7JFaUZu093728@www.freebsd.org> Resent-Message-ID: <200908191540.n7JFe1R4005620@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908191536.n7JFaUZu093728>