From 05d103bde28f0a299db50fb8bbd21464df228c2a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 27 Sep 2020 16:02:31 +0200 Subject: [PATCH] netpbm: update to 10.92.00. --- .../netpbm/files/netpbm-security-code.patch | 22 ------------------- srcpkgs/netpbm/template | 6 ++--- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/srcpkgs/netpbm/files/netpbm-security-code.patch b/srcpkgs/netpbm/files/netpbm-security-code.patch index 88d9143586..294df11f18 100644 --- a/srcpkgs/netpbm/files/netpbm-security-code.patch +++ b/srcpkgs/netpbm/files/netpbm-security-code.patch @@ -494,18 +494,6 @@ diff -up netpbm-10.58.01/converter/ppm/ppmtomitsu.c.security-code netpbm-10.58.0 medias.maxcols *= 2; medias.maxrows *= 2; } -diff -up netpbm-10.58.01/converter/ppm/ppmtopcx.c.security-code netpbm-10.58.01/converter/ppm/ppmtopcx.c ---- netpbm-10.58.01/converter/ppm/ppmtopcx.c.security-code 2012-04-09 15:31:44.000000000 +0200 -+++ netpbm-10.58.01/converter/ppm/ppmtopcx.c 2012-04-09 15:40:03.210619702 +0200 -@@ -419,6 +419,8 @@ ppmTo16ColorPcx(pixel ** cons - else Planes = 1; - } - } -+ overflow2(BitsPerPixel, cols); -+ overflow_add(BitsPerPixel * cols, 7); - BytesPerLine = ((cols * BitsPerPixel) + 7) / 8; - MALLOCARRAY_NOFAIL(indexRow, cols); - MALLOCARRAY_NOFAIL(planesrow, BytesPerLine); diff -up netpbm-10.58.01/converter/ppm/ppmtopj.c.security-code netpbm-10.58.01/converter/ppm/ppmtopj.c --- netpbm-10.58.01/converter/ppm/ppmtopj.c.security-code 2012-04-09 15:31:44.000000000 +0200 +++ netpbm-10.58.01/converter/ppm/ppmtopj.c 2012-04-09 15:40:03.212619677 +0200 @@ -1019,13 +1007,3 @@ diff -up netpbm-10.58.01/urt/Runput.c.security-code netpbm-10.58.01/urt/Runput.c 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 -@@ -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/template b/srcpkgs/netpbm/template index 3cedf15a58..a682d95e26 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.91.04 +version=10.92.00 revision=1 -_githash=cd7f17a619a0421a1dfb2ceb09f4af60ead8ad5f +_githash=4c361c0a7638b4f068e8b524e4ff43374a286018 _githash_guide=2ab5fffd17f1e979ce63db9212331e51f53811fc create_wrksrc=yes build_wrksrc="netpbm-mirror-${_githash}" @@ -16,7 +16,7 @@ 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="6f1e93610ef32521dfdebf23074e4c1ebff02edac4cc7ccad6fc2d4de509b593 +checksum="fec87c54b7ff7aeb78f9e2bd48f658821c58b86a41332d9c547b31f2ea8f2593 542a9532d5c0a81ff47b3a65529670f51f45da4939150a8545e2f3a4af5b120b" post_extract() {