diff --git a/.gitignore b/.gitignore index dd2d4be..ab258a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/netpbm-10.59.03.tar.xz +/netpbm-10.60.00.tar.xz diff --git a/netpbm-security-code.patch b/netpbm-security-code.patch index 1ae5bcf..f9d1ede 100644 --- a/netpbm-security-code.patch +++ b/netpbm-security-code.patch @@ -988,17 +988,6 @@ diff -up netpbm-10.58.01/converter/ppm/ximtoppm.c.security-code netpbm-10.58.01/ header->colors = (Color *)calloc((unsigned int)header->ncolors, sizeof(Color)); if (header->colors == NULL) { -diff -up netpbm-10.58.01/converter/ppm/xpmtoppm.c.security-code netpbm-10.58.01/converter/ppm/xpmtoppm.c ---- netpbm-10.58.01/converter/ppm/xpmtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 -+++ netpbm-10.58.01/converter/ppm/xpmtoppm.c 2012-04-09 15:41:54.193232227 +0200 -@@ -851,6 +851,7 @@ readXpmFile(FILE * const ifP - &nColors, colorsP, &ptab); - transparentP->none = true; /* No transparency in version 1 */ - } -+ overflow2(*widthP, *heightP); - totalpixels = width * height; - MALLOCARRAY(data, totalpixels); - if (!data) diff -up netpbm-10.58.01/converter/ppm/yuvtoppm.c.security-code netpbm-10.58.01/converter/ppm/yuvtoppm.c --- netpbm-10.58.01/converter/ppm/yuvtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 +++ netpbm-10.58.01/converter/ppm/yuvtoppm.c 2012-04-09 15:40:03.218619602 +0200 diff --git a/netpbm.spec b/netpbm.spec index 0b152ed..1fb730c 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -1,6 +1,6 @@ Summary: A library for handling different graphics file formats Name: netpbm -Version: 10.59.03 +Version: 10.60.00 Release: 1%{?dist} # See copyright_summary for details License: BSD and GPLv2 and IJG and MIT and Public Domain @@ -250,6 +250,10 @@ rm -rf $RPM_BUILD_ROOT %doc userguide/* %changelog +* Tue Oct 02 2012 Jindrich Novy 10.60.00-1 +- update to 10.60.00 +- speeds up xpmtoppm + * Tue Sep 25 2012 Jindrich Novy 10.59.03-1 - update to 10.59.03 - fixes xpmtoppm diff --git a/sources b/sources index 7b6f5a9..89e3ef1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -986d3982dcf28e78b642b1d3432687df netpbm-10.59.03.tar.xz +c3a7fa947347fd1f2f90f07cf5907dc9 netpbm-10.60.00.tar.xz