packages/pdfbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!37 [sync] PR-32: Fix build error

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @wangchong1995924 
Signed-off-by: @wangchong1995924
This commit is contained in:
openeuler-ci-bot 2022-11-26 03:18:23 +00:00 committed by Gitee
commit 9f0c863ac3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
0001-port-to-bouncycastle-1.61.patch
View File

@ -1,36 +0,0 @@
From d958a27c35d5a173ab3be1798516955cc17b0de8 Mon Sep 17 00:00:00 2001
From: maminjie <maminjie1@huawei.com>
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

6
pdfbox.spec
View File

@ -1,11 +1,10 @@
Name: pdfbox Name: pdfbox
Version: 2.0.25 Version: 2.0.25
Release: 2 Release: 3
Summary: A Java PDF Library Summary: A Java PDF Library
License: ASL 2.0 License: ASL 2.0
URL: http://pdfbox.apache.org/ URL: http://pdfbox.apache.org/
Source0: https://archive.apache.org/dist/pdfbox/%{version}/pdfbox-%{version}-src.zip Source0: https://archive.apache.org/dist/pdfbox/%{version}/pdfbox-%{version}-src.zip
Patch0000: 0001-port-to-bouncycastle-1.61.patch
BuildRequires: maven-local mvn(commons-io:commons-io) BuildRequires: maven-local mvn(commons-io:commons-io)
BuildRequires: mvn(commons-logging:commons-logging) mvn(junit:junit) BuildRequires: mvn(commons-logging:commons-logging) mvn(junit:junit)
BuildRequires: mvn(org.apache.ant:ant) mvn(org.apache:apache:pom:) 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 %license LICENSE.txt NOTICE.txt
%changelog %changelog
* Fri Nov 25 2022 yaoxin <yaoxin30@h-partners.com> - 2.0.25-3
- Fix build error
* Mon Nov 14 2022 wulei <wulei80@h-partners.com> - 2.0.25-2 * Mon Nov 14 2022 wulei <wulei80@h-partners.com> - 2.0.25-2
- Modifying the source code package address - Modifying the source code package address