[pkg-java] r18924 - in trunk/libitext-java/debian: . patches
Markus Koschany
apo-guest at moszumanska.debian.org
Sun Dec 6 16:07:08 UTC 2015
Author: apo-guest
Date: 2015-12-06 16:07:08 +0000 (Sun, 06 Dec 2015)
New Revision: 18924
Added:
trunk/libitext-java/debian/ant.properties
trunk/libitext-java/debian/patches/bouncycastle-1.51.patch
Modified:
trunk/libitext-java/debian/changelog
trunk/libitext-java/debian/control
trunk/libitext-java/debian/patches/series
trunk/libitext-java/debian/rules
Log:
Release 2.1.7-10
Added: trunk/libitext-java/debian/ant.properties
===================================================================
--- trunk/libitext-java/debian/ant.properties (rev 0)
+++ trunk/libitext-java/debian/ant.properties 2015-12-06 16:07:08 UTC (rev 18924)
@@ -0,0 +1 @@
+itext.jdk.core=1.5
Modified: trunk/libitext-java/debian/changelog
===================================================================
--- trunk/libitext-java/debian/changelog 2015-12-06 15:57:35 UTC (rev 18923)
+++ trunk/libitext-java/debian/changelog 2015-12-06 16:07:08 UTC (rev 18924)
@@ -1,3 +1,14 @@
+libitext-java (2.1.7-10) unstable; urgency=medium
+
+ * Team upload.
+ * Add bouncycastle-1.51.patch and fix FTBFS with version 1.51 of
+ bouncycastle.
+ * Vcs-Browser: Use cgit and https.
+ * Add ant.properties file and build with Java version 1.5 due to use of
+ generics.
+
+ -- Markus Koschany <apo at debian.org> Sun, 06 Dec 2015 16:53:35 +0100
+
libitext-java (2.1.7-9) unstable; urgency=medium
* Team upload.
@@ -13,7 +24,7 @@
* Wrap and sort Build-Depends.
* Add a build dependency on maven-repo-helper.
* Provide Maven artifacts (Closes: #729010).
- * Add mh_clean to clean target.
+ * Add mh_clean to clean target.
-- Stephen Nelson <stephen at eccostudio.com> Mon, 20 Jan 2014 22:59:50 +0000
@@ -211,7 +222,7 @@
libitext-java (1.02b-1) unstable; urgency=low
* Removed depend on gij-3.2 (closes #232871)
- * New upstream version
+ * New upstream version
-- Christian Bayle <bayle at debian.org> Thu, 19 Feb 2004 20:40:48 +0100
Modified: trunk/libitext-java/debian/control
===================================================================
--- trunk/libitext-java/debian/control 2015-12-06 15:57:35 UTC (rev 18923)
+++ trunk/libitext-java/debian/control 2015-12-06 16:07:08 UTC (rev 18924)
@@ -4,7 +4,7 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Adriaan Peeters <apeeters at lashout.net>, Torsten Werner <twerner at debian.org>,
Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: ant,
+Build-Depends: ant,
debhelper (>= 9),
default-jdk,
cdbs,
@@ -19,7 +19,7 @@
Standards-Version: 3.9.6
Homepage: http://www.lowagie.com/iText/
Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libitext-java
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libitext-java
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/libitext-java
Package: libitext-java
Architecture: all
Added: trunk/libitext-java/debian/patches/bouncycastle-1.51.patch
===================================================================
--- trunk/libitext-java/debian/patches/bouncycastle-1.51.patch (rev 0)
+++ trunk/libitext-java/debian/patches/bouncycastle-1.51.patch 2015-12-06 16:07:08 UTC (rev 18924)
@@ -0,0 +1,197 @@
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 2 Dec 2015 20:56:51 +0100
+Subject: bouncycastle 1.51
+
+Fix FTBFS with bouncycastle 1.51.
+Forwarded: no
+---
+ .../lowagie/text/pdf/OcspClientBouncyCastle.java | 47 +++++++++++++---------
+ core/com/lowagie/text/pdf/PdfPKCS7.java | 19 ++++++---
+ core/com/lowagie/text/pdf/PdfReader.java | 10 +++--
+ 3 files changed, 46 insertions(+), 30 deletions(-)
+
+diff --git a/core/com/lowagie/text/pdf/OcspClientBouncyCastle.java b/core/com/lowagie/text/pdf/OcspClientBouncyCastle.java
+index 982d708..74978c9 100644
+--- a/core/com/lowagie/text/pdf/OcspClientBouncyCastle.java
++++ b/core/com/lowagie/text/pdf/OcspClientBouncyCastle.java
+@@ -59,20 +59,29 @@ import java.math.BigInteger;
+ import java.net.HttpURLConnection;
+ import java.net.URL;
+ import java.security.Security;
++import java.security.cert.CertificateEncodingException;
+ import java.security.cert.X509Certificate;
+ import java.util.Vector;
+ import org.bouncycastle.asn1.DEROctetString;
+ import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers;
++import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
++import org.bouncycastle.asn1.x509.Extension;
++import org.bouncycastle.asn1.x509.Extensions;
+ import org.bouncycastle.asn1.x509.X509Extension;
+ import org.bouncycastle.asn1.x509.X509Extensions;
+-import org.bouncycastle.ocsp.BasicOCSPResp;
+-import org.bouncycastle.ocsp.CertificateID;
+-import org.bouncycastle.ocsp.CertificateStatus;
+-import org.bouncycastle.ocsp.OCSPException;
+-import org.bouncycastle.ocsp.OCSPReq;
+-import org.bouncycastle.ocsp.OCSPReqGenerator;
+-import org.bouncycastle.ocsp.OCSPResp;
+-import org.bouncycastle.ocsp.SingleResp;
++import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
++import org.bouncycastle.cert.ocsp.BasicOCSPResp;
++import org.bouncycastle.cert.ocsp.CertificateID;
++import org.bouncycastle.cert.ocsp.CertificateStatus;
++import org.bouncycastle.cert.ocsp.OCSPException;
++import org.bouncycastle.cert.ocsp.OCSPReq;
++import org.bouncycastle.cert.ocsp.OCSPReqBuilder;
++import org.bouncycastle.cert.ocsp.OCSPResp;
++import org.bouncycastle.cert.ocsp.SingleResp;
++import org.bouncycastle.operator.DigestCalculator;
++import org.bouncycastle.operator.DigestCalculatorProvider;
++import org.bouncycastle.operator.OperatorException;
++import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
+
+ /**
+ * OcspClient implementation using BouncyCastle.
+@@ -107,28 +116,26 @@ public class OcspClientBouncyCastle implements OcspClient {
+ * @throws OCSPException
+ * @throws IOException
+ */
+- private static OCSPReq generateOCSPRequest(X509Certificate issuerCert, BigInteger serialNumber) throws OCSPException, IOException {
++ private static OCSPReq generateOCSPRequest(X509Certificate issuerCert, BigInteger serialNumber) throws OCSPException, IOException, OperatorException, CertificateEncodingException {
+ //Add provider BC
+ Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
+
++ JcaDigestCalculatorProviderBuilder digestCalculatorProviderBuilder = new JcaDigestCalculatorProviderBuilder();
++ DigestCalculatorProvider digestCalculatorProvider = digestCalculatorProviderBuilder.build();
++ DigestCalculator digestCalculator = digestCalculatorProvider.get(CertificateID.HASH_SHA1);
+ // Generate the id for the certificate we are looking for
+- CertificateID id = new CertificateID(CertificateID.HASH_SHA1, issuerCert, serialNumber);
++ CertificateID id = new CertificateID(digestCalculator, new JcaX509CertificateHolder(issuerCert), serialNumber);
+
+ // basic request generation with nonce
+- OCSPReqGenerator gen = new OCSPReqGenerator();
++ OCSPReqBuilder gen = new OCSPReqBuilder();
+
+ gen.addRequest(id);
+
+ // create details for nonce extension
+- Vector oids = new Vector();
+- Vector values = new Vector();
++ Extension ext = new Extension(OCSPObjectIdentifiers.id_pkix_ocsp_nonce, false, new DEROctetString(new DEROctetString(PdfEncryption.createDocumentId()).getEncoded()));
++ gen.setRequestExtensions(new Extensions(new Extension[]{ext}));
+
+- oids.add(OCSPObjectIdentifiers.id_pkix_ocsp_nonce);
+- values.add(new X509Extension(false, new DEROctetString(new DEROctetString(PdfEncryption.createDocumentId()).getEncoded())));
+-
+- gen.setRequestExtensions(new X509Extensions(oids, values));
+-
+- return gen.generate();
++ return gen.build();
+ }
+
+ /**
+@@ -167,7 +174,7 @@ public class OcspClientBouncyCastle implements OcspClient {
+ if (status == CertificateStatus.GOOD) {
+ return basicResponse.getEncoded();
+ }
+- else if (status instanceof org.bouncycastle.ocsp.RevokedStatus) {
++ else if (status instanceof org.bouncycastle.cert.ocsp.RevokedStatus) {
+ throw new IOException("OCSP Status is revoked!");
+ }
+ else {
+diff --git a/core/com/lowagie/text/pdf/PdfPKCS7.java b/core/com/lowagie/text/pdf/PdfPKCS7.java
+index ccb1653..d99d730 100644
+--- a/core/com/lowagie/text/pdf/PdfPKCS7.java
++++ b/core/com/lowagie/text/pdf/PdfPKCS7.java
+@@ -109,10 +109,15 @@ import org.bouncycastle.asn1.cms.ContentInfo;
+ import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
+ import org.bouncycastle.asn1.tsp.MessageImprint;
+ import org.bouncycastle.asn1.x509.X509Extensions;
+-import org.bouncycastle.ocsp.BasicOCSPResp;
+-import org.bouncycastle.ocsp.CertificateID;
+-import org.bouncycastle.ocsp.SingleResp;
+ import org.bouncycastle.tsp.TimeStampToken;
++import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
++import org.bouncycastle.cms.SignerInformationVerifier;
++import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
++import org.bouncycastle.cert.ocsp.BasicOCSPResp;
++import org.bouncycastle.cert.ocsp.CertificateID;
++import org.bouncycastle.cert.ocsp.SingleResp;
++import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder;
++import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
+
+ /**
+ * This class does all the processing related to signing and verifying a PKCS#7
+@@ -899,7 +904,7 @@ public class PdfPKCS7 {
+ if (!keystore.isCertificateEntry(alias))
+ continue;
+ X509Certificate certStoreX509 = (X509Certificate)keystore.getCertificate(alias);
+- if (ocsp.verify(certStoreX509.getPublicKey(), provider))
++ if (ocsp.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(provider).build(certStoreX509.getPublicKey())))
+ return true;
+ }
+ catch (Exception ex) {
+@@ -929,7 +934,8 @@ public class PdfPKCS7 {
+ if (!keystore.isCertificateEntry(alias))
+ continue;
+ X509Certificate certStoreX509 = (X509Certificate)keystore.getCertificate(alias);
+- ts.validate(certStoreX509, provider);
++ SignerInformationVerifier siv = new JcaSimpleSignerInfoVerifierBuilder().setProvider(provider).build(certStoreX509);
++ ts.validate(siv);
+ return true;
+ }
+ catch (Exception ex) {
+@@ -992,7 +998,8 @@ public class PdfPKCS7 {
+ CertificateID cid = sr.getCertID();
+ X509Certificate sigcer = getSigningCertificate();
+ X509Certificate isscer = cs[1];
+- CertificateID tis = new CertificateID(CertificateID.HASH_SHA1, isscer, sigcer.getSerialNumber());
++ CertificateID tis = new CertificateID(
++ new JcaDigestCalculatorProviderBuilder().build().get(CertificateID.HASH_SHA1), new JcaX509CertificateHolder(isscer), sigcer.getSerialNumber());
+ return tis.equals(cid);
+ }
+ catch (Exception ex) {
+diff --git a/core/com/lowagie/text/pdf/PdfReader.java b/core/com/lowagie/text/pdf/PdfReader.java
+index 8699f22..ca4c207 100644
+--- a/core/com/lowagie/text/pdf/PdfReader.java
++++ b/core/com/lowagie/text/pdf/PdfReader.java
+@@ -67,6 +67,7 @@ import java.util.zip.InflaterInputStream;
+ import java.util.Stack;
+ import java.security.Key;
+ import java.security.MessageDigest;
++import java.security.PrivateKey;
+ import java.security.cert.Certificate;
+
+ import com.lowagie.text.ExceptionConverter;
+@@ -80,6 +81,7 @@ import com.lowagie.text.pdf.internal.PdfViewerPreferencesImp;
+
+ import org.bouncycastle.cms.CMSEnvelopedData;
+ import org.bouncycastle.cms.RecipientInformation;
++import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient;
+
+ /** Reads a PDF document.
+ * @author Paulo Soares (psoares at consiste.pt)
+@@ -713,13 +715,13 @@ public class PdfReader implements PdfViewerPreferences {
+ try {
+ data = new CMSEnvelopedData(recipient.getBytes());
+
+- Iterator recipientCertificatesIt = data.getRecipientInfos().getRecipients().iterator();
++ Iterator<RecipientInformation> recipientCertificatesIt = data.getRecipientInfos().getRecipients().iterator();
+
+ while (recipientCertificatesIt.hasNext()) {
+- RecipientInformation recipientInfo = (RecipientInformation)recipientCertificatesIt.next();
++ RecipientInformation recipientInfo = recipientCertificatesIt.next();
+
+ if (recipientInfo.getRID().match(certificate) && !foundRecipient) {
+- envelopedData = recipientInfo.getContent(certificateKey, certificateKeyProvider);
++ envelopedData = recipientInfo.getContent(new JceKeyTransEnvelopedRecipient((PrivateKey) certificateKey).setProvider(certificateKeyProvider));
+ foundRecipient = true;
+ }
+ }
+@@ -3493,4 +3495,4 @@ public class PdfReader implements PdfViewerPreferences {
+ if (!encrypted || !ownerPasswordUsed) return null;
+ return decrypt.computeUserPassword(password);
+ }
+-}
+\ No newline at end of file
++}
Modified: trunk/libitext-java/debian/patches/series
===================================================================
--- trunk/libitext-java/debian/patches/series 2015-12-06 15:57:35 UTC (rev 18923)
+++ trunk/libitext-java/debian/patches/series 2015-12-06 16:07:08 UTC (rev 18924)
@@ -1,2 +1,3 @@
01_allow_standard_input.patch
02_bouncycastle_compatibility.patch
+bouncycastle-1.51.patch
Modified: trunk/libitext-java/debian/rules
===================================================================
--- trunk/libitext-java/debian/rules 2015-12-06 15:57:35 UTC (rev 18923)
+++ trunk/libitext-java/debian/rules 2015-12-06 16:07:08 UTC (rev 18924)
@@ -9,7 +9,7 @@
DEB_ANT_CLEAN_TARGET :=
DEB_ANT_BUILDFILE := src/build.xml
DEB_JARS := bcprov bcmail bcpkix dom4j pdfrenderer
-CORE_CLASS_PATH := /usr/share/java/bcprov.jar /usr/share/java/bcmail.jar /usr/share/java/bcpkix.jar
+CORE_CLASS_PATH := /usr/share/java/bcprov.jar /usr/share/java/bcmail.jar /usr/share/java/bcpkix.jar
RTF_CLASS_PATH := /usr/share/java/itext.jar /usr/share/java/pdfrenderer.jar /usr/share/java/dom4j.jar
RUPS_CLASS_PATH := /usr/share/java/itext.jar
@@ -33,8 +33,8 @@
install -m 644 lib/iText.jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
dh_link -plib$(LIBRARY_PACKAGE)-java usr/share/java/$(LIBRARY_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(LIBRARY_PACKAGE).jar
jh_depends -plib$(LIBRARY_PACKAGE)-java
- mh_installpoms -plib$(LIBRARY_PACKAGE)-java -e$(DEB_UPSTREAM_VERSION)
- mh_installjar -plib$(LIBRARY_PACKAGE)-java -l -e$(DEB_UPSTREAM_VERSION) ant/pom.xml debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
+ mh_installpoms -plib$(LIBRARY_PACKAGE)-java -e$(DEB_UPSTREAM_VERSION)
+ mh_installjar -plib$(LIBRARY_PACKAGE)-java -l -e$(DEB_UPSTREAM_VERSION) ant/pom.xml debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
install/lib$(LIBRARY_PACKAGE)-rtf-java::
dh_installdirs -plib$(LIBRARY_PACKAGE)-rtf-java usr/share/java
More information about the pkg-java-commits
mailing list