From 22d9bc2e799456deffe0e200412fb00f0dd5121c Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Jul 23 2018 13:30:35 +0000 Subject: Resolves: #1596970 - new upstream release 10.83.01 --- diff --git a/netpbm-CAN-2005-2471.patch b/netpbm-CAN-2005-2471.patch index ee9935f..24495de 100644 --- a/netpbm-CAN-2005-2471.patch +++ b/netpbm-CAN-2005-2471.patch @@ -1,10 +1,10 @@ -diff -up netpbm-10.56.03/converter/other/pstopnm.c.CAN-2005-2471 netpbm-10.56.03/converter/other/pstopnm.c ---- netpbm-10.56.03/converter/other/pstopnm.c.CAN-2005-2471 2011-11-09 09:18:00.000000000 +0100 -+++ netpbm-10.56.03/converter/other/pstopnm.c 2011-11-11 11:43:51.827409226 +0100 -@@ -747,11 +747,11 @@ execGhostscript(int const input +diff -urNp a/converter/other/pstopnm.c b/converter/other/pstopnm.c +--- a/converter/other/pstopnm.c 2018-07-23 15:14:51.200658026 +0200 ++++ b/converter/other/pstopnm.c 2018-07-23 15:18:12.579910612 +0200 +@@ -896,11 +896,11 @@ execGhostscript(int const ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, textalphabitsopt, - "-q", "-dNOPAUSE", + "-q", "-dNOPAUSE", - "-dSAFER", "-"); + "-dPARANOIDSAFER", "-"); } @@ -12,6 +12,6 @@ diff -up netpbm-10.56.03/converter/other/pstopnm.c.CAN-2005-2471 netpbm-10.56.03 execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q", - "-dNOPAUSE", "-dSAFER", "-", NULL); + "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL); - + pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)", ghostscriptProg, errno, strerror(errno)); diff --git a/netpbm-security-code.patch b/netpbm-security-code.patch index faf7237..6cb6394 100644 --- a/netpbm-security-code.patch +++ b/netpbm-security-code.patch @@ -1,7 +1,6 @@ -diff --git a/analyzer/pgmtexture.c b/analyzer/pgmtexture.c -index 84c6bf4..c9576f5 100644 ---- a/analyzer/pgmtexture.c -+++ b/analyzer/pgmtexture.c +diff -urNp a/analyzer/pgmtexture.c b/analyzer/pgmtexture.c +--- a/analyzer/pgmtexture.c 2018-07-23 15:03:21.372486801 +0200 ++++ b/analyzer/pgmtexture.c 2018-07-23 15:05:03.047265799 +0200 @@ -98,6 +98,8 @@ vector(unsigned int const nl, assert(nh >= nl); @@ -27,10 +26,9 @@ index 84c6bf4..c9576f5 100644 /* allocate rows and set pointers to them */ for (i = nrl; i <= nrh; ++i) { MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1)); -diff --git a/converter/other/gemtopnm.c b/converter/other/gemtopnm.c -index aac7479..5f1a51a 100644 ---- a/converter/other/gemtopnm.c -+++ b/converter/other/gemtopnm.c +diff -urNp a/converter/other/gemtopnm.c b/converter/other/gemtopnm.c +--- a/converter/other/gemtopnm.c 2018-07-23 15:03:21.379486786 +0200 ++++ b/converter/other/gemtopnm.c 2018-07-23 15:05:03.053265786 +0200 @@ -106,6 +106,7 @@ main(argc, argv) pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 ); @@ -39,11 +37,10 @@ index aac7479..5f1a51a 100644 { /* allocate input row data structure */ int plane; -diff --git a/converter/other/jpegtopnm.c b/converter/other/jpegtopnm.c -index 98552c0..311298c 100644 ---- a/converter/other/jpegtopnm.c -+++ b/converter/other/jpegtopnm.c -@@ -862,6 +862,8 @@ convertImage(FILE * const ofP, +diff -urNp a/converter/other/jpegtopnm.c b/converter/other/jpegtopnm.c +--- a/converter/other/jpegtopnm.c 2018-07-23 15:03:21.398486744 +0200 ++++ b/converter/other/jpegtopnm.c 2018-07-23 15:05:03.068265754 +0200 +@@ -862,6 +862,8 @@ convertImage(FILE * /* Calculate output image dimensions so we can allocate space */ jpeg_calc_output_dimensions(cinfoP); @@ -52,10 +49,9 @@ index 98552c0..311298c 100644 /* Start decompressor */ jpeg_start_decompress(cinfoP); -diff --git a/converter/other/pbmtopgm.c b/converter/other/pbmtopgm.c -index 69b20fb..382a487 100644 ---- a/converter/other/pbmtopgm.c -+++ b/converter/other/pbmtopgm.c +diff -urNp a/converter/other/pbmtopgm.c b/converter/other/pbmtopgm.c +--- a/converter/other/pbmtopgm.c 2018-07-23 15:03:21.380486783 +0200 ++++ b/converter/other/pbmtopgm.c 2018-07-23 15:05:03.068265754 +0200 @@ -47,6 +47,7 @@ main(int argc, char *argv[]) { "than the image height (%u rows)", height, rows); @@ -64,10 +60,9 @@ index 69b20fb..382a487 100644 maxval = MIN(PGM_OVERALLMAXVAL, width*height); pgm_writepgminit(stdout, cols, rows, maxval, 0) ; -diff --git a/converter/other/pnmtoddif.c b/converter/other/pnmtoddif.c -index ac02e42..a2f045b 100644 ---- a/converter/other/pnmtoddif.c -+++ b/converter/other/pnmtoddif.c +diff -urNp a/converter/other/pnmtoddif.c b/converter/other/pnmtoddif.c +--- a/converter/other/pnmtoddif.c 2018-07-23 15:03:21.380486783 +0200 ++++ b/converter/other/pnmtoddif.c 2018-07-23 15:05:03.068265754 +0200 @@ -629,6 +629,7 @@ main(int argc, char *argv[]) { switch (PNM_FORMAT_TYPE(format)) { case PBM_TYPE: @@ -84,11 +79,10 @@ index ac02e42..a2f045b 100644 ip.bytes_per_line = 3 * cols; ip.bits_per_pixel = 24; ip.spectral = 5; -diff --git a/converter/other/pnmtojpeg.c b/converter/other/pnmtojpeg.c -index 4482624..757d08d 100644 ---- a/converter/other/pnmtojpeg.c -+++ b/converter/other/pnmtojpeg.c -@@ -606,7 +606,11 @@ read_scan_script(j_compress_ptr const cinfo, +diff -urNp a/converter/other/pnmtojpeg.c b/converter/other/pnmtojpeg.c +--- a/converter/other/pnmtojpeg.c 2018-07-23 15:03:21.387486768 +0200 ++++ b/converter/other/pnmtojpeg.c 2018-07-23 15:05:03.068265754 +0200 +@@ -606,7 +606,11 @@ read_scan_script(j_compress_ptr const ci want JPOOL_PERMANENT. */ const unsigned int scan_info_size = nscans * sizeof(jpeg_scan_info); @@ -101,7 +95,7 @@ index 4482624..757d08d 100644 (jpeg_scan_info *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, scan_info_size); -@@ -938,6 +942,8 @@ compute_rescaling_array(JSAMPLE ** const rescale_p, const pixval maxval, +@@ -938,6 +942,8 @@ compute_rescaling_array(JSAMPLE ** const const long half_maxval = maxval / 2; long val; @@ -110,7 +104,7 @@ index 4482624..757d08d 100644 *rescale_p = (JSAMPLE *) (cinfo.mem->alloc_small) ((j_common_ptr) &cinfo, JPOOL_IMAGE, (size_t) (((long) maxval + 1L) * -@@ -1016,6 +1022,7 @@ convert_scanlines(struct jpeg_compress_struct * const cinfo_p, +@@ -1016,6 +1022,7 @@ convert_scanlines(struct jpeg_compress_s */ /* Allocate the libpnm output and compressor input buffers */ @@ -118,11 +112,10 @@ index 4482624..757d08d 100644 buffer = (*cinfo_p->mem->alloc_sarray) ((j_common_ptr) cinfo_p, JPOOL_IMAGE, (unsigned int) cinfo_p->image_width * cinfo_p->input_components, -diff --git a/converter/other/pnmtops.c b/converter/other/pnmtops.c -index de0dfd8..09c28d5 100644 ---- a/converter/other/pnmtops.c -+++ b/converter/other/pnmtops.c -@@ -294,17 +294,21 @@ parseCommandLine(int argc, const char ** argv, +diff -urNp a/converter/other/pnmtops.c b/converter/other/pnmtops.c +--- a/converter/other/pnmtops.c 2018-07-23 15:03:21.399486742 +0200 ++++ b/converter/other/pnmtops.c 2018-07-23 15:05:03.068265754 +0200 +@@ -294,17 +294,21 @@ parseCommandLine(int argc, const char ** validateCompDimension(width, 72, "-width value"); validateCompDimension(height, 72, "-height value"); @@ -145,10 +138,9 @@ index de0dfd8..09c28d5 100644 cmdlineP->imageheight = imageheight * 72; } else -diff --git a/converter/other/rletopnm.c b/converter/other/rletopnm.c -index 018456c..35ea7f7 100644 ---- a/converter/other/rletopnm.c -+++ b/converter/other/rletopnm.c +diff -urNp a/converter/other/rletopnm.c b/converter/other/rletopnm.c +--- a/converter/other/rletopnm.c 2018-07-23 15:03:21.385486773 +0200 ++++ b/converter/other/rletopnm.c 2018-07-23 15:05:03.068265754 +0200 @@ -19,6 +19,8 @@ * If you modify this software, you should include a notice giving the * name of the person performing the modification, the date of modification, @@ -158,10 +150,9 @@ index 018456c..35ea7f7 100644 */ /* * rletopnm - A conversion program to convert from Utah's "rle" image format -diff --git a/converter/other/sirtopnm.c b/converter/other/sirtopnm.c -index fafcc91..9fe49d0 100644 ---- a/converter/other/sirtopnm.c -+++ b/converter/other/sirtopnm.c +diff -urNp a/converter/other/sirtopnm.c b/converter/other/sirtopnm.c +--- a/converter/other/sirtopnm.c 2018-07-23 15:03:21.398486744 +0200 ++++ b/converter/other/sirtopnm.c 2018-07-23 15:05:03.068265754 +0200 @@ -69,6 +69,7 @@ char* argv[]; } break; @@ -170,11 +161,10 @@ index fafcc91..9fe49d0 100644 picsize = cols * rows * 3; planesize = cols * rows; if ( !( sirarray = (unsigned char*) malloc( picsize ) ) ) -diff --git a/converter/other/tifftopnm.c b/converter/other/tifftopnm.c -index c1e7af8..ef9253b 100644 ---- a/converter/other/tifftopnm.c -+++ b/converter/other/tifftopnm.c -@@ -1372,7 +1372,9 @@ convertRasterByRows(pnmOut * const pnmOutP, +diff -urNp a/converter/other/tifftopnm.c b/converter/other/tifftopnm.c +--- a/converter/other/tifftopnm.c 2018-07-23 15:03:21.379486786 +0200 ++++ b/converter/other/tifftopnm.c 2018-07-23 15:05:03.068265754 +0200 +@@ -1372,7 +1372,9 @@ convertRasterByRows(pnmOut * const if (scanbuf == NULL) pm_error("can't allocate memory for scanline buffer"); @@ -185,11 +175,10 @@ index c1e7af8..ef9253b 100644 if (samplebuf == NULL) pm_error("can't allocate memory for row buffer"); -diff --git a/converter/other/xwdtopnm.c b/converter/other/xwdtopnm.c -index df3c737..6c19ade 100644 ---- a/converter/other/xwdtopnm.c -+++ b/converter/other/xwdtopnm.c -@@ -210,6 +210,10 @@ processX10Header(X10WDFileHeader * const h10P, +diff -urNp a/converter/other/xwdtopnm.c b/converter/other/xwdtopnm.c +--- a/converter/other/xwdtopnm.c 2018-07-23 15:03:21.387486768 +0200 ++++ b/converter/other/xwdtopnm.c 2018-07-23 15:05:03.068265754 +0200 +@@ -210,6 +210,10 @@ processX10Header(X10WDFileHeader * cons *colorsP = pnm_allocrow(2); PNM_ASSIGN1((*colorsP)[0], 0); PNM_ASSIGN1((*colorsP)[1], *maxvalP); @@ -200,7 +189,7 @@ index df3c737..6c19ade 100644 *padrightP = (((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width) * 8; *bits_per_itemP = 16; -@@ -635,6 +639,7 @@ processX11Header(X11WDFileHeader * const h11P, +@@ -635,6 +639,7 @@ processX11Header(X11WDFileHeader * cons *colsP = h11FixedP->pixmap_width; *rowsP = h11FixedP->pixmap_height; @@ -208,10 +197,9 @@ index df3c737..6c19ade 100644 *padrightP = h11FixedP->bytes_per_line * 8 - h11FixedP->pixmap_width * h11FixedP->bits_per_pixel; -diff --git a/converter/pbm/mdatopbm.c b/converter/pbm/mdatopbm.c -index d8e0657..12c7468 100644 ---- a/converter/pbm/mdatopbm.c -+++ b/converter/pbm/mdatopbm.c +diff -urNp a/converter/pbm/mdatopbm.c b/converter/pbm/mdatopbm.c +--- a/converter/pbm/mdatopbm.c 2018-07-23 15:03:21.377486790 +0200 ++++ b/converter/pbm/mdatopbm.c 2018-07-23 15:05:03.052265788 +0200 @@ -245,10 +245,13 @@ main(int argc, char **argv) { pm_readlittleshort(infile, &yy); nInCols = yy; } @@ -227,10 +215,9 @@ index d8e0657..12c7468 100644 data = pbm_allocarray(nOutCols, nOutRows); -diff --git a/converter/pbm/mgrtopbm.c b/converter/pbm/mgrtopbm.c -index 9f7004a..60e8477 100644 ---- a/converter/pbm/mgrtopbm.c -+++ b/converter/pbm/mgrtopbm.c +diff -urNp a/converter/pbm/mgrtopbm.c b/converter/pbm/mgrtopbm.c +--- a/converter/pbm/mgrtopbm.c 2018-07-23 15:03:21.377486790 +0200 ++++ b/converter/pbm/mgrtopbm.c 2018-07-23 15:05:03.052265788 +0200 @@ -65,6 +65,8 @@ readMgrHeader(FILE * const ifP, if (head.h_high < ' ' || head.l_high < ' ') pm_error("Invalid width field in MGR header"); @@ -240,31 +227,9 @@ index 9f7004a..60e8477 100644 *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' '); *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' '); *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP; -diff --git a/converter/pbm/pbmto4425.c b/converter/pbm/pbmto4425.c -index 1d97ac6..c4c8cbb 100644 ---- a/converter/pbm/pbmto4425.c -+++ b/converter/pbm/pbmto4425.c -@@ -2,6 +2,7 @@ - - #include "nstring.h" - #include "pbm.h" -+#include - - static char bit_table[2][3] = { - {1, 4, 0x10}, -@@ -160,7 +161,7 @@ main(int argc, char * argv[]) { - xres = vmap_width * 2; - yres = vmap_height * 3; - -- vmap = malloc(vmap_width * vmap_height * sizeof(char)); -+ vmap = malloc3(vmap_width, vmap_height, sizeof(char)); - if(vmap == NULL) - { - pm_error( "Cannot allocate memory" ); -diff --git a/converter/pbm/pbmtogem.c b/converter/pbm/pbmtogem.c -index 9eab041..13b0257 100644 ---- a/converter/pbm/pbmtogem.c -+++ b/converter/pbm/pbmtogem.c +diff -urNp a/converter/pbm/pbmtogem.c b/converter/pbm/pbmtogem.c +--- a/converter/pbm/pbmtogem.c 2018-07-23 15:03:21.377486790 +0200 ++++ b/converter/pbm/pbmtogem.c 2018-07-23 15:05:03.052265788 +0200 @@ -79,6 +79,7 @@ putinit (int const rows, int const cols) bitsperitem = 0; bitshift = 7; @@ -273,10 +238,9 @@ index 9eab041..13b0257 100644 outmax = (cols + 7) / 8; outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char)); lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char)); -diff --git a/converter/pbm/pbmtogo.c b/converter/pbm/pbmtogo.c -index 23b2ee9..d2ee91f 100644 ---- a/converter/pbm/pbmtogo.c -+++ b/converter/pbm/pbmtogo.c +diff -urNp a/converter/pbm/pbmtogo.c b/converter/pbm/pbmtogo.c +--- a/converter/pbm/pbmtogo.c 2018-07-23 15:03:21.377486790 +0200 ++++ b/converter/pbm/pbmtogo.c 2018-07-23 15:05:03.052265788 +0200 @@ -158,6 +158,7 @@ main(int argc, bitrow = pbm_allocrow(cols); @@ -285,10 +249,9 @@ index 23b2ee9..d2ee91f 100644 rucols = ( cols + 7 ) / 8; bytesperrow = rucols; /* GraphOn uses bytes */ rucols = rucols * 8; -diff --git a/converter/pbm/pbmtolj.c b/converter/pbm/pbmtolj.c -index 0cceb4f..fdab6df 100644 ---- a/converter/pbm/pbmtolj.c -+++ b/converter/pbm/pbmtolj.c +diff -urNp a/converter/pbm/pbmtolj.c b/converter/pbm/pbmtolj.c +--- a/converter/pbm/pbmtolj.c 2018-07-23 15:03:21.377486790 +0200 ++++ b/converter/pbm/pbmtolj.c 2018-07-23 15:05:03.052265788 +0200 @@ -120,7 +120,11 @@ parseCommandLine(int argc, char ** argv, static void allocateBuffers(unsigned int const cols) { @@ -301,10 +264,9 @@ index 0cceb4f..fdab6df 100644 packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1; deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10; -diff --git a/converter/pbm/pbmtomda.c b/converter/pbm/pbmtomda.c -index 3ad5149..9efe5cf 100644 ---- a/converter/pbm/pbmtomda.c -+++ b/converter/pbm/pbmtomda.c +diff -urNp a/converter/pbm/pbmtomda.c b/converter/pbm/pbmtomda.c +--- a/converter/pbm/pbmtomda.c 2018-07-23 15:03:21.377486790 +0200 ++++ b/converter/pbm/pbmtomda.c 2018-07-23 15:05:03.052265788 +0200 @@ -179,6 +179,7 @@ int main(int argc, char **argv) nOutRowsUnrounded = bScale ? nInRows/2 : nInRows; @@ -313,11 +275,10 @@ index 3ad5149..9efe5cf 100644 nOutRows = ((nOutRowsUnrounded + 3) / 4) * 4; /* MDA wants rows a multiple of 4 */ nOutCols = nInCols / 8; -diff --git a/converter/pbm/pbmtoppa/pbm.c b/converter/pbm/pbmtoppa/pbm.c -index 2f8a42b..1c8d236 100644 ---- a/converter/pbm/pbmtoppa/pbm.c -+++ b/converter/pbm/pbmtoppa/pbm.c -@@ -106,6 +106,7 @@ int pbm_readline(pbm_stat* pbm,unsigned char* data) +diff -urNp a/converter/pbm/pbmtoppa/pbm.c b/converter/pbm/pbmtoppa/pbm.c +--- a/converter/pbm/pbmtoppa/pbm.c 2018-07-23 15:03:21.377486790 +0200 ++++ b/converter/pbm/pbmtoppa/pbm.c 2018-07-23 15:05:03.051265791 +0200 +@@ -106,6 +106,7 @@ int pbm_readline(pbm_stat* pbm,unsigned return 0; case P4: @@ -325,7 +286,7 @@ index 2f8a42b..1c8d236 100644 tmp=(pbm->width+7)/8; tmp2=fread(data,1,tmp,pbm->fptr); if(tmp2 == tmp) -@@ -130,6 +131,7 @@ void pbm_unreadline (pbm_stat *pbm, void *data) +@@ -130,6 +131,7 @@ void pbm_unreadline (pbm_stat *pbm, void return; pbm->unread = 1; @@ -333,10 +294,9 @@ index 2f8a42b..1c8d236 100644 pbm->revdata = malloc ((pbm->width+7)/8); memcpy (pbm->revdata, data, (pbm->width+7)/8); pbm->current_line--; -diff --git a/converter/pbm/pbmtoppa/pbmtoppa.c b/converter/pbm/pbmtoppa/pbmtoppa.c -index ff4a599..aa510ec 100644 ---- a/converter/pbm/pbmtoppa/pbmtoppa.c -+++ b/converter/pbm/pbmtoppa/pbmtoppa.c +diff -urNp a/converter/pbm/pbmtoppa/pbmtoppa.c b/converter/pbm/pbmtoppa/pbmtoppa.c +--- a/converter/pbm/pbmtoppa/pbmtoppa.c 2018-07-23 15:03:21.377486790 +0200 ++++ b/converter/pbm/pbmtoppa/pbmtoppa.c 2018-07-23 15:05:03.051265791 +0200 @@ -453,6 +453,7 @@ main(int argc, char *argv[]) { pm_error("main(): unrecognized parameter '%s'", argv[argn]); } @@ -345,10 +305,9 @@ index ff4a599..aa510ec 100644 Pwidth=(Width+7)/8; printer.fptr=out; -diff --git a/converter/pbm/pbmtoxbm.c b/converter/pbm/pbmtoxbm.c -index ecb72b3..fc0eb9c 100644 ---- a/converter/pbm/pbmtoxbm.c -+++ b/converter/pbm/pbmtoxbm.c +diff -urNp a/converter/pbm/pbmtoxbm.c b/converter/pbm/pbmtoxbm.c +--- a/converter/pbm/pbmtoxbm.c 2018-07-23 15:03:21.376486792 +0200 ++++ b/converter/pbm/pbmtoxbm.c 2018-07-23 15:05:03.053265786 +0200 @@ -352,6 +352,8 @@ convertRaster(FILE * const ifP, unsigned char * bitrow; @@ -358,10 +317,29 @@ index ecb72b3..fc0eb9c 100644 putinit(xbmVersion); -diff --git a/converter/pbm/pktopbm.c b/converter/pbm/pktopbm.c -index 712f339..b6fcb02 100644 ---- a/converter/pbm/pktopbm.c -+++ b/converter/pbm/pktopbm.c +diff -urNp a/converter/pbm/pbmto4425.c b/converter/pbm/pbmto4425.c +--- a/converter/pbm/pbmto4425.c 2018-07-23 15:03:21.377486790 +0200 ++++ b/converter/pbm/pbmto4425.c 2018-07-23 15:05:03.052265788 +0200 +@@ -2,6 +2,7 @@ + + #include "nstring.h" + #include "pbm.h" ++#include + + static char bit_table[2][3] = { + {1, 4, 0x10}, +@@ -160,7 +161,7 @@ main(int argc, char * argv[]) { + xres = vmap_width * 2; + yres = vmap_height * 3; + +- vmap = malloc(vmap_width * vmap_height * sizeof(char)); ++ vmap = malloc3(vmap_width, vmap_height, sizeof(char)); + if(vmap == NULL) + { + pm_error( "Cannot allocate memory" ); +diff -urNp a/converter/pbm/pktopbm.c b/converter/pbm/pktopbm.c +--- a/converter/pbm/pktopbm.c 2018-07-23 15:03:21.377486790 +0200 ++++ b/converter/pbm/pktopbm.c 2018-07-23 15:05:03.053265786 +0200 @@ -280,6 +280,7 @@ main(int argc, char *argv[]) { if (flagbyte == 7) { /* long form preamble */ integer packetlength = get32() ; /* character packet length */ @@ -370,10 +348,9 @@ index 712f339..b6fcb02 100644 endofpacket = packetlength + pktopbm_pkloc; /* calculate end of packet */ if ((car >= MAXPKCHAR) || !filename[car]) { -diff --git a/converter/pbm/thinkjettopbm.l b/converter/pbm/thinkjettopbm.l -index 5de4f2b..7f31de5 100644 ---- a/converter/pbm/thinkjettopbm.l -+++ b/converter/pbm/thinkjettopbm.l +diff -urNp a/converter/pbm/thinkjettopbm.l b/converter/pbm/thinkjettopbm.l +--- a/converter/pbm/thinkjettopbm.l 2018-07-23 15:03:21.377486790 +0200 ++++ b/converter/pbm/thinkjettopbm.l 2018-07-23 15:05:03.053265786 +0200 @@ -114,7 +114,9 @@ DIG [0-9] \033\*b{DIG}+W { int l; @@ -394,10 +371,9 @@ index 5de4f2b..7f31de5 100644 pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0); packed_bitrow = malloc(maxRowLength); -diff --git a/converter/pbm/ybmtopbm.c b/converter/pbm/ybmtopbm.c -index 2a42908..cf1ff03 100644 ---- a/converter/pbm/ybmtopbm.c -+++ b/converter/pbm/ybmtopbm.c +diff -urNp a/converter/pbm/ybmtopbm.c b/converter/pbm/ybmtopbm.c +--- a/converter/pbm/ybmtopbm.c 2018-07-23 15:03:21.378486788 +0200 ++++ b/converter/pbm/ybmtopbm.c 2018-07-23 15:05:03.053265786 +0200 @@ -43,6 +43,7 @@ getinit(FILE * const ifP, pm_error("EOF / read error"); @@ -406,10 +382,9 @@ index 2a42908..cf1ff03 100644 } -diff --git a/converter/pgm/lispmtopgm.c b/converter/pgm/lispmtopgm.c -index 40dd3fb..b5469f7 100644 ---- a/converter/pgm/lispmtopgm.c -+++ b/converter/pgm/lispmtopgm.c +diff -urNp a/converter/pgm/lispmtopgm.c b/converter/pgm/lispmtopgm.c +--- a/converter/pgm/lispmtopgm.c 2018-07-23 15:03:21.400486740 +0200 ++++ b/converter/pgm/lispmtopgm.c 2018-07-23 15:05:03.069265751 +0200 @@ -58,6 +58,7 @@ main( argc, argv ) pm_error( "depth (%d bits) is too large", depth); @@ -418,7 +393,7 @@ index 40dd3fb..b5469f7 100644 grayrow = pgm_allocrow( ( cols + 7 ) / 8 * 8 ); for ( row = 0; row < rows; ++row ) -@@ -102,6 +103,8 @@ getinit( file, colsP, rowsP, depthP, padrightP ) +@@ -102,6 +103,8 @@ getinit( file, colsP, rowsP, depthP, pad if ( *depthP == 0 ) *depthP = 1; /* very old file */ @@ -427,10 +402,9 @@ index 40dd3fb..b5469f7 100644 *padrightP = ( ( *colsP + 31 ) / 32 ) * 32 - *colsP; -diff --git a/converter/pgm/psidtopgm.c b/converter/pgm/psidtopgm.c -index 07417d1..25bb311 100644 ---- a/converter/pgm/psidtopgm.c -+++ b/converter/pgm/psidtopgm.c +diff -urNp a/converter/pgm/psidtopgm.c b/converter/pgm/psidtopgm.c +--- a/converter/pgm/psidtopgm.c 2018-07-23 15:03:21.400486740 +0200 ++++ b/converter/pgm/psidtopgm.c 2018-07-23 15:05:03.069265751 +0200 @@ -78,6 +78,7 @@ main(int argc, pm_error("bits/sample (%d) is too large.", bitspersample); @@ -439,24 +413,10 @@ index 07417d1..25bb311 100644 grayrow = pgm_allocrow((cols + 7) / 8 * 8); for (row = 0; row < rows; ++row) { unsigned int col; -diff --git a/converter/ppm/Makefile b/converter/ppm/Makefile -index 003ef8d..b97349d 100644 ---- a/converter/ppm/Makefile -+++ b/converter/ppm/Makefile -@@ -11,7 +11,7 @@ SUBDIRS = hpcdtoppm ppmtompeg - - PORTBINARIES = 411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \ - leaftoppm mtvtoppm neotoppm \ -- pcxtoppm pc1toppm pi1toppm picttoppm pjtoppm \ -+ pcxtoppm pc1toppm pi1toppm pjtoppm \ - ppmtoacad ppmtoapplevol ppmtoarbtxt ppmtoascii \ - ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \ - ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \ -diff --git a/converter/ppm/ilbmtoppm.c b/converter/ppm/ilbmtoppm.c -index 662be0b..2a86efc 100644 ---- a/converter/ppm/ilbmtoppm.c -+++ b/converter/ppm/ilbmtoppm.c -@@ -606,6 +606,7 @@ decode_row(FILE * const ifP, +diff -urNp a/converter/ppm/ilbmtoppm.c b/converter/ppm/ilbmtoppm.c +--- a/converter/ppm/ilbmtoppm.c 2018-07-23 15:03:21.403486734 +0200 ++++ b/converter/ppm/ilbmtoppm.c 2018-07-23 15:08:45.446313490 +0200 +@@ -608,6 +608,7 @@ decode_row(FILE * const ifP, rawtype *chp; cols = bmhdP->w; @@ -464,7 +424,7 @@ index 662be0b..2a86efc 100644 bytes = RowBytes(cols); for( plane = 0; plane < nPlanes; plane++ ) { int mask; -@@ -693,6 +694,23 @@ decode_mask(FILE * const ifP, +@@ -695,6 +696,23 @@ decode_mask(FILE * const ifP, Multipalette handling ****************************************************************************/ @@ -487,28 +447,28 @@ index 662be0b..2a86efc 100644 + static void - multi_adjust(cmap, row, palchange) -@@ -1355,6 +1373,9 @@ dcol_to_ppm(FILE * const ifP, + multi_adjust(ColorMap * const cmapP, +@@ -1363,6 +1381,9 @@ dcol_to_ppm(FILE * const ifP, if( redmaxval != maxval || greenmaxval != maxval || bluemaxval != maxval ) pm_message("scaling colors to %d bits", pm_maxvaltobits(maxval)); - + + overflow_add(redmaxval, 1); + overflow_add(greenmaxval, 1); + overflow_add(bluemaxval, 1); MALLOCARRAY_NOFAIL(redtable, redmaxval +1); MALLOCARRAY_NOFAIL(greentable, greenmaxval +1); MALLOCARRAY_NOFAIL(bluetable, bluemaxval +1); -@@ -1784,7 +1805,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, datasize) +@@ -1802,7 +1823,9 @@ PCHG_ConvertSmall(PCHGHeader * const ChangeCount32 = *data++; - datasize -= 2; + remDataSize -= 2; + overflow_add(ChangeCount16, ChangeCount32); changes = ChangeCount16 + ChangeCount32; + overflow_add(changes, 1); - for( i = 0; i < changes; i++ ) { - if( totalchanges >= PCHG->TotalChanges ) goto fail; - if( datasize < 2 ) goto fail; -@@ -2049,6 +2072,9 @@ read_pchg(FILE * const ifP, + for (i = 0; i < changes; ++i) { + if (totalchanges >= pchgP->TotalChanges) goto fail; + if (remDataSize < 2) goto fail; +@@ -2067,6 +2090,9 @@ read_pchg(FILE * const ifP, cmap->mp_change[i] = NULL; if( PCHG.StartLine < 0 ) { int nch; @@ -518,7 +478,7 @@ index 662be0b..2a86efc 100644 nch = PCHG.MaxReg - PCHG.MinReg +1; MALLOCARRAY_NOFAIL(cmap->mp_init, nch + 1); for( i = 0; i < nch; i++ ) -@@ -2125,6 +2151,7 @@ process_body( FILE * const ifP, +@@ -2143,6 +2169,7 @@ process_body( FILE * const ifP, if (typeid == ID_ILBM) { int isdeep; @@ -526,10 +486,59 @@ index 662be0b..2a86efc 100644 MALLOCARRAY_NOFAIL(ilbmrow, RowBytes(bmhdP->w)); *viewportmodesP |= fakeviewport; /* -isham/-isehb */ -diff --git a/converter/ppm/imgtoppm.c b/converter/ppm/imgtoppm.c -index 7078b88..eb8509e 100644 ---- a/converter/ppm/imgtoppm.c -+++ b/converter/ppm/imgtoppm.c +diff -urNp a/converter/ppm/ilbmtoppm.c.rej b/converter/ppm/ilbmtoppm.c.rej +--- a/converter/ppm/ilbmtoppm.c.rej 1970-01-01 01:00:00.000000000 +0100 ++++ b/converter/ppm/ilbmtoppm.c.rej 2018-07-23 15:05:03.071265747 +0200 +@@ -0,0 +1,46 @@ ++--- converter/ppm/ilbmtoppm.c +++++ converter/ppm/ilbmtoppm.c ++@@ -694,6 +695,23 @@ decode_mask(FILE * const ifP, ++ Multipalette handling ++ ****************************************************************************/ ++ +++static void * +++xmalloc2(x, y) +++ int x; +++ int y; +++{ +++ void *mem; +++ +++ overflow2(x,y); +++ if( x * y == 0 ) +++ return NULL; +++ +++ mem = malloc2(x,y); +++ if( mem == NULL ) +++ pm_error("out of memory allocating %d bytes", x * y); +++ return mem; +++} +++ ++ ++ static void ++ multi_adjust(cmap, row, palchange) ++@@ -1356,6 +1374,9 @@ dcol_to_ppm(FILE * const ifP, ++ if( redmaxval != maxval || greenmaxval != maxval || bluemaxval != maxval ) ++ pm_message("scaling colors to %d bits", pm_maxvaltobits(maxval)); ++ +++ overflow_add(redmaxval, 1); +++ overflow_add(greenmaxval, 1); +++ overflow_add(bluemaxval, 1); ++ MALLOCARRAY_NOFAIL(redtable, redmaxval +1); ++ MALLOCARRAY_NOFAIL(greentable, greenmaxval +1); ++ MALLOCARRAY_NOFAIL(bluetable, bluemaxval +1); ++@@ -1785,7 +1806,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, datasize) ++ ChangeCount32 = *data++; ++ datasize -= 2; ++ +++ overflow_add(ChangeCount16, ChangeCount32); ++ changes = ChangeCount16 + ChangeCount32; +++ overflow_add(changes, 1); ++ for( i = 0; i < changes; i++ ) { ++ if( totalchanges >= PCHG->TotalChanges ) goto fail; ++ if( datasize < 2 ) goto fail; +diff -urNp a/converter/ppm/imgtoppm.c b/converter/ppm/imgtoppm.c +--- a/converter/ppm/imgtoppm.c 2018-07-23 15:03:21.404486731 +0200 ++++ b/converter/ppm/imgtoppm.c 2018-07-23 15:05:03.071265747 +0200 @@ -84,6 +84,7 @@ main(int argc, char ** argv) { len = atoi((char*) buf ); if ( fread( buf, len, 1, ifp ) != 1 ) @@ -546,11 +555,22 @@ index 7078b88..eb8509e 100644 if ( len != cols * rows ) pm_message( "pixel data length (%d) does not match image size (%d)", -diff --git a/converter/ppm/pcxtoppm.c b/converter/ppm/pcxtoppm.c -index e252ba2..270ae3b 100644 ---- a/converter/ppm/pcxtoppm.c -+++ b/converter/ppm/pcxtoppm.c -@@ -409,6 +409,7 @@ pcx_planes_to_pixels(pixels, bitplanes, bytesperline, planes, bitsperpixel) +diff -urNp a/converter/ppm/Makefile b/converter/ppm/Makefile +--- a/converter/ppm/Makefile 2018-07-23 15:03:21.406486727 +0200 ++++ b/converter/ppm/Makefile 2018-07-23 15:05:03.071265747 +0200 +@@ -11,7 +11,7 @@ SUBDIRS = hpcdtoppm + + PORTBINARIES = 411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \ + leaftoppm mtvtoppm neotoppm \ +- pcxtoppm pc1toppm pi1toppm picttoppm pjtoppm \ ++ pcxtoppm pc1toppm pi1toppm pjtoppm \ + ppmtoacad ppmtoapplevol ppmtoarbtxt ppmtoascii \ + ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \ + ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \ +diff -urNp a/converter/ppm/pcxtoppm.c b/converter/ppm/pcxtoppm.c +--- a/converter/ppm/pcxtoppm.c 2018-07-23 15:03:21.406486727 +0200 ++++ b/converter/ppm/pcxtoppm.c 2018-07-23 15:05:03.071265747 +0200 +@@ -409,6 +409,7 @@ pcx_planes_to_pixels(pixels, bitplanes, /* * clear the pixel buffer */ @@ -566,19 +586,17 @@ index e252ba2..270ae3b 100644 rawcols = BytesPerLine * 8 / BitsPerPixel; if (headerCols > rawcols) { pm_message("warning - BytesPerLine = %d, " -diff --git a/converter/ppm/picttoppm.c b/converter/ppm/picttoppm.c -index d412038..a59bf77 100644 ---- a/converter/ppm/picttoppm.c -+++ b/converter/ppm/picttoppm.c +diff -urNp a/converter/ppm/picttoppm.c b/converter/ppm/picttoppm.c +--- a/converter/ppm/picttoppm.c 2018-07-23 15:03:21.404486731 +0200 ++++ b/converter/ppm/picttoppm.c 2018-07-23 15:05:03.071265747 +0200 @@ -1,3 +1,4 @@ +#error "Unfixable. Don't ship me" /* * picttoppm.c -- convert a MacIntosh PICT file to PPM format. * -diff --git a/converter/ppm/pjtoppm.c b/converter/ppm/pjtoppm.c -index 7b694fb..62ce77e 100644 ---- a/converter/ppm/pjtoppm.c -+++ b/converter/ppm/pjtoppm.c +diff -urNp a/converter/ppm/pjtoppm.c b/converter/ppm/pjtoppm.c +--- a/converter/ppm/pjtoppm.c 2018-07-23 15:03:21.402486736 +0200 ++++ b/converter/ppm/pjtoppm.c 2018-07-23 15:05:03.071265747 +0200 @@ -127,20 +127,22 @@ main(argc, argv) case 'V': /* send plane */ case 'W': /* send last plane */ @@ -632,11 +650,10 @@ index 7b694fb..62ce77e 100644 cols *= 8; } -diff --git a/converter/ppm/ppmtoeyuv.c b/converter/ppm/ppmtoeyuv.c -index f5ce115..6f072be 100644 ---- a/converter/ppm/ppmtoeyuv.c -+++ b/converter/ppm/ppmtoeyuv.c -@@ -114,6 +114,7 @@ create_multiplication_tables(const pixval maxval) { +diff -urNp a/converter/ppm/ppmtoeyuv.c b/converter/ppm/ppmtoeyuv.c +--- a/converter/ppm/ppmtoeyuv.c 2018-07-23 15:03:21.404486731 +0200 ++++ b/converter/ppm/ppmtoeyuv.c 2018-07-23 15:05:03.071265747 +0200 +@@ -114,6 +114,7 @@ create_multiplication_tables(const pixva int index; @@ -644,10 +661,9 @@ index f5ce115..6f072be 100644 MALLOCARRAY_NOFAIL(mult299 , maxval+1); MALLOCARRAY_NOFAIL(mult587 , maxval+1); MALLOCARRAY_NOFAIL(mult114 , maxval+1); -diff --git a/converter/ppm/ppmtolj.c b/converter/ppm/ppmtolj.c -index 7ed814e..b4e7db1 100644 ---- a/converter/ppm/ppmtolj.c -+++ b/converter/ppm/ppmtolj.c +diff -urNp a/converter/ppm/ppmtolj.c b/converter/ppm/ppmtolj.c +--- a/converter/ppm/ppmtolj.c 2018-07-23 15:03:21.401486738 +0200 ++++ b/converter/ppm/ppmtolj.c 2018-07-23 15:05:03.071265747 +0200 @@ -182,6 +182,7 @@ int main(int argc, char *argv[]) { ppm_readppminit( ifp, &cols, &rows, &maxval, &format ); pixelrow = ppm_allocrow( cols ); @@ -656,10 +672,9 @@ index 7ed814e..b4e7db1 100644 obuf = (unsigned char *) pm_allocrow(cols * 3, sizeof(unsigned char)); cbuf = (unsigned char *) pm_allocrow(cols * 6, sizeof(unsigned char)); if (mode == C_TRANS_MODE_DELTA) -diff --git a/converter/ppm/ppmtomitsu.c b/converter/ppm/ppmtomitsu.c -index e59f09b..1d2be20 100644 ---- a/converter/ppm/ppmtomitsu.c -+++ b/converter/ppm/ppmtomitsu.c +diff -urNp a/converter/ppm/ppmtomitsu.c b/converter/ppm/ppmtomitsu.c +--- a/converter/ppm/ppmtomitsu.c 2018-07-23 15:03:21.403486734 +0200 ++++ b/converter/ppm/ppmtomitsu.c 2018-07-23 15:05:03.071265747 +0200 @@ -685,6 +685,8 @@ main(int argc, char * argv[]) { medias = MSize_User; @@ -669,11 +684,10 @@ index e59f09b..1d2be20 100644 medias.maxcols *= 2; medias.maxrows *= 2; } -diff --git a/converter/ppm/ppmtopcx.c b/converter/ppm/ppmtopcx.c -index fa68edc..97dfb2b 100644 ---- a/converter/ppm/ppmtopcx.c -+++ b/converter/ppm/ppmtopcx.c -@@ -425,6 +425,8 @@ ppmTo16ColorPcx(pixel ** const pixels, +diff -urNp a/converter/ppm/ppmtopcx.c b/converter/ppm/ppmtopcx.c +--- a/converter/ppm/ppmtopcx.c 2018-07-23 15:03:21.403486734 +0200 ++++ b/converter/ppm/ppmtopcx.c 2018-07-23 15:05:03.071265747 +0200 +@@ -425,6 +425,8 @@ ppmTo16ColorPcx(pixel ** cons else Planes = 1; } } @@ -682,10 +696,9 @@ index fa68edc..97dfb2b 100644 BytesPerLine = ((cols * BitsPerPixel) + 7) / 8; MALLOCARRAY_NOFAIL(indexRow, cols); MALLOCARRAY_NOFAIL(planesrow, BytesPerLine); -diff --git a/converter/ppm/ppmtopict.c b/converter/ppm/ppmtopict.c -index 36464b6..c91ccf2 100644 ---- a/converter/ppm/ppmtopict.c -+++ b/converter/ppm/ppmtopict.c +diff -urNp a/converter/ppm/ppmtopict.c b/converter/ppm/ppmtopict.c +--- a/converter/ppm/ppmtopict.c 2018-07-23 15:03:21.402486736 +0200 ++++ b/converter/ppm/ppmtopict.c 2018-07-23 15:05:03.071265747 +0200 @@ -450,6 +450,8 @@ main(int argc, const char ** argv) { putShort(stdout, 0); /* mode */ @@ -695,10 +708,9 @@ index 36464b6..c91ccf2 100644 outBuf = malloc((unsigned)(cols+cols/MAX_COUNT+1)); for (row = 0, oc = 0; row < rows; ++row) { unsigned int rowSize; -diff --git a/converter/ppm/ppmtopj.c b/converter/ppm/ppmtopj.c -index d116773..fc84cac 100644 ---- a/converter/ppm/ppmtopj.c -+++ b/converter/ppm/ppmtopj.c +diff -urNp a/converter/ppm/ppmtopj.c b/converter/ppm/ppmtopj.c +--- a/converter/ppm/ppmtopj.c 2018-07-23 15:03:21.405486729 +0200 ++++ b/converter/ppm/ppmtopj.c 2018-07-23 15:05:03.071265747 +0200 @@ -179,6 +179,7 @@ char *argv[]; pixels = ppm_readppm( ifp, &cols, &rows, &maxval ); @@ -707,10 +719,9 @@ index d116773..fc84cac 100644 obuf = (unsigned char *) pm_allocrow(cols, sizeof(unsigned char)); cbuf = (unsigned char *) pm_allocrow(cols * 2, sizeof(unsigned char)); -diff --git a/converter/ppm/ppmtopjxl.c b/converter/ppm/ppmtopjxl.c -index 90bcef0..72d0027 100644 ---- a/converter/ppm/ppmtopjxl.c -+++ b/converter/ppm/ppmtopjxl.c +diff -urNp a/converter/ppm/ppmtopjxl.c b/converter/ppm/ppmtopjxl.c +--- a/converter/ppm/ppmtopjxl.c 2018-07-23 15:03:21.405486729 +0200 ++++ b/converter/ppm/ppmtopjxl.c 2018-07-23 15:05:03.071265747 +0200 @@ -267,6 +267,9 @@ main(int argc, const char * argv[]) { if (maxval > PCL_MAXVAL) pm_error("color range too large; reduce with ppmcscale"); @@ -744,10 +755,9 @@ index 90bcef0..72d0027 100644 inrow = (char *)malloc((unsigned)bpp); outrow = (char *)malloc((unsigned)bpp*2); runcnt = (signed char *)malloc((unsigned)bpp); -diff --git a/converter/ppm/ppmtowinicon.c b/converter/ppm/ppmtowinicon.c -index c673798..af2b445 100644 ---- a/converter/ppm/ppmtowinicon.c -+++ b/converter/ppm/ppmtowinicon.c +diff -urNp a/converter/ppm/ppmtowinicon.c b/converter/ppm/ppmtowinicon.c +--- a/converter/ppm/ppmtowinicon.c 2018-07-23 15:03:21.405486729 +0200 ++++ b/converter/ppm/ppmtowinicon.c 2018-07-23 15:05:03.071265747 +0200 @@ -12,6 +12,7 @@ #include @@ -756,7 +766,7 @@ index c673798..af2b445 100644 #include "pm_c_util.h" #include "winico.h" -@@ -214,6 +215,7 @@ createAndBitmap (gray ** const ba, int const cols, int const rows, +@@ -214,6 +215,7 @@ createAndBitmap (gray ** const ba, int c MALLOCARRAY_NOFAIL(rowData, rows); icBitmap->xBytes = xBytes; icBitmap->data = rowData; @@ -764,7 +774,7 @@ index c673798..af2b445 100644 icBitmap->size = xBytes * rows; for (y=0;yxBytes = xBytes; icBitmap->data = rowData; @@ -772,7 +782,7 @@ index c673798..af2b445 100644 icBitmap->size = xBytes * rows; for (y=0;yxBytes = xBytes; icBitmap->data = rowData; @@ -780,7 +790,7 @@ index c673798..af2b445 100644 icBitmap->size = xBytes * rows; for (y=0;ybitcount = bpp; entry->ih = createInfoHeader(entry, xorBitmap, andBitmap); entry->colors = palette->colors; @@ -793,11 +803,10 @@ index c673798..af2b445 100644 xorBitmap->size + andBitmap->size + 40 + (4 * entry->color_count); if (verbose) pm_message("entry->size_in_bytes = %d + %d + %d = %d", -diff --git a/converter/ppm/ppmtoxpm.c b/converter/ppm/ppmtoxpm.c -index 0e31692..1b3923f 100644 ---- a/converter/ppm/ppmtoxpm.c -+++ b/converter/ppm/ppmtoxpm.c -@@ -198,6 +198,7 @@ genNumstr(unsigned int const input, int const digits) { +diff -urNp a/converter/ppm/ppmtoxpm.c b/converter/ppm/ppmtoxpm.c +--- a/converter/ppm/ppmtoxpm.c 2018-07-23 15:03:21.405486729 +0200 ++++ b/converter/ppm/ppmtoxpm.c 2018-07-23 15:05:03.071265747 +0200 +@@ -198,6 +198,7 @@ genNumstr(unsigned int const input, int unsigned int i; /* Allocate memory for printed number. Abort if error. */ @@ -813,10 +822,9 @@ index 0e31692..1b3923f 100644 MALLOCARRAY(cmap, cmapSize); if (cmapP == NULL) pm_error("Out of memory allocating %u bytes for a color map.", -diff --git a/converter/ppm/qrttoppm.c b/converter/ppm/qrttoppm.c -index 935463e..653084c 100644 ---- a/converter/ppm/qrttoppm.c -+++ b/converter/ppm/qrttoppm.c +diff -urNp a/converter/ppm/qrttoppm.c b/converter/ppm/qrttoppm.c +--- a/converter/ppm/qrttoppm.c 2018-07-23 15:03:21.406486727 +0200 ++++ b/converter/ppm/qrttoppm.c 2018-07-23 15:05:03.071265747 +0200 @@ -46,7 +46,7 @@ main( argc, argv ) ppm_writeppminit( stdout, cols, rows, maxval, 0 ); @@ -826,10 +834,9 @@ index 935463e..653084c 100644 if ( buf == (unsigned char *) 0 ) pm_error( "out of memory" ); -diff --git a/converter/ppm/sldtoppm.c b/converter/ppm/sldtoppm.c -index 5ce92c2..2a482be 100644 ---- a/converter/ppm/sldtoppm.c -+++ b/converter/ppm/sldtoppm.c +diff -urNp a/converter/ppm/sldtoppm.c b/converter/ppm/sldtoppm.c +--- a/converter/ppm/sldtoppm.c 2018-07-23 15:03:21.401486738 +0200 ++++ b/converter/ppm/sldtoppm.c 2018-07-23 15:05:03.071265747 +0200 @@ -154,127 +154,85 @@ vscale(int * const px, @@ -1037,10 +1044,9 @@ index 5ce92c2..2a482be 100644 pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1); PPM_ASSIGN(rgbcolor, 0, 0, 0); ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0, -diff --git a/converter/ppm/ximtoppm.c b/converter/ppm/ximtoppm.c -index 75faac6..5758739 100644 ---- a/converter/ppm/ximtoppm.c -+++ b/converter/ppm/ximtoppm.c +diff -urNp a/converter/ppm/ximtoppm.c b/converter/ppm/ximtoppm.c +--- a/converter/ppm/ximtoppm.c 2018-07-23 15:03:21.402486736 +0200 ++++ b/converter/ppm/ximtoppm.c 2018-07-23 15:05:03.071265747 +0200 @@ -118,6 +118,7 @@ ReadXimHeader(FILE * const in_fp, header->bits_channel = atoi(a_head.bits_per_channel); header->alpha_flag = atoi(a_head.alpha_channel); @@ -1073,11 +1079,10 @@ index 75faac6..5758739 100644 header->colors = (Color *)calloc((unsigned int)header->ncolors, sizeof(Color)); if (header->colors == NULL) { -diff --git a/editor/pamcut.c b/editor/pamcut.c -index 7c41af3..72df687 100644 ---- a/editor/pamcut.c -+++ b/editor/pamcut.c -@@ -655,6 +655,8 @@ cutOneImage(FILE * const ifP, +diff -urNp a/editor/pamcut.c b/editor/pamcut.c +--- a/editor/pamcut.c 2018-07-23 15:03:21.362486822 +0200 ++++ b/editor/pamcut.c 2018-07-23 15:05:03.046265802 +0200 +@@ -655,6 +655,8 @@ cutOneImage(FILE * const ifP outpam = inpam; /* Initial value -- most fields should be same */ outpam.file = ofP; @@ -1086,11 +1091,10 @@ index 7c41af3..72df687 100644 outpam.width = rightcol - leftcol + 1; outpam.height = bottomrow - toprow + 1; -diff --git a/editor/pnmgamma.c b/editor/pnmgamma.c -index b357b0d..ec612d3 100644 ---- a/editor/pnmgamma.c -+++ b/editor/pnmgamma.c -@@ -596,6 +596,7 @@ createGammaTables(enum transferFunction const transferFunction, +diff -urNp a/editor/pnmgamma.c b/editor/pnmgamma.c +--- a/editor/pnmgamma.c 2018-07-23 15:03:21.364486818 +0200 ++++ b/editor/pnmgamma.c 2018-07-23 15:05:03.046265802 +0200 +@@ -596,6 +596,7 @@ createGammaTables(enum transferFunction xelval ** const btableP) { /* Allocate space for the tables. */ @@ -1098,11 +1102,10 @@ index b357b0d..ec612d3 100644 MALLOCARRAY(*rtableP, maxval+1); MALLOCARRAY(*gtableP, maxval+1); MALLOCARRAY(*btableP, maxval+1); -diff --git a/editor/pnmhisteq.c b/editor/pnmhisteq.c -index 8af4201..0c8d6e5 100644 ---- a/editor/pnmhisteq.c -+++ b/editor/pnmhisteq.c -@@ -107,6 +107,7 @@ computeLuminosityHistogram(xel * const * const xels, +diff -urNp a/editor/pnmhisteq.c b/editor/pnmhisteq.c +--- a/editor/pnmhisteq.c 2018-07-23 15:03:21.362486822 +0200 ++++ b/editor/pnmhisteq.c 2018-07-23 15:05:03.046265802 +0200 +@@ -107,6 +107,7 @@ computeLuminosityHistogram(xel * const * unsigned int pixelCount; unsigned int * lumahist; @@ -1110,10 +1113,9 @@ index 8af4201..0c8d6e5 100644 MALLOCARRAY(lumahist, maxval + 1); if (lumahist == NULL) pm_error("Out of storage allocating array for %u histogram elements", -diff --git a/editor/pnmindex.csh b/editor/pnmindex.csh -index c6f1e84..c513a84 100755 ---- a/editor/pnmindex.csh -+++ b/editor/pnmindex.csh +diff -urNp a/editor/pnmindex.csh b/editor/pnmindex.csh +--- a/editor/pnmindex.csh 2018-07-23 15:03:21.369486807 +0200 ++++ b/editor/pnmindex.csh 2018-07-23 15:05:03.046265802 +0200 @@ -1,5 +1,7 @@ #!/bin/csh -f # @@ -1122,10 +1124,9 @@ index c6f1e84..c513a84 100755 # pnmindex - build a visual index of a bunch of anymaps # # Copyright (C) 1991 by Jef Poskanzer. -diff --git a/editor/pnmpad.c b/editor/pnmpad.c -index 9c7a77e..1aa578c 100644 ---- a/editor/pnmpad.c -+++ b/editor/pnmpad.c +diff -urNp a/editor/pnmpad.c b/editor/pnmpad.c +--- a/editor/pnmpad.c 2018-07-23 15:03:21.362486822 +0200 ++++ b/editor/pnmpad.c 2018-07-23 15:05:03.046265802 +0200 @@ -634,6 +634,8 @@ main(int argc, const char ** argv) { computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad); @@ -1135,10 +1136,9 @@ index 9c7a77e..1aa578c 100644 newcols = cols + lpad + rpad; if (PNM_FORMAT_TYPE(format) == PBM_TYPE) -diff --git a/editor/pnmremap.c b/editor/pnmremap.c -index ed758aa..73968be 100644 ---- a/editor/pnmremap.c -+++ b/editor/pnmremap.c +diff -urNp a/editor/pnmremap.c b/editor/pnmremap.c +--- a/editor/pnmremap.c 2018-07-23 15:03:21.363486820 +0200 ++++ b/editor/pnmremap.c 2018-07-23 15:09:26.462101272 +0200 @@ -468,6 +468,7 @@ fserr_init(struct pam * const pamP, unsigned int const fserrSize = pamP->width + 2; @@ -1147,19 +1147,32 @@ index ed758aa..73968be 100644 fserrP->width = pamP->width; MALLOCARRAY(fserrP->thiserr, pamP->depth); -@@ -505,6 +506,7 @@ floydInitRow(struct pam * const pamP, struct Fserr * const fserrP) { +@@ -506,6 +507,7 @@ floydInitRow(struct pam * const pamP, - int col; + unsigned int col; + overflow_add(pamP->width, 2); for (col = 0; col < pamP->width + 2; ++col) { unsigned int plane; for (plane = 0; plane < pamP->depth; ++plane) -diff --git a/editor/pnmscalefixed.c b/editor/pnmscalefixed.c -index 884ca31..747cd8f 100644 ---- a/editor/pnmscalefixed.c -+++ b/editor/pnmscalefixed.c -@@ -214,6 +214,7 @@ compute_output_dimensions(const struct cmdline_info cmdline, +diff -urNp a/editor/pnmremap.c.rej b/editor/pnmremap.c.rej +--- a/editor/pnmremap.c.rej 1970-01-01 01:00:00.000000000 +0100 ++++ b/editor/pnmremap.c.rej 2018-07-23 15:05:03.046265802 +0200 +@@ -0,0 +1,10 @@ ++--- editor/pnmremap.c +++++ editor/pnmremap.c ++@@ -506,6 +507,7 @@ floydInitRow(struct pam * const pamP, struct Fserr * const fserrP) { ++ ++ int col; ++ +++ overflow_add(pamP->width, 2); ++ for (col = 0; col < pamP->width + 2; ++col) { ++ unsigned int plane; ++ for (plane = 0; plane < pamP->depth; ++plane) +diff -urNp a/editor/pnmscalefixed.c b/editor/pnmscalefixed.c +--- a/editor/pnmscalefixed.c 2018-07-23 15:03:21.365486816 +0200 ++++ b/editor/pnmscalefixed.c 2018-07-23 15:05:03.046265802 +0200 +@@ -214,6 +214,7 @@ compute_output_dimensions(const struct c const int rows, const int cols, int * newrowsP, int * newcolsP) { @@ -1167,7 +1180,7 @@ index 884ca31..747cd8f 100644 if (cmdline.pixels) { if (rows * cols <= cmdline.pixels) { *newrowsP = rows; -@@ -265,6 +266,8 @@ compute_output_dimensions(const struct cmdline_info cmdline, +@@ -265,6 +266,8 @@ compute_output_dimensions(const struct c if (*newcolsP < 1) *newcolsP = 1; if (*newrowsP < 1) *newrowsP = 1; @@ -1186,11 +1199,10 @@ index 884ca31..747cd8f 100644 sxscale = SCALE * newcols / cols; syscale = SCALE * newrows / rows; -diff --git a/editor/ppmdither.c b/editor/ppmdither.c -index ec1b977..e701e09 100644 ---- a/editor/ppmdither.c -+++ b/editor/ppmdither.c -@@ -356,6 +356,11 @@ dithMatrix(unsigned int const dithPower) { +diff -urNp a/editor/ppmdither.c b/editor/ppmdither.c +--- a/editor/ppmdither.c 2018-07-23 15:03:21.363486820 +0200 ++++ b/editor/ppmdither.c 2018-07-23 15:05:03.046265802 +0200 +@@ -356,6 +356,11 @@ dithMatrix(unsigned int const dithPower) (dithDim * sizeof(*dithMat)) + /* pointers */ (dithDim * dithDim * sizeof(**dithMat)); /* data */ @@ -1202,10 +1214,9 @@ index ec1b977..e701e09 100644 dithMat = malloc(dithMatSize); if (dithMat == NULL) -diff --git a/editor/specialty/pamoil.c b/editor/specialty/pamoil.c -index 6cb8d3a..6f4bde9 100644 ---- a/editor/specialty/pamoil.c -+++ b/editor/specialty/pamoil.c +diff -urNp a/editor/specialty/pamoil.c b/editor/specialty/pamoil.c +--- a/editor/specialty/pamoil.c 2018-07-23 15:03:21.366486814 +0200 ++++ b/editor/specialty/pamoil.c 2018-07-23 15:05:03.045265804 +0200 @@ -112,6 +112,7 @@ main(int argc, char *argv[] ) { tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type)); pm_close(ifp); @@ -1214,11 +1225,10 @@ index 6cb8d3a..6f4bde9 100644 MALLOCARRAY(hist, inpam.maxval + 1); if (hist == NULL) pm_error("Unable to allocate memory for histogram."); -diff --git a/lib/libpam.c b/lib/libpam.c -index fa1be8f..e5cef1a 100644 ---- a/lib/libpam.c -+++ b/lib/libpam.c -@@ -225,7 +225,8 @@ allocPamRow(const struct pam * const pamP) { +diff -urNp a/lib/libpam.c b/lib/libpam.c +--- a/lib/libpam.c 2018-07-23 15:03:21.373486799 +0200 ++++ b/lib/libpam.c 2018-07-23 15:05:03.050265793 +0200 +@@ -225,7 +225,8 @@ allocPamRow(const struct pam * const pam unsigned int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample); tuple * tuplerow; @@ -1228,11 +1238,10 @@ index fa1be8f..e5cef1a 100644 if (tuplerow != NULL) { /* Now we initialize the pointers to the individual tuples -diff --git a/lib/libpammap.c b/lib/libpammap.c -index 2222491..ba27a4c 100644 ---- a/lib/libpammap.c -+++ b/lib/libpammap.c -@@ -108,7 +108,9 @@ allocTupleIntListItem(struct pam * const pamP) { +diff -urNp a/lib/libpammap.c b/lib/libpammap.c +--- a/lib/libpammap.c 2018-07-23 15:03:21.373486799 +0200 ++++ b/lib/libpammap.c 2018-07-23 15:05:03.050265793 +0200 +@@ -108,7 +108,9 @@ allocTupleIntListItem(struct pam * const */ struct tupleint_list_item * retval; @@ -1243,11 +1252,10 @@ index 2222491..ba27a4c 100644 sizeof(*retval) - sizeof(retval->tupleint.tuple) + pamP->depth * sizeof(sample); -diff --git a/lib/libpm.c b/lib/libpm.c -index f9aa1ae..36c49c7 100644 ---- a/lib/libpm.c -+++ b/lib/libpm.c -@@ -888,5 +888,53 @@ pm_parse_height(const char * const arg) { +diff -urNp a/lib/libpm.c b/lib/libpm.c +--- a/lib/libpm.c 2018-07-23 15:03:21.372486801 +0200 ++++ b/lib/libpm.c 2018-07-23 15:05:03.050265793 +0200 +@@ -888,5 +888,53 @@ pm_parse_height(const char * const arg) return height; } @@ -1301,11 +1309,10 @@ index f9aa1ae..36c49c7 100644 + return realloc(a, b*c); +} -diff --git a/lib/pm.h b/lib/pm.h -index 47cbfe8..5005df2 100644 ---- a/lib/pm.h -+++ b/lib/pm.h -@@ -434,5 +434,12 @@ pm_parse_height(const char * const arg); +diff -urNp a/lib/pm.h b/lib/pm.h +--- a/lib/pm.h 2018-07-23 15:03:21.376486792 +0200 ++++ b/lib/pm.h 2018-07-23 15:05:03.050265793 +0200 +@@ -435,5 +435,12 @@ pm_parse_height(const char * const arg); } #endif @@ -1318,11 +1325,10 @@ index 47cbfe8..5005df2 100644 + #endif -diff --git a/other/pnmcolormap.c b/other/pnmcolormap.c -index 57db432..7195295 100644 ---- a/other/pnmcolormap.c -+++ b/other/pnmcolormap.c -@@ -840,6 +840,7 @@ colormapToSquare(struct pam * const pamP, +diff -urNp a/other/pnmcolormap.c b/other/pnmcolormap.c +--- a/other/pnmcolormap.c 2018-07-23 15:03:21.362486822 +0200 ++++ b/other/pnmcolormap.c 2018-07-23 15:05:03.041265812 +0200 +@@ -840,6 +840,7 @@ colormapToSquare(struct pam * const pamP pamP->width = intsqrt; else pamP->width = intsqrt + 1; @@ -1330,61 +1336,9 @@ index 57db432..7195295 100644 } { unsigned int const intQuotient = colormap.size / pamP->width; -diff --git a/urt/Runput.c b/urt/Runput.c -index 3bc562a..645a376 100644 ---- a/urt/Runput.c -+++ b/urt/Runput.c -@@ -202,10 +202,11 @@ RunSetup(rle_hdr * the_hdr) - if ( the_hdr->background != 0 ) - { - register int i; -- register rle_pixel *background = -- (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) ); -- register int *bg_color; -- /* -+ register rle_pixel *background; -+ register int *bg_color; -+ -+ overflow_add(the_hdr->ncolors,1); -+ background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) ); /* - * If even number of bg color bytes, put out one more to get to - * 16 bit boundary. - */ -@@ -224,7 +225,7 @@ RunSetup(rle_hdr * the_hdr) - /* Big-endian machines are harder */ - register int i, nmap = (1 << the_hdr->cmaplen) * - the_hdr->ncmap; -- register char *h_cmap = (char *)malloc( nmap * 2 ); -+ register char *h_cmap = (char *)malloc2( nmap, 2 ); - if ( h_cmap == NULL ) - { - fprintf( stderr, -diff --git a/urt/rle.h b/urt/rle.h -index 0766d22..c80a5fa 100644 ---- a/urt/rle.h -+++ b/urt/rle.h -@@ -160,6 +160,17 @@ rle_hdr /* End of typedef. */ - */ - extern rle_hdr rle_dflt_hdr; - -+/* -+ * Provided by pm library -+ */ -+ -+extern void overflow_add(int, int); -+#define overflow2(a,b) __overflow2(a,b) -+extern void __overflow2(int, int); -+extern void overflow3(int, int, int); -+extern void *malloc2(int, int); -+extern void *malloc3(int, int, int); -+extern void *realloc2(void *, int, int); - - /* Declare RLE library routines. */ - -diff --git a/urt/rle_addhist.c b/urt/rle_addhist.c -index b165175..e09ed94 100644 ---- a/urt/rle_addhist.c -+++ b/urt/rle_addhist.c +diff -urNp a/urt/rle_addhist.c b/urt/rle_addhist.c +--- a/urt/rle_addhist.c 2018-07-23 15:03:21.419486699 +0200 ++++ b/urt/rle_addhist.c 2018-07-23 15:05:03.072265745 +0200 @@ -70,13 +70,18 @@ rle_addhist(char * argv[], return; @@ -1418,10 +1372,9 @@ index b165175..e09ed94 100644 ++length; /*Cater for the null. */ -diff --git a/urt/rle_getrow.c b/urt/rle_getrow.c -index 679811c..cc1f5cb 100644 ---- a/urt/rle_getrow.c -+++ b/urt/rle_getrow.c +diff -urNp a/urt/rle_getrow.c b/urt/rle_getrow.c +--- a/urt/rle_getrow.c 2018-07-23 15:03:21.418486701 +0200 ++++ b/urt/rle_getrow.c 2018-07-23 15:05:03.072265745 +0200 @@ -160,6 +160,7 @@ rle_get_setup(rle_hdr * const the_hdr) { char * cp; @@ -1430,10 +1383,30 @@ index 679811c..cc1f5cb 100644 evenlen = (comlen + 1) & ~1; /* make it even */ if (evenlen) { MALLOCARRAY(comment_buf, evenlen); -diff --git a/urt/rle_hdr.c b/urt/rle_hdr.c -index 1611324..7c9c010 100644 ---- a/urt/rle_hdr.c -+++ b/urt/rle_hdr.c +diff -urNp a/urt/rle.h b/urt/rle.h +--- a/urt/rle.h 2018-07-23 15:03:21.418486701 +0200 ++++ b/urt/rle.h 2018-07-23 15:05:03.072265745 +0200 +@@ -161,6 +161,17 @@ rle_hdr /* End of typedef. * + */ + extern rle_hdr rle_dflt_hdr; + ++/* ++ * Provided by pm library ++ */ ++ ++extern void overflow_add(int, int); ++#define overflow2(a,b) __overflow2(a,b) ++extern void __overflow2(int, int); ++extern void overflow3(int, int, int); ++extern void *malloc2(int, int); ++extern void *malloc3(int, int, int); ++extern void *realloc2(void *, int, int); + + /* Declare RLE library routines. */ + +diff -urNp a/urt/rle_hdr.c b/urt/rle_hdr.c +--- a/urt/rle_hdr.c 2018-07-23 15:03:21.418486701 +0200 ++++ b/urt/rle_hdr.c 2018-07-23 15:05:03.072265745 +0200 @@ -80,7 +80,10 @@ int img_num; /* Fill in with copies of the strings. */ if ( the_hdr->cmd != pgmname ) @@ -1495,11 +1468,10 @@ index 1611324..7c9c010 100644 size *= sizeof(char *); to_hdr->comments = (CONST_DECL char **)malloc( size ); RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" ); -diff --git a/urt/rle_open_f.c b/urt/rle_open_f.c -index ae8548b..c2ef37d 100644 ---- a/urt/rle_open_f.c -+++ b/urt/rle_open_f.c -@@ -163,65 +163,7 @@ dealWithSubprocess(const char * const file_name, +diff -urNp a/urt/rle_open_f.c b/urt/rle_open_f.c +--- a/urt/rle_open_f.c 2018-07-23 15:03:21.418486701 +0200 ++++ b/urt/rle_open_f.c 2018-07-23 15:05:03.072265745 +0200 +@@ -163,65 +163,7 @@ dealWithSubprocess(const char * const f FILE ** const fpP, bool * const noSubprocessP, const char ** const errorP) { @@ -1565,10 +1537,9 @@ index ae8548b..c2ef37d 100644 } -diff --git a/urt/rle_putcom.c b/urt/rle_putcom.c -index ab2eb20..ce83615 100644 ---- a/urt/rle_putcom.c -+++ b/urt/rle_putcom.c +diff -urNp a/urt/rle_putcom.c b/urt/rle_putcom.c +--- a/urt/rle_putcom.c 2018-07-23 15:03:21.418486701 +0200 ++++ b/urt/rle_putcom.c 2018-07-23 15:05:03.072265745 +0200 @@ -98,12 +98,14 @@ rle_putcom(const char * const value, const char * v; const char ** old_comments; @@ -1585,10 +1556,37 @@ index ab2eb20..ce83615 100644 /* Not found */ /* Can't realloc because somebody else might be pointing to this * comments block. Of course, if this were true, then the -diff --git a/urt/scanargs.c b/urt/scanargs.c -index f3af334..5e114bb 100644 ---- a/urt/scanargs.c -+++ b/urt/scanargs.c +diff -urNp a/urt/Runput.c b/urt/Runput.c +--- a/urt/Runput.c 2018-07-23 15:03:21.418486701 +0200 ++++ b/urt/Runput.c 2018-07-23 15:05:03.072265745 +0200 +@@ -202,10 +202,11 @@ RunSetup(rle_hdr * the_hdr) + if ( the_hdr->background != 0 ) + { + register int i; +- register rle_pixel *background = +- (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) ); +- register int *bg_color; +- /* ++ register rle_pixel *background; ++ register int *bg_color; ++ ++ overflow_add(the_hdr->ncolors,1); ++ background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) ); /* + * If even number of bg color bytes, put out one more to get to + * 16 bit boundary. + */ +@@ -224,7 +225,7 @@ RunSetup(rle_hdr * the_hdr) + /* Big-endian machines are harder */ + register int i, nmap = (1 << the_hdr->cmaplen) * + the_hdr->ncmap; +- register char *h_cmap = (char *)malloc( nmap * 2 ); ++ register char *h_cmap = (char *)malloc2( nmap, 2 ); + if ( h_cmap == NULL ) + { + fprintf( stderr, +diff -urNp a/urt/scanargs.c b/urt/scanargs.c +--- a/urt/scanargs.c 2018-07-23 15:03:21.418486701 +0200 ++++ b/urt/scanargs.c 2018-07-23 15:05:03.072265745 +0200 @@ -62,9 +62,8 @@ typedef int *ptr; /* * Storage allocation macros diff --git a/netpbm.spec b/netpbm.spec index 3882cb9..7541722 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -1,7 +1,7 @@ Summary: A library for handling different graphics file formats Name: netpbm -Version: 10.82.00 -Release: 4%{?dist} +Version: 10.83.01 +Release: 1%{?dist} # See copyright_summary for details License: BSD and GPLv2 and IJG and MIT and Public Domain URL: http://netpbm.sourceforge.net/ @@ -31,7 +31,8 @@ Patch15: netpbm-cmuwtopbm.patch Patch16: netpbm-pamtojpeg2k.patch Patch17: netpbm-manfix.patch Patch18: netpbm-manual-pages.patch -BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex + +BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex, gcc BuildRequires: libX11-devel, perl-generators, python3, jasper-devel, libxml2-devel %if (0%{?fedora} && 0%{?fedora} < 28) || (0%{?rhel} || 0%{?rhel} <= 7) BuildRequires: ghostscript-core @@ -225,6 +226,9 @@ popd %doc userguide/* %changelog +* Mon Jul 23 2018 Josef Ridky - 10.83.01-1 +- New upstream release 10.83.01 (#1596970) + * Fri Jul 13 2018 Fedora Release Engineering - 10.82.00-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild