This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat7.
commit 5d608a601e5d1bfb8a3a2974549914542b4f7d0c Author: Emmanuel Bourg <[email protected]> Date: Wed Jul 8 12:16:26 2015 +0200 Refreshed the patches --- debian/changelog | 4 +++- ...it-deploy-webapps-target-from-deploy-target.patch | 4 ++-- debian/patches/0010-debianize-build-xml.patch | 4 ++-- .../0011-fix-classpath-lintian-warnings.patch | 10 +++++----- .../0015_disable_test_TestCometProcessor.patch | 4 ++-- debian/patches/0022-update-test-certificates.patch | 20 ++++++++------------ 6 files changed, 22 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5f85ee7..600f12e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ -tomcat7 (7.0.62-2) UNRELEASED; urgency=medium +tomcat7 (7.0.63-1) UNRELEASED; urgency=medium + * New upstream release + - Refreshed the patches * debian/rules: Use an english locale when generating the documentation to improve the reproducibility 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 d8eca91..ac31f7e 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 -@@ -979,7 +979,7 @@ +@@ -983,7 +983,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" -@@ -1017,6 +1017,10 @@ +@@ -1021,6 +1021,10 @@ </fileset> </copy> diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch index ac14cc1..916a6b6 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 -@@ -628,7 +628,7 @@ +@@ -632,7 +632,7 @@ <target name="compile" depends="compile-java6,check-java7,compile-java7" /> <target name="compile-java6" @@ -14,7 +14,7 @@ Last-Update: 2011-05-16 <!-- Compile internal server components --> <javac srcdir="java" destdir="${tomcat.classes}" debug="${compile.debug}" -@@ -982,12 +982,14 @@ +@@ -986,12 +986,14 @@ <target name="deploy" depends="package,build-docs,deploy-webapps,compile-webapp-examples" description="Default. Builds a working Tomcat instance"> diff --git a/debian/patches/0011-fix-classpath-lintian-warnings.patch b/debian/patches/0011-fix-classpath-lintian-warnings.patch index 77e0986..4cd8d9f 100644 --- a/debian/patches/0011-fix-classpath-lintian-warnings.patch +++ b/debian/patches/0011-fix-classpath-lintian-warnings.patch @@ -5,7 +5,7 @@ Last-Update: 2014-05-01 --- a/build.xml +++ b/build.xml -@@ -787,7 +787,8 @@ +@@ -791,7 +791,8 @@ <!-- Jasper Implementation JAR File --> <jarIt jarfile="${jasper.jar}" filesDir="${tomcat.classes}" @@ -15,7 +15,7 @@ Last-Update: 2014-05-01 <!-- Jasper EL Implementation JAR File --> <jarIt jarfile="${jasper-el.jar}" -@@ -795,8 +796,7 @@ +@@ -799,8 +800,7 @@ filesId="files.jasper-el" /> <!-- i18n JARs --> @@ -25,7 +25,7 @@ Last-Update: 2014-05-01 <fileset dir="${tomcat.classes}"> <include name="**/LocalStrings_es.properties" /> </fileset> -@@ -804,9 +804,8 @@ +@@ -808,9 +808,8 @@ fullpath="META-INF/NOTICE" /> <zipfileset file="${tomcat.manifests}/default.license" fullpath="META-INF/LICENSE" /> @@ -37,7 +37,7 @@ Last-Update: 2014-05-01 <fileset dir="${tomcat.classes}"> <include name="**/LocalStrings_fr.properties" /> </fileset> -@@ -814,9 +813,8 @@ +@@ -818,9 +817,8 @@ fullpath="META-INF/NOTICE" /> <zipfileset file="${tomcat.manifests}/default.license" fullpath="META-INF/LICENSE" /> @@ -49,7 +49,7 @@ Last-Update: 2014-05-01 <fileset dir="${tomcat.classes}"> <include name="**/LocalStrings_ja.properties" /> </fileset> -@@ -824,7 +822,7 @@ +@@ -828,7 +826,7 @@ fullpath="META-INF/NOTICE" /> <zipfileset file="${tomcat.manifests}/default.license" fullpath="META-INF/LICENSE" /> diff --git a/debian/patches/0015_disable_test_TestCometProcessor.patch b/debian/patches/0015_disable_test_TestCometProcessor.patch index 7cbce7c..50d4150 100644 --- a/debian/patches/0015_disable_test_TestCometProcessor.patch +++ b/debian/patches/0015_disable_test_TestCometProcessor.patch @@ -1,6 +1,6 @@ --- a/test/org/apache/catalina/comet/TestCometProcessor.java +++ b/test/org/apache/catalina/comet/TestCometProcessor.java -@@ -35,6 +35,7 @@ import static org.junit.Assert.fail; +@@ -35,6 +35,7 @@ import org.junit.Assert; import org.junit.Assume; import org.junit.Test; @@ -8,7 +8,7 @@ import org.apache.catalina.Context; import org.apache.catalina.Wrapper; -@@ -187,7 +188,7 @@ public class TestCometProcessor extends +@@ -189,7 +190,7 @@ is.close(); } diff --git a/debian/patches/0022-update-test-certificates.patch b/debian/patches/0022-update-test-certificates.patch index e0e7c48..fd693cc 100644 --- a/debian/patches/0022-update-test-certificates.patch +++ b/debian/patches/0022-update-test-certificates.patch @@ -2,11 +2,9 @@ Description: Uses updated test certificates to avoid a build failure when the te The updated keystores were taken from Tomcat 7.0.39 (http://svn.apache.org/r1451105) Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed -diff --git a/test/org/apache/tomcat/util/net/TestCustomSsl.java b/test/org/apache/tomcat/util/net/TestCustomSsl.java -index b74279c..5f59387 100644 --- a/test/org/apache/tomcat/util/net/TestCustomSsl.java +++ b/test/org/apache/tomcat/util/net/TestCustomSsl.java -@@ -62,7 +62,7 @@ public class TestCustomSsl extends TomcatBaseTest { +@@ -62,7 +62,7 @@ connector.setProperty("sslProtocol", "tls"); File keystoreFile = @@ -15,11 +13,9 @@ index b74279c..5f59387 100644 connector.setAttribute( "keystoreFile", keystoreFile.getAbsolutePath()); -diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java b/test/org/apache/tomcat/util/net/TesterSupport.java -index 69b7874..854f536 100644 --- a/test/org/apache/tomcat/util/net/TesterSupport.java +++ b/test/org/apache/tomcat/util/net/TesterSupport.java -@@ -21,6 +21,7 @@ import java.io.FileInputStream; +@@ -21,6 +21,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.URISyntaxException; @@ -27,7 +23,7 @@ index 69b7874..854f536 100644 import java.security.KeyManagementException; import java.security.KeyStore; import java.security.NoSuchAlgorithmException; -@@ -90,13 +91,13 @@ public final class TesterSupport { +@@ -92,13 +93,13 @@ connector.setProperty("sslProtocol", "tls"); java.net.URL keyStoreUrl = @@ -43,7 +39,7 @@ index 69b7874..854f536 100644 File truststoreFile = toFile(truststoreUrl); connector.setAttribute("truststoreFile", truststoreFile.getAbsolutePath()); -@@ -109,7 +110,7 @@ public final class TesterSupport { +@@ -111,7 +112,7 @@ } } else { java.net.URL keyStoreUrl = @@ -52,7 +48,7 @@ index 69b7874..854f536 100644 File keystoreFile = toFile(keyStoreUrl); tomcat.getConnector().setAttribute("SSLCertificateFile", keystoreFile.getAbsolutePath()); -@@ -135,7 +136,7 @@ public final class TesterSupport { +@@ -147,7 +148,7 @@ protected static KeyManager[] getUser1KeyManagers() throws Exception { KeyManagerFactory kmf = KeyManagerFactory.getInstance( KeyManagerFactory.getDefaultAlgorithm()); @@ -61,7 +57,7 @@ index 69b7874..854f536 100644 "changeit".toCharArray()); return kmf.getKeyManagers(); } -@@ -143,7 +144,7 @@ public final class TesterSupport { +@@ -155,7 +156,7 @@ protected static TrustManager[] getTrustManagers() throws Exception { TrustManagerFactory tmf = TrustManagerFactory.getInstance( TrustManagerFactory.getDefaultAlgorithm()); @@ -70,7 +66,7 @@ index 69b7874..854f536 100644 return tmf.getTrustManagers(); } -@@ -162,7 +163,7 @@ public final class TesterSupport { +@@ -174,7 +175,7 @@ private static KeyStore getKeyStore(String keystore) throws Exception { ClassLoader cl = TesterSupport.class.getClassLoader(); @@ -79,7 +75,7 @@ index 69b7874..854f536 100644 File keystoreFile = toFile(keystoreUrl); KeyStore ks = KeyStore.getInstance("JKS"); InputStream is = null; -@@ -181,6 +182,16 @@ public final class TesterSupport { +@@ -193,6 +194,16 @@ return ks; } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
