From nobody@FreeBSD.org  Sun Apr  3 15:28:45 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 387721065740
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  3 Apr 2011 15:28:45 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D3F58FC15
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  3 Apr 2011 15:28:45 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p33FSiNw085696
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 3 Apr 2011 15:28:44 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p33FSiO3085693;
	Sun, 3 Apr 2011 15:28:44 GMT
	(envelope-from nobody)
Message-Id: <201104031528.p33FSiO3085693@red.freebsd.org>
Date: Sun, 3 Apr 2011 15:28:44 GMT
From: Alexey Illarionov <littlesavage@rambler.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] graphics/geoserver start script conflicts with net-im/openfire
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         156154
>Category:       ports
>Synopsis:       [patch] graphics/geoserver start script conflicts with net-im/openfire
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    avl
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 03 15:30:16 UTC 2011
>Closed-Date:    Mon Jun 27 02:16:26 UTC 2011
>Last-Modified:  Mon Jun 27 02:20:04 UTC 2011
>Originator:     Alexey Illarionov
>Release:        8.1
>Organization:
>Environment:
>Description:
geoserver-2.0.2
openfire-3.6.4

Can not run geoserver when openfire is running:

# /usr/local/etc/rc.d/openfire status
openfire is running as pid 1601
# /usr/local/etc/rc.d/geoserver status
geoserver is running as pid 1601.
# ps dww 1601
  PID  TT  STAT      TIME COMMAND
 1601  ??  SsJ    4:32,47 /usr/local/diablo-jdk1.6.0/bin/java -server -jar -Xmx256M -Dopenfire.lib.dir=/usr/local/share/java/classes -DopenfireHome=/usr/local/share/java/openfire /usr/local/share/java/classes/startup.jar

# /usr/local/etc/rc.d/geoserver start
geoserver already running? (pid=1601).
# /usr/local/etc/rc.d/geoserver stop
Stopping geoserver.
Waiting for PIDS: 1601.
# /usr/local/etc/rc.d/openfire status
openfire not running? (check /var/run/openfire.pid).

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN graphics/geoserver.orig/Makefile graphics/geoserver/Makefile
--- graphics/geoserver.orig/Makefile	2011-04-03 15:05:25.000000000 +0400
+++ graphics/geoserver/Makefile	2011-04-03 15:08:03.000000000 +0400
@@ -7,6 +7,7 @@
 
 PORTNAME=	geoserver
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
diff -ruN graphics/geoserver.orig/files/geoserver.in graphics/geoserver/files/geoserver.in
--- graphics/geoserver.orig/files/geoserver.in	2011-04-03 15:05:25.000000000 +0400
+++ graphics/geoserver/files/geoserver.in	2011-04-03 15:06:53.000000000 +0400
@@ -24,12 +24,16 @@
 : ${geoserver_user="root"}
 : ${geoserver_chdir="%%GEOSERVERDIR%%"}
 
+pidfile=${geoserver_pidfile:-"/var/run/geoserver.pid"}
+
+java="%%JAVA%%"
 java_args="-DGEOSERVER_DATA_DIR=%%GEOSERVERDIR%%/data_dir -Djava.awt.headless=true \
 		-DSTOP.PORT=8079 -DSTOP.KEY=geoserver -jar start.jar"
 log_args=">> ${geoserver_stdout_log} 2>> ${geoserver_stderr_log}"
 
-command="%%JAVA%%"
-command_args="${java_args} ${geoserver_flags} ${log_args} &"
+command="/usr/sbin/daemon"
+command_args="-p ${pidfile} ${java} ${java_args} ${geoserver_flags} ${log_args}"
+procname="${java}"
 
 start_precmd=logs_touch
 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->avl 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Apr 3 15:30:28 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=156154 
State-Changed-From-To: open->closed 
State-Changed-By: avl 
State-Changed-When: Mon Jun 27 02:16:24 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/156154: commit references a PR
Date: Mon, 27 Jun 2011 02:14:06 +0000 (UTC)

 avl         2011-06-27 02:13:48 UTC
 
   FreeBSD ports repository
 
   Modified files:
     graphics/geoserver   Makefile distinfo pkg-plist 
     graphics/geoserver/files geoserver.in 
   Log:
   - Update to 2.1.1 [1]
   - Add license information [1]
   - Fix rc script conflict with net-im/openfire [2]
   
   PR:             ports/157878 [1] ports/156154 [2]
   Submitted by:   Alexey Illarionov <littlesavage at rambler.ru>
   
   Revision  Changes    Path
   1.15      +5 -5      ports/graphics/geoserver/Makefile
   1.12      +2 -3      ports/graphics/geoserver/distinfo
   1.3       +6 -3      ports/graphics/geoserver/files/geoserver.in
   1.12      +69 -82    ports/graphics/geoserver/pkg-plist
 _______________________________________________
 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:
