From sean@mat.tgd.net  Mon Apr 22 18:52:12 2002
Return-Path: <sean@mat.tgd.net>
Received: from mail.tgd.net (mail.tgd.net [209.81.25.10])
	by hub.freebsd.org (Postfix) with ESMTP id 9661137B41A
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 22 Apr 2002 18:52:11 -0700 (PDT)
Received: from mat.tgd.net (mat.tgd.net [64.81.67.116])
	by mail.tgd.net (Postfix) with ESMTP id 42DFE20F07
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 22 Apr 2002 11:18:33 -0700 (PDT)
Received: by perrin.tgd.net (Postfix, from userid 1000)
	id 17A2E2EDD18; Mon, 22 Apr 2002 11:18:32 -0700 (PDT)
Message-Id: <20020422181832.17A2E2EDD18@mat.tgd.net>
Date: Mon, 22 Apr 2002 11:18:32 -0700 (PDT)
From: Sean Chittenden <sean@chittenden.org>
Reply-To: Sean Chittenden <sean@chittenden.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Maintainer Update: net/jabber
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         37363
>Category:       ports
>Synopsis:       Maintainer Update: net/jabber
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 22 19:00:02 PDT 2002
>Closed-Date:    Fri Apr 26 11:52:32 PDT 2002
>Last-Modified:  Fri Apr 26 11:52:32 PDT 2002
>Originator:     Sean Chittenden
>Release:        FreeBSD 4.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD mat.tgd.net 4.5-STABLE FreeBSD 4.5-STABLE #3: Sat Apr 13 12:49:18 PDT 2002 sean@mat.tgd.net:/usr/obj/usr/src/sys/MAT i386


	
>Description:
	jabberd requires a SIGKILL instead of a SIGTERM to die.  Attached
	patch fixes this along with removing a redundant log file.

	Pointed out by Neil Darlow.
>How-To-Repeat:
	
>Fix:


Index: net/jabber/pkg-deinstall
===================================================================
RCS file: /home/ncvs/ports/net/jabber/pkg-deinstall,v
retrieving revision 1.2
diff -u -r1.2 pkg-deinstall
--- net/jabber/pkg-deinstall	2001/02/12 19:44:37	1.2
+++ net/jabber/pkg-deinstall	2002/04/22 17:54:39
@@ -55,17 +55,17 @@
 
 export PATH=/bin:/usr/bin:/usr/sbin
 
-user=jabber
-group=jabber
+USER=jabber
+GROUP=jabber
 
 if ps -axc | grep -q jabberd; then
     if yesno "There are some jabberd processes running.  Shall I kill them" y
     then
-	killall jabberd
+	killall -SIGKILL -u ${USER} jabberd
 	sleep 2
     else
 	echo "OK ... I hope you know what you are doing."
     fi
 fi
 
-delete_account ${user} ${group}
+delete_account ${USER} ${GROUP}
Index: net/jabber/pkg-install
===================================================================
RCS file: /home/ncvs/ports/net/jabber/pkg-install,v
retrieving revision 1.3
diff -u -r1.3 pkg-install
--- net/jabber/pkg-install	2001/02/12 19:44:37	1.3
+++ net/jabber/pkg-install	2002/04/22 17:54:39
@@ -133,11 +133,6 @@
     chown root:${group} ${etcdir}/jabber.xml ${etcdir}/jabber.xml.sample
     chmod 640 ${etcdir}/jabber.xml ${etcdir}/jabber.xml.sample
 
-    if [ ! -f /var/log/jabber.log ]; then
-	echo "Creating \"/var/log/jabber.log\"."
-	cp /dev/null /var/log/jabber.log
-    fi
-
     if [ ! -f /var/log/jabber.error ]; then
 	echo "Creating \"/var/log/jabber.error\"."
 	cp /dev/null /var/log/jabber.error
@@ -149,8 +144,8 @@
     fi
 
     echo "Fixing log files ownerships and modes."
-    chown ${user}:${group} /var/log/jabber.log /var/log/jabber.error /var/log/jabber.record
-    chmod 640 /var/log/jabber.log /var/log/jabber.error /var/log/jabber.record
+    chown ${user}:${group} /var/log/jabber.error /var/log/jabber.record
+    chmod 640 /var/log/jabber.error /var/log/jabber.record
 
     ;;
 esac
Index: net/jabber/files/jabberd.sh
===================================================================
RCS file: /home/ncvs/ports/net/jabber/files/jabberd.sh,v
retrieving revision 1.5
diff -u -r1.5 jabberd.sh
--- net/jabber/files/jabberd.sh	2002/04/18 16:12:04	1.5
+++ net/jabber/files/jabberd.sh	2002/04/22 17:54:39
@@ -7,7 +7,6 @@
 
 USER="jabber"
 RUNDIR="/var/tmp"
-LOG="/var/log/jabber.log"
 HOSTNAME=`/bin/hostname`
 
 test -x ${PREFIX}/sbin/jabberd || exit 1
@@ -20,9 +19,9 @@
 
 case ${1:-start} in
 start)
-    su -f -m ${USER} -c "jabberd -h ${HOSTNAME} -c ${PREFIX}/etc/jabber.xml" >${LOG} 2>&1 &;;
+    su -f -m ${USER} -c "jabberd -B -h ${HOSTNAME} -c ${PREFIX}/etc/jabber.xml" ;;
 
 stop)
-    killall jabberd;
+    killall -SIGKILL -u ${USER} jabberd;
     rm -f ${RUNDIR}/jabber.pid;
 esac
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: dwcjr 
State-Changed-When: Fri Apr 26 11:52:20 PDT 2002 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=37363 
>Unformatted:
