diff --git a/.cvsignore b/.cvsignore
index 6d9a656..be6ce16 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,3 +6,5 @@ netpbm-nojbig-10.26.tar.bz2
 netpbmdoc-nojbig-10.26.tar.bz2
 netpbm-10.26.4.tar.bz2
 netpbmdoc-10.26.4.tar.bz2
+netpbm-10.27.tar.bz2
+netpbmdoc-10.27.tar.bz2
diff --git a/netpbm-10.22-security2.patch b/netpbm-10.22-security2.patch
index bc66443..fe6a6ea 100644
--- a/netpbm-10.22-security2.patch
+++ b/netpbm-10.22-security2.patch
@@ -1,109 +1,53 @@
---- netpbm-10.22/editor/ppmquantall.security2	2003-12-31 04:56:24.000000000 +0100
-+++ netpbm-10.22/editor/ppmquantall	2004-06-30 14:55:13.820546555 +0200
-@@ -63,13 +63,8 @@
-     heights=(${heights[*]} `grep -v '^#' $i | sed '1d; s/.* //; 2q'`)
- done
+--- netpbm-10.27/converter/other/anytopnm.security2	2004-10-13 17:05:53.000000000 +0200
++++ netpbm-10.27/converter/other/anytopnm	2005-03-29 14:03:43.449904176 +0200
+@@ -522,11 +522,7 @@ else
+     inputFile="-"
+ fi
  
--tempdir="${TMPDIR-/tmp}/ppmquantall.$$"
+-tempdir="${TMPDIR-/tmp}/anytopnm.$$"
 -mkdir $tempdir || { echo "Could not create temporary file. Exiting."; exit 1;}
 -chmod 700 $tempdir
 -
 -trap 'rm -rf $tempdir' 0 1 3 15
--
--all=$tempdir/pqa.all.$$
-+all=$(mktemp -t pqa.all.XXXXXXXXXX) || exit 1
-+rm -f $all
++tempdir=$(mktemp -d -t anytopnm.XXXXXXXXXX) || exit 1
  
- pnmcat -topbottom -jleft -white ${files[@]} | ppmquant $newcolors > $all
- if [ $? != 0 ]; then
---- netpbm-10.22/editor/pnmmargin.security2	2003-12-31 05:01:26.000000000 +0100
-+++ netpbm-10.22/editor/pnmmargin	2004-06-30 15:00:53.814556218 +0200
-@@ -11,16 +11,11 @@
- # documentation.  This software is provided "as is" without express or
- # implied warranty.
+ findAwk;
  
--tempdir="${TMPDIR-/tmp}/pnmmargin.$$"
--mkdir $tempdir || { echo "Could not create temporary file. Exiting."; exit 1;}
--chmod 700 $tempdir
--
--trap 'rm -rf $tempdir' 0 1 3 15
--
--tmp1=$tempdir/pnmm1
--tmp2=$tempdir/pnmm2
--tmp3=$tempdir/pnmm3
--tmp4=$tempdir/pnmm4
-+tmpdir=$(mktemp -d -t ppmmargin.XXXXXXX) || exit 1
-+tmp1="$tmpdir/tmp1"
-+tmp2="$tmpdir/tmp2"
-+tmp3="$tmpdir/tmp3"
-+tmp4="$tmpdir/tmp4"
- 
- color="-gofigure"
- 
-@@ -39,6 +34,9 @@
- 	shift
- 	if [ ! ${1-""} ] ; then
- 	    echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
-+            if [ -d "$tmpdir" ]; then
-+                rm -rf "$tmpdir"
-+            fi
- 	    exit 1
- 	fi
- 	color="$1"
-@@ -46,6 +44,9 @@
- 	;;
- 	-* )
- 	echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
-+        if [ -d "$tmpdir" ]; then
-+            rm -rf "$tmpdir"
-+        fi
- 	exit 1
- 	;;
- 	* )
-@@ -56,6 +57,9 @@
- 
- if [ ! ${1-""} ] ; then
-     echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
-+    if [ -d "$tmpdir" ]; then
-+        rm -rf "$tmpdir"
+@@ -549,9 +545,17 @@ if [ "$filetype" = "unknown" ]; then
+     echo "$progname: unknown file type.  " \
+         "'file' says mime type is '$mimeType', " 1>&2
+     echo "type description is '$typeDescription'" 1>&2
++    if [ -d "$tempdir" ] ; then
++        rm -rf "$tempdir"
 +    fi
-     exit 1
- fi
- size="$1"
-@@ -63,6 +67,9 @@
- 
- if [ ${2-""} ] ; then
-     echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
-+    if [ -d "$tmpdir" ]; then
-+        rm -rf "$tmpdir"
-+    fi
-     exit 1
- fi
- 
-@@ -86,3 +93,7 @@
- # Cat things together.
- pnmcat -lr $tmp2 $tmp1 $tmp2 > $tmp4
- pnmcat -tb $tmp3 $tmp4 $tmp3
 +
-+if [ -d "$tmpdir" ]; then
-+    rm -rf "$tmpdir"
+     exit 1
+     fi
+ 
+ convertIt $file $filetype
+ 
++if [ -d "$tempdir" ] ; then
++    rm -rf "$tempdir"
 +fi
---- netpbm-10.22/editor/pamstretch-gen.security2	2003-12-31 04:47:10.000000000 +0100
-+++ netpbm-10.22/editor/pamstretch-gen	2004-06-30 16:02:24.705968769 +0200
-@@ -31,10 +31,7 @@
-   exit 1
- fi
++
+ exit 0
+--- netpbm-10.27/converter/ppm/ppmtompeg/parallel.c.security2	2005-03-05 06:07:50.000000000 +0100
++++ netpbm-10.27/converter/ppm/ppmtompeg/parallel.c	2005-03-29 14:03:43.452903720 +0200
+@@ -1058,8 +1058,11 @@ GetRemoteFrame(MpegFrame * const frameP,
+             int numBytes;  /* Number of data bytes in message */
+             FILE * filePtr;
+             char fileName[256];
++#define TMPFILE_TEMPLATE "/tmp/ppmtompeg.XXXXXX"
  
--tempdir="${TMPDIR-/tmp}/pamstretch-gen.$$"
--mkdir $tempdir || { echo "Could not create temporary file. Exiting."; exit 1;}
--chmod 700 $tempdir
--tempfile=$tempdir/pnmig
-+tempfile=$(mktemp /tmp/pnmig.XXXXXXXXXX) || exit 1
+-            sprintf(fileName, "/tmp/foobar%d", machineNumber);
++            strcpy(fileName, TMPFILE_TEMPLATE);
++            if (-1 == mkstemp(fileName))
++                pm_error( "could not create temporary convolution file");
+             filePtr = fopen(fileName, "wb");
  
- trap 'rm -rf $tempdir' 0 1 3 15
- 
---- netpbm-10.22/editor/ppmfade.security2	2003-08-18 01:41:59.000000000 +0200
-+++ netpbm-10.22/editor/ppmfade	2004-06-30 14:51:08.412822427 +0200
+             /* read in stuff, write to file, perform local conversion */
+--- netpbm-10.27/editor/ppmfade.security2	2005-03-16 22:10:39.000000000 +0100
++++ netpbm-10.27/editor/ppmfade	2005-03-29 14:29:07.975141112 +0200
 @@ -14,6 +14,7 @@
  #
  #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
@@ -112,7 +56,7 @@
  
  my $SPREAD =  1;
  my $SHIFT =   2;
-@@ -116,20 +117,26 @@
+@@ -116,20 +117,26 @@ if ($first_file ne "undefined") {
  
  print("Frames are " . $width . "W x " . $height . "H\n");
  
@@ -143,7 +87,30 @@
  }
  
  #
-@@ -152,148 +159,150 @@
+@@ -137,14 +144,14 @@ if ($last_file eq "undefined") {
+ #
+ 
+ # Here's what our temporary files are:
+-#   junk1$$.ppm: The original (fade-from) image
+-#   junk2$$.ppm: The target (fade-from) image
+-#   junk3$$.ppm: The frame of the fade for the current iteration of the 
+-#                the for loop.
+-#   junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
+-#                 image to another, this is the first frame of that 
+-#                 sequence.
+-#   junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
++#   $tmpdir/junk1$$.ppm: The original (fade-from) image
++#   $tmpdir/junk2$$.ppm: The target (fade-from) image
++#   $tmpdir/junk3$$.ppm: The frame of the fade for the current iteration of the 
++#                	 the for loop.
++#   $tmpdir/junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
++#                         image to another, this is the first frame of that 
++#                         sequence.
++#   $tmpdir/junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
+ 
+ my $i;    # Frame number
+ for ($i = 1; $i <= $nframes; $i++) {
+@@ -152,148 +159,148 @@ for ($i = 1; $i <= $nframes; $i++) {
      if ($mode eq $SPREAD) {
          if ($i <= 10) {
              my $n = $spline20[$i] * 100;
@@ -295,34 +262,34 @@
 -            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
 -                   ">junk2o$$.ppm");
 +            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm j$tmpdir/unko$$.ppm $tmpdir/junko$$.ppm " .
++            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
 +                   ">$tmpdir/junk2o$$.ppm");
          }
      } elsif ($mode eq $BLOCK) {
          if ($i <= 10) {
              my $n = 1 - 1.9*$spline20[$i];
--            system("pnmscale $n junk1$$.ppm | " .
--                   "pnmscale -width $width -height $height >junk3$$.ppm");
-+            system("pnmscale $n $tmpdir/junk1$$.ppm | " .
-+                   "pnmscale -width $width -height $height >$tmpdir/junk3$$.ppm");
+-            system("pamscale $n junk1$$.ppm | " .
+-                   "pamscale -width $width -height $height >junk3$$.ppm");
++            system("pamscale $n $tmpdir/junk1$$.ppm | " .
++                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
          } elsif ($i <= 20) {
              my $n = $spline10[$i-10];
 -            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
 +            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
          } else {
              my $n = 1 - 1.9*$spline20[31-$i];
--            system("pnmscale $n junk2$$.ppm | " .
--                   "pnmscale -width $width -height $height >junk3$$.ppm");
-+            system("pnmscale $n $tmpdir/junk2$$.ppm | " .
-+                   "pnmscale -width $width -height $height >$tmpdir/junk3$$.ppm");
+-            system("pamscale $n junk2$$.ppm | " .
+-                   "pamscale -width $width -height $height >junk3$$.ppm");
++            system("pamscale $n $tmpdir/junk2$$.ppm | " .
++                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
          }
          if ($i == 10) {
 -            system("cp", "junk3$$.ppm", "junk1a$$.ppm");
--            system("pnmscale $n junk2$$.ppm | " .
--                   "pnmscale -width $width -height $height >junk2a$$.ppm");
+-            system("pamscale $n junk2$$.ppm | " .
+-                   "pamscale -width $width -height $height >junk2a$$.ppm");
 +            system("cp", "$tmpdir/junk3$$.ppm", "$tmpdir/junk1a$$.ppm");
-+            system("pnmscale $n $tmpdir/junk2$$.ppm | " .
-+                   "pnmscale -width $width -height $height >$tmpdir/junk2a$$.ppm");
++            system("pamscale $n $tmpdir/junk2$$.ppm | " .
++                   "pamscale -width $width -height $height >$tmpdir/junk2a$$.ppm");
          }    
      } elsif ($mode eq $MIX) {
          my $fade_factor = sqrt(1/($nframes-$i+1));
@@ -341,15 +308,117 @@
  #  Clean up shop.
  #
 -system("rm junk*$$.ppm");
-+#system("rm junk*$$.ppm");
-+# As the temporary files are automatically deleted, nothing is needed for
-+# cleanup any more.
++system("rm $tmpdir/junk*$$.ppm");
  
  exit(0);
  
---- netpbm-10.22/editor/ppmshadow.security2	2004-01-31 04:35:48.000000000 +0100
-+++ netpbm-10.22/editor/ppmshadow	2004-06-30 16:01:24.378413183 +0200
-@@ -27,9 +27,10 @@
+--- netpbm-10.27/editor/ppmquantall.security2	2005-03-17 00:44:03.000000000 +0100
++++ netpbm-10.27/editor/ppmquantall	2005-03-29 14:03:43.441905392 +0200
+@@ -63,13 +63,8 @@ for i in ${files[@]}; do
+     heights=(${heights[*]} `grep -v '^#' $i | sed '1d; s/.* //; 2q'`)
+ done
+ 
+-tempdir="${TMPDIR-/tmp}/ppmquantall.$$"
+-mkdir $tempdir || { echo "Could not create temporary file. Exiting."; exit 1;}
+-chmod 700 $tempdir
+-
+-trap 'rm -rf $tempdir' 0 1 3 15
+-
+-all=$tempdir/pqa.all.$$
++all=$(mktemp -t pqa.all.XXXXXXXXXX) || exit 1
++rm -f $all
+ 
+ pnmcat -topbottom -jleft -white ${files[@]} | pnmquant $newcolors > $all
+ if [ $? != 0 ]; then
+--- netpbm-10.27/editor/pnmmargin.security2	2003-12-31 05:01:26.000000000 +0100
++++ netpbm-10.27/editor/pnmmargin	2005-03-29 14:03:43.442905240 +0200
+@@ -11,16 +11,11 @@
+ # documentation.  This software is provided "as is" without express or
+ # implied warranty.
+ 
+-tempdir="${TMPDIR-/tmp}/pnmmargin.$$"
+-mkdir $tempdir || { echo "Could not create temporary file. Exiting."; exit 1;}
+-chmod 700 $tempdir
+-
+-trap 'rm -rf $tempdir' 0 1 3 15
+-
+-tmp1=$tempdir/pnmm1
+-tmp2=$tempdir/pnmm2
+-tmp3=$tempdir/pnmm3
+-tmp4=$tempdir/pnmm4
++tmpdir=$(mktemp -d -t ppmmargin.XXXXXXX) || exit 1
++tmp1="$tmpdir/tmp1"
++tmp2="$tmpdir/tmp2"
++tmp3="$tmpdir/tmp3"
++tmp4="$tmpdir/tmp4"
+ 
+ color="-gofigure"
+ 
+@@ -39,6 +34,9 @@ while true ; do
+ 	shift
+ 	if [ ! ${1-""} ] ; then
+ 	    echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
++            if [ -d "$tmpdir" ]; then
++                rm -rf "$tmpdir"
++            fi
+ 	    exit 1
+ 	fi
+ 	color="$1"
+@@ -46,6 +44,9 @@ while true ; do
+ 	;;
+ 	-* )
+ 	echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
++        if [ -d "$tmpdir" ]; then
++            rm -rf "$tmpdir"
++        fi
+ 	exit 1
+ 	;;
+ 	* )
+@@ -56,6 +57,9 @@ done
+ 
+ if [ ! ${1-""} ] ; then
+     echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
++    if [ -d "$tmpdir" ]; then
++        rm -rf "$tmpdir"
++    fi
+     exit 1
+ fi
+ size="$1"
+@@ -63,6 +67,9 @@ shift
+ 
+ if [ ${2-""} ] ; then
+     echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
++    if [ -d "$tmpdir" ]; then
++        rm -rf "$tmpdir"
++    fi
+     exit 1
+ fi
+ 
+@@ -86,3 +93,7 @@ pamflip -rotate90 $tmp2 > $tmp3
+ # Cat things together.
+ pnmcat -lr $tmp2 $tmp1 $tmp2 > $tmp4
+ pnmcat -tb $tmp3 $tmp4 $tmp3
++
++if [ -d "$tmpdir" ]; then
++    rm -rf "$tmpdir"
++fi
+--- netpbm-10.27/editor/pamstretch-gen.security2	2004-07-25 02:01:24.000000000 +0200
++++ netpbm-10.27/editor/pamstretch-gen	2005-03-29 14:03:43.443905088 +0200
+@@ -31,10 +31,7 @@ if [ "$1" = "" ]; then
+   exit 1
+ fi
+ 
+-tempdir="${TMPDIR-/tmp}/pamstretch-gen.$$"
+-mkdir $tempdir || { echo "Could not create temporary file. Exiting."; exit 1;}
+-chmod 700 $tempdir
+-tempfile=$tempdir/pnmig
++tempfile=$(mktemp /tmp/pnmig.XXXXXXXXXX) || exit 1
+ 
+ trap 'rm -rf $tempdir' 0 1 3 15
+ 
+--- netpbm-10.27/editor/ppmshadow.security2	2005-03-16 22:10:25.000000000 +0100
++++ netpbm-10.27/editor/ppmshadow	2005-03-29 14:03:43.447904480 +0200
+@@ -27,9 +27,10 @@ use strict;
  my $true=1; my $false=0;
  
  my $tmpdir = $ENV{TMPDIR} || "/tmp";
@@ -363,51 +432,3 @@
  
  #   Process command line options
  
---- netpbm-10.22/converter/other/anytopnm.security2	2003-12-31 04:49:34.000000000 +0100
-+++ netpbm-10.22/converter/other/anytopnm	2004-06-30 14:58:25.242904602 +0200
-@@ -503,11 +503,7 @@
-     inputFile="-"
- fi
- 
--tempdir="${TMPDIR-/tmp}/anytopnm.$$"
--mkdir $tempdir || { echo "Could not create temporary file. Exiting."; exit 1;}
--chmod 700 $tempdir
--
--trap 'rm -rf $tempdir' 0 1 3 15
-+tempdir=$(mktemp -d -t anytopnm.XXXXXXXXXX) || exit 1
- 
- # Take out all spaces
- # Find the filename extension for last-ditch efforts later
-@@ -528,9 +524,17 @@
-     echo "$progname: unknown file type.  " \
-         "'file' says mime type is '$mimeType', " 1>&2
-     echo "type description is '$typeDescription'" 1>&2
-+    if [ -d "$tempdir" ] ; then
-+        rm -rf "$tempdir"
-+    fi
-+
-     exit 1
-     fi
- 
- convertIt $file $filetype
- 
-+if [ -d "$tempdir" ] ; then
-+    rm -rf "$tempdir"
-+fi
-+
- exit 0
---- netpbm-10.22/converter/ppm/ppmtompeg/parallel.c.security2	2004-06-30 14:51:08.365828224 +0200
-+++ netpbm-10.22/converter/ppm/ppmtompeg/parallel.c	2004-06-30 14:51:08.409822797 +0200
-@@ -609,8 +609,11 @@
-             int numBytes;  /* Number of data bytes in message */
-             FILE * filePtr;
-             char fileName[256];
-+#define TMPFILE_TEMPLATE "/tmp/ppmtompeg.XXXXXX"
- 
--            sprintf(fileName, "/tmp/foobar%d", machineNumber);
-+            strcpy(fileName, TMPFILE_TEMPLATE);
-+            if (-1 == mkstemp(fileName))
-+                pm_error( "could not create temporary convolution file");
-             filePtr = fopen(fileName, "wb");
- 
-             /* read in stuff, SafeWrite to file, perform local conversion */
diff --git a/netpbm-10.23-security.patch b/netpbm-10.23-security.patch
index 3ffbe8b..35066c3 100644
--- a/netpbm-10.23-security.patch
+++ b/netpbm-10.23-security.patch
@@ -1,5 +1,5 @@
---- netpbm-10.26/generator/ppmrainbow.security	2003-01-04 01:40:56.000000000 +0100
-+++ netpbm-10.26/generator/ppmrainbow	2005-01-05 12:58:55.271594824 +0100
+--- netpbm-10.27/generator/ppmrainbow.security	2003-01-04 01:40:56.000000000 +0100
++++ netpbm-10.27/generator/ppmrainbow	2005-03-29 14:31:42.980576704 +0200
 @@ -11,7 +11,7 @@ my ($Twid, $Thgt, $tmpdir, $norepeat, $v
  # set defaults
  $Twid = 600;
@@ -9,8 +9,8 @@
  $norepeat = $FALSE;
  $verbose = $FALSE;
  
---- netpbm-10.26/generator/pbmpage.c.security	2003-07-09 20:48:11.000000000 +0200
-+++ netpbm-10.26/generator/pbmpage.c	2005-01-05 12:58:55.272594672 +0100
+--- netpbm-10.27/generator/pbmpage.c.security	2003-07-09 20:48:11.000000000 +0200
++++ netpbm-10.27/generator/pbmpage.c	2005-03-29 14:31:42.981576552 +0200
 @@ -15,6 +15,7 @@
  #include <math.h>
  #include <stdio.h>
@@ -29,8 +29,8 @@
      pbmrow = pbm_allocrow(((Width+7)/8)*8);
      
      bitmap_cursor = 0;
---- netpbm-10.26/generator/pbmtext.c.security	2004-12-08 05:56:06.000000000 +0100
-+++ netpbm-10.26/generator/pbmtext.c	2005-01-05 13:02:17.595836864 +0100
+--- netpbm-10.27/generator/pbmtext.c.security	2004-12-08 05:56:06.000000000 +0100
++++ netpbm-10.27/generator/pbmtext.c	2005-03-29 14:31:42.982576400 +0200
 @@ -89,12 +89,14 @@ parse_command_line(int argc, char ** arg
          
          for (i = 1; i < argc; i++) {
@@ -93,8 +93,8 @@
      bits = pbm_allocarray(cols, rows);
  
      /* Fill background with white */
---- netpbm-10.26/generator/pgmcrater.c.security	2003-07-06 22:02:41.000000000 +0200
-+++ netpbm-10.26/generator/pgmcrater.c	2005-01-05 12:58:55.274594368 +0100
+--- netpbm-10.27/generator/pgmcrater.c.security	2003-07-06 22:02:41.000000000 +0200
++++ netpbm-10.27/generator/pgmcrater.c	2005-03-29 14:31:42.983576248 +0200
 @@ -131,7 +131,7 @@ static void gencraters()
      /* Acquire the elevation array and initialise it to mean
         surface elevation. */
@@ -104,8 +104,8 @@
      if (aux == NULL) 
          pm_error("out of memory allocating elevation array");
  
---- netpbm-10.26/generator/pgmkernel.c.security	2003-07-06 22:03:29.000000000 +0200
-+++ netpbm-10.26/generator/pgmkernel.c	2005-01-05 12:58:55.275594216 +0100
+--- netpbm-10.27/generator/pgmkernel.c.security	2003-07-06 22:03:29.000000000 +0200
++++ netpbm-10.27/generator/pgmkernel.c	2005-03-29 14:31:42.984576096 +0200
 @@ -68,7 +68,7 @@ main ( argc, argv )
      kycenter = (fysize - 1) / 2.0;
      ixsize = fxsize + 0.999;
@@ -115,8 +115,8 @@
      for (i = 0; i < iysize; i++) 
          for (j = 0; j < ixsize; j++) {
              fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double)
---- netpbm-10.26/converter/other/pbmtopgm.c.security	2004-09-18 05:15:02.000000000 +0200
-+++ netpbm-10.26/converter/other/pbmtopgm.c	2005-01-05 12:58:55.276594064 +0100
+--- netpbm-10.27/converter/other/pbmtopgm.c.security	2004-09-18 05:15:02.000000000 +0200
++++ netpbm-10.27/converter/other/pbmtopgm.c	2005-03-29 14:31:42.985575944 +0200
 @@ -45,6 +45,7 @@ main(int argc, char *argv[]) {
                   "than the image height (%u rows)", height, rows);
  
@@ -125,8 +125,8 @@
      maxval = MIN(PGM_OVERALLMAXVAL, width*height);
      pgm_writepgminit(stdout, cols, rows, maxval, 0) ;
  
---- netpbm-10.26/converter/other/sirtopnm.c.security	2002-01-04 18:22:45.000000000 +0100
-+++ netpbm-10.26/converter/other/sirtopnm.c	2005-01-05 12:58:55.277593912 +0100
+--- netpbm-10.27/converter/other/sirtopnm.c.security	2002-01-04 18:22:45.000000000 +0100
++++ netpbm-10.27/converter/other/sirtopnm.c	2005-03-29 14:31:42.986575792 +0200
 @@ -69,6 +69,7 @@ char* argv[];
  	    }
  	    break;
@@ -135,8 +135,8 @@
  	    picsize = cols * rows * 3;
  	    planesize = cols * rows;
              if ( !( sirarray = (unsigned char*) malloc( picsize ) ) ) 
---- netpbm-10.26/converter/other/sgitopnm.c.security	2003-07-10 05:42:28.000000000 +0200
-+++ netpbm-10.26/converter/other/sgitopnm.c	2005-01-05 12:58:55.278593760 +0100
+--- netpbm-10.27/converter/other/sgitopnm.c.security	2003-07-10 05:42:28.000000000 +0200
++++ netpbm-10.27/converter/other/sgitopnm.c	2005-03-29 14:31:42.987575640 +0200
 @@ -252,13 +252,17 @@ read_channels(ifp, head, table, func, oc
  
      if (ochan < 0) {
@@ -156,8 +156,8 @@
  
      for( channel = 0; channel < maxchannel;  channel++ ) {
  #ifdef DEBUG
---- netpbm-10.26/converter/other/pnmtosgi.c.security	2003-07-10 06:04:07.000000000 +0200
-+++ netpbm-10.26/converter/other/pnmtosgi.c	2005-01-05 12:58:55.279593608 +0100
+--- netpbm-10.27/converter/other/pnmtosgi.c.security	2003-07-10 06:04:07.000000000 +0200
++++ netpbm-10.27/converter/other/pnmtosgi.c	2005-03-29 14:31:42.988575488 +0200
 @@ -213,6 +213,22 @@ write_channels(cols, rows, channels, put
      }
  }
@@ -198,9 +198,9 @@
              len = rle_compress(temp, cols);    /* writes result into rletemp */
              channel[chan_no][row].length = len;
              MALLOCARRAY(p, len);
---- netpbm-10.26/converter/other/tifftopnm.c.security	2004-10-16 19:41:17.000000000 +0200
-+++ netpbm-10.26/converter/other/tifftopnm.c	2005-01-05 12:58:55.281593304 +0100
-@@ -736,7 +736,8 @@ convertRasterByRows(FILE *         const
+--- netpbm-10.27/converter/other/tifftopnm.c.security	2005-03-28 01:32:05.000000000 +0200
++++ netpbm-10.27/converter/other/tifftopnm.c	2005-03-29 14:31:42.990575184 +0200
+@@ -742,7 +742,8 @@ convertRasterByRows(FILE *         const
      if (scanbuf == NULL)
          pm_error("can't allocate memory for scanline buffer");
  
@@ -210,8 +210,8 @@
      if (samplebuf == NULL)
          pm_error ("can't allocate memory for row buffer");
  
---- netpbm-10.26/converter/other/pnmtorle.c.security	2003-07-10 06:04:49.000000000 +0200
-+++ netpbm-10.26/converter/other/pnmtorle.c	2005-01-05 12:58:55.283593000 +0100
+--- netpbm-10.27/converter/other/pnmtorle.c.security	2003-07-10 06:04:49.000000000 +0200
++++ netpbm-10.27/converter/other/pnmtorle.c	2005-03-29 14:31:42.992574880 +0200
 @@ -19,6 +19,8 @@
   * If you modify this software, you should include a notice giving the
   * name of the person performing the modification, the date of modification,
@@ -221,8 +221,8 @@
   */
  /*
   * pnmtorle - A program which will convert pbmplus (ppm or pgm) images
---- netpbm-10.26/converter/other/jpegtopnm.c.security	2004-10-26 06:20:07.000000000 +0200
-+++ netpbm-10.26/converter/other/jpegtopnm.c	2005-01-05 12:58:55.285592696 +0100
+--- netpbm-10.27/converter/other/jpegtopnm.c.security	2004-10-26 06:20:07.000000000 +0200
++++ netpbm-10.27/converter/other/jpegtopnm.c	2005-03-29 14:31:42.993574728 +0200
 @@ -828,6 +828,7 @@ convertImage(FILE *                     
      /* Calculate output image dimensions so we can allocate space */
      jpeg_calc_output_dimensions(cinfoP);
@@ -231,8 +231,8 @@
      jpegbuffer = ((*cinfoP->mem->alloc_sarray)
                    ((j_common_ptr) cinfoP, JPOOL_IMAGE,
                     cinfoP->output_width * cinfoP->output_components, 
---- netpbm-10.26/converter/other/rletopnm.c.security	2004-10-19 17:36:22.000000000 +0200
-+++ netpbm-10.26/converter/other/rletopnm.c	2005-01-05 12:58:55.286592544 +0100
+--- netpbm-10.27/converter/other/rletopnm.c.security	2004-10-19 17:36:22.000000000 +0200
++++ netpbm-10.27/converter/other/rletopnm.c	2005-03-29 14:31:42.995574424 +0200
 @@ -19,6 +19,8 @@
   * If you modify this software, you should include a notice giving the
   * name of the person performing the modification, the date of modification,
@@ -242,9 +242,9 @@
   */
  /*
   * rletopnm - A conversion program to convert from Utah's "rle" image format
---- netpbm-10.26/converter/other/pnmtotiff.c.security	2003-05-19 18:39:10.000000000 +0200
-+++ netpbm-10.26/converter/other/pnmtotiff.c	2005-01-05 12:58:55.287592392 +0100
-@@ -611,11 +611,14 @@ computeRasterParm(int              const
+--- netpbm-10.27/converter/other/pnmtotiff.c.security	2005-03-28 01:16:55.000000000 +0200
++++ netpbm-10.27/converter/other/pnmtotiff.c	2005-03-29 14:31:42.996574272 +0200
+@@ -620,11 +620,14 @@ computeRasterParm(int              const
      if (*bitspersampleP < 8) {
          int samplesperbyte;
          samplesperbyte = 8 / *bitspersampleP;
@@ -261,8 +261,8 @@
      if (requested_rowsperstrip == -1 )
          *rowsperstripP = (8 * 1024) / *bytesperrowP;
      else 
---- netpbm-10.26/converter/other/pnmtopalm/palmcolormap.c.security	2004-10-16 19:50:24.000000000 +0200
-+++ netpbm-10.26/converter/other/pnmtopalm/palmcolormap.c	2005-01-05 12:58:55.288592240 +0100
+--- netpbm-10.27/converter/other/pnmtopalm/palmcolormap.c.security	2004-10-16 19:50:24.000000000 +0200
++++ netpbm-10.27/converter/other/pnmtopalm/palmcolormap.c	2005-03-29 14:31:42.998573968 +0200
 @@ -232,7 +232,7 @@ Colormap
      return 0;
  
@@ -272,9 +272,9 @@
    colormap->nentries = ncolors;
    colormap->ncolors = ncolors;
  
---- netpbm-10.26/converter/other/pngtopnm.c.security	2004-04-04 02:18:34.000000000 +0200
-+++ netpbm-10.26/converter/other/pngtopnm.c	2005-01-05 12:58:55.290591936 +0100
-@@ -612,18 +612,30 @@ convertpng (FILE * const ifp, FILE * con
+--- netpbm-10.27/converter/other/pngtopnm.c.security	2005-03-25 06:08:44.000000000 +0100
++++ netpbm-10.27/converter/other/pngtopnm.c	2005-03-29 14:31:42.999573816 +0200
+@@ -744,18 +744,30 @@ convertpng (FILE *             const ifp
    }
  
    if (info_ptr->bit_depth == 16)
@@ -305,8 +305,8 @@
  
    for (y = 0 ; y < info_ptr->height ; y++) {
      png_image[y] = malloc (linesize);
---- netpbm-10.26/converter/other/gemtopnm.c.security	2004-09-18 05:15:23.000000000 +0200
-+++ netpbm-10.26/converter/other/gemtopnm.c	2005-01-05 12:58:55.291591784 +0100
+--- netpbm-10.27/converter/other/gemtopnm.c.security	2004-09-18 05:15:23.000000000 +0200
++++ netpbm-10.27/converter/other/gemtopnm.c	2005-03-29 14:31:43.001573512 +0200
 @@ -106,6 +106,7 @@ main(argc, argv)
  
  	pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 );
@@ -315,8 +315,8 @@
      { 
          /* allocate input row data structure */
          int plane;
---- netpbm-10.26/converter/other/pnmtojpeg.c.security	2005-01-05 12:58:55.266595584 +0100
-+++ netpbm-10.26/converter/other/pnmtojpeg.c	2005-01-05 12:58:55.292591632 +0100
+--- netpbm-10.27/converter/other/pnmtojpeg.c.security	2005-03-29 14:31:42.974577616 +0200
++++ netpbm-10.27/converter/other/pnmtojpeg.c	2005-03-29 14:31:43.002573360 +0200
 @@ -588,6 +588,8 @@ compute_rescaling_array(JSAMPLE ** const
    const long half_maxval = maxval / 2;
    long val;
@@ -347,38 +347,36 @@
              (jpeg_scan_info *)
              (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
                                          scan_info_size);
---- netpbm-10.26/converter/other/pnmtops.c.security	2004-05-29 20:13:26.000000000 +0200
-+++ netpbm-10.26/converter/other/pnmtops.c	2005-01-05 12:58:55.299590568 +0100
-@@ -147,16 +147,24 @@ parse_command_line(int argc, char ** arg
- 
-     cmdlineP->center  = !nocenter;
-     cmdlineP->canturn = !noturn;
--    
-+
+--- netpbm-10.27/converter/other/pnmtops.c.security	2005-01-06 02:04:39.000000000 +0100
++++ netpbm-10.27/converter/other/pnmtops.c	2005-03-29 14:41:36.063414408 +0200
+@@ -187,16 +187,21 @@ parseCommandLine(int argc, char ** argv,
+     cmdlineP->canturn =  !noturn;
+     cmdlineP->showpage = !noshowpage;
+     
 +    overflow2(width, 72);
-+    overflow2(height, 72);    
      cmdlineP->width  = width * 72;
++    overflow2(width, 72);
      cmdlineP->height = height * 72;
--
-+    
-     if (imagewidth_spec)
-+    {
-         cmdlineP->imagewidth = imagewidth * 72;
+ 
+-    if (imagewidth_spec)
++    if (imagewidth_spec) {
 +        overflow2(imagewidth, 72);
+         cmdlineP->imagewidth = imagewidth * 72;
 +    }
      else
          cmdlineP->imagewidth = 0;
-     if (imageheight_spec)
-+    {
-+    	overflow2(imageheight, 72);
+-    if (imageheight_spec)
++    if (imageheight_spec) {
++        overflow2(imagewidth, 72);
          cmdlineP->imageheight = imageheight * 72;
-+    }
-     else
+-    else
++    } else
          cmdlineP->imageheight = 0;
  
---- netpbm-10.26/converter/other/xwdtopnm.c.security	2004-11-09 20:51:36.000000000 +0100
-+++ netpbm-10.26/converter/other/xwdtopnm.c	2005-01-05 12:58:55.301590264 +0100
-@@ -243,6 +243,9 @@ processX10Header(X10WDFileHeader *  cons
+     if (!cmdlineP->psfilter &&
+--- netpbm-10.27/converter/other/xwdtopnm.c.security	2005-01-02 19:36:02.000000000 +0100
++++ netpbm-10.27/converter/other/xwdtopnm.c	2005-03-29 14:31:43.007572600 +0200
+@@ -247,6 +247,9 @@ processX10Header(X10WDFileHeader *  cons
          *colorsP = pnm_allocrow( 2 );
          PNM_ASSIGN1( (*colorsP)[0], 0 );
          PNM_ASSIGN1( (*colorsP)[1], *maxvalP );
@@ -388,7 +386,7 @@
          *padrightP =
              ( ( h10P->pixmap_width + 15 ) / 16 ) * 16 - h10P->pixmap_width;
          *bits_per_itemP = 16;
-@@ -252,9 +255,13 @@ processX10Header(X10WDFileHeader *  cons
+@@ -256,9 +259,13 @@ processX10Header(X10WDFileHeader *  cons
          *formatP = PGM_TYPE;
          *visualclassP = StaticGray;
          *maxvalP = ( 1 << h10P->display_planes ) - 1;
@@ -402,7 +400,7 @@
          *padrightP =
              ( ( h10P->pixmap_width + 15 ) / 16 ) * 16 - h10P->pixmap_width;
          *bits_per_itemP = 16;
-@@ -572,6 +579,7 @@ processX11Header(X11WDFileHeader *  cons
+@@ -577,6 +584,7 @@ processX11Header(X11WDFileHeader *  cons
  
      *colsP = h11FixedP->pixmap_width;
      *rowsP = h11FixedP->pixmap_height;
@@ -410,8 +408,8 @@
      *padrightP =
          h11FixedP->bytes_per_line * 8 / h11FixedP->bits_per_pixel -
          h11FixedP->pixmap_width;
---- netpbm-10.26/converter/other/pnmtoddif.c.security	2002-07-30 19:09:13.000000000 +0200
-+++ netpbm-10.26/converter/other/pnmtoddif.c	2005-01-05 12:58:55.303589960 +0100
+--- netpbm-10.27/converter/other/pnmtoddif.c.security	2002-07-30 19:09:13.000000000 +0200
++++ netpbm-10.27/converter/other/pnmtoddif.c	2005-03-29 14:31:43.008572448 +0200
 @@ -484,6 +484,7 @@ int main(int argc, char *argv[])
      switch (PNM_FORMAT_TYPE(format)) {
      case PBM_TYPE:
@@ -428,8 +426,8 @@
          ip.bytes_per_line = 3 * cols;
          ip.bits_per_pixel = 24;
          ip.spectral = 5;
---- netpbm-10.26/converter/ppm/ppmtomitsu.c.security	2003-07-06 23:04:25.000000000 +0200
-+++ netpbm-10.26/converter/ppm/ppmtomitsu.c	2005-01-05 12:58:55.304589808 +0100
+--- netpbm-10.27/converter/ppm/ppmtomitsu.c.security	2003-07-06 23:04:25.000000000 +0200
++++ netpbm-10.27/converter/ppm/ppmtomitsu.c	2005-03-29 14:31:43.010572144 +0200
 @@ -164,6 +164,8 @@ int main( argc, argv )
          medias = MSize_User;
  
@@ -439,8 +437,8 @@
                  medias.maxcols *= 2;
                  medias.maxrows *= 2;
          }
---- netpbm-10.26/converter/ppm/ppmtompeg/psearch.c.security	2002-10-14 04:22:16.000000000 +0200
-+++ netpbm-10.26/converter/ppm/ppmtompeg/psearch.c	2005-01-05 12:58:55.305589656 +0100
+--- netpbm-10.27/converter/ppm/ppmtompeg/psearch.c.security	2002-10-14 04:22:16.000000000 +0200
++++ netpbm-10.27/converter/ppm/ppmtompeg/psearch.c	2005-03-29 14:31:43.011571992 +0200
 @@ -217,7 +217,14 @@ SetSearchRange(int const pixelsP, int co
          int const max_search = max(searchRangeP, searchRangeB);
  
@@ -487,9 +485,9 @@
      columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int));
  
  #ifdef COMPLETE_DISPLAY
---- netpbm-10.26/converter/ppm/ppmtompeg/parallel.c.security	2005-01-05 12:58:55.256597104 +0100
-+++ netpbm-10.26/converter/ppm/ppmtompeg/parallel.c	2005-01-05 12:58:55.307589352 +0100
-@@ -2122,7 +2122,9 @@ DecodeServer(int          const numInput
+--- netpbm-10.27/converter/ppm/ppmtompeg/parallel.c.security	2005-03-29 14:31:42.959579896 +0200
++++ netpbm-10.27/converter/ppm/ppmtompeg/parallel.c	2005-03-29 14:31:43.014571536 +0200
+@@ -2124,7 +2124,9 @@ DecodeServer(int          const numInput
      const char * error;
  
      /* should keep list of port numbers to notify when frames become ready */
@@ -500,8 +498,8 @@
      ready = (boolean *) calloc(numInputFiles, sizeof(boolean));
      waitMachine = (int *) calloc(numInputFiles, sizeof(int));
      waitPort = (int *) malloc(numMachines*sizeof(int));
---- netpbm-10.26/converter/ppm/ppmtompeg/jpeg.c.security	2002-10-17 16:49:49.000000000 +0200
-+++ netpbm-10.26/converter/ppm/ppmtompeg/jpeg.c	2005-01-05 12:58:55.308589200 +0100
+--- netpbm-10.27/converter/ppm/ppmtompeg/jpeg.c.security	2002-10-17 16:49:49.000000000 +0200
++++ netpbm-10.27/converter/ppm/ppmtompeg/jpeg.c	2005-03-29 14:31:43.015571384 +0200
 @@ -228,7 +228,7 @@ int end;                /* last frame to
        exit(1);
      }  
@@ -511,8 +509,8 @@
      
    if (fread (&(width),sizeof(int),1,inFile) != 1)
      {
---- netpbm-10.26/converter/ppm/ppmtompeg/rgbtoycc.c.security	2004-11-13 23:13:03.000000000 +0100
-+++ netpbm-10.26/converter/ppm/ppmtompeg/rgbtoycc.c	2005-01-05 12:58:55.308589200 +0100
+--- netpbm-10.27/converter/ppm/ppmtompeg/rgbtoycc.c.security	2004-11-13 23:13:03.000000000 +0100
++++ netpbm-10.27/converter/ppm/ppmtompeg/rgbtoycc.c	2005-03-29 14:31:43.016571232 +0200
 @@ -72,6 +72,8 @@ compute_mult_tables(const pixval maxval)
          } 
          table_maxval = maxval;
@@ -522,8 +520,8 @@
          mult299   = malloc((table_maxval+1)*sizeof(float));
          mult587   = malloc((table_maxval+1)*sizeof(float));
          mult114   = malloc((table_maxval+1)*sizeof(float));
---- netpbm-10.26/converter/ppm/ppmtompeg/frame.c.security	2004-11-27 00:44:01.000000000 +0100
-+++ netpbm-10.26/converter/ppm/ppmtompeg/frame.c	2005-01-05 12:58:55.309589048 +0100
+--- netpbm-10.27/converter/ppm/ppmtompeg/frame.c.security	2004-11-27 00:44:01.000000000 +0100
++++ netpbm-10.27/converter/ppm/ppmtompeg/frame.c	2005-03-29 14:31:43.018570928 +0200
 @@ -137,24 +137,24 @@ int i;
  omfrw->orig_y = NULL;
  Fsize_x = out_x;
@@ -704,8 +702,8 @@
      ERRCHK(frame->decoded_cb[y], "malloc");
      }
  
---- netpbm-10.26/converter/ppm/ppmtompeg/iframe.c.security	2004-11-27 04:58:15.000000000 +0100
-+++ netpbm-10.26/converter/ppm/ppmtompeg/iframe.c	2005-01-05 12:58:55.310588896 +0100
+--- netpbm-10.27/converter/ppm/ppmtompeg/iframe.c.security	2004-11-27 04:58:15.000000000 +0100
++++ netpbm-10.27/converter/ppm/ppmtompeg/iframe.c	2005-03-29 14:31:43.020570624 +0200
 @@ -859,6 +859,7 @@ BlockComputeSNR(current, snr, psnr)
      int ysz = (Fsize_y>>3) * sizeof(int32 *);
      int xsz = (Fsize_x>>3);
@@ -758,8 +756,8 @@
      ERRCHK(dctr[i], "malloc");
      ERRCHK(dctb[i], "malloc");
      }
---- netpbm-10.26/converter/ppm/ppmtowinicon.c.security	2004-05-01 21:00:55.000000000 +0200
-+++ netpbm-10.26/converter/ppm/ppmtowinicon.c	2005-01-05 12:58:55.311588744 +0100
+--- netpbm-10.27/converter/ppm/ppmtowinicon.c.security	2004-05-01 21:00:55.000000000 +0200
++++ netpbm-10.27/converter/ppm/ppmtowinicon.c	2005-03-29 14:31:43.022570320 +0200
 @@ -12,6 +12,7 @@
  
  #include <math.h>
@@ -818,8 +816,8 @@
      MSIconData->entries[MSIconData->count-1] = entry;
  }
  
---- netpbm-10.26/converter/ppm/ppmtolj.c.security	2002-09-06 18:31:57.000000000 +0200
-+++ netpbm-10.26/converter/ppm/ppmtolj.c	2005-01-05 12:58:55.312588592 +0100
+--- netpbm-10.27/converter/ppm/ppmtolj.c.security	2002-09-06 18:31:57.000000000 +0200
++++ netpbm-10.27/converter/ppm/ppmtolj.c	2005-03-29 14:31:43.023570168 +0200
 @@ -182,6 +182,7 @@ int main(int argc, char *argv[]) {
      pixels = ppm_readppm( ifp, &cols, &rows, &maxval );
  
@@ -828,9 +826,9 @@
      obuf = (unsigned char *) pm_allocrow(cols * 3, sizeof(unsigned char));
      cbuf = (unsigned char *) pm_allocrow(cols * 6, sizeof(unsigned char));
      if (mode == C_TRANS_MODE_DELTA)
---- netpbm-10.26/converter/ppm/Makefile.security	2005-01-04 13:56:51.000000000 +0100
-+++ netpbm-10.26/converter/ppm/Makefile	2005-01-05 12:58:55.313588440 +0100
-@@ -11,7 +11,7 @@ SUBDIRS = ppmtompeg
+--- netpbm-10.27/converter/ppm/Makefile.security	2004-10-16 20:55:28.000000000 +0200
++++ netpbm-10.27/converter/ppm/Makefile	2005-03-29 14:31:43.024570016 +0200
+@@ -11,7 +11,7 @@ SUBDIRS = hpcdtoppm ppmtompeg
  
  PORTBINARIES =	411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
  		leaftoppm mtvtoppm neotoppm \
@@ -839,8 +837,8 @@
  		ppmtoacad ppmtoarbtxt \
  		ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \
  		ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \
---- netpbm-10.26/converter/ppm/ximtoppm.c.security	2004-10-19 17:35:17.000000000 +0200
-+++ netpbm-10.26/converter/ppm/ximtoppm.c	2005-01-05 12:58:55.314588288 +0100
+--- netpbm-10.27/converter/ppm/ximtoppm.c.security	2004-10-19 17:35:17.000000000 +0200
++++ netpbm-10.27/converter/ppm/ximtoppm.c	2005-03-29 14:31:43.025569864 +0200
 @@ -283,6 +283,7 @@ ReadXimHeader(in_fp, header)
      header->bits_channel = atoi(a_head.bits_per_channel);
      header->alpha_flag = atoi(a_head.alpha_channel);
@@ -873,16 +871,16 @@
          header->colors = (Color *)calloc((unsigned int)header->ncolors,
                  sizeof(Color));
          if (header->colors == NULL) {
---- netpbm-10.26/converter/ppm/picttoppm.c.security	2004-03-31 21:19:44.000000000 +0200
-+++ netpbm-10.26/converter/ppm/picttoppm.c	2005-01-05 12:58:55.315588136 +0100
+--- netpbm-10.27/converter/ppm/picttoppm.c.security	2005-02-20 22:36:52.000000000 +0100
++++ netpbm-10.27/converter/ppm/picttoppm.c	2005-03-29 14:31:43.027569560 +0200
 @@ -1,3 +1,5 @@
 +#error "Unfixable. Don't ship me"
 +
  /*
   * picttoppm.c -- convert a MacIntosh PICT file to PPM format.
   *
---- netpbm-10.26/converter/ppm/pjtoppm.c.security	2003-07-06 23:45:36.000000000 +0200
-+++ netpbm-10.26/converter/ppm/pjtoppm.c	2005-01-05 12:58:55.316587984 +0100
+--- netpbm-10.27/converter/ppm/pjtoppm.c.security	2003-07-06 23:45:36.000000000 +0200
++++ netpbm-10.27/converter/ppm/pjtoppm.c	2005-03-29 14:31:43.028569408 +0200
 @@ -127,19 +127,21 @@ main(argc, argv)
                  case 'V':   /* send plane */
                  case 'W':   /* send last plane */
@@ -932,8 +930,8 @@
          cols *= 8;
      }
              
---- netpbm-10.26/converter/ppm/sldtoppm.c.security	2004-02-21 22:55:39.000000000 +0100
-+++ netpbm-10.26/converter/ppm/sldtoppm.c	2005-01-05 12:58:55.317587832 +0100
+--- netpbm-10.27/converter/ppm/sldtoppm.c.security	2004-02-21 22:55:39.000000000 +0100
++++ netpbm-10.27/converter/ppm/sldtoppm.c	2005-03-29 14:31:43.030569104 +0200
 @@ -306,7 +306,9 @@ static void slider(slvec, slflood)
      }
  
@@ -945,8 +943,8 @@
      pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1);
      PPM_ASSIGN(rgbcolour, 0, 0, 0);
      ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0,
---- netpbm-10.26/converter/ppm/ppmtopj.c.security	2002-09-06 18:32:14.000000000 +0200
-+++ netpbm-10.26/converter/ppm/ppmtopj.c	2005-01-05 12:58:55.318587680 +0100
+--- netpbm-10.27/converter/ppm/ppmtopj.c.security	2002-09-06 18:32:14.000000000 +0200
++++ netpbm-10.27/converter/ppm/ppmtopj.c	2005-03-29 14:31:43.031568952 +0200
 @@ -180,6 +180,7 @@ char *argv[];
  	pixels = ppm_readppm( ifp, &cols, &rows, &maxval );
  
@@ -955,8 +953,8 @@
  	obuf = (unsigned char *) pm_allocrow(cols, sizeof(unsigned char));
  	cbuf = (unsigned char *) pm_allocrow(cols * 2, sizeof(unsigned char));
  
---- netpbm-10.26/converter/ppm/ppmtoilbm.c.security	2004-03-20 06:06:39.000000000 +0100
-+++ netpbm-10.26/converter/ppm/ppmtoilbm.c	2005-01-05 12:58:55.319587528 +0100
+--- netpbm-10.27/converter/ppm/ppmtoilbm.c.security	2004-03-20 06:06:39.000000000 +0100
++++ netpbm-10.27/converter/ppm/ppmtoilbm.c	2005-03-29 14:31:43.034568496 +0200
 @@ -810,11 +810,15 @@ main(argc, argv)
  
      if( mode != MODE_CMAP ) {
@@ -1020,8 +1018,8 @@
      MALLOCARRAY_NOFAIL(table, oldmaxval + 1);
      for(i = 0; i <= oldmaxval; i++ )
          table[i] = (i * newmaxval + oldmaxval/2) / oldmaxval;
---- netpbm-10.26/converter/ppm/xpmtoppm.c.security	2004-03-13 20:36:36.000000000 +0100
-+++ netpbm-10.26/converter/ppm/xpmtoppm.c	2005-01-05 12:58:55.320587376 +0100
+--- netpbm-10.27/converter/ppm/xpmtoppm.c.security	2004-03-13 20:36:36.000000000 +0100
++++ netpbm-10.27/converter/ppm/xpmtoppm.c	2005-03-29 14:31:43.035568344 +0200
 @@ -685,6 +685,7 @@ ReadXPMFile(FILE * const stream, int * c
                         &ncolors, colorsP, &ptab);
          *transparentP = -1;  /* No transparency in version 1 */
@@ -1030,8 +1028,8 @@
      totalpixels = *widthP * *heightP;
      MALLOCARRAY(*dataP, totalpixels);
      if (*dataP == NULL)
---- netpbm-10.26/converter/ppm/ilbmtoppm.c.security	2003-08-10 00:30:10.000000000 +0200
-+++ netpbm-10.26/converter/ppm/ilbmtoppm.c	2005-01-05 12:58:55.322587072 +0100
+--- netpbm-10.27/converter/ppm/ilbmtoppm.c.security	2003-08-10 00:30:10.000000000 +0200
++++ netpbm-10.27/converter/ppm/ilbmtoppm.c	2005-03-29 14:31:43.038567888 +0200
 @@ -580,6 +580,7 @@ decode_row(ifp, chunksizeP, chunkyrow, n
      rawtype *chp;
  
@@ -1118,8 +1116,8 @@
          MALLOCARRAY_NOFAIL(ilbmrow, RowBytes(bmhd->w));
          *viewportmodesP |= fakeviewport;      /* -isham/-isehb */
  
---- netpbm-10.26/converter/ppm/ppmtoeyuv.c.security	2003-07-07 00:22:35.000000000 +0200
-+++ netpbm-10.26/converter/ppm/ppmtoeyuv.c	2005-01-05 12:58:55.323586920 +0100
+--- netpbm-10.27/converter/ppm/ppmtoeyuv.c.security	2003-07-07 00:22:35.000000000 +0200
++++ netpbm-10.27/converter/ppm/ppmtoeyuv.c	2005-03-29 14:31:43.040567584 +0200
 @@ -113,6 +113,7 @@ create_multiplication_tables(const pixva
  
      int index;
@@ -1128,8 +1126,8 @@
      MALLOCARRAY_NOFAIL(mult299   , maxval+1);
      MALLOCARRAY_NOFAIL(mult587   , maxval+1);
      MALLOCARRAY_NOFAIL(mult114   , maxval+1);
---- netpbm-10.26/converter/ppm/ppmtoicr.c.security	2003-02-22 23:05:03.000000000 +0100
-+++ netpbm-10.26/converter/ppm/ppmtoicr.c	2005-01-05 12:58:55.324586768 +0100
+--- netpbm-10.27/converter/ppm/ppmtoicr.c.security	2003-02-22 23:05:03.000000000 +0100
++++ netpbm-10.27/converter/ppm/ppmtoicr.c	2005-03-29 14:31:43.041567432 +0200
 @@ -169,7 +169,7 @@ char* argv[];
  
  	if (rleflag) {	
@@ -1139,8 +1137,8 @@
  		p = testimage;
  		for (i=0; i<rows; i++)
  			for (j=0; j<cols; j++) 
---- netpbm-10.26/converter/ppm/imgtoppm.c.security	2002-09-06 18:30:03.000000000 +0200
-+++ netpbm-10.26/converter/ppm/imgtoppm.c	2005-01-05 12:58:55.324586768 +0100
+--- netpbm-10.27/converter/ppm/imgtoppm.c.security	2002-09-06 18:30:03.000000000 +0200
++++ netpbm-10.27/converter/ppm/imgtoppm.c	2005-03-29 14:31:43.042567280 +0200
 @@ -84,6 +84,7 @@ main(int argc, char ** argv) {
              len = atoi((char*) buf );
              if ( fread( buf, len, 1, ifp ) != 1 )
@@ -1157,8 +1155,8 @@
              if ( len != cols * rows )
                  pm_message(
                      "pixel data length (%d) does not match image size (%d)",
---- netpbm-10.26/converter/ppm/pcxtoppm.c.security	2004-04-19 23:30:42.000000000 +0200
-+++ netpbm-10.26/converter/ppm/pcxtoppm.c	2005-01-05 12:58:55.325586616 +0100
+--- netpbm-10.27/converter/ppm/pcxtoppm.c.security	2004-04-19 23:30:42.000000000 +0200
++++ netpbm-10.27/converter/ppm/pcxtoppm.c	2005-03-29 14:31:43.043567128 +0200
 @@ -376,6 +376,7 @@ pcx_16col_to_ppm(ifp, cols, rows, BytesP
      }
  
@@ -1184,8 +1182,8 @@
      npixels = (bytesperline * 8) / bitsperpixel;
      p    = pixels;
      while (--npixels >= 0)
---- netpbm-10.26/converter/ppm/ppmtopjxl.c.security	2003-02-22 23:04:36.000000000 +0100
-+++ netpbm-10.26/converter/ppm/ppmtopjxl.c	2005-01-05 12:58:55.326586464 +0100
+--- netpbm-10.27/converter/ppm/ppmtopjxl.c.security	2003-02-22 23:04:36.000000000 +0100
++++ netpbm-10.27/converter/ppm/ppmtopjxl.c	2005-03-29 14:31:43.044566976 +0200
 @@ -273,6 +273,8 @@ main(argc, argv)
        pm_error("image too large; reduce with ppmscale");
     if (maxval > PCL_MAXVAL)
@@ -1218,8 +1216,8 @@
     if ((inrow = (char *)malloc((unsigned)bpp)) == NULL ||
         (outrow = (char *)malloc((unsigned)bpp*2)) == NULL ||
         (runcnt = (signed char *)malloc((unsigned)bpp)) == NULL)
---- netpbm-10.26/converter/ppm/ppmtopict.c.security	2003-02-22 23:04:40.000000000 +0100
-+++ netpbm-10.26/converter/ppm/ppmtopict.c	2005-01-05 12:58:55.327586312 +0100
+--- netpbm-10.27/converter/ppm/ppmtopict.c.security	2003-02-22 23:04:40.000000000 +0100
++++ netpbm-10.27/converter/ppm/ppmtopict.c	2005-03-29 14:31:43.045566824 +0200
 @@ -245,6 +245,8 @@ char *argv[];
  	putShort(stdout, 0);			/* mode */
  
@@ -1229,8 +1227,8 @@
  	packed = (char*) malloc((unsigned)(cols+cols/MAX_COUNT+1));
  	oc = 0;
  	for (row = 0; row < rows; row++)
---- netpbm-10.26/converter/ppm/qrttoppm.c.security	1993-10-04 10:12:56.000000000 +0100
-+++ netpbm-10.26/converter/ppm/qrttoppm.c	2005-01-05 12:58:55.328586160 +0100
+--- netpbm-10.27/converter/ppm/qrttoppm.c.security	1993-10-04 10:12:56.000000000 +0100
++++ netpbm-10.27/converter/ppm/qrttoppm.c	2005-03-29 14:31:43.046566672 +0200
 @@ -46,7 +46,7 @@ main( argc, argv )
  
      ppm_writeppminit( stdout, cols, rows, maxval, 0 );
@@ -1240,26 +1238,26 @@
      if ( buf == (unsigned char *) 0 )
  	pm_error( "out of memory" );
  
---- netpbm-10.26/converter/ppm/ppmtoxpm.c.security	2004-03-13 20:37:14.000000000 +0100
-+++ netpbm-10.26/converter/ppm/ppmtoxpm.c	2005-01-05 12:58:55.328586160 +0100
-@@ -180,6 +180,7 @@ genNumstr(int const input, int const dig
-     int i;
+--- netpbm-10.27/converter/ppm/ppmtoxpm.c.security	2005-03-17 20:19:45.000000000 +0100
++++ netpbm-10.27/converter/ppm/ppmtoxpm.c	2005-03-29 14:39:29.902593768 +0200
+@@ -193,6 +193,7 @@ genNumstr(unsigned int const input, int 
+     unsigned int i;
  
      /* Allocate memory for printed number.  Abort if error. */
 +    overflow_add(digits, 1);
      if (!(str = (char *) malloc(digits + 1)))
          pm_error("out of memory");
  
-@@ -236,6 +237,7 @@ genCmap(colorhist_vector const chv, 
-     int mval;
-     cixel_map * cmap;  /* malloc'ed */
+@@ -306,6 +307,7 @@ genCmap(colorhist_vector const chv, 
+     unsigned int charsPerPixel;
+     unsigned int xppMaxval;
      
-+    overflow_add(ncolors,1);
-     MALLOCARRAY(cmap, ncolors + 1);
++    if (includeTransparent) overflow_add(ncolors, 1);
+     MALLOCARRAY(cmap, cmapSize);
      if (cmapP == NULL)
-         pm_error("Out of memory allocating %d bytes for a color map.",
---- netpbm-10.26/converter/ppm/yuvtoppm.c.security	2003-07-06 22:32:09.000000000 +0200
-+++ netpbm-10.26/converter/ppm/yuvtoppm.c	2005-01-05 12:58:55.329586008 +0100
+         pm_error("Out of memory allocating %u bytes for a color map.",
+--- netpbm-10.27/converter/ppm/yuvtoppm.c.security	2003-07-06 22:32:09.000000000 +0200
++++ netpbm-10.27/converter/ppm/yuvtoppm.c	2005-03-29 14:31:43.048566368 +0200
 @@ -72,6 +72,7 @@ main(argc, argv)
  
  	ppm_writeppminit(stdout, cols, rows, (pixval) 255, 0);
@@ -1268,8 +1266,8 @@
      MALLOCARRAY(yuvbuf, (cols+1)/2);
      if (yuvbuf == NULL)
          pm_error("Unable to allocate YUV buffer for %d columns.", cols);
---- netpbm-10.26/converter/ppm/ppmtopcx.c.security	2004-08-31 05:21:55.000000000 +0200
-+++ netpbm-10.26/converter/ppm/ppmtopcx.c	2005-01-05 12:58:55.330585856 +0100
+--- netpbm-10.27/converter/ppm/ppmtopcx.c.security	2004-08-31 05:21:55.000000000 +0200
++++ netpbm-10.27/converter/ppm/ppmtopcx.c	2005-03-29 14:31:43.049566216 +0200
 @@ -418,6 +418,8 @@ ppmTo16ColorPcx(pixel **            cons
              else                   Planes = 1;
          }
@@ -1279,8 +1277,8 @@
      BytesPerLine = ((cols * BitsPerPixel) + 7) / 8;
      MALLOCARRAY_NOFAIL(indexRow, cols);
      MALLOCARRAY_NOFAIL(planesrow, BytesPerLine);
---- netpbm-10.26/converter/pgm/psidtopgm.c.security	2002-07-30 17:57:36.000000000 +0200
-+++ netpbm-10.26/converter/pgm/psidtopgm.c	2005-01-05 12:58:55.331585704 +0100
+--- netpbm-10.27/converter/pgm/psidtopgm.c.security	2002-07-30 17:57:36.000000000 +0200
++++ netpbm-10.27/converter/pgm/psidtopgm.c	2005-03-29 14:31:43.050566064 +0200
 @@ -60,6 +60,7 @@ char* argv[];
  	    "bits/sample (%d) is too large.", bitspersample );
  
@@ -1289,8 +1287,8 @@
      grayrow = pgm_allocrow( ( cols + 7 ) / 8 * 8 );
      for ( row = 0; row < rows; ++row)
  	{
---- netpbm-10.26/converter/pgm/lispmtopgm.c.security	2002-09-06 18:27:00.000000000 +0200
-+++ netpbm-10.26/converter/pgm/lispmtopgm.c	2005-01-05 12:58:55.331585704 +0100
+--- netpbm-10.27/converter/pgm/lispmtopgm.c.security	2002-09-06 18:27:00.000000000 +0200
++++ netpbm-10.27/converter/pgm/lispmtopgm.c	2005-03-29 14:31:43.051565912 +0200
 @@ -57,6 +57,7 @@ main( argc, argv )
          pm_error( "depth (%d bits) is too large", depth);
  
@@ -1310,8 +1308,8 @@
      *padrightP = ( ( *colsP + 31 ) / 32 ) * 32 - *colsP;
      
      if ( *colsP != (cols_32 - *padrightP) ) {
---- netpbm-10.26/converter/pbm/pbmtozinc.c.security	2002-07-30 17:47:45.000000000 +0200
-+++ netpbm-10.26/converter/pbm/pbmtozinc.c	2005-01-05 12:58:55.332585552 +0100
+--- netpbm-10.27/converter/pbm/pbmtozinc.c.security	2002-07-30 17:47:45.000000000 +0200
++++ netpbm-10.27/converter/pbm/pbmtozinc.c	2005-03-29 14:31:43.051565912 +0200
 @@ -66,6 +66,7 @@ main( argc, argv )
      bitrow = pbm_allocrow( cols );
  
@@ -1320,8 +1318,8 @@
      padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
  
      printf( "USHORT %s[] = {\n",name);
---- netpbm-10.26/converter/pbm/pbmtomgr.c.security	1993-10-04 10:10:50.000000000 +0100
-+++ netpbm-10.26/converter/pbm/pbmtomgr.c	2005-01-05 12:58:55.333585400 +0100
+--- netpbm-10.27/converter/pbm/pbmtomgr.c.security	1993-10-04 10:10:50.000000000 +0100
++++ netpbm-10.27/converter/pbm/pbmtomgr.c	2005-03-29 14:31:43.052565760 +0200
 @@ -43,6 +43,7 @@ main( argc, argv )
      bitrow = pbm_allocrow( cols );
      
@@ -1330,8 +1328,8 @@
      padright = ( ( cols + 7 ) / 8 ) * 8 - cols;
  
      putinit( rows, cols );
---- netpbm-10.26/converter/pbm/pbmto10x.c.security	2004-03-20 05:23:36.000000000 +0100
-+++ netpbm-10.26/converter/pbm/pbmto10x.c	2005-01-05 12:58:55.333585400 +0100
+--- netpbm-10.27/converter/pbm/pbmto10x.c.security	2004-03-20 05:23:36.000000000 +0100
++++ netpbm-10.27/converter/pbm/pbmto10x.c	2005-03-29 14:31:43.053565608 +0200
 @@ -162,7 +162,7 @@ main(int argc, char * argv[]) {
          res_60x72();
  
@@ -1341,8 +1339,8 @@
  }
  
  
---- netpbm-10.26/converter/pbm/pbmto4425.c.security	2002-09-06 18:03:50.000000000 +0200
-+++ netpbm-10.26/converter/pbm/pbmto4425.c	2005-01-05 12:58:55.334585248 +0100
+--- netpbm-10.27/converter/pbm/pbmto4425.c.security	2002-09-06 18:03:50.000000000 +0200
++++ netpbm-10.27/converter/pbm/pbmto4425.c	2005-03-29 14:31:43.054565456 +0200
 @@ -1,6 +1,7 @@
  #include <string.h>
  
@@ -1360,8 +1358,8 @@
    if(vmap == NULL)
  	{
  	  pm_error( "Cannot allocate memory" );
---- netpbm-10.26/converter/pbm/pbmtocmuwm.c.security	1993-10-04 10:10:46.000000000 +0100
-+++ netpbm-10.26/converter/pbm/pbmtocmuwm.c	2005-01-05 12:58:55.334585248 +0100
+--- netpbm-10.27/converter/pbm/pbmtocmuwm.c.security	1993-10-04 10:10:46.000000000 +0100
++++ netpbm-10.27/converter/pbm/pbmtocmuwm.c	2005-03-29 14:31:43.055565304 +0200
 @@ -43,6 +43,7 @@ main( argc, argv )
      bitrow = pbm_allocrow( cols );
      
@@ -1370,8 +1368,8 @@
      padright = ( ( cols + 7 ) / 8 ) * 8 - cols;
  
      putinit( rows, cols );
---- netpbm-10.26/converter/pbm/pbmtogo.c.security	2002-07-30 17:47:49.000000000 +0200
-+++ netpbm-10.26/converter/pbm/pbmtogo.c	2005-01-05 12:58:55.335585096 +0100
+--- netpbm-10.27/converter/pbm/pbmtogo.c.security	2002-07-30 17:47:49.000000000 +0200
++++ netpbm-10.27/converter/pbm/pbmtogo.c	2005-03-29 14:31:43.056565152 +0200
 @@ -90,6 +90,7 @@ main( argc, argv )
      bitrow = pbm_allocrow(cols);
  
@@ -1380,8 +1378,8 @@
      rucols = ( cols + 7 ) / 8;
      bytesperrow = rucols;       /* GraphOn uses bytes */
      rucols = rucols * 8;
---- netpbm-10.26/converter/pbm/pbmtoxbm.c.security	2004-03-13 20:37:59.000000000 +0100
-+++ netpbm-10.26/converter/pbm/pbmtoxbm.c	2005-01-05 12:58:55.336584944 +0100
+--- netpbm-10.27/converter/pbm/pbmtoxbm.c.security	2004-03-13 20:37:59.000000000 +0100
++++ netpbm-10.27/converter/pbm/pbmtoxbm.c	2005-03-29 14:31:43.057565000 +0200
 @@ -100,6 +100,7 @@ main(int argc, char * argv[]) {
      bitrow = pbm_allocrow(cols);
      
@@ -1390,8 +1388,8 @@
      padright = ((cols + 7)/8) * 8 - cols;
  
      printf("#define %s_width %d\n", name, cols);
---- netpbm-10.26/converter/pbm/pbmtox10bm.c.security	2002-07-30 17:47:46.000000000 +0200
-+++ netpbm-10.26/converter/pbm/pbmtox10bm.c	2005-01-05 12:58:55.336584944 +0100
+--- netpbm-10.27/converter/pbm/pbmtox10bm.c.security	2002-07-30 17:47:46.000000000 +0200
++++ netpbm-10.27/converter/pbm/pbmtox10bm.c	2005-03-29 14:31:43.058564848 +0200
 @@ -57,6 +57,7 @@ main( argc, argv )
      bitrow = pbm_allocrow( cols );
  
@@ -1400,8 +1398,8 @@
      padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
  
      printf( "#define %s_width %d\n", name, cols );
---- netpbm-10.26/converter/pbm/mdatopbm.c.security	2004-03-20 05:09:15.000000000 +0100
-+++ netpbm-10.26/converter/pbm/mdatopbm.c	2005-01-05 12:58:55.337584792 +0100
+--- netpbm-10.27/converter/pbm/mdatopbm.c.security	2004-03-20 05:09:15.000000000 +0100
++++ netpbm-10.27/converter/pbm/mdatopbm.c	2005-03-29 14:31:43.059564696 +0200
 @@ -245,10 +245,13 @@ main(int argc, char **argv) {
          pm_readlittleshort(infile, &yy); nInCols = yy;
      }
@@ -1417,9 +1415,9 @@
  
      data = pbm_allocarray(nOutCols, nOutRows);
      
---- netpbm-10.26/converter/pbm/thinkjettopbm.l.security	2002-10-27 16:45:48.000000000 +0100
-+++ netpbm-10.26/converter/pbm/thinkjettopbm.l	2005-01-05 12:58:55.338584640 +0100
-@@ -90,7 +90,9 @@ DIG             [0-9]
+--- netpbm-10.27/converter/pbm/thinkjettopbm.l.security	2005-01-02 23:39:18.000000000 +0100
++++ netpbm-10.27/converter/pbm/thinkjettopbm.l	2005-03-29 14:31:43.060564544 +0200
+@@ -94,7 +94,9 @@ DIG             [0-9]
  <RASTERMODE>\033\*b{DIG}+W  {
                              int l;
                              if (rowCount >= rowCapacity) {
@@ -1429,7 +1427,7 @@
                                  rows = realloc (rows, rowCapacity * sizeof *rows);
                                  if (rows == NULL)
                                      pm_error ("Out of memory.");
-@@ -200,6 +202,8 @@ yywrap (void)
+@@ -204,6 +206,8 @@ yywrap (void)
      /*
       * Quite simple since ThinkJet bit arrangement matches PBM
       */
@@ -1438,8 +1436,8 @@
      pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0);
  
      packed_bitrow = malloc(maxRowLength);
---- netpbm-10.26/converter/pbm/pbmtoppa/pbm.c.security	2000-06-01 19:20:30.000000000 +0200
-+++ netpbm-10.26/converter/pbm/pbmtoppa/pbm.c	2005-01-05 12:58:55.339584488 +0100
+--- netpbm-10.27/converter/pbm/pbmtoppa/pbm.c.security	2000-06-01 19:20:30.000000000 +0200
++++ netpbm-10.27/converter/pbm/pbmtoppa/pbm.c	2005-03-29 14:31:43.061564392 +0200
 @@ -105,6 +105,7 @@ int pbm_readline(pbm_stat* pbm,unsigned 
      return 0;
  
@@ -1458,8 +1456,8 @@
    memcpy (pbm->revdata, data, (pbm->width+7)/8);
    pbm->current_line--;
  }
---- netpbm-10.26/converter/pbm/pbmtoppa/pbmtoppa.c.security	2002-07-30 17:48:16.000000000 +0200
-+++ netpbm-10.26/converter/pbm/pbmtoppa/pbmtoppa.c	2005-01-05 12:58:55.339584488 +0100
+--- netpbm-10.27/converter/pbm/pbmtoppa/pbmtoppa.c.security	2002-07-30 17:48:16.000000000 +0200
++++ netpbm-10.27/converter/pbm/pbmtoppa/pbmtoppa.c	2005-03-29 14:31:43.062564240 +0200
 @@ -471,6 +471,7 @@ main (int argc, char *argv[])
      }
    }
@@ -1468,8 +1466,8 @@
    Pwidth=(Width+7)/8;
    printer.fptr=out;
  
---- netpbm-10.26/converter/pbm/pktopbm.c.security	2004-03-20 05:52:21.000000000 +0100
-+++ netpbm-10.26/converter/pbm/pktopbm.c	2005-01-05 12:58:55.340584336 +0100
+--- netpbm-10.27/converter/pbm/pktopbm.c.security	2004-03-20 05:52:21.000000000 +0100
++++ netpbm-10.27/converter/pbm/pktopbm.c	2005-03-29 14:31:43.063564088 +0200
 @@ -274,6 +274,7 @@ main(int argc, char *argv[]) {
          if (flagbyte == 7) {            /* long form preamble */
              integer packetlength = get32() ;    /* character packet length */
@@ -1478,8 +1476,8 @@
              endofpacket = packetlength + pktopbm_pkloc;
                  /* calculate end of packet */
              if ((car >= MAXPKCHAR) || !filename[car]) {
---- netpbm-10.26/converter/pbm/pbmtolj.c.security	2004-03-20 05:43:25.000000000 +0100
-+++ netpbm-10.26/converter/pbm/pbmtolj.c	2005-01-05 12:58:55.340584336 +0100
+--- netpbm-10.27/converter/pbm/pbmtolj.c.security	2004-03-20 05:43:25.000000000 +0100
++++ netpbm-10.27/converter/pbm/pbmtolj.c	2005-03-29 14:31:43.065563784 +0200
 @@ -30,6 +30,7 @@
  #include "pbm.h"
  #include <string.h>
@@ -1500,8 +1498,8 @@
      packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1;
      deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10;
  
---- netpbm-10.26/converter/pbm/pbmtoybm.c.security	1993-10-04 10:10:43.000000000 +0100
-+++ netpbm-10.26/converter/pbm/pbmtoybm.c	2005-01-05 12:58:55.341584184 +0100
+--- netpbm-10.27/converter/pbm/pbmtoybm.c.security	1993-10-04 10:10:43.000000000 +0100
++++ netpbm-10.27/converter/pbm/pbmtoybm.c	2005-03-29 14:31:43.066563632 +0200
 @@ -45,6 +45,7 @@ main( argc, argv )
      bitrow = pbm_allocrow( cols );
      
@@ -1510,8 +1508,8 @@
      padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
  
      putinit( cols, rows );
---- netpbm-10.26/converter/pbm/icontopbm.c.security	2003-01-08 20:19:42.000000000 +0100
-+++ netpbm-10.26/converter/pbm/icontopbm.c	2005-01-05 12:58:55.342584032 +0100
+--- netpbm-10.27/converter/pbm/icontopbm.c.security	2003-01-08 20:19:42.000000000 +0100
++++ netpbm-10.27/converter/pbm/icontopbm.c	2005-03-29 14:31:43.067563480 +0200
 @@ -12,6 +12,8 @@
  
  #include <string.h>
@@ -1533,8 +1531,8 @@
      data_length = BitmapSize( *widthP, *heightP );
      *dataP = (short unsigned int *) malloc( data_length );
      if ( *dataP == NULL )
---- netpbm-10.26/converter/pbm/mgrtopbm.c.security	2003-01-08 20:20:10.000000000 +0100
-+++ netpbm-10.26/converter/pbm/mgrtopbm.c	2005-01-05 12:58:55.342584032 +0100
+--- netpbm-10.27/converter/pbm/mgrtopbm.c.security	2005-02-20 20:58:25.000000000 +0100
++++ netpbm-10.27/converter/pbm/mgrtopbm.c	2005-03-29 14:31:43.068563328 +0200
 @@ -68,6 +68,8 @@ getinit(FILE * const file, 
      if (head.h_high < ' ' || head.l_high < ' ')
          pm_error("Invalid width field in MGR header");
@@ -1544,8 +1542,8 @@
      *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' ');
      *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' ');
      *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP;
---- netpbm-10.26/converter/pbm/pbmtoascii.c.security	2002-07-30 17:42:53.000000000 +0200
-+++ netpbm-10.26/converter/pbm/pbmtoascii.c	2005-01-05 12:58:55.343583880 +0100
+--- netpbm-10.27/converter/pbm/pbmtoascii.c.security	2002-07-30 17:42:53.000000000 +0200
++++ netpbm-10.27/converter/pbm/pbmtoascii.c	2005-03-29 14:31:43.069563176 +0200
 @@ -115,9 +115,11 @@ char* argv[];
          pm_usage( usage );
  
@@ -1558,8 +1556,8 @@
      line = (char*) pm_allocrow( ccols + 1, sizeof(char) );
  
      for ( row = 0; row < rows; row += gridy )
---- netpbm-10.26/converter/pbm/pbmtogem.c.security	2000-06-09 09:07:05.000000000 +0200
-+++ netpbm-10.26/converter/pbm/pbmtogem.c	2005-01-05 12:58:55.344583728 +0100
+--- netpbm-10.27/converter/pbm/pbmtogem.c.security	2000-06-09 09:07:05.000000000 +0200
++++ netpbm-10.27/converter/pbm/pbmtogem.c	2005-03-29 14:31:43.070563024 +0200
 @@ -123,6 +123,7 @@ putinit (rows, cols)
    bitsperitem = 0;
    bitshift = 7;
@@ -1568,8 +1566,8 @@
    outmax = (cols + 7) / 8;
    outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
    lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
---- netpbm-10.26/converter/pbm/pbmtomda.c.security	2004-01-11 22:11:22.000000000 +0100
-+++ netpbm-10.26/converter/pbm/pbmtomda.c	2005-01-05 12:58:55.345583576 +0100
+--- netpbm-10.27/converter/pbm/pbmtomda.c.security	2004-01-11 22:11:22.000000000 +0100
++++ netpbm-10.27/converter/pbm/pbmtomda.c	2005-03-29 14:31:43.071562872 +0200
 @@ -179,6 +179,7 @@ int main(int argc, char **argv)
      
      nOutRowsUnrounded = bScale ? nInRows/2 : nInRows;
@@ -1578,8 +1576,8 @@
      nOutRows = ((nOutRowsUnrounded + 3) / 4) * 4;
          /* MDA wants rows a multiple of 4 */   
      nOutCols = nInCols / 8;
---- netpbm-10.26/converter/pbm/pbmtomacp.c.security	2002-09-06 18:04:22.000000000 +0200
-+++ netpbm-10.26/converter/pbm/pbmtomacp.c	2005-01-05 12:58:55.346583424 +0100
+--- netpbm-10.27/converter/pbm/pbmtomacp.c.security	2002-09-06 18:04:22.000000000 +0200
++++ netpbm-10.27/converter/pbm/pbmtomacp.c	2005-03-29 14:31:43.072562720 +0200
 @@ -104,6 +104,7 @@ char *argv[];
    if( !lflg )
      left = 0;
@@ -1597,8 +1595,8 @@
    if( bflg )
    { if( bottom - top >= MAX_LINES )
        bottom = top + MAX_LINES - 1;
---- netpbm-10.26/converter/pbm/ybmtopbm.c.security	1993-10-04 10:10:35.000000000 +0100
-+++ netpbm-10.26/converter/pbm/ybmtopbm.c	2005-01-05 12:58:55.346583424 +0100
+--- netpbm-10.27/converter/pbm/ybmtopbm.c.security	1993-10-04 10:10:35.000000000 +0100
++++ netpbm-10.27/converter/pbm/ybmtopbm.c	2005-03-29 14:31:43.073562568 +0200
 @@ -88,6 +88,7 @@ getinit( file, colsP, rowsP, depthP, pad
  	pm_error( "EOF / read error" );
  
@@ -1607,8 +1605,8 @@
      *padrightP = ( ( *colsP + 15 ) / 16 ) * 16 - *colsP;
      bitsperitem = 0;
      }
---- netpbm-10.26/converter/pbm/pbmtoicon.c.security	2002-07-30 17:47:48.000000000 +0200
-+++ netpbm-10.26/converter/pbm/pbmtoicon.c	2005-01-05 12:58:55.347583272 +0100
+--- netpbm-10.27/converter/pbm/pbmtoicon.c.security	2002-07-30 17:47:48.000000000 +0200
++++ netpbm-10.27/converter/pbm/pbmtoicon.c	2005-03-29 14:31:43.073562568 +0200
 @@ -42,6 +42,7 @@ main( argc, argv )
      bitrow = pbm_allocrow( cols );
      
@@ -1617,8 +1615,8 @@
      pad = ( ( cols + 15 ) / 16 ) * 16 - cols;
      padleft = pad / 2;
      padright = pad - padleft;
---- netpbm-10.26/other/pnmcolormap.c.security	2004-08-11 01:37:03.000000000 +0200
-+++ netpbm-10.26/other/pnmcolormap.c	2005-01-05 12:58:55.348583120 +0100
+--- netpbm-10.27/other/pnmcolormap.c.security	2004-08-11 01:37:03.000000000 +0200
++++ netpbm-10.27/other/pnmcolormap.c	2005-03-29 14:31:43.087560440 +0200
 @@ -788,6 +788,7 @@ colormapToSquare(struct pam * const pamP
              pamP->width = intsqrt;
          else 
@@ -1627,8 +1625,8 @@
      }
      {
          unsigned int const intQuotient = colormapSize / pamP->width;
---- netpbm-10.26/doc/COPYRIGHT.PATENT.security	2004-05-01 01:54:22.000000000 +0200
-+++ netpbm-10.26/doc/COPYRIGHT.PATENT	2005-01-05 12:58:55.349582968 +0100
+--- netpbm-10.27/doc/COPYRIGHT.PATENT.security	2004-05-01 01:54:22.000000000 +0200
++++ netpbm-10.27/doc/COPYRIGHT.PATENT	2005-03-29 14:31:43.088560288 +0200
 @@ -33,6 +33,11 @@ no warranties regarding any of the code 
  all the above to be modified by "to the best of the Netpbm
  maintainer's knowledge."
@@ -1641,8 +1639,8 @@
  
  
  PATENTS
---- netpbm-10.26/editor/pnmcrop.c.security	2002-07-30 19:47:37.000000000 +0200
-+++ netpbm-10.26/editor/pnmcrop.c	2005-01-05 12:58:55.349582968 +0100
+--- netpbm-10.27/editor/pnmcrop.c.security	2002-07-30 19:47:37.000000000 +0200
++++ netpbm-10.27/editor/pnmcrop.c	2005-03-29 14:31:43.089560136 +0200
 @@ -379,6 +379,8 @@ main(int argc, char *argv[]) {
  
          xelrow = pnm_allocrow(cols);
@@ -1652,8 +1650,8 @@
          newcols = right - left + 1;
          newrows = bottom - top + 1;
          pnm_writepnminit(stdout, newcols, newrows, maxval, format, 0);
---- netpbm-10.26/editor/pnmcut.c.security	2002-07-30 19:47:37.000000000 +0200
-+++ netpbm-10.26/editor/pnmcut.c	2005-01-05 12:58:55.350582816 +0100
+--- netpbm-10.27/editor/pnmcut.c.security	2002-07-30 19:47:37.000000000 +0200
++++ netpbm-10.27/editor/pnmcut.c	2005-03-29 14:31:43.090559984 +0200
 @@ -373,6 +373,7 @@ main(int argc, char *argv[]) {
                     toprow, leftcol, bottomrow, rightcol);
      }
@@ -1662,8 +1660,8 @@
      output_cols = rightcol-leftcol+1;
      output_row = pnm_allocrow(output_cols);
      
---- netpbm-10.26/editor/pnmpaste.c.security	2002-07-30 19:47:35.000000000 +0200
-+++ netpbm-10.26/editor/pnmpaste.c	2005-01-05 12:58:55.351582664 +0100
+--- netpbm-10.27/editor/pnmpaste.c.security	2002-07-30 19:47:35.000000000 +0200
++++ netpbm-10.27/editor/pnmpaste.c	2005-03-29 14:31:43.091559832 +0200
 @@ -100,11 +100,16 @@ main( argc, argv )
  	    "y is too large -- the second anymap has only %d rows",
  	    rows2 );
@@ -1681,8 +1679,8 @@
      if ( x + cols1 > cols2 )
  	pm_error( "x + width is too large by %d pixels", x + cols1 - cols2 );
      if ( y + rows1 > rows2 )
---- netpbm-10.26/editor/pbmlife.c.security	1993-10-04 10:10:37.000000000 +0100
-+++ netpbm-10.26/editor/pbmlife.c	2005-01-05 12:58:55.351582664 +0100
+--- netpbm-10.27/editor/pbmlife.c.security	1993-10-04 10:10:37.000000000 +0100
++++ netpbm-10.27/editor/pbmlife.c	2005-03-29 14:31:43.091559832 +0200
 @@ -54,7 +54,7 @@ char* argv[];
  	prevrow = thisrow;
  	thisrow = nextrow;
@@ -1692,8 +1690,8 @@
  	    pbm_readpbmrow( ifp, nextrow, cols, format );
  
          for ( col = 0; col < cols; ++col )
---- netpbm-10.26/editor/pbmpscale.c.security	2003-07-06 21:41:04.000000000 +0200
-+++ netpbm-10.26/editor/pbmpscale.c	2005-01-05 12:58:55.352582512 +0100
+--- netpbm-10.27/editor/pbmpscale.c.security	2003-07-06 21:41:04.000000000 +0200
++++ netpbm-10.27/editor/pbmpscale.c	2005-03-29 14:31:43.092559680 +0200
 @@ -109,6 +109,7 @@ main(argc, argv)
     inrow[0] = inrow[1] = inrow[2] = NULL;
     pbm_readpbminit(ifd, &columns, &rows, &format) ;
@@ -1702,8 +1700,8 @@
     outrow = pbm_allocrow(columns*scale) ;
     MALLOCARRAY(flags, columns);
     if (flags == NULL) 
---- netpbm-10.26/editor/ppmdither.c.security	2005-01-05 12:58:55.267595432 +0100
-+++ netpbm-10.26/editor/ppmdither.c	2005-01-05 12:58:55.353582360 +0100
+--- netpbm-10.27/editor/ppmdither.c.security	2005-03-29 14:31:42.975577464 +0200
++++ netpbm-10.27/editor/ppmdither.c	2005-03-29 14:31:43.093559528 +0200
 @@ -111,6 +111,9 @@ dith_matrix(unsigned int const dith_dim)
              (dith_dim * sizeof(int *)) + /* pointers */
              (dith_dim * dith_dim * sizeof(int)); /* data */
@@ -1724,8 +1722,8 @@
      if (*colormapP == NULL) 
          pm_error("Unable to allocate space for the color lookup table "
                   "(%d by %d by %d pixels).", dith_nr, dith_ng, dith_nb);
---- netpbm-10.26/editor/pnmshear.c.security	2002-12-11 21:00:02.000000000 +0100
-+++ netpbm-10.26/editor/pnmshear.c	2005-01-05 12:58:55.354582208 +0100
+--- netpbm-10.27/editor/pnmshear.c.security	2002-12-11 21:00:02.000000000 +0100
++++ netpbm-10.27/editor/pnmshear.c	2005-03-29 14:31:43.094559376 +0200
 @@ -12,6 +12,7 @@
  
  #include <math.h>
@@ -1746,8 +1744,8 @@
      newcols = rows * shearfac + cols + 0.999999;
  
      pnm_writepnminit( stdout, newcols, rows, newmaxval, newformat, 0 );
---- netpbm-10.26/editor/pnmscalefixed.c.security	2002-07-30 19:52:49.000000000 +0200
-+++ netpbm-10.26/editor/pnmscalefixed.c	2005-01-05 12:58:55.355582056 +0100
+--- netpbm-10.27/editor/pnmscalefixed.c.security	2002-07-30 19:52:49.000000000 +0200
++++ netpbm-10.27/editor/pnmscalefixed.c	2005-03-29 14:31:43.095559224 +0200
 @@ -209,6 +209,8 @@ compute_output_dimensions(const struct c
                            const int rows, const int cols,
                            int * newrowsP, int * newcolsP) {
@@ -1776,8 +1774,8 @@
      sxscale = SCALE * newcols / cols;
      syscale = SCALE * newrows / rows;
  
---- netpbm-10.26/editor/pnmhisteq.c.security	2004-09-18 05:25:46.000000000 +0200
-+++ netpbm-10.26/editor/pnmhisteq.c	2005-01-05 12:58:55.356581904 +0100
+--- netpbm-10.27/editor/pnmhisteq.c.security	2004-09-18 05:25:46.000000000 +0200
++++ netpbm-10.27/editor/pnmhisteq.c	2005-03-29 14:31:43.095559224 +0200
 @@ -210,6 +210,7 @@ int main(argc, argv)
         user has specified an input map file, read it in at
         this point. */
@@ -1786,8 +1784,8 @@
      lumahist = (long *) pm_allocrow(maxval + 1, sizeof(long));
      memset((char *) lumahist, 0, (maxval + 1) * sizeof(long));
  
---- netpbm-10.26/editor/pnmpad.c.security	2004-05-16 00:02:15.000000000 +0200
-+++ netpbm-10.26/editor/pnmpad.c	2005-01-05 12:58:55.356581904 +0100
+--- netpbm-10.27/editor/pnmpad.c.security	2004-05-16 00:02:15.000000000 +0200
++++ netpbm-10.27/editor/pnmpad.c	2005-03-29 14:31:43.096559072 +0200
 @@ -356,6 +356,8 @@ main(int argc, char ** argv) {
  
      computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad);
@@ -1797,9 +1795,9 @@
      newcols = cols + lpad + rpad;
      xelrow = pnm_allocrow(newcols);
      bgrow = pnm_allocrow(newcols);
---- netpbm-10.26/editor/pnmremap.c.security	2004-05-29 20:00:54.000000000 +0200
-+++ netpbm-10.26/editor/pnmremap.c	2005-01-05 12:58:55.357581752 +0100
-@@ -228,6 +228,7 @@ initFserr(struct pam * const pamP, struc
+--- netpbm-10.27/editor/pnmremap.c.security	2005-02-23 05:35:06.000000000 +0100
++++ netpbm-10.27/editor/pnmremap.c	2005-03-29 14:31:43.097558920 +0200
+@@ -280,6 +280,7 @@ initFserr(struct pam * const pamP, struc
  
      unsigned int const fserrSize = pamP->width + 2;
  
@@ -1807,7 +1805,7 @@
      MALLOCARRAY(fserrP->thiserr, pamP->depth);
      if (fserrP->thiserr == NULL)
          pm_error("Out of memory allocating Floyd-Steinberg structures");
-@@ -267,6 +268,7 @@ floydInitRow(struct pam * const pamP, st
+@@ -319,6 +320,7 @@ floydInitRow(struct pam * const pamP, st
  
      int col;
      
@@ -1815,8 +1813,8 @@
      for (col = 0; col < pamP->width + 2; ++col) {
          unsigned int plane;
          for (plane = 0; plane < pamP->depth; ++plane) 
---- netpbm-10.26/editor/pamoil.c.security	2004-05-29 20:01:02.000000000 +0200
-+++ netpbm-10.26/editor/pamoil.c	2005-01-05 12:58:55.358581600 +0100
+--- netpbm-10.27/editor/pamoil.c.security	2004-05-29 20:01:02.000000000 +0200
++++ netpbm-10.27/editor/pamoil.c	2005-03-29 14:31:43.098558768 +0200
 @@ -112,6 +112,7 @@ main(int argc, char *argv[] ) {
      tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type));
      pm_close(ifp);
@@ -1825,8 +1823,8 @@
      MALLOCARRAY(hist, inpam.maxval + 1);
      if (hist == NULL)
          pm_error("Unable to allocate memory for histogram.");
---- netpbm-10.26/editor/pbmclean.c.security	2002-07-30 19:47:41.000000000 +0200
-+++ netpbm-10.26/editor/pbmclean.c	2005-01-05 12:58:55.359581448 +0100
+--- netpbm-10.27/editor/pbmclean.c.security	2005-02-27 17:33:57.000000000 +0100
++++ netpbm-10.27/editor/pbmclean.c	2005-03-29 14:31:43.099558616 +0200
 @@ -147,7 +147,7 @@ nextrow(FILE * const ifd, int const row,
      inrow[0] = inrow[1];
      inrow[1] = inrow[2];
@@ -1836,8 +1834,8 @@
          /* Read the "next" row in from the file.  Allocate buffer if neeeded */
          if (inrow[2] == NULL)
              inrow[2] = pbm_allocrow(cols);
---- netpbm-10.26/editor/pnmindex.csh.security	2000-09-14 07:37:35.000000000 +0200
-+++ netpbm-10.26/editor/pnmindex.csh	2005-01-05 12:58:55.360581296 +0100
+--- netpbm-10.27/editor/pnmindex.csh.security	2000-09-14 07:37:35.000000000 +0200
++++ netpbm-10.27/editor/pnmindex.csh	2005-03-29 14:31:43.100558464 +0200
 @@ -1,5 +1,8 @@
  #!/bin/csh -f
  #
@@ -1847,8 +1845,8 @@
  # pnmindex - build a visual index of a bunch of anymaps
  #
  # Copyright (C) 1991 by Jef Poskanzer.
---- netpbm-10.26/editor/pnmrotate.c.security	2004-02-02 20:19:52.000000000 +0100
-+++ netpbm-10.26/editor/pnmrotate.c	2005-01-05 12:58:55.361581144 +0100
+--- netpbm-10.27/editor/pnmrotate.c.security	2004-02-02 20:19:52.000000000 +0100
++++ netpbm-10.27/editor/pnmrotate.c	2005-03-29 14:31:43.101558312 +0200
 @@ -11,6 +11,7 @@
  */
  
@@ -1876,8 +1874,8 @@
      newcols = newrows * xshearfac + tempcols + 0.999999 - 2 * x2shearjunk;
      direction = cmdline.angle > 0 ? COUNTERCLOCKWISE : CLOCKWISE;
  
---- netpbm-10.26/editor/pamcut.c.security	2004-10-03 04:29:33.000000000 +0200
-+++ netpbm-10.26/editor/pamcut.c	2005-01-05 12:58:55.362580992 +0100
+--- netpbm-10.27/editor/pamcut.c.security	2005-01-04 01:07:53.000000000 +0100
++++ netpbm-10.27/editor/pamcut.c	2005-03-29 14:31:43.102558160 +0200
 @@ -509,6 +509,8 @@ main(int argc, char *argv[]) {
      outpam.width  = rightcol-leftcol+1;
      outpam.height = bottomrow-toprow+1;
@@ -1887,8 +1885,8 @@
      pnm_writepaminit(&outpam);
  
      /* Write out top padding */
---- netpbm-10.26/editor/pnmgamma.c.security	2004-06-16 04:28:06.000000000 +0200
-+++ netpbm-10.26/editor/pnmgamma.c	2005-01-05 12:58:55.362580992 +0100
+--- netpbm-10.27/editor/pnmgamma.c.security	2004-06-16 04:28:06.000000000 +0200
++++ netpbm-10.27/editor/pnmgamma.c	2005-03-29 14:31:43.102558160 +0200
 @@ -274,6 +274,7 @@ createGammaTables(bool const ungamma, 
                    xelval **rtableP, xelval **gtableP, xelval **btableP) {
  
@@ -1897,8 +1895,8 @@
      MALLOCARRAY(*rtableP, maxval+1);
      MALLOCARRAY(*gtableP, maxval+1);
      MALLOCARRAY(*btableP, maxval+1);
---- netpbm-10.26/editor/pbmreduce.c.security	2003-07-06 21:41:49.000000000 +0200
-+++ netpbm-10.26/editor/pbmreduce.c	2005-01-05 12:58:55.363580840 +0100
+--- netpbm-10.27/editor/pbmreduce.c.security	2003-07-06 21:41:49.000000000 +0200
++++ netpbm-10.27/editor/pbmreduce.c	2005-03-29 14:31:43.103558008 +0200
 @@ -93,6 +93,7 @@ main( argc, argv )
  
      if ( halftone == QT_FS ) {
@@ -1907,8 +1905,8 @@
          MALLOCARRAY(thiserr, newcols + 2);
          MALLOCARRAY(nexterr, newcols + 2);
          if ( thiserr == NULL || nexterr == NULL )
---- /dev/null	2005-01-05 10:23:03.496449296 +0100
-+++ netpbm-10.26/OPENLICENSE	2005-01-05 12:58:55.364580688 +0100
+--- /dev/null	2005-03-21 10:25:58.558439872 +0100
++++ netpbm-10.27/OPENLICENSE	2005-03-29 14:31:43.104557856 +0200
 @@ -0,0 +1,163 @@
 +			The Open Software License
 +			v. 1.1
@@ -2073,9 +2071,9 @@
 +Permission is hereby granted to copy and distribute this license without 
 +modification. This license may not be modified without the express written 
 +permission of its copyright owner.
---- netpbm-10.26/lib/libpammap.c.security	2004-04-12 00:21:27.000000000 +0200
-+++ netpbm-10.26/lib/libpammap.c	2005-01-05 12:58:55.365580536 +0100
-@@ -98,6 +98,8 @@ allocTupleIntListItem(struct pam * const
+--- netpbm-10.27/lib/libpammap.c.security	2005-03-17 05:27:49.000000000 +0100
++++ netpbm-10.27/lib/libpammap.c	2005-03-29 14:31:43.105557704 +0200
+@@ -101,6 +101,8 @@ allocTupleIntListItem(struct pam * const
      */
      struct tupleint_list_item * retval;
  
@@ -2084,38 +2082,25 @@
      unsigned int const size = 
          sizeof(*retval) - sizeof(retval->tupleint.tuple) 
          + pamP->depth * sizeof(sample);
-@@ -315,7 +317,11 @@ pnm_alloctupletable(const struct pam * c
-        as a single malloc block and suballocate internally.
-     */
-     
--    pool = malloc(mainTableSize + size * tupleIntSize);
-+    overflow2(pamP->depth, sizeof(sample));
-+    overflow_add(pamP->depth*sizeof(sample),
-+    		sizeof(struct tupleint) - sizeof(sample));
-+    overflow_add(mainTableSize, size);
-+    pool = malloc2(mainTableSize + size, tupleIntSize);
-     
-     retval = (tupletable) pool;
- 
---- netpbm-10.26/lib/libpbmvms.c.security	2000-05-26 20:34:55.000000000 +0200
-+++ netpbm-10.26/lib/libpbmvms.c	2005-01-05 12:58:55.366580384 +0100
+--- netpbm-10.27/lib/libpbmvms.c.security	2000-05-26 20:34:55.000000000 +0200
++++ netpbm-10.27/lib/libpbmvms.c	2005-03-29 14:31:43.106557552 +0200
 @@ -1,3 +1,5 @@
 +#warning "NOT AUDITED"
 +
  /***************************************************************************
    This file contains library routines needed to build Netpbm for VMS.
    However, as of 2000.05.26, when these were split out of libpbm1.c
---- netpbm-10.26/lib/libpm.c.security	2004-11-20 17:55:27.000000000 +0100
-+++ netpbm-10.26/lib/libpm.c	2005-01-05 12:58:55.367580232 +0100
-@@ -35,6 +35,7 @@
+--- netpbm-10.27/lib/libpm.c.security	2005-03-24 20:55:02.000000000 +0100
++++ netpbm-10.27/lib/libpm.c	2005-03-29 14:32:55.703521136 +0200
+@@ -36,6 +36,7 @@
      /* This makes the the x64() functions available on AIX */
  
  #include <stdio.h>
 +#include <limits.h>
- #include "version.h"
- #include "compile.h"
- #include "nstring.h"
-@@ -122,7 +123,7 @@ char*
+ #include <stdarg.h>
+ #include <string.h>
+ #include <errno.h>
+@@ -155,7 +156,7 @@ char*
  pm_allocrow(int const cols, int const size) {
      char * itrow;
  
@@ -2124,7 +2109,7 @@
      if ( itrow == NULL )
          pm_error( "out of memory allocating a row" );
      return itrow;
-@@ -162,7 +163,7 @@ pm_allocarray(int const cols, int const 
+@@ -195,7 +196,7 @@ pm_allocarray(int const cols, int const 
      if ( rowIndex == NULL )
          pm_error("out of memory allocating row index (%u rows) for an array",
                   rows);
@@ -2133,7 +2118,7 @@
      if ( rowheap == NULL ) {
          /* We couldn't get the whole heap in one block, so try fragmented
             format.
-@@ -1171,4 +1172,53 @@ pm_check(FILE *               const file
+@@ -1368,4 +1369,53 @@ pm_check(FILE *               const file
  }
  
  
@@ -2187,21 +2172,21 @@
 +	return realloc(a, b*c);
 +}
  
---- netpbm-10.26/lib/libpam.c.security	2004-10-02 20:52:03.000000000 +0200
-+++ netpbm-10.26/lib/libpam.c	2005-01-05 12:58:55.368580080 +0100
-@@ -273,7 +273,8 @@ pnm_allocpamrow(const struct pam * const
-        themselves.  Each tuple consists of 'depth' samples.  
-     */
+--- netpbm-10.27/lib/libpam.c.security	2005-03-17 04:19:49.000000000 +0100
++++ netpbm-10.27/lib/libpam.c	2005-03-29 14:35:34.982307080 +0200
+@@ -270,7 +270,8 @@ allocPamRow(const struct pam * const pam
+     int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample);
+     tuple * tuplerow;
  
--    tuplerow = malloc(pamP->width * (sizeof(tuple *) + bytes_per_tuple));
-+    overflow_add(sizeof(tuple *), bytes_per_tuple);
-+    tuplerow = malloc2(pamP->width, sizeof(tuple *) + bytes_per_tuple);
-     if (tuplerow == NULL)
-         pm_error("Out of memory allocating space for a tuple row of\n"
-                  "%d tuples by %d samples per tuple by %d bytes per sample.",
---- netpbm-10.26/lib/libpbm1.c.security	2003-11-14 09:25:55.000000000 +0100
-+++ netpbm-10.26/lib/libpbm1.c	2005-01-05 12:58:55.368580080 +0100
-@@ -58,6 +58,7 @@ pbm_check(FILE * file, const enum pm_che
+-    tuplerow = malloc(pamP->width * (sizeof(tuple *) + bytesPerTuple));
++    overflow_add(sizeof(tuple *), bytesPerTuple);
++    tuplerow = malloc2(pamP->width, sizeof(tuple *) + bytesPerTuple);
+                       
+     if (tuplerow != NULL) {
+         /* Now we initialize the pointers to the individual tuples
+--- netpbm-10.27/lib/libpbm1.c.security	2005-02-05 19:41:54.000000000 +0100
++++ netpbm-10.27/lib/libpbm1.c	2005-03-29 14:31:43.112556640 +0200
+@@ -56,6 +56,7 @@ pbm_check(FILE * file, const enum pm_che
          pm_message("pm_filepos passed to pm_check() is %u bytes",
                     sizeof(pm_filepos));
  #endif
@@ -2209,9 +2194,9 @@
          pm_check(file, check_type, need_raster_size, retval_p);
      }
  }
---- netpbm-10.26/lib/pm.h.security	2004-12-11 20:52:19.000000000 +0100
-+++ netpbm-10.26/lib/pm.h	2005-01-05 12:58:55.369579928 +0100
-@@ -287,6 +287,12 @@ pm_arg0toprogname(const char arg0[]);
+--- netpbm-10.27/lib/pm.h.security	2005-03-24 21:00:43.000000000 +0100
++++ netpbm-10.27/lib/pm.h	2005-03-29 14:31:43.113556488 +0200
+@@ -331,6 +331,12 @@ pm_arg0toprogname(const char arg0[]);
  
  
  
@@ -2224,8 +2209,8 @@
  #endif
  
  
---- netpbm-10.26/urt/rle_open_f.c.security	2004-10-19 17:52:12.000000000 +0200
-+++ netpbm-10.26/urt/rle_open_f.c	2005-01-05 12:58:55.370579776 +0100
+--- netpbm-10.27/urt/rle_open_f.c.security	2005-01-01 05:03:50.000000000 +0100
++++ netpbm-10.27/urt/rle_open_f.c	2005-03-29 14:31:43.114556336 +0200
 @@ -6,6 +6,9 @@
   * 		University of Michigan
   * Date:	11/14/89
@@ -2257,8 +2242,8 @@
              combuf = (char *)malloc( 20 + strlen( file_name ) );
              if ( combuf == NULL )
              {
---- netpbm-10.26/urt/Runput.c.security	2002-03-13 05:24:43.000000000 +0100
-+++ netpbm-10.26/urt/Runput.c	2005-01-05 12:58:55.370579776 +0100
+--- netpbm-10.27/urt/Runput.c.security	2002-03-13 05:24:43.000000000 +0100
++++ netpbm-10.27/urt/Runput.c	2005-03-29 14:31:43.115556184 +0200
 @@ -17,6 +17,8 @@
   *
   *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
@@ -2291,8 +2276,8 @@
  	if ( h_cmap == NULL )
  	{
  	    fprintf( stderr,
---- netpbm-10.26/urt/rle_addhist.c.security	2003-01-08 20:35:44.000000000 +0100
-+++ netpbm-10.26/urt/rle_addhist.c	2005-01-05 12:58:55.371579624 +0100
+--- netpbm-10.27/urt/rle_addhist.c.security	2003-01-08 20:35:44.000000000 +0100
++++ netpbm-10.27/urt/rle_addhist.c	2005-03-29 14:31:43.115556184 +0200
 @@ -14,6 +14,8 @@
   * If you modify this software, you should include a notice giving the
   * name of the person performing the modification, the date of modification,
@@ -2341,8 +2326,8 @@
  	(void)rle_putcom(newc,out_hdr);
 -
  }
---- netpbm-10.26/urt/rle_getrow.c.security	2004-10-19 17:41:01.000000000 +0200
-+++ netpbm-10.26/urt/rle_getrow.c	2005-01-05 12:58:55.372579472 +0100
+--- netpbm-10.27/urt/rle_getrow.c.security	2004-10-19 17:41:01.000000000 +0200
++++ netpbm-10.27/urt/rle_getrow.c	2005-03-29 14:31:43.117555880 +0200
 @@ -17,6 +17,8 @@
   *
   *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
@@ -2395,8 +2380,8 @@
          if ( the_hdr->comments == NULL )
          {
          fprintf( stderr,
---- netpbm-10.26/urt/rle.h.security	2002-03-13 16:32:34.000000000 +0100
-+++ netpbm-10.26/urt/rle.h	2005-01-05 12:58:55.372579472 +0100
+--- netpbm-10.27/urt/rle.h.security	2002-03-13 16:32:34.000000000 +0100
++++ netpbm-10.27/urt/rle.h	2005-03-29 14:31:43.118555728 +0200
 @@ -14,6 +14,9 @@
   * If you modify this software, you should include a notice giving the
   * name of the person performing the modification, the date of modification,
@@ -2424,8 +2409,8 @@
  
  /* Declare RLE library routines. */
  
---- netpbm-10.26/urt/README.security	2000-06-02 22:53:04.000000000 +0200
-+++ netpbm-10.26/urt/README	2005-01-05 12:58:55.373579320 +0100
+--- netpbm-10.27/urt/README.security	2000-06-02 22:53:04.000000000 +0200
++++ netpbm-10.27/urt/README	2005-03-29 14:31:43.118555728 +0200
 @@ -18,3 +18,8 @@ in its initializer in the original.  But
  defines stdout as a variable, so that wouldn't compile.  So I changed
  it to NULL and added a line to rle_hdr_init to set that field to
@@ -2435,8 +2420,8 @@
 +Removed pipe through and compress support (unsafe)
 +
 +Alan Cox <alan@redhat.com>
---- netpbm-10.26/urt/scanargs.c.security	2003-01-08 20:38:25.000000000 +0100
-+++ netpbm-10.26/urt/scanargs.c	2005-01-05 12:58:55.374579168 +0100
+--- netpbm-10.27/urt/scanargs.c.security	2003-01-08 20:38:25.000000000 +0100
++++ netpbm-10.27/urt/scanargs.c	2005-03-29 14:31:43.120555424 +0200
 @@ -38,6 +38,8 @@
   *
   *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
@@ -2457,8 +2442,8 @@
  
  #if defined(c_plusplus) && !defined(USE_PROTOTYPES)
  #define USE_PROTOTYPES
---- netpbm-10.26/urt/rle_putcom.c.security	2000-05-19 01:12:22.000000000 +0200
-+++ netpbm-10.26/urt/rle_putcom.c	2005-01-05 12:58:55.374579168 +0100
+--- netpbm-10.27/urt/rle_putcom.c.security	2000-05-19 01:12:22.000000000 +0200
++++ netpbm-10.27/urt/rle_putcom.c	2005-03-29 14:31:43.121555272 +0200
 @@ -14,6 +14,8 @@
   * If you modify this software, you should include a notice giving the
   * name of the person performing the modification, the date of modification,
@@ -2501,8 +2486,8 @@
  	the_hdr->comments[--i] = NULL;
  	the_hdr->comments[--i] = value;
  	for ( i--; i >= 0; i-- )
---- netpbm-10.26/urt/rle_hdr.c.security	2000-06-09 09:49:51.000000000 +0200
-+++ netpbm-10.26/urt/rle_hdr.c	2005-01-05 12:58:55.375579016 +0100
+--- netpbm-10.27/urt/rle_hdr.c.security	2000-06-09 09:49:51.000000000 +0200
++++ netpbm-10.27/urt/rle_hdr.c	2005-03-29 14:31:43.122555120 +0200
 @@ -14,6 +14,8 @@
   * If you modify this software, you should include a notice giving the
   * name of the person performing the modification, the date of modification,
@@ -2569,8 +2554,8 @@
  	    size *= sizeof(char *);
  	    to_hdr->comments = (CONST_DECL char **)malloc( size );
  	    RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" );
---- netpbm-10.26/analyzer/pgmhist.c.security	2003-07-06 21:23:19.000000000 +0200
-+++ netpbm-10.26/analyzer/pgmhist.c	2005-01-05 12:58:55.376578864 +0100
+--- netpbm-10.27/analyzer/pgmhist.c.security	2003-07-06 21:23:19.000000000 +0200
++++ netpbm-10.27/analyzer/pgmhist.c	2005-03-29 14:31:43.123554968 +0200
 @@ -45,6 +45,7 @@ main( argc, argv )
      grayrow = pgm_allocrow( cols );
  
@@ -2579,8 +2564,8 @@
      MALLOCARRAY(hist, maxval + 1);
      MALLOCARRAY(rcount, maxval + 1);
      if ( hist == NULL || rcount == NULL )
---- netpbm-10.26/analyzer/pgmtexture.c.security	2003-08-07 18:18:16.000000000 +0200
-+++ netpbm-10.26/analyzer/pgmtexture.c	2005-01-05 12:58:55.376578864 +0100
+--- netpbm-10.27/analyzer/pgmtexture.c.security	2003-08-07 18:18:16.000000000 +0200
++++ netpbm-10.27/analyzer/pgmtexture.c	2005-03-29 14:31:43.124554816 +0200
 @@ -75,7 +75,10 @@ vector (int nl, int nh)
  {
    float *v;
diff --git a/netpbm.spec b/netpbm.spec
index 9114c4a..3d0a4ef 100644
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
-Version: 10.26.4
-Release: 3
+Version: 10.27
+Release: 1
 License: freeware
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
@@ -168,6 +168,12 @@ rm -rf $RPM_BUILD_ROOT/usr/pkginfo
 %{_mandir}/man5/*
 
 %changelog
+* Tue Mar 29 2005 Jindrich Novy <jnovy@redhat.com> 10.27-1
+- update to the new 10.27 release
+- update .security2, .security patch
+- regenerate man pages
+- remove jbig, hpcd
+
 * Mon Mar 14 2005 Jindrich Novy <jnovy@redhat.com> 10.26.4-3
 - fix overflow checking of integers with incompatible endianess
   causing problems using xwdtopnm (#147790)
diff --git a/sources b/sources
index 2bc0fa0..97a2432 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2b77de25d0aceb7d39cfe95a826bb469  netpbm-10.26.4.tar.bz2
-cafe185e7e05f1c01611e78eaa0cdad3  netpbmdoc-10.26.4.tar.bz2
+9075c0f45df08c54e7b8834e236e4bcc  netpbm-10.27.tar.bz2
+f28dd0bcf678de96764c35bc0badfacd  netpbmdoc-10.27.tar.bz2