1932052 - qpdf-10.2.0 is available

2021-02-24 13:18:25 +01:00 · 2021-02-24 13:18:25 +01:00 · 601d7442e0
commit 601d7442e0
parent b3db7a5854
5 changed files with 60 additions and 51 deletions
--- a/.gitignore
+++ b/.gitignore
@ -29,3 +29,4 @@
 /qpdf-10.0.3.tar.gz
 /qpdf-10.0.4.tar.gz
 /qpdf-10.1.0.tar.gz
+/qpdf-10.2.0.tar.gz
--- a/qpdf-erase-tests-with-generated-object-stream.patch
+++ b/qpdf-erase-tests-with-generated-object-stream.patch
@ -1,7 +1,7 @@
-diff -up qpdf-9.0.1/examples/qtest/filter-tokens.test.erase-tests-with-generated-object-stream qpdf-9.0.1/examples/qtest/filter-tokens.test
--- qpdf-9.0.1/examples/qtest/filter-tokens.test.erase-tests-with-generated-object-stream	2019-09-20 14:07:56.000000000 +0200
-+++ qpdf-9.0.1/examples/qtest/filter-tokens.test	2019-10-03 08:05:23.809400490 +0200
-@@ -13,8 +13,4 @@ $td->runtest("filter tokens",
+diff -up qpdf-10.2.0/examples/qtest/filter-tokens.test.erase-tests-with-generated-object-stream qpdf-10.2.0/examples/qtest/filter-tokens.test
+--- qpdf-10.2.0/examples/qtest/filter-tokens.test.erase-tests-with-generated-object-stream	2021-02-24 12:45:32.347357149 +0100
+++ qpdf-10.2.0/examples/qtest/filter-tokens.test	2021-02-24 12:47:01.379611993 +0100
+@@ -15,13 +15,9 @@ $td->runtest("filter tokens",
 	     {$td->COMMAND => "pdf-filter-tokens in.pdf a.pdf"},
 	     {$td->STRING => "", $td->EXIT_STATUS => 0});
 
@ -9,12 +9,17 @@ diff -up qpdf-9.0.1/examples/qtest/filter-tokens.test.erase-tests-with-generated
 -	     {$td->FILE => "a.pdf"},
 -	     {$td->FILE => "out.pdf"});
 -
+ cleanup();
+ 
 -$td->report(2);
 +$td->report(1);
-diff -up qpdf-9.0.1/examples/qtest/invert-images.test.erase-tests-with-generated-object-stream qpdf-9.0.1/examples/qtest/invert-images.test
--- qpdf-9.0.1/examples/qtest/invert-images.test.erase-tests-with-generated-object-stream	2019-09-20 14:07:56.000000000 +0200
-+++ qpdf-9.0.1/examples/qtest/invert-images.test	2019-10-03 08:05:23.810400481 +0200
-@@ -19,13 +19,13 @@ $td->runtest("double page size",
+ 
+ sub cleanup
+ {
+diff -up qpdf-10.2.0/examples/qtest/invert-images.test.erase-tests-with-generated-object-stream qpdf-10.2.0/examples/qtest/invert-images.test
+--- qpdf-10.2.0/examples/qtest/invert-images.test.erase-tests-with-generated-object-stream	2021-02-23 16:41:58.000000000 +0100
+++ qpdf-10.2.0/examples/qtest/invert-images.test	2021-02-24 12:45:32.347357149 +0100
+@@ -19,13 +19,13 @@ $td->runtest("invert images",
 	      $td->EXIT_STATUS => 0},
 	     $td->NORMALIZE_NEWLINES);
 
@ -32,9 +37,9 @@ diff -up qpdf-9.0.1/examples/qtest/invert-images.test.erase-tests-with-generated
 
 sub cleanup
 {
-diff -up qpdf-9.0.1/examples/qtest/set-form-values.test.erase-tests-with-generated-object-stream qpdf-9.0.1/examples/qtest/set-form-values.test
--- qpdf-9.0.1/examples/qtest/set-form-values.test.erase-tests-with-generated-object-stream	2019-09-20 14:07:56.000000000 +0200
-+++ qpdf-9.0.1/examples/qtest/set-form-values.test	2019-10-03 08:05:23.810400481 +0200
+diff -up qpdf-10.2.0/examples/qtest/set-form-values.test.erase-tests-with-generated-object-stream qpdf-10.2.0/examples/qtest/set-form-values.test
+--- qpdf-10.2.0/examples/qtest/set-form-values.test.erase-tests-with-generated-object-stream	2021-02-23 16:41:58.000000000 +0100
+++ qpdf-10.2.0/examples/qtest/set-form-values.test	2021-02-24 12:45:32.347357149 +0100
@@ -14,13 +14,10 @@ cleanup();
 $td->runtest("set form values",
 	     {$td->COMMAND => "pdf-set-form-values form-in.pdf a.pdf soup"},
@ -50,10 +55,10 @@ diff -up qpdf-9.0.1/examples/qtest/set-form-values.test.erase-tests-with-generat
 
 sub cleanup
 {
-diff -up qpdf-9.0.1/libqpdf/qpdf-c.cc.erase-tests-with-generated-object-stream qpdf-9.0.1/libqpdf/qpdf-c.cc
--- qpdf-9.0.1/libqpdf/qpdf-c.cc.erase-tests-with-generated-object-stream	2019-09-20 14:07:56.000000000 +0200
-+++ qpdf-9.0.1/libqpdf/qpdf-c.cc	2019-10-03 08:05:23.811400473 +0200
-@@ -297,7 +297,6 @@ QPDF_ERROR_CODE qpdf_read_memory(qpdf_da
+diff -up qpdf-10.2.0/libqpdf/qpdf-c.cc.erase-tests-with-generated-object-stream qpdf-10.2.0/libqpdf/qpdf-c.cc
+--- qpdf-10.2.0/libqpdf/qpdf-c.cc.erase-tests-with-generated-object-stream	2021-02-23 16:41:58.000000000 +0100
+++ qpdf-10.2.0/libqpdf/qpdf-c.cc	2021-02-24 12:45:32.348357141 +0100
+@@ -331,7 +331,6 @@ QPDF_ERROR_CODE qpdf_read_memory(qpdf_da
     qpdf->size = size;
     qpdf->password = password;
     status = trap_errors(qpdf, &call_read_memory);
@ -61,7 +66,7 @@ diff -up qpdf-9.0.1/libqpdf/qpdf-c.cc.erase-tests-with-generated-object-stream q
     return status;
 }
 
-@@ -508,7 +507,6 @@ unsigned char const* qpdf_get_buffer(qpd
+@@ -542,7 +541,6 @@ unsigned char const* qpdf_get_buffer(qpd
 
 void qpdf_set_object_stream_mode(qpdf_data qpdf, qpdf_object_stream_e mode)
 {
@ -69,10 +74,10 @@ diff -up qpdf-9.0.1/libqpdf/qpdf-c.cc.erase-tests-with-generated-object-stream q
     qpdf->qpdf_writer->setObjectStreamMode(mode);
 }
 
-diff -up qpdf-9.0.1/libqpdf/QPDFWriter.cc.erase-tests-with-generated-object-stream qpdf-9.0.1/libqpdf/QPDFWriter.cc
--- qpdf-9.0.1/libqpdf/QPDFWriter.cc.erase-tests-with-generated-object-stream	2019-10-03 08:05:23.812400464 +0200
-+++ qpdf-9.0.1/libqpdf/QPDFWriter.cc	2019-10-03 08:07:08.083488747 +0200
-@@ -3436,8 +3436,6 @@ QPDFWriter::writeLinearized()
+diff -up qpdf-10.2.0/libqpdf/QPDFWriter.cc.erase-tests-with-generated-object-stream qpdf-10.2.0/libqpdf/QPDFWriter.cc
+--- qpdf-10.2.0/libqpdf/QPDFWriter.cc.erase-tests-with-generated-object-stream	2021-02-23 16:41:58.000000000 +0100
+++ qpdf-10.2.0/libqpdf/QPDFWriter.cc	2021-02-24 12:45:32.348357141 +0100
+@@ -3445,8 +3445,6 @@ QPDFWriter::writeLinearized()
 	{
             if (this->m->deterministic_id)
             {
@ -81,7 +86,7 @@ diff -up qpdf-9.0.1/libqpdf/QPDFWriter.cc.erase-tests-with-generated-object-stre
                 computeDeterministicIDData();
                 pp_md5 = 0;
                 assert(this->m->md5_pipeline == 0);
-@@ -3645,8 +3643,6 @@ QPDFWriter::writeStandard()
+@@ -3654,8 +3652,6 @@ QPDFWriter::writeStandard()
 
     if (this->m->deterministic_id)
     {
@ -90,9 +95,9 @@ diff -up qpdf-9.0.1/libqpdf/QPDFWriter.cc.erase-tests-with-generated-object-stre
         pp_md5 = 0;
         assert(this->m->md5_pipeline == 0);
     }
-diff -up qpdf-9.0.1/qpdf/qpdf.testcov.erase-tests-with-generated-object-stream qpdf-9.0.1/qpdf/qpdf.testcov
--- qpdf-9.0.1/qpdf/qpdf.testcov.erase-tests-with-generated-object-stream	2019-09-20 14:07:56.000000000 +0200
-+++ qpdf-9.0.1/qpdf/qpdf.testcov	2019-10-03 08:05:23.814400446 +0200
+diff -up qpdf-10.2.0/qpdf/qpdf.testcov.erase-tests-with-generated-object-stream qpdf-10.2.0/qpdf/qpdf.testcov
+--- qpdf-10.2.0/qpdf/qpdf.testcov.erase-tests-with-generated-object-stream	2021-02-23 16:41:58.000000000 +0100
+++ qpdf-10.2.0/qpdf/qpdf.testcov	2021-02-24 12:45:32.348357141 +0100
@@ -123,7 +123,6 @@ qpdf-c called qpdf_get_user_password 0
 qpdf-c called qpdf_is_linearized 0
 qpdf-c called qpdf_is_encrypted 0
@ -109,7 +114,7 @@ diff -up qpdf-9.0.1/qpdf/qpdf.testcov.erase-tests-with-generated-object-stream q
 QPDF stream without newline 0
 QPDF stream with CR only 0
 QPDF stream with CRNL 0
-@@ -261,8 +259,6 @@ qpdf pages range omitted at end 0
+@@ -260,8 +258,6 @@ qpdf pages range omitted at end 0
 qpdf pages range omitted in middle 0
 qpdf npages 0
 QPDF already reserved object 0
@ -118,10 +123,10 @@ diff -up qpdf-9.0.1/qpdf/qpdf.testcov.erase-tests-with-generated-object-stream q
 QPDFWriter deterministic with no data 0
 qpdf-c called qpdf_set_deterministic_ID 0
 QPDFObjectHandle indirect with 0 objid 0
-diff -up qpdf-9.0.1/qpdf/qtest/qpdf.test.erase-tests-with-generated-object-stream qpdf-9.0.1/qpdf/qtest/qpdf.test
--- qpdf-9.0.1/qpdf/qtest/qpdf.test.erase-tests-with-generated-object-stream	2019-09-20 14:07:56.000000000 +0200
-+++ qpdf-9.0.1/qpdf/qtest/qpdf.test	2019-10-03 08:05:23.816400429 +0200
-@@ -2584,7 +2584,6 @@ my @capi = (
+diff -up qpdf-10.2.0/qpdf/qtest/qpdf.test.erase-tests-with-generated-object-stream qpdf-10.2.0/qpdf/qtest/qpdf.test
+--- qpdf-10.2.0/qpdf/qtest/qpdf.test.erase-tests-with-generated-object-stream	2021-02-23 16:41:58.000000000 +0100
+++ qpdf-10.2.0/qpdf/qtest/qpdf.test	2021-02-24 12:45:32.349357133 +0100
+@@ -3254,7 +3254,6 @@ my @capi = (
     [3, 'normalized content'],
     [4, 'ignore xref streams'],
     [5, 'linearized'],
@ -129,7 +134,7 @@ diff -up qpdf-9.0.1/qpdf/qtest/qpdf.test.erase-tests-with-generated-object-strea
     [7, 'qdf'],
     [8, 'no original object ids'],
     [9, 'uncompressed streams'],
-@@ -2628,8 +2627,8 @@ $td->runtest("write damaged",
+@@ -3298,8 +3297,8 @@ $td->runtest("write damaged",
 show_ntests();
 # ----------
 $td->notify("--- Deterministic ID Tests ---");
--- a/qpdf-relax.patch
+++ b/qpdf-relax.patch
@ -1,7 +1,7 @@
-diff -up qpdf-9.0.1/libqpdf/QPDF.cc.relax qpdf-9.0.1/libqpdf/QPDF.cc
--- qpdf-9.0.1/libqpdf/QPDF.cc.relax	2019-09-20 14:07:56.000000000 +0200
-+++ qpdf-9.0.1/libqpdf/QPDF.cc	2019-10-01 13:15:46.513551565 +0200
-@@ -10,6 +10,10 @@
+diff -up qpdf-10.2.0/libqpdf/QPDF.cc.relax qpdf-10.2.0/libqpdf/QPDF.cc
+--- qpdf-10.2.0/libqpdf/QPDF.cc.relax	2021-02-23 16:41:58.000000000 +0100
+++ qpdf-10.2.0/libqpdf/QPDF.cc	2021-02-24 12:35:50.715329461 +0100
+@@ -11,6 +11,10 @@
 #include <string.h>
 #include <memory.h>
 
@ -12,7 +12,7 @@ diff -up qpdf-9.0.1/libqpdf/QPDF.cc.relax qpdf-9.0.1/libqpdf/QPDF.cc
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
 #include <qpdf/Pipeline.hh>
-@@ -207,7 +211,13 @@ QPDF::processFile(char const* filename,
+@@ -261,7 +265,13 @@ QPDF::processFile(char const* filename,
 {
     FileInputSource* fi = new FileInputSource();
     fi->setFilename(filename);
@ -26,7 +26,7 @@ diff -up qpdf-9.0.1/libqpdf/QPDF.cc.relax qpdf-9.0.1/libqpdf/QPDF.cc
 }
 
 void
-@@ -216,7 +226,13 @@ QPDF::processFile(char const* descriptio
+@@ -270,7 +280,13 @@ QPDF::processFile(char const* descriptio
 {
     FileInputSource* fi = new FileInputSource();
     fi->setFile(description, filep, close_file);
@ -40,9 +40,9 @@ diff -up qpdf-9.0.1/libqpdf/QPDF.cc.relax qpdf-9.0.1/libqpdf/QPDF.cc
 }
 
 void
-diff -up qpdf-9.0.1/libqpdf/QPDF_encryption.cc.relax qpdf-9.0.1/libqpdf/QPDF_encryption.cc
--- qpdf-9.0.1/libqpdf/QPDF_encryption.cc.relax	2019-09-20 14:07:56.000000000 +0200
-+++ qpdf-9.0.1/libqpdf/QPDF_encryption.cc	2019-10-01 13:19:56.086467631 +0200
+diff -up qpdf-10.2.0/libqpdf/QPDF_encryption.cc.relax qpdf-10.2.0/libqpdf/QPDF_encryption.cc
+--- qpdf-10.2.0/libqpdf/QPDF_encryption.cc.relax	2021-02-23 16:41:58.000000000 +0100
+++ qpdf-10.2.0/libqpdf/QPDF_encryption.cc	2021-02-24 12:37:17.267561185 +0100
@@ -1,6 +1,8 @@
 // This file implements methods from the QPDF class that involve
 // encryption.
@ -63,7 +63,7 @@ diff -up qpdf-9.0.1/libqpdf/QPDF_encryption.cc.relax qpdf-9.0.1/libqpdf/QPDF_enc
 static unsigned char const padding_string[] = {
     0x28, 0xbf, 0x4e, 0x5e, 0x4e, 0x75, 0x8a, 0x41,
     0x64, 0x00, 0x4e, 0x56, 0xff, 0xfa, 0x01, 0x08,
-@@ -1140,6 +1146,12 @@ QPDF::getKeyForObject(
+@@ -1150,6 +1156,12 @@ QPDF::getKeyForObject(
 void
 QPDF::decryptString(std::string& str, int objid, int generation)
 {
@ -76,7 +76,7 @@ diff -up qpdf-9.0.1/libqpdf/QPDF_encryption.cc.relax qpdf-9.0.1/libqpdf/QPDF_enc
     if (objid == 0)
     {
 	return;
-@@ -1220,6 +1232,10 @@ QPDF::decryptString(std::string& str, in
+@@ -1230,6 +1242,10 @@ QPDF::decryptString(std::string& str, in
 		      QUtil::int_to_string(objid) + " " +
 		      QUtil::int_to_string(generation) + ": " + e.what());
     }
@ -87,8 +87,8 @@ diff -up qpdf-9.0.1/libqpdf/QPDF_encryption.cc.relax qpdf-9.0.1/libqpdf/QPDF_enc
 }
 
 void
-@@ -1231,6 +1247,12 @@ QPDF::decryptStream(PointerHolder<Encryp
-                     bool is_attachment_stream,
+@@ -1240,6 +1256,12 @@ QPDF::decryptStream(PointerHolder<Encryp
+ 		    QPDFObjectHandle& stream_dict,
 		    std::vector<PointerHolder<Pipeline> >& heap)
 {
 +#ifdef HAVE_GNUTLS
@ -100,7 +100,7 @@ diff -up qpdf-9.0.1/libqpdf/QPDF_encryption.cc.relax qpdf-9.0.1/libqpdf/QPDF_enc
     std::string type;
     if (stream_dict.getKey("/Type").isName())
     {
-@@ -1360,6 +1382,10 @@ QPDF::decryptStream(PointerHolder<Encryp
+@@ -1361,6 +1383,10 @@ QPDF::decryptStream(PointerHolder<Encryp
                               toI(key.length()));
     }
     heap.push_back(pipeline);
@ -111,9 +111,9 @@ diff -up qpdf-9.0.1/libqpdf/QPDF_encryption.cc.relax qpdf-9.0.1/libqpdf/QPDF_enc
 }
 
 void
-diff -up qpdf-9.0.1/libqpdf/QPDFWriter.cc.relax qpdf-9.0.1/libqpdf/QPDFWriter.cc
--- qpdf-9.0.1/libqpdf/QPDFWriter.cc.relax	2019-09-20 14:07:56.000000000 +0200
-+++ qpdf-9.0.1/libqpdf/QPDFWriter.cc	2019-10-01 13:16:49.665013937 +0200
+diff -up qpdf-10.2.0/libqpdf/QPDFWriter.cc.relax qpdf-10.2.0/libqpdf/QPDFWriter.cc
+--- qpdf-10.2.0/libqpdf/QPDFWriter.cc.relax	2021-02-23 16:41:58.000000000 +0100
+++ qpdf-10.2.0/libqpdf/QPDFWriter.cc	2021-02-24 12:35:50.716329452 +0100
@@ -24,6 +24,10 @@
 #include <algorithm>
 #include <stdlib.h>
--- a/qpdf.spec
+++ b/qpdf.spec
@ -1,7 +1,7 @@
 Summary: Command-line tools and library for transforming PDF files
 Name:    qpdf
-Version: 10.1.0
-Release: 2%{?dist}
+Version: 10.2.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.1.0
+%{_libdir}/libqpdf.so.28.2.0

 %files devel
 %doc examples/*.cc examples/*.c
@ -148,6 +148,9 @@ make check


 %changelog
+* Wed Feb 24 2021 Zdenek Dohnal <zdohnal@redhat.com> - 10.2.0-1
+- 1932052 - qpdf-10.2.0 is available
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 10.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (qpdf-10.1.0.tar.gz) = f9b22d89fc62e430e6232c840ad74d220ac9eb09d7f2dfe2c42c1c943d35b5fd25e2abec9970ac19ad7ad25dc3d95c74e68e50bad395abf815cf71c432233106
+SHA512 (qpdf-10.2.0.tar.gz) = 07a37aafccb670034aedfc031a4c2c1d3b6aa001e5c1bde5a3f57520a0523eebd890011a8225bb26b5beb83be15d4be3d2f1f40ad91f8370032db984cf788c0a