This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libitext-java.
commit 64cb2362477cf76923885777a3999e3cfcb70a89 Author: Emmanuel Bourg <[email protected]> Date: Mon Jul 15 22:13:32 2013 +0000 Patched to compile against Bouncy Castle 1.49 --- debian/changelog | 5 ++- ...t.patch => 02_bouncycastle_compatibility.patch} | 43 ++++++---------------- debian/patches/series | 2 +- 3 files changed, 15 insertions(+), 35 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7fd662c..462e930 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -libitext-java (2.1.7-7) UNRELEASED; urgency=low +libitext-java (2.1.7-7) unstable; urgency=low + * Patched to compile against Bouncy Castle 1.49 * Use canonical URLs for the Vcs-* fields - -- Emmanuel Bourg <[email protected]> Mon, 15 Jul 2013 23:43:09 +0200 + -- Emmanuel Bourg <[email protected]> Mon, 15 Jul 2013 23:57:34 +0200 libitext-java (2.1.7-6) unstable; urgency=low diff --git a/debian/patches/02_bouncycastle_1.47_port.patch b/debian/patches/02_bouncycastle_compatibility.patch similarity index 85% rename from debian/patches/02_bouncycastle_1.47_port.patch rename to debian/patches/02_bouncycastle_compatibility.patch index f2dafdd..30029fb 100644 --- a/debian/patches/02_bouncycastle_1.47_port.patch +++ b/debian/patches/02_bouncycastle_compatibility.patch @@ -1,35 +1,12 @@ -Description: Bouncy Castle 1.47 broke the binary compatibility with the previous - versions. iText 2.1.7 was developped for Bouncy Castle 1.38 and no longer works +Description: iText 2.1.7 was developped for Bouncy Castle 1.38 and no longer works with the recent versions. This patch addresses this issue and fixes the compilation errors with Bouncy Castle 1.47 and later. http://www.bouncycastle.org/wiki/display/JA1/Porting+from+earlier+BC+releases+to+1.47+and+later Author: Emmanuel Bourg <[email protected]> Origin: vendor Forwarded: not-needed -Index: src/ant/.ant.properties -=================================================================== ---- src/ant/.ant.properties (revision 5738) -+++ src/ant/.ant.properties (working copy) -@@ -13,12 +13,12 @@ - jcommon.jar=${itext.lib}/jcommon.jar - servlet.jar=${itext.lib}/servlet.jar - --bc.jdk=jdk14 --bc.version=138 -+bc.jdk=jdk15on -+bc.version=1.48 - - lib.bcmail=bcmail-${bc.jdk}-${bc.version}.jar - lib.bcprov=bcprov-${bc.jdk}-${bc.version}.jar --lib.bctsp=bctsp-${bc.jdk}-${bc.version}.jar -+lib.bctsp=bcpkix-${bc.jdk}-${bc.version}.jar - lib.dom4j=pdf-renderer.jar - lib.pdf-renderer=dom4j-1.6.1.jar - -Index: src/core/com/lowagie/text/pdf/PdfPKCS7.java -=================================================================== ---- src/core/com/lowagie/text/pdf/PdfPKCS7.java (revision 5738) -+++ src/core/com/lowagie/text/pdf/PdfPKCS7.java (working copy) +--- a/core/com/lowagie/text/pdf/PdfPKCS7.java ++++ b/core/com/lowagie/text/pdf/PdfPKCS7.java @@ -77,21 +77,22 @@ import org.bouncycastle.asn1.ASN1Encodable; @@ -155,10 +132,8 @@ Index: src/core/com/lowagie/text/pdf/PdfPKCS7.java } } } -Index: src/core/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java -=================================================================== ---- src/core/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java (revision 5738) -+++ src/core/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java (working copy) +--- a/core/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java ++++ b/core/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java @@ -108,7 +108,7 @@ import javax.crypto.SecretKey; @@ -195,8 +170,12 @@ Index: src/core/com/lowagie/text/pdf/PdfPublicKeySecurityHandler.java KeyGenerator keygenerator = KeyGenerator.getInstance(s); keygenerator.init(128); SecretKey secretkey = keygenerator.generateKey(); -@@ -303,7 +303,7 @@ - EnvelopedData env = new EnvelopedData(null, derset, encryptedcontentinfo, null); +@@ -300,10 +300,10 @@ + AlgorithmIdentifier algorithmidentifier = new AlgorithmIdentifier(new DERObjectIdentifier(s), derobject); + EncryptedContentInfo encryptedcontentinfo = + new EncryptedContentInfo(PKCSObjectIdentifiers.data, algorithmidentifier, deroctetstring); +- EnvelopedData env = new EnvelopedData(null, derset, encryptedcontentinfo, null); ++ EnvelopedData env = new EnvelopedData(null, derset, encryptedcontentinfo, (org.bouncycastle.asn1.ASN1Set) null); ContentInfo contentinfo = new ContentInfo(PKCSObjectIdentifiers.envelopedData, env); - return contentinfo.getDERObject(); diff --git a/debian/patches/series b/debian/patches/series index fb9ba57..2eddec2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ 01_allow_standard_input.patch -02_bouncycastle_1.47_port.patch +02_bouncycastle_compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libitext-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
