netpbm: update to 10.72.00.

This commit is contained in:
Christian Neukirchen 2015-09-27 14:46:37 +02:00
parent e3f074ac7f
commit 17eeacab02
2 changed files with 6 additions and 49 deletions

View file

@ -632,19 +632,6 @@ diff -up netpbm-10.58.01/converter/ppm/ppmtoilbm.c.security-code netpbm-10.58.01
MALLOCARRAY_NOFAIL(compr_row, cols * 2);
if( maxval != 15 ) {
@@ -2293,8 +2296,11 @@ main(int argc, char ** argv) {
MALLOCARRAY_NOFAIL(coded_rowbuf, RowBytes(cols));
for (i = 0; i < RowBytes(cols); ++i)
coded_rowbuf[i] = 0;
- if (DO_COMPRESS)
+ if (DO_COMPRESS) {
+ overflow2(cols,2);
+ overflow_add(cols*2,2);
MALLOCARRAY_NOFAIL(compr_rowbuf, WORSTCOMPR(RowBytes(cols)));
+ }
}
switch (mode) {
diff -up netpbm-10.58.01/converter/ppm/ppmtolj.c.security-code netpbm-10.58.01/converter/ppm/ppmtolj.c
--- netpbm-10.58.01/converter/ppm/ppmtolj.c.security-code 2012-04-09 15:31:42.000000000 +0200
+++ netpbm-10.58.01/converter/ppm/ppmtolj.c 2012-04-09 15:40:03.210619701 +0200
@ -1223,26 +1210,6 @@ diff -up netpbm-10.58.01/urt/rle_addhist.c.security-code netpbm-10.58.01/urt/rle
++length; /*Cater for the null. */
MALLOCARRAY(newc, length);
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
* to have all "void" functions so declared.
+ *
+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
*/
/*
* rle_getrow.c - Read an RLE file in.
@@ -168,6 +170,7 @@ rle_get_setup(rle_hdr * const the_hdr) {
register char * cp;
VAXSHORT( comlen, infile ); /* get comment length */
+ overflow_add(comlen, 1);
evenlen = (comlen + 1) & ~1; /* make it even */
if ( evenlen )
{
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
@ -1538,15 +1505,6 @@ diff -up netpbm-10.58.01/urt/scanargs.c.security-code netpbm-10.58.01/urt/scanar
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;

View file

@ -1,12 +1,11 @@
# Template file for 'netpbm'
pkgname=netpbm
# from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
version=10.71.02
version=10.72.00
revision=1
_githash=533e5a163abba83d69269053f1cbdb38358bbcb3
_githash_guide=6e802c41ff82aae1aec29351e5302e3f81b7a316
_githash_guide=d8b2ae2a47c23d0012345503cbdd4377e68357f7
create_wrksrc=yes
build_wrksrc="netpbm-mirror-${_githash}"
build_wrksrc="netpbm-mirror-${version}"
hostmakedepends="pkg-config perl python flex"
makedepends="libjpeg-turbo-devel tiff-devel libpng-devel zlib-devel libxml2-devel libX11-devel"
short_desc="Toolkit for manipulation of graphic images"
@ -14,10 +13,10 @@ maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
license="BSD,GPL-2,custom"
homepage="http://netpbm.sourceforge.net/"
nocross=yes
distfiles="https://github.com/chneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
distfiles="https://github.com/chneukirchen/netpbm-mirror/archive/${version}.tar.gz
https://github.com/chneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
checksum="4b9babc71fe0cdbc21ad0c5bc8bbe245d3f4c3ebb0c4f5211fd83e695f573247
64ea1fe8f93c72ce985f79ed1ae7f08b3f977e36c7ae6c5177687b4dfa60b4bb"
checksum="daa66f9b0ee231c228d98c2a801a7f6d5e43478f699ed6f3c669285f9d2a3296
0ba4401b046971cdf429c0620b7f9b6c6b21f1c7fe31b4e8604e6d5ef611caef"
post_extract() {
cd $build_wrksrc