[Git][java-team/tomcat9][master] Refresh patches
Bastien Roucariès (@rouca)
gitlab at salsa.debian.org
Sun Feb 1 15:17:01 GMT 2026
Bastien Roucariès pushed to branch master at Debian Java Maintainers / tomcat9
Commits:
de983ce6 by Bastien Roucariès at 2026-02-01T16:16:35+01:00
Refresh patches
- - - - -
12 changed files:
- debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch
- debian/patches/0005-skip-test-failures.patch
- debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch
- debian/patches/0010-debianize-build-xml.patch
- debian/patches/0013-dont-look-for-build-properties-in-user-home.patch
- debian/patches/0018-fix-manager-webapp.patch
- debian/patches/0019-add-distribution-to-error-page.patch
- debian/patches/0023-disable-shutdown-by-socket.patch
- debian/patches/0024-systemd-log-formatter.patch
- debian/patches/0026-easymock4-compatibility.patch
- debian/patches/disable-jacoco.patch
- debian/patches/exclude-TestJNDIRealmIntegration.patch
Changes:
=====================================
debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch
=====================================
@@ -3,9 +3,9 @@ Date: Mon, 28 Jun 2010 21:32:35 +0200
Subject: [PATCH] split deploy-webapps target from deploy target
Index: tomcat9/build.xml
===================================================================
---- tomcat9.orig/build.xml 2025-10-25 17:13:18.356179573 +0200
-+++ tomcat9/build.xml 2025-10-25 17:13:18.353017861 +0200
-@@ -1499,7 +1499,7 @@
+--- tomcat9.orig/build.xml 2026-02-01 16:12:32.372841684 +0100
++++ tomcat9/build.xml 2026-02-01 16:12:32.369894925 +0100
+@@ -1507,7 +1507,7 @@
</xslt>
</target>
@@ -14,7 +14,7 @@ Index: tomcat9/build.xml
description="Default. Builds a working Tomcat instance">
<copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
-@@ -1533,6 +1533,10 @@
+@@ -1541,6 +1541,10 @@
</fileset>
</copy>
=====================================
debian/patches/0005-skip-test-failures.patch
=====================================
@@ -3,9 +3,9 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
Index: tomcat9/build.xml
===================================================================
---- tomcat9.orig/build.xml 2025-10-25 17:13:23.268083954 +0200
-+++ tomcat9/build.xml 2025-10-25 17:13:23.264349815 +0200
-@@ -1961,8 +1961,10 @@
+--- tomcat9.orig/build.xml 2026-02-01 16:12:37.876187116 +0100
++++ tomcat9/build.xml 2026-02-01 16:12:37.873617893 +0100
+@@ -2067,8 +2067,10 @@
</filterchain>
</concat>
=====================================
debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch
=====================================
@@ -9,8 +9,8 @@ Bug-Debian: http://bugs.debian.org/585379
Forwarded: not-needed
Index: tomcat9/bin/catalina.sh
===================================================================
---- tomcat9.orig/bin/catalina.sh 2025-10-25 17:13:25.848363779 +0200
-+++ tomcat9/bin/catalina.sh 2025-10-25 17:13:25.847945200 +0200
+--- tomcat9.orig/bin/catalina.sh 2026-02-01 16:12:40.003850378 +0100
++++ tomcat9/bin/catalina.sh 2026-02-01 16:12:40.001565089 +0100
@@ -392,7 +392,7 @@
-classpath "$CLASSPATH" \
-sourcepath "$CATALINA_HOME"/../../java \
=====================================
debian/patches/0010-debianize-build-xml.patch
=====================================
@@ -10,9 +10,9 @@ Last-Update: 2011-05-16
Index: tomcat9/build.xml
===================================================================
---- tomcat9.orig/build.xml 2025-10-25 17:13:28.918550164 +0200
-+++ tomcat9/build.xml 2025-10-25 17:13:28.916483913 +0200
-@@ -1015,7 +1015,7 @@
+--- tomcat9.orig/build.xml 2026-02-01 16:12:42.955901911 +0100
++++ tomcat9/build.xml 2026-02-01 16:12:42.953566458 +0100
+@@ -1023,7 +1023,7 @@
</copy>
</target>
@@ -21,7 +21,7 @@ Index: tomcat9/build.xml
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
debug="${compile.debug}"
-@@ -1501,9 +1501,9 @@
+@@ -1509,9 +1509,9 @@
<target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples,deploy-webapps"
description="Default. Builds a working Tomcat instance">
=====================================
debian/patches/0013-dont-look-for-build-properties-in-user-home.patch
=====================================
@@ -5,9 +5,9 @@ Author: Jakub Adam <jakub.adam at ktknet.cz>
Forwarded: not-needed
Index: tomcat9/build.xml
===================================================================
---- tomcat9.orig/build.xml 2025-10-25 17:13:32.691621368 +0200
-+++ tomcat9/build.xml 2025-10-25 17:13:32.689325667 +0200
-@@ -858,7 +858,6 @@
+--- tomcat9.orig/build.xml 2026-02-01 16:12:45.853463016 +0100
++++ tomcat9/build.xml 2026-02-01 16:12:45.851454716 +0100
+@@ -860,7 +860,6 @@
<!-- Property that determines if manifests need updating -->
<uptodate property="manifests.uptodate"
targetfile="${tomcat.manifests}/default.manifest" >
=====================================
debian/patches/0018-fix-manager-webapp.patch
=====================================
@@ -6,8 +6,8 @@ Reviewed-By: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Last-Update: 2013-08-01
Index: tomcat9/webapps/host-manager/WEB-INF/manager.xml
===================================================================
---- tomcat9.orig/webapps/host-manager/WEB-INF/manager.xml 2025-10-25 16:56:03.646655877 +0200
-+++ tomcat9/webapps/host-manager/WEB-INF/manager.xml 2025-10-25 16:56:03.643872005 +0200
+--- tomcat9.orig/webapps/host-manager/WEB-INF/manager.xml 2026-02-01 16:12:48.297279609 +0100
++++ tomcat9/webapps/host-manager/WEB-INF/manager.xml 2026-02-01 16:12:48.293914190 +0100
@@ -20,7 +20,7 @@
Context configuration file for the Tomcat Manager Web App
@@ -19,8 +19,8 @@ Index: tomcat9/webapps/host-manager/WEB-INF/manager.xml
sameSiteCookies="strict" />
Index: tomcat9/webapps/docs/manager-howto.xml
===================================================================
---- tomcat9.orig/webapps/docs/manager-howto.xml 2025-10-25 16:56:03.646655877 +0200
-+++ tomcat9/webapps/docs/manager-howto.xml 2025-10-25 16:56:03.644135598 +0200
+--- tomcat9.orig/webapps/docs/manager-howto.xml 2026-02-01 16:12:48.297279609 +0100
++++ tomcat9/webapps/docs/manager-howto.xml 2026-02-01 16:12:48.294196632 +0100
@@ -73,7 +73,7 @@
<code>$CATALINA_BASE/conf/[enginename]/[hostname]</code> folder. Here is an
example:</p>
@@ -32,8 +32,8 @@ Index: tomcat9/webapps/docs/manager-howto.xml
<Valve className="org.apache.catalina.valves.RemoteCIDRValve"
Index: tomcat9/conf/catalina.policy
===================================================================
---- tomcat9.orig/conf/catalina.policy 2025-10-25 16:56:03.646655877 +0200
-+++ tomcat9/conf/catalina.policy 2025-10-25 16:56:03.644296143 +0200
+--- tomcat9.orig/conf/catalina.policy 2026-02-01 16:12:48.297279609 +0100
++++ tomcat9/conf/catalina.policy 2026-02-01 16:12:48.294396237 +0100
@@ -189,7 +189,7 @@
// - default CATALINA_HOME == CATALINA_BASE
// - CATALINA_HOME != CATALINA_BASE, per instance Manager in CATALINA_BASE
=====================================
debian/patches/0019-add-distribution-to-error-page.patch
=====================================
@@ -3,8 +3,10 @@ Description: Adds the name of the distribution to the version of Tomcat
Author: Yolanda Robla <yolanda.robla at canonical.com>
Forwarded: not-needed
Bug-Debian: http://bugs.debian.org/729840
---- a/java/org/apache/catalina/util/ServerInfo.properties
-+++ b/java/org/apache/catalina/util/ServerInfo.properties
+Index: tomcat9/java/org/apache/catalina/util/ServerInfo.properties
+===================================================================
+--- tomcat9.orig/java/org/apache/catalina/util/ServerInfo.properties 2026-02-01 16:12:51.042258495 +0100
++++ tomcat9/java/org/apache/catalina/util/ServerInfo.properties 2026-02-01 16:12:51.039682098 +0100
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
@@ -14,8 +16,10 @@ Bug-Debian: http://bugs.debian.org/729840
server.number=@VERSION_NUMBER@
server.built=@VERSION_BUILT@
server.built.iso=@VERSION_BUILT_ISO@
---- a/build.xml
-+++ b/build.xml
+Index: tomcat9/build.xml
+===================================================================
+--- tomcat9.orig/build.xml 2026-02-01 16:12:51.042258495 +0100
++++ tomcat9/build.xml 2026-02-01 16:12:51.040110272 +0100
@@ -285,6 +285,7 @@
<filter token="YEAR" value="${year}"/>
<filter token="VERSION" value="${version}"/>
=====================================
debian/patches/0023-disable-shutdown-by-socket.patch
=====================================
@@ -1,8 +1,10 @@
Description: Disables the shutdown port (8005) by default
Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
---- a/conf/server.xml
-+++ b/conf/server.xml
+Index: tomcat9/conf/server.xml
+===================================================================
+--- tomcat9.orig/conf/server.xml 2026-02-01 16:12:53.706597315 +0100
++++ tomcat9/conf/server.xml 2026-02-01 16:12:53.704218344 +0100
@@ -19,7 +19,7 @@
define subcomponents such as "Valves" at this level.
Documentation at /docs/config/server.html
=====================================
debian/patches/0024-systemd-log-formatter.patch
=====================================
@@ -1,8 +1,10 @@
Description: Adds a log formatter suitable for systemd
Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
---- /dev/null
-+++ b/java/org/apache/juli/SystemdFormatter.java
+Index: tomcat9/java/org/apache/juli/SystemdFormatter.java
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ tomcat9/java/org/apache/juli/SystemdFormatter.java 2026-02-01 16:12:56.602847657 +0100
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
=====================================
debian/patches/0026-easymock4-compatibility.patch
=====================================
@@ -6,11 +6,11 @@ Subject: 0026-easymock4-compatibility
.../valves/TestCrawlerSessionManagerValve.java | 28 +++++++++++-----------
1 file changed, 14 insertions(+), 14 deletions(-)
-diff --git a/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java b/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java
-index bce456e..dedd6c9 100644
---- a/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java
-+++ b/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java
-@@ -57,13 +57,13 @@ public class TestCrawlerSessionManagerValve {
+Index: tomcat9/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java
+===================================================================
+--- tomcat9.orig/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java 2026-02-01 16:12:59.159880489 +0100
++++ tomcat9/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java 2026-02-01 16:12:59.157483848 +0100
+@@ -57,13 +57,13 @@
CrawlerSessionManagerValve valve = new CrawlerSessionManagerValve();
valve.setCrawlerIps("216\\.58\\.206\\.174");
valve.setCrawlerUserAgents(valve.getCrawlerUserAgents());
@@ -26,7 +26,7 @@ index bce456e..dedd6c9 100644
EasyMock.verify(request, session);
}
-@@ -73,13 +73,13 @@ public class TestCrawlerSessionManagerValve {
+@@ -73,13 +73,13 @@
CrawlerSessionManagerValve valve = new CrawlerSessionManagerValve();
valve.setCrawlerIps("216\\.58\\.206\\.174");
valve.setCrawlerUserAgents(valve.getCrawlerUserAgents());
@@ -42,7 +42,7 @@ index bce456e..dedd6c9 100644
EasyMock.verify(request, session);
}
-@@ -90,7 +90,7 @@ public class TestCrawlerSessionManagerValve {
+@@ -90,7 +90,7 @@
valve.setCrawlerUserAgents(valve.getCrawlerUserAgents());
valve.setHostAware(true);
valve.setContextAware(true);
@@ -51,7 +51,7 @@ index bce456e..dedd6c9 100644
verifyCrawlingLocalhost(valve, "localhost");
verifyCrawlingLocalhost(valve, "example.invalid");
-@@ -102,7 +102,7 @@ public class TestCrawlerSessionManagerValve {
+@@ -102,7 +102,7 @@
valve.setCrawlerUserAgents(valve.getCrawlerUserAgents());
valve.setHostAware(true);
valve.setContextAware(true);
@@ -60,7 +60,7 @@ index bce456e..dedd6c9 100644
verifyCrawlingContext(valve, "/examples");
verifyCrawlingContext(valve, null);
-@@ -113,7 +113,7 @@ public class TestCrawlerSessionManagerValve {
+@@ -113,7 +113,7 @@
CrawlerSessionManagerValve valve = new CrawlerSessionManagerValve();
valve.setCrawlerIps("216\\.58\\.206\\.174");
valve.setCrawlerUserAgents(valve.getCrawlerUserAgents());
@@ -69,7 +69,7 @@ index bce456e..dedd6c9 100644
valve.setSessionInactiveInterval(0);
StandardSession session = new StandardSession(TEST_MANAGER);
session.setId("id");
-@@ -123,7 +123,7 @@ public class TestCrawlerSessionManagerValve {
+@@ -123,7 +123,7 @@
EasyMock.replay(request);
@@ -78,7 +78,7 @@ index bce456e..dedd6c9 100644
EasyMock.verify(request);
-@@ -142,7 +142,7 @@ public class TestCrawlerSessionManagerValve {
+@@ -142,7 +142,7 @@
EasyMock.replay(request, session);
@@ -87,7 +87,7 @@ index bce456e..dedd6c9 100644
EasyMock.verify(request, session);
}
-@@ -156,14 +156,14 @@ public class TestCrawlerSessionManagerValve {
+@@ -156,14 +156,14 @@
EasyMock.replay(request, session);
@@ -104,16 +104,16 @@ index bce456e..dedd6c9 100644
if (isBot) {
EasyMock.expect(session.getId()).andReturn("id").times(1);
session.setAttribute(EasyMock.eq(valve.getClass().getName()),
-@@ -182,7 +182,7 @@ public class TestCrawlerSessionManagerValve {
+@@ -182,7 +182,7 @@
private Request createRequestExpectations(String ip, HttpSession session, boolean isBot, String hostname,
String contextPath, String userAgent) {
- Request request = EasyMock.createMock(Request.class);
+ Request request = (Request) EasyMock.createMock(Request.class);
+ EasyMock.expect(request.getRemoteAddr()).andReturn(ip);
EasyMock.expect(request.getRemoteAddr()).andReturn(ip);
EasyMock.expect(request.getHost()).andReturn(simpleHostWithName(hostname));
- EasyMock.expect(request.getContext()).andReturn(simpleContextWithName(contextPath));
-@@ -196,7 +196,7 @@ public class TestCrawlerSessionManagerValve {
+@@ -198,7 +198,7 @@
}
private Host simpleHostWithName(String hostname) {
@@ -122,7 +122,7 @@ index bce456e..dedd6c9 100644
EasyMock.expect(host.getName()).andReturn(hostname);
EasyMock.replay(host);
return host;
-@@ -206,7 +206,7 @@ public class TestCrawlerSessionManagerValve {
+@@ -208,7 +208,7 @@
if (contextPath == null) {
return null;
}
=====================================
debian/patches/disable-jacoco.patch
=====================================
@@ -9,18 +9,18 @@ Forwarded: not-needed
Index: tomcat9/build.xml
===================================================================
---- tomcat9.orig/build.xml 2025-10-25 17:10:47.303393647 +0200
-+++ tomcat9/build.xml 2025-10-25 17:10:47.300977560 +0200
-@@ -1923,7 +1923,7 @@
- <property name="junit.formatter.extension" value=".txt" />
+--- tomcat9.orig/build.xml 2026-02-01 16:14:07.580271843 +0100
++++ tomcat9/build.xml 2026-02-01 16:15:46.387675378 +0100
+@@ -2029,7 +2029,7 @@
+ <!-- ==================== End of Test Profile System ==================== -->
<target name="test" description="Runs the JUnit test cases"
-- depends="test-nio,test-nio2,test-apr,coverage-report,test-status" />
-+ depends="test-nio,test-nio2,test-apr,test-status" />
+- depends="-test-name-default,test-nio,test-nio2,test-apr,coverage-report,test-status" />
++ depends="-test-name-default,test-nio,test-nio2,test-apr,test-status" />
<target name="test-clean" description="Runs the JUnit test cases"
- depends="clean-classes,test-nio,test-nio2,coverage-report,test-status" />
-@@ -2055,10 +2055,6 @@
+ depends="clean-classes,-test-name-default,test-nio,test-nio2,coverage-report,test-status" />
+@@ -2161,10 +2161,6 @@
<sequential>
<mkdir dir="${test.reports}" />
@@ -28,10 +28,10 @@ Index: tomcat9/build.xml
- enabled="${test.coverage}"
- destfile="${coverage.datafile}"
- >
- <junit printsummary="yes" fork="yes" dir="." showoutput="${test.verbose}"
+ <junit printsummary="${junit.printsummary}" fork="yes" dir="." showoutput="${junit.showoutput}"
errorproperty="test.result.error"
failureproperty="test.result.failure"
-@@ -2137,7 +2133,6 @@
+@@ -2243,7 +2239,6 @@
<fileset dir="test" includes="**/SecurityManager.java" excludes="${test.exclude}" />
</batchtest>
</junit>
@@ -39,7 +39,7 @@ Index: tomcat9/build.xml
</sequential>
</macrodef>
-@@ -2145,21 +2140,6 @@
+@@ -2251,21 +2246,6 @@
depends="test-nio,test-nio2,test-apr"
description="Creates report from gathered Code coverage results">
@@ -61,7 +61,7 @@ Index: tomcat9/build.xml
</target>
<target name="spotbugs"
-@@ -3719,15 +3699,8 @@
+@@ -3832,15 +3812,8 @@
<path id="jacoco.classpath">
<fileset file="${jacoco.jar}" />
</path>
=====================================
debian/patches/exclude-TestJNDIRealmIntegration.patch
=====================================
@@ -12,12 +12,12 @@ Forwarded: not-needed
Index: tomcat9/build.xml
===================================================================
---- tomcat9.orig/build.xml 2025-10-25 17:10:44.538448479 +0200
-+++ tomcat9/build.xml 2025-10-25 17:10:44.535644496 +0200
-@@ -1905,6 +1905,7 @@
+--- tomcat9.orig/build.xml 2026-02-01 16:13:13.355780156 +0100
++++ tomcat9/build.xml 2026-02-01 16:13:41.345283889 +0100
+@@ -1913,6 +1913,7 @@
<!-- Exclude these by default as Gump can't run them because the -->
<!-- classes on which they depend are not in any output JAR. -->
- <exclude name="org/apache/tomcat/buildutil/**"/>
+ <exclude name="org/apache/tomcat/buildutil/**" unless="test.includeBuildutil"/>
+ <exclude name="org/apache/catalina/realm/TestJNDIRealmIntegration.java"/>
</javac>
<copy todir="${test.classes}">
View it on GitLab: https://salsa.debian.org/java-team/tomcat9/-/commit/de983ce65879108619119ba4d1b9f62f17f437f3
--
View it on GitLab: https://salsa.debian.org/java-team/tomcat9/-/commit/de983ce65879108619119ba4d1b9f62f17f437f3
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20260201/3d936aca/attachment.htm>
More information about the pkg-java-commits
mailing list