[tomcat7] 02/11: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Feb 18 22:07:13 GMT 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat7.
commit cd15d0f34a756c7a8c64a39c01402c426352f088
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Oct 22 21:25:06 2015 +0200
Refreshed the patches
---
debian/changelog | 8 +++
...-deploy-webapps-target-from-deploy-target.patch | 4 +-
debian/patches/0010-debianize-build-xml.patch | 4 +-
.../0011-fix-classpath-lintian-warnings.patch | 10 ++--
...nt-look-for-build-properties-in-user-home.patch | 2 +-
debian/patches/0022-update-test-certificates.patch | 24 +++------
...ble-unit-tests-depending-on-network-access.path | 61 +++++++---------------
7 files changed, 45 insertions(+), 68 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2ebab9b..9c4cf53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tomcat7 (7.0.65-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 22 Oct 2015 21:24:28 +0200
+
tomcat7 (7.0.64-1) unstable; urgency=medium
* Team upload.
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 ac31f7e..ceaf411 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
-@@ -983,7 +983,7 @@
+@@ -982,7 +982,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"
-@@ -1021,6 +1021,10 @@
+@@ -1020,6 +1020,10 @@
</fileset>
</copy>
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index 916a6b6..3f6cccc 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
-@@ -632,7 +632,7 @@
+@@ -631,7 +631,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}"
-@@ -986,12 +986,14 @@
+@@ -985,12 +985,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 4cd8d9f..7e466b6 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
-@@ -791,7 +791,8 @@
+@@ -790,7 +790,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}"
-@@ -799,8 +800,7 @@
+@@ -798,8 +799,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>
-@@ -808,9 +808,8 @@
+@@ -807,9 +807,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>
-@@ -818,9 +817,8 @@
+@@ -817,9 +816,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>
-@@ -828,7 +826,7 @@
+@@ -827,7 +825,7 @@
fullpath="META-INF/NOTICE" />
<zipfileset file="${tomcat.manifests}/default.license"
fullpath="META-INF/LICENSE" />
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 e000c89..f0cb472 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
@@ -8,7 +8,7 @@ Subject: 0013-dont-look-for-build-properties-in-user-home
--- a/build.xml
+++ b/build.xml
-@@ -502,7 +502,6 @@
+@@ -501,7 +501,6 @@
<!-- Property that determines if manifests need updating -->
<uptodate property="manifests.uptodate"
targetfile="${tomcat.manifests}/default.manifest" >
diff --git a/debian/patches/0022-update-test-certificates.patch b/debian/patches/0022-update-test-certificates.patch
index fd693cc..5bc9d05 100644
--- a/debian/patches/0022-update-test-certificates.patch
+++ b/debian/patches/0022-update-test-certificates.patch
@@ -15,15 +15,7 @@ Forwarded: not-needed
--- 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.IOException;
- import java.io.InputStream;
- import java.net.URISyntaxException;
-+import java.net.URL;
- import java.security.KeyManagementException;
- import java.security.KeyStore;
- import java.security.NoSuchAlgorithmException;
-@@ -92,13 +93,13 @@
+@@ -101,13 +101,13 @@
connector.setProperty("sslProtocol", "tls");
java.net.URL keyStoreUrl =
@@ -39,7 +31,7 @@ Forwarded: not-needed
File truststoreFile = toFile(truststoreUrl);
connector.setAttribute("truststoreFile",
truststoreFile.getAbsolutePath());
-@@ -111,7 +112,7 @@
+@@ -120,7 +120,7 @@
}
} else {
java.net.URL keyStoreUrl =
@@ -48,7 +40,7 @@ Forwarded: not-needed
File keystoreFile = toFile(keyStoreUrl);
tomcat.getConnector().setAttribute("SSLCertificateFile",
keystoreFile.getAbsolutePath());
-@@ -147,7 +148,7 @@
+@@ -156,7 +156,7 @@
protected static KeyManager[] getUser1KeyManagers() throws Exception {
KeyManagerFactory kmf = KeyManagerFactory.getInstance(
KeyManagerFactory.getDefaultAlgorithm());
@@ -57,7 +49,7 @@ Forwarded: not-needed
"changeit".toCharArray());
return kmf.getKeyManagers();
}
-@@ -155,7 +156,7 @@
+@@ -164,7 +164,7 @@
protected static TrustManager[] getTrustManagers() throws Exception {
TrustManagerFactory tmf = TrustManagerFactory.getInstance(
TrustManagerFactory.getDefaultAlgorithm());
@@ -66,7 +58,7 @@ Forwarded: not-needed
return tmf.getTrustManagers();
}
-@@ -174,7 +175,7 @@
+@@ -185,7 +185,7 @@
private static KeyStore getKeyStore(String keystore) throws Exception {
ClassLoader cl = TesterSupport.class.getClassLoader();
@@ -75,12 +67,12 @@ Forwarded: not-needed
File keystoreFile = toFile(keystoreUrl);
KeyStore ks = KeyStore.getInstance("JKS");
InputStream is = null;
-@@ -193,6 +194,16 @@
+@@ -204,6 +204,16 @@
return ks;
}
-+ private static URL getResourceURL(String path) {
-+ URL resourceURL = null;
++ private static java.net.URL getResourceURL(String path) {
++ java.net.URL resourceURL = null;
+ try {
+ resourceURL = new File(path).toURI().toURL();
+ } catch (java.net.MalformedURLException e) {
diff --git a/debian/patches/0024-disable-unit-tests-depending-on-network-access.path b/debian/patches/0024-disable-unit-tests-depending-on-network-access.path
index 71b3a91..efb6e4d 100644
--- a/debian/patches/0024-disable-unit-tests-depending-on-network-access.path
+++ b/debian/patches/0024-disable-unit-tests-depending-on-network-access.path
@@ -7,30 +7,26 @@ Author: Miguel Landaeta <nomadium at debian.org>
Forwarded: no
Last-Update: 2015-03-27
-diff --git a/test/org/apache/catalina/session/TestStandardSession.java b/test/org/apache/catalina/session/TestStandardSession.java
-index 1d9e448..d042be1 100644
+--- a/test/org/apache/catalina/session/TestStandardSessionIntegration.java
++++ b/test/org/apache/catalina/session/TestStandardSessionIntegration.java
+@@ -40,6 +40,7 @@
+ * Test session.invalidate() in a clustered environment.
+ */
+ @Test
++ @org.junit.Ignore("it fails when tested in chroots without network like pbuilder")
+ public void testBug56578a() throws Exception {
+ doTestInvalidate(true);
+ }
--- a/test/org/apache/catalina/session/TestStandardSession.java
+++ b/test/org/apache/catalina/session/TestStandardSession.java
-@@ -27,6 +27,7 @@ import javax.servlet.http.HttpSession;
+@@ -27,6 +27,7 @@
import org.junit.Assert;
import org.junit.Test;
+import org.junit.Ignore;
- import org.apache.catalina.Context;
- import org.apache.catalina.ha.tcp.SimpleTcpCluster;
-@@ -39,7 +40,7 @@ public class TestStandardSession extends TomcatBaseTest {
- /**
- * Test session.invalidate() in a clustered environment.
- */
-- @Test
-+ @Ignore("it fails when tested in chroots without network like pbuilder")
- public void testBug56578a() throws Exception {
- doTestInvalidate(true);
- }
-diff --git a/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java b/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
-deleted file mode 100644
-index 3e5d022..0000000
+ import org.apache.catalina.Manager;
+ import org.apache.catalina.core.StandardContext;
--- a/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
+++ /dev/null
@@ -1,183 +0,0 @@
@@ -217,9 +213,6 @@ index 3e5d022..0000000
- }
-
-}
-diff --git a/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java b/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
-deleted file mode 100644
-index 04035e2..0000000
--- a/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
+++ /dev/null
@@ -1,186 +0,0 @@
@@ -409,11 +402,9 @@ index 04035e2..0000000
- }
-
-}
-diff --git a/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java b/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
-index 4c73469..1e0c4f1 100644
--- a/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
+++ b/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
-@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
+@@ -21,6 +21,7 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -421,7 +412,7 @@ index 4c73469..1e0c4f1 100644
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.transport.ReceiverBase;
-@@ -43,7 +44,7 @@ public class TestGroupChannelStartStop {
+@@ -43,7 +44,7 @@
try {channel.stop(Channel.DEFAULT);}catch (Exception ignore){ /* Ignore */ }
}
@@ -430,7 +421,7 @@ index 4c73469..1e0c4f1 100644
public void testDoubleFullStart() throws Exception {
int count = 0;
try {
-@@ -64,7 +65,7 @@ public class TestGroupChannelStartStop {
+@@ -64,7 +65,7 @@
((ReceiverBase)channel.getChannelReceiver()).setMaxThreads(1);
}
@@ -439,7 +430,7 @@ index 4c73469..1e0c4f1 100644
public void testDoublePartialStart() throws Exception {
//try to double start the RX
int count = 0;
-@@ -134,7 +135,7 @@ public class TestGroupChannelStartStop {
+@@ -134,7 +135,7 @@
channel.stop(Channel.DEFAULT);
}
@@ -448,9 +439,6 @@ index 4c73469..1e0c4f1 100644
public void testUdpReceiverStart() throws Exception {
ReceiverBase rb = (ReceiverBase)channel.getChannelReceiver();
rb.setUdpPort(udpPort);
-diff --git a/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java b/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
-deleted file mode 100644
-index f6f422d..0000000
--- a/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
+++ /dev/null
@@ -1,129 +0,0 @@
@@ -583,9 +571,6 @@ index f6f422d..0000000
- }
-
-}
-diff --git a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
-deleted file mode 100644
-index a3464e4..0000000
--- a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
+++ /dev/null
@@ -1,131 +0,0 @@
@@ -720,9 +705,6 @@ index a3464e4..0000000
- }
-
-}
-diff --git a/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java b/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
-deleted file mode 100644
-index b21fa1a..0000000
--- a/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
+++ /dev/null
@@ -1,197 +0,0 @@
@@ -923,9 +905,6 @@ index b21fa1a..0000000
-
-
-}
-diff --git a/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java b/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
-deleted file mode 100644
-index cff47c2..0000000
--- a/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
+++ /dev/null
@@ -1,177 +0,0 @@
@@ -1106,11 +1085,9 @@ index cff47c2..0000000
- }
-
-}
-diff --git a/test/org/apache/catalina/tribes/test/TribesTestSuite.java b/test/org/apache/catalina/tribes/test/TribesTestSuite.java
-index a626300..c0f57ad 100644
--- a/test/org/apache/catalina/tribes/test/TribesTestSuite.java
+++ b/test/org/apache/catalina/tribes/test/TribesTestSuite.java
-@@ -20,14 +20,14 @@ import org.junit.runner.RunWith;
+@@ -20,14 +20,14 @@
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@@ -1131,7 +1108,7 @@ index a626300..c0f57ad 100644
import org.apache.catalina.tribes.io.TestXByteBuffer;
import org.apache.catalina.tribes.membership.TestMemberImplSerialization;
import org.apache.catalina.tribes.test.channel.TestDataIntegrity;
-@@ -42,12 +42,12 @@ import org.apache.catalina.tribes.test.channel.TestUdpPackages;
+@@ -42,12 +42,12 @@
TestDataIntegrity.class, TestMulticastPackages.class,
TestRemoteProcessException.class, TestUdpPackages.class,
// o.a.catalina.tribes.test.interceptors
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git
More information about the pkg-java-commits
mailing list