From ec34bc4aebd0f1451cf1e61b57d1dc50be030793 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Fri, 12 Sep 2014 00:21:01 +0200 Subject: [PATCH] netpbm: update to 10.67.05; grab from SVN. --- .../netpbm/patches/netpbm-CAN-2005-2471.patch | 4 +- .../netpbm/patches/netpbm-security-code.patch | 552 +++++++++--------- .../patches/netpbm-security-scripts.patch | 34 +- srcpkgs/netpbm/template | 28 +- 4 files changed, 307 insertions(+), 311 deletions(-) diff --git a/srcpkgs/netpbm/patches/netpbm-CAN-2005-2471.patch b/srcpkgs/netpbm/patches/netpbm-CAN-2005-2471.patch index 0139cbd162a..3759d7ebef2 100644 --- a/srcpkgs/netpbm/patches/netpbm-CAN-2005-2471.patch +++ b/srcpkgs/netpbm/patches/netpbm-CAN-2005-2471.patch @@ -1,5 +1,5 @@ ---- converter/other/pstopnm.c.CAN-2005-2471 2005-08-15 02:39:46.000000000 +0200 -+++ converter/other/pstopnm.c 2005-08-16 15:38:15.000000000 +0200 +--- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471 2005-08-15 02:39:46.000000000 +0200 ++++ netpbm-10.29/converter/other/pstopnm.c 2005-08-16 15:38:15.000000000 +0200 @@ -711,11 +711,11 @@ ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, textalphabitsopt, diff --git a/srcpkgs/netpbm/patches/netpbm-security-code.patch b/srcpkgs/netpbm/patches/netpbm-security-code.patch index 87009709d42..348925a3d5b 100644 --- a/srcpkgs/netpbm/patches/netpbm-security-code.patch +++ b/srcpkgs/netpbm/patches/netpbm-security-code.patch @@ -1,6 +1,6 @@ -diff -up analyzer/pgmtexture.c.security-code analyzer/pgmtexture.c ---- analyzer/pgmtexture.c.security-code 2012-04-09 15:31:32.000000000 +0200 -+++ analyzer/pgmtexture.c 2012-04-09 15:40:03.183620040 +0200 +diff -up netpbm-10.58.01/analyzer/pgmtexture.c.security-code netpbm-10.58.01/analyzer/pgmtexture.c +--- netpbm-10.58.01/analyzer/pgmtexture.c.security-code 2012-04-09 15:31:32.000000000 +0200 ++++ netpbm-10.58.01/analyzer/pgmtexture.c 2012-04-09 15:40:03.183620040 +0200 @@ -97,7 +97,7 @@ vector(unsigned int const nl, float * v; @@ -27,9 +27,9 @@ diff -up analyzer/pgmtexture.c.security-code analyzer/pgmtexture.c /* allocate rows and set pointers to them */ for (i = nrl; i <= nrh; ++i) { MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1)); -diff -up converter/other/gemtopnm.c.security-code converter/other/gemtopnm.c ---- converter/other/gemtopnm.c.security-code 2012-04-09 15:31:42.000000000 +0200 -+++ converter/other/gemtopnm.c 2012-04-09 15:40:03.183620040 +0200 +diff -up netpbm-10.58.01/converter/other/gemtopnm.c.security-code netpbm-10.58.01/converter/other/gemtopnm.c +--- netpbm-10.58.01/converter/other/gemtopnm.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/other/gemtopnm.c 2012-04-09 15:40:03.183620040 +0200 @@ -106,6 +106,7 @@ main(argc, argv) pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 ); @@ -38,9 +38,9 @@ diff -up converter/other/gemtopnm.c.security-code converter/other/gemtopnm.c { /* allocate input row data structure */ int plane; -diff -up converter/other/jpegtopnm.c.security-code converter/other/jpegtopnm.c ---- converter/other/jpegtopnm.c.security-code 2012-04-09 15:31:40.000000000 +0200 -+++ converter/other/jpegtopnm.c 2012-04-09 15:40:03.184620028 +0200 +diff -up netpbm-10.58.01/converter/other/jpegtopnm.c.security-code netpbm-10.58.01/converter/other/jpegtopnm.c +--- netpbm-10.58.01/converter/other/jpegtopnm.c.security-code 2012-04-09 15:31:40.000000000 +0200 ++++ netpbm-10.58.01/converter/other/jpegtopnm.c 2012-04-09 15:40:03.184620028 +0200 @@ -861,6 +861,8 @@ convertImage(FILE * /* Calculate output image dimensions so we can allocate space */ jpeg_calc_output_dimensions(cinfoP); @@ -50,9 +50,9 @@ diff -up converter/other/jpegtopnm.c.security-code converter/other/jpegtopnm.c /* Start decompressor */ jpeg_start_decompress(cinfoP); -diff -up converter/other/pbmtopgm.c.security-code converter/other/pbmtopgm.c ---- converter/other/pbmtopgm.c.security-code 2012-04-09 15:31:42.000000000 +0200 -+++ converter/other/pbmtopgm.c 2012-04-09 15:40:03.184620028 +0200 +diff -up netpbm-10.58.01/converter/other/pbmtopgm.c.security-code netpbm-10.58.01/converter/other/pbmtopgm.c +--- netpbm-10.58.01/converter/other/pbmtopgm.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/other/pbmtopgm.c 2012-04-09 15:40:03.184620028 +0200 @@ -47,6 +47,7 @@ main(int argc, char *argv[]) { "than the image height (%u rows)", height, rows); @@ -61,9 +61,9 @@ diff -up converter/other/pbmtopgm.c.security-code converter/other/pbmtopgm.c maxval = MIN(PGM_OVERALLMAXVAL, width*height); pgm_writepgminit(stdout, cols, rows, maxval, 0) ; -diff -up converter/other/pnmtoddif.c.security-code converter/other/pnmtoddif.c ---- converter/other/pnmtoddif.c.security-code 2012-04-09 15:31:42.000000000 +0200 -+++ converter/other/pnmtoddif.c 2012-04-09 15:40:03.185620015 +0200 +diff -up netpbm-10.58.01/converter/other/pnmtoddif.c.security-code netpbm-10.58.01/converter/other/pnmtoddif.c +--- netpbm-10.58.01/converter/other/pnmtoddif.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/other/pnmtoddif.c 2012-04-09 15:40:03.185620015 +0200 @@ -632,6 +632,7 @@ main(int argc, char *argv[]) { switch (PNM_FORMAT_TYPE(format)) { case PBM_TYPE: @@ -80,9 +80,9 @@ diff -up converter/other/pnmtoddif.c.security-code converter/other/pnmtoddif.c ip.bytes_per_line = 3 * cols; ip.bits_per_pixel = 24; ip.spectral = 5; -diff -up converter/other/pnmtojpeg.c.security-code converter/other/pnmtojpeg.c ---- converter/other/pnmtojpeg.c.security-code 2012-04-09 15:31:39.000000000 +0200 -+++ converter/other/pnmtojpeg.c 2012-04-09 15:40:03.186620002 +0200 +diff -up netpbm-10.58.01/converter/other/pnmtojpeg.c.security-code netpbm-10.58.01/converter/other/pnmtojpeg.c +--- netpbm-10.58.01/converter/other/pnmtojpeg.c.security-code 2012-04-09 15:31:39.000000000 +0200 ++++ netpbm-10.58.01/converter/other/pnmtojpeg.c 2012-04-09 15:40:03.186620002 +0200 @@ -605,7 +605,11 @@ read_scan_script(j_compress_ptr const ci want JPOOL_PERMANENT. */ @@ -113,9 +113,9 @@ diff -up converter/other/pnmtojpeg.c.security-code converter/other/pnmtojpeg.c buffer = (*cinfo_p->mem->alloc_sarray) ((j_common_ptr) cinfo_p, JPOOL_IMAGE, (unsigned int) cinfo_p->image_width * cinfo_p->input_components, -diff -up converter/other/pnmtops.c.security-code converter/other/pnmtops.c ---- converter/other/pnmtops.c.security-code 2012-04-09 15:31:40.000000000 +0200 -+++ converter/other/pnmtops.c 2012-04-09 15:40:03.187619989 +0200 +diff -up netpbm-10.58.01/converter/other/pnmtops.c.security-code netpbm-10.58.01/converter/other/pnmtops.c +--- netpbm-10.58.01/converter/other/pnmtops.c.security-code 2012-04-09 15:31:40.000000000 +0200 ++++ netpbm-10.58.01/converter/other/pnmtops.c 2012-04-09 15:40:03.187619989 +0200 @@ -256,17 +256,21 @@ parseCommandLine(int argc, const char ** validateCompDimension(width, 72, "-width value"); validateCompDimension(height, 72, "-height value"); @@ -139,9 +139,9 @@ diff -up converter/other/pnmtops.c.security-code converter/other/pnmtops.c cmdlineP->imageheight = imageheight * 72; } else -diff -up converter/other/pnmtorle.c.security-code converter/other/pnmtorle.c ---- converter/other/pnmtorle.c.security-code 2012-04-09 15:31:42.000000000 +0200 -+++ converter/other/pnmtorle.c 2012-04-09 15:40:03.188619976 +0200 +diff -up netpbm-10.58.01/converter/other/pnmtorle.c.security-code netpbm-10.58.01/converter/other/pnmtorle.c +--- netpbm-10.58.01/converter/other/pnmtorle.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/other/pnmtorle.c 2012-04-09 15:40:03.188619976 +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, @@ -151,29 +151,9 @@ diff -up converter/other/pnmtorle.c.security-code converter/other/pnmtorle.c */ /* * pnmtorle - A program which will convert pbmplus (ppm or pgm) images -diff -up converter/other/pnmtosgi.c.security-code converter/other/pnmtosgi.c ---- converter/other/pnmtosgi.c.security-code 2012-04-09 15:31:42.000000000 +0200 -+++ converter/other/pnmtosgi.c 2012-04-09 15:40:03.188619976 +0200 -@@ -254,6 +254,7 @@ build_channels(FILE * const ifp, int con - #endif - - if( storage != STORAGE_VERBATIM ) { -+ overflow2(channels, rows); - MALLOCARRAY_NOFAIL(table, channels * rows); - MALLOCARRAY_NOFAIL(rletemp, WORSTCOMPR(cols)); - } -@@ -306,6 +307,8 @@ compress(ScanElem * temp, - break; - case STORAGE_RLE: - tabrow = chan_no * rows + row; -+ overflow2(chan_no, rows); -+ overflow_add(chan_no* rows, row); - len = rle_compress(temp, cols); /* writes result into rletemp */ - channel[chan_no][row].length = len; - MALLOCARRAY(p, len); -diff -up converter/other/rletopnm.c.security-code converter/other/rletopnm.c ---- converter/other/rletopnm.c.security-code 2012-04-09 15:31:42.000000000 +0200 -+++ converter/other/rletopnm.c 2012-04-09 15:40:03.189619963 +0200 +diff -up netpbm-10.58.01/converter/other/rletopnm.c.security-code netpbm-10.58.01/converter/other/rletopnm.c +--- netpbm-10.58.01/converter/other/rletopnm.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/other/rletopnm.c 2012-04-09 15:40:03.189619963 +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, @@ -183,28 +163,9 @@ diff -up converter/other/rletopnm.c.security-code converter/other/rletopnm.c */ /* * rletopnm - A conversion program to convert from Utah's "rle" image format -diff -up converter/other/sgitopnm.c.security-code converter/other/sgitopnm.c ---- converter/other/sgitopnm.c.security-code 2012-04-09 15:31:42.000000000 +0200 -+++ converter/other/sgitopnm.c 2012-04-09 15:40:03.189619963 +0200 -@@ -359,10 +359,14 @@ readChannels(FILE * const ifP, - MALLOCARRAY_NOFAIL(image, head->ysize); - } else { - maxchannel = MIN(3, head->zsize); -+ overflow2(head->ysize, maxchannel); - MALLOCARRAY_NOFAIL(image, head->ysize * maxchannel); - } -- if (table) -+ if (table) { -+ overflow2(head->xsize, 2); -+ overflow_add(head->xsize*2, 2); - MALLOCARRAY_NOFAIL(temp, WORSTCOMPR(head->xsize)); -+ } - - for (channel = 0; channel < maxchannel; ++channel) { - unsigned int row; -diff -up converter/other/sirtopnm.c.security-code converter/other/sirtopnm.c ---- converter/other/sirtopnm.c.security-code 2012-04-09 15:31:42.000000000 +0200 -+++ converter/other/sirtopnm.c 2012-04-09 15:40:03.190619951 +0200 +diff -up netpbm-10.58.01/converter/other/sirtopnm.c.security-code netpbm-10.58.01/converter/other/sirtopnm.c +--- netpbm-10.58.01/converter/other/sirtopnm.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/other/sirtopnm.c 2012-04-09 15:40:03.190619951 +0200 @@ -69,6 +69,7 @@ char* argv[]; } break; @@ -213,9 +174,9 @@ diff -up converter/other/sirtopnm.c.security-code converter/other/sirtopnm.c picsize = cols * rows * 3; planesize = cols * rows; if ( !( sirarray = (unsigned char*) malloc( picsize ) ) ) -diff -up converter/other/tifftopnm.c.security-code converter/other/tifftopnm.c ---- converter/other/tifftopnm.c.security-code 2012-04-09 15:31:42.000000000 +0200 -+++ converter/other/tifftopnm.c 2012-04-09 15:40:03.191619939 +0200 +diff -up netpbm-10.58.01/converter/other/tifftopnm.c.security-code netpbm-10.58.01/converter/other/tifftopnm.c +--- netpbm-10.58.01/converter/other/tifftopnm.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/other/tifftopnm.c 2012-04-09 15:40:03.191619939 +0200 @@ -1279,7 +1279,9 @@ convertRasterByRows(pnmOut * const if (scanbuf == NULL) pm_error("can't allocate memory for scanline buffer"); @@ -227,9 +188,9 @@ diff -up converter/other/tifftopnm.c.security-code converter/other/tifftopnm.c if (samplebuf == NULL) pm_error("can't allocate memory for row buffer"); -diff -up converter/other/xwdtopnm.c.security-code converter/other/xwdtopnm.c ---- converter/other/xwdtopnm.c.security-code 2012-04-09 15:31:40.000000000 +0200 -+++ converter/other/xwdtopnm.c 2012-04-09 15:40:03.192619927 +0200 +diff -up netpbm-10.58.01/converter/other/xwdtopnm.c.security-code netpbm-10.58.01/converter/other/xwdtopnm.c +--- netpbm-10.58.01/converter/other/xwdtopnm.c.security-code 2012-04-09 15:31:40.000000000 +0200 ++++ netpbm-10.58.01/converter/other/xwdtopnm.c 2012-04-09 15:40:03.192619927 +0200 @@ -209,6 +209,10 @@ processX10Header(X10WDFileHeader * cons *colorsP = pnm_allocrow(2); PNM_ASSIGN1((*colorsP)[0], 0); @@ -249,9 +210,9 @@ diff -up converter/other/xwdtopnm.c.security-code converter/other/xwdtopnm.c *padrightP = h11FixedP->bytes_per_line * 8 - h11FixedP->pixmap_width * h11FixedP->bits_per_pixel; -diff -up converter/pbm/mdatopbm.c.security-code converter/pbm/mdatopbm.c ---- converter/pbm/mdatopbm.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ converter/pbm/mdatopbm.c 2012-04-09 15:40:03.192619927 +0200 +diff -up netpbm-10.58.01/converter/pbm/mdatopbm.c.security-code netpbm-10.58.01/converter/pbm/mdatopbm.c +--- netpbm-10.58.01/converter/pbm/mdatopbm.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/mdatopbm.c 2012-04-09 15:40:03.192619927 +0200 @@ -245,10 +245,13 @@ main(int argc, char **argv) { pm_readlittleshort(infile, &yy); nInCols = yy; } @@ -267,9 +228,9 @@ diff -up converter/pbm/mdatopbm.c.security-code converter/pbm/mdatopbm.c data = pbm_allocarray(nOutCols, nOutRows); -diff -up converter/pbm/mgrtopbm.c.security-code converter/pbm/mgrtopbm.c ---- converter/pbm/mgrtopbm.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ converter/pbm/mgrtopbm.c 2012-04-09 15:40:03.193619915 +0200 +diff -up netpbm-10.58.01/converter/pbm/mgrtopbm.c.security-code netpbm-10.58.01/converter/pbm/mgrtopbm.c +--- netpbm-10.58.01/converter/pbm/mgrtopbm.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/mgrtopbm.c 2012-04-09 15:40:03.193619915 +0200 @@ -65,6 +65,8 @@ readMgrHeader(FILE * const ifP, if (head.h_high < ' ' || head.l_high < ' ') pm_error("Invalid width field in MGR header"); @@ -279,9 +240,9 @@ diff -up converter/pbm/mgrtopbm.c.security-code converter/pbm/mgrtopbm.c *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 -up converter/pbm/pbmtogem.c.security-code converter/pbm/pbmtogem.c ---- converter/pbm/pbmtogem.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ converter/pbm/pbmtogem.c 2012-04-09 15:40:03.193619915 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmtogem.c.security-code netpbm-10.58.01/converter/pbm/pbmtogem.c +--- netpbm-10.58.01/converter/pbm/pbmtogem.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtogem.c 2012-04-09 15:40:03.193619915 +0200 @@ -79,6 +79,7 @@ putinit (int const rows, int const cols) bitsperitem = 0; bitshift = 7; @@ -290,9 +251,9 @@ diff -up converter/pbm/pbmtogem.c.security-code converter/pbm/pbmtogem.c outmax = (cols + 7) / 8; outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char)); lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char)); -diff -up converter/pbm/pbmtogo.c.security-code converter/pbm/pbmtogo.c ---- converter/pbm/pbmtogo.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ converter/pbm/pbmtogo.c 2012-04-09 15:40:03.193619915 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmtogo.c.security-code netpbm-10.58.01/converter/pbm/pbmtogo.c +--- netpbm-10.58.01/converter/pbm/pbmtogo.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtogo.c 2012-04-09 15:40:03.193619915 +0200 @@ -158,6 +158,7 @@ main(int argc, bitrow = pbm_allocrow(cols); @@ -301,9 +262,9 @@ diff -up converter/pbm/pbmtogo.c.security-code converter/pbm/pbmtogo.c rucols = ( cols + 7 ) / 8; bytesperrow = rucols; /* GraphOn uses bytes */ rucols = rucols * 8; -diff -up converter/pbm/pbmtolj.c.security-code converter/pbm/pbmtolj.c ---- converter/pbm/pbmtolj.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ converter/pbm/pbmtolj.c 2012-04-09 15:40:03.194619902 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmtolj.c.security-code netpbm-10.58.01/converter/pbm/pbmtolj.c +--- netpbm-10.58.01/converter/pbm/pbmtolj.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtolj.c 2012-04-09 15:40:03.194619902 +0200 @@ -120,7 +120,11 @@ parseCommandLine(int argc, char ** argv, static void allocateBuffers(unsigned int const cols) { @@ -316,9 +277,9 @@ diff -up converter/pbm/pbmtolj.c.security-code converter/pbm/pbmtolj.c packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1; deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10; -diff -up converter/pbm/pbmtomacp.c.security-code converter/pbm/pbmtomacp.c ---- converter/pbm/pbmtomacp.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ converter/pbm/pbmtomacp.c 2012-04-09 15:40:03.195619889 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmtomacp.c.security-code netpbm-10.58.01/converter/pbm/pbmtomacp.c +--- netpbm-10.58.01/converter/pbm/pbmtomacp.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtomacp.c 2012-04-09 15:40:03.195619889 +0200 @@ -101,6 +101,7 @@ char *argv[]; if( !lflg ) left = 0; @@ -336,9 +297,9 @@ diff -up converter/pbm/pbmtomacp.c.security-code converter/pbm/pbmtomacp.c if( bflg ) { if( bottom - top >= MAX_LINES ) bottom = top + MAX_LINES - 1; -diff -up converter/pbm/pbmtomda.c.security-code converter/pbm/pbmtomda.c ---- converter/pbm/pbmtomda.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ converter/pbm/pbmtomda.c 2012-04-09 15:40:03.195619889 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmtomda.c.security-code netpbm-10.58.01/converter/pbm/pbmtomda.c +--- netpbm-10.58.01/converter/pbm/pbmtomda.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtomda.c 2012-04-09 15:40:03.195619889 +0200 @@ -179,6 +179,7 @@ int main(int argc, char **argv) nOutRowsUnrounded = bScale ? nInRows/2 : nInRows; @@ -347,9 +308,9 @@ diff -up converter/pbm/pbmtomda.c.security-code converter/pbm/pbmtomda.c nOutRows = ((nOutRowsUnrounded + 3) / 4) * 4; /* MDA wants rows a multiple of 4 */ nOutCols = nInCols / 8; -diff -up converter/pbm/pbmtoppa/pbm.c.security-code converter/pbm/pbmtoppa/pbm.c ---- converter/pbm/pbmtoppa/pbm.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ converter/pbm/pbmtoppa/pbm.c 2012-04-09 15:40:03.195619889 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmtoppa/pbm.c.security-code netpbm-10.58.01/converter/pbm/pbmtoppa/pbm.c +--- netpbm-10.58.01/converter/pbm/pbmtoppa/pbm.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtoppa/pbm.c 2012-04-09 15:40:03.195619889 +0200 @@ -105,6 +105,7 @@ int pbm_readline(pbm_stat* pbm,unsigned return 0; @@ -368,9 +329,9 @@ diff -up converter/pbm/pbmtoppa/pbm.c.security-code converter/pbm/pbmtoppa/pbm.c memcpy (pbm->revdata, data, (pbm->width+7)/8); pbm->current_line--; } -diff -up converter/pbm/pbmtoppa/pbmtoppa.c.security-code converter/pbm/pbmtoppa/pbmtoppa.c ---- converter/pbm/pbmtoppa/pbmtoppa.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ converter/pbm/pbmtoppa/pbmtoppa.c 2012-04-09 15:40:03.196619876 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmtoppa/pbmtoppa.c.security-code netpbm-10.58.01/converter/pbm/pbmtoppa/pbmtoppa.c +--- netpbm-10.58.01/converter/pbm/pbmtoppa/pbmtoppa.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtoppa/pbmtoppa.c 2012-04-09 15:40:03.196619876 +0200 @@ -441,6 +441,7 @@ main(int argc, char *argv[]) { pm_error("main(): unrecognized parameter '%s'", argv[argn]); } @@ -379,9 +340,9 @@ diff -up converter/pbm/pbmtoppa/pbmtoppa.c.security-code converter/pbm/pbmtoppa/ Pwidth=(Width+7)/8; printer.fptr=out; -diff -up converter/pbm/pbmtoxbm.c.security-code converter/pbm/pbmtoxbm.c ---- converter/pbm/pbmtoxbm.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ converter/pbm/pbmtoxbm.c 2012-04-09 15:40:03.196619876 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmtoxbm.c.security-code netpbm-10.58.01/converter/pbm/pbmtoxbm.c +--- netpbm-10.58.01/converter/pbm/pbmtoxbm.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtoxbm.c 2012-04-09 15:40:03.196619876 +0200 @@ -335,6 +335,8 @@ convertRaster(FILE * const ifP, unsigned char * bitrow; @@ -391,9 +352,9 @@ diff -up converter/pbm/pbmtoxbm.c.security-code converter/pbm/pbmtoxbm.c putinit(xbmVersion); -diff -up converter/pbm/pbmtoybm.c.security-code converter/pbm/pbmtoybm.c ---- converter/pbm/pbmtoybm.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ converter/pbm/pbmtoybm.c 2012-04-09 15:40:03.197619863 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmtoybm.c.security-code netpbm-10.58.01/converter/pbm/pbmtoybm.c +--- netpbm-10.58.01/converter/pbm/pbmtoybm.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtoybm.c 2012-04-09 15:40:03.197619863 +0200 @@ -113,6 +113,7 @@ main(int argc, const char *argv[]) { bitrow = pbm_allocrow(cols); @@ -402,9 +363,9 @@ diff -up converter/pbm/pbmtoybm.c.security-code converter/pbm/pbmtoybm.c padright = ((cols + 15) / 16) * 16 - cols; putinit(cols, rows); -diff -up converter/pbm/pbmtozinc.c.security-code converter/pbm/pbmtozinc.c ---- converter/pbm/pbmtozinc.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ converter/pbm/pbmtozinc.c 2012-04-09 15:40:03.197619863 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmtozinc.c.security-code netpbm-10.58.01/converter/pbm/pbmtozinc.c +--- netpbm-10.58.01/converter/pbm/pbmtozinc.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmtozinc.c 2012-04-09 15:40:03.197619863 +0200 @@ -65,6 +65,7 @@ main(int argc, char * argv[]) { bitrow = pbm_allocrow( cols ); @@ -413,9 +374,9 @@ diff -up converter/pbm/pbmtozinc.c.security-code converter/pbm/pbmtozinc.c padright = ( ( cols + 15 ) / 16 ) * 16 - cols; printf( "USHORT %s[] = {\n",name); -diff -up converter/pbm/pbmto10x.c.security-code converter/pbm/pbmto10x.c ---- converter/pbm/pbmto10x.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ converter/pbm/pbmto10x.c 2012-04-09 15:40:03.197619863 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmto10x.c.security-code netpbm-10.58.01/converter/pbm/pbmto10x.c +--- netpbm-10.58.01/converter/pbm/pbmto10x.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmto10x.c 2012-04-09 15:40:03.197619863 +0200 @@ -162,7 +162,7 @@ main(int argc, char * argv[]) { res_60x72(); @@ -425,9 +386,9 @@ diff -up converter/pbm/pbmto10x.c.security-code converter/pbm/pbmto10x.c } -diff -up converter/pbm/pbmto4425.c.security-code converter/pbm/pbmto4425.c ---- converter/pbm/pbmto4425.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ converter/pbm/pbmto4425.c 2012-04-09 15:40:03.198619851 +0200 +diff -up netpbm-10.58.01/converter/pbm/pbmto4425.c.security-code netpbm-10.58.01/converter/pbm/pbmto4425.c +--- netpbm-10.58.01/converter/pbm/pbmto4425.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pbmto4425.c 2012-04-09 15:40:03.198619851 +0200 @@ -2,6 +2,7 @@ #include "nstring.h" @@ -445,9 +406,9 @@ diff -up converter/pbm/pbmto4425.c.security-code converter/pbm/pbmto4425.c if(vmap == NULL) { pm_error( "Cannot allocate memory" ); -diff -up converter/pbm/pktopbm.c.security-code converter/pbm/pktopbm.c ---- converter/pbm/pktopbm.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ converter/pbm/pktopbm.c 2012-04-09 15:40:03.198619851 +0200 +diff -up netpbm-10.58.01/converter/pbm/pktopbm.c.security-code netpbm-10.58.01/converter/pbm/pktopbm.c +--- netpbm-10.58.01/converter/pbm/pktopbm.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/pktopbm.c 2012-04-09 15:40:03.198619851 +0200 @@ -277,6 +277,7 @@ main(int argc, char *argv[]) { if (flagbyte == 7) { /* long form preamble */ integer packetlength = get32() ; /* character packet length */ @@ -456,9 +417,9 @@ diff -up converter/pbm/pktopbm.c.security-code converter/pbm/pktopbm.c endofpacket = packetlength + pktopbm_pkloc; /* calculate end of packet */ if ((car >= MAXPKCHAR) || !filename[car]) { -diff -up converter/pbm/thinkjettopbm.l.security-code converter/pbm/thinkjettopbm.l ---- converter/pbm/thinkjettopbm.l.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ converter/pbm/thinkjettopbm.l 2012-04-09 15:40:03.199619839 +0200 +diff -up netpbm-10.58.01/converter/pbm/thinkjettopbm.l.security-code netpbm-10.58.01/converter/pbm/thinkjettopbm.l +--- netpbm-10.58.01/converter/pbm/thinkjettopbm.l.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/thinkjettopbm.l 2012-04-09 15:40:03.199619839 +0200 @@ -114,7 +114,9 @@ DIG [0-9] \033\*b{DIG}+W { int l; @@ -478,9 +439,9 @@ diff -up converter/pbm/thinkjettopbm.l.security-code converter/pbm/thinkjettopbm pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0); packed_bitrow = malloc(maxRowLength); -diff -up converter/pbm/ybmtopbm.c.security-code converter/pbm/ybmtopbm.c ---- converter/pbm/ybmtopbm.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ converter/pbm/ybmtopbm.c 2012-04-09 15:40:03.199619839 +0200 +diff -up netpbm-10.58.01/converter/pbm/ybmtopbm.c.security-code netpbm-10.58.01/converter/pbm/ybmtopbm.c +--- netpbm-10.58.01/converter/pbm/ybmtopbm.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/converter/pbm/ybmtopbm.c 2012-04-09 15:40:03.199619839 +0200 @@ -49,6 +49,7 @@ getinit(FILE * const ifP, pm_error("EOF / read error"); @@ -489,9 +450,9 @@ diff -up converter/pbm/ybmtopbm.c.security-code converter/pbm/ybmtopbm.c *padrightP = ((*colsP + 15) / 16) * 16 - *colsP; } -diff -up converter/pgm/lispmtopgm.c.security-code converter/pgm/lispmtopgm.c ---- converter/pgm/lispmtopgm.c.security-code 2012-04-09 15:31:42.000000000 +0200 -+++ converter/pgm/lispmtopgm.c 2012-04-09 15:40:03.199619839 +0200 +diff -up netpbm-10.58.01/converter/pgm/lispmtopgm.c.security-code netpbm-10.58.01/converter/pgm/lispmtopgm.c +--- netpbm-10.58.01/converter/pgm/lispmtopgm.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/pgm/lispmtopgm.c 2012-04-09 15:40:03.199619839 +0200 @@ -58,6 +58,7 @@ main( argc, argv ) pm_error( "depth (%d bits) is too large", depth); @@ -511,9 +472,9 @@ diff -up converter/pgm/lispmtopgm.c.security-code converter/pgm/lispmtopgm.c *padrightP = ( ( *colsP + 31 ) / 32 ) * 32 - *colsP; if ( *colsP != (cols_32 - *padrightP) ) { -diff -up converter/pgm/psidtopgm.c.security-code converter/pgm/psidtopgm.c ---- converter/pgm/psidtopgm.c.security-code 2012-04-09 15:31:42.000000000 +0200 -+++ converter/pgm/psidtopgm.c 2012-04-09 15:40:03.200619827 +0200 +diff -up netpbm-10.58.01/converter/pgm/psidtopgm.c.security-code netpbm-10.58.01/converter/pgm/psidtopgm.c +--- netpbm-10.58.01/converter/pgm/psidtopgm.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/pgm/psidtopgm.c 2012-04-09 15:40:03.200619827 +0200 @@ -78,6 +78,7 @@ main(int argc, pm_error("bits/sample (%d) is too large.", bitspersample); @@ -522,9 +483,9 @@ diff -up converter/pgm/psidtopgm.c.security-code converter/pgm/psidtopgm.c grayrow = pgm_allocrow((cols + 7) / 8 * 8); for (row = 0; row < rows; ++row) { unsigned int col; -diff -up converter/ppm/ilbmtoppm.c.security-code converter/ppm/ilbmtoppm.c ---- converter/ppm/ilbmtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 -+++ converter/ppm/ilbmtoppm.c 2012-04-09 15:40:03.201619815 +0200 +diff -up netpbm-10.58.01/converter/ppm/ilbmtoppm.c.security-code netpbm-10.58.01/converter/ppm/ilbmtoppm.c +--- netpbm-10.58.01/converter/ppm/ilbmtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ilbmtoppm.c 2012-04-09 15:40:03.201619815 +0200 @@ -592,6 +592,7 @@ decode_row(FILE * const ifP, rawtype *chp; @@ -595,9 +556,9 @@ diff -up converter/ppm/ilbmtoppm.c.security-code converter/ppm/ilbmtoppm.c MALLOCARRAY_NOFAIL(ilbmrow, RowBytes(bmhdP->w)); *viewportmodesP |= fakeviewport; /* -isham/-isehb */ -diff -up converter/ppm/imgtoppm.c.security-code converter/ppm/imgtoppm.c ---- converter/ppm/imgtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 -+++ converter/ppm/imgtoppm.c 2012-04-09 15:40:03.202619802 +0200 +diff -up netpbm-10.58.01/converter/ppm/imgtoppm.c.security-code netpbm-10.58.01/converter/ppm/imgtoppm.c +--- netpbm-10.58.01/converter/ppm/imgtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/imgtoppm.c 2012-04-09 15:40:03.202619802 +0200 @@ -84,6 +84,7 @@ main(int argc, char ** argv) { len = atoi((char*) buf ); if ( fread( buf, len, 1, ifp ) != 1 ) @@ -614,9 +575,9 @@ diff -up converter/ppm/imgtoppm.c.security-code converter/ppm/imgtoppm.c if ( len != cols * rows ) pm_message( "pixel data length (%d) does not match image size (%d)", -diff -up converter/ppm/Makefile.security-code converter/ppm/Makefile ---- converter/ppm/Makefile.security-code 2012-04-09 15:31:44.000000000 +0200 -+++ converter/ppm/Makefile 2012-04-09 15:40:03.202619802 +0200 +diff -up netpbm-10.58.01/converter/ppm/Makefile.security-code netpbm-10.58.01/converter/ppm/Makefile +--- netpbm-10.58.01/converter/ppm/Makefile.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/Makefile 2012-04-09 15:40:03.202619802 +0200 @@ -11,7 +11,7 @@ SUBDIRS = hpcdtoppm ppmtompeg PORTBINARIES = 411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \ @@ -626,9 +587,9 @@ diff -up converter/ppm/Makefile.security-code converter/ppm/Makefile ppmtoacad ppmtoapplevol ppmtoarbtxt ppmtoascii \ ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \ ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \ -diff -up converter/ppm/pcxtoppm.c.security-code converter/ppm/pcxtoppm.c ---- converter/ppm/pcxtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 -+++ converter/ppm/pcxtoppm.c 2012-04-09 15:40:03.203619789 +0200 +diff -up netpbm-10.58.01/converter/ppm/pcxtoppm.c.security-code netpbm-10.58.01/converter/ppm/pcxtoppm.c +--- netpbm-10.58.01/converter/ppm/pcxtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/pcxtoppm.c 2012-04-09 15:40:03.203619789 +0200 @@ -409,6 +409,7 @@ pcx_planes_to_pixels(pixels, bitplanes, /* * clear the pixel buffer @@ -645,18 +606,18 @@ diff -up converter/ppm/pcxtoppm.c.security-code converter/ppm/pcxtoppm.c rawcols = BytesPerLine * 8 / BitsPerPixel; if (headerCols > rawcols) { pm_message("warning - BytesPerLine = %d, " -diff -up converter/ppm/picttoppm.c.security-code converter/ppm/picttoppm.c ---- converter/ppm/picttoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 -+++ converter/ppm/picttoppm.c 2012-04-09 15:40:03.205619763 +0200 +diff -up netpbm-10.58.01/converter/ppm/picttoppm.c.security-code netpbm-10.58.01/converter/ppm/picttoppm.c +--- netpbm-10.58.01/converter/ppm/picttoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/picttoppm.c 2012-04-09 15:40:03.205619763 +0200 @@ -1,3 +1,5 @@ +#error "Unfixable. Don't ship me" + /* * picttoppm.c -- convert a MacIntosh PICT file to PPM format. * -diff -up converter/ppm/pjtoppm.c.security-code converter/ppm/pjtoppm.c ---- converter/ppm/pjtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 -+++ converter/ppm/pjtoppm.c 2012-04-09 15:40:03.206619751 +0200 +diff -up netpbm-10.58.01/converter/ppm/pjtoppm.c.security-code netpbm-10.58.01/converter/ppm/pjtoppm.c +--- netpbm-10.58.01/converter/ppm/pjtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/pjtoppm.c 2012-04-09 15:40:03.206619751 +0200 @@ -127,19 +127,21 @@ main(argc, argv) case 'V': /* send plane */ case 'W': /* send last plane */ @@ -706,9 +667,9 @@ diff -up converter/ppm/pjtoppm.c.security-code converter/ppm/pjtoppm.c cols *= 8; } -diff -up converter/ppm/ppmtoeyuv.c.security-code converter/ppm/ppmtoeyuv.c ---- converter/ppm/ppmtoeyuv.c.security-code 2012-04-09 15:31:42.000000000 +0200 -+++ converter/ppm/ppmtoeyuv.c 2012-04-09 15:40:03.206619751 +0200 +diff -up netpbm-10.58.01/converter/ppm/ppmtoeyuv.c.security-code netpbm-10.58.01/converter/ppm/ppmtoeyuv.c +--- netpbm-10.58.01/converter/ppm/ppmtoeyuv.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ppmtoeyuv.c 2012-04-09 15:40:03.206619751 +0200 @@ -114,6 +114,7 @@ create_multiplication_tables(const pixva int index; @@ -717,9 +678,9 @@ diff -up converter/ppm/ppmtoeyuv.c.security-code converter/ppm/ppmtoeyuv.c MALLOCARRAY_NOFAIL(mult299 , maxval+1); MALLOCARRAY_NOFAIL(mult587 , maxval+1); MALLOCARRAY_NOFAIL(mult114 , maxval+1); -diff -up converter/ppm/ppmtoicr.c.security-code converter/ppm/ppmtoicr.c ---- converter/ppm/ppmtoicr.c.security-code 2012-04-09 15:31:44.000000000 +0200 -+++ converter/ppm/ppmtoicr.c 2012-04-09 15:40:03.207619739 +0200 +diff -up netpbm-10.58.01/converter/ppm/ppmtoicr.c.security-code netpbm-10.58.01/converter/ppm/ppmtoicr.c +--- netpbm-10.58.01/converter/ppm/ppmtoicr.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ppmtoicr.c 2012-04-09 15:40:03.207619739 +0200 @@ -169,7 +169,7 @@ char* argv[]; if (rleflag) { @@ -729,9 +690,9 @@ diff -up converter/ppm/ppmtoicr.c.security-code converter/ppm/ppmtoicr.c p = testimage; for (i=0; i PCL_MAXVAL) @@ -856,9 +817,9 @@ diff -up converter/ppm/ppmtopjxl.c.security-code converter/ppm/ppmtopjxl.c inrow = (char *)malloc((unsigned)bpp); outrow = (char *)malloc((unsigned)bpp*2); runcnt = (signed char *)malloc((unsigned)bpp); -diff -up converter/ppm/ppmtowinicon.c.security-code converter/ppm/ppmtowinicon.c ---- converter/ppm/ppmtowinicon.c.security-code 2012-04-09 15:31:44.000000000 +0200 -+++ converter/ppm/ppmtowinicon.c 2012-04-09 15:40:03.213619664 +0200 +diff -up netpbm-10.58.01/converter/ppm/ppmtowinicon.c.security-code netpbm-10.58.01/converter/ppm/ppmtowinicon.c +--- netpbm-10.58.01/converter/ppm/ppmtowinicon.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ppmtowinicon.c 2012-04-09 15:40:03.213619664 +0200 @@ -12,6 +12,7 @@ #include @@ -902,9 +863,9 @@ diff -up converter/ppm/ppmtowinicon.c.security-code converter/ppm/ppmtowinicon.c entry->size_in_bytes = xorBitmap->size + andBitmap->size + 40 + (4 * entry->color_count); if (verbose) -diff -up converter/ppm/ppmtoxpm.c.security-code converter/ppm/ppmtoxpm.c ---- converter/ppm/ppmtoxpm.c.security-code 2012-04-09 15:31:44.000000000 +0200 -+++ converter/ppm/ppmtoxpm.c 2012-04-09 15:40:03.214619651 +0200 +diff -up netpbm-10.58.01/converter/ppm/ppmtoxpm.c.security-code netpbm-10.58.01/converter/ppm/ppmtoxpm.c +--- netpbm-10.58.01/converter/ppm/ppmtoxpm.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ppmtoxpm.c 2012-04-09 15:40:03.214619651 +0200 @@ -197,6 +197,7 @@ genNumstr(unsigned int const input, int unsigned int i; @@ -921,9 +882,9 @@ diff -up converter/ppm/ppmtoxpm.c.security-code converter/ppm/ppmtoxpm.c MALLOCARRAY(cmap, cmapSize); if (cmapP == NULL) pm_error("Out of memory allocating %u bytes for a color map.", -diff -up converter/ppm/qrttoppm.c.security-code converter/ppm/qrttoppm.c ---- converter/ppm/qrttoppm.c.security-code 2012-04-09 15:31:42.000000000 +0200 -+++ converter/ppm/qrttoppm.c 2012-04-09 15:40:03.215619638 +0200 +diff -up netpbm-10.58.01/converter/ppm/qrttoppm.c.security-code netpbm-10.58.01/converter/ppm/qrttoppm.c +--- netpbm-10.58.01/converter/ppm/qrttoppm.c.security-code 2012-04-09 15:31:42.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/qrttoppm.c 2012-04-09 15:40:03.215619638 +0200 @@ -46,7 +46,7 @@ main( argc, argv ) ppm_writeppminit( stdout, cols, rows, maxval, 0 ); @@ -933,9 +894,9 @@ diff -up converter/ppm/qrttoppm.c.security-code converter/ppm/qrttoppm.c if ( buf == (unsigned char *) 0 ) pm_error( "out of memory" ); -diff -up converter/ppm/sldtoppm.c.security-code converter/ppm/sldtoppm.c ---- converter/ppm/sldtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 -+++ converter/ppm/sldtoppm.c 2012-04-09 15:40:03.216619626 +0200 +diff -up netpbm-10.58.01/converter/ppm/sldtoppm.c.security-code netpbm-10.58.01/converter/ppm/sldtoppm.c +--- netpbm-10.58.01/converter/ppm/sldtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/sldtoppm.c 2012-04-09 15:40:03.216619626 +0200 @@ -455,6 +455,8 @@ slider(slvecfn slvec, /* Allocate image buffer and clear it to black. */ @@ -945,9 +906,9 @@ diff -up converter/ppm/sldtoppm.c.security-code converter/ppm/sldtoppm.c pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1); PPM_ASSIGN(rgbcolor, 0, 0, 0); ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0, -diff -up converter/ppm/ximtoppm.c.security-code converter/ppm/ximtoppm.c ---- converter/ppm/ximtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 -+++ converter/ppm/ximtoppm.c 2012-04-09 15:40:03.216619626 +0200 +diff -up netpbm-10.58.01/converter/ppm/ximtoppm.c.security-code netpbm-10.58.01/converter/ppm/ximtoppm.c +--- netpbm-10.58.01/converter/ppm/ximtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 ++++ netpbm-10.58.01/converter/ppm/ximtoppm.c 2012-04-09 15:40:03.216619626 +0200 @@ -117,6 +117,7 @@ ReadXimHeader(FILE * const in_fp, header->bits_channel = atoi(a_head.bits_per_channel); header->alpha_flag = atoi(a_head.alpha_channel); @@ -980,9 +941,9 @@ diff -up converter/ppm/ximtoppm.c.security-code converter/ppm/ximtoppm.c header->colors = (Color *)calloc((unsigned int)header->ncolors, sizeof(Color)); if (header->colors == NULL) { -diff -up editor/pamcut.c.security-code editor/pamcut.c ---- editor/pamcut.c.security-code 2012-04-09 15:31:33.000000000 +0200 -+++ editor/pamcut.c 2012-04-09 15:40:03.218619602 +0200 +diff -up netpbm-10.58.01/editor/pamcut.c.security-code netpbm-10.58.01/editor/pamcut.c +--- netpbm-10.58.01/editor/pamcut.c.security-code 2012-04-09 15:31:33.000000000 +0200 ++++ netpbm-10.58.01/editor/pamcut.c 2012-04-09 15:40:03.218619602 +0200 @@ -655,6 +655,8 @@ cutOneImage(FILE * const ifP outpam = inpam; /* Initial value -- most fields should be same */ @@ -992,9 +953,9 @@ diff -up editor/pamcut.c.security-code editor/pamcut.c outpam.width = rightcol - leftcol + 1; outpam.height = bottomrow - toprow + 1; -diff -up editor/pbmreduce.c.security-code editor/pbmreduce.c ---- editor/pbmreduce.c.security-code 2012-04-09 15:31:33.000000000 +0200 -+++ editor/pbmreduce.c 2012-04-09 15:40:03.219619590 +0200 +diff -up netpbm-10.58.01/editor/pbmreduce.c.security-code netpbm-10.58.01/editor/pbmreduce.c +--- netpbm-10.58.01/editor/pbmreduce.c.security-code 2012-04-09 15:31:33.000000000 +0200 ++++ netpbm-10.58.01/editor/pbmreduce.c 2012-04-09 15:40:03.219619590 +0200 @@ -94,6 +94,7 @@ main( argc, argv ) if (halftone == QT_FS) { unsigned int col; @@ -1003,9 +964,9 @@ diff -up editor/pbmreduce.c.security-code editor/pbmreduce.c MALLOCARRAY(thiserr, newcols + 2); MALLOCARRAY(nexterr, newcols + 2); if (thiserr == NULL || nexterr == NULL) -diff -up editor/pnmgamma.c.security-code editor/pnmgamma.c ---- editor/pnmgamma.c.security-code 2012-04-09 15:31:34.000000000 +0200 -+++ editor/pnmgamma.c 2012-04-09 15:40:03.220619577 +0200 +diff -up netpbm-10.58.01/editor/pnmgamma.c.security-code netpbm-10.58.01/editor/pnmgamma.c +--- netpbm-10.58.01/editor/pnmgamma.c.security-code 2012-04-09 15:31:34.000000000 +0200 ++++ netpbm-10.58.01/editor/pnmgamma.c 2012-04-09 15:40:03.220619577 +0200 @@ -586,6 +586,7 @@ createGammaTables(enum transferFunction xelval ** const btableP) { @@ -1014,9 +975,9 @@ diff -up editor/pnmgamma.c.security-code editor/pnmgamma.c MALLOCARRAY(*rtableP, maxval+1); MALLOCARRAY(*gtableP, maxval+1); MALLOCARRAY(*btableP, maxval+1); -diff -up editor/pnmhisteq.c.security-code editor/pnmhisteq.c ---- editor/pnmhisteq.c.security-code 2012-04-09 15:31:33.000000000 +0200 -+++ editor/pnmhisteq.c 2012-04-09 15:40:03.220619577 +0200 +diff -up netpbm-10.58.01/editor/pnmhisteq.c.security-code netpbm-10.58.01/editor/pnmhisteq.c +--- netpbm-10.58.01/editor/pnmhisteq.c.security-code 2012-04-09 15:31:33.000000000 +0200 ++++ netpbm-10.58.01/editor/pnmhisteq.c 2012-04-09 15:40:03.220619577 +0200 @@ -103,6 +103,7 @@ computeLuminosityHistogram(xel * const * unsigned int pixelCount; unsigned int * lumahist; @@ -1025,9 +986,9 @@ diff -up editor/pnmhisteq.c.security-code editor/pnmhisteq.c MALLOCARRAY(lumahist, maxval + 1); if (lumahist == NULL) pm_error("Out of storage allocating array for %u histogram elements", -diff -up editor/pnmindex.csh.security-code editor/pnmindex.csh ---- editor/pnmindex.csh.security-code 2012-04-09 15:31:33.000000000 +0200 -+++ editor/pnmindex.csh 2012-04-09 15:40:03.221619564 +0200 +diff -up netpbm-10.58.01/editor/pnmindex.csh.security-code netpbm-10.58.01/editor/pnmindex.csh +--- netpbm-10.58.01/editor/pnmindex.csh.security-code 2012-04-09 15:31:33.000000000 +0200 ++++ netpbm-10.58.01/editor/pnmindex.csh 2012-04-09 15:40:03.221619564 +0200 @@ -1,5 +1,8 @@ #!/bin/csh -f # @@ -1037,9 +998,9 @@ diff -up editor/pnmindex.csh.security-code editor/pnmindex.csh # pnmindex - build a visual index of a bunch of anymaps # # Copyright (C) 1991 by Jef Poskanzer. -diff -up editor/pnmpad.c.security-code editor/pnmpad.c ---- editor/pnmpad.c.security-code 2012-04-09 15:31:34.000000000 +0200 -+++ editor/pnmpad.c 2012-04-09 15:40:03.221619564 +0200 +diff -up netpbm-10.58.01/editor/pnmpad.c.security-code netpbm-10.58.01/editor/pnmpad.c +--- netpbm-10.58.01/editor/pnmpad.c.security-code 2012-04-09 15:31:34.000000000 +0200 ++++ netpbm-10.58.01/editor/pnmpad.c 2012-04-09 15:40:03.221619564 +0200 @@ -527,6 +527,8 @@ main(int argc, const char ** argv) { computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad); @@ -1049,9 +1010,9 @@ diff -up editor/pnmpad.c.security-code editor/pnmpad.c newcols = cols + lpad + rpad; if (PNM_FORMAT_TYPE(format) == PBM_TYPE) -diff -up editor/pnmremap.c.security-code editor/pnmremap.c ---- editor/pnmremap.c.security-code 2012-04-09 15:31:33.000000000 +0200 -+++ editor/pnmremap.c 2012-04-09 15:40:03.222619551 +0200 +diff -up netpbm-10.58.01/editor/pnmremap.c.security-code netpbm-10.58.01/editor/pnmremap.c +--- netpbm-10.58.01/editor/pnmremap.c.security-code 2012-04-09 15:31:33.000000000 +0200 ++++ netpbm-10.58.01/editor/pnmremap.c 2012-04-09 15:40:03.222619551 +0200 @@ -409,7 +409,7 @@ initFserr(struct pam * const pamP, unsigned int plane; @@ -1069,9 +1030,9 @@ diff -up editor/pnmremap.c.security-code editor/pnmremap.c for (col = 0; col < pamP->width + 2; ++col) { unsigned int plane; for (plane = 0; plane < pamP->depth; ++plane) -diff -up editor/pnmscalefixed.c.security-code editor/pnmscalefixed.c ---- editor/pnmscalefixed.c.security-code 2012-04-09 15:31:34.000000000 +0200 -+++ editor/pnmscalefixed.c 2012-04-09 15:40:03.223619538 +0200 +diff -up netpbm-10.58.01/editor/pnmscalefixed.c.security-code netpbm-10.58.01/editor/pnmscalefixed.c +--- netpbm-10.58.01/editor/pnmscalefixed.c.security-code 2012-04-09 15:31:34.000000000 +0200 ++++ netpbm-10.58.01/editor/pnmscalefixed.c 2012-04-09 15:40:03.223619538 +0200 @@ -214,6 +214,8 @@ compute_output_dimensions(const struct c const int rows, const int cols, int * newrowsP, int * newcolsP) { @@ -1100,9 +1061,9 @@ diff -up editor/pnmscalefixed.c.security-code editor/pnmscalefixed.c sxscale = SCALE * newcols / cols; syscale = SCALE * newrows / rows; -diff -up editor/pnmshear.c.security-code editor/pnmshear.c ---- editor/pnmshear.c.security-code 2012-04-09 15:31:33.000000000 +0200 -+++ editor/pnmshear.c 2012-04-09 15:40:03.224619526 +0200 +diff -up netpbm-10.58.01/editor/pnmshear.c.security-code netpbm-10.58.01/editor/pnmshear.c +--- netpbm-10.58.01/editor/pnmshear.c.security-code 2012-04-09 15:31:33.000000000 +0200 ++++ netpbm-10.58.01/editor/pnmshear.c 2012-04-09 15:40:03.224619526 +0200 @@ -15,6 +15,7 @@ #include #include @@ -1123,9 +1084,9 @@ diff -up editor/pnmshear.c.security-code editor/pnmshear.c newcols = rows * shearfac + cols + 0.999999; pnm_writepnminit(stdout, newcols, rows, newmaxval, newformat, 0); -diff -up editor/ppmdither.c.security-code editor/ppmdither.c ---- editor/ppmdither.c.security-code 2012-04-09 15:31:33.000000000 +0200 -+++ editor/ppmdither.c 2012-04-09 15:40:03.224619526 +0200 +diff -up netpbm-10.58.01/editor/ppmdither.c.security-code netpbm-10.58.01/editor/ppmdither.c +--- netpbm-10.58.01/editor/ppmdither.c.security-code 2012-04-09 15:31:33.000000000 +0200 ++++ netpbm-10.58.01/editor/ppmdither.c 2012-04-09 15:40:03.224619526 +0200 @@ -355,7 +355,11 @@ dithMatrix(unsigned int const dithPower) unsigned int const dithMatSize = (dithDim * sizeof(*dithMat)) + /* pointers */ @@ -1139,9 +1100,9 @@ diff -up editor/ppmdither.c.security-code editor/ppmdither.c dithMat = malloc(dithMatSize); if (dithMat == NULL) -diff -up editor/specialty/pamoil.c.security-code editor/specialty/pamoil.c ---- editor/specialty/pamoil.c.security-code 2012-04-09 15:31:33.000000000 +0200 -+++ editor/specialty/pamoil.c 2012-04-09 15:40:03.224619526 +0200 +diff -up netpbm-10.58.01/editor/specialty/pamoil.c.security-code netpbm-10.58.01/editor/specialty/pamoil.c +--- netpbm-10.58.01/editor/specialty/pamoil.c.security-code 2012-04-09 15:31:33.000000000 +0200 ++++ netpbm-10.58.01/editor/specialty/pamoil.c 2012-04-09 15:40:03.224619526 +0200 @@ -112,6 +112,7 @@ main(int argc, char *argv[] ) { tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type)); pm_close(ifp); @@ -1150,9 +1111,9 @@ diff -up editor/specialty/pamoil.c.security-code editor/specialty/pamoil.c MALLOCARRAY(hist, inpam.maxval + 1); if (hist == NULL) pm_error("Unable to allocate memory for histogram."); -diff -up generator/pbmtext.c.security-code generator/pbmtext.c ---- generator/pbmtext.c.security-code 2012-04-09 15:31:34.000000000 +0200 -+++ generator/pbmtext.c 2012-04-09 15:40:03.225619514 +0200 +diff -up netpbm-10.58.01/generator/pbmtext.c.security-code netpbm-10.58.01/generator/pbmtext.c +--- netpbm-10.58.01/generator/pbmtext.c.security-code 2012-04-09 15:31:34.000000000 +0200 ++++ netpbm-10.58.01/generator/pbmtext.c 2012-04-09 15:40:03.225619514 +0200 @@ -96,12 +96,14 @@ parseCommandLine(int argc, const char ** for (i = 1; i < argc; ++i) { @@ -1184,9 +1145,9 @@ diff -up generator/pbmtext.c.security-code generator/pbmtext.c hmargin = 2 * fontP->maxwidth; } } -diff -up generator/pgmcrater.c.security-code generator/pgmcrater.c ---- generator/pgmcrater.c.security-code 2012-04-09 15:31:34.000000000 +0200 -+++ generator/pgmcrater.c 2012-04-09 15:40:03.226619502 +0200 +diff -up netpbm-10.58.01/generator/pgmcrater.c.security-code netpbm-10.58.01/generator/pgmcrater.c +--- netpbm-10.58.01/generator/pgmcrater.c.security-code 2012-04-09 15:31:34.000000000 +0200 ++++ netpbm-10.58.01/generator/pgmcrater.c 2012-04-09 15:40:03.226619502 +0200 @@ -130,7 +130,7 @@ static void gencraters() /* Acquire the elevation array and initialize it to mean surface elevation. */ @@ -1196,9 +1157,9 @@ diff -up generator/pgmcrater.c.security-code generator/pgmcrater.c if (aux == NULL) pm_error("out of memory allocating elevation array"); -diff -up lib/libpam.c.security-code lib/libpam.c ---- lib/libpam.c.security-code 2012-04-09 15:31:38.000000000 +0200 -+++ lib/libpam.c 2012-04-09 15:40:03.227619490 +0200 +diff -up netpbm-10.58.01/lib/libpam.c.security-code netpbm-10.58.01/lib/libpam.c +--- netpbm-10.58.01/lib/libpam.c.security-code 2012-04-09 15:31:38.000000000 +0200 ++++ netpbm-10.58.01/lib/libpam.c 2012-04-09 15:40:03.227619490 +0200 @@ -220,7 +220,8 @@ allocPamRow(const struct pam * const pam unsigned int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample); tuple * tuplerow; @@ -1209,9 +1170,9 @@ diff -up lib/libpam.c.security-code lib/libpam.c if (tuplerow != NULL) { /* Now we initialize the pointers to the individual tuples -diff -up lib/libpammap.c.security-code lib/libpammap.c ---- lib/libpammap.c.security-code 2012-04-09 15:31:38.000000000 +0200 -+++ lib/libpammap.c 2012-04-09 15:40:03.228619477 +0200 +diff -up netpbm-10.58.01/lib/libpammap.c.security-code netpbm-10.58.01/lib/libpammap.c +--- netpbm-10.58.01/lib/libpammap.c.security-code 2012-04-09 15:31:38.000000000 +0200 ++++ netpbm-10.58.01/lib/libpammap.c 2012-04-09 15:40:03.228619477 +0200 @@ -104,6 +104,8 @@ allocTupleIntListItem(struct pam * const */ struct tupleint_list_item * retval; @@ -1221,9 +1182,9 @@ diff -up lib/libpammap.c.security-code lib/libpammap.c unsigned int const size = sizeof(*retval) - sizeof(retval->tupleint.tuple) + pamP->depth * sizeof(sample); -diff -up lib/libpm.c.security-code lib/libpm.c ---- lib/libpm.c.security-code 2012-04-09 15:31:38.000000000 +0200 -+++ lib/libpm.c 2012-04-09 15:40:03.229619464 +0200 +diff -up netpbm-10.58.01/lib/libpm.c.security-code netpbm-10.58.01/lib/libpm.c +--- netpbm-10.58.01/lib/libpm.c.security-code 2012-04-09 15:31:38.000000000 +0200 ++++ netpbm-10.58.01/lib/libpm.c 2012-04-09 15:40:03.229619464 +0200 @@ -808,4 +808,53 @@ pm_parse_height(const char * const arg) } @@ -1278,9 +1239,9 @@ diff -up lib/libpm.c.security-code lib/libpm.c + return realloc(a, b*c); +} -diff -up lib/pm.h.security-code lib/pm.h ---- lib/pm.h.security-code 2012-04-09 15:31:38.000000000 +0200 -+++ lib/pm.h 2012-04-09 15:40:03.229619464 +0200 +diff -up netpbm-10.58.01/lib/pm.h.security-code netpbm-10.58.01/lib/pm.h +--- netpbm-10.58.01/lib/pm.h.security-code 2012-04-09 15:31:38.000000000 +0200 ++++ netpbm-10.58.01/lib/pm.h 2012-04-09 15:40:03.229619464 +0200 @@ -432,4 +432,11 @@ pm_parse_height(const char * const arg); #endif @@ -1293,9 +1254,9 @@ diff -up lib/pm.h.security-code lib/pm.h +void overflow_add(int, int); + #endif -diff -up other/pnmcolormap.c.security-code other/pnmcolormap.c ---- other/pnmcolormap.c.security-code 2012-04-09 15:31:32.000000000 +0200 -+++ other/pnmcolormap.c 2012-04-09 15:40:03.230619451 +0200 +diff -up netpbm-10.58.01/other/pnmcolormap.c.security-code netpbm-10.58.01/other/pnmcolormap.c +--- netpbm-10.58.01/other/pnmcolormap.c.security-code 2012-04-09 15:31:32.000000000 +0200 ++++ netpbm-10.58.01/other/pnmcolormap.c 2012-04-09 15:40:03.230619451 +0200 @@ -840,6 +840,7 @@ colormapToSquare(struct pam * const pamP pamP->width = intsqrt; else @@ -1304,9 +1265,9 @@ diff -up other/pnmcolormap.c.security-code other/pnmcolormap.c } { unsigned int const intQuotient = colormap.size / pamP->width; -diff -up urt/README.security-code urt/README ---- urt/README.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ urt/README 2012-04-09 15:40:03.231619438 +0200 +diff -up netpbm-10.58.01/urt/README.security-code netpbm-10.58.01/urt/README +--- netpbm-10.58.01/urt/README.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/urt/README 2012-04-09 15:40:03.231619438 +0200 @@ -18,3 +18,8 @@ in its initializer in the original. But defines stdout as a variable, so that wouldn't compile. So I changed it to NULL and added a line to rle_hdr_init to set that field to @@ -1316,9 +1277,9 @@ diff -up urt/README.security-code urt/README +Removed pipe through and compress support (unsafe) + +Alan Cox -diff -up urt/rle_addhist.c.security-code urt/rle_addhist.c ---- urt/rle_addhist.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ urt/rle_addhist.c 2012-04-09 15:40:03.231619438 +0200 +diff -up netpbm-10.58.01/urt/rle_addhist.c.security-code netpbm-10.58.01/urt/rle_addhist.c +--- netpbm-10.58.01/urt/rle_addhist.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/urt/rle_addhist.c 2012-04-09 15:40:03.231619438 +0200 @@ -14,6 +14,8 @@ * If you modify this software, you should include a notice giving the * name of the person performing the modification, the date of modification, @@ -1363,9 +1324,9 @@ diff -up urt/rle_addhist.c.security-code urt/rle_addhist.c ++length; /*Cater for the null. */ MALLOCARRAY(newc, length); -diff -up urt/rle_getrow.c.security-code urt/rle_getrow.c ---- urt/rle_getrow.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ urt/rle_getrow.c 2012-04-09 15:40:03.232619426 +0200 +diff -up netpbm-10.58.01/urt/rle_getrow.c.security-code netpbm-10.58.01/urt/rle_getrow.c +--- netpbm-10.58.01/urt/rle_getrow.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/urt/rle_getrow.c 2012-04-09 15:40:03.232619426 +0200 @@ -17,6 +17,8 @@ * * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire @@ -1383,9 +1344,9 @@ diff -up urt/rle_getrow.c.security-code urt/rle_getrow.c evenlen = (comlen + 1) & ~1; /* make it even */ if ( evenlen ) { -diff -up urt/rle_hdr.c.security-code urt/rle_hdr.c ---- urt/rle_hdr.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ urt/rle_hdr.c 2012-04-09 15:40:03.233619414 +0200 +diff -up netpbm-10.58.01/urt/rle_hdr.c.security-code netpbm-10.58.01/urt/rle_hdr.c +--- netpbm-10.58.01/urt/rle_hdr.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/urt/rle_hdr.c 2012-04-09 15:40:03.233619414 +0200 @@ -14,6 +14,8 @@ * If you modify this software, you should include a notice giving the * name of the person performing the modification, the date of modification, @@ -1452,9 +1413,9 @@ diff -up urt/rle_hdr.c.security-code urt/rle_hdr.c size *= sizeof(char *); to_hdr->comments = (CONST_DECL char **)malloc( size ); RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" ); -diff -up urt/rle.h.security-code urt/rle.h ---- urt/rle.h.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ urt/rle.h 2012-04-09 15:40:03.233619414 +0200 +diff -up netpbm-10.58.01/urt/rle.h.security-code netpbm-10.58.01/urt/rle.h +--- netpbm-10.58.01/urt/rle.h.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/urt/rle.h 2012-04-09 15:40:03.233619414 +0200 @@ -14,6 +14,9 @@ * If you modify this software, you should include a notice giving the * name of the person performing the modification, the date of modification, @@ -1483,9 +1444,9 @@ diff -up urt/rle.h.security-code urt/rle.h /* Declare RLE library routines. */ -diff -up urt/rle_open_f.c.security-code urt/rle_open_f.c ---- urt/rle_open_f.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ urt/rle_open_f.c 2012-04-09 15:40:03.234619402 +0200 +diff -up netpbm-10.58.01/urt/rle_open_f.c.security-code netpbm-10.58.01/urt/rle_open_f.c +--- netpbm-10.58.01/urt/rle_open_f.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/urt/rle_open_f.c 2012-04-09 15:40:03.234619402 +0200 @@ -163,65 +163,7 @@ dealWithSubprocess(const char * const f FILE ** const fpP, bool * const noSubprocessP, @@ -1552,9 +1513,9 @@ diff -up urt/rle_open_f.c.security-code urt/rle_open_f.c } -diff -up urt/rle_putcom.c.security-code urt/rle_putcom.c ---- urt/rle_putcom.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ urt/rle_putcom.c 2012-04-09 15:40:03.234619402 +0200 +diff -up netpbm-10.58.01/urt/rle_putcom.c.security-code netpbm-10.58.01/urt/rle_putcom.c +--- netpbm-10.58.01/urt/rle_putcom.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/urt/rle_putcom.c 2012-04-09 15:40:03.234619402 +0200 @@ -14,6 +14,8 @@ * If you modify this software, you should include a notice giving the * name of the person performing the modification, the date of modification, @@ -1580,9 +1541,9 @@ diff -up urt/rle_putcom.c.security-code urt/rle_putcom.c /* Not found */ /* Can't realloc because somebody else might be pointing to this * comments block. Of course, if this were true, then the -diff -up urt/Runput.c.security-code urt/Runput.c ---- urt/Runput.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ urt/Runput.c 2012-04-09 15:40:03.235619390 +0200 +diff -up netpbm-10.58.01/urt/Runput.c.security-code netpbm-10.58.01/urt/Runput.c +--- netpbm-10.58.01/urt/Runput.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/urt/Runput.c 2012-04-09 15:40:03.235619390 +0200 @@ -17,6 +17,8 @@ * * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire @@ -1615,9 +1576,9 @@ diff -up urt/Runput.c.security-code urt/Runput.c if ( h_cmap == NULL ) { fprintf( stderr, -diff -up urt/scanargs.c.security-code urt/scanargs.c ---- urt/scanargs.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ urt/scanargs.c 2012-04-09 15:40:03.235619390 +0200 +diff -up netpbm-10.58.01/urt/scanargs.c.security-code netpbm-10.58.01/urt/scanargs.c +--- netpbm-10.58.01/urt/scanargs.c.security-code 2012-04-09 15:31:45.000000000 +0200 ++++ netpbm-10.58.01/urt/scanargs.c 2012-04-09 15:40:03.235619390 +0200 @@ -38,6 +38,8 @@ * * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire @@ -1638,8 +1599,8 @@ diff -up urt/scanargs.c.security-code urt/scanargs.c static CONST_DECL char * prformat( CONST_DECL char *, int ); static int isnum( CONST_DECL char *, int, int ); ---- lib/libpbm1.c.orig 2014-06-16 21:12:28.499230631 -0400 -+++ lib/libpbm1.c 2014-06-16 21:12:55.932519324 -0400 +--- netpbm-10.58.01/lib/libpbm1.c.orig 2014-06-16 21:12:28.499230631 -0400 ++++ netpbm-10.58.01/lib/libpbm1.c 2014-06-16 21:12:55.932519324 -0400 @@ -78,6 +78,7 @@ } else { pm_filepos const bytesPerRow = (cols+7)/8; @@ -1648,8 +1609,8 @@ diff -up urt/scanargs.c.security-code urt/scanargs.c pm_check(fileP, checkType, needRasterSize, retvalP); } } ---- converter/ppm/ppmtoilbm.c.orig 2014-06-16 21:23:40.061473868 -0400 -+++ converter/ppm/ppmtoilbm.c 2014-06-16 21:23:44.701466379 -0400 +--- netpbm-10.58.01/converter/ppm/ppmtoilbm.c.orig 2014-06-16 21:23:40.061473868 -0400 ++++ netpbm-10.58.01/converter/ppm/ppmtoilbm.c 2014-06-16 21:23:44.701466379 -0400 @@ -185,6 +185,7 @@ unsigned int i; int * table; @@ -1658,3 +1619,40 @@ diff -up urt/scanargs.c.security-code urt/scanargs.c MALLOCARRAY_NOFAIL(table, oldmaxval + 1); for (i = 0; i <= oldmaxval; ++i) table[i] = ROUNDDIV(i * newmaxval, oldmaxval); +--- netpbm-10.58.01/converter/other/sgitopnm.c.orig 2014-07-08 16:57:30.878754976 -0400 ++++ netpbm-10.58.01/converter/other/sgitopnm.c 2014-07-08 17:07:52.727745725 -0400 +@@ -372,10 +372,14 @@ + MALLOCARRAY_NOFAIL(image, head->ysize); + } else { + maxchannel = 3; ++ overflow2(head->ysize, maxchannel); + MALLOCARRAY_NOFAIL(image, head->ysize * maxchannel); + } +- if (table) ++ if (table) { ++ overflow2(head->xsize, 2); ++ overflow_add(head->xsize*2, 2); + MALLOCARRAY_NOFAIL(temp, WORSTCOMPR(head->xsize)); ++ } + + for (channel = 0; channel < maxchannel; ++channel) { + unsigned int row; +--- netpbm-10.58.01/converter/other/pnmtosgi.c.orig 2014-07-08 16:57:30.878754976 -0400 ++++ netpbm-10.58.01/converter/other/pnmtosgi.c 2014-07-08 17:11:55.164018919 -0400 +@@ -176,6 +176,8 @@ + break; + case STORAGE_RLE: { + unsigned int const tabrow = chanNum * rows + row; ++ overflow2(chanNum, rows); ++ overflow_add(chanNum* rows, row); + unsigned int const len = rleCompress(tempArg, cols); + /* writes result into rletemp */ + unsigned int i; +@@ -212,6 +214,7 @@ + ScanElem * temp; + + if (storage != STORAGE_VERBATIM) { ++ overflow2(channels, rows); + MALLOCARRAY_NOFAIL(table, channels * rows); + MALLOCARRAY_NOFAIL(rletemp, WORSTCOMPR(cols)); + } else diff --git a/srcpkgs/netpbm/patches/netpbm-security-scripts.patch b/srcpkgs/netpbm/patches/netpbm-security-scripts.patch index 9c3069f1667..db056db9962 100644 --- a/srcpkgs/netpbm/patches/netpbm-security-scripts.patch +++ b/srcpkgs/netpbm/patches/netpbm-security-scripts.patch @@ -1,6 +1,6 @@ -diff -up converter/other/anytopnm.security-scripts converter/other/anytopnm ---- converter/other/anytopnm.security-scripts 2009-12-10 08:34:36.000000000 +0100 -+++ converter/other/anytopnm 2010-03-16 21:28:09.000000000 +0100 +diff -up netpbm-10.47.05/converter/other/anytopnm.security-scripts netpbm-10.47.05/converter/other/anytopnm +--- netpbm-10.47.05/converter/other/anytopnm.security-scripts 2009-12-10 08:34:36.000000000 +0100 ++++ netpbm-10.47.05/converter/other/anytopnm 2010-03-16 21:28:09.000000000 +0100 @@ -510,10 +510,7 @@ else inputFile="-" fi @@ -31,9 +31,9 @@ diff -up converter/other/anytopnm.security-scripts converter/other/anytopnm +fi + exit 0 -diff -up editor/pamstretch-gen.security-scripts editor/pamstretch-gen ---- editor/pamstretch-gen.security-scripts 2009-12-10 08:34:32.000000000 +0100 -+++ editor/pamstretch-gen 2010-03-16 21:28:47.000000000 +0100 +diff -up netpbm-10.47.05/editor/pamstretch-gen.security-scripts netpbm-10.47.05/editor/pamstretch-gen +--- netpbm-10.47.05/editor/pamstretch-gen.security-scripts 2009-12-10 08:34:32.000000000 +0100 ++++ netpbm-10.47.05/editor/pamstretch-gen 2010-03-16 21:28:47.000000000 +0100 @@ -31,13 +31,9 @@ if [ "$1" = "" ]; then exit 1 fi @@ -49,9 +49,9 @@ diff -up editor/pamstretch-gen.security-scripts editor/pamstretch-gen if ! cat $2 >$tempfile 2>/dev/null; then echo 'pamstretch-gen: error reading file' 1>&2 exit 1 -diff -up editor/pnmmargin.security-scripts editor/pnmmargin ---- editor/pnmmargin.security-scripts 2009-12-10 08:34:32.000000000 +0100 -+++ editor/pnmmargin 2010-03-16 21:28:09.000000000 +0100 +diff -up netpbm-10.47.05/editor/pnmmargin.security-scripts netpbm-10.47.05/editor/pnmmargin +--- netpbm-10.47.05/editor/pnmmargin.security-scripts 2009-12-10 08:34:32.000000000 +0100 ++++ netpbm-10.47.05/editor/pnmmargin 2010-03-16 21:28:09.000000000 +0100 @@ -11,15 +11,11 @@ # documentation. This software is provided "as is" without express or # implied warranty. @@ -81,9 +81,9 @@ diff -up editor/pnmmargin.security-scripts editor/pnmmargin exit ;; * ) -diff -up editor/ppmfade.security-scripts editor/ppmfade ---- editor/ppmfade.security-scripts 2009-12-10 08:34:32.000000000 +0100 -+++ editor/ppmfade 2010-03-16 21:28:09.000000000 +0100 +diff -up netpbm-10.47.05/editor/ppmfade.security-scripts netpbm-10.47.05/editor/ppmfade +--- netpbm-10.47.05/editor/ppmfade.security-scripts 2009-12-10 08:34:32.000000000 +0100 ++++ netpbm-10.47.05/editor/ppmfade 2010-03-16 21:28:09.000000000 +0100 @@ -14,6 +14,7 @@ # #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- @@ -347,9 +347,9 @@ diff -up editor/ppmfade.security-scripts editor/ppmfade +system("rm $tmpdir/junk*$$.ppm"); exit(0); -diff -up editor/ppmshadow.security-scripts editor/ppmshadow ---- editor/ppmshadow.security-scripts 2009-12-10 08:34:32.000000000 +0100 -+++ editor/ppmshadow 2010-03-16 21:28:09.000000000 +0100 +diff -up netpbm-10.47.05/editor/ppmshadow.security-scripts netpbm-10.47.05/editor/ppmshadow +--- netpbm-10.47.05/editor/ppmshadow.security-scripts 2009-12-10 08:34:32.000000000 +0100 ++++ netpbm-10.47.05/editor/ppmshadow 2010-03-16 21:28:09.000000000 +0100 @@ -72,9 +72,10 @@ sub makeConvolutionKernel($$) { @@ -364,8 +364,8 @@ diff -up editor/ppmshadow.security-scripts editor/ppmshadow # Process command line options ---- editor/pnmmargin.orig 2014-06-16 21:30:27.480812666 -0400 -+++ editor/pnmmargin 2014-06-16 21:30:41.500789921 -0400 +--- snetpbm-10.47.05/editor/pnmmargin.orig 2014-06-16 21:30:27.480812666 -0400 ++++ netpbm-10.47.05/editor/pnmmargin 2014-06-16 21:30:41.500789921 -0400 @@ -101,3 +101,4 @@ fi diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template index 43a5ad3384b..697ca8dae40 100644 --- a/srcpkgs/netpbm/template +++ b/srcpkgs/netpbm/template @@ -1,18 +1,20 @@ # Template file for 'netpbm' pkgname=netpbm -version=10.66.03 -revision=3 -wrksrc=advanced -hostmakedepends="pkg-config perl python flex" +# from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY +version=10.67.05 +revision=1 +patch_args="-Np1" +hostmakedepends="pkg-config perl python flex subversion" makedepends="libjpeg-turbo-devel tiff-devel libpng-devel zlib-devel libxml2-devel libX11-devel" short_desc="Toolkit for manipulation of graphic images" maintainer="Christian Neukirchen " license="BSD,GPL,LGPL,custom" homepage="http://netpbm.sourceforge.net/" -distfiles="ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$version.tar.xz - ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-doc-31Jan2014.tar.xz" -checksum="705551823155dcfebdb6b914447769a62eefd7157efd1dae925b36fb7cc647b1 - 74bcf840ee643c6917330c382484010cb99c004a3fcf05391bebcac63815acb3" + +do_fetch() { + svn co http://svn.code.sf.net/p/netpbm/code/advanced ${wrksrc} + svn co http://svn.code.sf.net/p/netpbm/code/userguide ${wrksrc}/userguide +} do_configure() { cat config.mk.in ${FILESDIR}/config.mk >config.mk @@ -26,19 +28,15 @@ do_configure() { do_build() { make CC=$CC CFLAGS="$CFLAGS" ${makejobs} make MAKEMAN="${PWD}/buildtools/makeman" USERGUIDE=. \ - -C ../doc -f "${PWD}/buildtools/manpage.mk" manpages + -C userguide -f "${PWD}/buildtools/manpage.mk" manpages } do_install() { make pkgdir=$DESTDIR/usr PKGMANDIR=share/man install-run install-dev rm $DESTDIR/usr/share/man/man?/* make MAKEMAN="${PWD}/buildtools/makeman" MANDIR="$DESTDIR/usr/share/man" \ - -C ../doc -f "${PWD}/buildtools/manpage.mk" installman - vinstall doc/copyright_summary 644 usr/share/licenses/$pkgname -} - -do_clean() { - rm -rf ${XBPS_BUILDDIR}/doc + -C userguide -f "${PWD}/buildtools/manpage.mk" installman + vlicense doc/copyright_summary LICENSE } libnetpbm_package() {