From 1f1da71346d034ac37d137cf99930190fe4faa19ca58abd80437f97c5d659c72 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 15 May 2018 13:32:35 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-pdfbox?expand=0&rev=15 --- apache-pdfbox.changes | 6 ++++++ apache-pdfbox.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apache-pdfbox.changes b/apache-pdfbox.changes index bd70011..b42a089 100644 --- a/apache-pdfbox.changes +++ b/apache-pdfbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 15 13:31:52 UTC 2018 - fstrba@suse.com + +- Build with source and target 8 to prepare for a possible removal + of 1.6 compatibility in OpenJDK 11 + ------------------------------------------------------------------- Fri Sep 29 06:42:51 UTC 2017 - fstrba@suse.com diff --git a/apache-pdfbox.spec b/apache-pdfbox.spec index 898dae2..ca6e4b1 100644 --- a/apache-pdfbox.spec +++ b/apache-pdfbox.spec @@ -1,7 +1,7 @@ # # spec file for package apache-pdfbox # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,7 +37,7 @@ BuildRequires: apache-commons-logging BuildRequires: bouncycastle BuildRequires: fdupes BuildRequires: icu4j -BuildRequires: java-devel >= 1.6 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit @@ -72,7 +72,7 @@ JavaDoc documentation for %{name} ant -buildfile pdfbox/build.xml \ -Dbcprov.jar=$(build-classpath bcprov) -Djunit.jar=$(build-classpath junit4) \ -Dicu4j.jar=$(build-classpath icu4j) -Dlogging.jar=$(build-classpath commons-logging) \ - -Dbuild.sysclasspath=first -Dcompile.source=1.6 -Dcompile.target=1.6 \ + -Dbuild.sysclasspath=first -Dcompile.source=8 -Dcompile.target=8 \ fontbox.package jempbox.package javadoc %install From e3f417056e5df31dc06c91bcc998851ae13cc029b19d6ef5f2ec7baf35d083f5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 May 2018 19:58:17 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-pdfbox?expand=0&rev=16 --- apache-pdfbox.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-pdfbox.changes b/apache-pdfbox.changes index b42a089..9ed2efb 100644 --- a/apache-pdfbox.changes +++ b/apache-pdfbox.changes @@ -2,7 +2,7 @@ Tue May 15 13:31:52 UTC 2018 - fstrba@suse.com - Build with source and target 8 to prepare for a possible removal - of 1.6 compatibility in OpenJDK 11 + of 1.6 compatibility ------------------------------------------------------------------- Fri Sep 29 06:42:51 UTC 2017 - fstrba@suse.com From bcb9d98508ce7d934489bcbb592d0be2479d2cefc55e42970ee0499cb5506787 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 2 Jul 2018 09:32:27 +0000 Subject: [PATCH 3/3] Accepting request 620188 from home:favogt:branches:Java:packages - Update to 1.8.15: * [PDFBOX-4197] - PDStructureElement.getAttributes() ignores reference objects (CVE-2018-8036,bsc#1099721) - Update to 1.8.14: * [PDFBOX-3625] - Use correct file encoding when saving fdf data * [PDFBOX-3724] - Wrong size in rendering of some artifacts * [PDFBOX-3733] - image added to pdf by tool AddImageToPDF is turn-overed * [PDFBOX-3739] - ImageWriterIterator.next() and ImageReaderIterator.next() can return null * [PDFBOX-3742] - Unknown dir object c='>' cInt=62 peek='>' peekInt=62 * [PDFBOX-3813] - PDF Box crash when using PDFToImage or PDFDebug * [PDFBOX-3843] - Rect of Annotation contains indirect elements + Patch * [PDFBOX-3889] - javax.crypto.BadPaddingException: Given final block not properly padded * [PDFBOX-3909] - End of inline image not detected * [PDFBOX-3919] - Infinite loop while parsing (2) * [PDFBOX-3933] - PDFParser swallows a CR at the end of a stream * [PDFBOX-3942] - ClassCastException in getOptionalContentGroups * [PDFBOX-4005] - Incorrect use of PDNumberTreeNode in PDPageLabels * [PDFBOX-4011] - BBox in signature forms has wrong order * [PDFBOX-4027] - IndexOutOfBoundsException when XObject form matrix has only 5 elements * [PDFBOX-4030] - ClassCastException when matrix array has indirect objects * [PDFBOX-4064] - cm operator has 7 numbers * [PDFBOX-4083] - Line annotation /LL, /LLE and /LLO have wrong default values * [PDFBOX-4088] - Root/StructTreeRoot/K/S must be name, not string (merge) * [PDFBOX-3635] - Remove workaround to avoid SSLHandshakeException * [PDFBOX-4142] - Don't use md5 checksum due to changes to the release distribuition policy - Update to 1.8.13: * [PDFBOX-2420] - DateConverter doesn't handle time zones outside -12 to +12 range properly * [PDFBOX-2919] - org.apache.fontbox.cff.CFFParser.readEntry sometimes throws java.lang.IllegalArgumentException * [PDFBOX-3315] - Dates falsely detected as different by preflight * [PDFBOX-3335] - Issue while Merging PDF with Hidden Layers * [PDFBOX-3341] - currentAccessPermission.setReadOnly() not set in StandardSecurityHandler * [PDFBOX-3355] - PDPageLabels.getLabelsByPageIndices() returns Uppercase letters for style a * [PDFBOX-3368] - ContainsKey don't work for the Map returned by PDStructureTreeRoot.getRoleMap * [PDFBOX-3369] - Error expected floating point number actual='0.00-35095424' * [PDFBOX-3409] - TextToPDF drops leading spaces * [PDFBOX-3420] - Can't sign pdf with a particular attachment * [PDFBOX-3446] - Infinite loop while parsing * [PDFBOX-3448] - NullPointerException at org.apache.pdfbox.pdmodel.common.COSArrayList.convertFloatCOSArrayToList * [PDFBOX-3450] - ArrayIndexOutOfBoundsException at org.apache.fontbox.cmap.CMapParser.increment * [PDFBOX-3463] - XMPSchemaBasic.getLabel() always returns null * [PDFBOX-3466] - Java 9 warnings * [PDFBOX-3472] - NPE when PDF/A identification metadata does not contain ID * [PDFBOX-3477] - CA and ca values should be clipped * [PDFBOX-3481] - Localization in XRef generation results in unusable PDFs * [PDFBOX-3487] - ClassCastException in COSWriter.write() when saving PDF * [PDFBOX-3491] - NumberFormatException in CFFParser.readRealNumber * [PDFBOX-3500] - Error expected floating point number actual='0.-262' * [PDFBOX-3532] - Java 6 errors * [PDFBOX-3546] - IOException over DataFormatException, "invalid stored block lengths" on a valid PDF * [PDFBOX-3551] - CLI Decrypt broken, only allows 1 argument * [PDFBOX-3555] - FlateFilter.decode cause native memory leaks * [PDFBOX-3558] - NPE in JBig2Filter if BitsPerComponent is missing * [PDFBOX-3570] - JDK-8054565 Java 8 close contract issue * [PDFBOX-3571] - sRGB Color Space Profile is subject to 3rd party copyright * [PDFBOX-3578] - java.lang.IllegalArgumentException: dash lengths all zero * [PDFBOX-3590] - AccessPermission not applied * [PDFBOX-3594] - Use PDOutlineItem#findDestinationPage() cannot get PDPage, return was null * [PDFBOX-3609] - ClassCastException in PDCIDFont.readWidths() * [PDFBOX-3410] - TextToPDF needs orientation control * [PDFBOX-3352] - Calendar values are parsed with unknown timezones - Refresh pdfbox-1.8.12-bouncycastle.patch - Add patch to fix the version number: * fix-version.patch - Use %license OBS-URL: https://build.opensuse.org/request/show/620188 OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-pdfbox?expand=0&rev=17 --- apache-pdfbox.changes | 67 ++++++++++++++++++++++++ apache-pdfbox.spec | 11 ++-- fix-version.patch | 13 +++++ fontbox-1.8.12.pom => fontbox-1.8.15.pom | 2 +- jempbox-1.8.12.pom => jempbox-1.8.15.pom | 2 +- pdfbox-1.8.12-bouncycastle.patch | 22 ++++---- pdfbox-1.8.12-src.zip | 3 -- pdfbox-1.8.15-src.zip | 3 ++ pdfbox-1.8.12.pom => pdfbox-1.8.15.pom | 34 +++++------- 9 files changed, 116 insertions(+), 41 deletions(-) create mode 100644 fix-version.patch rename fontbox-1.8.12.pom => fontbox-1.8.15.pom (98%) rename jempbox-1.8.12.pom => jempbox-1.8.15.pom (98%) delete mode 100644 pdfbox-1.8.12-src.zip create mode 100644 pdfbox-1.8.15-src.zip rename pdfbox-1.8.12.pom => pdfbox-1.8.15.pom (89%) diff --git a/apache-pdfbox.changes b/apache-pdfbox.changes index 9ed2efb..9f2034e 100644 --- a/apache-pdfbox.changes +++ b/apache-pdfbox.changes @@ -1,3 +1,70 @@ +------------------------------------------------------------------- +Mon Jul 2 09:00:09 UTC 2018 - fvogt@suse.com + +- Update to 1.8.15: + * [PDFBOX-4197] - PDStructureElement.getAttributes() ignores reference objects (CVE-2018-8036,bsc#1099721) +- Update to 1.8.14: + * [PDFBOX-3625] - Use correct file encoding when saving fdf data + * [PDFBOX-3724] - Wrong size in rendering of some artifacts + * [PDFBOX-3733] - image added to pdf by tool AddImageToPDF is turn-overed + * [PDFBOX-3739] - ImageWriterIterator.next() and ImageReaderIterator.next() can return null + * [PDFBOX-3742] - Unknown dir object c='>' cInt=62 peek='>' peekInt=62 + * [PDFBOX-3813] - PDF Box crash when using PDFToImage or PDFDebug + * [PDFBOX-3843] - Rect of Annotation contains indirect elements + Patch + * [PDFBOX-3889] - javax.crypto.BadPaddingException: Given final block not properly padded + * [PDFBOX-3909] - End of inline image not detected + * [PDFBOX-3919] - Infinite loop while parsing (2) + * [PDFBOX-3933] - PDFParser swallows a CR at the end of a stream + * [PDFBOX-3942] - ClassCastException in getOptionalContentGroups + * [PDFBOX-4005] - Incorrect use of PDNumberTreeNode in PDPageLabels + * [PDFBOX-4011] - BBox in signature forms has wrong order + * [PDFBOX-4027] - IndexOutOfBoundsException when XObject form matrix has only 5 elements + * [PDFBOX-4030] - ClassCastException when matrix array has indirect objects + * [PDFBOX-4064] - cm operator has 7 numbers + * [PDFBOX-4083] - Line annotation /LL, /LLE and /LLO have wrong default values + * [PDFBOX-4088] - Root/StructTreeRoot/K/S must be name, not string (merge) + * [PDFBOX-3635] - Remove workaround to avoid SSLHandshakeException + * [PDFBOX-4142] - Don't use md5 checksum due to changes to the release distribuition policy +- Update to 1.8.13: + * [PDFBOX-2420] - DateConverter doesn't handle time zones outside -12 to +12 range properly + * [PDFBOX-2919] - org.apache.fontbox.cff.CFFParser.readEntry sometimes throws java.lang.IllegalArgumentException + * [PDFBOX-3315] - Dates falsely detected as different by preflight + * [PDFBOX-3335] - Issue while Merging PDF with Hidden Layers + * [PDFBOX-3341] - currentAccessPermission.setReadOnly() not set in StandardSecurityHandler + * [PDFBOX-3355] - PDPageLabels.getLabelsByPageIndices() returns Uppercase letters for style a + * [PDFBOX-3368] - ContainsKey don't work for the Map returned by PDStructureTreeRoot.getRoleMap + * [PDFBOX-3369] - Error expected floating point number actual='0.00-35095424' + * [PDFBOX-3409] - TextToPDF drops leading spaces + * [PDFBOX-3420] - Can't sign pdf with a particular attachment + * [PDFBOX-3446] - Infinite loop while parsing + * [PDFBOX-3448] - NullPointerException at org.apache.pdfbox.pdmodel.common.COSArrayList.convertFloatCOSArrayToList + * [PDFBOX-3450] - ArrayIndexOutOfBoundsException at org.apache.fontbox.cmap.CMapParser.increment + * [PDFBOX-3463] - XMPSchemaBasic.getLabel() always returns null + * [PDFBOX-3466] - Java 9 warnings + * [PDFBOX-3472] - NPE when PDF/A identification metadata does not contain ID + * [PDFBOX-3477] - CA and ca values should be clipped + * [PDFBOX-3481] - Localization in XRef generation results in unusable PDFs + * [PDFBOX-3487] - ClassCastException in COSWriter.write() when saving PDF + * [PDFBOX-3491] - NumberFormatException in CFFParser.readRealNumber + * [PDFBOX-3500] - Error expected floating point number actual='0.-262' + * [PDFBOX-3532] - Java 6 errors + * [PDFBOX-3546] - IOException over DataFormatException, "invalid stored block lengths" on a valid PDF + * [PDFBOX-3551] - CLI Decrypt broken, only allows 1 argument + * [PDFBOX-3555] - FlateFilter.decode cause native memory leaks + * [PDFBOX-3558] - NPE in JBig2Filter if BitsPerComponent is missing + * [PDFBOX-3570] - JDK-8054565 Java 8 close contract issue + * [PDFBOX-3571] - sRGB Color Space Profile is subject to 3rd party copyright + * [PDFBOX-3578] - java.lang.IllegalArgumentException: dash lengths all zero + * [PDFBOX-3590] - AccessPermission not applied + * [PDFBOX-3594] - Use PDOutlineItem#findDestinationPage() cannot get PDPage, return was null + * [PDFBOX-3609] - ClassCastException in PDCIDFont.readWidths() + * [PDFBOX-3410] - TextToPDF needs orientation control + * [PDFBOX-3352] - Calendar values are parsed with unknown timezones +- Refresh pdfbox-1.8.12-bouncycastle.patch +- Add patch to fix the version number: + * fix-version.patch +- Use %license + ------------------------------------------------------------------- Tue May 15 13:31:52 UTC 2018 - fstrba@suse.com diff --git a/apache-pdfbox.spec b/apache-pdfbox.spec index ca6e4b1..3d53982 100644 --- a/apache-pdfbox.spec +++ b/apache-pdfbox.spec @@ -18,7 +18,7 @@ # Only fontbox and jempbox are built as pdfbox itself depends on Adobe's pcif. Name: apache-pdfbox -Version: 1.8.12 +Version: 1.8.15 Release: 0 Summary: Java PDF Library License: Apache-2.0 @@ -32,6 +32,7 @@ Patch0: pdfbox-1.8.12-bouncycastle.patch Patch1: disable-downloads.patch Patch2: fix-javadoc-dep.patch Patch3: pdfbox-1.8.12-sourcetarget.patch +Patch4: fix-version.patch BuildRequires: ant BuildRequires: apache-commons-logging BuildRequires: bouncycastle @@ -62,10 +63,7 @@ JavaDoc documentation for %{name} %prep %setup -q -n pdfbox-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autopatch -p1 %build # Build @@ -100,7 +98,8 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} %{_javadocdir}/%{name} %files -%doc RELEASE-NOTES.txt LICENSE.txt NOTICE.txt README.txt +%doc RELEASE-NOTES.txt NOTICE.txt README.txt +%license LICENSE.txt %{_javadir}/fontbox.jar %{_javadir}/jempbox.jar %{_mavenpomdir}/JPP-fontbox.pom diff --git a/fix-version.patch b/fix-version.patch new file mode 100644 index 0000000..3c89621 --- /dev/null +++ b/fix-version.patch @@ -0,0 +1,13 @@ +Index: pdfbox-1.8.15/pdfbox/build.xml +=================================================================== +--- pdfbox-1.8.15.orig/pdfbox/build.xml ++++ pdfbox-1.8.15/pdfbox/build.xml +@@ -31,7 +31,7 @@ + + + +- ++ + + + diff --git a/fontbox-1.8.12.pom b/fontbox-1.8.15.pom similarity index 98% rename from fontbox-1.8.12.pom rename to fontbox-1.8.15.pom index 73f44d3..b3e5a6d 100644 --- a/fontbox-1.8.12.pom +++ b/fontbox-1.8.15.pom @@ -21,7 +21,7 @@ org.apache.pdfbox pdfbox-parent - 1.8.12 + 1.8.15 ../parent/pom.xml diff --git a/jempbox-1.8.12.pom b/jempbox-1.8.15.pom similarity index 98% rename from jempbox-1.8.12.pom rename to jempbox-1.8.15.pom index 7d9bc19..a598a66 100644 --- a/jempbox-1.8.12.pom +++ b/jempbox-1.8.15.pom @@ -21,7 +21,7 @@ org.apache.pdfbox pdfbox-parent - 1.8.12 + 1.8.15 ../parent/pom.xml diff --git a/pdfbox-1.8.12-bouncycastle.patch b/pdfbox-1.8.12-bouncycastle.patch index 76b3d41..3837c50 100644 --- a/pdfbox-1.8.12-bouncycastle.patch +++ b/pdfbox-1.8.12-bouncycastle.patch @@ -1,6 +1,8 @@ ---- pdfbox-1.8.12/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java 2017-09-15 07:55:42.552501155 +0200 -+++ pdfbox-1.8.12/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java 2017-09-15 08:21:29.621212330 +0200 -@@ -38,7 +38,7 @@ +Index: pdfbox-1.8.15/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java +=================================================================== +--- pdfbox-1.8.15.orig/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java ++++ pdfbox-1.8.15/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java +@@ -38,7 +38,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.bouncycastle.asn1.ASN1InputStream; @@ -9,7 +11,7 @@ import org.bouncycastle.asn1.DERObjectIdentifier; import org.bouncycastle.asn1.DEROctetString; import org.bouncycastle.asn1.DEROutputStream; -@@ -53,9 +53,6 @@ +@@ -53,9 +53,6 @@ import org.bouncycastle.asn1.cms.Recipie import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; import org.bouncycastle.asn1.x509.AlgorithmIdentifier; import org.bouncycastle.asn1.x509.TBSCertificateStructure; @@ -19,7 +21,7 @@ import org.apache.pdfbox.cos.COSArray; import org.apache.pdfbox.cos.COSString; import org.apache.pdfbox.exceptions.CryptographyException; -@@ -311,7 +308,7 @@ +@@ -311,7 +308,7 @@ public class PublicKeySecurityHandler ex pkcs7input[22] = two; pkcs7input[23] = one; @@ -28,7 +30,7 @@ ByteArrayOutputStream baos = new ByteArrayOutputStream(); -@@ -378,7 +375,7 @@ +@@ -378,7 +375,7 @@ public class PublicKeySecurityHandler ex } @@ -37,12 +39,12 @@ throws IOException, GeneralSecurityException { -@@ -389,7 +386,7 @@ +@@ -389,7 +386,7 @@ public class PublicKeySecurityHandler ex AlgorithmParameters algorithmparameters = algorithmparametergenerator.generateParameters(); ByteArrayInputStream bytearrayinputstream = new ByteArrayInputStream(algorithmparameters.getEncoded("ASN.1")); ASN1InputStream asn1inputstream = new ASN1InputStream(bytearrayinputstream); - DERObject derobject = asn1inputstream.readObject(); + ASN1Primitive derobject = asn1inputstream.readObject(); - KeyGenerator keygenerator = KeyGenerator.getInstance(s); - keygenerator.init(128); - SecretKey secretkey = keygenerator.generateKey(); + KeyGenerator keygenerator; + try + { diff --git a/pdfbox-1.8.12-src.zip b/pdfbox-1.8.12-src.zip deleted file mode 100644 index 20dcb91..0000000 --- a/pdfbox-1.8.12-src.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3365b395564d40e0f5e77e96a88dc9dd452634f912e400aac8422d51f660cd0 -size 11055835 diff --git a/pdfbox-1.8.15-src.zip b/pdfbox-1.8.15-src.zip new file mode 100644 index 0000000..937adf9 --- /dev/null +++ b/pdfbox-1.8.15-src.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2d66fc193ae82b8926ed8467de0d6bcfc898d8d5433ac19b7299b720d01b03e +size 11078696 diff --git a/pdfbox-1.8.12.pom b/pdfbox-1.8.15.pom similarity index 89% rename from pdfbox-1.8.12.pom rename to pdfbox-1.8.15.pom index ba28ced..fcf3bdf 100644 --- a/pdfbox-1.8.12.pom +++ b/pdfbox-1.8.15.pom @@ -23,7 +23,7 @@ org.apache.pdfbox pdfbox-parent - 1.8.12 + 1.8.15 ../parent/pom.xml @@ -77,35 +77,28 @@ test - com.levigo.jbig2 levigo-jbig2-imageio - 1.6.2 + 1.6.5 test - net.java.dev.jai-imageio - jai-imageio-core-standalone - 1.2-pre-dr-b04-2011-07-04 + com.github.jai-imageio + jai-imageio-core + 1.3.1 test + + com.github.jai-imageio + jai-imageio-jpeg2000 + 1.3.0 + test + - - - - jbig2.googlecode - JBIG2 ImageIO-Plugin repository at googlecode.com - https://jbig2-imageio.googlecode.com/svn/maven-repository/ - - - mygrid-repository - myGrid Repository - http://www.mygrid.org.uk/maven/repository - - @@ -141,7 +134,7 @@ maven-surefire-plugin - -Xmx128m + -Xmx128m -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider org/apache/pdfbox/TestAll.java org/apache/pdfbox/util/TestImageIOUtils.java @@ -181,6 +174,7 @@ src/test/resources/org/apache/pdfbox/filter/*.bin src/test/resources/org/apache/pdfbox/encryption/*.der src/test/resources/org/apache/pdfbox/encryption/*.pfx + src/test/resources/org/apache/pdfbox/pdmodel/sRGB.* download/glyphlist.txt release.properties