parent
ad422912cf
commit
b554d8de10
|
@ -1,136 +1,157 @@
|
||||||
diff -up qpdf-10.2.0/libqpdf/QPDF.cc.relax qpdf-10.2.0/libqpdf/QPDF.cc
|
diff -up qpdf-11.7.0/libqpdf/QPDF.cc.relax qpdf-11.7.0/libqpdf/QPDF.cc
|
||||||
--- qpdf-10.2.0/libqpdf/QPDF.cc.relax 2021-02-23 16:41:58.000000000 +0100
|
--- qpdf-11.7.0/libqpdf/QPDF.cc.relax 2023-12-24 13:36:07.000000000 +0100
|
||||||
+++ qpdf-10.2.0/libqpdf/QPDF.cc 2021-02-24 12:35:50.715329461 +0100
|
+++ qpdf-11.7.0/libqpdf/QPDF.cc 2024-01-08 15:17:27.020951639 +0100
|
||||||
@@ -11,6 +11,10 @@
|
@@ -13,6 +13,10 @@
|
||||||
#include <string.h>
|
#include <sstream>
|
||||||
#include <memory.h>
|
#include <vector>
|
||||||
|
|
||||||
+#ifdef HAVE_GNUTLS
|
+#ifdef USE_CRYPTO_GNUTLS
|
||||||
+# include <gnutls/crypto.h>
|
+# include <gnutls/crypto.h>
|
||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
#include <qpdf/QTC.hh>
|
#include <qpdf/BufferInputSource.hh>
|
||||||
#include <qpdf/QUtil.hh>
|
#include <qpdf/FileInputSource.hh>
|
||||||
#include <qpdf/Pipeline.hh>
|
#include <qpdf/OffsetInputSource.hh>
|
||||||
@@ -261,7 +265,13 @@ QPDF::processFile(char const* filename,
|
@@ -250,14 +254,26 @@ void
|
||||||
|
QPDF::processFile(char const* filename, char const* password)
|
||||||
{
|
{
|
||||||
FileInputSource* fi = new FileInputSource();
|
auto* fi = new FileInputSource(filename);
|
||||||
fi->setFilename(filename);
|
+#ifdef USE_CRYPTO_GNUTLS
|
||||||
+#ifdef HAVE_GNUTLS
|
|
||||||
+ GNUTLS_FIPS140_SET_LAX_MODE();
|
+ GNUTLS_FIPS140_SET_LAX_MODE();
|
||||||
+#endif
|
+#endif
|
||||||
processInputSource(fi, password);
|
processInputSource(std::shared_ptr<InputSource>(fi), password);
|
||||||
+#ifdef HAVE_GNUTLS
|
+#ifdef USE_CRYPTO_GNUTLS
|
||||||
+ GNUTLS_FIPS140_SET_STRICT_MODE();
|
+ GNUTLS_FIPS140_SET_STRICT_MODE();
|
||||||
+#endif
|
+#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@@ -270,7 +280,13 @@ QPDF::processFile(char const* descriptio
|
QPDF::processFile(char const* description, FILE* filep, bool close_file, char const* password)
|
||||||
{
|
{
|
||||||
FileInputSource* fi = new FileInputSource();
|
auto* fi = new FileInputSource(description, filep, close_file);
|
||||||
fi->setFile(description, filep, close_file);
|
+#ifdef USE_CRYPTO_GNUTLS
|
||||||
+#ifdef HAVE_GNUTLS
|
|
||||||
+ GNUTLS_FIPS140_SET_LAX_MODE();
|
+ GNUTLS_FIPS140_SET_LAX_MODE();
|
||||||
+#endif
|
+#endif
|
||||||
processInputSource(fi, password);
|
processInputSource(std::shared_ptr<InputSource>(fi), password);
|
||||||
+#ifdef HAVE_GNUTLS
|
+#ifdef USE_CRYPTO_GNUTLS
|
||||||
+ GNUTLS_FIPS140_SET_STRICT_MODE();
|
+ GNUTLS_FIPS140_SET_STRICT_MODE();
|
||||||
+#endif
|
+#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
diff -up qpdf-10.2.0/libqpdf/QPDF_encryption.cc.relax qpdf-10.2.0/libqpdf/QPDF_encryption.cc
|
diff -up qpdf-11.7.0/libqpdf/QPDF_encryption.cc.relax qpdf-11.7.0/libqpdf/QPDF_encryption.cc
|
||||||
--- qpdf-10.2.0/libqpdf/QPDF_encryption.cc.relax 2021-02-23 16:41:58.000000000 +0100
|
--- qpdf-11.7.0/libqpdf/QPDF_encryption.cc.relax 2023-12-24 13:36:07.000000000 +0100
|
||||||
+++ qpdf-10.2.0/libqpdf/QPDF_encryption.cc 2021-02-24 12:37:17.267561185 +0100
|
+++ qpdf-11.7.0/libqpdf/QPDF_encryption.cc 2024-01-08 15:19:52.303117277 +0100
|
||||||
@@ -1,6 +1,8 @@
|
@@ -3,6 +3,8 @@
|
||||||
// This file implements methods from the QPDF class that involve
|
|
||||||
// encryption.
|
#include <qpdf/assert_debug.h>
|
||||||
|
|
||||||
+#include <qpdf/qpdf-config.h>
|
+#include <qpdf/qpdf-config.h>
|
||||||
+
|
+
|
||||||
#include <qpdf/QPDF.hh>
|
#include <qpdf/QPDF.hh>
|
||||||
|
|
||||||
#include <qpdf/QPDFExc.hh>
|
#include <qpdf/QPDFExc.hh>
|
||||||
@@ -18,6 +20,10 @@
|
@@ -19,6 +21,10 @@
|
||||||
#include <assert.h>
|
#include <algorithm>
|
||||||
#include <string.h>
|
#include <cstring>
|
||||||
|
|
||||||
+#ifdef HAVE_GNUTLS
|
+#ifdef USE_CRYPTO_GNUTLS
|
||||||
+# include <gnutls/crypto.h>
|
+# include <gnutls/crypto.h>
|
||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
static unsigned char const padding_string[] = {
|
static unsigned char const padding_string[] = {
|
||||||
0x28, 0xbf, 0x4e, 0x5e, 0x4e, 0x75, 0x8a, 0x41,
|
0x28, 0xbf, 0x4e, 0x5e, 0x4e, 0x75, 0x8a, 0x41, 0x64, 0x00, 0x4e, 0x56, 0xff, 0xfa, 0x01, 0x08,
|
||||||
0x64, 0x00, 0x4e, 0x56, 0xff, 0xfa, 0x01, 0x08,
|
0x2e, 0x2e, 0x00, 0xb6, 0xd0, 0x68, 0x3e, 0x80, 0x2f, 0x0c, 0xa9, 0xfe, 0x64, 0x53, 0x69, 0x7a};
|
||||||
@@ -1150,6 +1156,12 @@ QPDF::getKeyForObject(
|
@@ -349,10 +355,21 @@ QPDF::compute_data_key(
|
||||||
void
|
result += "sAlT";
|
||||||
QPDF::decryptString(std::string& str, int objid, int generation)
|
}
|
||||||
{
|
|
||||||
+#ifdef HAVE_GNUTLS
|
+#ifdef USE_CRYPTO_GNUTLS
|
||||||
+ unsigned oldmode = gnutls_fips140_mode_enabled();
|
+ unsigned oldmode = gnutls_fips140_mode_enabled();
|
||||||
+
|
+
|
||||||
+ gnutls_fips140_set_mode(GNUTLS_FIPS140_LAX, GNUTLS_FIPS140_SET_MODE_THREAD);
|
+ gnutls_fips140_set_mode(GNUTLS_FIPS140_LAX, GNUTLS_FIPS140_SET_MODE_THREAD);
|
||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
if (objid == 0)
|
MD5 md5;
|
||||||
{
|
md5.encodeDataIncrementally(result.c_str(), result.length());
|
||||||
return;
|
MD5::Digest digest;
|
||||||
@@ -1230,6 +1242,10 @@ QPDF::decryptString(std::string& str, in
|
md5.digest(digest);
|
||||||
QUtil::int_to_string(objid) + " " +
|
+
|
||||||
QUtil::int_to_string(generation) + ": " + e.what());
|
+#ifdef USE_CRYPTO_GNUTLS
|
||||||
|
+ gnutls_fips140_set_mode(static_cast<gnutls_fips_mode_t>(oldmode), GNUTLS_FIPS140_SET_MODE_THREAD);
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
return {reinterpret_cast<char*>(digest), std::min(result.length(), toS(16))};
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -976,6 +993,12 @@ QPDF::getKeyForObject(
|
||||||
|
void
|
||||||
|
QPDF::decryptString(std::string& str, QPDFObjGen const& og)
|
||||||
|
{
|
||||||
|
+#ifdef USE_CRYPTO_GNUTLS
|
||||||
|
+ unsigned oldmode = gnutls_fips140_mode_enabled();
|
||||||
|
+
|
||||||
|
+ gnutls_fips140_set_mode(GNUTLS_FIPS140_LAX, GNUTLS_FIPS140_SET_MODE_THREAD);
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
if (!og.isIndirect()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
@@ -1036,6 +1059,10 @@ QPDF::decryptString(std::string& str, QP
|
||||||
|
} catch (std::runtime_error& e) {
|
||||||
|
throw damagedPDF("error decrypting string for object " + og.unparse() + ": " + e.what());
|
||||||
}
|
}
|
||||||
+
|
+
|
||||||
+#ifdef HAVE_GNUTLS
|
+#ifdef USE_CRYPTO_GNUTLS
|
||||||
+ gnutls_fips140_set_mode(static_cast<gnutls_fips_mode_t>(oldmode), GNUTLS_FIPS140_SET_MODE_THREAD);
|
+ gnutls_fips140_set_mode(static_cast<gnutls_fips_mode_t>(oldmode), GNUTLS_FIPS140_SET_MODE_THREAD);
|
||||||
+#endif
|
+#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
// Prepend a decryption pipeline to 'pipeline'. The decryption pipeline (returned as
|
||||||
@@ -1240,6 +1256,12 @@ QPDF::decryptStream(PointerHolder<Encryp
|
@@ -1051,6 +1078,12 @@ QPDF::decryptStream(
|
||||||
QPDFObjectHandle& stream_dict,
|
QPDFObjectHandle& stream_dict,
|
||||||
std::vector<PointerHolder<Pipeline> >& heap)
|
std::unique_ptr<Pipeline>& decrypt_pipeline)
|
||||||
{
|
{
|
||||||
+#ifdef HAVE_GNUTLS
|
+#ifdef USE_CRYPTO_GNUTLS
|
||||||
+ unsigned oldmode = gnutls_fips140_mode_enabled();
|
+ unsigned oldmode = gnutls_fips140_mode_enabled();
|
||||||
+
|
+
|
||||||
+ gnutls_fips140_set_mode(GNUTLS_FIPS140_LAX, GNUTLS_FIPS140_SET_MODE_THREAD);
|
+ gnutls_fips140_set_mode(GNUTLS_FIPS140_LAX, GNUTLS_FIPS140_SET_MODE_THREAD);
|
||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
std::string type;
|
std::string type;
|
||||||
if (stream_dict.getKey("/Type").isName())
|
if (stream_dict.getKey("/Type").isName()) {
|
||||||
{
|
type = stream_dict.getKey("/Type").getName();
|
||||||
@@ -1361,6 +1383,10 @@ QPDF::decryptStream(PointerHolder<Encryp
|
@@ -1151,6 +1184,10 @@ QPDF::decryptStream(
|
||||||
toI(key.length()));
|
toI(key.length()));
|
||||||
}
|
}
|
||||||
heap.push_back(pipeline);
|
pipeline = decrypt_pipeline.get();
|
||||||
+
|
+
|
||||||
+#ifdef HAVE_GNUTLS
|
+#ifdef USE_CRYPTO_GNUTLS
|
||||||
+ gnutls_fips140_set_mode(static_cast<gnutls_fips_mode_t>(oldmode), GNUTLS_FIPS140_SET_MODE_THREAD);
|
+ gnutls_fips140_set_mode(static_cast<gnutls_fips_mode_t>(oldmode), GNUTLS_FIPS140_SET_MODE_THREAD);
|
||||||
+#endif
|
+#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
diff -up qpdf-10.2.0/libqpdf/QPDFWriter.cc.relax qpdf-10.2.0/libqpdf/QPDFWriter.cc
|
diff -up qpdf-11.7.0/libqpdf/QPDFWriter.cc.relax qpdf-11.7.0/libqpdf/QPDFWriter.cc
|
||||||
--- qpdf-10.2.0/libqpdf/QPDFWriter.cc.relax 2021-02-23 16:41:58.000000000 +0100
|
--- qpdf-11.7.0/libqpdf/QPDFWriter.cc.relax 2023-12-24 13:36:07.000000000 +0100
|
||||||
+++ qpdf-10.2.0/libqpdf/QPDFWriter.cc 2021-02-24 12:35:50.716329452 +0100
|
+++ qpdf-11.7.0/libqpdf/QPDFWriter.cc 2024-01-08 15:17:27.022951614 +0100
|
||||||
@@ -24,6 +24,10 @@
|
@@ -26,6 +26,10 @@
|
||||||
#include <algorithm>
|
#include <cstdlib>
|
||||||
#include <stdlib.h>
|
#include <stdexcept>
|
||||||
|
|
||||||
+#ifdef HAVE_GNUTLS
|
+#ifdef USE_CRYPTO_GNUTLS
|
||||||
+#include <gnutls/crypto.h>
|
+#include <gnutls/crypto.h>
|
||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
QPDFWriter::Members::Members(QPDF& pdf) :
|
QPDFWriter::ProgressReporter::~ProgressReporter() // NOLINT (modernize-use-equals-default)
|
||||||
pdf(pdf),
|
{
|
||||||
filename("unspecified"),
|
// Must be explicit and not inline -- see QPDF_DLL_CLASS in README-maintainer
|
||||||
@@ -321,6 +325,13 @@ void
|
@@ -287,6 +291,13 @@ void
|
||||||
QPDFWriter::setDeterministicID(bool val)
|
QPDFWriter::setDeterministicID(bool val)
|
||||||
{
|
{
|
||||||
this->m->deterministic_id = val;
|
m->deterministic_id = val;
|
||||||
+
|
+
|
||||||
+#ifdef HAVE_GNUTLS
|
+#ifdef USE_CRYPTO_GNUTLS
|
||||||
+ if (val)
|
+ if (val)
|
||||||
+ GNUTLS_FIPS140_SET_LAX_MODE();
|
+ GNUTLS_FIPS140_SET_LAX_MODE();
|
||||||
+ else
|
+ else
|
||||||
|
@ -139,12 +160,12 @@ diff -up qpdf-10.2.0/libqpdf/QPDFWriter.cc.relax qpdf-10.2.0/libqpdf/QPDFWriter.
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@@ -342,6 +353,13 @@ void
|
@@ -307,6 +318,13 @@ void
|
||||||
QPDFWriter::setPreserveEncryption(bool val)
|
QPDFWriter::setPreserveEncryption(bool val)
|
||||||
{
|
{
|
||||||
this->m->preserve_encryption = val;
|
m->preserve_encryption = val;
|
||||||
+
|
+
|
||||||
+#ifdef HAVE_GNUTLS
|
+#ifdef USE_CRYPTO_GNUTLS
|
||||||
+ if (val)
|
+ if (val)
|
||||||
+ GNUTLS_FIPS140_SET_STRICT_MODE();
|
+ GNUTLS_FIPS140_SET_STRICT_MODE();
|
||||||
+ else
|
+ else
|
||||||
|
@ -153,3 +174,25 @@ diff -up qpdf-10.2.0/libqpdf/QPDFWriter.cc.relax qpdf-10.2.0/libqpdf/QPDFWriter.
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@@ -1890,11 +1908,21 @@ QPDFWriter::generateID()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef USE_CRYPTO_GNUTLS
|
||||||
|
+ unsigned oldmode = gnutls_fips140_mode_enabled();
|
||||||
|
+
|
||||||
|
+ gnutls_fips140_set_mode(GNUTLS_FIPS140_LAX, GNUTLS_FIPS140_SET_MODE_THREAD);
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
MD5 m;
|
||||||
|
m.encodeString(seed.c_str());
|
||||||
|
MD5::Digest digest;
|
||||||
|
m.digest(digest);
|
||||||
|
result = std::string(reinterpret_cast<char*>(digest), sizeof(MD5::Digest));
|
||||||
|
+
|
||||||
|
+#ifdef USE_CRYPTO_GNUTLS
|
||||||
|
+ gnutls_fips140_set_mode(static_cast<gnutls_fips_mode_t>(oldmode), GNUTLS_FIPS140_SET_MODE_THREAD);
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
// If /ID already exists, follow the spec: use the original first word and generate a new second
|
||||||
|
|
197
SPECS/qpdf.spec
197
SPECS/qpdf.spec
|
@ -1,34 +1,29 @@
|
||||||
Summary: Command-line tools and library for transforming PDF files
|
Summary: Command-line tools and library for transforming PDF files
|
||||||
Name: qpdf
|
Name: qpdf
|
||||||
Version: 10.3.1
|
Version: 11.9.0
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
# MIT: e.g. libqpdf/sha2.c
|
# MIT: e.g. libqpdf/sha2.c, but those are not compiled in (GNUTLS is used)
|
||||||
# upstream uses ASL 2.0 now, but he allowed other to distribute qpdf under
|
# upstream uses ASL 2.0 now, but he allowed other to distribute qpdf under
|
||||||
# old license (see README)
|
# old license (see README)
|
||||||
License: (Artistic 2.0 or ASL 2.0) and MIT
|
License: Apache-2.0 OR Artistic-2.0
|
||||||
URL: http://qpdf.sourceforge.net/
|
URL: https://qpdf.sourceforge.io/
|
||||||
Source0: http://downloads.sourceforge.net/sourceforge/qpdf/qpdf-%{version}.tar.gz
|
Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
||||||
|
Source1: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}-doc.zip
|
||||||
|
|
||||||
Patch0: qpdf-doc.patch
|
|
||||||
# zlib has optimalization for aarch64 now, which gives different output after
|
|
||||||
# compression - patch erases 3 tests with generated object stream which were failing
|
|
||||||
Patch1: qpdf-erase-tests-with-generated-object-stream.patch
|
|
||||||
# make qpdf working under FIPS, downstream patch
|
# make qpdf working under FIPS, downstream patch
|
||||||
Patch2: qpdf-relax.patch
|
Patch1: qpdf-relax.patch
|
||||||
# 1950033 - Possible changes in zlib output causes FTBFS for qpdf
|
|
||||||
Patch3: qpdf-s390x-disable-streamtest.patch
|
|
||||||
|
|
||||||
# gcc and gcc-c++ are no longer in buildroot by default
|
# gcc and gcc-c++ are no longer in buildroot by default
|
||||||
# gcc is needed for qpdf-ctest.c
|
# gcc is needed for qpdf-ctest.c
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
# gcc-c++ is need for everything except for qpdf-ctest
|
# gcc-c++ is need for everything except for qpdf-ctest
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
# uses make
|
# uses cmake
|
||||||
BuildRequires: make
|
BuildRequires: cmake
|
||||||
|
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
BuildRequires: libjpeg-turbo-devel
|
BuildRequires: libjpeg-turbo-devel
|
||||||
BuildRequires: pcre-devel
|
|
||||||
|
|
||||||
# for gnutls crypto
|
# for gnutls crypto
|
||||||
BuildRequires: gnutls-devel
|
BuildRequires: gnutls-devel
|
||||||
|
@ -43,6 +38,7 @@ BuildRequires: perl(Cwd)
|
||||||
BuildRequires: perl(Digest::MD5)
|
BuildRequires: perl(Digest::MD5)
|
||||||
BuildRequires: perl(Digest::SHA)
|
BuildRequires: perl(Digest::SHA)
|
||||||
BuildRequires: perl(File::Basename)
|
BuildRequires: perl(File::Basename)
|
||||||
|
BuildRequires: perl(File::Compare)
|
||||||
BuildRequires: perl(File::Copy)
|
BuildRequires: perl(File::Copy)
|
||||||
BuildRequires: perl(File::Find)
|
BuildRequires: perl(File::Find)
|
||||||
BuildRequires: perl(File::Spec)
|
BuildRequires: perl(File::Spec)
|
||||||
|
@ -55,11 +51,6 @@ BuildRequires: perl(strict)
|
||||||
# perl(Term::ANSIColor) - not needed for tests
|
# perl(Term::ANSIColor) - not needed for tests
|
||||||
# perl(Term::ReadKey) - not needed for tests
|
# perl(Term::ReadKey) - not needed for tests
|
||||||
|
|
||||||
# for autoreconf
|
|
||||||
BuildRequires: autoconf
|
|
||||||
BuildRequires: automake
|
|
||||||
BuildRequires: libtool
|
|
||||||
|
|
||||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
%package libs
|
%package libs
|
||||||
|
@ -72,6 +63,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||||
%package doc
|
%package doc
|
||||||
Summary: QPDF Manual
|
Summary: QPDF Manual
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
BuildRequires: unzip
|
||||||
Requires: %{name}-libs = %{version}-%{release}
|
Requires: %{name}-libs = %{version}-%{release}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
|
@ -96,37 +88,34 @@ QPDF Manual
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
# fix 'complete manual location' note in man pages
|
%patch -P 1 -p1 -b .relax
|
||||||
%patch0 -p1 -b .doc
|
|
||||||
%ifarch aarch64
|
# unpack zip file with manual
|
||||||
%patch1 -p1 -b .erase-tests-with-generated-object-stream
|
unzip %{SOURCE1}
|
||||||
%endif
|
|
||||||
%patch2 -p1 -b .relax
|
|
||||||
%ifarch s390x
|
|
||||||
%patch3 -p1 -b .s390x-disable-streamtest
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# work-around check-rpaths errors
|
%cmake -DBUILD_STATIC_LIBS=0 \
|
||||||
autoreconf --verbose --force --install
|
-DREQUIRE_CRYPTO_GNUTLS=1 \
|
||||||
# automake files needed to be regenerated in 8.4.0 - check if this can be removed
|
-DUSE_IMPLICIT_CRYPTO=0 \
|
||||||
# in the next qpdf release
|
-DSHOW_FAILED_TEST_OUTPUT=1 \
|
||||||
./autogen.sh
|
-DINSTALL_CMAKE_PACKAGE=0
|
||||||
|
|
||||||
%configure --disable-static \
|
%cmake_build
|
||||||
--enable-crypto-gnutls \
|
|
||||||
--disable-implicit-crypto \
|
|
||||||
--enable-show-failed-test-output
|
|
||||||
|
|
||||||
%make_build
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install
|
%cmake_install
|
||||||
|
|
||||||
rm -f %{buildroot}%{_libdir}/libqpdf.la
|
install -m 0644 %{name}-%{version}-doc/%{name}-manual.pdf %{buildroot}/%{_pkgdocdir}/%{name}-manual.pdf
|
||||||
|
|
||||||
|
# install bash/zsh completions
|
||||||
|
mkdir -p %{buildroot}%{bash_completions_dir}
|
||||||
|
mkdir -p %{buildroot}%{zsh_completions_dir}
|
||||||
|
install -m 0644 completions/bash/qpdf %{buildroot}%{bash_completions_dir}/qpdf
|
||||||
|
install -m 0644 completions/zsh/_qpdf %{buildroot}%{zsh_completions_dir}/_qpdf
|
||||||
|
|
||||||
%check
|
%check
|
||||||
make check
|
%ctest
|
||||||
|
|
||||||
%ldconfig_scriptlets libs
|
%ldconfig_scriptlets libs
|
||||||
|
|
||||||
|
@ -135,12 +124,16 @@ make check
|
||||||
%{_bindir}/qpdf
|
%{_bindir}/qpdf
|
||||||
%{_bindir}/zlib-flate
|
%{_bindir}/zlib-flate
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
%dir %{bash_completions_dir}
|
||||||
|
%{bash_completions_dir}/qpdf
|
||||||
|
%dir %{zsh_completions_dir}
|
||||||
|
%{zsh_completions_dir}/_qpdf
|
||||||
|
|
||||||
%files libs
|
%files libs
|
||||||
%doc README.md TODO ChangeLog
|
%doc README.md TODO.md ChangeLog
|
||||||
%license Artistic-2.0
|
%license Artistic-2.0 LICENSE.txt NOTICE.md
|
||||||
%{_libdir}/libqpdf.so.28
|
%{_libdir}/libqpdf.so.29
|
||||||
%{_libdir}/libqpdf.so.28.3.1
|
%{_libdir}/libqpdf.so.29.9.0
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%doc examples/*.cc examples/*.c
|
%doc examples/*.cc examples/*.c
|
||||||
|
@ -153,15 +146,109 @@ make check
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 10.3.1-4
|
* Fri Mar 01 2024 Zdenek Dohnal <zdohnal@redhat.com> - 11.9.0-1
|
||||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
- 2267205 - TRIAGE CVE-2024-24246 qpdf - Heap Buffer Overflow vulnerability in qpdf [fedora-all]
|
||||||
Related: rhbz#1991688
|
- 2265854 - qpdf-11.9.0 is available
|
||||||
|
|
||||||
* Tue Apr 20 2021 Zdenek Dohnal <zdohnal@redhat.com> - 10.3.1-3
|
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.8.0-3
|
||||||
- 1950033 - Possible changes in zlib output causes FTBFS for qpdf
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 10.3.1-2
|
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.8.0-2
|
||||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jan 09 2024 Zdenek Dohnal <zdohnal@redhat.com> - 11.8.0-1
|
||||||
|
- 2257313 - qpdf-11.8.0 is available
|
||||||
|
|
||||||
|
* Mon Jan 08 2024 Zdenek Dohnal <zdohnal@redhat.com> - 11.7.0-1
|
||||||
|
- 2255755 - qpdf-11.7.0 is available
|
||||||
|
|
||||||
|
* Tue Dec 19 2023 Zdenek Dohnal <zdohnal@redhat.com> - 11.6.4-2
|
||||||
|
- 2254778 - remove the tests which fail with zlib-ng-compat for now
|
||||||
|
|
||||||
|
* Mon Dec 18 2023 Zdenek Dohnal <zdohnal@redhat.com> - 11.6.4-1
|
||||||
|
- 2253901 - qpdf-11.6.4 is available
|
||||||
|
|
||||||
|
* Thu Nov 02 2023 Zdenek Dohnal <zdohnal@redhat.com> - 11.6.3-1
|
||||||
|
- 2244319 - qpdf-11.6.3 is available
|
||||||
|
|
||||||
|
* Mon Oct 09 2023 Zdenek Dohnal <zdohnal@redhat.com> - 11.6.2-1
|
||||||
|
- 2242670 - qpdf-11.6.2 is available
|
||||||
|
|
||||||
|
* Tue Sep 12 2023 Zdenek Dohnal <zdohnal@redhat.com> - 11.6.1-1
|
||||||
|
- 2237125 - qpdf-11.6.1 is available
|
||||||
|
|
||||||
|
* Wed Jul 26 2023 Zdenek Dohnal <zdohnal@redhat.com> - 11.5.0-1
|
||||||
|
- 2221506 - qpdf-11.5.0 is available
|
||||||
|
|
||||||
|
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.4.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon May 22 2023 Zdenek Dohnal <zdohnal@redhat.com> - 11.4.0-1
|
||||||
|
- 2208892 - qpdf-11.4.0 is available
|
||||||
|
|
||||||
|
* Mon Mar 27 2023 Zdenek Dohnal <zdohnal@redhat.com> - 11.3.0-2
|
||||||
|
- 2181519 - qpdf bash and zsh completion files are missing
|
||||||
|
|
||||||
|
* Thu Mar 02 2023 Zdenek Dohnal <zdohnal@redhat.com> - 11.3.0-1
|
||||||
|
- 2173354 - qpdf-11.3.0 is available
|
||||||
|
|
||||||
|
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.2.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Nov 22 2022 Zdenek Dohnal <zdohnal@redhat.com> - 11.2.0-1
|
||||||
|
- 2144359 - qpdf-11.2.0 is available
|
||||||
|
|
||||||
|
* Thu Oct 13 2022 Zdenek Dohnal <zdohnal@redhat.com> - 11.1.1-1
|
||||||
|
- 2125823 - qpdf-11.1.1 is available
|
||||||
|
|
||||||
|
* Thu Sep 22 2022 Zdenek Dohnal <zdohnal@redhat.com> - 11.1.0-1
|
||||||
|
- 2125823 - qpdf-11.1.0 is available, move to cmake
|
||||||
|
|
||||||
|
* Thu Sep 22 2022 Zdenek Dohnal <zdohnal@redhat.com> - 10.6.3-5
|
||||||
|
- use `grep -E` in test suite (bz2127957)
|
||||||
|
|
||||||
|
* Mon Jul 25 2022 Zdenek Dohnal <zdohnal@redhat.com> - 10.6.3-4
|
||||||
|
- qpdf doesn't depend on pcre since 7.0b1
|
||||||
|
|
||||||
|
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 10.6.3-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 14 2022 Zdenek Dohnal <zdohnal@redhat.com> - 10.6.3-2
|
||||||
|
- 2107240 - FIPS breaks pdftopdf and bannertopdf
|
||||||
|
|
||||||
|
* Fri Mar 18 2022 Zdenek Dohnal <zdohnal@redhat.com> - 10.6.3-1
|
||||||
|
- 2063429 - qpdf-10.6.3 is available
|
||||||
|
|
||||||
|
* Thu Feb 17 2022 Zdenek Dohnal <zdohnal@redhat.com> - 10.6.2-1
|
||||||
|
- 2053647 - qpdf-10.6.2 is available
|
||||||
|
|
||||||
|
* Mon Feb 14 2022 Zdenek Dohnal <zdohnal@redhat.com> - 10.6.1-1
|
||||||
|
- 2053647 - qpdf-10.6.1 is available
|
||||||
|
|
||||||
|
* Thu Feb 10 2022 Zdenek Dohnal <zdohnal@redhat.com> - 10.6.0-1
|
||||||
|
- 2052569 - qpdf-10.6.0 is available
|
||||||
|
|
||||||
|
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 10.5.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 05 2022 Zdenek Dohnal <zdohnal@redhat.com> - 10.5.0-2
|
||||||
|
- add qpdf-manual - now it is in a different archive
|
||||||
|
|
||||||
|
* Mon Jan 03 2022 Zdenek Dohnal <zdohnal@redhat.com> - 10.5.0-1
|
||||||
|
- 2034671 - qpdf-10.5.0 is available
|
||||||
|
|
||||||
|
* 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
|
||||||
|
|
||||||
|
* Thu May 20 2021 Zdenek Dohnal <zdohnal@redhat.com> - 10.3.2-1
|
||||||
|
- 1958536 - qpdf-10.3.2 is available
|
||||||
|
|
||||||
|
* 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
|
* Fri Mar 12 2021 Zdenek Dohnal <zdohnal@redhat.com> - 10.3.1-1
|
||||||
- 1937988 - qpdf-10.3.1 is available
|
- 1937988 - qpdf-10.3.1 is available
|
||||||
|
|
Loading…
Reference in New Issue