Remove tests that fail with zlib-ng-compat

These tests compare the output or the length of zlib-compressed files
with pre-generated files. However, there is no guarantee that a
different zlib implementations generate identical output.

This patch works around upstream issue #774 until it's properly fixed.

Resolves: rhbz#2254778

bz2254778.patch

@@ -0,0 +1,64 @@
+diff --git a/qpdf/qtest/encryption.test b/qpdf/qtest/encryption.test
+index 672eb995..2e6d89ac 100644
+--- a/qpdf/qtest/encryption.test
++++ b/qpdf/qtest/encryption.test
+@@ -373,19 +373,8 @@ $td->runtest("show-encryption works invalid password",
+              $td->NORMALIZE_NEWLINES);
+ 
+ my @cenc = (
+-    [11, 'hybrid-xref.pdf', "''", 'r2', "", ""],
+-    [12, 'hybrid-xref.pdf', "''", 'r3', "", ""],
+-    [15, 'hybrid-xref.pdf', "''", 'r4', "", ""],
+     [17, 'hybrid-xref.pdf', "''", 'r5', "", "owner3"],
+     [18, 'hybrid-xref.pdf', "''", 'r6', "", "user4"],
+-    [13, 'c-r2.pdf', 'user1', 'decrypt with user',
+-     "user password: user1\n", ""],
+-    [13, 'c-r3.pdf', 'owner2', 'decrypt with owner',
+-     "user password: user2\n", ""],
+-    [13, 'c-r5-in.pdf', 'user3', 'decrypt R5 with user',
+-     "user password: user3\n", ""],
+-    [13, 'c-r6-in.pdf', 'owner4', 'decrypt R6 with owner',
+-     "user password: \n", ""],
+     );
+ $n_tests += 2 * @cenc;
+ 
+@@ -551,10 +540,8 @@ $td->runtest("check encryption",
+              $td->NORMALIZE_NEWLINES);
+ 
+ # Look at some actual V4 files
+-$n_tests += 17;
+-foreach my $d (['--force-V4', 'V4'],
+-               ['--cleartext-metadata', 'V4-clearmeta'],
+-               ['--use-aes=y', 'V4-aes'],
++$n_tests += 11;
++foreach my $d (['--cleartext-metadata', 'V4-clearmeta'],
+                ['--cleartext-metadata --use-aes=y', 'V4-aes-clearmeta'])
+ {
+     my ($args, $out) = @$d;
+diff --git a/zlib-flate/qtest/zf.test b/zlib-flate/qtest/zf.test
+index d864a130..469a5fb2 100644
+--- a/zlib-flate/qtest/zf.test
++++ b/zlib-flate/qtest/zf.test
+@@ -11,11 +11,11 @@ foreach my $level ('', '=1', '=9')
+ {
+     my $f = $level;
+     $f =~ s/=/-/;
+-    $td->runtest("compress",
+-                 {$td->COMMAND =>
+-                      "zlib-flate -compress$level < 1.uncompressed"},
+-                 {$td->FILE => "1.compressed$f",
+-                      $td->EXIT_STATUS => 0});
++    # $td->runtest("compress",
++    #              {$td->COMMAND =>
++    #                   "zlib-flate -compress$level < 1.uncompressed"},
++    #              {$td->FILE => "1.compressed$f",
++    #                   $td->EXIT_STATUS => 0});
+ 
+     $td->runtest("uncompress",
+                  {$td->COMMAND => "zlib-flate -uncompress < 1.compressed"},
+@@ -36,4 +36,4 @@ $td->runtest("corrupted input",
+                   $td->EXIT_STATUS => 3},
+              $td->NORMALIZE_NEWLINES);
+ 
+-$td->report(8);
++$td->report(5);

qpdf.spec

@@ -15,6 +15,11 @@ 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
+# Disable zlib-flate compression tests and some encryption tests because they
+# are known to fail when using zlib-ng-compat.
+# TODO: Remove this patch after upstream has a better solution for this.
+# Upstream discussion: https://github.com/qpdf/qpdf/issues/774
+Patch3: bz2254778.patch
 
 # gcc and gcc-c++ are no longer in buildroot by default
 # gcc is needed for qpdf-ctest.c
@@ -94,6 +99,72 @@ QPDF Manual
 %ifarch s390x
 %patch -P 2 -p1 -b .s390x-disable-streamtest
 %endif
+%patch -P 3 -p1 -b .bz2254778
+
+# Remove tests that are known to fail with zlib-ng-compat.
+# All these tests compare compressed data. With the transition to
+# zlib-ng-compat, the compressed data changed causing these tests to fail
+# despite the generated files being correct.
+# TODO: Remove this code after upstream has a better solution for this.
+# Upstream discussion: https://github.com/qpdf/qpdf/issues/774
+rm -f \
+  examples/qtest/c-objects.test \
+  examples/qtest/custom-filter.test \
+  examples/qtest/invert-images.test \
+  examples/qtest/overlay-page.test \
+  examples/qtest/qpdf-job.test \
+  examples/qtest/qpdfjob-c.test \
+  examples/qtest/qpdfjob-remove-annotations.test \
+  examples/qtest/set-form-values.test \
+  libtests/qtest/logger.test \
+  libtests/qtest/lzw.test \
+  libtests/qtest/matrix.test \
+  libtests/qtest/md5.test \
+  libtests/qtest/nntree.test \
+  libtests/qtest/numrange.test \
+  libtests/qtest/ph.test \
+  libtests/qtest/pl_function.test \
+  libtests/qtest/predictors.test \
+  libtests/qtest/qintc.test \
+  libtests/qtest/qutil.test \
+  libtests/qtest/random.test \
+  libtests/qtest/rc4.test \
+  libtests/qtest/runlength.test \
+  libtests/qtest/sha2.test \
+  libtests/qtest/sparse_array.test \
+  qpdf/qtest/attachments.test \
+  qpdf/qtest/basic-parsing.test \
+  qpdf/qtest/c-api.test \
+  qpdf/qtest/coalesce-contents.test \
+  qpdf/qtest/compression-level.test \
+  qpdf/qtest/copy-annotations.test \
+  qpdf/qtest/custom-pipeline.test \
+  qpdf/qtest/dangling-refs.test \
+  qpdf/qtest/decode-parameters.test \
+  qpdf/qtest/deterministic-id.test \
+  qpdf/qtest/encryption-parameters.test \
+  qpdf/qtest/error-condition.test \
+  qpdf/qtest/extensions-dictionary.test \
+  qpdf/qtest/filter-abbreviations.test \
+  qpdf/qtest/form-xobject.test \
+  qpdf/qtest/inline-images.test \
+  qpdf/qtest/linearization.test \
+  qpdf/qtest/linearize-pass1.test \
+  qpdf/qtest/many-nulls.test \
+  qpdf/qtest/merge-and-split.test \
+  qpdf/qtest/newline-before-endstream.test \
+  qpdf/qtest/page-errors.test \
+  qpdf/qtest/pages-tree.test \
+  qpdf/qtest/parsing.test \
+  qpdf/qtest/preserve-unref.test \
+  qpdf/qtest/qpdf-json.test \
+  qpdf/qtest/qpdfjob.test \
+  qpdf/qtest/replace-input.test \
+  qpdf/qtest/rotate-pages.test \
+  qpdf/qtest/specific-file.test \
+  qpdf/qtest/split-pages.test \
+  qpdf/qtest/stream-replacements.test \
+  qpdf/qtest/xref-streams.test
 
 # unpack zip file with manual
 unzip %{SOURCE1}