[libpdfbox-java] 05/08: Refresh patches.

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libpdfbox-java.

commit 4dde188c0c2d53ebd7d50f627639451c1b8255bc
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Jan 23 17:51:27 2016 +0100

    Refresh patches.
---
 debian/patches/05_bc1.51.patch | 14 ++++++++------
 debian/patches/bc-1.47.patch   | 12 ++++++------
 debian/patches/build.xml.patch |  4 ++--
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/debian/patches/05_bc1.51.patch b/debian/patches/05_bc1.51.patch
index 73ef81e..7134e8b 100644
--- a/debian/patches/05_bc1.51.patch
+++ b/debian/patches/05_bc1.51.patch
@@ -1,6 +1,8 @@
 Description: patch for bouncycastle 1.51
-Author: tony mancill <tmancill at debian.org>
 Forwarded: no
+Author: tony mancill <tmancill at debian.org>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2016-01-23
 
 --- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
 +++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
@@ -10,17 +12,17 @@ Forwarded: no
  import java.security.NoSuchProviderException;
 +import java.security.PrivateKey;
  import java.security.SecureRandom;
- import java.security.Security;
  import java.security.cert.X509Certificate;
-@@ -57,6 +58,7 @@
+ import java.util.Iterator;
+@@ -56,6 +57,7 @@
  import org.bouncycastle.cms.CMSEnvelopedData;
  import org.bouncycastle.cms.CMSException;
  import org.bouncycastle.cms.RecipientInformation;
 +import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient;
- import org.bouncycastle.jce.provider.BouncyCastleProvider;
  import org.apache.pdfbox.cos.COSArray;
  import org.apache.pdfbox.cos.COSString;
-@@ -187,7 +189,7 @@
+ import org.apache.pdfbox.exceptions.CryptographyException;
+@@ -185,7 +187,7 @@
                      if (ri.getRID().match(material.getCertificate()) && !foundRecipient)
                      {
                          foundRecipient = true;
@@ -29,7 +31,7 @@ Forwarded: no
                          break;
                      }
                  }
-@@ -241,10 +243,6 @@
+@@ -239,10 +241,6 @@
          {
              throw new CryptographyException(e);
          }
diff --git a/debian/patches/bc-1.47.patch b/debian/patches/bc-1.47.patch
index c159a49..eab1c70 100644
--- a/debian/patches/bc-1.47.patch
+++ b/debian/patches/bc-1.47.patch
@@ -4,11 +4,11 @@ Origin: vendor
 Bug: https://issues.apache.org/jira/browse/PDFBOX-1587
  https://issues.apache.org/jira/browse/PDFBOX-1669
 Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2014-09-19
+Last-Update: 2016-01-23
 
 --- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
 +++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
-@@ -39,8 +39,8 @@
+@@ -38,8 +38,8 @@
  import org.apache.commons.logging.LogFactory;
  
  import org.bouncycastle.asn1.ASN1InputStream;
@@ -19,7 +19,7 @@ Last-Update: 2014-09-19
  import org.bouncycastle.asn1.DEROctetString;
  import org.bouncycastle.asn1.DEROutputStream;
  import org.bouncycastle.asn1.DERSet;
-@@ -315,7 +315,7 @@
+@@ -311,7 +311,7 @@
                  pkcs7input[22] = two;
                  pkcs7input[23] = one;
  
@@ -28,7 +28,7 @@ Last-Update: 2014-09-19
  
                  ByteArrayOutputStream baos = new ByteArrayOutputStream();
  
-@@ -382,7 +382,7 @@
+@@ -378,7 +378,7 @@
  
      }
  
@@ -37,7 +37,7 @@ Last-Update: 2014-09-19
          throws IOException,
                 GeneralSecurityException
      {
-@@ -393,7 +393,7 @@
+@@ -389,7 +389,7 @@
          AlgorithmParameters algorithmparameters = algorithmparametergenerator.generateParameters();
          ByteArrayInputStream bytearrayinputstream = new ByteArrayInputStream(algorithmparameters.getEncoded("ASN.1"));
          ASN1InputStream asn1inputstream = new ASN1InputStream(bytearrayinputstream);
@@ -46,7 +46,7 @@ Last-Update: 2014-09-19
          KeyGenerator keygenerator = KeyGenerator.getInstance(s);
          keygenerator.init(128);
          SecretKey secretkey = keygenerator.generateKey();
-@@ -403,13 +403,13 @@
+@@ -399,13 +399,13 @@
          DEROctetString deroctetstring = new DEROctetString(abyte1);
          KeyTransRecipientInfo keytransrecipientinfo = computeRecipientInfo(cert, secretkey.getEncoded());
          DERSet derset = new DERSet(new RecipientInfo(keytransrecipientinfo));
diff --git a/debian/patches/build.xml.patch b/debian/patches/build.xml.patch
index 1cfadd8..2e74bf2 100644
--- a/debian/patches/build.xml.patch
+++ b/debian/patches/build.xml.patch
@@ -5,7 +5,7 @@ Description: adjust for Debian:
 Origin: vendor
 Forwarded: not-needed
 Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2014-09-19
+Last-Update: 2016-01-23
 
 --- a/pdfbox/build.xml
 +++ b/pdfbox/build.xml
@@ -19,7 +19,7 @@ Last-Update: 2014-09-19
 +    <property name="tool.dir" value="/usr/share/java" />
      <property name="bin.dir" value="bin" />
  
-     <property name="project.version" value="1.8.10" />
+     <property name="project.version" value="1.8.11" />
 @@ -64,23 +64,23 @@
      <property name="maven.repo1" value="http://repo1.maven.org/maven2" />
      <property name="maven.repo2" value="http://repo2.maven.org/maven2" />

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpdfbox-java.git