diff --git a/.gitignore b/.gitignore index 09f9b6f..b7a95fe 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /netpbm-10.75.99.tar.xz /netpbm-10.76.00.tar.xz /netpbm-10.77.00.tar.xz +/netpbm-10.78.00.tar.xz diff --git a/netpbm-CVE-2017-5849.patch b/netpbm-CVE-2017-5849.patch deleted file mode 100644 index f2c703b..0000000 --- a/netpbm-CVE-2017-5849.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urpN old/converter/other/tifftopnm.c new/converter/other/tifftopnm.c ---- old/converter/other/tifftopnm.c 2017-02-08 13:58:14.515058955 +0100 -+++ new/converter/other/tifftopnm.c 2017-02-08 14:47:25.684420520 +0100 -@@ -1526,7 +1526,7 @@ convertRasterInMemory(pnmOut * - *statusP = CONV_FAILED; - } else { - int ok; -- ok = TIFFRGBAImageGet(&img, raster, cols, rows); -+ ok = TIFFRGBAImageGet(&img, raster, rows, cols); - TIFFRGBAImageEnd(&img) ; - if (!ok) { - pm_message("%s", emsg); diff --git a/netpbm.spec b/netpbm.spec index 33deacd..f6f9cc8 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -1,7 +1,7 @@ Summary: A library for handling different graphics file formats Name: netpbm -Version: 10.77.00 -Release: 3%{?dist} +Version: 10.78.00 +Release: 1%{?dist} # See copyright_summary for details License: BSD and GPLv2 and IJG and MIT and Public Domain Group: System Environment/Libraries @@ -19,7 +19,6 @@ Patch2: netpbm-ppmfadeusage.patch Patch3: netpbm-noppmtompeg.patch Patch4: netpbm-CVE-2017-2586.patch Patch5: netpbm-CVE-2017-2587.patch -Patch6: netpbm-CVE-2017-5849.patch BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex BuildRequires: libX11-devel, perl-generators, python, jasper-devel, libxml2-devel BuildRequires: ghostscript-core @@ -81,7 +80,6 @@ netpbm-doc. You'll also need to install the netpbm-progs package. %patch3 -p1 -b .noppmtompeg %patch4 -p1 -b .CVE-2586 %patch5 -p1 -b .CVE-2587 -%patch6 -p1 -b .CVE-5849 %build ./configure < - 10.78.00-1 +- New upstream release 10.78.00 + * Wed Feb 08 2017 Josef Ridky - 10.77.00-3 - fix CVE-2017-2586, CVE-2017-2587 (#1419545) - fix CVE-2017-5849 (#1419650) diff --git a/sources b/sources index 049fab7..fdcefff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (netpbm-10.77.00.tar.xz) = 4ab52cf7e9278fa2c4a1cca91a5020a2369111c99d7346d5abcebbfb5757fa37754379fe4ad44a85def9430815c2f11b2752e8ec997b455e2617b32bdd3c1747 +SHA512 (netpbm-10.78.00.tar.xz) = fd5cdea7fdc8ac66589efed509f6e22efee78e35798a8461bccbcc53d0735a0bd242c34f721cda57b77986a82163575736a8acf5841c784c4883b9cc35f86af0