From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 16 12:40:09 2005 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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7BFAB16A41F for ; Fri, 16 Dec 2005 12:40:09 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 140EC43D53 for ; Fri, 16 Dec 2005 12:40:08 +0000 (GMT) (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 jBGCe7H6055747 for ; Fri, 16 Dec 2005 12:40:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id jBGCe7ce055746; Fri, 16 Dec 2005 12:40:07 GMT (envelope-from gnats) Resent-Date: Fri, 16 Dec 2005 12:40:07 GMT Resent-Message-Id: <200512161240.jBGCe7ce055746@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, Jean-Baptiste Quenot Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BBDC216A420 for ; Fri, 16 Dec 2005 12:30:37 +0000 (GMT) (envelope-from jbq@anyware-tech.com) Received: from caraldi.com (195-13-58-165.oxyd.net [195.13.58.165]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E1C143D7B for ; Fri, 16 Dec 2005 12:30:28 +0000 (GMT) (envelope-from jbq@anyware-tech.com) Received: from vision.anyware (10.21.96-84.rev.gaoland.net [84.96.21.10]) by caraldi.com (Postfix) with ESMTP id 1F6D3638C for ; Fri, 16 Dec 2005 13:30:27 +0100 (CET) Received: by vision.anyware (Postfix, from userid 1021) id 611DB6184; Fri, 16 Dec 2005 13:30:28 +0100 (CET) Message-Id: <20051216123028.611DB6184@vision.anyware> Date: Fri, 16 Dec 2005 13:30:28 +0100 (CET) From: Jean-Baptiste Quenot To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/90489: Maintainer update: www/resin2 2.1.17 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: Fri, 16 Dec 2005 12:40:09 -0000 >Number: 90489 >Category: ports >Synopsis: Maintainer update: www/resin2 2.1.17 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Dec 16 12:40:07 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Jean-Baptiste Quenot >Release: FreeBSD 5.4-STABLE i386 >Organization: >Environment: System: FreeBSD vision.anyware 5.4-STABLE FreeBSD 5.4-STABLE #0: Wed Oct 5 09:32:29 CEST 2005 jbq@vision.anyware:/usr/src/sys/i386/compile/VISION i386 >Description: This is an update of www/resin2: * Update to version 2.1.17 * Incorporate a fix from Hervé Quiroz backported from www/resin3 to be able to remove the work directory when building as a user. * Accept resin2_flags to pass Java options * Added support for OpenSSL Thanks in advance! >How-To-Repeat: >Fix: diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin2/Makefile ./Makefile --- /usr/ports/www/resin2/Makefile Mon Dec 5 00:15:05 2005 +++ ./Makefile Fri Dec 16 13:16:56 2005 @@ -2,11 +2,11 @@ # Whom: Jean-Baptiste Quenot # Date Created: 2002-07-15 15:00:43 # -# $FreeBSD: ports/www/resin2/Makefile,v 1.9 2005/12/04 00:18:14 clement Exp $ +# $FreeBSD: ports/www/resin2/Makefile,v 1.8 2005/04/15 00:30:47 hq Exp $ # PORTNAME= resin -PORTVERSION= 2.1.16 +PORTVERSION= 2.1.17 CATEGORIES= www java MASTER_SITES= http://www.caucho.com/download/ @@ -18,6 +18,7 @@ HAS_CONFIGURE= yes USE_PYTHON= yes USE_REINPLACE= yes +USE_OPENSSL= yes # Customizable settings RUNASUSER?= www @@ -55,7 +56,9 @@ .include # Pass JAVA_HOME as determined by bsd.java.mk -CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME} +CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME} \ + --with-openssl-lib=${OPENSSLLIB} \ + --with-openssl-include=${OPENSSLINC} # Install the Apache plugin if needed .if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES) @@ -117,16 +120,25 @@ @${ECHO_CMD} The Resin Apache module mod_caucho has been activated \ in the Apache configuration file, where you should also \ add a line to specify the location of the Resin configuration \ - file, for example: | fmt -w 80 >> ${PKGMESSAGE} + file, for example: | ${FMT} -w 80 >> ${PKGMESSAGE} @${ECHO_CMD} >> ${PKGMESSAGE} @${ECHO_CMD} "" >> ${PKGMESSAGE} @${ECHO_CMD} " CauchoConfigFile ${PREFIX}/etc/${APP_NAME}.xml" >> ${PKGMESSAGE} @${ECHO_CMD} "" >> ${PKGMESSAGE} .endif +post-build: + cd ${WRKSRC}/src/c/jni && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install + # Resin does not handle installation, so proceed now -post-install: +do-install: @${SETENV} RUNASUSER=${RUNASUSER} GROUP=${GROUP} ${SH} ${WRKDIR}/install.sh +.if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES)) + ${APXS} -i -n caucho -a ${WRKSRC}/src/c/plugin/apache2/mod_caucho.so +.endif +.if (defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)) + ${APXS} -i -n caucho -a ${WRKSRC}/src/c/plugin/apache1/mod_caucho.so +.endif @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${ECHO_MSG} @${ECHO_MSG} "********************************************************************************" diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin2/distinfo ./distinfo --- /usr/ports/www/resin2/distinfo Fri Feb 25 09:54:44 2005 +++ ./distinfo Fri Dec 16 12:25:21 2005 @@ -1,2 +1,3 @@ -MD5 (resin-2.1.16.tar.gz) = 0651cfa42705397be714cee27556b028 -SIZE (resin-2.1.16.tar.gz) = 3312495 +MD5 (resin-2.1.17.tar.gz) = 75c96945b8c71a193d708073d00025ae +SHA256 (resin-2.1.17.tar.gz) = c9291e89a544809e637522dd0b47c5191263bd33942715006814147c1bd02104 +SIZE (resin-2.1.17.tar.gz) = 2956041 diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin2/files/patch-apache-Makefile.in ./files/patch-apache-Makefile.in --- /usr/ports/www/resin2/files/patch-apache-Makefile.in Fri Feb 25 09:54:44 2005 +++ ./files/patch-apache-Makefile.in Fri Dec 16 13:18:57 2005 @@ -1,14 +1,11 @@ -$FreeBSD: ports/www/resin2/files/patch-apache-Makefile.in,v 1.2 2005/02/24 22:27:53 hq Exp $ - ---- src/c/plugin/apache/Makefile.in.orig Thu Nov 13 09:27:52 2003 -+++ src/c/plugin/apache/Makefile.in Thu Nov 13 09:28:36 2003 -@@ -28,8 +28,7 @@ +--- src/c/plugin/apache/Makefile.in.orig Fri Dec 16 13:18:12 2005 ++++ src/c/plugin/apache/Makefile.in Fri Dec 16 13:18:19 2005 +@@ -28,8 +28,6 @@ $(CC) -c $(INCLUDES) $(CFLAGS) $< install : - sh install.sh -conf $(apache_conf) -libexec $(apache_libexec) \ - -resin_home $(resin_home) -+ %%APXS%% -i -a -n caucho mod_caucho.so clean : - rm *.o *.lo *.la *.so diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin2/files/patch-apache2-Makefile.in ./files/patch-apache2-Makefile.in --- /usr/ports/www/resin2/files/patch-apache2-Makefile.in Fri Feb 25 09:54:44 2005 +++ ./files/patch-apache2-Makefile.in Fri Dec 16 13:19:05 2005 @@ -1,14 +1,11 @@ -$FreeBSD: ports/www/resin2/files/patch-apache2-Makefile.in,v 1.2 2005/02/24 22:27:53 hq Exp $ - ---- src/c/plugin/apache2/Makefile.in.orig Thu Nov 13 09:28:46 2003 -+++ src/c/plugin/apache2/Makefile.in Thu Nov 13 09:28:52 2003 -@@ -27,8 +27,7 @@ +--- src/c/plugin/apache2/Makefile.in.orig Fri Dec 16 13:18:09 2005 ++++ src/c/plugin/apache2/Makefile.in Fri Dec 16 13:18:21 2005 +@@ -27,8 +27,6 @@ $(CC) -c $(INCLUDES) $(CFLAGS) $< install : - sh install.sh -conf $(apache_conf) -libexec $(apache_libexec) \ - -resin_home $(resin_home) -+ %%APXS%% -i -a -n caucho mod_caucho.so clean : - rm *.o *.lo *.so diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin2/files/patch-configure ./files/patch-configure --- /usr/ports/www/resin2/files/patch-configure Thu Jan 1 01:00:00 1970 +++ ./files/patch-configure Mon Apr 25 11:42:57 2005 @@ -0,0 +1,11 @@ +--- configure.orig Mon Apr 25 11:42:17 2005 ++++ configure Mon Apr 25 11:42:43 2005 +@@ -3506,7 +3506,7 @@ + ;; + + *freebsd*) +- PROXY_LIBS='-lc_r' ++ PROXY_LIBS='-lssl -lcrypto -lc_r' + jni_os=freebsd + ;; + diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin2/files/pkg-message.in ./files/pkg-message.in --- /usr/ports/www/resin2/files/pkg-message.in Fri Feb 25 09:54:44 2005 +++ ./files/pkg-message.in Fri Dec 16 13:11:37 2005 @@ -8,7 +8,40 @@ env - %%PREFIX%%/etc/rc.d/%%APP_NAME%%.sh start -And point your web browser to the default home page at +For this control script to run seamlessly, it is recommended to increase the +maximum length of commands displayed by ps(1). Please append the following +setting to /etc/sysctl.conf: + + # Do not truncate command line arguments in ps(1) listing + kern.ps_arg_cache_limit=10000 + +This setting will take effect at next reboot, however it is possible to have +immediate effect with the following command as root: + + # sysctl kern.ps_arg_cache_limit=10000 + +If you wish to skip this setting, please note that the `stop', `restart' and +`status' will not function properly with %%APP_NAME%%.sh. + +Once Resin is started, point your web browser to the default home page at http://localhost:%%PORT%%/ to read the documentation and test the samples. Resin configuration is located at %%PREFIX%%/etc/%%APP_NAME%%.xml + + +Enjoy! + +-------------------------------------------------------------------------------- +ADVANCED USAGE + +If you need to pass special options to Java, please set the +%%APP_NAME%%_flags option in /etc/rc.conf, see examples below: + + # Prevent Java from opening an X11 display + %%APP_NAME%%_flags="-Djava.awt.headless=true" + + # Increase memory limit of the Java virtual machine + %%APP_NAME%%_flags="-Xms32m -Xmx256m" + + # Run Java with remote debugging turned on on port 8000 + %%APP_NAME%%_flags="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000" diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin2/files/resinctl ./files/resinctl --- /usr/ports/www/resin2/files/resinctl Sat Apr 16 00:05:32 2005 +++ ./files/resinctl Thu Oct 20 09:27:55 2005 @@ -157,8 +157,7 @@ COMMAND = "%%JAVA%%" ARGS = [COMMAND] - if os.environ.has_key('JAVA_OPTS'): - ARGS += os.environ['JAVA_OPTS'].split(" ") + ARGS += sys.argv[1:-1] ARGS += [ "-Dresin.home=%%APP_HOME%%", @@ -169,17 +168,17 @@ os.environ['JAVA_HOME'] = "%%JAVA_HOME%%" os.environ['CLASSPATH'] = classpath() - if len(sys.argv) != 2: + if len(sys.argv) < 2: usage() sys.exit(1) - if sys.argv[1] == "start": + if sys.argv[-1] == "start": start() - elif sys.argv[1] == "stop": + elif sys.argv[-1] == "stop": stop() - elif sys.argv[1] == "restart": + elif sys.argv[-1] == "restart": stop() start() >Release-Note: >Audit-Trail: >Unformatted: