netpbm: update to 10.68.01.

srcpkgs/netpbm/patches/netpbm-security-code.patch

@@ -759,18 +759,6 @@ diff -up netpbm-10.58.01/converter/ppm/ppmtopcx.c.security-code netpbm-10.58.01/
      BytesPerLine = ((cols * BitsPerPixel) + 7) / 8;
      MALLOCARRAY_NOFAIL(indexRow, cols);
      MALLOCARRAY_NOFAIL(planesrow, BytesPerLine);
-diff -up netpbm-10.58.01/converter/ppm/ppmtopict.c.security-code netpbm-10.58.01/converter/ppm/ppmtopict.c
---- netpbm-10.58.01/converter/ppm/ppmtopict.c.security-code	2012-04-09 15:31:42.000000000 +0200
-+++ netpbm-10.58.01/converter/ppm/ppmtopict.c	2012-04-09 15:40:03.211619690 +0200
-@@ -441,6 +441,8 @@ main(int argc, const char ** argv) {
-     putShort(stdout, 0);            /* mode */
- 
-     /* Finally, write out the data. */
-+    overflow_add(cols/MAX_COUNT, 1);
-+    overflow_add(cols, cols/MAX_COUNT+1);
-     packed = malloc((unsigned)(cols+cols/MAX_COUNT+1));
-     for (row = 0, oc = 0; row < rows; row++)
-         oc += putRow(stdout, row, cols, pixels[row], packed);
 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
@@ -1145,18 +1133,6 @@ diff -up netpbm-10.58.01/generator/pbmtext.c.security-code netpbm-10.58.01/gener
              hmargin = 2 * fontP->maxwidth;
          }
      }
-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. */
- 
--    MALLOCARRAY(aux, SCRX * SCRY);
-+    aux = (unsigned short *) malloc3(SCRX, SCRY, sizeof(short));
-     if (aux == NULL) 
-         pm_error("out of memory allocating elevation array");
- 
 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

srcpkgs/netpbm/template

@@ -1,14 +1,14 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.67.05
+version=10.68.01
 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 <chneukirchen@gmail.com>"
-license="BSD,GPL,LGPL,custom"
+license="BSD,GPL-2,custom"
 homepage="http://netpbm.sourceforge.net/"
 nocross=yes