0001-port-to-bouncycastle-1.61.patch

@@ -0,0 +1,36 @@
+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
+

pdfbox.spec

@@ -1,16 +1,17 @@
 Name:          pdfbox
-Version:       2.0.25
-Release:       3
+Version:       2.0.23
+Release:       1
 Summary:       A Java PDF Library
 License:       ASL 2.0
 URL:           http://pdfbox.apache.org/
-Source0:       https://archive.apache.org/dist/pdfbox/%{version}/pdfbox-%{version}-src.zip
+Source0:       http://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: mvn(commons-logging:commons-logging) mvn(junit:junit)
 BuildRequires: mvn(org.apache.ant:ant) mvn(org.apache:apache:pom:)
 BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) mvn(org.bouncycastle:bcmail-jdk15on)
 BuildRequires: mvn(org.bouncycastle:bcprov-jdk15on) dejavu-sans-mono-fonts google-noto-emoji-fonts
-BuildRequires: liberation-sans-fonts icc-profiles-openicc fontconfig mockito
+BuildRequires: liberation-sans-fonts icc-profiles-openicc fontconfig
 Requires:      liberation-sans-fonts
 
 BuildArch:     noarch
@@ -106,14 +107,7 @@ done
 sed -i -e 's/TestTextStripper/BidiTest/' pdfbox/src/test/java/org/apache/pdfbox/text/BidiTest.java
 
 rm pdfbox/src/test/java/org/apache/pdfbox/multipdf/MergeAcroFormsTest.java \
-   pdfbox/src/test/java/org/apache/pdfbox/multipdf/MergeAnnotationsTest.java \
-   pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java \
-   pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFlattenTest.java \
-   pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFromAnnotsTest.java \
-   pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormGenerateAppearancesTest.java \
-   pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormTest.java \
-   pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeTest.java \
-   pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestRadioButtons.java
+   pdfbox/src/test/java/org/apache/pdfbox/multipdf/MergeAnnotationsTest.java
 sed -i -e '/\(OptionsAndNamesNotNumbers\|RadioButtonWithOptions\)/i\@org.junit.Ignore' \
    pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDButtonTest.java
 
@@ -127,14 +121,11 @@ sed -i -e '/\(OptionsAndNamesNotNumbers\|RadioButtonWithOptions\)/i\@org.junit.I
 %mvn_file :fontbox fontbox
 
 %build
-%mvn_build -s --skipTests -- -DskipITs -Dlucene.version=4 -Dmaven.test.failure.ignore=true
+%mvn_build -s -- -DskipITs -Dlucene.version=4 -Dmaven.test.failure.ignore=true
 
 %install
 %mvn_install
 
-%check
-xmvn test --batch-mode --offline -Dmaven.test.failure.ignore=true verify
-
 %files -f .mfiles-pdfbox
 %doc README.md RELEASE-NOTES.txt
 
@@ -161,22 +152,6 @@ xmvn test --batch-mode --offline -Dmaven.test.failure.ignore=true verify
 %license LICENSE.txt NOTICE.txt
 
 %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
-- Modifying the source code package address
-
-* Tue Jan 18 2022 SimpleUpdate Robot <tc@openeuler.org> - 2.0.25-1
-- Upgrade to version 2.0.25
-
-* Fri Jul 09 2021 lingsheng <lingsheng@huawei.com> - 2.0.24-2
-- Remove tests which require net connectivity to avoid build stuck
-- Move tests to check stage
-
-* Tue Jun 29 2021 houyingchao <houyingchao@huawei.com> - 2.0.24-1
-- Upgrade to 2.0.24
-
 * Thu Apr 01 2021 maminjie <maminjie1@huawei.com> - 2.0.23-1
 - Upgrade to 2.0.23