diff --git a/00-disable-jarsigner-test.patch b/00-disable-jarsigner-test.patch new file mode 100644 index 0000000..02975a8 --- /dev/null +++ b/00-disable-jarsigner-test.patch @@ -0,0 +1,82 @@ +diff --git a/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java b/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java +index cedeed0..34d0c1c 100644 +--- a/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java ++++ b/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java +@@ -157,6 +157,7 @@ public class AntClassLoaderTest { + FileUtils.getFileUtils().getFileURL(testJar), codeSourceLocation); + } + ++/* + @Test + public void testSignedJar() throws Exception { + buildRule.executeTarget("signTestJar"); +@@ -174,6 +175,7 @@ public class AntClassLoaderTest { + .getCertificates()); + assertNotNull("should be signed", foo.getSigners()); + } ++*/ + + /** + * @see bug 47593 +diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java +index 4d5f29c..b5f2f1b 100644 +--- a/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java ++++ b/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java +@@ -58,6 +58,7 @@ public class SignJarTest { + return Boolean.getBoolean("offline"); + } + ++/* + @Test + public void testSigFile() { + buildRule.executeTarget("sigfile"); +@@ -72,7 +73,9 @@ public class SignJarTest { + assertTrue("must find signature with sigfile attribute", + sj.isSigned()); + } ++*/ + ++/* + @Test + public void testInvalidChars() { + buildRule.executeTarget("invalidchars"); +@@ -83,6 +86,7 @@ public class SignJarTest { + sj.setJar(new File(buildRule.getProject().getProperty("test.jar"))); + assertTrue(sj.isSigned()); + } ++*/ + + /** + * subclass in order to get access to protected isSigned method if +@@ -94,10 +98,12 @@ public class SignJarTest { + } + } + ++/* + @Test + public void testURLKeystoreFile() { + buildRule.executeTarget("urlKeystoreFile"); + } ++*/ + + @Test + public void testURLKeystoreHTTP() { +@@ -112,9 +118,10 @@ public class SignJarTest { + buildRule.executeTarget("testTsaLocalhost"); + } + +- /** ++/* ++ /* * + * @see bug 50081 +- */ ++ * / + @Test + public void testSignUnnormalizedJar() throws Exception { + buildRule.executeTarget("jar"); +@@ -133,4 +140,5 @@ public class SignJarTest { + s.setKeystore("testkeystore"); + s.execute(); + } ++*/ + } diff --git a/ant.spec b/ant.spec index f2c0fec..a2cc6b7 100644 --- a/ant.spec +++ b/ant.spec @@ -37,7 +37,7 @@ Name: ant Epoch: 0 Version: 1.10.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java build tool Summary(it): Tool per la compilazione di programmi java Summary(fr): Outil de compilation pour java @@ -48,6 +48,10 @@ Source2: apache-ant-1.8.ant.conf # manpage Source3: ant.asciidoc +# temporarily disable AntClassLoaderTest.testSignedJar() +# https://bugzilla.redhat.com/show_bug.cgi?id=1869017 +Patch0: 00-disable-jarsigner-test.patch + BuildRequires: javapackages-local BuildRequires: java-devel >= 1:1.8.0 BuildRequires: ant >= 1.10.2 @@ -347,6 +351,7 @@ Javadoc pour %{name}. %prep %setup -q -n apache-ant-%{version} +%patch0 -p1 # Fix class-path-in-manifest rpmlint warning %pom_xpath_remove 'attribute[@name="Class-Path"]' build.xml @@ -656,6 +661,9 @@ LC_ALL=C.UTF-8 %{ant} test # ----------------------------------------------------------------------------- %changelog +* Sun Aug 23 2020 Fabio Valentini - 0:1.10.8-4 +- Temporarily disable some jarsigner tests to work around RHBZ#1869017. + * Mon Jul 27 2020 Fedora Release Engineering - 0:1.10.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild