From dcf5187289cfa9cc6e6faf8c491c49041b28a989 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Mon, 19 Apr 2021 14:48:14 +0200
Subject: [PATCH] zlib got downstream patches on s390x, we need to patch qpdf
 test suite for it

---
 qpdf-s390x-disable-streamtest.patch | 36 +++++++++++++++++++++++++++++
 qpdf.spec                           |  7 ++++++
 2 files changed, 43 insertions(+)
 create mode 100644 qpdf-s390x-disable-streamtest.patch

diff --git a/qpdf-s390x-disable-streamtest.patch b/qpdf-s390x-disable-streamtest.patch
new file mode 100644
index 0000000..8a157c3
--- /dev/null
+++ b/qpdf-s390x-disable-streamtest.patch
@@ -0,0 +1,36 @@
+diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc
+index fccefe0..2793191 100644
+--- a/libqpdf/QPDFWriter.cc
++++ b/libqpdf/QPDFWriter.cc
+@@ -2096,7 +2096,6 @@ QPDFWriter::writeObjectStream(QPDFObjectHandle object)
+                 // 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.
+-                QTC::TC("qpdf", "QPDFWriter stream in ostream");
+                 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 b4e7c46..3e935d0 100644
+--- a/qpdf/qpdf.testcov
++++ b/qpdf/qpdf.testcov
+@@ -443,7 +443,6 @@ QPDF xref skipped space 0
+ QPDF eof skipping spaces before xref 1
+ QPDF_encryption user matches owner V < 5 0
+ QPDF_encryption same password 1
+-QPDFWriter stream in ostream 0
+ 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 afb6668..b8f55a2 100644
+--- a/qpdf/qtest/qpdf.test
++++ b/qpdf/qtest/qpdf.test
+@@ -996,7 +996,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],
+     # When adding to this list, consider adding to SEED_CORPUS_FILES
+     # in fuzz/build.mk and updating the count in fuzz/qtest/fuzz.test.
+     );
diff --git a/qpdf.spec b/qpdf.spec
index 345e410..ac49afb 100644
--- a/qpdf.spec
+++ b/qpdf.spec
@@ -12,6 +12,9 @@ Source0: http://downloads.sourceforge.net/sourceforge/qpdf/qpdf-%{version}.tar.g
 Patch0:  qpdf-doc.patch
 # make qpdf working under FIPS, downstream patch
 Patch1:  qpdf-relax.patch
+# now we have s390x specific patch in zlib which changes output
+# so we need to disable one test because of it
+Patch2: qpdf-s390x-disable-streamtest.patch
 
 # gcc and gcc-c++ are no longer in buildroot by default
 # gcc is needed for qpdf-ctest.c
@@ -94,6 +97,9 @@ QPDF Manual
 # fix 'complete manual location' note in man pages
 %patch0 -p1 -b .doc
 %patch1 -p1 -b .relax
+%ifarch s390x
+%patch2 -p1 -b .s390x-disable-streamtest
+%endif
 
 %build
 # work-around check-rpaths errors
@@ -144,6 +150,7 @@ make check
 %changelog
 * Mon Apr 19 2021 Zdenek Dohnal <zdohnal@redhat.com> - 10.3.1-2
 - aarch64 specific patches were removed from zlib, so no need for ours
+- zlib got downstream patches on s390x, we need to patch qpdf test suite for it
 
 * Fri Mar 12 2021 Zdenek Dohnal <zdohnal@redhat.com> - 10.3.1-1
 - 1937988 - qpdf-10.3.1 is available