From root+buttercup3@utdallas.edu  Sun Jan 14 01:07:58 2007
Return-Path: <root+buttercup3@utdallas.edu>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7EBDA16A415
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 14 Jan 2007 01:07:58 +0000 (UTC)
	(envelope-from root+buttercup3@utdallas.edu)
Received: from smtp2.utdallas.edu (smtp2.utdallas.edu [129.110.10.33])
	by mx1.freebsd.org (Postfix) with ESMTP id 6267713C428
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 14 Jan 2007 01:07:58 +0000 (UTC)
	(envelope-from root+buttercup3@utdallas.edu)
Received: from buttercup3.utdallas.edu (buttercup3.utdallas.edu [10.110.4.93])
	by smtp2.utdallas.edu (Postfix) with ESMTP id A43B15C176
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 13 Jan 2007 18:42:32 -0600 (CST)
Received: by buttercup3.utdallas.edu (Postfix, from userid 0)
	id 19CF520581B; Sun, 14 Jan 2007 00:46:30 +0000 (UTC)
Message-Id: <20070114004630.19CF520581B@buttercup3.utdallas.edu>
Date: Sun, 14 Jan 2007 00:46:30 +0000 (UTC)
From: Paul Schmehl <pauls@utdallas.edu>
Reply-To: Paul Schmehl <pauls@utdallas.edu>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: security/sguil-sensor, correct init script error
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         107894
>Category:       ports
>Synopsis:       security/sguil-sensor, correct init script error
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    bsam
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 14 01:10:16 GMT 2007
>Closed-Date:    Tue Jan 16 12:46:46 GMT 2007
>Last-Modified:  Tue Jan 16 12:50:21 GMT 2007
>Originator:     Paul Schmehl
>Release:        FreeBSD 6.0-RELEASE-p15 amd64
>Organization:
The University of Texas at Dallas
>Environment:
System: FreeBSD hostname.utdallas.edu 6.0-RELEASE-p15 FreeBSD 6.0-RELEASE-p15 #2: Mon Oct 16 21:28:21 UTC 2006 root@hostname.utdallas.edu:/usr/obj/usr/src/sys/SMPKERNEL amd64


	
>Description:
	The init script will not start the daemon if the security/sguil-server
	port is installed on the same server and is already running.  Although
	this is not the recommended procedure for running sguil, some are running
	it that way.  This patch corrects the problem in conjunction with a patch
	being submitted at the same time for security/sguil-server.
>How-To-Repeat:
	
>Fix:

	

--- patch-sensor_agent.sh.in begins here ---
--- sensor_agent.sh.in.orig	Sun Jan 14 00:27:19 2007
+++ sensor_agent.sh.in	Sun Jan 14 00:32:08 2007
@@ -20,27 +20,14 @@
 rcvar=`set_rcvar`
 command="%%PREFIX%%/bin/%%SGUILDIR%%/sensor_agent.tcl"
 procname="%%PREFIX%%/bin/tclsh8.4"
-check_process="${command} /bin/sh"
-stop_cmd="sensor_agent_stop"
+pidfile="/var/run/${name}.pid"
+check_pidfile="${pidfile} ${procname} /bin/sh"
 
 [ -z "$sensor_agent_enable" ]    && sensor_agent_enable="NO"
 [ -z "$sensor_agent_conf" ]      && sensor_agent_conf="%%PREFIX%%/etc/sensor_agent.conf"
 [ -z "$sensor_agent_flags" ]     && sensor_agent_flags="-D"
 
 [ -n "$sensor_agent_conf" ]      && sensor_agent_flags="$sensor_agent_flags -c $sensor_agent_conf"
-
-sensor_agent_stop() {
-  if [ -z "${rc_pid}" ]; then
-    echo "${name} not running?"
-  else
-    echo "Stopping ${name}"
-    kill ${sig_stop} ${rc_pid}
-    wait_for_pids ${rc_pid}
-    if [ -f "/var/run/${name}.pid" ]; then
-      `rm -f /var/run/${name}.pid`
-    fi
-  fi
-}
 
 load_rc_config $name
 run_rc_command "$1"
--- patch-sensor_agent.sh.in ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->bsam 
Responsible-Changed-By: bsam 
Responsible-Changed-When: Tue Jan 16 11:33:33 UTC 2007 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=107894 
State-Changed-From-To: open->closed 
State-Changed-By: bsam 
State-Changed-When: Tue Jan 16 12:46:00 UTC 2007 
State-Changed-Why:  
Committed, thanks! 
(PORTREVISION was bumpted) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=107894 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/107894: commit references a PR
Date: Tue, 16 Jan 2007 12:45:22 +0000 (UTC)

 bsam        2007-01-16 12:45:12 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/sguil-sensor Makefile 
     security/sguil-sensor/files sensor_agent.sh.in 
     security/sguil-server Makefile 
     security/sguil-server/files sguild.sh.in 
   Log:
   . correct init scripts,  [1] [2]
   . bump PORTREVISIONs.
   
   PR:             107894 [1], 107895 [2]
   Submitted by:   Paul Schmehl <pauls at utdallas.edu> (maintainer) [1], [2]
   
   Revision  Changes    Path
   1.4       +1 -0      ports/security/sguil-sensor/Makefile
   1.2       +2 -15     ports/security/sguil-sensor/files/sensor_agent.sh.in
   1.4       +1 -0      ports/security/sguil-server/Makefile
   1.2       +2 -15     ports/security/sguil-server/files/sguild.sh.in
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
