rpms/netpbm/F-10 netpbm-10.35-64bitfix.patch, NONE, 1.1 netpbm-10.35-pamtosvgsegfault.patch, NONE, 1.1 netpbm-10.35-pnmmontagefix.patch, NONE, 1.1 netpbm-10.35-pnmtofiasco-stdin.patch, NONE, 1.1 .cvsignore, 1.47, 1.48 netpbm-10.22-security2.patch, 1.4, 1.5 netpbm-10.23-security.patch, 1.19, 1.20 netpbm.spec, 1.123, 1.124 sources, 1.51, 1.52 netpbm-10.35-pamcomp.patch, 1.1, NONE
Jindrich Novy
jnovy at fedoraproject.org
Fri Jan 23 17:58:59 UTC 2009
- Previous message: rpms/google-gadgets/F-10 .cvsignore, 1.4, 1.5 google-gadgets.spec, 1.7, 1.8 sources, 1.4, 1.5
- Next message: rpms/patchutils/devel patchutils-0.3.1.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.11, 1.12 patchutils.spec, 1.25, 1.26 sources, 1.11, 1.12 patchutils-0.3.0.tar.bz2.sig, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jnovy
Update of /cvs/pkgs/rpms/netpbm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3176
Modified Files:
.cvsignore netpbm-10.22-security2.patch
netpbm-10.23-security.patch netpbm.spec sources
Added Files:
netpbm-10.35-64bitfix.patch
netpbm-10.35-pamtosvgsegfault.patch
netpbm-10.35-pnmmontagefix.patch
netpbm-10.35-pnmtofiasco-stdin.patch
Removed Files:
netpbm-10.35-pamcomp.patch
Log Message:
* Fri Jan 23 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-1
- update to 10.35.38
- fixes crashes in picttoppm, pbmtomrf, mrftopbm
- fixes bugs in leaftoppm, ilbmtoppm
- unbreak ppmshadow and ppmrainbow (#476989)
- pnmmontage won't crash because of uninitialized memory usage
- fix segfault in pamtosvg caused by not reverting "sentinel value" (#476989)
- fix pnmtofiasco to accept image from stdin (#476989, #227283)
- fix cmuwmtopbm and other utilities by making endianess
functions work correctly on 64bit systems (#476863)
netpbm-10.35-64bitfix.patch:
--- NEW FILE netpbm-10.35-64bitfix.patch ---
diff -up netpbm-10.35.58/lib/libpm.c.64bitfix netpbm-10.35.58/lib/libpm.c
--- netpbm-10.35.58/lib/libpm.c.64bitfix 2009-01-22 08:49:25.000000000 +0100
+++ netpbm-10.35.58/lib/libpm.c 2009-01-22 08:50:38.000000000 +0100
@@ -1069,7 +1069,7 @@
pm_readbiglong(FILE * const ifP,
long * const lP) {
- int c;
+ unsigned int c;
unsigned long l;
c = getc(ifP);
@@ -1148,7 +1148,7 @@
int
pm_readlittlelong(FILE * const ifP,
long * const lP) {
- int c;
+ unsigned int c;
unsigned long l;
c = getc(ifP);
netpbm-10.35-pamtosvgsegfault.patch:
--- NEW FILE netpbm-10.35-pamtosvgsegfault.patch ---
diff -up netpbm-10.35.57/converter/other/pamtosvg/fit.c.pamtosvgsegfault netpbm-10.35.57/converter/other/pamtosvg/fit.c
--- netpbm-10.35.57/converter/other/pamtosvg/fit.c.pamtosvgsegfault 2008-12-15 10:04:49.000000000 +0100
+++ netpbm-10.35.57/converter/other/pamtosvg/fit.c 2008-12-19 09:10:01.000000000 +0100
@@ -1852,6 +1852,7 @@ find_error (curve_type curve, spline_typ
if (*worst_point == CURVE_LENGTH (curve) + 1)
{ /* Didn't have any ``worst point''; the error should be zero. */
+ *worst_point = 0;
if (epsilon_equal (total_error, 0.0))
LOG (" Every point fit perfectly.\n");
else
netpbm-10.35-pnmmontagefix.patch:
--- NEW FILE netpbm-10.35-pnmmontagefix.patch ---
diff -up netpbm-10.35.57/editor/pnmmontage.c.pnmmontagefix netpbm-10.35.57/editor/pnmmontage.c
--- netpbm-10.35.57/editor/pnmmontage.c.pnmmontagefix 2008-12-15 10:04:29.000000000 +0100
+++ netpbm-10.35.57/editor/pnmmontage.c 2008-12-23 20:09:01.000000000 +0100
@@ -346,6 +346,7 @@ main(int argc, char **argv)
}
pnm_readpaminit(imgs[0].file, &imgs[0], PAM_STRUCT_SIZE(tuple_type));
+ memset(&outimg, 0, sizeof(outimg));
outimg.maxval = imgs[0].maxval;
outimg.format = imgs[0].format;
memcpy(outimg.tuple_type, imgs[0].tuple_type, sizeof(imgs[0].tuple_type));
netpbm-10.35-pnmtofiasco-stdin.patch:
--- NEW FILE netpbm-10.35-pnmtofiasco-stdin.patch ---
diff -up netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/coder.c
--- netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin 2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/codec/coder.c 2009-01-21 08:03:00.000000000 +0100
@@ -213,15 +213,14 @@ alloc_coder (char const * const *inputna
*/
{
char *filename;
- int width, w = 0, height, h = 0;
+ int width, w = 0, height, h = 0, format;
bool_t color, c = NO;
+ xelval maxval;
unsigned n;
for (n = 0; (filename = get_input_image_name (inputname, n)); n++)
{
FILE *file;
- xelval maxval;
- int format;
if (filename == NULL)
file = stdin;
else
@@ -251,6 +250,8 @@ alloc_coder (char const * const *inputna
wi->width = w;
wi->height = h;
wi->color = c;
+ wi->format = format;
+ wi->maxval = maxval;
}
/*
@@ -642,7 +643,18 @@ video_coder (char const * const *image_t
*/
future_frame = frame == future_display;
c->mt->number = frame;
- c->mt->original = read_image (image_name);
+ if (strcmp(image_name, "-")) {
+ c->mt->original = read_image (image_name);
+ } else { /* stdin is not seekable - read image contents without rewind */
+ int width = wfa->wfainfo->width;
+ int height = wfa->wfainfo->height;
+ int color = wfa->wfainfo->color;
+ int format = wfa->wfainfo->format;
+ xelval maxval = wfa->wfainfo->maxval;
+
+ c->mt->original = alloc_image(width, height, color, FORMAT_4_4_4);
+ read_image_data(c->mt->original, stdin, color, width, height, maxval, format);
+ }
if (c->tiling->exponent && type == I_FRAME)
perform_tiling (c->mt->original, c->tiling);
diff -up netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/wfa.h
--- netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin 2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/codec/wfa.h 2009-01-21 08:03:28.000000000 +0100
@@ -75,6 +75,7 @@ typedef struct range_info
unsigned level; /* bintree level of range */
} range_info_t;
+#include "pnm.h"
#include "image.h"
#include "rpf.h"
#include "bit-io.h"
@@ -93,6 +94,8 @@ typedef struct wfa_info
unsigned width; /* image width */
unsigned height; /* image height */
unsigned level; /* image level */
+ unsigned format; /* image format */
+ xelval maxval; /* image maximal pixel intensity value */
rpf_t *rpf; /* Standard reduced precision format */
rpf_t *dc_rpf; /* DC reduced precision format */
rpf_t *d_rpf; /* Delta reduced precision format */
diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.c
--- netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin 2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/lib/image.c 2009-01-21 08:01:53.000000000 +0100
@@ -273,7 +273,7 @@ free_image (image_t *image)
}
-static void
+void
read_image_data(image_t * const image, FILE *input, const bool_t color,
const int width, const int height, const xelval maxval,
const int format) {
diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.h
--- netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin 2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/lib/image.h 2009-01-21 08:02:29.000000000 +0100
@@ -17,6 +17,8 @@
#ifndef _IMAGE_H
#define _IMAGE_H
+#include "pnm.h"
+
#include <stdio.h>
#include "types.h"
#include "fiasco.h"
@@ -51,6 +53,10 @@ read_pnmheader (const char *image_name,
image_t *
read_image (const char *image_name);
void
+read_image_data(image_t * const image, FILE *input, const bool_t color,
+ const int width, const int height, const xelval maxval,
+ const int format);
+void
write_image (const char *image_name, const image_t *image);
bool_t
same_image_type (const image_t *img1, const image_t *img2);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore 6 Nov 2008 11:15:27 -0000 1.47
+++ .cvsignore 23 Jan 2009 17:58:28 -0000 1.48
@@ -1 +1 @@
-netpbm-10.35.55.tar.bz2
+netpbm-10.35.58.tar.bz2
netpbm-10.22-security2.patch:
Index: netpbm-10.22-security2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/netpbm-10.22-security2.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- netpbm-10.22-security2.patch 4 Aug 2008 07:05:23 -0000 1.4
+++ netpbm-10.22-security2.patch 23 Jan 2009 17:58:28 -0000 1.5
@@ -416,7 +416,7 @@
-my $ourtmp = "$tmpdir/ppmshadow$$";
-mkdir($ourtmp, 0777) or
- die("Unable to create directory for temporary files '$ourtmp");
-+chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`);
++my $ourtmp; chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`);
+if ($? >> 8) {
+ die "Can't create directory for temporary files";
+}
netpbm-10.23-security.patch:
Index: netpbm-10.23-security.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/netpbm-10.23-security.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- netpbm-10.23-security.patch 24 Jun 2008 09:38:25 -0000 1.19
+++ netpbm-10.23-security.patch 23 Jan 2009 17:58:28 -0000 1.20
@@ -1654,18 +1654,6 @@
for (i = 0; i < iysize; i++)
for (j = 0; j < ixsize; j++) {
fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double)
-diff -up netpbm-10.35.46/generator/ppmrainbow.security netpbm-10.35.46/generator/ppmrainbow
---- netpbm-10.35.46/generator/ppmrainbow.security 2008-06-24 08:58:57.000000000 +0200
-+++ netpbm-10.35.46/generator/ppmrainbow 2008-06-24 09:04:21.000000000 +0200
-@@ -11,7 +11,7 @@ my ($Twid, $Thgt, $tmpdir, $norepeat, $v
- # set defaults
- $Twid = 600;
- $Thgt = 8;
--$tmpdir = $ENV{"TMPDIR"} || "/tmp";
-+$tmpdir = $ENV{"TMPDIR"} || ".tmp";
- $norepeat = $FALSE;
- $verbose = $FALSE;
-
diff -up netpbm-10.35.46/lib/libpam.c.security netpbm-10.35.46/lib/libpam.c
--- netpbm-10.35.46/lib/libpam.c.security 2008-06-24 08:59:03.000000000 +0200
+++ netpbm-10.35.46/lib/libpam.c 2008-06-24 09:04:21.000000000 +0200
Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/netpbm.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- netpbm.spec 6 Nov 2008 11:15:27 -0000 1.123
+++ netpbm.spec 23 Jan 2009 17:58:28 -0000 1.124
@@ -1,6 +1,6 @@
Summary: A library for handling different graphics file formats
Name: netpbm
-Version: 10.35.55
+Version: 10.35.58
Release: 1%{?dist}
# See copyright_summary for details
License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -30,7 +30,10 @@
Patch18: netpbm-10.35-glibc.patch
Patch19: netpbm-10.35-gcc43.patch
Patch20: netpbm-10.35-rgbtxt.patch
-Patch21: netpbm-10.35-pamcomp.patch
+Patch21: netpbm-10.35-pamtosvgsegfault.patch
+Patch22: netpbm-10.35-pnmmontagefix.patch
+Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
+Patch24: netpbm-10.35-64bitfix.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
BuildRequires: libX11-devel, python, jasper-devel
@@ -91,7 +94,10 @@
%patch18 -p1 -b .glibc
%patch19 -p1 -b .gcc43
%patch20 -p1 -b .rgbtxt
-%patch21 -p1 -b .pamcomp
+%patch21 -p1 -b .pamtosvgsegfault
+%patch22 -p1 -b .pnmmontagefix
+%patch23 -p1 -b .pnmtofiasco-stdin
+%patch24 -p1 -b .64bitfix
##mv shhopt/shhopt.h shhopt/pbmshhopt.h
##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -219,6 +225,17 @@
%{_datadir}/netpbm/
%changelog
+* Fri Jan 23 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-1
+- update to 10.35.38
+- fixes crashes in picttoppm, pbmtomrf, mrftopbm
+- fixes bugs in leaftoppm, ilbmtoppm
+- unbreak ppmshadow and ppmrainbow (#476989)
+- pnmmontage won't crash because of uninitialized memory usage
+- fix segfault in pamtosvg caused by not reverting "sentinel value" (#476989)
+- fix pnmtofiasco to accept image from stdin (#476989, #227283)
+- fix cmuwmtopbm and other utilities by making endianess
+ functions work correctly on 64bit systems (#476863)
+
* Thu Nov 6 2008 Jindrich Novy <jnovy at redhat.com> 10.35.55-1
- update to 10.35.55
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources 6 Nov 2008 11:15:27 -0000 1.51
+++ sources 23 Jan 2009 17:58:28 -0000 1.52
@@ -1 +1 @@
-9d470a6472b3b49ecbc98e516d6d206c netpbm-10.35.55.tar.bz2
+f4e789971594212d0be2d8fd1e8a00ac netpbm-10.35.58.tar.bz2
--- netpbm-10.35-pamcomp.patch DELETED ---
- Previous message: rpms/google-gadgets/F-10 .cvsignore, 1.4, 1.5 google-gadgets.spec, 1.7, 1.8 sources, 1.4, 1.5
- Next message: rpms/patchutils/devel patchutils-0.3.1.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.11, 1.12 patchutils.spec, 1.25, 1.26 sources, 1.11, 1.12 patchutils-0.3.0.tar.bz2.sig, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list