On Thu, 30 Jun 2011, Stuart Henderson wrote:
> On 2011/06/30 14:23, David Coppa wrote:
> >
> > And another thing... Can you please check if the redirection rule in
> > {v5,v6}/pkg/README-main is correct and reflects -current state of the
> > art?
>
> Please change it to 'pass in quick ...' (rest of the line is ok).
Thanks. New diff below:
- removed message about editing /etc/tomcat/tomcat.rc for JAVA_HOME.
- minor fixes to {v5,v6}/pkg/README-main, including pf cluebat by Stuart.
Cheers!
David
Index: v5/Makefile
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- v5/Makefile 2 Jun 2011 13:41:42 -0000 1.16
+++ v5/Makefile 30 Jun 2011 15:07:12 -0000
@@ -4,15 +4,13 @@ COMMENT-main= Java servlet 2.4 and Java
COMMENT-admin= administration web application
COMMENT-examples=example applications and documentation
-V= 5.5.31
+V= 5.5.33
DISTNAME= apache-tomcat-${V}
PKGNAME= tomcat-${V}
PKGNAME-main= tomcat-${V}
PKGNAME-admin= tomcat-admin-${V}
PKGNAME-examples=tomcat-examples-${V}
CATEGORIES= www
-
-REVISION-main= 0
DISTFILES= ${DISTNAME}.tar.gz \
${DISTNAME}-admin.tar.gz \
Index: v5/distinfo
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- v5/distinfo 29 Nov 2010 21:26:01 -0000 1.7
+++ v5/distinfo 30 Jun 2011 15:07:12 -0000
@@ -1,15 +1,15 @@
-MD5 (apache-tomcat-5.5.31-admin.tar.gz) = ua1YTX1F+XWNo0PfkUyL+A==
-MD5 (apache-tomcat-5.5.31-fulldocs.tar.gz) = rti7PlcAIZWDQzT8QckJOQ==
-MD5 (apache-tomcat-5.5.31.tar.gz) = mrBzhuI/TD38OwpeKbX4VA==
-RMD160 (apache-tomcat-5.5.31-admin.tar.gz) = 4kqzwGaBmTVKnrpcvUAGVKXQX9g=
-RMD160 (apache-tomcat-5.5.31-fulldocs.tar.gz) = VQefm5OGK4jU0LwJ/LHjUilx6R8=
-RMD160 (apache-tomcat-5.5.31.tar.gz) = xQtEQXLxWKhy2IxcHQ9jgSfWDBQ=
-SHA1 (apache-tomcat-5.5.31-admin.tar.gz) = ifE348wjfedai5MPL80NvxYuJNQ=
-SHA1 (apache-tomcat-5.5.31-fulldocs.tar.gz) = 9FtWOZyhAnoNfUJ3XK9g2KEzZbA=
-SHA1 (apache-tomcat-5.5.31.tar.gz) = zgYRZ1gkkM4ZTDjw6EA5FVWzRhs=
-SHA256 (apache-tomcat-5.5.31-admin.tar.gz) =
bxPrDnvrkWIHCP2MbUEWJdRnlt4IyUFU+SEBeSEId88=
-SHA256 (apache-tomcat-5.5.31-fulldocs.tar.gz) =
Ob7B9ClNlz3OX+spPL2ADg1yxJuGzKyOvgDu9IAbUZM=
-SHA256 (apache-tomcat-5.5.31.tar.gz) =
nwL0fSzzUbz/TA0BOiU8llrQzA/AMF0Iby9lMCLM+oI=
-SIZE (apache-tomcat-5.5.31-admin.tar.gz) = 2395782
-SIZE (apache-tomcat-5.5.31-fulldocs.tar.gz) = 3131660
-SIZE (apache-tomcat-5.5.31.tar.gz) = 8277017
+MD5 (apache-tomcat-5.5.33-admin.tar.gz) = /AoYRNdmoeNZpMB8DcvuNQ==
+MD5 (apache-tomcat-5.5.33-fulldocs.tar.gz) = uvx1B+xBJI3ytsG2MY3m5g==
+MD5 (apache-tomcat-5.5.33.tar.gz) = PXnNJFSXssUBtP1k4dpkHA==
+RMD160 (apache-tomcat-5.5.33-admin.tar.gz) = ZG1ljjzlOBwdv/eVckw5FrxaoeQ=
+RMD160 (apache-tomcat-5.5.33-fulldocs.tar.gz) = VdImxRK+OE2Nsh7Tx7TfCx2HY+w=
+RMD160 (apache-tomcat-5.5.33.tar.gz) = VBy7fTVOdiAT+VTfZsjb8cLwcZg=
+SHA1 (apache-tomcat-5.5.33-admin.tar.gz) = qRr+XtNLGjZS0Z1oJ2zQJxPqxRg=
+SHA1 (apache-tomcat-5.5.33-fulldocs.tar.gz) = FlGnLiMftJTq1B3HL7lDP6nTBJ0=
+SHA1 (apache-tomcat-5.5.33.tar.gz) = jxzPsc9qiTWc4VM8y2RF37DHZiQ=
+SHA256 (apache-tomcat-5.5.33-admin.tar.gz) =
e9J+xcWgGIyu9s6Pxck/VAymf7U01Nqmkd/Db1gYcVc=
+SHA256 (apache-tomcat-5.5.33-fulldocs.tar.gz) =
WJVCaGNlXyJJPVsiczPShjrkwZsLojLoEpFwmDOlcP0=
+SHA256 (apache-tomcat-5.5.33.tar.gz) =
R5kFGAac3/uiuHh6Aiu36sxAhtFDKyvx2k4a5N+ivIE=
+SIZE (apache-tomcat-5.5.33-admin.tar.gz) = 2395950
+SIZE (apache-tomcat-5.5.33-fulldocs.tar.gz) = 3138491
+SIZE (apache-tomcat-5.5.33.tar.gz) = 8205713
Index: v5/files/tomcat.rc
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/files/tomcat.rc,v
retrieving revision 1.2
diff -u -p -r1.2 tomcat.rc
--- v5/files/tomcat.rc 29 Nov 2010 21:26:01 -0000 1.2
+++ v5/files/tomcat.rc 30 Jun 2011 15:07:12 -0000
@@ -8,7 +8,7 @@
# javaPathHelper will pickup JAVA_HOME from the env. if
# it is not set in the env it will default the jdk that
# satisfied the RUN_DEPEND.
-JAVA_HOME=$(javaPathHelper -h tomcat)
+JAVA_HOME=$(${LOCALBASE}/bin/javaPathHelper -h tomcat)
JAVA_OPTS=-server
# override other environment options:
Index: v5/patches/patch-bin_setclasspath_sh
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/patches/patch-bin_setclasspath_sh,v
retrieving revision 1.3
diff -u -p -r1.3 patch-bin_setclasspath_sh
--- v5/patches/patch-bin_setclasspath_sh 29 Nov 2010 21:26:01 -0000
1.3
+++ v5/patches/patch-bin_setclasspath_sh 30 Jun 2011 15:07:12 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-bin_setclasspath_sh,v 1.3 2010/11/29 21:26:01 sthen Exp $
--- bin/setclasspath.sh.orig Thu Jul 1 11:19:40 2010
+++ bin/setclasspath.sh Tue Aug 3 04:52:30 2010
-@@ -22,5 +22,10 @@
+@@ -22,4 +22,9 @@
#
-----------------------------------------------------------------------------
+# Read $JAVA_HOME - sudo doesn't pass environment variables
@@ -11,12 +11,3 @@ $OpenBSD: patch-bin_setclasspath_sh,v 1.
+
# Make sure prerequisite environment variables are set
if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
- # Bugzilla 37284
-@@ -29,6 +34,7 @@ if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
- else
- echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is
defined"
- echo "At least one of these environment variable is needed to run this
program"
-+ echo "Edit \`${SYSCONFDIR}/tomcat/tomcat.rc' to point to your \$JAVA_HOME"
- exit 1
- fi
- fi
Index: v5/pkg/PLIST-examples
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/pkg/PLIST-examples,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST-examples
--- v5/pkg/PLIST-examples 29 Nov 2010 21:26:01 -0000 1.7
+++ v5/pkg/PLIST-examples 30 Jun 2011 15:07:15 -0000
@@ -1248,6 +1248,7 @@ webapps/tomcat-docs/catalina/docs/api/or
webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/package-tree.html
webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/
webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/
+webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/ExceptionUtils.html
webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/IntrospectionUtils.AttributeHolder.html
webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/IntrospectionUtils.PropertySource.html
webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/IntrospectionUtils.html
@@ -1371,7 +1372,6 @@ webapps/tomcat-docs/catalina/docs/api/or
webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/TcpConnectionHandler.html
webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/URL.html
webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/
-webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.html
webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.html
webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/JSSEImplementation.html
webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/JSSEKeyManager.html
Index: v5/pkg/README-main
===================================================================
RCS file: /cvs/ports/www/tomcat/v5/pkg/README-main,v
retrieving revision 1.3
diff -u -p -r1.3 README-main
--- v5/pkg/README-main 2 Jun 2011 13:41:42 -0000 1.3
+++ v5/pkg/README-main 30 Jun 2011 15:07:15 -0000
@@ -37,7 +37,7 @@ sure the Connector port is 80 in your `$
more secure: redirect all tcp traffic to port 80 to Tomcat's default
listener port 8080 using a pf.conf(5) rule like:
- pass quick on $NIC proto tcp to port 80 rdr-to 127.0.0.1 port 8080
+ pass in quick on $NIC proto tcp to port 80 rdr-to 127.0.0.1 port 8080
If you are upgrading and use database drivers, don't forget to copy them
into ${TRUEPREFIX}/tomcat/common/lib. If you use ssi or cgi, remember to
Index: v6/Makefile
===================================================================
RCS file: /cvs/ports/www/tomcat/v6/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- v6/Makefile 2 Jun 2011 13:41:42 -0000 1.10
+++ v6/Makefile 30 Jun 2011 15:07:15 -0000
@@ -3,13 +3,11 @@
COMMENT-main= Java servlet 2.5 and Java server pages 2.1 server
COMMENT-examples=example applications and full documentation
-V= 6.0.20
+V= 6.0.32
DISTNAME= apache-tomcat-${V}
PKGNAME= tomcat-${V}
PKGNAME-main= tomcat-${V}
PKGNAME-examples=tomcat-examples-${V}
-REVISION-main= 2
-REVISION-examples= 1
CATEGORIES= www
DISTFILES= ${DISTNAME}.tar.gz \
@@ -20,8 +18,6 @@ MASTER_SITES= ${MASTER_SITE_APACHE:=tomc
HOMEPAGE= http://tomcat.apache.org/
-MAINTAINER= Kurt Miller <[email protected]>
-
MULTI_PACKAGES= -main -examples
MODULES= java
@@ -76,12 +72,17 @@ do-install:
${INSTALL_DATA_DIR} ${WRKINST}/${CONFDIR}/Catalina/localhost
${INSTALL_DATA} ${WRKDIST}/webapps/host-manager/manager.xml \
${WRKINST}/${CONFDIR}/Catalina/localhost
- find ${WRKINST} -name \*.orig -or -name \*.bat -or -name \*.exe | \
- xargs rm
- @perl -pi -e 's,%%SYSCONFDIR%%,${SYSCONFDIR},' \
+ @${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} \
${PREFIX}/tomcat/bin/setclasspath.sh
- @sed -e 's,%%PREFIX%%,${TRUEPREFIX},' \
- -e 's,%%CATALINA_BASE%%,${CATALINA_BASE},' \
- < ${FILESDIR}/tomcat.rc > ${SAMPLEDIR}/tomcat.rc
+ @${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c \
+ ${FILESDIR}/tomcat.rc \
+ ${SAMPLEDIR}/tomcat.rc
+ find ${WRKINST} \
+ -name \*.beforesubst -or \
+ -name \*.orig -or \
+ -name \*.bat -or \
+ -name \*.exe -or \
+ -name \*.dll \
+ | xargs rm
.include <bsd.port.mk>
Index: v6/distinfo
===================================================================
RCS file: /cvs/ports/www/tomcat/v6/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- v6/distinfo 12 Jun 2009 17:46:56 -0000 1.2
+++ v6/distinfo 30 Jun 2011 15:07:15 -0000
@@ -1,10 +1,10 @@
-MD5 (apache-tomcat-6.0.20-fulldocs.tar.gz) = FOwHDtm6uZ5KXDpDnhwEFQ==
-MD5 (apache-tomcat-6.0.20.tar.gz) = WUSZmr550B3C7nd22dV4cw==
-RMD160 (apache-tomcat-6.0.20-fulldocs.tar.gz) = pGk+cVK/LPE2SttsLLYOXMaWaxM=
-RMD160 (apache-tomcat-6.0.20.tar.gz) = 4HWz/c4RWEPtLFC1LLBd04oV6g4=
-SHA1 (apache-tomcat-6.0.20-fulldocs.tar.gz) = w5vGOzMVT80AI30zf7bGSbBfkhA=
-SHA1 (apache-tomcat-6.0.20.tar.gz) = T50mUNHkpafQU/eLc8JQnmSubfw=
-SHA256 (apache-tomcat-6.0.20-fulldocs.tar.gz) =
Qf1aHugeyFTf2g0NwdXARkP1QKehUsAReI/vjR5GqXY=
-SHA256 (apache-tomcat-6.0.20.tar.gz) =
pEPBcg3CXQlj3UeymbTF6B1RRiFHw1HxjlxZv3ZGBG4=
-SIZE (apache-tomcat-6.0.20-fulldocs.tar.gz) = 3391229
-SIZE (apache-tomcat-6.0.20.tar.gz) = 5998298
+MD5 (apache-tomcat-6.0.32-fulldocs.tar.gz) = t+m9d8lcTUXlshFYCZMYTQ==
+MD5 (apache-tomcat-6.0.32.tar.gz) = koqWAmit9hCn1v5cT80LIA==
+RMD160 (apache-tomcat-6.0.32-fulldocs.tar.gz) = rvW1QilZR4j2qIYr72v5IbChBwY=
+RMD160 (apache-tomcat-6.0.32.tar.gz) = 9LLDxmoEChltftuuLJjzrrKdOiM=
+SHA1 (apache-tomcat-6.0.32-fulldocs.tar.gz) = rPcWsIPFBpCCxKmj7uVnGICPAZA=
+SHA1 (apache-tomcat-6.0.32.tar.gz) = wMh+CdrjgYc9lLoBzB/vXBiMXKA=
+SHA256 (apache-tomcat-6.0.32-fulldocs.tar.gz) =
QyR33wtlXSLUGM6wlA0TfiE43OUePfL+NgA5qrWj4Y8=
+SHA256 (apache-tomcat-6.0.32.tar.gz) =
UF5knR/890bma+gpXIJEopSTSd7fZ46fKmWcRzaWjF4=
+SIZE (apache-tomcat-6.0.32-fulldocs.tar.gz) = 3518030
+SIZE (apache-tomcat-6.0.32.tar.gz) = 6507748
Index: v6/files/tomcat.rc
===================================================================
RCS file: /cvs/ports/www/tomcat/v6/files/tomcat.rc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 tomcat.rc
--- v6/files/tomcat.rc 9 Jan 2009 21:38:43 -0000 1.1.1.1
+++ v6/files/tomcat.rc 30 Jun 2011 15:07:15 -0000
@@ -1,19 +1,19 @@
# $OpenBSD: tomcat.rc,v 1.1.1.1 2009/01/09 21:38:43 kurt Exp $
#
# Start tomcat with following command:
-# $ sudo -u _tomcat %%PREFIX%%/tomcat/bin/startup.sh
+# $ sudo -u _tomcat ${TRUEPREFIX}/tomcat/bin/startup.sh
#
# javaPathHelper will pickup JAVA_HOME from the env or the
# path. If it is not set it will default the jdk that
# satisfied the RUN_DEPEND.
-JAVA_HOME=$(javaPathHelper -h tomcat)
+JAVA_HOME=$(${LOCALBASE}/bin/javaPathHelper -h tomcat)
JAVA_OPTS=-server
# override other environment options:
-#CATALINA_HOME=%%PREFIX%%/tomcat
-#CATALINA_BASE=%%CATALINA_BASE%%
-#CATALINA_TMPDIR=$CATALINA_BASE/temp
+#CATALINA_HOME=${TRUEPREFIX}/tomcat
+#CATALINA_BASE=${CATALINA_BASE}
+#CATALINA_TMPDIR=${CATALINA_BASE}/temp
#JAVA_OPTS="-server -Djava.net.preferIPv4Stack=true"
#JPDA_TRANSPORT=
#JPDA_ADDRESS=
Index: v6/patches/patch-bin_catalina_sh
===================================================================
RCS file: /cvs/ports/www/tomcat/v6/patches/patch-bin_catalina_sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-bin_catalina_sh
--- v6/patches/patch-bin_catalina_sh 9 Jan 2009 21:38:43 -0000 1.1.1.1
+++ v6/patches/patch-bin_catalina_sh 30 Jun 2011 15:07:15 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-bin_catalina_sh,v 1.1.1.1 2009/01/09 21:38:43 kurt Exp $
---- bin/catalina.sh.orig Mon Jul 21 20:01:12 2008
-+++ bin/catalina.sh Thu Jan 1 14:59:02 2009
-@@ -153,7 +153,7 @@ fi
- CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar
+--- bin/catalina.sh.orig Wed Feb 2 20:04:54 2011
++++ bin/catalina.sh Wed Jun 22 11:03:34 2011
+@@ -164,7 +164,7 @@ else
+ fi
if [ -z "$CATALINA_BASE" ] ; then
- CATALINA_BASE="$CATALINA_HOME"
+ CATALINA_BASE="/var/tomcat"
fi
- if [ -z "$CATALINA_TMPDIR" ] ; then
+ # Add tomcat-juli.jar and bootstrap.jar to classpath
Index: v6/patches/patch-bin_setclasspath_sh
===================================================================
RCS file: /cvs/ports/www/tomcat/v6/patches/patch-bin_setclasspath_sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-bin_setclasspath_sh
--- v6/patches/patch-bin_setclasspath_sh 9 Jan 2009 21:38:43 -0000
1.1.1.1
+++ v6/patches/patch-bin_setclasspath_sh 30 Jun 2011 15:07:15 -0000
@@ -1,23 +1,13 @@
$OpenBSD: patch-bin_setclasspath_sh,v 1.1.1.1 2009/01/09 21:38:43 kurt Exp $
--- bin/setclasspath.sh.orig Mon Jul 21 20:01:12 2008
+++ bin/setclasspath.sh Thu Jan 1 14:59:02 2009
-@@ -24,6 +24,11 @@
- # First clear out the user classpath
- CLASSPATH=
+@@ -22,4 +22,9 @@
+ #
-----------------------------------------------------------------------------
+# Read $JAVA_HOME - sudo doesn't pass environment variables
-+if [ -r "%%SYSCONFDIR%%/tomcat/tomcat.rc" ]; then
-+ . %%SYSCONFDIR%%/tomcat/tomcat.rc
++if [ -r "${SYSCONFDIR}/tomcat/tomcat.rc" ]; then
++ . ${SYSCONFDIR}/tomcat/tomcat.rc
+fi
+
# Make sure prerequisite environment variables are set
if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
- # Bugzilla 37284 (reviewed).
-@@ -47,6 +52,7 @@ if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
- if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
- echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is
defined"
- echo "At least one of these environment variable is needed to run this
program"
-+ echo "Edit \`%%SYSCONFDIR%%/tomcat/tomcat.rc' to point to your
\$JAVA_HOME"
- exit 1
- fi
- fi
Index: v6/patches/patch-conf_catalina_policy
===================================================================
RCS file: /cvs/ports/www/tomcat/v6/patches/patch-conf_catalina_policy,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-conf_catalina_policy
--- v6/patches/patch-conf_catalina_policy 9 Jan 2009 21:38:43 -0000
1.1.1.1
+++ v6/patches/patch-conf_catalina_policy 30 Jun 2011 15:07:15 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-conf_catalina_policy,v 1.1.1.1 2009/01/09 21:38:43 kurt Exp $
---- conf/catalina.policy.orig Sun Jan 4 22:50:39 2009
-+++ conf/catalina.policy Sun Jan 4 22:51:48 2009
-@@ -158,21 +158,21 @@ grant {
+--- conf/catalina.policy.orig Wed Feb 2 20:06:47 2011
++++ conf/catalina.policy Wed Jun 22 11:03:34 2011
+@@ -192,21 +192,21 @@ grant codeBase "file:${catalina.base}/webapps/manager/
// the NOAA web server. You might create a "grant" entries like this:
//
// The permissions granted to the context root directory apply to JSP pages.
Index: v6/patches/patch-conf_server_xml
===================================================================
RCS file: /cvs/ports/www/tomcat/v6/patches/patch-conf_server_xml,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-conf_server_xml
--- v6/patches/patch-conf_server_xml 9 Jan 2009 21:38:43 -0000 1.1.1.1
+++ v6/patches/patch-conf_server_xml 30 Jun 2011 15:07:15 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-conf_server_xml,v 1.1.1.1 2009/01/09 21:38:43 kurt Exp $
---- conf/server.xml.orig Mon Jul 21 20:01:12 2008
-+++ conf/server.xml Thu Jan 1 15:03:32 2009
-@@ -64,12 +64,12 @@
+--- conf/server.xml.orig Wed Feb 2 20:06:47 2011
++++ conf/server.xml Wed Jun 22 11:03:34 2011
+@@ -66,12 +66,12 @@
APR (HTTP/AJP) Connector: /docs/apr.html
Define a non-SSL HTTP/1.1 Connector on port 8080
-->
@@ -16,7 +16,7 @@ $OpenBSD: patch-conf_server_xml,v 1.1.1.
port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
-@@ -79,13 +79,13 @@
+@@ -81,13 +81,13 @@
connector should be using the OpenSSL style configuration
described in the APR documentation -->
<!--
@@ -32,7 +32,7 @@ $OpenBSD: patch-conf_server_xml,v 1.1.1.
<!-- An Engine represents the entry point (within Catalina) that processes
-@@ -123,7 +123,7 @@
+@@ -125,7 +125,7 @@
<!-- Define the default virtual host
Note: XML Schema validation will not work with Xerces 2.2.
-->
Index: v6/pkg/PLIST-examples
===================================================================
RCS file: /cvs/ports/www/tomcat/v6/pkg/PLIST-examples,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-examples
--- v6/pkg/PLIST-examples 15 Nov 2010 10:45:54 -0000 1.3
+++ v6/pkg/PLIST-examples 30 Jun 2011 15:07:18 -0000
@@ -37,6 +37,7 @@ webapps/docs/api/org/apache/
webapps/docs/api/org/apache/AnnotationProcessor.html
webapps/docs/api/org/apache/PeriodicEventListener.html
webapps/docs/api/org/apache/catalina/
+webapps/docs/api/org/apache/catalina/AccessLog.html
webapps/docs/api/org/apache/catalina/Authenticator.html
webapps/docs/api/org/apache/catalina/Cluster.html
webapps/docs/api/org/apache/catalina/CometEvent.EventSubType.html
@@ -153,17 +154,21 @@ webapps/docs/api/org/apache/catalina/con
webapps/docs/api/org/apache/catalina/core/
webapps/docs/api/org/apache/catalina/core/ApplicationContext.html
webapps/docs/api/org/apache/catalina/core/ApplicationContextFacade.html
+webapps/docs/api/org/apache/catalina/core/ApplicationFilterConfig.html
webapps/docs/api/org/apache/catalina/core/ApplicationFilterFactory.html
webapps/docs/api/org/apache/catalina/core/AprLifecycleListener.html
webapps/docs/api/org/apache/catalina/core/Constants.html
webapps/docs/api/org/apache/catalina/core/ContainerBase.ContainerBackgroundProcessor.html
+webapps/docs/api/org/apache/catalina/core/ContainerBase.NoopAccessLog.html
webapps/docs/api/org/apache/catalina/core/ContainerBase.PrivilegedAddChild.html
webapps/docs/api/org/apache/catalina/core/ContainerBase.html
webapps/docs/api/org/apache/catalina/core/DummyRequest.html
webapps/docs/api/org/apache/catalina/core/DummyResponse.html
webapps/docs/api/org/apache/catalina/core/JasperListener.html
+webapps/docs/api/org/apache/catalina/core/JreMemoryLeakPreventionListener.html
webapps/docs/api/org/apache/catalina/core/NamingContextListener.html
webapps/docs/api/org/apache/catalina/core/StandardContext.html
+webapps/docs/api/org/apache/catalina/core/StandardEngine.AccessLogListener.html
webapps/docs/api/org/apache/catalina/core/StandardEngine.html
webapps/docs/api/org/apache/catalina/core/StandardHost.html
webapps/docs/api/org/apache/catalina/core/StandardPipeline.html
@@ -200,6 +205,14 @@ webapps/docs/api/org/apache/catalina/dep
webapps/docs/api/org/apache/catalina/deploy/package-frame.html
webapps/docs/api/org/apache/catalina/deploy/package-summary.html
webapps/docs/api/org/apache/catalina/deploy/package-tree.html
+webapps/docs/api/org/apache/catalina/filters/
+webapps/docs/api/org/apache/catalina/filters/Constants.html
+webapps/docs/api/org/apache/catalina/filters/CsrfPreventionFilter.CsrfResponseWrapper.html
+webapps/docs/api/org/apache/catalina/filters/CsrfPreventionFilter.html
+webapps/docs/api/org/apache/catalina/filters/FilterBase.html
+webapps/docs/api/org/apache/catalina/filters/package-frame.html
+webapps/docs/api/org/apache/catalina/filters/package-summary.html
+webapps/docs/api/org/apache/catalina/filters/package-tree.html
webapps/docs/api/org/apache/catalina/ha/
webapps/docs/api/org/apache/catalina/ha/CatalinaCluster.html
webapps/docs/api/org/apache/catalina/ha/ClusterDeployer.html
@@ -274,12 +287,14 @@ webapps/docs/api/org/apache/catalina/ha/
webapps/docs/api/org/apache/catalina/ha/util/package-tree.html
webapps/docs/api/org/apache/catalina/loader/
webapps/docs/api/org/apache/catalina/loader/Constants.html
+webapps/docs/api/org/apache/catalina/loader/JdbcLeakPrevention.html
webapps/docs/api/org/apache/catalina/loader/Reloader.html
webapps/docs/api/org/apache/catalina/loader/ResourceEntry.html
webapps/docs/api/org/apache/catalina/loader/StandardClassLoader.html
webapps/docs/api/org/apache/catalina/loader/StandardClassLoaderMBean.html
webapps/docs/api/org/apache/catalina/loader/VirtualWebappLoader.html
webapps/docs/api/org/apache/catalina/loader/WebappClassLoader.PrivilegedFindResource.html
+webapps/docs/api/org/apache/catalina/loader/WebappClassLoader.PrivilegedFindResourceByName.html
webapps/docs/api/org/apache/catalina/loader/WebappClassLoader.PrivilegedGetClassLoader.html
webapps/docs/api/org/apache/catalina/loader/WebappClassLoader.html
webapps/docs/api/org/apache/catalina/loader/WebappLoader.html
@@ -314,12 +329,15 @@ webapps/docs/api/org/apache/catalina/man
webapps/docs/api/org/apache/catalina/mbeans/
webapps/docs/api/org/apache/catalina/mbeans/ClassNameMBean.html
webapps/docs/api/org/apache/catalina/mbeans/ConnectorMBean.html
+webapps/docs/api/org/apache/catalina/mbeans/Constants.html
webapps/docs/api/org/apache/catalina/mbeans/ContextEnvironmentMBean.html
webapps/docs/api/org/apache/catalina/mbeans/ContextResourceLinkMBean.html
webapps/docs/api/org/apache/catalina/mbeans/ContextResourceMBean.html
webapps/docs/api/org/apache/catalina/mbeans/DefaultContextMBean.html
webapps/docs/api/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.html
webapps/docs/api/org/apache/catalina/mbeans/GroupMBean.html
+webapps/docs/api/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.RmiClientLocalhostSocketFactory.html
+webapps/docs/api/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.html
webapps/docs/api/org/apache/catalina/mbeans/MBeanFactory.html
webapps/docs/api/org/apache/catalina/mbeans/MBeanUtils.html
webapps/docs/api/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.html
@@ -347,6 +365,7 @@ webapps/docs/api/org/apache/catalina/rea
webapps/docs/api/org/apache/catalina/realm/JAASMemoryLoginModule.html
webapps/docs/api/org/apache/catalina/realm/JAASRealm.html
webapps/docs/api/org/apache/catalina/realm/JDBCRealm.html
+webapps/docs/api/org/apache/catalina/realm/JNDIRealm.User.html
webapps/docs/api/org/apache/catalina/realm/JNDIRealm.html
webapps/docs/api/org/apache/catalina/realm/LockOutRealm.LockRecord.html
webapps/docs/api/org/apache/catalina/realm/LockOutRealm.html
@@ -382,6 +401,7 @@ webapps/docs/api/org/apache/catalina/ses
webapps/docs/api/org/apache/catalina/session/Constants.html
webapps/docs/api/org/apache/catalina/session/FileStore.html
webapps/docs/api/org/apache/catalina/session/JDBCStore.html
+webapps/docs/api/org/apache/catalina/session/ManagerBase.SessionTiming.html
webapps/docs/api/org/apache/catalina/session/ManagerBase.html
webapps/docs/api/org/apache/catalina/session/PersistentManager.html
webapps/docs/api/org/apache/catalina/session/PersistentManagerBase.html
@@ -609,6 +629,7 @@ webapps/docs/api/org/apache/catalina/tri
webapps/docs/api/org/apache/catalina/tribes/util/Arrays.html
webapps/docs/api/org/apache/catalina/tribes/util/Logs.html
webapps/docs/api/org/apache/catalina/tribes/util/StringManager.html
+webapps/docs/api/org/apache/catalina/tribes/util/TcclThreadFactory.html
webapps/docs/api/org/apache/catalina/tribes/util/UUIDGenerator.html
webapps/docs/api/org/apache/catalina/tribes/util/package-frame.html
webapps/docs/api/org/apache/catalina/tribes/util/package-summary.html
@@ -708,6 +729,7 @@ webapps/docs/api/org/apache/catalina/val
webapps/docs/api/org/apache/catalina/valves/PersistentValve.html
webapps/docs/api/org/apache/catalina/valves/RemoteAddrValve.html
webapps/docs/api/org/apache/catalina/valves/RemoteHostValve.html
+webapps/docs/api/org/apache/catalina/valves/RemoteIpValve.html
webapps/docs/api/org/apache/catalina/valves/RequestDumperValve.html
webapps/docs/api/org/apache/catalina/valves/RequestFilterValve.html
webapps/docs/api/org/apache/catalina/valves/SSLValve.html
@@ -774,6 +796,7 @@ webapps/docs/api/org/apache/coyote/http1
webapps/docs/api/org/apache/coyote/http11/filters/BufferedInputFilter.html
webapps/docs/api/org/apache/coyote/http11/filters/ChunkedInputFilter.html
webapps/docs/api/org/apache/coyote/http11/filters/ChunkedOutputFilter.html
+webapps/docs/api/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.html
webapps/docs/api/org/apache/coyote/http11/filters/GzipOutputFilter.FakeOutputStream.html
webapps/docs/api/org/apache/coyote/http11/filters/GzipOutputFilter.html
webapps/docs/api/org/apache/coyote/http11/filters/IdentityInputFilter.html
@@ -878,6 +901,7 @@ webapps/docs/api/org/apache/el/util/
webapps/docs/api/org/apache/el/util/ConcurrentCache.html
webapps/docs/api/org/apache/el/util/MessageFactory.html
webapps/docs/api/org/apache/el/util/ReflectionUtil.html
+webapps/docs/api/org/apache/el/util/Validation.html
webapps/docs/api/org/apache/el/util/package-frame.html
webapps/docs/api/org/apache/el/util/package-summary.html
webapps/docs/api/org/apache/el/util/package-tree.html
@@ -892,6 +916,7 @@ webapps/docs/api/org/apache/jasper/compi
webapps/docs/api/org/apache/jasper/compiler/AntCompiler.JasperAntLogger.html
webapps/docs/api/org/apache/jasper/compiler/AntCompiler.SystemLogHandler.html
webapps/docs/api/org/apache/jasper/compiler/AntCompiler.html
+webapps/docs/api/org/apache/jasper/compiler/AttributeParser.html
webapps/docs/api/org/apache/jasper/compiler/BeanRepository.html
webapps/docs/api/org/apache/jasper/compiler/Compiler.html
webapps/docs/api/org/apache/jasper/compiler/ELFunctionMapper.html
@@ -1125,6 +1150,8 @@ webapps/docs/api/org/apache/naming/Trans
webapps/docs/api/org/apache/naming/factory/
webapps/docs/api/org/apache/naming/factory/BeanFactory.html
webapps/docs/api/org/apache/naming/factory/Constants.html
+webapps/docs/api/org/apache/naming/factory/DataSourceLinkFactory.DataSourceHandler.html
+webapps/docs/api/org/apache/naming/factory/DataSourceLinkFactory.html
webapps/docs/api/org/apache/naming/factory/EjbFactory.html
webapps/docs/api/org/apache/naming/factory/MailSessionFactory.html
webapps/docs/api/org/apache/naming/factory/OpenEjbFactory.html
@@ -1229,6 +1256,7 @@ webapps/docs/api/org/apache/tomcat/packa
webapps/docs/api/org/apache/tomcat/util/
webapps/docs/api/org/apache/tomcat/util/DomUtil.NullResolver.html
webapps/docs/api/org/apache/tomcat/util/DomUtil.html
+webapps/docs/api/org/apache/tomcat/util/ExceptionUtils.html
webapps/docs/api/org/apache/tomcat/util/IntrospectionUtils.AttributeHolder.html
webapps/docs/api/org/apache/tomcat/util/IntrospectionUtils.PropertySource.html
webapps/docs/api/org/apache/tomcat/util/IntrospectionUtils.html
@@ -1523,6 +1551,7 @@ webapps/docs/config/cluster.html
webapps/docs/config/context.html
webapps/docs/config/engine.html
webapps/docs/config/executor.html
+webapps/docs/config/filter.html
webapps/docs/config/globalresources.html
webapps/docs/config/host.html
webapps/docs/config/http.html
@@ -1582,9 +1611,14 @@ webapps/docs/setup.html
webapps/docs/ssi-howto.html
webapps/docs/ssl-howto.html
webapps/docs/tribes/
+webapps/docs/tribes/developers.html
webapps/docs/tribes/faq.html
+webapps/docs/tribes/interceptors.html
webapps/docs/tribes/introduction.html
+webapps/docs/tribes/membership.html
webapps/docs/tribes/setup.html
+webapps/docs/tribes/status.html
+webapps/docs/tribes/transport.html
webapps/docs/virtual-hosting-howto.html
webapps/docs/windows-service-howto.html
webapps/examples/
@@ -1730,8 +1764,8 @@ webapps/examples/jsp/cal/cal2.jsp.html
webapps/examples/jsp/cal/calendar.html
webapps/examples/jsp/cal/login.html
webapps/examples/jsp/chat/
-webapps/examples/jsp/chat/chat.jsp
-webapps/examples/jsp/chat/chat.jsp.html
+webapps/examples/jsp/chat/index.jsp
+webapps/examples/jsp/chat/index.jsp.html
webapps/examples/jsp/chat/login.jsp
webapps/examples/jsp/chat/login.jsp.html
webapps/examples/jsp/chat/post.jsp
Index: v6/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/www/tomcat/v6/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- v6/pkg/PLIST-main 15 Nov 2010 10:45:54 -0000 1.2
+++ v6/pkg/PLIST-main 30 Jun 2011 15:07:18 -0000
@@ -80,9 +80,9 @@ tomcat/bin/
tomcat/bin/bootstrap.jar
tomcat/bin/catalina-tasks.xml
tomcat/bin/catalina.sh
+tomcat/bin/commons-daemon-native.tar.gz
tomcat/bin/commons-daemon.jar
tomcat/bin/digest.sh
-tomcat/bin/jsvc.tar.gz
tomcat/bin/setclasspath.sh
tomcat/bin/shutdown.sh
tomcat/bin/startup.sh
@@ -96,9 +96,9 @@ tomcat/lib/catalina-ant.jar
tomcat/lib/catalina-ha.jar
tomcat/lib/catalina-tribes.jar
tomcat/lib/catalina.jar
+tomcat/lib/ecj-3.3.1.jar
tomcat/lib/el-api.jar
tomcat/lib/jasper-el.jar
-tomcat/lib/jasper-jdt.jar
tomcat/lib/jasper.jar
tomcat/lib/jsp-api.jar
tomcat/lib/servlet-api.jar
@@ -109,6 +109,8 @@ tomcat/lib/tomcat-i18n-fr.jar
tomcat/lib/tomcat-i18n-ja.jar
tomcat/webapps/
tomcat/webapps/host-manager/
+tomcat/webapps/host-manager/401.jsp
+tomcat/webapps/host-manager/403.jsp
tomcat/webapps/host-manager/META-INF/
tomcat/webapps/host-manager/META-INF/context.xml
tomcat/webapps/host-manager/WEB-INF/
@@ -126,9 +128,13 @@ tomcat/webapps/host-manager/images/void.
tomcat/webapps/host-manager/manager.xml
tomcat/webapps/manager/
tomcat/webapps/manager/401.jsp
+tomcat/webapps/manager/403.jsp
tomcat/webapps/manager/META-INF/
tomcat/webapps/manager/META-INF/context.xml
tomcat/webapps/manager/WEB-INF/
+tomcat/webapps/manager/WEB-INF/jsp/
+tomcat/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
+tomcat/webapps/manager/WEB-INF/jsp/sessionsList.jsp
tomcat/webapps/manager/WEB-INF/web.xml
tomcat/webapps/manager/images/
tomcat/webapps/manager/images/add.gif
@@ -140,8 +146,6 @@ tomcat/webapps/manager/images/fix.gif
tomcat/webapps/manager/images/tomcat.gif
tomcat/webapps/manager/images/update.gif
tomcat/webapps/manager/images/void.gif
-tomcat/webapps/manager/sessionDetail.jsp
-tomcat/webapps/manager/sessionsList.jsp
tomcat/webapps/manager/status.xsd
tomcat/webapps/manager/xform.xsl
@extraunexec rm -rf ${CATALINA_BASE}/logs/* ${CATALINA_BASE}/work/*
Index: v6/pkg/README-main
===================================================================
RCS file: /cvs/ports/www/tomcat/v6/pkg/README-main,v
retrieving revision 1.2
diff -u -p -r1.2 README-main
--- v6/pkg/README-main 2 Jun 2011 13:41:42 -0000 1.2
+++ v6/pkg/README-main 30 Jun 2011 15:07:18 -0000
@@ -11,10 +11,10 @@ documentation. Sample config files for
in ${TRUEPREFIX}/share/examples/tomcat.
The tomcat-examples package includes the examples, full documentation
-and localhost config file for the and manager webapp.
+and the localhost config file for the manager webapp.
The packages are structured this way to facilate mantaining a server
-which normally would not contain the examples and documentation webapp.
+which normally would not contain the examples and documentation webapps.
Tomcat on OpenBSD uses the `${SYSCONFDIR}/tomcat' directory for its
configuration files. `$CATALINA_BASE' is `${CATALINA_BASE}'. All files
@@ -34,7 +34,7 @@ sure the Connector port is 80 in your
tcp traffic to port 80 to Tomcat's default listener port 8080 using a
pf.conf(5) rule like:
- pass quick on $NIC proto tcp to port 80 rdr-to 127.0.0.1 port 8080
+ pass in quick on $NIC proto tcp to port 80 rdr-to 127.0.0.1 port 8080
If you are upgrading and use database drivers, don't forget to copy them
into ${TRUEPREFIX}/tomcat/lib. You must also delete any work files in
