diff --git a/srcpkgs/netpbm/files/netpbm-CAN-2005-2471.patch b/srcpkgs/netpbm/files/netpbm-CAN-2005-2471.patch deleted file mode 100644 index 3759d7ebef2..00000000000 --- a/srcpkgs/netpbm/files/netpbm-CAN-2005-2471.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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, - "-q", "-dNOPAUSE", -- "-dSAFER", "-"); -+ "-dPARANOIDSAFER", "-"); - } - - 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/srcpkgs/netpbm/files/netpbm-security-code.patch b/srcpkgs/netpbm/files/netpbm-security-code.patch index d136215d91c..965d5762ab8 100644 --- a/srcpkgs/netpbm/files/netpbm-security-code.patch +++ b/srcpkgs/netpbm/files/netpbm-security-code.patch @@ -453,26 +453,6 @@ diff -up netpbm-10.58.01/converter/ppm/ilbmtoppm.c.security-code netpbm-10.58.01 static void multi_adjust(cmap, row, palchange) -@@ -1341,6 +1359,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); -@@ -1763,7 +1784,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, data - 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; @@ -2028,6 +2051,9 @@ read_pchg(FILE * const ifp, cmap->mp_change[i] = NULL; if( PCHG.StartLine < 0 ) { diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template index ae4d54c3b07..6a213a31bfc 100644 --- a/srcpkgs/netpbm/template +++ b/srcpkgs/netpbm/template @@ -1,9 +1,9 @@ # Template file for 'netpbm' pkgname=netpbm # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY -version=10.82.03 +version=10.83.00 revision=1 -_githash=3be1029c5d1e62ae6f243e62d0853ca3f17ba0da +_githash=81ba0303f29b08507cccad29eecf2b30b012df63 _githash_guide=a615465999de69b20b7d4b2981477a90b6cc3db3 create_wrksrc=yes build_wrksrc="netpbm-mirror-${_githash}" @@ -17,7 +17,7 @@ homepage="http://netpbm.sourceforge.net/" nocross=yes distfiles="https://github.com/chneukirchen/netpbm-mirror/archive/${_githash}.tar.gz https://github.com/chneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz" -checksum="c1825ec9942b16e21b0cb0e0c2f576287fa16da20a891f1f3c33ce64bd7e1d1a +checksum="77dc3ad3d0319d7993fc588bdce65077bc6e1fc4aa7a10bd35b2579d5fec01a4 9060b6af454fddfa53379177600f68040b2ce83995e1ab4d58e70158bf1efdd5" post_extract() {