Update jakarta-servletapi, jakarta-tomcat, and ap-jk to version 3.2.4.

We are not advancing to the 3.3 or 4.0 branches at the moment, as neither
will work with our native JDK without a lot more work.

Changes since Tomcat 3.2.3 (the last pkgsrc version):

7.1 Fixes and Enhancements in Release 3.2.4

This section highlights the bugs fixed in this release.

  -  Cookie name expires is a reserved token (#1114)
  -  Thread initialization problem in thread pool (#1745)
  -  AJP12 returned invalid HTTP headers when redirecting to very
     long URLS (#2333)
  -  Fixed casting problem in JspFactoryImpl.getPageContext().  (#4260)
  -  Setting sesstion-timeout in web.xml did not prevent sessions from
     timing out.  (#4412)
  -  Fixed race condition in ServerSocketFactory.getDefault().  (#4418)
  -  Removed the restrictions on encoded spcecial characters in URLs
     that was added as a security precaution in 3.2.3.  The encoded
     special characters are not decoded and remain the URL and
     path info returned to servlets.
  -  Jk_nt_service now supports the ability to be restarted automatically
     by the Windows 2000 service control manager if Tomcat terminates
     abnormally.
  -  Fixed invalid servlet mapping in web.xml generated by JspC (#3474, #3499)
  -  Added findResource() and findResources() to AdaptiveClassLoader12
  -  A Date: HTTP header is now sent in responses when running stand
     alone. (#345)
  -  Simple held on to a reference to removed objects preventing
     garbage collection.
  -  Tomcat 3.2.4 now ships with JAXP 1.1.  Prior releases used
     JAXP 1.0.1.  Tomcat 3.2.4 remains completely compatible with
     the older version of JAXP and there is no requirement for users
     to upgrade to JAXP 1.1 unless their applications require the new
     version.
  -  Fixed NullPointerException in HttpConnectionHandler.  (#4577)


7.2 Security Vulnerabilities fixed in Tomcat 3.2.4

The randomness of generated session ids has been enhanced to prevent the
generation of guessable ids.

8 files changed, 77 insertions, 82 deletions

diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile
index 59949d62218..74deeaf4e96 100644
--- a/www/ap-jk/Makefile
+++ b/www/ap-jk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2002/02/28 18:32:18 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/04/19 15:54:20 jwise Exp $
 
-DISTNAME=	jakarta-tomcat-3.2.1-src
-PKGNAME=	ap-jk-3.2.1
+DISTNAME=	jakarta-tomcat-3.2.4-src
+PKGNAME=	ap-jk-3.2.4
 CATEGORIES=	www
-MASTER_SITES=	http://jakarta.apache.org/builds/tomcat/release/v3.2.1/src/
+MASTER_SITES=	http://jakarta.apache.org/builds/tomcat/release/v3.2.4/src/
 
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://jakarta.apache.org/
diff --git a/www/ap-jk/distinfo b/www/ap-jk/distinfo
index debcd007483..f2b355d0c2d 100644
--- a/www/ap-jk/distinfo
+++ b/www/ap-jk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2001/04/17 12:12:26 agc Exp $
+$NetBSD: distinfo,v 1.2 2002/04/19 15:54:20 jwise Exp $
 
-SHA1 (jakarta-tomcat-3.2.1-src.tar.gz) = c28d97378dcc1c9a15d15cae404733674ae91c9c
-SHA1 (patch-aa) = 916cb0718dfc1e73450ca0403dcc85e4e3a1bd28
+SHA1 (jakarta-tomcat-3.2.4-src.tar.gz) = 15592fa13356fc35eea97e59196ea99884613399
+Size (jakarta-tomcat-3.2.4-src.tar.gz) = 982282 bytes
diff --git a/www/jakarta-servletapi/Makefile b/www/jakarta-servletapi/Makefile
index 6a049a832b4..d7e160acbb9 100644
--- a/www/jakarta-servletapi/Makefile
+++ b/www/jakarta-servletapi/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.8 2002/04/19 13:12:43 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/04/19 15:54:21 jwise Exp $
 
-DISTNAME=	jakarta-servletapi-3.2.3-src
-PKGNAME=	jakarta-servletapi-3.2.3
+DISTNAME=	jakarta-servletapi-3.2.4-src
+PKGNAME=	jakarta-servletapi-3.2.4
 CATEGORIES=	www
-MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.2.3/src/
+MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.2.4/src/
 
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://jakarta.apache.org/
 COMMENT=	the Apache project's implementation of the JSP and Java Servlet APIs
 
-DEPENDS+=	jakarta-ant>=1.3:../../devel/jakarta-ant
+BUILD_DEPENDS+=	jakarta-ant>=1.4.1:../../devel/jakarta-ant
 
 USE_JAVA=	yes
 
diff --git a/www/jakarta-servletapi/distinfo b/www/jakarta-servletapi/distinfo
index cf54983946a..7cc45c2682c 100644
--- a/www/jakarta-servletapi/distinfo
+++ b/www/jakarta-servletapi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/08/11 22:05:22 jwise Exp $
+$NetBSD: distinfo,v 1.4 2002/04/19 15:54:21 jwise Exp $
 
-SHA1 (jakarta-servletapi-3.2.3-src.tar.gz) = a9369507fd6c9ec05a48ba5a1d16530ec90a5ca0
-Size (jakarta-servletapi-3.2.3-src.tar.gz) = 101172 bytes
+SHA1 (jakarta-servletapi-3.2.4-src.tar.gz) = 3c70d36813b30fafae3b65438a629c6331b53432
+Size (jakarta-servletapi-3.2.4-src.tar.gz) = 101506 bytes
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index ee88aaea18a..c15ae94fdcb 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.27 2002/04/09 18:24:51 jwise Exp $
+# $NetBSD: Makefile,v 1.28 2002/04/19 15:54:21 jwise Exp $
 
-DISTNAME=	jakarta-tomcat-3.2.3-src
-PKGNAME=	jakarta-tomcat-3.2.3
-PKGREVISION=	1
+DISTNAME=	jakarta-tomcat-3.2.4-src
+PKGNAME=	jakarta-tomcat-3.2.4
 CATEGORIES=	www
-MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.2.3/src/
+MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.2.4/src/
 
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://jakarta.apache.org/
 COMMENT=	the Apache Project's Java Servlet 2.2 and JSP 1.1 server
 
 DEPENDS+=	jakarta-servletapi-[0-9]*:../../www/jakarta-servletapi
+BUILD_DEPENDS+=	jakarta-ant>=1.4.1:../../devel/jakarta-ant
 
 USE_JAVA=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
@@ -32,6 +32,7 @@ post-patch:
 	${RM} -f ${WRKSRC}/src/etc/workers.properties.orig
 	${RM} -f ${WRKSRC}/src/share/org/apache/tomcat/facade/RequestDispatcherImpl.java.orig
 	${RM} -f ${WRKSRC}/src/share/org/apache/tomcat/task/ApacheConfig.java.orig
+	${RM} -f ${WRKSRC}/src/share/org/apache/tomcat/loader/AdaptiveClassLoader.java.orig
 
 post-build:
 	${SED}	-e "s|@PREFIX@|${PREFIX}|g"				\
diff --git a/www/jakarta-tomcat/distinfo b/www/jakarta-tomcat/distinfo
index 08485d45bff..9e211b0d302 100644
--- a/www/jakarta-tomcat/distinfo
+++ b/www/jakarta-tomcat/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.4 2001/08/11 22:05:23 jwise Exp $
+$NetBSD: distinfo,v 1.5 2002/04/19 15:54:21 jwise Exp $
 
-SHA1 (jakarta-tomcat-3.2.3-src.tar.gz) = e113986a4f7f414d3adf127a1c9fbdc4c41c84fe
-Size (jakarta-tomcat-3.2.3-src.tar.gz) = 981958 bytes
-SHA1 (patch-aa) = b532decf4c4f205125f4114d8f763044541112c5
+SHA1 (jakarta-tomcat-3.2.4-src.tar.gz) = 15592fa13356fc35eea97e59196ea99884613399
+Size (jakarta-tomcat-3.2.4-src.tar.gz) = 982282 bytes
+SHA1 (patch-aa) = 3752f658c8a8a26d5c000e5acdcca1d8a2643ada
 SHA1 (patch-ab) = 759c6373af773d45931bba58e512e4be50dfdc9e
 SHA1 (patch-ac) = 3bdcc53f7f8649131d2d9f37c82f2d833f497281
 SHA1 (patch-ad) = 6bf096f144865af5b9f0fddfe913632d7ef893c1
+SHA1 (patch-ae) = 182cdcae7df89c6d6cbaa9ca05cced8030c3eda6
diff --git a/www/jakarta-tomcat/patches/patch-aa b/www/jakarta-tomcat/patches/patch-aa
index 05a5ea10b67..f55e27c9804 100644
--- a/www/jakarta-tomcat/patches/patch-aa
+++ b/www/jakarta-tomcat/patches/patch-aa
@@ -1,11 +1,18 @@
---- build.xml.orig	Tue Jul 17 07:25:27 2001
-+++ build.xml	Sat Aug 11 15:23:28 2001
-@@ -5,11 +5,11 @@
-   <property name="ant.home" value="../jakarta-ant"/>
-   <property name="debug" value="on"/>
+--- build.xml.orig	Fri Oct 26 09:59:03 2001
++++ build.xml	Fri Apr 19 11:25:00 2002
+@@ -2,15 +2,15 @@
+ 
+ 
+   <!-- ==================== Initialization properties ===================== -->
+-  <property name="ant.home" value="../jakarta-ant"/>
+-  <property name="debug" value="on"/>
++  <property name="ant.home" value="${pkgsrc.prefix}"/>
++  <property name="debug" value="off"/>
    <property name="j2ee.home" value="../../j2ee/build/unix"/>
--  <property name="jaxp" value="../jaxp-1.0.1" />
+-  <property name="jaxp" value="../jaxp-1.1/jaxp.jar" />
+-  <property name="parser" value="../jaxp-1.1/crimson.jar" />
 +  <property name="jaxp" value="${pkgsrc.prefix}/lib/java" />
++  <property name="parser" value="${pkgsrc.prefix}/lib/java/crimson.jar" />
    <property name="optimize" value="true" />
 -  <property name="servlet.jar" value="../jakarta-servletapi/lib/servlet.jar"/>
 +  <property name="servlet.jar" value="${pkgsrc.prefix}/lib/java/servlet.jar"/>
@@ -15,7 +22,7 @@
  
  
    <!-- ======================== Copy static files ========================= -->
-@@ -30,14 +30,18 @@
+@@ -31,14 +31,18 @@
  
      <!-- Copy executables and scripts -->
      <copy todir="${tomcat.build}/bin">
@@ -36,84 +43,50 @@
      <copy tofile="${tomcat.build}/conf/build.xml"
              file="build.xml"/>
  
-@@ -50,14 +54,16 @@
+@@ -51,6 +55,7 @@
      <copy tofile="${tomcat.build}/KEYS" file="KEYS"/>
  
      <!-- Copy library JAR files -->
--    <copy tofile="${tomcat.build}/lib/ant.jar"
--            file="${ant.home}/lib/ant.jar"/>
--    <copy tofile="${tomcat.build}/lib/servlet.jar"
--            file="${servlet.jar}"/>
--    <copy tofile="${tomcat.build}/lib/jaxp.jar"
--            file="${jaxp}/jaxp.jar"/>
--    <copy tofile="${tomcat.build}/lib/parser.jar"
--            file="${jaxp}/parser.jar"/>
 +    <!--
-+    	<copy tofile="${tomcat.build}/lib/ant.jar"
-+       	      file="${ant.home}/lib/ant.jar"/>
-+    	<copy tofile="${tomcat.build}/lib/servlet.jar"
-+      	      file="${servlet.jar}"/>
-+    	<copy tofile="${tomcat.build}/lib/jaxp.jar"
-+      	      file="${jaxp}/jaxp.jar"/>
-+    	<copy tofile="${tomcat.build}/lib/parser.jar"
-+       	      file="${jaxp}/parser.jar"/>
+     <copy tofile="${tomcat.build}/lib/ant.jar"
+             file="${ant.home}/lib/ant.jar"/>
+     <copy tofile="${tomcat.build}/lib/servlet.jar"
+@@ -59,6 +64,7 @@
+             file="${jaxp}"/>
+     <copy todir="${tomcat.build}/lib"
+             file="${parser}"/>
 +    -->
  
      <!-- Copy golden files for the tests webapp -->
      <copy todir="${tomcat.build}/lib/test/Golden">
-@@ -66,9 +72,11 @@
+@@ -67,9 +73,11 @@
  
      <!-- Fixups for line endings and executable permissions -->
      <fixcrlf srcdir="${tomcat.build}" includes="**/*.sh" cr="remove"/>
--    <fixcrlf srcdir="${tomcat.build}" includes="**/*.bat" cr="add"/>
--    <chmod perm="+x" file="${tomcat.build}/bin/ant"/>
--    <chmod perm="+x" file="${tomcat.build}/bin/antRun"/>
 +    <!--
-+    	<fixcrlf srcdir="${tomcat.build}" includes="**/*.bat" cr="add"/>
-+    	<chmod perm="+x" file="${tomcat.build}/bin/ant"/>
-+    	<chmod perm="+x" file="${tomcat.build}/bin/antRun"/>
+     <fixcrlf srcdir="${tomcat.build}" includes="**/*.bat" cr="add"/>
+     <chmod perm="+x" file="${tomcat.build}/bin/ant"/>
+     <chmod perm="+x" file="${tomcat.build}/bin/antRun"/>
 +    -->
      <chmod perm="+x" file="${tomcat.build}/bin/jspc.sh"/>
      <chmod perm="+x" file="${tomcat.build}/bin/startup.sh"/>
      <chmod perm="+x" file="${tomcat.build}/bin/shutdown.sh"/>
-@@ -82,8 +90,10 @@
-   <target name="tomcat" depends="prepare">
- 
-     <!-- Determine availability of optional components -->
-+    <!-- no JSSE yet
-     <available property="jsse.present" 
-                classname="com.sun.net.ssl.internal.ssl.Provider" />
-+    -->
-     <available property="jdk12.present"
-                classname="java.security.PrivilegedAction" />
- 
-@@ -95,6 +105,8 @@
+@@ -96,6 +104,8 @@
             deprecation="off" >
             <exclude name="**/Jdk12Interceptor.java" 
                      unless="jdk12.present"/>
-+           <exclude name="**/Jdk12Support.java" 
++           <exclude name="**/Jdk12Support.java"
 +                    unless="jdk12.present"/>
             <exclude name="**/SetSecurityManager.java" 
                      unless="jdk12.present"/>
             <exclude name="**/EmbededTomcat.java" 
-@@ -107,6 +119,8 @@
-                     unless="jdk12.present"/>
-            <exclude name="**/SSLSocketFactory.java"
-                     unless="jsse.present" />
-+           <exclude name="**/EmbededTomcat.java" 
-+                    unless="jsse.present"/>
-     </javac>
- 
-     <!-- Copy the corresponding resource files -->
-@@ -203,8 +217,10 @@
+@@ -204,8 +214,10 @@
      </copy>
  
      <!-- Fixups for executable permissions -->
--    <chmod perm="+x" file="${tomcat.dist}/bin/ant"/>
--    <chmod perm="+x" file="${tomcat.dist}/bin/antRun"/>
 +    <!--
-+    	<chmod perm="+x" file="${tomcat.dist}/bin/ant"/>
-+    	<chmod perm="+x" file="${tomcat.dist}/bin/antRun"/>
+     <chmod perm="+x" file="${tomcat.dist}/bin/ant"/>
+     <chmod perm="+x" file="${tomcat.dist}/bin/antRun"/>
 +    -->
      <chmod perm="+x" file="${tomcat.dist}/bin/jspc.sh"/>
      <chmod perm="+x" file="${tomcat.dist}/bin/startup.sh"/>
diff --git a/www/jakarta-tomcat/patches/patch-ae b/www/jakarta-tomcat/patches/patch-ae
new file mode 100644
index 00000000000..00cdda27be6
--- /dev/null
+++ b/www/jakarta-tomcat/patches/patch-ae
@@ -0,0 +1,20 @@
+--- src/share/org/apache/tomcat/loader/AdaptiveClassLoader.java.orig	Fri Apr 19 10:40:20 2002
++++ src/share/org/apache/tomcat/loader/AdaptiveClassLoader.java	Fri Apr 19 10:40:48 2002
+@@ -813,7 +813,7 @@
+               if (resFile.exists()) {
+                   // Build a file:// URL form the file name
+                   try {
+-                      urls.add( new URL("file", null, resFile.getAbsolutePath()) );
++                      urls.addElement( new URL("file", null, resFile.getAbsolutePath()) );
+                       if(justOne) return urls;
+                   } catch(java.net.MalformedURLException badurl) {
+                       badurl.printStackTrace();
+@@ -832,7 +832,7 @@
+ 
+                   if (ze != null) {
+                       try {
+-                          urls.add( new URL("jar:file:" + file.getAbsolutePath() + "!/" + name) );
++                          urls.addElement( new URL("jar:file:" + file.getAbsolutePath() + "!/" + name) );
+                           if(justOne) return urls;
+                       } catch(java.net.MalformedURLException badurl) {
+                           badurl.printStackTrace();