[tomcat8] 04/13: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Nov 17 23:51:43 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch experimental
in repository tomcat8.
commit 66e24afffff0d70684baa290c5629e46a7c95447
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Nov 16 18:53:14 2016 +0100
Refreshed the patches
---
debian/changelog | 4 +++-
...02-do-not-load-AJP13-connector-by-default.patch | 2 +-
...-deploy-webapps-target-from-deploy-target.patch | 4 ++--
debian/patches/0005-skip-test-failures.patch | 6 ++---
...-java.security.policy-file-in-catalina.sh.patch | 12 +++++-----
debian/patches/0010-debianize-build-xml.patch | 4 ++--
...nt-look-for-build-properties-in-user-home.patch | 2 +-
debian/patches/0014-JDTCompiler.patch | 16 -------------
.../0015_disable_test_TestCometProcessor.patch | 20 ----------------
debian/patches/0018-fix-manager-webapp.patch | 2 +-
.../0019-add-distribution-to-error-page.patch | 2 +-
...20-disable-java8-support-with-jdtcompiler.patch | 27 ----------------------
debian/patches/series | 3 ---
13 files changed, 20 insertions(+), 84 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 535f64c..d36c2d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-tomcat8 (8.0.39-2) UNRELEASED; urgency=medium
+tomcat8 (8.5.8-1) UNRELEASED; urgency=medium
* Team upload.
+ * New upstream release
+ - Refreshed the patches
* Adapted debian/orig-tar.sh to download the 8.5.x releases
-- Emmanuel Bourg <ebourg at apache.org> Wed, 16 Nov 2016 18:44:57 +0100
diff --git a/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch b/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch
index 888a4c7..72c01b5 100644
--- a/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch
+++ b/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch
@@ -2,7 +2,7 @@ Description: Do not load AJP13 connector by default
Author: Thierry Carrez <thierry.carrez at ubuntu.com>
--- a/conf/server.xml
+++ b/conf/server.xml
-@@ -88,7 +88,9 @@
+@@ -108,7 +108,9 @@
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
diff --git a/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch b/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch
index dfdb1aa..01b4bae 100644
--- a/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch
+++ b/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch
@@ -3,7 +3,7 @@ Date: Mon, 28 Jun 2010 21:32:35 +0200
Subject: [PATCH] split deploy-webapps target from deploy target
--- a/build.xml
+++ b/build.xml
-@@ -988,7 +988,7 @@
+@@ -984,7 +984,7 @@
</xslt>
</target>
@@ -12,7 +12,7 @@ Subject: [PATCH] split deploy-webapps target from deploy target
description="Default. Builds a working Tomcat instance">
<copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-@@ -1027,6 +1027,10 @@
+@@ -1023,6 +1023,10 @@
</fileset>
</copy>
diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch
index d309093..c615bcd 100644
--- a/debian/patches/0005-skip-test-failures.patch
+++ b/debian/patches/0005-skip-test-failures.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -1371,8 +1371,10 @@
+@@ -1361,8 +1361,10 @@
</filterchain>
</concat>
@@ -13,8 +13,8 @@ Forwarded: not-needed
+ -->
</target>
- <target name="test-bio" description="Runs the JUnit test cases for BIO. Does not stop on errors."
-@@ -1431,7 +1433,7 @@
+ <target name="test-nio" description="Runs the JUnit test cases for NIO. Does not stop on errors."
+@@ -1415,7 +1417,7 @@
<sequential>
<mkdir dir="${test.reports}" />
diff --git a/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch b/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch
index 2b3c3e7..8123815 100644
--- a/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch
+++ b/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
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
-@@ -329,7 +329,7 @@
- -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
+@@ -330,7 +330,7 @@
+ -classpath "$CLASSPATH" \
-sourcepath "$CATALINA_HOME"/../../java \
-Djava.security.manager \
- -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
@@ -18,18 +18,18 @@ Forwarded: not-needed
-Dcatalina.base="$CATALINA_BASE" \
-Dcatalina.home="$CATALINA_HOME" \
-Djava.io.tmpdir="$CATALINA_TMPDIR" \
-@@ -356,7 +356,7 @@
+@@ -357,7 +357,7 @@
eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $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\"" \
+ -Djava.security.policy=="\"$CATALINA_BASE/policy/catalina.policy\"" \
-Dcatalina.base="\"$CATALINA_BASE\"" \
-Dcatalina.home="\"$CATALINA_HOME\"" \
-Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
-@@ -422,7 +422,7 @@
+@@ -423,7 +423,7 @@
eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $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\"" \
+ -Djava.security.policy=="\"$CATALINA_BASE/policy/catalina.policy\"" \
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index c688776..c679d72 100644
--- a/debian/patches/0010-debianize-build-xml.patch
+++ b/debian/patches/0010-debianize-build-xml.patch
@@ -5,7 +5,7 @@ Last-Update: 2011-05-16
--- a/build.xml
+++ b/build.xml
-@@ -646,7 +646,7 @@
+@@ -635,7 +635,7 @@
</copy>
</target>
@@ -14,7 +14,7 @@ Last-Update: 2011-05-16
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
debug="${compile.debug}"
-@@ -991,12 +991,14 @@
+@@ -987,12 +987,14 @@
<target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples,deploy-webapps"
description="Default. Builds a working Tomcat instance">
diff --git a/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch b/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch
index 3319e5b..6bebe7b 100644
--- a/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch
+++ b/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch
@@ -3,7 +3,7 @@ Date: Mon, 9 Jul 2012 20:53:38 +0000
Subject: 0013-dont-look-for-build-properties-in-user-home
--- a/build.xml
+++ b/build.xml
-@@ -521,7 +521,6 @@
+@@ -510,7 +510,6 @@
<!-- Property that determines if manifests need updating -->
<uptodate property="manifests.uptodate"
targetfile="${tomcat.manifests}/default.manifest" >
diff --git a/debian/patches/0014-JDTCompiler.patch b/debian/patches/0014-JDTCompiler.patch
deleted file mode 100644
index fbc9378..0000000
--- a/debian/patches/0014-JDTCompiler.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Ensures the compatibility with older versions of ecj. This patch
- is no longer required with ecj 3.8 in Jessie, we keep it to facilitate
- a backport to Wheezy.
-Author: tony mancill <tmancill at debian.org>
-Forwarded: not-needed
---- a/java/org/apache/jasper/compiler/JDTCompiler.java
-+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
-@@ -145,7 +145,7 @@
- return result;
- }
-
-- @Override
-+ //@Override
- public boolean ignoreOptionalProblems() {
- return false;
- }
diff --git a/debian/patches/0015_disable_test_TestCometProcessor.patch b/debian/patches/0015_disable_test_TestCometProcessor.patch
deleted file mode 100644
index f39fc16..0000000
--- a/debian/patches/0015_disable_test_TestCometProcessor.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Disables TestCometProcessor.testConnectionClose()
-Author: tony mancill <tmancill at debian.org>
---- a/test/org/apache/catalina/comet/TestCometProcessor.java
-+++ b/test/org/apache/catalina/comet/TestCometProcessor.java
-@@ -35,6 +35,7 @@
- import org.junit.Assert;
- import org.junit.Assume;
- import org.junit.Test;
-+import org.junit.Ignore;
-
- import org.apache.catalina.Context;
- import org.apache.catalina.Wrapper;
-@@ -188,6 +189,7 @@
- }
-
- @Test
-+ @Ignore("fails consistently on Debian/Linux")
- public void testConnectionClose() throws Exception {
- Assume.assumeTrue(
- "This test is skipped, because this connector does not support Comet.",
diff --git a/debian/patches/0018-fix-manager-webapp.patch b/debian/patches/0018-fix-manager-webapp.patch
index 8ddb2b5..d395295 100644
--- a/debian/patches/0018-fix-manager-webapp.patch
+++ b/debian/patches/0018-fix-manager-webapp.patch
@@ -28,7 +28,7 @@ Last-Update: 2013-08-01
</Context>]]></source>
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
-@@ -201,14 +201,14 @@
+@@ -202,14 +202,14 @@
// - default CATALINA_HOME == CATALINA_BASE
// - CATALINA_HOME != CATALINA_BASE, per instance Manager in CATALINA_BASE
// - CATALINA_HOME != CATALINA_BASE, shared Manager in CATALINA_HOME
diff --git a/debian/patches/0019-add-distribution-to-error-page.patch b/debian/patches/0019-add-distribution-to-error-page.patch
index 854e7a4..7d83ee1 100644
--- a/debian/patches/0019-add-distribution-to-error-page.patch
+++ b/debian/patches/0019-add-distribution-to-error-page.patch
@@ -16,7 +16,7 @@ Bug-Debian: http://bugs.debian.org/729840
\ No newline at end of file
--- a/build.xml
+++ b/build.xml
-@@ -235,6 +235,7 @@
+@@ -231,6 +231,7 @@
<filter token="YEAR" value="${year}"/>
<filter token="VERSION" value="${version}"/>
<filter token="VERSION_NUMBER" value="${version.number}"/>
diff --git a/debian/patches/0020-disable-java8-support-with-jdtcompiler.patch b/debian/patches/0020-disable-java8-support-with-jdtcompiler.patch
deleted file mode 100644
index a11a03d..0000000
--- a/debian/patches/0020-disable-java8-support-with-jdtcompiler.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Drop Java 8 support in JSP files until the Eclipse compiler is updated
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/java/org/apache/jasper/compiler/JDTCompiler.java
-+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
-@@ -305,9 +305,6 @@
- } else if(opt.equals("1.7")) {
- settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_7);
-- } else if(opt.equals("1.8")) {
-- settings.put(CompilerOptions.OPTION_Source,
-- CompilerOptions.VERSION_1_8);
- } else {
- log.warn("Unknown source VM " + opt + " ignored.");
- settings.put(CompilerOptions.OPTION_Source,
-@@ -349,11 +346,6 @@
- CompilerOptions.VERSION_1_7);
- settings.put(CompilerOptions.OPTION_Compliance,
- CompilerOptions.VERSION_1_7);
-- } else if(opt.equals("1.8")) {
-- settings.put(CompilerOptions.OPTION_TargetPlatform,
-- CompilerOptions.VERSION_1_8);
-- settings.put(CompilerOptions.OPTION_Compliance,
-- CompilerOptions.VERSION_1_8);
- } else {
- log.warn("Unknown target VM " + opt + " ignored.");
- settings.put(CompilerOptions.OPTION_TargetPlatform,
diff --git a/debian/patches/series b/debian/patches/series
index e68024e..6da8b73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,8 +6,5 @@
0009-Use-java.security.policy-file-in-catalina.sh.patch
0010-debianize-build-xml.patch
0013-dont-look-for-build-properties-in-user-home.patch
-#0014-JDTCompiler.patch
-0015_disable_test_TestCometProcessor.patch
0018-fix-manager-webapp.patch
0019-add-distribution-to-error-page.patch
-#0020-disable-java8-support-with-jdtcompiler.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git
More information about the pkg-java-commits
mailing list