Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f973ecbe0e38c73469faf9ba86c2315bcc488340
commit f973ecbe0e38c73469faf9ba86c2315bcc488340 Author: Marius Cirsta <[email protected]> Date: Sat Jul 22 21:42:52 2017 +0300 apache-ivy-2.4.0-2-x86_64 * version bump * change m8r diff --git a/source/devel-extra/apache-ivy/FrugalBuild b/source/devel-extra/apache-ivy/FrugalBuild index d9f102e..d8e7046 100644 --- a/source/devel-extra/apache-ivy/FrugalBuild +++ b/source/devel-extra/apache-ivy/FrugalBuild @@ -1,23 +1,27 @@ # Compiling Time: 0.05 SBU -# Maintainer: kikadf <[email protected]> +# Maintainer: Marius Cirsta <[email protected]> pkgname=apache-ivy -pkgver=2.3.0 -pkgrel=1 +pkgver=2.4.0 +pkgrel=2 pkgdesc="Apache Ivy is a popular dependency manager focusing on flexibility and simplicity." url="http://ant.apache.org/ivy/index.html"; -depends=('jsch' 'commons-httpclient' 'bcpg' 'jakarta-oro') +depends=('jsch' 'commons-httpclient' 'bcpg' 'jakarta-oro' 'jsch-agent-proxy') Finclude openjava license="Apache" groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url | grep available | grep -v rc | head -1 | sed 's/.*]//;s/ ver.*//'" -source=(http://xenia.sote.hu/ftp/mirrors/www.apache.org/ant/ivy/$pkgver/$pkgname-$pkgver-src.tar.gz) -sha1sums=('244213bd0d0f344e17678ccbc72b341db6c5b9a3') +source=(http://xenia.sote.hu/ftp/mirrors/www.apache.org/ant/ivy/$pkgver/$pkgname-$pkgver-src.tar.gz \ + apache-ivy-global-settings.patch \ + port-to-bc-1.52.patch) +sha1sums=('1efa73e73b5fc14ef003ff2fcb182f039db33ce2' \ + '6a8c478f20da704325ac50ed98a8d03af83c5835' \ + 'd7c46dfbc1d0d6e6df446777a6e3617165104e02') build() { - Fcd + Fpatchall Fjavacleanup rm -rf src/java/org/apache/ivy/plugins/repository/vfs || Fdie rm -rf src/java/org/apache/ivy/plugins/resolver/VfsResolver.java || Fdie diff --git a/source/devel-extra/apache-ivy/apache-ivy-global-settings.patch b/source/devel-extra/apache-ivy/apache-ivy-global-settings.patch new file mode 100644 index 0000000..29cf61e --- /dev/null +++ b/source/devel-extra/apache-ivy/apache-ivy-global-settings.patch @@ -0,0 +1,11 @@ +--- src/java/org/apache/ivy/ant/IvyAntSettings.java~ 2014-05-23 19:56:50.000000000 +0200 ++++ src/java/org/apache/ivy/ant/IvyAntSettings.java 2015-04-01 12:37:37.537520590 +0200 +@@ -346,7 +346,7 @@ + File[] settingsLocations = new File[] { + new File(getProject().getBaseDir(), settingsFileName), + new File(getProject().getBaseDir(), "ivyconf.xml"), new File(settingsFileName), +- new File("ivyconf.xml")}; ++ new File("ivyconf.xml"), new File("/etc/ivy/ivysettings.xml")}; + for (int i = 0; i < settingsLocations.length; i++) { + file = settingsLocations[i]; + task.log("searching settings file: trying " + file, Project.MSG_VERBOSE); diff --git a/source/devel-extra/apache-ivy/port-to-bc-1.52.patch b/source/devel-extra/apache-ivy/port-to-bc-1.52.patch new file mode 100644 index 0000000..0bdddab --- /dev/null +++ b/source/devel-extra/apache-ivy/port-to-bc-1.52.patch @@ -0,0 +1,93 @@ +diff --git a/ivy.xml b/ivy.xml +index d448897..7d8896a 100644 +--- a/ivy.xml ++++ b/ivy.xml +@@ -50,8 +50,8 @@ + <dependency org="com.jcraft" name="jsch.agentproxy" rev="0.0.6" conf="default,sftp->default"/> + <dependency org="com.jcraft" name="jsch.agentproxy.connector-factory" rev="0.0.6" conf="default,sftp->default"/> + <dependency org="com.jcraft" name="jsch.agentproxy.jsch" rev="0.0.6" conf="default,sftp->default"/> +- <dependency org="org.bouncycastle" name="bcpg-jdk14" rev="1.45" conf="default"/> +- <dependency org="org.bouncycastle" name="bcprov-jdk14" rev="1.45" conf="default"/> ++ <dependency org="org.bouncycastle" name="bcpg-jdk15on" rev="1.52" conf="default"/> ++ <dependency org="org.bouncycastle" name="bcprov-jdk15on" rev="1.52" conf="default"/> + + <!-- Test dependencies --> + <dependency org="junit" name="junit" rev="3.8.2" conf="test->default"/> +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();) { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
