Package: release.debian.org Severity: normal Tags: bullseye User: release.debian.org@packages.debian.org Usertags: pu This proposed update fixes a FTBFS in bullseye. It adds the patches used to fix the same issue in testing and unstable. debdiff is attached. Changes: voms-api-java (3.3.2-1+deb11u1) bullseye; urgency=medium . * Disable tests failing with bouncycastle 1.71 (Closes: #1011698) * Disable tests that fail due to expired certificates (Closes: #1021551) Mattias Ellert
diff -Nru voms-api-java-3.3.2/debian/changelog voms-api-java-3.3.2/debian/changelog
--- voms-api-java-3.3.2/debian/changelog 2020-10-14 05:44:33.000000000 +0200
+++ voms-api-java-3.3.2/debian/changelog 2023-01-12 14:26:32.000000000 +0100
@@ -1,3 +1,10 @@
+voms-api-java (3.3.2-1+deb11u1) bullseye; urgency=medium
+
+ * Disable tests failing with bouncycastle 1.71 (Closes: #1011698)
+ * Disable tests that fail due to expired certificates (Closes: #1021551)
+
+ -- Mattias Ellert <mattias.ellert@physics.uu.se> Thu, 12 Jan 2023 14:26:32 +0100
+
voms-api-java (3.3.2-1) unstable; urgency=medium
* Update to version 3.3.2 - matches canl-java 2.6.x
diff -Nru voms-api-java-3.3.2/debian/copyright voms-api-java-3.3.2/debian/copyright
--- voms-api-java-3.3.2/debian/copyright 2020-10-14 05:44:33.000000000 +0200
+++ voms-api-java-3.3.2/debian/copyright 2023-01-12 14:26:32.000000000 +0100
@@ -19,7 +19,7 @@
Files: debian/*
Copyright:
- 2012-2020, Mattias Ellert <mattias.ellert@physics.uu.se>
+ 2012-2023, Mattias Ellert <mattias.ellert@physics.uu.se>
License: Apache-2.0
License: Apache-2.0
diff -Nru voms-api-java-3.3.2/debian/patches/series voms-api-java-3.3.2/debian/patches/series
--- voms-api-java-3.3.2/debian/patches/series 2020-10-14 05:44:33.000000000 +0200
+++ voms-api-java-3.3.2/debian/patches/series 2022-12-13 09:42:05.000000000 +0100
@@ -1,2 +1,13 @@
-# Disable tests using non-local network interface
-voms-api-java-no-local.patch
+# Disable failing tests
+# IllegalState object explicit - implicit expected.
+# https://github.com/italiangrid/voms-api-java/issues/29
+voms-api-java-disable-some-tests.patch
+
+# Disable tests that fail due to expired certificates
+# https://github.com/italiangrid/voms-api-java/issues/30
+# 2022-09-24 (test0.cert.pem, wilco_cnaf_infn_it.cert.pem)
+voms-api-java-expired-2022-09-24.patch
+# 2022-10-08 (test_host_cnaf_infn_it.cert.pem)
+voms-api-java-expired-2022-10-08.patch
+# 2022-12-02 (test_host_2_cnaf_infn_it.cert.pem)
+voms-api-java-expired-2022-12-12.patch
diff -Nru voms-api-java-3.3.2/debian/patches/voms-api-java-disable-some-tests.patch voms-api-java-3.3.2/debian/patches/voms-api-java-disable-some-tests.patch
--- voms-api-java-3.3.2/debian/patches/voms-api-java-disable-some-tests.patch 1970-01-01 01:00:00.000000000 +0100
+++ voms-api-java-3.3.2/debian/patches/voms-api-java-disable-some-tests.patch 2022-06-22 11:32:12.000000000 +0200
@@ -0,0 +1,62 @@
+diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java b/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java
+index bc7557c..32ba7a5 100644
+--- a/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java
++++ b/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java
+@@ -191,7 +191,7 @@ public class TestACGeneration {
+ return ga;
+ }
+
+- @Test
++ // @Test
+ public void testGeneratedACParsing() throws KeyStoreException,
+ CertificateException, FileNotFoundException, IOException,
+ OperatorCreationException {
+@@ -230,7 +230,7 @@ public class TestACGeneration {
+
+ }
+
+- @Test
++ // @Test
+ public void testACValidation() {
+
+ ValidationResultChecker c = new ValidationResultChecker(true);
+@@ -247,7 +247,7 @@ public class TestACGeneration {
+
+ }
+
+- @Test
++ // @Test
+ public void testLSCValidationFailure() {
+
+ ValidationResultChecker c = new ValidationResultChecker(false,
+@@ -264,7 +264,7 @@ public class TestACGeneration {
+ assertEquals(validatedAttrs.size(), 0);
+ }
+
+- @Test
++ // @Test
+ public void testExpiredAACertValidationFailure()
+ throws OperatorCreationException {
+
+@@ -284,7 +284,7 @@ public class TestACGeneration {
+ assertEquals(validatedAttrs.size(), 0);
+ }
+
+- @Test
++ // @Test
+ public void testRevokedAACertValidationFailure() {
+
+ ValidationResultChecker c = new ValidationResultChecker(false,
+diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java b/src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java
+index 6eca55f..49f0498 100644
+--- a/src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java
++++ b/src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java
+@@ -54,7 +54,7 @@ public class TestFakeVOMSACService extends TestACSupport {
+ initializeCredentials();
+ }
+
+- @Test
++ // @Test
+ public void testFakeAcServiceCreation() {
+
+ ACGenerationParams params = ACGenerationParams.builder()
diff -Nru voms-api-java-3.3.2/debian/patches/voms-api-java-expired-2022-09-24.patch voms-api-java-3.3.2/debian/patches/voms-api-java-expired-2022-09-24.patch
--- voms-api-java-3.3.2/debian/patches/voms-api-java-expired-2022-09-24.patch 1970-01-01 01:00:00.000000000 +0100
+++ voms-api-java-3.3.2/debian/patches/voms-api-java-expired-2022-09-24.patch 2022-10-18 04:38:55.000000000 +0200
@@ -0,0 +1,48 @@
+diff --git a/src/test/java/org/italiangrid/voms/test/TestOpensslHashFunction.java b/src/test/java/org/italiangrid/voms/test/TestOpensslHashFunction.java
+index 6f57833..aa800ac 100644
+--- a/src/test/java/org/italiangrid/voms/test/TestOpensslHashFunction.java
++++ b/src/test/java/org/italiangrid/voms/test/TestOpensslHashFunction.java
+@@ -47,7 +47,7 @@ public class TestOpensslHashFunction {
+ cred = new PEMCredential(userKey, userCert, keyPassword.toCharArray());
+ }
+
+- @Test
++ // @Test
+ public void testDefaultHashIsMD5() {
+
+ CertificateValidatorBuilder builder = new CertificateValidatorBuilder();
+@@ -60,7 +60,7 @@ public class TestOpensslHashFunction {
+
+ }
+
+- @Test
++ // @Test
+ public void testSHA1Hash() {
+
+ CertificateValidatorBuilder builder = new CertificateValidatorBuilder();
+diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
+index 8b420a9..df91a02 100644
+--- a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
++++ b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
+@@ -227,7 +227,7 @@ public class TestACValidator implements Fixture {
+
+ }
+
+- @Test
++ // @Test
+ public void testInvalidLSCSignatureFailure() throws Exception {
+
+ VOMSAA aa = Utils.getVOMSAA();
+diff --git a/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java b/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java
+index 496455e..d9b26cc 100644
+--- a/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java
++++ b/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java
+@@ -167,7 +167,7 @@ public class TestConcurrentValidation {
+
+ }
+
+- @Test
++ // @Test
+ public void test() throws InterruptedException, BrokenBarrierException {
+
+ long start = System.currentTimeMillis();
diff -Nru voms-api-java-3.3.2/debian/patches/voms-api-java-expired-2022-10-08.patch voms-api-java-3.3.2/debian/patches/voms-api-java-expired-2022-10-08.patch
--- voms-api-java-3.3.2/debian/patches/voms-api-java-expired-2022-10-08.patch 1970-01-01 01:00:00.000000000 +0100
+++ voms-api-java-3.3.2/debian/patches/voms-api-java-expired-2022-10-08.patch 2022-10-18 04:38:55.000000000 +0200
@@ -0,0 +1,111 @@
+diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java b/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java
+index bc7557c..80120db 100644
+--- a/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java
++++ b/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java
+@@ -301,7 +301,7 @@ public class TestACGeneration {
+ assertEquals(validatedAttrs.size(), 0);
+ }
+
+- @Test
++ // @Test
+ public void testSuccesfullACExtractionFromProxy() {
+
+ ValidationResultChecker c = new ValidationResultChecker(true);
+diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
+index 8b420a9..b35aa8a 100644
+--- a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
++++ b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
+@@ -62,7 +62,7 @@ public class TestACValidator implements Fixture {
+
+ }
+
+- @Test
++ // @Test
+ public void testValidityCheckSuccess() throws Exception {
+
+ ProxyCertificate proxy = Utils.getVOMSAA().createVOMSProxy(holder, defaultVOFqans);
+@@ -96,7 +96,7 @@ public class TestACValidator implements Fixture {
+ Assert.assertEquals(VOMSValidationErrorCode.acNotValidAtCurrentTime, m.getErrorCode());
+ }
+
+- @Test
++ // @Test
+ public void testHolderCheckFailure() throws Exception {
+
+ ProxyCertificate proxy =
+@@ -172,7 +172,7 @@ public class TestACValidator implements Fixture {
+
+ }
+
+- @Test
++ // @Test
+ public void testEmptyACCertsExtensionSuccess() throws Exception {
+
+ VOMSAA aa = Utils.getVOMSAA();
+@@ -256,7 +256,7 @@ public class TestACValidator implements Fixture {
+ r.getValidationErrors().get(1).getErrorCode());
+ }
+
+- @Test
++ // @Test
+ public void testUnknownCriticalExtensionFailure() throws Exception {
+
+ VOMSAA aa = Utils.getVOMSAA();
+@@ -281,7 +281,7 @@ public class TestACValidator implements Fixture {
+ r.getValidationErrors().get(0).getMessage());
+ }
+
+- @Test
++ // @Test
+ public void testCriticalAKIDFailure() throws Exception {
+
+ VOMSAA aa = Utils.getVOMSAA();
+@@ -304,7 +304,7 @@ public class TestACValidator implements Fixture {
+ r.getValidationErrors().get(0).getMessage());
+ }
+
+- @Test
++ // @Test
+ public void testCriticalNoRevAvailFailure() throws Exception {
+
+ VOMSAA aa = Utils.getVOMSAA();
+@@ -329,7 +329,7 @@ public class TestACValidator implements Fixture {
+ r.getValidationErrors().get(0).getMessage());
+ }
+
+- @Test
++ // @Test
+ public void testTargetValidationSuccess() throws Exception {
+
+ VOMSAA aa = Utils.getVOMSAA();
+@@ -355,7 +355,7 @@ public class TestACValidator implements Fixture {
+ Assert.assertTrue(r.isValid());
+ }
+
+- @Test
++ // @Test
+ public void testTargetValidationFailure() throws Exception {
+
+ VOMSAA aa = Utils.getVOMSAA();
+@@ -375,7 +375,7 @@ public class TestACValidator implements Fixture {
+
+ }
+
+- @Test
++ // @Test
+ public void testResolveHostnameException() throws Exception {
+
+ VOMSAA aa = Utils.getVOMSAA();
+diff --git a/src/test/java/org/italiangrid/voms/test/req/TestRequests.java b/src/test/java/org/italiangrid/voms/test/req/TestRequests.java
+index d00ad46..214bde7 100644
+--- a/src/test/java/org/italiangrid/voms/test/req/TestRequests.java
++++ b/src/test/java/org/italiangrid/voms/test/req/TestRequests.java
+@@ -41,7 +41,7 @@ import eu.emi.security.authn.x509.impl.PEMCredential;
+
+ public class TestRequests implements Fixture {
+
+- @Test
++ // @Test
+ public void testEchoRequest() throws Exception {
+
+ VOMSACService acService = Utils.buildACService(new EchoVOMSProtocol(Utils.getAACredential()));
diff -Nru voms-api-java-3.3.2/debian/patches/voms-api-java-expired-2022-12-12.patch voms-api-java-3.3.2/debian/patches/voms-api-java-expired-2022-12-12.patch
--- voms-api-java-3.3.2/debian/patches/voms-api-java-expired-2022-12-12.patch 1970-01-01 01:00:00.000000000 +0100
+++ voms-api-java-3.3.2/debian/patches/voms-api-java-expired-2022-12-12.patch 2022-12-13 07:40:05.000000000 +0100
@@ -0,0 +1,13 @@
+diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
+index 8b420a9..ef0b14a 100644
+--- a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
++++ b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
+@@ -111,7 +111,7 @@ public class TestACValidator implements Fixture {
+ Assert.assertEquals(VOMSValidationErrorCode.acHolderDoesntMatchCertChain, m.getErrorCode());
+ }
+
+- @Test
++ // @Test
+ public void testSignatureCheckFailure() throws Exception {
+
+ ProxyCertificate proxy = Utils.getVOMSAA().createVOMSProxy(holder, defaultVOFqans);
diff -Nru voms-api-java-3.3.2/debian/patches/voms-api-java-no-local.patch voms-api-java-3.3.2/debian/patches/voms-api-java-no-local.patch
--- voms-api-java-3.3.2/debian/patches/voms-api-java-no-local.patch 2020-10-14 05:44:33.000000000 +0200
+++ voms-api-java-3.3.2/debian/patches/voms-api-java-no-local.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-diff -ur voms-api-java-3.3.2.orig/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java voms-api-java-3.3.2/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
---- voms-api-java-3.3.2.orig/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java 2020-10-08 17:57:55.000000000 +0200
-+++ voms-api-java-3.3.2/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java 2020-10-14 07:49:04.716000000 +0200
-@@ -329,7 +329,7 @@
- r.getValidationErrors().get(0).getMessage());
- }
-
-- @Test
-+ // @Test
- public void testTargetValidationSuccess() throws Exception {
-
- VOMSAA aa = Utils.getVOMSAA();
-@@ -355,7 +355,7 @@
- Assert.assertTrue(r.isValid());
- }
-
-- @Test
-+ // @Test
- public void testTargetValidationFailure() throws Exception {
-
- VOMSAA aa = Utils.getVOMSAA();
Attachment:
signature.asc
Description: This is a digitally signed message part