From bc347e28287987f3d2451ebed51fcc24052a393e Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Tue, 7 Dec 2021 11:38:41 +0100
Subject: [PATCH] 2023979 - qpdf-10.4.0 is available

---
 .gitignore                          |  1 +
 qpdf-s390x-disable-streamtest.patch | 27 ++++++++++++---------------
 qpdf.spec                           |  9 ++++++---
 sources                             |  2 +-
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 17675c9..582184f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 /qpdf-10.3.0.tar.gz
 /qpdf-10.3.1.tar.gz
 /qpdf-10.3.2.tar.gz
+/qpdf-10.4.0.tar.gz
diff --git a/qpdf-s390x-disable-streamtest.patch b/qpdf-s390x-disable-streamtest.patch
index 921d676..db032fd 100644
--- a/qpdf-s390x-disable-streamtest.patch
+++ b/qpdf-s390x-disable-streamtest.patch
@@ -1,8 +1,7 @@
-diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc
-index 1968214..0b9b59d 100644
---- a/libqpdf/QPDFWriter.cc
-+++ b/libqpdf/QPDFWriter.cc
-@@ -2096,7 +2096,6 @@ QPDFWriter::writeObjectStream(QPDFObjectHandle object)
+diff -up qpdf-10.4.0/libqpdf/QPDFWriter.cc.s390x-disable-streamtest qpdf-10.4.0/libqpdf/QPDFWriter.cc
+--- qpdf-10.4.0/libqpdf/QPDFWriter.cc.s390x-disable-streamtest	2021-12-06 12:53:11.625309618 +0100
++++ qpdf-10.4.0/libqpdf/QPDFWriter.cc	2021-12-06 12:53:11.627309604 +0100
+@@ -2096,7 +2096,6 @@ QPDFWriter::writeObjectStream(QPDFObject
                  // This condition occurred in a fuzz input. Ideally we
                  // should block it at at parse time, but it's not
                  // clear to me how to construct a case for this.
@@ -10,10 +9,9 @@ index 1968214..0b9b59d 100644
                  obj_to_write.warnIfPossible(
                      "stream found inside object stream; treating as null");
                  obj_to_write = QPDFObjectHandle::newNull();
-diff --git a/qpdf/qpdf.testcov b/qpdf/qpdf.testcov
-index 9a15ae6..ce58c3c 100644
---- a/qpdf/qpdf.testcov
-+++ b/qpdf/qpdf.testcov
+diff -up qpdf-10.4.0/qpdf/qpdf.testcov.s390x-disable-streamtest qpdf-10.4.0/qpdf/qpdf.testcov
+--- qpdf-10.4.0/qpdf/qpdf.testcov.s390x-disable-streamtest	2021-11-16 21:44:09.000000000 +0100
++++ qpdf-10.4.0/qpdf/qpdf.testcov	2021-12-06 12:53:11.628309596 +0100
 @@ -442,7 +442,6 @@ QPDF xref skipped space 0
  QPDF eof skipping spaces before xref 1
  QPDF_encryption user matches owner V < 5 0
@@ -22,15 +20,14 @@ index 9a15ae6..ce58c3c 100644
  QPDFObjectHandle duplicate dict key 0
  QPDFWriter no encryption sig contents 0
  QPDFPageObjectHelper colorspace lookup 0
-diff --git a/qpdf/qtest/qpdf.test b/qpdf/qtest/qpdf.test
-index 5a978d3..c9002ba 100644
---- a/qpdf/qtest/qpdf.test
-+++ b/qpdf/qtest/qpdf.test
-@@ -996,7 +996,6 @@ my @bug_tests = (
+diff -up qpdf-10.4.0/qpdf/qtest/qpdf.test.s390x-disable-streamtest qpdf-10.4.0/qpdf/qtest/qpdf.test
+--- qpdf-10.4.0/qpdf/qtest/qpdf.test.s390x-disable-streamtest	2021-12-06 12:53:11.628309596 +0100
++++ qpdf-10.4.0/qpdf/qtest/qpdf.test	2021-12-06 12:54:45.351620347 +0100
+@@ -1024,7 +1024,6 @@ my @bug_tests = (
      ["263", "empty xref stream", 2],
      ["335a", "ozz-fuzz-12152", 2],
      ["335b", "ozz-fuzz-14845", 2],
 -    ["fuzz-16214", "stream in object stream", 3, "--preserve-unreferenced"],
-     # When adding to this list, consider adding to SEED_CORPUS_FILES
+     # When adding to this list, consider adding to CORPUS_FROM_TEST
      # in fuzz/build.mk and updating the count in fuzz/qtest/fuzz.test.
      );
diff --git a/qpdf.spec b/qpdf.spec
index 21daa10..3e88882 100644
--- a/qpdf.spec
+++ b/qpdf.spec
@@ -1,7 +1,7 @@
 Summary: Command-line tools and library for transforming PDF files
 Name:    qpdf
-Version: 10.3.2
-Release: 2%{?dist}
+Version: 10.4.0
+Release: 1%{?dist}
 # MIT: e.g. libqpdf/sha2.c
 # upstream uses ASL 2.0 now, but he allowed other to distribute qpdf under
 # old license (see README)
@@ -135,7 +135,7 @@ make check
 %doc README.md TODO ChangeLog
 %license Artistic-2.0
 %{_libdir}/libqpdf.so.28
-%{_libdir}/libqpdf.so.28.3.2
+%{_libdir}/libqpdf.so.28.4.0
 
 %files devel
 %doc examples/*.cc examples/*.c
@@ -148,6 +148,9 @@ make check
 
 
 %changelog
+* Mon Dec 06 2021 Zdenek Dohnal <zdohnal@redhat.com> - 10.4.0-1
+- 2023979 - qpdf-10.4.0 is available
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 10.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index f22c2cf..06b171a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qpdf-10.3.2.tar.gz) = 4e630959abf27d1801e36d0cbd754945ded42ade9299057a6b9a642c7cb2a3f8242e274642f1c33a65b4a5a77562d91dcbe64fd5772d483cbe5edb4a6a389219
+SHA512 (qpdf-10.4.0.tar.gz) = 7a17cc2b3168bb60ac05d01b585d34d94f62e44e309b86635351b2564bc2c3b7846d3a008ae0d6c068bce3b1d9c42d3a3ab40de3f85a1ec4952280cf8321a041