diff --git a/.gitignore b/.gitignore index b5fd7f5..3526c0c 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /poppler-0.63.0.tar.xz /poppler-0.67.0.tar.xz /poppler-0.73.0.tar.xz +/poppler-0.84.0.tar.xz diff --git a/mingw-poppler.spec b/mingw-poppler.spec index 0d1e7a9..ef9e9ce 100644 --- a/mingw-poppler.spec +++ b/mingw-poppler.spec @@ -3,8 +3,8 @@ %global pkgname poppler Name: mingw-%{pkgname} -Version: 0.73.0 -Release: 6%{?dist} +Version: 0.84.0 +Release: 1%{?dist} Summary: MinGW Windows Poppler library License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT @@ -16,10 +16,6 @@ Source0: http://poppler.freedesktop.org/%{pkgname}-%{version}.tar.xz Patch0: poppler_isystem.patch # Downstream fix for CVE-2017-9083 (#1453200) Patch1: poppler_CVE-2017-9083.patch -# Backport fix for CVE-2018-20662 (#1665275) -Patch2: poppler_CVE-2018-20662.patch -# Backport fix for CVE-2019-7310 (#1672419) -Patch3: poppler_CVE-2019-7310.patch BuildRequires: cmake BuildRequires: gettext-devel @@ -158,12 +154,11 @@ rm -f %{buildroot}%{mingw64_bindir}/*.exe %files -n mingw32-%{pkgname} %license COPYING -%doc README -%{mingw32_bindir}/libpoppler-84.dll +%doc README.md +%{mingw32_bindir}/libpoppler-94.dll %{mingw32_includedir}/poppler/ %exclude %{mingw32_includedir}/poppler/cpp/ %exclude %{mingw32_includedir}/poppler/glib/ -%exclude %{mingw32_includedir}/poppler/qt4/ %exclude %{mingw32_includedir}/poppler/qt5/ %{mingw32_libdir}/libpoppler.dll.a %{mingw32_libdir}/pkgconfig/poppler.pc @@ -190,12 +185,11 @@ rm -f %{buildroot}%{mingw64_bindir}/*.exe %files -n mingw64-%{pkgname} %license COPYING -%doc README -%{mingw64_bindir}/libpoppler-84.dll +%doc README.md +%{mingw64_bindir}/libpoppler-94.dll %{mingw64_includedir}/poppler/ %exclude %{mingw64_includedir}/poppler/cpp/ %exclude %{mingw64_includedir}/poppler/glib/ -%exclude %{mingw64_includedir}/poppler/qt4/ %exclude %{mingw64_includedir}/poppler/qt5/ %{mingw64_libdir}/libpoppler.dll.a %{mingw64_libdir}/pkgconfig/poppler.pc @@ -222,6 +216,9 @@ rm -f %{buildroot}%{mingw64_bindir}/*.exe %changelog +* Fri Jan 17 2020 Sandro Mani - 0.84.0-1 +- Update to 0.84.0 + * Wed Nov 13 2019 Sandro Mani - 0.73.0-6 - Install XPDF headers again - Drop old Obsoletes diff --git a/poppler_CVE-2017-9083.patch b/poppler_CVE-2017-9083.patch index 8a33a1c..fbd3532 100644 --- a/poppler_CVE-2017-9083.patch +++ b/poppler_CVE-2017-9083.patch @@ -1,7 +1,7 @@ -diff -rupN poppler-0.73.0/poppler/JPXStream.cc poppler-0.73.0-new/poppler/JPXStream.cc ---- poppler-0.73.0/poppler/JPXStream.cc 2019-01-07 22:15:12.000000000 +0100 -+++ poppler-0.73.0-new/poppler/JPXStream.cc 2019-02-20 19:06:08.024873692 +0100 -@@ -961,6 +961,11 @@ bool JPXStream::readCodestream(unsigned +diff -rupN --no-dereference poppler-0.84.0/poppler/JPXStream.cc poppler-0.84.0-new/poppler/JPXStream.cc +--- poppler-0.84.0/poppler/JPXStream.cc 2019-12-28 13:18:51.000000000 +0100 ++++ poppler-0.84.0-new/poppler/JPXStream.cc 2020-01-17 20:27:54.233707873 +0100 +@@ -962,6 +962,11 @@ bool JPXStream::readCodestream(unsigned "Different number of components in JPX SIZ marker segment"); return false; } diff --git a/poppler_isystem.patch b/poppler_isystem.patch index 3e9b677..74ecfe3 100644 --- a/poppler_isystem.patch +++ b/poppler_isystem.patch @@ -1,6 +1,6 @@ -diff -rupN poppler-0.73.0/glib/CMakeLists.txt poppler-0.73.0-new/glib/CMakeLists.txt ---- poppler-0.73.0/glib/CMakeLists.txt 2019-01-07 22:15:12.000000000 +0100 -+++ poppler-0.73.0-new/glib/CMakeLists.txt 2019-02-20 19:06:07.984872888 +0100 +diff -rupN --no-dereference poppler-0.84.0/glib/CMakeLists.txt poppler-0.84.0-new/glib/CMakeLists.txt +--- poppler-0.84.0/glib/CMakeLists.txt 2019-12-28 13:18:51.000000000 +0100 ++++ poppler-0.84.0-new/glib/CMakeLists.txt 2020-01-17 20:27:54.194707789 +0100 @@ -4,7 +4,6 @@ include_directories( ) @@ -9,9 +9,9 @@ diff -rupN poppler-0.73.0/glib/CMakeLists.txt poppler-0.73.0-new/glib/CMakeLists ${GLIB2_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS} ) -diff -rupN poppler-0.73.0/test/CMakeLists.txt poppler-0.73.0-new/test/CMakeLists.txt ---- poppler-0.73.0/test/CMakeLists.txt 2019-01-07 22:15:12.000000000 +0100 -+++ poppler-0.73.0-new/test/CMakeLists.txt 2019-02-20 19:06:07.985872908 +0100 +diff -rupN --no-dereference poppler-0.84.0/test/CMakeLists.txt poppler-0.84.0-new/test/CMakeLists.txt +--- poppler-0.84.0/test/CMakeLists.txt 2019-12-28 13:18:51.000000000 +0100 ++++ poppler-0.84.0-new/test/CMakeLists.txt 2020-01-17 20:27:54.194707789 +0100 @@ -18,7 +18,6 @@ endif () if (GTK_FOUND) diff --git a/sources b/sources index dd36c38..8b2cce2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (poppler-0.73.0.tar.xz) = 6924a343032573504a0039c56a6263cd1183fa6aca75966fe1f084bd19da78553e455e541a3693896c1ed0c3865f11c11758a0f5a66b2f6cd48ac8a7eccf891a +SHA512 (poppler-0.84.0.tar.xz) = e00aca76b4909621b79ec68374529396ddba756af5d60d86750095dfebbabe5b576aa7c873c3fcfabaff28c89e3e37e826d4a0fac356d76ef966500514a772e7