[libpdfbox-java] 03/07: Refresh patches (offset, fuzz).
gregor herrmann
gregoa at debian.org
Fri Sep 19 15:25:35 UTC 2014
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libpdfbox-java.
commit 2f96401b205eb047b1c9b65342f767f7a2486797
Author: gregor herrmann <gregoa at debian.org>
Date: Fri Sep 19 17:13:27 2014 +0200
Refresh patches (offset, fuzz).
---
debian/patches/bc-1.47.patch | 10 +++++-----
debian/patches/build.xml.patch | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/debian/patches/bc-1.47.patch b/debian/patches/bc-1.47.patch
index 10d6337..28fcca9 100644
--- a/debian/patches/bc-1.47.patch
+++ b/debian/patches/bc-1.47.patch
@@ -4,7 +4,7 @@ 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-06-23
+Last-Update: 2014-09-19
--- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
+++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
@@ -19,7 +19,7 @@ Last-Update: 2014-06-23
import org.bouncycastle.asn1.DEROctetString;
import org.bouncycastle.asn1.DEROutputStream;
import org.bouncycastle.asn1.DERSet;
-@@ -316,7 +316,7 @@
+@@ -317,7 +317,7 @@
pkcs7input[22] = two;
pkcs7input[23] = one;
@@ -28,7 +28,7 @@ Last-Update: 2014-06-23
ByteArrayOutputStream baos = new ByteArrayOutputStream();
-@@ -383,7 +383,7 @@
+@@ -384,7 +384,7 @@
}
@@ -37,7 +37,7 @@ Last-Update: 2014-06-23
throws IOException,
GeneralSecurityException
{
-@@ -394,7 +394,7 @@
+@@ -395,7 +395,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-06-23
KeyGenerator keygenerator = KeyGenerator.getInstance(s);
keygenerator.init(128);
SecretKey secretkey = keygenerator.generateKey();
-@@ -404,13 +404,13 @@
+@@ -405,13 +405,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 ef97000..ca0bc63 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-06-23
+Last-Update: 2014-09-19
--- a/pdfbox/build.xml
+++ b/pdfbox/build.xml
@@ -19,7 +19,7 @@ Last-Update: 2014-06-23
+ <property name="tool.dir" value="/usr/share/java" />
<property name="bin.dir" value="bin" />
- <property name="project.version" value="1.8.6" />
+ <property name="project.version" value="1.8.7" />
@@ -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
More information about the pkg-java-commits
mailing list