From 1ccf19a3ee7adfd5570ac42f95f71ef63078ceed0fa924ea6a451e940389a7e9 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 19 Mar 2022 13:26:16 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=63 --- apache-ivy-2.4.0-jdk9.patch | 11 -- apache-ivy-2.4.0-src.tar.gz | 3 - ivy-2.4.0.pom | 193 ------------------------------------ port-to-bc-1.52.patch | 93 ----------------- 4 files changed, 300 deletions(-) delete mode 100644 apache-ivy-2.4.0-jdk9.patch delete mode 100644 apache-ivy-2.4.0-src.tar.gz delete mode 100644 ivy-2.4.0.pom delete mode 100644 port-to-bc-1.52.patch diff --git a/apache-ivy-2.4.0-jdk9.patch b/apache-ivy-2.4.0-jdk9.patch deleted file mode 100644 index 38d20d3..0000000 --- a/apache-ivy-2.4.0-jdk9.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- apache-ivy-2.3.0/build.xml 2012-04-09 08:58:36.000000000 +0200 -+++ apache-ivy-2.3.0/build.xml 2017-09-07 14:46:13.128164218 +0200 -@@ -517,7 +517,7 @@ - - - -- -+ - - - diff --git a/apache-ivy-2.4.0-src.tar.gz b/apache-ivy-2.4.0-src.tar.gz deleted file mode 100644 index ea0453b..0000000 --- a/apache-ivy-2.4.0-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:202f08ca41f4bdf1c081aa8b2e531565be6c73e9e5e0d68137f454f14eb16ef6 -size 3616939 diff --git a/ivy-2.4.0.pom b/ivy-2.4.0.pom deleted file mode 100644 index 81116e1..0000000 --- a/ivy-2.4.0.pom +++ /dev/null @@ -1,193 +0,0 @@ - - - - - 4.0.0 - - org.apache - apache - 7 - - org.apache.ivy - ivy - 2.4.0 - Apache Ivy - http://ant.apache.org/ivy/ - - scm:svn:http://svn.apache.org/repos/asf/ant/ivy/core/trunk/ - scm:svn:https://svn.apache.org/repos/asf/ant/ivy/core/trunk - http://svn.apache.org/repos/asf/ant/ivy/core/trunk - - - - Ant/Ivy Developers List - dev-subscribe@ant.apache.org - dev-unsubscribe@ant.apache.org - dev@ant.apache.org - http://mail-archives.apache.org/mod_mbox/ant-dev - - - Ivy Users List - ivy-user-subscribe@ant.apache.org - ivy-user-unsubscribe@ant.apache.org - ivy-user@ant.apache.org - http://mail-archives.apache.org/mod_mbox/ant-ivy-user - - - - jira - http://issues.apache.org/jira/browse/IVY - - - - org.apache.ant - ant - 1.7.1 - true - - - org.apache.ant - ant-nodeps - 1.7.1 - true - - - org.apache.ant - ant-trax - 1.7.1 - true - - - commons-httpclient - commons-httpclient - 3.0 - true - - - oro - oro - 2.0.8 - true - - - commons-vfs - commons-vfs - 1.0 - true - - - com.jcraft - jsch - 0.1.50 - true - - - com.jcraft - jsch.agentproxy - 0.0.6 - true - - - com.jcraft - jsch.agentproxy.connector-factory - 0.0.6 - true - - - com.jcraft - jsch.agentproxy.jsch - 0.0.6 - true - - - org.bouncycastle - bcpg-jdk14 - 1.45 - true - - - org.bouncycastle - bcprov-jdk14 - 1.45 - true - - - junit - junit - 3.8.2 - test - - - commons-lang - commons-lang - 2.6 - test - - - org.apache.ant - ant-testutil - 1.7.0 - test - - - * - * - - - - - ant - ant-launcher - 1.6.2 - test - - - * - * - - - - - ant-contrib - ant-contrib - 1.0b3 - test - - - * - * - - - - - xerces - xercesImpl - 2.6.2 - test - - - xerces - xmlParserAPIs - 2.6.2 - test - - - diff --git a/port-to-bc-1.52.patch b/port-to-bc-1.52.patch deleted file mode 100644 index 7b73be3..0000000 --- a/port-to-bc-1.52.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/ivy.xml b/ivy.xml -index d448897..7d8896a 100644 ---- a/ivy.xml -+++ b/ivy.xml -@@ -50,8 +50,8 @@ - - - -- -- -+ -+ - - - -diff --git a/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java b/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java -index af7beae..bec8ae4 100644 ---- a/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java -+++ b/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java -@@ -23,16 +23,18 @@ import java.io.FileOutputStream; - import java.io.IOException; - import java.io.InputStream; - import java.io.OutputStream; --import java.security.NoSuchAlgorithmException; --import java.security.NoSuchProviderException; - import java.security.Security; --import java.security.SignatureException; - import java.util.Iterator; - - import org.apache.ivy.plugins.signer.SignatureGenerator; - import org.bouncycastle.bcpg.ArmoredOutputStream; - import org.bouncycastle.bcpg.BCPGOutputStream; - import org.bouncycastle.jce.provider.BouncyCastleProvider; -+import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor; -+import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; -+import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; -+import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; -+import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; - import org.bouncycastle.openpgp.PGPException; - import org.bouncycastle.openpgp.PGPPrivateKey; - import org.bouncycastle.openpgp.PGPSecretKey; -@@ -101,11 +103,13 @@ public class OpenPGPSignatureGenerator implements SignatureGenerator { - pgpSec = readSecretKey(keyIn); - } - -- PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(password.toCharArray(), -- BouncyCastleProvider.PROVIDER_NAME); -- PGPSignatureGenerator sGen = new PGPSignatureGenerator(pgpSec.getPublicKey() -- .getAlgorithm(), PGPUtil.SHA1, BouncyCastleProvider.PROVIDER_NAME); -- sGen.initSign(PGPSignature.BINARY_DOCUMENT, pgpPrivKey); -+ PBESecretKeyDecryptor decryptor = new BcPBESecretKeyDecryptorBuilder( -+ new BcPGPDigestCalculatorProvider()).build(password.toCharArray()); -+ PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(decryptor); -+ PGPSignatureGenerator sGen = new PGPSignatureGenerator( -+ new BcPGPContentSignerBuilder(pgpSec.getPublicKey() -+ .getAlgorithm(), PGPUtil.SHA1)); -+ sGen.init(PGPSignature.BINARY_DOCUMENT, pgpPrivKey); - - in = new FileInputStream(src); - out = new BCPGOutputStream(new ArmoredOutputStream(new FileOutputStream(dest))); -@@ -116,22 +120,10 @@ public class OpenPGPSignatureGenerator implements SignatureGenerator { - } - - sGen.generate().encode(out); -- } catch (SignatureException e) { -- IOException ioexc = new IOException(); -- ioexc.initCause(e); -- throw ioexc; - } catch (PGPException e) { - IOException ioexc = new IOException(); - ioexc.initCause(e); - throw ioexc; -- } catch (NoSuchAlgorithmException e) { -- IOException ioexc = new IOException(); -- ioexc.initCause(e); -- throw ioexc; -- } catch (NoSuchProviderException e) { -- IOException ioexc = new IOException(); -- ioexc.initCause(e); -- throw ioexc; - } finally { - if (out != null) { - try { -@@ -156,7 +148,8 @@ public class OpenPGPSignatureGenerator implements SignatureGenerator { - - private PGPSecretKey readSecretKey(InputStream in) throws IOException, PGPException { - in = PGPUtil.getDecoderStream(in); -- PGPSecretKeyRingCollection pgpSec = new PGPSecretKeyRingCollection(in); -+ PGPSecretKeyRingCollection pgpSec = new PGPSecretKeyRingCollection(in, -+ new BcKeyFingerprintCalculator()); - - PGPSecretKey key = null; - for (Iterator it = pgpSec.getKeyRings(); key == null && it.hasNext();) {