From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Mar 24 15:30:04 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5DFE816A404 for ; Sat, 24 Mar 2007 15:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 3D5FA13C46A for ; Sat, 24 Mar 2007 15:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l2OFU4ng069841 for ; Sat, 24 Mar 2007 15:30:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l2OFU4Yl069840; Sat, 24 Mar 2007 15:30:04 GMT (envelope-from gnats) Resent-Date: Sat, 24 Mar 2007 15:30:04 GMT Resent-Message-Id: <200703241530.l2OFU4Yl069840@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, Nemo Liu Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6D27D16A401 for ; Sat, 24 Mar 2007 15:24:30 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [69.147.83.33]) by mx1.freebsd.org (Postfix) with ESMTP id 5D51E13C468 for ; Sat, 24 Mar 2007 15:24:30 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l2OFOUaV046626 for ; Sat, 24 Mar 2007 15:24:30 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id l2OFJTAA045990; Sat, 24 Mar 2007 15:19:29 GMT (envelope-from nobody) Message-Id: <200703241519.l2OFJTAA045990@www.freebsd.org> Date: Sat, 24 Mar 2007 15:19:29 GMT From: Nemo Liu To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.0 Cc: Subject: ports/110767: [UPDATE]java/jboss3:update to jboss3.2.8 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: Sat, 24 Mar 2007 15:30:04 -0000 >Number: 110767 >Category: ports >Synopsis: [UPDATE]java/jboss3:update to jboss3.2.8 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Mar 24 15:30:03 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Nemo Liu >Release: 7-current >Organization: >Environment: FreeBSD tango.sina.com.cn 7.0-STOooRM FreeBSD 7.0-STOooRM #0: Mon Mar 19 12:20:35 CST 2007 liutong@tango.sina.com.cn:/usr/obj/usr/src/sys/TANGO amd64 >Description: 3.2.8 is the lastest version of jboss 3 branch. changelog: http://jira.jboss.com/jira/secure/ReleaseNote.jspa?version=12310651&styleName=Text&projectId=10030&Create=Create >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/java/jboss3/Makefile,v retrieving revision 1.30 diff -u -r1.30 Makefile --- Makefile 9 May 2006 00:18:04 -0000 1.30 +++ Makefile 24 Mar 2007 14:11:54 -0000 @@ -2,15 +2,15 @@ # Date created: 16 April 2002 # Whom: Ernst de Haan # -# $FreeBSD: ports/java/jboss3/Makefile,v 1.30 2006/05/09 00:18:04 edwin Exp $ +# $FreeBSD$ # PORTNAME= ${APP_TITLE:L} -PORTVERSION= 3.2.7 +PORTVERSION= 3.2.8 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}-${PORTVERSION}-src +DISTNAME= ${PORTNAME}-${PORTVERSION}.SP1-src MAINTAINER= jonc@chen.org.nz COMMENT= JBoss 3.x, an open-source J2EE application server @@ -21,7 +21,7 @@ USE_JAVA= yes JAVA_VERSION= 1.4 -USE_RC_SUBR= YES +USE_RC_SUBR= startup.sh USE_BZIP2= YES .if !defined(NOPORTDOCS) @@ -50,10 +50,10 @@ JAVA_CP= bin/run.jar:${JAVA_HOME}/lib/tools.jar JAVA_MAIN= org.jboss.Main DAEMONCTL_DIR= ${FILESDIR} -DAEMONCTL_FILES=daemonctl.c daemonctl.1 startup.sh pkg-message +DAEMONCTL_FILES=daemonctl.c daemonctl.1 startup.sh.in pkg-message MAN1= ${CONTROL_SCRIPT_NAME}.1 -JBOSSOUTPUT= ${WRKSRC}/build/output/${PORTNAME}-${PORTVERSION} +JBOSSOUTPUT= ${WRKSRC}/build/output/${PORTNAME}-${PORTVERSION}.SP1 APP_HOME_FILES= bin client lib server PLIST_FILES= ${CONTROL_SCRIPT:S,^${PREFIX}/,,} \ Index: distinfo =================================================================== RCS file: /home/ncvs/ports/java/jboss3/distinfo,v retrieving revision 1.13 diff -u -r1.13 distinfo --- distinfo 22 Jan 2006 12:39:54 -0000 1.13 +++ distinfo 24 Mar 2007 13:10:47 -0000 @@ -1,3 +1,3 @@ -MD5 (jboss-3.2.7-src.tar.bz2) = 1d3d66d1d779af0d47ef0ba1c189bffc -SHA256 (jboss-3.2.7-src.tar.bz2) = 1da0dfb592e5baa4e41f272ce3dcb65f0f65e290cef9e009f9644527bad86c54 -SIZE (jboss-3.2.7-src.tar.bz2) = 48688133 +MD5 (jboss-3.2.8.SP1-src.tar.bz2) = a3e2c2409465a2276aa584d9100026b7 +SHA256 (jboss-3.2.8.SP1-src.tar.bz2) = ed4e45fa5f51cd8a2a3643f3676580724b5c6bf68a347bb3aee1702d4d384914 +SIZE (jboss-3.2.8.SP1-src.tar.bz2) = 37995227 Index: files/startup.sh =================================================================== RCS file: files/startup.sh diff -N files/startup.sh --- files/startup.sh 13 Jan 2005 01:55:13 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,58 +0,0 @@ -#!/bin/sh -# -# %%APP_TITLE%% startup script. -# -# $FreeBSD: ports/java/jboss3/files/startup.sh,v 1.2 2005/01/13 01:55:13 hq Exp $ -# - -# PROVIDE: %%APP_SHORTNAME%% -# REQUIRE: NETWORKING SERVERS - -# Add the following lines to /etc/rc.conf to enable %%APP_SHORTNAME%%: -# %%APP_SHORTNAME%%_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable %%APP_SHORTNAME%% -# %%APP_SHORTNAME%%_flags (str): Set to "-server" by default. -# Extra JVM flags. -# %%APP_SHORTNAME%%_config (str): Set to "" by default -# JBoss server config, eg {all|default|minimal|standard} -# -. %%RC_SUBR%% - -name="%%APP_SHORTNAME%%" -rcvar=`set_rcvar` - -start_cmd="%%APP_SHORTNAME%%_start" -restart_cmd="%%APP_SHORTNAME%%_restart" -pidfile="%%PID_FILE%%" -procname="%%JAVA%%" - -[ -z "$%%APP_SHORTNAME%%_enable" ] && %%APP_SHORTNAME%%_enable="NO" -[ -z "$%%APP_SHORTNAME%%_flags" ] && %%APP_SHORTNAME%%_flags="-server" -[ -z "$%%APP_SHORTNAME%%_config" ] && %%APP_SHORTNAME%%_config="" - -%%APP_SHORTNAME%%_start () -{ - checkyesno %%APP_SHORTNAME%%_enable && - { - if [ ! -f ${pidfile} ] - then - touch ${pidfile} - chown %%USER%%:%%GROUP%% ${pidfile} - fi - - %%CONTROL_SCRIPT%% -q ${%%APP_SHORTNAME%%_flags} ${%%APP_SHORTNAME%%_configflag} ${%%APP_SHORTNAME%%_config} start && - echo -n " %%APP_SHORTNAME%%" - } -} - -%%APP_SHORTNAME%%_restart () -{ - checkyesno %%APP_SHORTNAME%%_enable && - %%CONTROL_SCRIPT%% -q ${%%APP_SHORTNAME%%_flags} ${%%APP_SHORTNAME%%_configflag} ${%%APP_SHORTNAME%%_config} restart -} - -load_rc_config $name - -[ -n "${%%APP_SHORTNAME%%_config}" ] && %%APP_SHORTNAME%%_configflag="-config" - -run_rc_command "$1" Index: files/startup.sh.in =================================================================== RCS file: files/startup.sh.in diff -N files/startup.sh.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/startup.sh.in 24 Mar 2007 12:45:40 -0000 @@ -0,0 +1,58 @@ +#!/bin/sh +# +# %%APP_TITLE%% startup script. +# +# $FreeBSD: ports/java/jboss3/files/startup.sh,v 1.2 2005/01/13 01:55:13 hq Exp $ +# + +# PROVIDE: %%APP_SHORTNAME%% +# REQUIRE: NETWORKING SERVERS + +# Add the following lines to /etc/rc.conf to enable %%APP_SHORTNAME%%: +# %%APP_SHORTNAME%%_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable %%APP_SHORTNAME%% +# %%APP_SHORTNAME%%_flags (str): Set to "-server" by default. +# Extra JVM flags. +# %%APP_SHORTNAME%%_config (str): Set to "" by default +# JBoss server config, eg {all|default|minimal|standard} +# +. %%RC_SUBR%% + +name="%%APP_SHORTNAME%%" +rcvar=`set_rcvar` + +start_cmd="%%APP_SHORTNAME%%_start" +restart_cmd="%%APP_SHORTNAME%%_restart" +pidfile="%%PID_FILE%%" +procname="%%JAVA%%" + +[ -z "$%%APP_SHORTNAME%%_enable" ] && %%APP_SHORTNAME%%_enable="NO" +[ -z "$%%APP_SHORTNAME%%_flags" ] && %%APP_SHORTNAME%%_flags="-server" +[ -z "$%%APP_SHORTNAME%%_config" ] && %%APP_SHORTNAME%%_config="" + +%%APP_SHORTNAME%%_start () +{ + checkyesno %%APP_SHORTNAME%%_enable && + { + if [ ! -f ${pidfile} ] + then + touch ${pidfile} + chown %%USER%%:%%GROUP%% ${pidfile} + fi + + %%CONTROL_SCRIPT%% -q ${%%APP_SHORTNAME%%_flags} ${%%APP_SHORTNAME%%_configflag} ${%%APP_SHORTNAME%%_config} start && + echo -n " %%APP_SHORTNAME%%" + } +} + +%%APP_SHORTNAME%%_restart () +{ + checkyesno %%APP_SHORTNAME%%_enable && + %%CONTROL_SCRIPT%% -q ${%%APP_SHORTNAME%%_flags} ${%%APP_SHORTNAME%%_configflag} ${%%APP_SHORTNAME%%_config} restart +} + +load_rc_config $name + +[ -n "${%%APP_SHORTNAME%%_config}" ] && %%APP_SHORTNAME%%_configflag="-config" + +run_rc_command "$1" >Release-Note: >Audit-Trail: >Unformatted: