[pdfbox] update to 1.8.7
gil
gil at fedoraproject.org
Thu Oct 30 06:57:16 UTC 2014
commit e83c25f77cbf92c2a353784984db3c4f91a30211
Author: gil <puntogil at libero.it>
Date: Thu Oct 30 07:57:13 2014 +0100
update to 1.8.7
.gitignore | 1 +
... => pdfbox-1.8.7-port-to-bouncycastle1.50.patch | 34 ++++++++++----------
pdfbox.spec | 20 +++++------
sources | 2 +-
4 files changed, 28 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 44b9aba..c4fc1c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/pdfbox-1.8.3-src.zip
/pdfbox-1.8.4-src.zip
/pdfbox-1.8.5-src.zip
+/pdfbox-1.8.7-src.zip
diff --git a/pdfbox-1.8.5-port-to-bouncycastle1.50.patch b/pdfbox-1.8.7-port-to-bouncycastle1.50.patch
similarity index 83%
rename from pdfbox-1.8.5-port-to-bouncycastle1.50.patch
rename to pdfbox-1.8.7-port-to-bouncycastle1.50.patch
index 1e64d03..0cd888b 100644
--- a/pdfbox-1.8.5-port-to-bouncycastle1.50.patch
+++ b/pdfbox-1.8.7-port-to-bouncycastle1.50.patch
@@ -1,5 +1,5 @@
---- pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java 2014-04-28 19:37:18.000000000 +0200
-+++ pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java-gil 2014-09-26 01:14:24.868807871 +0200
+--- pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java 2014-09-15 20:27:30.000000000 +0200
++++ pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java-gil 2014-09-26 01:31:09.514029829 +0200
@@ -27,6 +27,7 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -8,8 +8,8 @@
import java.security.SecureRandom;
import java.security.Security;
import java.security.cert.X509Certificate;
-@@ -37,7 +38,8 @@
- import javax.crypto.SecretKey;
+@@ -39,7 +40,8 @@
+ import org.apache.commons.logging.LogFactory;
import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.DERObject;
@@ -18,15 +18,15 @@
import org.bouncycastle.asn1.DERObjectIdentifier;
import org.bouncycastle.asn1.DEROctetString;
import org.bouncycastle.asn1.DEROutputStream;
-@@ -55,6 +57,7 @@
- import org.bouncycastle.cms.CMSEnvelopedData;
- import org.bouncycastle.cms.CMSException;
- import org.bouncycastle.cms.RecipientInformation;
+@@ -51,6 +53,7 @@
+ import org.bouncycastle.asn1.cms.KeyTransRecipientInfo;
+ import org.bouncycastle.asn1.cms.RecipientIdentifier;
+ import org.bouncycastle.asn1.cms.RecipientInfo;
+import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient;
- import org.bouncycastle.jce.provider.BouncyCastleProvider;
- import org.apache.pdfbox.cos.COSArray;
- import org.apache.pdfbox.cos.COSString;
-@@ -183,7 +186,7 @@
+ import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
+ import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
+ import org.bouncycastle.asn1.x509.TBSCertificateStructure;
+@@ -191,7 +194,7 @@
if(ri.getRID().match(material.getCertificate()) && !foundRecipient)
{
foundRecipient = true;
@@ -35,7 +35,7 @@
break;
}
}
-@@ -239,10 +242,6 @@
+@@ -247,10 +250,6 @@
{
throw new CryptographyException(e);
}
@@ -46,7 +46,7 @@
catch(NoSuchAlgorithmException e)
{
throw new CryptographyException(e);
-@@ -309,7 +308,7 @@
+@@ -317,7 +316,7 @@
pkcs7input[22] = two;
pkcs7input[23] = one;
@@ -55,7 +55,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
-@@ -376,7 +375,7 @@
+@@ -384,7 +383,7 @@
}
@@ -64,7 +64,7 @@
throws IOException,
GeneralSecurityException
{
-@@ -387,7 +386,7 @@
+@@ -395,7 +394,7 @@
AlgorithmParameters algorithmparameters = algorithmparametergenerator.generateParameters();
ByteArrayInputStream bytearrayinputstream = new ByteArrayInputStream(algorithmparameters.getEncoded("ASN.1"));
ASN1InputStream asn1inputstream = new ASN1InputStream(bytearrayinputstream);
@@ -73,7 +73,7 @@
KeyGenerator keygenerator = KeyGenerator.getInstance(s);
keygenerator.init(128);
SecretKey secretkey = keygenerator.generateKey();
-@@ -400,10 +399,10 @@
+@@ -408,10 +407,10 @@
AlgorithmIdentifier algorithmidentifier = new AlgorithmIdentifier(new DERObjectIdentifier(s), derobject);
EncryptedContentInfo encryptedcontentinfo =
new EncryptedContentInfo(PKCSObjectIdentifiers.data, algorithmidentifier, deroctetstring);
diff --git a/pdfbox.spec b/pdfbox.spec
index e770c75..e6d4109 100644
--- a/pdfbox.spec
+++ b/pdfbox.spec
@@ -1,6 +1,6 @@
Name: pdfbox
-Version: 1.8.5
-Release: 3%{?dist}
+Version: 1.8.7
+Release: 1%{?dist}
Summary: Java library for working with PDF documents
License: ASL 2.0
URL: http://pdfbox.apache.org/
@@ -10,7 +10,7 @@ Patch0: %{name}-nodownload.patch
#Use sysytem bitream-vera-sans-fonts instead of bundled fonts
Patch1: %{name}-1.2.0-bitstream.patch
-Patch3: pdfbox-1.8.5-port-to-bouncycastle1.50.patch
+Patch2: pdfbox-1.8.7-port-to-bouncycastle1.50.patch
BuildRequires: ant
BuildRequires: maven-local
@@ -20,7 +20,6 @@ BuildRequires: apache-commons-logging
BuildRequires: apache-rat-plugin
BuildRequires: bitstream-vera-sans-fonts
BuildRequires: bouncycastle-mail
-#BuildRequires: bouncycastle-pkix
BuildRequires: cobertura-maven-plugin
BuildRequires: fontconfig
BuildRequires: icu4j
@@ -122,7 +121,7 @@ sed -i -e /TestImageIOUtils/d pdfbox/src/test/java/org/apache/pdfbox/TestAll.jav
sed -i.ant "s|<artifactId>ant-nodeps</artifactId>|<artifactId>ant</artifactId>|" pom.xml */pom.xml
-sed -i.log4j12 "s|<version>1.2.12</version>|<version>1.2.17</version>|" preflight/pom.xml
+sed -i.log4j12 "s|<version>1.2.12</version>|<version>1.2.17</version>|" preflight*/pom.xml
#Disable lucene, not compatible with lucene 3.6
%pom_disable_module lucene
@@ -140,13 +139,9 @@ sed -i -e '/META-INF/d' pdfbox/pom.xml
rm -r pdfbox/src/main/resources/org/apache/pdfbox/resources/ttf
%pom_add_dep org.bouncycastle:bcpkix-jdk15on:1.50 %{name}
-%patch3 -p0 -b .bouncycastle1.50
+%patch2 -p0 -b .bouncycastle1.50
-#%%pom_add_dep org.bouncycastle:bcpkix-jdk15on:1.50 examples
-# build fails e.g.
-# cannot find symbol
-# [ERROR] symbol: method addSigner(java.security.PrivateKey,java.security.cert.X509Certificate,java.lang.String)
-# [ERROR] location: variable gen of type org.bouncycastle.cms.CMSSignedDataGenerator
+# TODO
rm -rf examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignature.java \
examples/src/main/java/org/apache/pdfbox/examples/signature/CreateVisibleSignature.java
@@ -206,6 +201,9 @@ sed -i -e /filtering/d examples/pom.xml
%doc LICENSE.txt NOTICE.txt
%changelog
+* Thu Oct 30 2014 gil cattaneo <puntogil at libero.it> 1.8.7-1
+- update to 1.8.7
+
* Fri Sep 26 2014 gil cattaneo <puntogil at libero.it> 1.8.5-3
- build fix for bouncycastle 1.50 (rhbz#1100445)
- adapt to current guideline
diff --git a/sources b/sources
index 6a6bc8c..747dee1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b97c345ddbbd1457989eb206aa5cd40f pdfbox-1.8.5-src.zip
+d37651d71f5814133a05b1fc229ae6d6 pdfbox-1.8.7-src.zip
More information about the scm-commits
mailing list