From 6c4a8b32d0197ccf236c89e53620a51f0d5a5219c8b17d6019e310abb26e03ca Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Thu, 16 Jun 2016 08:46:30 +0000
Subject: [PATCH 1/2] - Update to version 1.8.12   - CVE-2016-2175 (pdfbox
 only, which isn't build by this spec)

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-pdfbox?expand=0&rev=3
---
 _service                                 | 3 +++
 apache-pdfbox.changes                    | 6 ++++++
 apache-pdfbox.spec                       | 2 +-
 fontbox-1.8.11.pom => fontbox-1.8.12.pom | 2 +-
 jempbox-1.8.11.pom => jempbox-1.8.12.pom | 2 +-
 pdfbox-1.8.11-src.zip                    | 3 ---
 pdfbox-1.8.12-src.zip                    | 3 +++
 pdfbox-1.8.11.pom => pdfbox-1.8.12.pom   | 5 ++++-
 8 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 _service
 rename fontbox-1.8.11.pom => fontbox-1.8.12.pom (98%)
 rename jempbox-1.8.11.pom => jempbox-1.8.12.pom (98%)
 delete mode 100644 pdfbox-1.8.11-src.zip
 create mode 100644 pdfbox-1.8.12-src.zip
 rename pdfbox-1.8.11.pom => pdfbox-1.8.12.pom (95%)

diff --git a/_service b/_service
new file mode 100644
index 0000000..413b85c
--- /dev/null
+++ b/_service
@@ -0,0 +1,3 @@
+<services>
+  <service name="download_files" mode="disabled" />
+</services>
diff --git a/apache-pdfbox.changes b/apache-pdfbox.changes
index 7bfa4c0..3f53507 100644
--- a/apache-pdfbox.changes
+++ b/apache-pdfbox.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 16 08:43:53 UTC 2016 - fvogt@suse.com
+
+- Update to version 1.8.12
+  - CVE-2016-2175 (pdfbox only, which isn't build by this spec)
+
 -------------------------------------------------------------------
 Mon Mar  7 12:32:36 UTC 2016 - fvogt@suse.com
 
diff --git a/apache-pdfbox.spec b/apache-pdfbox.spec
index 596c670..afef889 100644
--- a/apache-pdfbox.spec
+++ b/apache-pdfbox.spec
@@ -19,7 +19,7 @@
 # Only fontbox and jempbox are built as pdfbox itself depends on Adobe's pcif.
 
 Name:           apache-pdfbox
-Version:        1.8.11
+Version:        1.8.12
 Release:        0
 Summary:        Java PDF Library
 License:        Apache-2.0
diff --git a/fontbox-1.8.11.pom b/fontbox-1.8.12.pom
similarity index 98%
rename from fontbox-1.8.11.pom
rename to fontbox-1.8.12.pom
index c0e9b14..73f44d3 100644
--- a/fontbox-1.8.11.pom
+++ b/fontbox-1.8.12.pom
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.pdfbox</groupId>
     <artifactId>pdfbox-parent</artifactId>
-    <version>1.8.11</version>
+    <version>1.8.12</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
diff --git a/jempbox-1.8.11.pom b/jempbox-1.8.12.pom
similarity index 98%
rename from jempbox-1.8.11.pom
rename to jempbox-1.8.12.pom
index 8fcc0b3..7d9bc19 100644
--- a/jempbox-1.8.11.pom
+++ b/jempbox-1.8.12.pom
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.pdfbox</groupId>
     <artifactId>pdfbox-parent</artifactId>
-    <version>1.8.11</version>
+    <version>1.8.12</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
diff --git a/pdfbox-1.8.11-src.zip b/pdfbox-1.8.11-src.zip
deleted file mode 100644
index d5af92a..0000000
--- a/pdfbox-1.8.11-src.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:160a2d058325845234eaa6b5ae23535b9226aadb4e570a1a76f7106a00653b1b
-size 11026359
diff --git a/pdfbox-1.8.12-src.zip b/pdfbox-1.8.12-src.zip
new file mode 100644
index 0000000..20dcb91
--- /dev/null
+++ b/pdfbox-1.8.12-src.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3365b395564d40e0f5e77e96a88dc9dd452634f912e400aac8422d51f660cd0
+size 11055835
diff --git a/pdfbox-1.8.11.pom b/pdfbox-1.8.12.pom
similarity index 95%
rename from pdfbox-1.8.11.pom
rename to pdfbox-1.8.12.pom
index 9e7e9c9..ba28ced 100644
--- a/pdfbox-1.8.11.pom
+++ b/pdfbox-1.8.12.pom
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.pdfbox</groupId>
         <artifactId>pdfbox-parent</artifactId>
-        <version>1.8.11</version>
+        <version>1.8.12</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -178,6 +178,9 @@
                         <exclude>src/main/resources/META-INF/services/*</exclude>
                         <exclude>src/test/resources/input/rendering/*.ai</exclude>
                         <exclude>src/test/resources/input/*.txt</exclude>
+                        <exclude>src/test/resources/org/apache/pdfbox/filter/*.bin</exclude>
+                        <exclude>src/test/resources/org/apache/pdfbox/encryption/*.der</exclude>
+                        <exclude>src/test/resources/org/apache/pdfbox/encryption/*.pfx</exclude>
                         <exclude>download/glyphlist.txt</exclude>
                         <exclude>release.properties</exclude>
                     </excludes>

From 4207e601b0814f168d71881d43ddfcf8708fde4c9c28a1573ee097f051d9081e Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Thu, 16 Jun 2016 08:48:52 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-pdfbox?expand=0&rev=4

---
 _service | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 _service

diff --git a/_service b/_service
deleted file mode 100644
index 413b85c..0000000
--- a/_service
+++ /dev/null
@@ -1,3 +0,0 @@
-<services>
-  <service name="download_files" mode="disabled" />
-</services>