diff --git a/.gitignore b/.gitignore index d01e502..a982380 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /poppler-21.01.0.tar.xz /poppler-21.03.0.tar.xz /poppler-21.04.0.tar.xz +/poppler-21.07.0.tar.xz diff --git a/mingw-poppler.spec b/mingw-poppler.spec index 978ff30..90671ac 100644 --- a/mingw-poppler.spec +++ b/mingw-poppler.spec @@ -3,8 +3,8 @@ %global pkgname poppler Name: mingw-%{pkgname} -Version: 21.04.0 -Release: 2%{?dist} +Version: 21.07.0 +Release: 1%{?dist} Summary: MinGW Windows Poppler library License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT @@ -21,6 +21,7 @@ BuildRequires: gettext-devel BuildRequires: perl(File::Temp) BuildRequires: mingw32-filesystem >= 95 +BuildRequires: mingw32-boost BuildRequires: mingw32-gcc BuildRequires: mingw32-libjpeg-turbo BuildRequires: mingw32-libtiff @@ -32,6 +33,7 @@ BuildRequires: mingw32-lcms2 BuildRequires: mingw32-qt5-qtbase-devel BuildRequires: mingw64-filesystem >= 95 +BuildRequires: mingw64-boost BuildRequires: mingw64-gcc BuildRequires: mingw64-libjpeg-turbo BuildRequires: mingw64-libtiff @@ -154,7 +156,7 @@ rm -f %{buildroot}%{mingw64_bindir}/*.exe %files -n mingw32-%{pkgname} %license COPYING %doc README.md -%{mingw32_bindir}/libpoppler-109.dll +%{mingw32_bindir}/libpoppler-111.dll %{mingw32_includedir}/poppler/ %exclude %{mingw32_includedir}/poppler/cpp/ %exclude %{mingw32_includedir}/poppler/glib/ @@ -183,7 +185,7 @@ rm -f %{buildroot}%{mingw64_bindir}/*.exe %files -n mingw64-%{pkgname} %license COPYING %doc README.md -%{mingw64_bindir}/libpoppler-109.dll +%{mingw64_bindir}/libpoppler-111.dll %{mingw64_includedir}/poppler/ %exclude %{mingw64_includedir}/poppler/cpp/ %exclude %{mingw64_includedir}/poppler/glib/ @@ -211,6 +213,9 @@ rm -f %{buildroot}%{mingw64_bindir}/*.exe %changelog +* Mon Aug 02 2021 Sandro Mani - 21.07.0-1 +- Update 21.07.0 + * Thu Jul 22 2021 Fedora Release Engineering - 21.04.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/poppler_CVE-2017-9083.patch b/poppler_CVE-2017-9083.patch index b5efdf7..e8ad677 100644 --- a/poppler_CVE-2017-9083.patch +++ b/poppler_CVE-2017-9083.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference poppler-21.04.0/poppler/JPXStream.cc poppler-21.04.0-new/poppler/JPXStream.cc ---- poppler-21.04.0/poppler/JPXStream.cc 2021-04-01 19:14:48.000000000 +0200 -+++ poppler-21.04.0-new/poppler/JPXStream.cc 2021-04-07 15:34:47.519541745 +0200 +diff -rupN --no-dereference poppler-21.07.0/poppler/JPXStream.cc poppler-21.07.0-new/poppler/JPXStream.cc +--- poppler-21.07.0/poppler/JPXStream.cc 2021-07-02 23:07:57.000000000 +0200 ++++ poppler-21.07.0-new/poppler/JPXStream.cc 2021-08-02 11:53:53.181905364 +0200 @@ -912,6 +912,10 @@ bool JPXStream::readCodestream(unsigned error(errSyntaxError, getPos(), "Different number of components in JPX SIZ marker segment"); return false; diff --git a/sources b/sources index 24bd8c8..732917e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (poppler-21.04.0.tar.xz) = c3391787456e8a4a3bd6e57f96faa25051bb5e15ae7eeb7072ad6fbc25e3f8a34818945cc49d90a0e6ebc3d38dd4e70d3c60ba0a5cb42c4000bd8c15c947e5bc +SHA512 (poppler-21.07.0.tar.xz) = ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8