Codebase list ivy / 23799a7
Removed the patches Emmanuel Bourg 3 years ago
4 changed file(s) with 3 addition(s) and 214 deletion(s). Raw diff Collapse all Expand all
+3
-1
debian/changelog less more
0 ivy (2.4.0-6) UNRELEASED; urgency=medium
0 ivy (2.5.0-1) UNRELEASED; urgency=medium
11
2 * New upstream release
3 - Removed the patches
24 * Standards-Version updated to 4.5.1
35 * Switch to debhelper level 13
46 * Removed debian/orig-tar.sh
+0
-106
debian/patches/bouncycastle-1.51.patch less more
0 From: Markus Koschany <apo@debian.org>
1 Date: Wed, 16 Dec 2015 13:34:19 +0100
2 Subject: bouncycastle 1.51
3
4 Fix FTBFS with Bouncycastle 1.51. Thanks to Fedora.
5 http://pkgs.fedoraproject.org/cgit/apache-ivy.git/tree/port-to-bc-1.52.patch
6
7 Forwarded: https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=commit;h=bb3ddfe426cf4ff5390f742d35bdba02a4ce7624
8 ---
9 ivy.xml | 4 +--
10 .../bouncycastle/OpenPGPSignatureGenerator.java | 35 +++++++++-------------
11 2 files changed, 16 insertions(+), 23 deletions(-)
12
13 diff --git a/ivy.xml b/ivy.xml
14 index d448897..c744371 100644
15 --- a/ivy.xml
16 +++ b/ivy.xml
17 @@ -50,8 +50,8 @@
18 <dependency org="com.jcraft" name="jsch.agentproxy" rev="0.0.6" conf="default,sftp->default"/>
19 <dependency org="com.jcraft" name="jsch.agentproxy.connector-factory" rev="0.0.6" conf="default,sftp->default"/>
20 <dependency org="com.jcraft" name="jsch.agentproxy.jsch" rev="0.0.6" conf="default,sftp->default"/>
21 - <dependency org="org.bouncycastle" name="bcpg-jdk14" rev="1.45" conf="default"/>
22 - <dependency org="org.bouncycastle" name="bcprov-jdk14" rev="1.45" conf="default"/>
23 + <dependency org="org.bouncycastle" name="bcpg-jdk15on" rev="1.51" conf="default"/>
24 + <dependency org="org.bouncycastle" name="bcprov-jdk15on" rev="1.51" conf="default"/>
25
26 <!-- Test dependencies -->
27 <dependency org="junit" name="junit" rev="3.8.2" conf="test->default"/>
28 diff --git a/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java b/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java
29 index af7beae..bec8ae4 100644
30 --- a/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java
31 +++ b/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java
32 @@ -23,16 +23,18 @@ import java.io.FileOutputStream;
33 import java.io.IOException;
34 import java.io.InputStream;
35 import java.io.OutputStream;
36 -import java.security.NoSuchAlgorithmException;
37 -import java.security.NoSuchProviderException;
38 import java.security.Security;
39 -import java.security.SignatureException;
40 import java.util.Iterator;
41
42 import org.apache.ivy.plugins.signer.SignatureGenerator;
43 import org.bouncycastle.bcpg.ArmoredOutputStream;
44 import org.bouncycastle.bcpg.BCPGOutputStream;
45 import org.bouncycastle.jce.provider.BouncyCastleProvider;
46 +import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
47 +import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator;
48 +import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder;
49 +import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder;
50 +import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider;
51 import org.bouncycastle.openpgp.PGPException;
52 import org.bouncycastle.openpgp.PGPPrivateKey;
53 import org.bouncycastle.openpgp.PGPSecretKey;
54 @@ -101,11 +103,13 @@ public class OpenPGPSignatureGenerator implements SignatureGenerator {
55 pgpSec = readSecretKey(keyIn);
56 }
57
58 - PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(password.toCharArray(),
59 - BouncyCastleProvider.PROVIDER_NAME);
60 - PGPSignatureGenerator sGen = new PGPSignatureGenerator(pgpSec.getPublicKey()
61 - .getAlgorithm(), PGPUtil.SHA1, BouncyCastleProvider.PROVIDER_NAME);
62 - sGen.initSign(PGPSignature.BINARY_DOCUMENT, pgpPrivKey);
63 + PBESecretKeyDecryptor decryptor = new BcPBESecretKeyDecryptorBuilder(
64 + new BcPGPDigestCalculatorProvider()).build(password.toCharArray());
65 + PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(decryptor);
66 + PGPSignatureGenerator sGen = new PGPSignatureGenerator(
67 + new BcPGPContentSignerBuilder(pgpSec.getPublicKey()
68 + .getAlgorithm(), PGPUtil.SHA1));
69 + sGen.init(PGPSignature.BINARY_DOCUMENT, pgpPrivKey);
70
71 in = new FileInputStream(src);
72 out = new BCPGOutputStream(new ArmoredOutputStream(new FileOutputStream(dest)));
73 @@ -116,22 +120,10 @@ public class OpenPGPSignatureGenerator implements SignatureGenerator {
74 }
75
76 sGen.generate().encode(out);
77 - } catch (SignatureException e) {
78 - IOException ioexc = new IOException();
79 - ioexc.initCause(e);
80 - throw ioexc;
81 } catch (PGPException e) {
82 IOException ioexc = new IOException();
83 ioexc.initCause(e);
84 throw ioexc;
85 - } catch (NoSuchAlgorithmException e) {
86 - IOException ioexc = new IOException();
87 - ioexc.initCause(e);
88 - throw ioexc;
89 - } catch (NoSuchProviderException e) {
90 - IOException ioexc = new IOException();
91 - ioexc.initCause(e);
92 - throw ioexc;
93 } finally {
94 if (out != null) {
95 try {
96 @@ -156,7 +148,8 @@ public class OpenPGPSignatureGenerator implements SignatureGenerator {
97
98 private PGPSecretKey readSecretKey(InputStream in) throws IOException, PGPException {
99 in = PGPUtil.getDecoderStream(in);
100 - PGPSecretKeyRingCollection pgpSec = new PGPSecretKeyRingCollection(in);
101 + PGPSecretKeyRingCollection pgpSec = new PGPSecretKeyRingCollection(in,
102 + new BcKeyFingerprintCalculator());
103
104 PGPSecretKey key = null;
105 for (Iterator it = pgpSec.getKeyRings(); key == null && it.hasNext();) {
+0
-105
debian/patches/commons-vfs2.diff less more
0 Description: Fix build with commons vfs 2.0
1 Author: Damien Raude-Morvan <drazzib@debian.org>
2 Last-Update: 2011-09-11
3 Forwarded: no
4 --- a/META-INF/MANIFEST.MF
5 +++ b/META-INF/MANIFEST.MF
6 @@ -20,13 +20,13 @@
7 org.apache.commons.httpclient.params;resolution:=optional,
8 org.apache.commons.httpclient.protocol;resolution:=optional,
9 org.apache.commons.net.ftp;resolution:=optional,
10 - org.apache.commons.vfs;resolution:=optional,
11 - org.apache.commons.vfs.impl;resolution:=optional,
12 - org.apache.commons.vfs.provider;resolution:=optional,
13 - org.apache.commons.vfs.provider.ftp;resolution:=optional,
14 - org.apache.commons.vfs.provider.local;resolution:=optional,
15 - org.apache.commons.vfs.provider.sftp;resolution:=optional,
16 - org.apache.commons.vfs.provider.url;resolution:=optional,
17 + org.apache.commons.vfs2;resolution:=optional,
18 + org.apache.commons.vfs2.impl;resolution:=optional,
19 + org.apache.commons.vfs2.provider;resolution:=optional,
20 + org.apache.commons.vfs2.provider.ftp;resolution:=optional,
21 + org.apache.commons.vfs2.provider.local;resolution:=optional,
22 + org.apache.commons.vfs2.provider.sftp;resolution:=optional,
23 + org.apache.commons.vfs2.provider.url;resolution:=optional,
24 org.apache.oro.text;resolution:=optional,
25 org.apache.oro.text.regex;resolution:=optional,
26 org.apache.tools.ant;resolution:=optional,
27 --- a/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java
28 +++ b/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java
29 @@ -25,12 +25,12 @@
30 import java.util.Arrays;
31 import java.util.List;
32
33 -import org.apache.commons.vfs.FileContent;
34 -import org.apache.commons.vfs.FileObject;
35 -import org.apache.commons.vfs.FileSystemException;
36 -import org.apache.commons.vfs.FileSystemManager;
37 -import org.apache.commons.vfs.FileType;
38 -import org.apache.commons.vfs.impl.StandardFileSystemManager;
39 +import org.apache.commons.vfs2.FileContent;
40 +import org.apache.commons.vfs2.FileObject;
41 +import org.apache.commons.vfs2.FileSystemException;
42 +import org.apache.commons.vfs2.FileSystemManager;
43 +import org.apache.commons.vfs2.FileType;
44 +import org.apache.commons.vfs2.impl.StandardFileSystemManager;
45 import org.apache.ivy.plugins.repository.AbstractRepository;
46 import org.apache.ivy.plugins.repository.RepositoryCopyProgressListener;
47 import org.apache.ivy.plugins.repository.Resource;
48 --- a/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java
49 +++ b/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java
50 @@ -22,11 +22,11 @@
51 import java.util.ArrayList;
52 import java.util.List;
53
54 -import org.apache.commons.vfs.FileContent;
55 -import org.apache.commons.vfs.FileObject;
56 -import org.apache.commons.vfs.FileSystemException;
57 -import org.apache.commons.vfs.FileSystemManager;
58 -import org.apache.commons.vfs.FileType;
59 +import org.apache.commons.vfs2.FileContent;
60 +import org.apache.commons.vfs2.FileObject;
61 +import org.apache.commons.vfs2.FileSystemException;
62 +import org.apache.commons.vfs2.FileSystemManager;
63 +import org.apache.commons.vfs2.FileType;
64 import org.apache.ivy.plugins.repository.Resource;
65 import org.apache.ivy.plugins.resolver.VfsResolver;
66 import org.apache.ivy.util.Message;
67 --- a/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml
68 +++ b/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml
69 @@ -20,29 +20,29 @@
70 in the jakarta-vfs-common distribution with the res and tmp schemas removed.
71 -->
72 <providers>
73 - <default-provider class-name="org.apache.commons.vfs.provider.url.UrlFileProvider">
74 + <default-provider class-name="org.apache.commons.vfs2.provider.url.UrlFileProvider">
75 </default-provider>
76 - <provider class-name="org.apache.commons.vfs.provider.local.DefaultLocalFileProvider">
77 + <provider class-name="org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider">
78 <scheme name="file"/>
79 </provider>
80 - <provider class-name="org.apache.commons.vfs.provider.ftp.FtpFileProvider">
81 + <provider class-name="org.apache.commons.vfs2.provider.ftp.FtpFileProvider">
82 <scheme name="ftp"/>
83 <if-available class-name="org.apache.commons.net.ftp.FTPFile"/>
84 </provider>
85 <!-- FIXME: not available anymore in commons-vfs but in commons-vfs-sandbox
86 - <provider class-name="org.apache.commons.vfs.provider.smb.SmbFileProvider">
87 + <provider class-name="org.apache.commons.vfs2.provider.smb.SmbFileProvider">
88 <scheme name="smb"/>
89 <if-available class-name="jcifs.smb.SmbFile"/>
90 </provider>
91 -->
92 <!--
93 - <provider class-name="org.apache.commons.vfs.provider.http.HttpFileProvider">
94 + <provider class-name="org.apache.commons.vfs2.provider.http.HttpFileProvider">
95 <scheme name="http"/>
96 <if-available class-name="org.apache.commons.httpclient.HttpClient"/>
97 </provider>
98 -->
99
100 - <provider class-name="org.apache.commons.vfs.provider.sftp.SftpFileProvider">
101 + <provider class-name="org.apache.commons.vfs2.provider.sftp.SftpFileProvider">
102 <scheme name="sftp"/>
103 <if-available class-name="javax.crypto.Cipher"/>
104 <if-available class-name="com.jcraft.jsch.JSch"/>
+0
-2
debian/patches/series less more
0 commons-vfs2.diff
1 bouncycastle-1.51.patch