[pkg-java] r17035 - in trunk/libitext5-java/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-07-15 22:12:06 +0000 (Mon, 15 Jul 2013)
New Revision: 17035

Added:
   trunk/libitext5-java/debian/patches/bouncycastle_compatibility.patch
Modified:
   trunk/libitext5-java/debian/changelog
   trunk/libitext5-java/debian/patches/series
Log:
Added a patch to compile against Bouncy Castle 1.49



Modified: trunk/libitext5-java/debian/changelog
===================================================================
--- trunk/libitext5-java/debian/changelog	2013-07-15 21:44:22 UTC (rev 17034)
+++ trunk/libitext5-java/debian/changelog	2013-07-15 22:12:06 UTC (rev 17035)
@@ -1,3 +1,9 @@
+libitext5-java (5.4.2-2) UNRELEASED; urgency=low
+
+  * Added a patch to compile against Bouncy Castle 1.49
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 16 Jul 2013 00:08:27 +0200
+
 libitext5-java (5.4.2-1) experimental; urgency=low
 
   * New upstream release

Added: trunk/libitext5-java/debian/patches/bouncycastle_compatibility.patch
===================================================================
--- trunk/libitext5-java/debian/patches/bouncycastle_compatibility.patch	                        (rev 0)
+++ trunk/libitext5-java/debian/patches/bouncycastle_compatibility.patch	2013-07-15 22:12:06 UTC (rev 17035)
@@ -0,0 +1,14 @@
+Description: Ensures the compatibility with the recent versions of Bouncy Castle
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/main/java/com/itextpdf/text/pdf/PdfPublicKeySecurityHandler.java
++++ b/src/main/java/com/itextpdf/text/pdf/PdfPublicKeySecurityHandler.java
+@@ -245,7 +245,7 @@
+         AlgorithmIdentifier algorithmidentifier = new AlgorithmIdentifier(new ASN1ObjectIdentifier(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.toASN1Primitive();

Modified: trunk/libitext5-java/debian/patches/series
===================================================================
--- trunk/libitext5-java/debian/patches/series	2013-07-15 21:44:22 UTC (rev 17034)
+++ trunk/libitext5-java/debian/patches/series	2013-07-15 22:12:06 UTC (rev 17035)
@@ -1 +1,2 @@
 utf8.patch
+bouncycastle_compatibility.patch