CVS commit: pkgsrc/www/apache-tomcat55

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/apache-tomcat55
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Thu, 18 Jul 2024 12:52:24 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Thu Jul 18 12:52:24 UTC 2024

Modified Files:
        pkgsrc/www/apache-tomcat55: Makefile PLIST distinfo
Added Files:
        pkgsrc/www/apache-tomcat55/patches: patch-bin_catalina.sh
Removed Files:
        pkgsrc/www/apache-tomcat55/files: getsite.sh

Log Message:
www/apache-tomcat55: Update to 5.5.36

Changelog:
Tomcat 5.5.36 (markt)
    General
        update Update to Apache Commons Daemon 1.0.10. (markt)

        update Update to Apache Commons Pool 1.5.7. (markt)

        update Update to Apache Tomcat Native 1.1.24. (markt)

        update Update to Eclipse JDT 3.7.2. (markt)

    Catalina
        fix  52677: The new SetCharacterEncodingFilter needs to implement
             Filter to be useful. (markt)

             53050: Fix XOR arithmetics and charset issue when calculating
        fix  entropy to initialize random numbers generator in session manager.
             Based on a proposal by Andras Rozsa. (kkolinko/jim)

        fix  53531: Better checking and improved error messages for directory
             creation during automatic deployment. (schultz/kkolinko)

             Various improvements to the DIGEST authenticator including 52954,
        fix  the disabling caching of an authenticated user in the session by
             default, tracking server rather than client nonces and better
             handling of stale nonce values. (markt)

        code Remove unneeded handling of FORM authentication in RealmBase.
             (kkolinko)

        fix  53830: Better handling of Manager.randomFile default value on
             Windows. (kkolinko)

    Coyote
        fix Ensure that the chunked input filter is correctly recycled between
            requests. (kkolinko/jim)

        add Implement the maxHeaderCount for the HTTP connectors. (kkolinko)

            42181: Better handling of edge conditions in chunk header
        fix processing. Improve chunk header parsing. Properly ignore
            chunk-extension suffix, not trying to parse digits contained in it.
            Reject chunks whose header is incorrect. (kkolinko)

    Webapps
        fix 52641: Remove mentioning of ldap.jar from docs. Patch provided by
            Felix Schumacher. (rjung)

        fix 53158: Fix documented defaults for DBCP. Patch provided by
            ph.dezanneau at gmail.com. (rjung)

    Other
        fix    52640: Correct set the endorsed directory location when using
               the Windows installer. (markt)

        update 52579: Add a note about Sun's Charset.decode() bug to the
               RELEASE-NOTES file. (kkolinko)


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/apache-tomcat55/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/apache-tomcat55/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/apache-tomcat55/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/apache-tomcat55/files/getsite.sh
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/apache-tomcat55/patches/patch-bin_catalina.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/apache-tomcat55/Makefile
diff -u pkgsrc/www/apache-tomcat55/Makefile:1.23 pkgsrc/www/apache-tomcat55/Makefile:1.24
--- pkgsrc/www/apache-tomcat55/Makefile:1.23    Wed Apr 29 19:44:49 2020
+++ pkgsrc/www/apache-tomcat55/Makefile Thu Jul 18 12:52:23 2024
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.23 2020/04/29 19:44:49 maya Exp $
+# $NetBSD: Makefile,v 1.24 2024/07/18 12:52:23 ryoon Exp $
 
 DISTNAME=      apache-tomcat-${TOMCAT_VERSION}
 CATEGORIES=    www java
-# The list of sites to download is generated by an apache website.
-# The getsite.sh script parses the HTML and extracts the urls.
+MASTER_SITES=  ${MASTER_SITE_APACHE:=tomcat/tomcat-5/v${TOMCAT_VERSION}/bin/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://tomcat.apache.org/
 COMMENT=       The Apache Project's Java Servlet 2.4 and JSP 2.0 server
-
 LICENSE=       apache-2.0
 
-TOMCAT_VERSION=        5.5.35
+TOMCAT_VERSION=        5.5.36
 
 USE_JAVA=      run
 # This needs java 1.5 or higher.
@@ -55,6 +53,9 @@ FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME:
 # post-configure:
 #      @(cd ${WRKSRC}/jsvc-src ; ${SH} ./configure)
 
+post-patch:
+       ${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
+
 do-build:
        ${MV} ${WRKSRC}/conf ${WRKDIR}
 

Index: pkgsrc/www/apache-tomcat55/PLIST
diff -u pkgsrc/www/apache-tomcat55/PLIST:1.10 pkgsrc/www/apache-tomcat55/PLIST:1.11
--- pkgsrc/www/apache-tomcat55/PLIST:1.10       Tue Mar 11 14:05:17 2014
+++ pkgsrc/www/apache-tomcat55/PLIST    Thu Jul 18 12:52:23 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2014/03/11 14:05:17 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.11 2024/07/18 12:52:23 ryoon Exp $
 tomcat/LICENSE
 tomcat/NOTICE
 tomcat/RELEASE-NOTES
@@ -30,7 +30,7 @@ tomcat/common/i18n/tomcat-i18n-es.jar
 tomcat/common/i18n/tomcat-i18n-fr.jar
 tomcat/common/i18n/tomcat-i18n-ja.jar
 tomcat/common/lib/commons-el.jar
-tomcat/common/lib/ecj-3.7.jar
+tomcat/common/lib/ecj-3.7.2.jar
 tomcat/common/lib/jasper-compiler.jar
 tomcat/common/lib/jasper-runtime.jar
 tomcat/common/lib/jsp-api.jar
@@ -826,14 +826,12 @@ tomcat/webapps/webdav/WEB-INF/web.xml
 tomcat/webapps/webdav/index.html
 tomcat/webapps/webdav/tomcat-power.gif
 tomcat/webapps/webdav/tomcat.gif
-@pkgdir tomcat/common/classes
-@pkgdir tomcat/common/endorsed
-@pkgdir tomcat/logs
-@pkgdir tomcat/server/classes
-@pkgdir tomcat/shared/classes
-@pkgdir tomcat/shared/lib
-@pkgdir tomcat/temp
-@pkgdir tomcat/webapps/balancer/images
 @pkgdir tomcat/work
-@unexec ${RM} -rf %D/tomcat/temp 2> /dev/null || ${TRUE}
-@unexec ${RM} -rf %D/tomcat/work 2> /dev/null || ${TRUE}
+@pkgdir tomcat/webapps/balancer/images
+@pkgdir tomcat/temp
+@pkgdir tomcat/shared/lib
+@pkgdir tomcat/shared/classes
+@pkgdir tomcat/server/classes
+@pkgdir tomcat/logs
+@pkgdir tomcat/common/endorsed
+@pkgdir tomcat/common/classes

Index: pkgsrc/www/apache-tomcat55/distinfo
diff -u pkgsrc/www/apache-tomcat55/distinfo:1.13 pkgsrc/www/apache-tomcat55/distinfo:1.14
--- pkgsrc/www/apache-tomcat55/distinfo:1.13    Tue Oct 26 11:29:19 2021
+++ pkgsrc/www/apache-tomcat55/distinfo Thu Jul 18 12:52:23 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 11:29:19 nia Exp $
+$NetBSD: distinfo,v 1.14 2024/07/18 12:52:23 ryoon Exp $
 
-BLAKE2s (apache-tomcat-5.5.35.tar.gz) = ae76f143df56afd21b56e569a4698416c40f70be922f3c41e7fdd29075581bfd
-SHA512 (apache-tomcat-5.5.35.tar.gz) = 6f28354b0472c795369de761bf51a76a778891105bd464bcd7273dc8ca171d7af683258061bc06785d8a61af60c87a3012df91a9ba4a7c5efe46144316f6d1ad
-Size (apache-tomcat-5.5.35.tar.gz) = 9050646 bytes
+BLAKE2s (apache-tomcat-5.5.36.tar.gz) = 36df247f1175f87a5e686be00a6b14c931cfd63038b722c72993cee24db79408
+SHA512 (apache-tomcat-5.5.36.tar.gz) = d56ac6c77ccd1a6b251d050f83714e2ef770ec9012ac5231ffaac517ae7041d4a98cb5a161d28aceb5ca128f894cfb71d9e4ab3d2582306156579c59713bab13
+Size (apache-tomcat-5.5.36.tar.gz) = 9665826 bytes
+SHA1 (patch-bin_catalina.sh) = e9cb8176e6476e23a77876cc8f7f87264dad0424

Added files:

Index: pkgsrc/www/apache-tomcat55/patches/patch-bin_catalina.sh
diff -u /dev/null pkgsrc/www/apache-tomcat55/patches/patch-bin_catalina.sh:1.1
--- /dev/null   Thu Jul 18 12:52:24 2024
+++ pkgsrc/www/apache-tomcat55/patches/patch-bin_catalina.sh    Thu Jul 18 12:52:23 2024
@@ -0,0 +1,70 @@
+$NetBSD: patch-bin_catalina.sh,v 1.1 2024/07/18 12:52:23 ryoon Exp $
+
+* -Djava.endorsed.dirs is invalid for openjdk9 or later.
+  Fix invocation.
+
+--- bin/catalina.sh.orig       2024-07-18 12:46:12.815521328 +0000
++++ bin/catalina.sh
+@@ -238,7 +238,7 @@ if [ "$1" = "debug" ] ; then
+       fi
+       shift
+       exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS  $CATALINA_OPTS \
+-        -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
++        -classpath "$CLASSPATH" \
+         -sourcepath "$CATALINA_HOME"/../../jakarta-tomcat-catalina/catalina/src/share \
+         -Djava.security.manager \
+         -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
+@@ -248,7 +248,7 @@ if [ "$1" = "debug" ] ; then
+         org.apache.catalina.startup.Bootstrap "$@" start
+     else
+       exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS  $CATALINA_OPTS \
+-        -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
++        -classpath "$CLASSPATH" \
+         -sourcepath "$CATALINA_HOME"/../../jakarta-tomcat-catalina/catalina/src/share \
+         -Dcatalina.base="$CATALINA_BASE" \
+         -Dcatalina.home="$CATALINA_HOME" \
+@@ -266,7 +266,7 @@ elif [ "$1" = "run" ]; then
+     fi
+     shift
+     exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS  $CATALINA_OPTS \
+-      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
++      -classpath "$CLASSPATH" \
+       -Djava.security.manager \
+       -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
+       -Dcatalina.base="$CATALINA_BASE" \
+@@ -275,7 +275,7 @@ elif [ "$1" = "run" ]; then
+       org.apache.catalina.startup.Bootstrap "$@" start
+   else
+     exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS  $CATALINA_OPTS \
+-      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
++      -classpath "$CLASSPATH" \
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+@@ -292,7 +292,7 @@ elif [ "$1" = "start" ] ; then
+     fi
+     shift
+     "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS  $CATALINA_OPTS \
+-      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
++      -classpath "$CLASSPATH" \
+       -Djava.security.manager \
+       -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
+       -Dcatalina.base="$CATALINA_BASE" \
+@@ -306,7 +306,7 @@ elif [ "$1" = "start" ] ; then
+       fi
+   else
+     "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS  $CATALINA_OPTS \
+-      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
++      -classpath "$CLASSPATH" \
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+@@ -328,7 +328,7 @@ elif [ "$1" = "stop" ] ; then
+   fi
+ 
+   "$_RUNJAVA" $JAVA_OPTS \
+-    -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
++    -classpath "$CLASSPATH" \
+     -Dcatalina.base="$CATALINA_BASE" \
+     -Dcatalina.home="$CATALINA_HOME" \
+     -Djava.io.tmpdir="$CATALINA_TMPDIR" \

Prev by Date: CVS commit: pkgsrc/www
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/www
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index