From ee579efc5a5878adba879e06df9fbe08756b85c9 Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Fri, 25 Nov 2022 18:55:59 +0800 Subject: [PATCH] Fix build error (cherry picked from commit 1767d2be3f354aa270e71cd2a57f20e08163b842) --- 0001-port-to-bouncycastle-1.61.patch | 36 ---------------------------- pdfbox.spec | 6 +++-- 2 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 0001-port-to-bouncycastle-1.61.patch diff --git a/0001-port-to-bouncycastle-1.61.patch b/0001-port-to-bouncycastle-1.61.patch deleted file mode 100644 index 58d298f..0000000 --- a/0001-port-to-bouncycastle-1.61.patch +++ /dev/null @@ -1,36 +0,0 @@ -From d958a27c35d5a173ab3be1798516955cc17b0de8 Mon Sep 17 00:00:00 2001 -From: maminjie -Date: Thu, 1 Apr 2021 15:02:02 +0800 -Subject: [PATCH] port to bouncycastle 1.61 - ---- - .../pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java -index 33badbc..a62529f 100644 ---- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java -+++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java -@@ -50,6 +50,7 @@ import org.bouncycastle.asn1.ASN1ObjectIdentifier; - import org.bouncycastle.asn1.ASN1Primitive; - import org.bouncycastle.asn1.ASN1Set; - import org.bouncycastle.asn1.DEROctetString; -+import org.bouncycastle.asn1.DEROutputStream; - import org.bouncycastle.asn1.DERSet; - import org.bouncycastle.asn1.cms.ContentInfo; - import org.bouncycastle.asn1.cms.EncryptedContentInfo; -@@ -457,7 +458,10 @@ public final class PublicKeySecurityHandler extends SecurityHandler - - ASN1Primitive obj = createDERForRecipient(pkcs7input, certificate); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); -- obj.encodeTo(baos, ASN1Encoding.DER); -+ //obj.encodeTo(baos, ASN1Encoding.DER); -+ //no symbol encodeTo in bouncycastle 1.61 -+ DEROutputStream k = new DEROutputStream(baos); -+ k.writeObject(obj); - - recipientsField[i] = baos.toByteArray(); - --- -2.23.0 - diff --git a/pdfbox.spec b/pdfbox.spec index 9eb9b41..a6d4b87 100644 --- a/pdfbox.spec +++ b/pdfbox.spec @@ -1,11 +1,10 @@ Name: pdfbox Version: 2.0.24 -Release: 2 +Release: 3 Summary: A Java PDF Library License: ASL 2.0 URL: http://pdfbox.apache.org/ Source0: http://www.apache.org/dyn/closer.lua/pdfbox/%{version}/pdfbox-%{version}-src.zip -Patch0000: 0001-port-to-bouncycastle-1.61.patch BuildRequires: maven-local mvn(commons-io:commons-io) BuildRequires: mvn(commons-logging:commons-logging) mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) mvn(org.apache:apache:pom:) @@ -162,6 +161,9 @@ xmvn test --batch-mode --offline -Dmaven.test.failure.ignore=true verify %license LICENSE.txt NOTICE.txt %changelog +* Fri Nov 25 2022 yaoxin - 2.0.24-3 +- Fix build error + * Fri Jul 09 2021 lingsheng - 2.0.24-2 - Remove tests which require net connectivity to avoid build stuck - Move tests to check stage