diff --git a/srcpkgs/netpbm/files/netpbm-security-code.patch b/srcpkgs/netpbm/files/netpbm-security-code.patch index 37893a95073..19e1a44b552 100644 --- a/srcpkgs/netpbm/files/netpbm-security-code.patch +++ b/srcpkgs/netpbm/files/netpbm-security-code.patch @@ -682,22 +682,6 @@ diff -up netpbm-10.58.01/editor/pnmscalefixed.c.security-code netpbm-10.58.01/ed sxscale = SCALE * newcols / cols; syscale = SCALE * newrows / rows; -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 */ - (dithDim * dithDim * sizeof(**dithMat)); /* data */ -- -+ -+ overflow2(dithDim, sizeof(*dithMat)); -+ overflow3(dithDim, dithDim, sizeof(**dithMat)); -+ overflow_add(dithDim * sizeof(*dithMat), dithDim * dithDim * sizeof(**dithMat)); -+ - dithMat = malloc(dithMatSize); - - if (dithMat == NULL) 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 diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template index d8da304beaa..cd25056b7d7 100644 --- a/srcpkgs/netpbm/template +++ b/srcpkgs/netpbm/template @@ -1,10 +1,10 @@ # Template file for 'netpbm' pkgname=netpbm # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY -version=11.02.00 +version=11.03.00 revision=1 -_githash=59588cf8aa12fd79214e937e6a9597630443c4a8 -_githash_guide=bd82abed1156636c98b258ade1735dfeb557e674 +_githash=341f87d067f5cb46683ae31944e9c31f1cc51e1d +_githash_guide=f9352b40e5733cfc65607a846ccdeba38d679e21 create_wrksrc=yes build_wrksrc="netpbm-mirror-${_githash}" hostmakedepends="flex perl pkg-config python3" @@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm" homepage="http://netpbm.sourceforge.net/" distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz" -checksum="5c3afee53b4eed7801a36c7b5a58096746738fb2f131297ddac9c302aafa2679 - 1234e095ff4c8733d3df2f4a6b215afc364c152f728aa91483e25b8016282319" +checksum="5c850bae2c2041eda2098d6a545032950bb75b03b40aaa477705f89fccf68339 + 00ed27905d0a16e340f8a94d3ba585c88a857bbaba4629fb64aa8c55fe5ab499" post_extract() { cd $build_wrksrc