Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jruby-openssl
Commits: 631d3ad2 by Emmanuel Bourg at 2019-09-12T22:18:45Z Fixed the compatibility with BouncyCastle 1.61 - - - - - c802359f by Emmanuel Bourg at 2019-09-12T22:18:50Z Standards-Version updated to 4.4.0 - - - - - 45d45677 by Emmanuel Bourg at 2019-09-12T22:18:50Z Switch to debhelper level 11 - - - - - 7ea3561f by Emmanuel Bourg at 2019-09-12T22:18:50Z Upload to unstable - - - - - 6 changed files: - debian/changelog - debian/compat - debian/control - + debian/patches/04-bouncycastle-compatibility.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +jruby-openssl (0.9.21-3) unstable; urgency=medium + + * Team upload. + * Fixed the compatibility with BouncyCastle 1.61 + * Standards-Version updated to 4.4.0 + * Switch to debhelper level 11 + + -- Emmanuel Bourg <[email protected]> Fri, 13 Sep 2019 00:13:38 +0200 + jruby-openssl (0.9.21-2) unstable; urgency=medium * Update Vcs-*. ===================================== debian/compat ===================================== @@ -1 +1 @@ -10 +11 ===================================== debian/control ===================================== @@ -3,7 +3,7 @@ Section: ruby Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Miguel Landaeta <[email protected]> -Build-Depends: debhelper (>= 10~), +Build-Depends: debhelper (>= 11), default-jdk, jruby (>= 1.7.19~), junit4, @@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 10~), libmaven-exec-plugin-java, maven-debian-helper, maven-repo-helper -Standards-Version: 4.1.1 +Standards-Version: 4.4.0 Homepage: https://github.com/jruby/jruby-openssl Vcs-Git: https://salsa.debian.org/java-team/jruby-openssl.git Vcs-Browser: https://salsa.debian.org/java-team/jruby-openssl ===================================== debian/patches/04-bouncycastle-compatibility.patch ===================================== @@ -0,0 +1,32 @@ +Description: Fixes the compatibility with the latest version of BouncyCastle in Debian +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/src/main/java/org/jruby/ext/openssl/impl/pem/MiscPEMGenerator.java ++++ b/src/main/java/org/jruby/ext/openssl/impl/pem/MiscPEMGenerator.java +@@ -208,7 +208,7 @@ + } + else if (o instanceof java.security.PrivateKey) // 1.47 compatibility + { +- PrivateKeyInfo info = new PrivateKeyInfo( ++ PrivateKeyInfo info = PrivateKeyInfo.getInstance( + (ASN1Sequence) ASN1Primitive.fromByteArray(((java.security.Key)o).getEncoded())); + + if (o instanceof java.security.interfaces.RSAPrivateKey) +@@ -350,4 +350,4 @@ + + } + +-} +\ No newline at end of file ++} +--- a/src/main/java/org/jruby/ext/openssl/x509store/PEMInputOutput.java ++++ b/src/main/java/org/jruby/ext/openssl/x509store/PEMInputOutput.java +@@ -992,7 +992,7 @@ + + public static void writeDSAPrivateKey(Writer _out, DSAPrivateKey obj, CipherSpec cipher, char[] passwd) throws IOException { + BufferedWriter out = makeBuffered(_out); +- PrivateKeyInfo info = new PrivateKeyInfo((ASN1Sequence) new ASN1InputStream(getEncoded(obj)).readObject()); ++ PrivateKeyInfo info = PrivateKeyInfo.getInstance((ASN1Sequence) new ASN1InputStream(getEncoded(obj)).readObject()); + ByteArrayOutputStream bOut = new ByteArrayOutputStream(); + ASN1OutputStream aOut = new ASN1OutputStream(bOut); + ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ 01-build-jruby-openssl-as-a-common-java-package.patch 02-load-debian-bouncy-castle-libraries.patch 03-use-higher-bytecode-version.patch +04-bouncycastle-compatibility.patch ===================================== debian/rules ===================================== @@ -3,7 +3,7 @@ export JAVA_HOME=/usr/lib/jvm/default-java %: - dh $@ --buildsystem=maven + dh $@ override_dh_auto_clean: dh_auto_clean @@ -17,6 +17,3 @@ override_dh_auto_install: override_dh_installchangelogs: dh_installchangelogs History.md - -get-orig-source: - uscan --verbose --download-current-version View it on GitLab: https://salsa.debian.org/java-team/jruby-openssl/compare/aa96a4b7a868eda9445112ca9a3ed70689653023...7ea3561f644759082f42c34213aa62a2e95dd5c8 -- View it on GitLab: https://salsa.debian.org/java-team/jruby-openssl/compare/aa96a4b7a868eda9445112ca9a3ed70689653023...7ea3561f644759082f42c34213aa62a2e95dd5c8 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
