rpms/netpbm/FC-4 netpbm-10.28-legal.patch, NONE, 1.1 netpbm-10.29-pnmtopng.patch, NONE, 1.1 netpbm-10.30-rgbtxt.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 netpbm-10.23-security.patch, 1.9, 1.10 netpbm-10.27-bmptopnm.patch, 1.1, 1.2 netpbm-10.28-CAN-2005-2471.patch, 1.1, 1.2 netpbm-10.28-gcc4.patch, 1.1, 1.2 netpbm.spec, 1.40, 1.41 sources, 1.17, 1.18 netpbm-10.18-manpath.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jan 4 12:19:40 UTC 2006
Author: jnovy
Update of /cvs/dist/rpms/netpbm/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv22467
Modified Files:
.cvsignore netpbm-10.23-security.patch
netpbm-10.27-bmptopnm.patch netpbm-10.28-CAN-2005-2471.patch
netpbm-10.28-gcc4.patch netpbm.spec sources
Added Files:
netpbm-10.28-legal.patch netpbm-10.29-pnmtopng.patch
netpbm-10.30-rgbtxt.patch
Removed Files:
netpbm-10.18-manpath.patch
Log Message:
* Wed Jan 04 2006 Jindrich Novy <jnovy at redhat.com> 10.31-1.FC4
- update to 10.31
- update security patch
- regenerate man pages
- drop manpath patch
- add .legal, .pnmtopng, .rgbtxt patches
- update .security, .security2, .bmptopnm, .CAN-2005-2471, .gcc4 patches
- new version fixes error in pnmnorm #176845
netpbm-10.28-legal.patch:
other/Makefile | 2 +-
ppm/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE netpbm-10.28-legal.patch ---
--- netpbm-10.28/converter/other/Makefile.legal 2005-04-12 05:55:29.000000000 +0200
+++ netpbm-10.28/converter/other/Makefile 2005-06-10 10:54:01.685885728 +0200
@@ -7,7 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
include $(BUILDDIR)/Makefile.config
-SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam
+SUBDIRS = pnmtopalm jpeg2000 cameratopam
ifneq ($(BUILD_FIASCO), N)
SUBDIRS += fiasco
endif
--- netpbm-10.28/converter/ppm/Makefile.legal 2004-10-16 20:55:28.000000000 +0200
+++ netpbm-10.28/converter/ppm/Makefile 2005-06-10 10:56:04.616197480 +0200
@@ -7,7 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
include $(BUILDDIR)/Makefile.config
-SUBDIRS = hpcdtoppm ppmtompeg
+SUBDIRS = ppmtompeg
PORTBINARIES = 411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
leaftoppm mtvtoppm neotoppm \
netpbm-10.29-pnmtopng.patch:
pnmtopng.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE netpbm-10.29-pnmtopng.patch ---
--- netpbm-10.29/converter/other/pnmtopng.c.segfault 2005-08-06 19:26:55.000000000 +0200
+++ netpbm-10.29/converter/other/pnmtopng.c 2005-10-05 14:33:03.000000000 +0200
@@ -1618,7 +1618,7 @@ makePngLine(png_byte * const l
*pp++ = PNM_GET1(p_png) & 0xff;
} else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) {
unsigned int paletteIndex;
- if (alpha)
+ if (alpha && alpha_mask)
paletteIndex = lookupColorAlpha(caht, &p, &alpha_mask[col]);
else
paletteIndex = ppm_lookupcolor(cht, &p);
@@ -1637,7 +1637,7 @@ makePngLine(png_byte * const l
} else
pm_error("INTERNAL ERROR: undefined color_type");
- if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) {
+ if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA && alpha_mask) {
int const png_alphaval = (int)
alpha_mask[col] * (float) png_maxval / maxval + 0.5;
if (depth == 16)
netpbm-10.30-rgbtxt.patch:
pm_config.in.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE netpbm-10.30-rgbtxt.patch ---
--- netpbm-10.30/pm_config.in.h.rgbtxt 2005-04-25 04:21:43.000000000 +0200
+++ netpbm-10.30/pm_config.in.h 2005-11-29 16:52:10.000000000 +0100
@@ -106,8 +106,8 @@
#define RGB_DB2 "PBMplus_Dir:RGB.TXT"
#define RGB_DB3 "PBMplus_Dir:RGB.TXT"
#else
-#define RGB_DB1 "/usr/lib/X11/rgb.txt"
-#define RGB_DB2 "/usr/openwin/lib/rgb.txt"
+#define RGB_DB1 "/usr/share/X11/rgb.txt"
+#define RGB_DB2 "/usr/lib/X11/rgb.txt"
#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 29 Mar 2005 14:08:28 -0000 1.15
+++ .cvsignore 4 Jan 2006 12:19:35 -0000 1.16
@@ -8,3 +8,5 @@
netpbmdoc-10.26.4.tar.bz2
netpbm-10.27.tar.bz2
netpbmdoc-10.27.tar.bz2
+netpbm-10.31.tar.bz2
+netpbmdoc-10.31.tar.bz2
netpbm-10.23-security.patch:
OPENLICENSE | 163 +++++++++++++++++++++++++++++++++++++
analyzer/pgmhist.c | 1
analyzer/pgmtexture.c | 9 ++
converter/other/gemtopnm.c | 1
converter/other/jpegtopnm.c | 1
converter/other/pbmtopgm.c | 1
converter/other/pngtopnm.c | 19 ++--
converter/other/pnmtoddif.c | 2
converter/other/pnmtojpeg.c | 9 +-
converter/other/pnmtops.c | 11 +-
converter/other/pnmtorle.c | 2
converter/other/pnmtosgi.c | 19 ++++
converter/other/rletopnm.c | 2
converter/other/sgitopnm.c | 6 +
converter/other/sirtopnm.c | 1
converter/other/tifftopnm.c | 3
converter/other/xwdtopnm.c | 8 +
converter/pbm/icontopbm.c | 6 +
converter/pbm/mdatopbm.c | 5 -
converter/pbm/mgrtopbm.c | 2
converter/pbm/pbmto10x.c | 2
converter/pbm/pbmto4425.c | 3
converter/pbm/pbmtoascii.c | 2
converter/pbm/pbmtocmuwm.c | 1
converter/pbm/pbmtogem.c | 1
converter/pbm/pbmtogo.c | 1
converter/pbm/pbmtoicon.c | 1
converter/pbm/pbmtolj.c | 4
converter/pbm/pbmtomacp.c | 3
converter/pbm/pbmtomda.c | 1
converter/pbm/pbmtomgr.c | 1
converter/pbm/pbmtoppa/pbm.c | 4
converter/pbm/pbmtoppa/pbmtoppa.c | 1
converter/pbm/pbmtox10bm.c | 1
converter/pbm/pbmtoxbm.c | 1
converter/pbm/pbmtoybm.c | 1
converter/pbm/pbmtozinc.c | 1
converter/pbm/pktopbm.c | 1
converter/pbm/thinkjettopbm.l | 4
converter/pbm/ybmtopbm.c | 1
converter/pgm/lispmtopgm.c | 5 -
converter/pgm/psidtopgm.c | 1
converter/ppm/Makefile | 2
converter/ppm/ilbmtoppm.c | 28 ++++++
converter/ppm/imgtoppm.c | 2
converter/ppm/pcxtoppm.c | 3
converter/ppm/picttoppm.c | 2
converter/ppm/pjtoppm.c | 21 ++--
converter/ppm/ppmtoeyuv.c | 1
converter/ppm/ppmtoicr.c | 2
converter/ppm/ppmtoilbm.c | 9 +-
converter/ppm/ppmtolj.c | 3
converter/ppm/ppmtomitsu.c | 2
converter/ppm/ppmtompeg/frame.c | 73 ++++++++--------
converter/ppm/ppmtompeg/iframe.c | 20 ++--
converter/ppm/ppmtompeg/parallel.c | 4
converter/ppm/ppmtompeg/psearch.c | 18 +++-
converter/ppm/ppmtompeg/rgbtoycc.c | 2
converter/ppm/ppmtopcx.c | 2
converter/ppm/ppmtopict.c | 2
converter/ppm/ppmtopj.c | 1
converter/ppm/ppmtopjxl.c | 8 +
converter/ppm/ppmtowinicon.c | 8 +
converter/ppm/ppmtoxpm.c | 2
converter/ppm/qrttoppm.c | 2
converter/ppm/sldtoppm.c | 4
converter/ppm/ximtoppm.c | 4
converter/ppm/xpmtoppm.c | 1
converter/ppm/yuvtoppm.c | 1
doc/COPYRIGHT.PATENT | 5 +
editor/pamcut.c | 2
editor/pamoil.c | 1
editor/pbmclean.c | 2
editor/pbmlife.c | 2
editor/pbmpscale.c | 1
editor/pbmreduce.c | 1
editor/pnmcut.c | 1
editor/pnmgamma.c | 1
editor/pnmhisteq.c | 1
editor/pnmindex.csh | 3
editor/pnmpad.c | 2
editor/pnmpaste.c | 5 +
editor/pnmremap.c | 2
editor/pnmrotate.c | 8 +
editor/pnmscalefixed.c | 7 +
editor/pnmshear.c | 6 +
editor/ppmdither.c | 6 +
generator/pbmpage.c | 3
generator/pbmtext.c | 15 +++
generator/pgmcrater.c | 2
generator/pgmkernel.c | 2
generator/ppmrainbow | 2
lib/libpam.c | 3
lib/libpammap.c | 2
lib/libpbm1.c | 1
lib/libpbmvms.c | 2
lib/libpm.c | 54 +++++++++++-
lib/pm.h | 6 +
other/pnmcolormap.c | 1
urt/README | 5 +
urt/Runput.c | 10 +-
urt/rle.h | 13 ++
urt/rle_addhist.c | 15 ++-
urt/rle_getrow.c | 3
urt/rle_hdr.c | 19 +++-
urt/rle_open_f.c | 8 +
urt/rle_putcom.c | 6 +
urt/scanargs.c | 6 -
108 files changed, 672 insertions(+), 101 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.9 -r 1.10 netpbm-10.23-security.patch
Index: netpbm-10.23-security.patch
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-4/netpbm-10.23-security.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- netpbm-10.23-security.patch 29 Jul 2005 08:14:30 -0000 1.9
+++ netpbm-10.23-security.patch 4 Jan 2006 12:19:35 -0000 1.10
@@ -1,28 +1,171 @@
---- netpbm-10.28/generator/ppmrainbow.security 2003-01-04 01:40:56.000000000 +0100
-+++ netpbm-10.28/generator/ppmrainbow 2005-06-10 09:44:00.275597176 +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;
-
---- netpbm-10.28/generator/pbmpage.c.security 2005-05-22 20:43:13.000000000 +0200
-+++ netpbm-10.28/generator/pbmpage.c 2005-06-10 09:44:00.276597024 +0200
-@@ -163,6 +163,9 @@ output_pbm(FILE *file, const int Width,
- /* We round the allocated row space up to a multiple of 8 so the ugly
- fast code below can work.
- */
-+
-+ overflow_add(Width, 7);
-+
- pbmrow = pbm_allocrow(((Width+7)/8)*8);
-
- bitmap_cursor = 0;
---- netpbm-10.28/generator/pbmtext.c.security 2005-04-14 19:03:43.000000000 +0200
-+++ netpbm-10.28/generator/pbmtext.c 2005-06-10 09:44:00.278596720 +0200
+--- /dev/null 2005-12-28 07:55:55.980549750 +0100
++++ netpbm-10.31/OPENLICENSE 2005-12-30 10:44:51.000000000 +0100
+@@ -0,0 +1,163 @@
++ The Open Software License
++ v. 1.1
++
++This Open Software License (the "License") applies to any original work of
++authorship (the "Original Work") whose owner (the "Licensor") has placed the
++following notice immediately following the copyright notice for the Original
++Work:
++
++Licensed under the Open Software License version 1.1
++
++1) Grant of Copyright License. Licensor hereby grants You a world-wide,
++royalty-free, non-exclusive, perpetual, non-sublicenseable license to do the
++following:
++
++a) to reproduce the Original Work in copies;
++
++b) to prepare derivative works ("Derivative Works") based upon the Original
++Work;
++
++c) to distribute copies of the Original Work and Derivative Works to the
++public, with the proviso that copies of Original Work or Derivative Works that
++You distribute shall be licensed under the Open Software License;
++
++d) to perform the Original Work publicly; and
++
++e) to display the Original Work publicly.
++
++2) Grant of Patent License. Licensor hereby grants You a world-wide,
++royalty-free, non-exclusive, perpetual, non-sublicenseable license, under
++patent claims owned or controlled by the Licensor that are embodied in the
++Original Work as furnished by the Licensor ("Licensed Claims") to make, use,
++sell and offer for sale the Original Work. Licensor hereby grants You a
++world-wide, royalty-free, non-exclusive, perpetual, non-sublicenseable license
++under the Licensed Claims to make, use, sell and offer for sale Derivative Works.
++
++3) Grant of Source Code License. The term "Source Code" means the preferred
++form of the Original Work for making modifications to it and all available
++documentation describing how to modify the Original Work. Licensor hereby
++agrees to provide a machine-readable copy of the Source Code of the Original
++Work along with each copy of the Original Work that Licensor distributes.
++Licensor reserves the right to satisfy this obligation by placing a
++machine-readable copy of the Source Code in an information repository reasonably
++calculated to permit inexpensive and convenient access by You for as long as
++ Licensor continues to distribute the Original Work, and by publishing the
++address of that information repository in a notice immediately following the
++copyright notice that applies to the Original Work.
++
++
++4) Exclusions From License Grant. Nothing in this License shall be deemed to
++grant any rights to trademarks, copyrights, patents, trade secrets or any
++other intellectual property of Licensor except as expressly stated herein. No
++patent license is granted to make, use, sell or offer to sell embodiments of
++any patent claims other than the Licensed Claims defined in Section 2. No
++right is granted to the trademarks of Licensor even if such marks are included
++in the Original Work. Nothing in this License shall be interpreted to prohibit
++Licensor from licensing under different terms from this License any Original
++Work that Licensor otherwise would have a right to license.
++
++5) External Deployment. The term "External Deployment" means the use or
++distribution of the Original Work or Derivative Works in any way such that the
++Original Work or Derivative Works may be used by anyone other than You,
++whether the Original Work or Derivative Works are distributed to those persons
++or made available as an application intended for use over a computer network.
++As an express condition for the grants of license hereunder, You agree that
++any External Deployment by You of a Derivative Work shall be deemed a
++distribution and shall be licensed to all under the terms of this License, as
++prescribed in section 1(c) herein.
++
++6) Attribution Rights. You must retain, in the Source Code of any Derivative
++Works that You create, all copyright, patent or trademark notices from the
++Source Code of the Original Work, as well as any notices of licensing and any
++descriptive text identified therein as an "Attribution Notice." You must cause
++the Source Code for any Derivative Works that You create to carry a prominent
++Attribution Notice reasonably calculated to inform recipients that You have
++modified the Original Work.
++
++7) Warranty and Disclaimer of Warranty. Licensor warrants that the copyright
++in and to the Original Work is owned by the Licensor or that the Original Work
++is distributed by Licensor under a valid current license from the copyright
++owner. Except as expressly stated in the immediately proceeding sentence, the
++Original Work is provided under this License on an "AS IS" BASIS and WITHOUT
++WARRANTY, either express or implied, including, without limitation, the
++warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR
++PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU.
++This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No
++license to Original Work is granted hereunder except under this disclaimer.
++
++8) Limitation of Liability. Under no circumstances and under no legal theory,
++whether in tort (including negligence), contract, or otherwise, shall the
++Licensor be liable to any person for any direct, indirect, special, incidental,
++or consequential damages of any character arising as a result of this License
++or the use of the Original Work including, without limitation, damages for
++loss of goodwill, work stoppage, computer failure or malfunction, or any and
++all other commercial damages or losses. This limitation of liability shall not
++apply to liability for death or personal injury resulting from Licensor's
++negligence to the extent applicable law prohibits such limitation. Some
++jurisdictions do not allow the exclusion or limitation of incidental or
++consequential damages, so this exclusion and limitation may not apply to You.
++
++
++9) Acceptance and Termination. If You distribute copies of the Original Work
++or a Derivative Work, You must make a reasonable effort under the circumstances
++to obtain the express and volitional assent of recipients to the terms of this
++License. Nothing else but this License (or another written agreement between
++Licensor and You) grants You permission to create Derivative Works based upon
++the Original Work or to exercise any of the rights granted in Sections 1 herein,
++and any attempt to do so except under the terms of this License (or another
++written agreement between Licensor and You) is expressly prohibited by U.S.
++copyright law, the equivalent laws of other countries, and by international
++treaty. Therefore, by exercising any of the rights granted to You in Sections
++1 herein, You indicate Your acceptance of this License and all of its terms and
++conditions. This License shall terminate immediately and you may no longer
++exercise any of the rights granted to You by this License upon Your failure to
++honor the proviso in Section 1(c) herein.
++
++10) Mutual Termination for Patent Action. This License shall terminate
++automatically and You may no longer exercise any of the rights granted to You
++by this License if You file a lawsuit in any court alleging that any OSI
++Certified open source software that is licensed under any license containing
++this "Mutual Termination for Patent Action" clause infringes any patent claims
++that are essential to use that software.
++
++11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this
++License may be brought only in the courts of a jurisdiction wherein the Licensor
++resides or in which Licensor conducts its primary business, and under the laws
++of that jurisdiction excluding its conflict-of-law provisions. The application
++of the United Nations Convention on Contracts for the International Sale of
++Goods is expressly excluded. Any use of the Original Work outside the scope of
++this License or after its termination shall be subject to the requirements and
++penalties of the U.S. Copyright Act, 17 U.S.C. å¤ 101 et seq., the equivalent
++laws of other countries, and international treaty. This section shall survive
++the termination of this License.
++
++12) Attorneys Fees. In any action to enforce the terms of this License or
++seeking damages relating thereto, the prevailing party shall be entitled to
++recover its costs and expenses, including, without limitation, reasonable
++attorneys' fees and costs incurred in connection with such action, including
++any appeal of such action. This section shall survive the termination of this
++License.
++
++13) Miscellaneous. This License represents the complete agreement concerning
++the subject matter hereof. If any provision of this License is held to be
++unenforceable, such provision shall be reformed only to the extent necessary
++to make it enforceable.
++
++14) Definition of "You" in This License. "You" throughout this License,
++whether in upper or lower case, means an individual or a legal entity exercising
++rights under, and complying with all of the terms of, this License. For legal
++entities, "You" includes any entity that controls, is controlled by, or is under
++common control with you. For purposes of this definition, "control" means (i)
++the power, direct or indirect, to cause the direction or management of such
++entity, whether by contract or otherwise, or (ii) ownership of fifty percent
++(50%) or more of the outstanding shares, or (iii) beneficial ownership of such
++entity.
++
++15) Right to Use. You may use the Original Work in all ways not otherwise
++restricted or conditioned by this License or by law, and Licensor promises not
++to interfere with or be responsible for such uses by You.
++
++This license is Copyright (C) 2002 Lawrence E. Rosen. All rights reserved.
++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.
[...3792 lines suppressed...]
+ length += strlen(old); /* add length if there. */
++ }
+
++ overflow_add(length, 1);
+ ++length; /*Cater for the null. */
+
+ MALLOCARRAY(newc, length);
+--- netpbm-10.31/urt/rle_hdr.c.security 2005-10-17 00:16:33.000000000 +0200
++++ netpbm-10.31/urt/rle_hdr.c 2005-12-30 10:44:51.000000000 +0100
@@ -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,
@@ -2452,7 +2296,7 @@
*/
/*
* rle_hdr.c - Functions to manipulate rle_hdr structures.
-@@ -77,7 +79,10 @@ int img_num;
+@@ -79,7 +81,10 @@ int img_num;
/* Fill in with copies of the strings. */
if ( the_hdr->cmd != pgmname )
{
@@ -2464,7 +2308,7 @@
RLE_CHECK_ALLOC( pgmname, tmp, 0 );
strcpy( tmp, pgmname );
the_hdr->cmd = tmp;
-@@ -85,7 +90,9 @@ int img_num;
+@@ -87,7 +92,9 @@ int img_num;
if ( the_hdr->file_name != fname )
{
@@ -2475,7 +2319,7 @@
RLE_CHECK_ALLOC( pgmname, tmp, 0 );
strcpy( tmp, fname );
the_hdr->file_name = tmp;
-@@ -150,6 +157,7 @@ rle_hdr *from_hdr, *to_hdr;
+@@ -152,6 +159,7 @@ rle_hdr *from_hdr, *to_hdr;
if ( to_hdr->bg_color )
{
int size = to_hdr->ncolors * sizeof(int);
@@ -2483,7 +2327,7 @@
to_hdr->bg_color = (int *)malloc( size );
RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->bg_color, "background color" );
memcpy( to_hdr->bg_color, from_hdr->bg_color, size );
-@@ -158,7 +166,7 @@ rle_hdr *from_hdr, *to_hdr;
+@@ -160,7 +168,7 @@ rle_hdr *from_hdr, *to_hdr;
if ( to_hdr->cmap )
{
int size = to_hdr->ncmap * (1 << to_hdr->cmaplen) * sizeof(rle_map);
@@ -2492,7 +2336,7 @@
RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->cmap, "color map" );
memcpy( to_hdr->cmap, from_hdr->cmap, size );
}
-@@ -171,11 +179,16 @@ rle_hdr *from_hdr, *to_hdr;
+@@ -173,11 +181,16 @@ rle_hdr *from_hdr, *to_hdr;
int size = 0;
CONST_DECL char **cp;
for ( cp=to_hdr->comments; *cp; cp++ )
@@ -2509,52 +2353,94 @@
size *= sizeof(char *);
to_hdr->comments = (CONST_DECL char **)malloc( size );
RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" );
---- netpbm-10.28/analyzer/pgmhist.c.security 2003-07-06 21:23:19.000000000 +0200
-+++ netpbm-10.28/analyzer/pgmhist.c 2005-06-10 09:44:00.413576200 +0200
-@@ -45,6 +45,7 @@ main( argc, argv )
- grayrow = pgm_allocrow( cols );
-
- /* Build histogram. */
-+ overflow_add(maxval, 1);
- MALLOCARRAY(hist, maxval + 1);
- MALLOCARRAY(rcount, maxval + 1);
- if ( hist == NULL || rcount == NULL )
---- netpbm-10.28/analyzer/pgmtexture.c.security 2003-08-07 18:18:16.000000000 +0200
-+++ netpbm-10.28/analyzer/pgmtexture.c 2005-06-10 09:44:00.414576048 +0200
-@@ -75,7 +75,10 @@ vector (int nl, int nh)
- {
- float *v;
+--- netpbm-10.31/urt/README.security 2000-06-02 22:53:04.000000000 +0200
++++ netpbm-10.31/urt/README 2005-12-30 10:44:51.000000000 +0100
+@@ -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
+ 'stdout' dynamically. 2000.06.02 BJH.
++
++Redid the code to check for maths overflows and other crawly horrors.
++Removed pipe through and compress support (unsafe)
++
++Alan Cox <alan at redhat.com>
+--- netpbm-10.31/urt/Runput.c.security 2005-10-16 23:36:29.000000000 +0200
++++ netpbm-10.31/urt/Runput.c 2005-12-30 10:44:51.000000000 +0100
+@@ -17,6 +17,8 @@
+ *
+ * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
+ * to have all "void" functions so declared.
++ *
++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
+ */
+ /*
+ * Runput.c - General purpose Run Length Encoding.
+@@ -202,9 +204,11 @@ RunSetup(rle_hdr * the_hdr)
+ if ( the_hdr->background != 0 )
+ {
+ register int i;
+- register rle_pixel *background =
+- (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
++ register rle_pixel *background;
+ register int *bg_color;
++
++ overflow_add(the_hdr->ncolors,1);
++ background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
+ /*
+ * If even number of bg color bytes, put out one more to get to
+ * 16 bit boundary.
+@@ -224,7 +228,7 @@ RunSetup(rle_hdr * the_hdr)
+ /* Big-endian machines are harder */
+ register int i, nmap = (1 << the_hdr->cmaplen) *
+ the_hdr->ncmap;
+- register char *h_cmap = (char *)malloc( nmap * 2 );
++ register char *h_cmap = (char *)malloc2( nmap, 2 );
+ if ( h_cmap == NULL )
+ {
+ fprintf( stderr,
+--- netpbm-10.31/urt/rle_getrow.c.security 2005-10-16 23:47:53.000000000 +0200
++++ netpbm-10.31/urt/rle_getrow.c 2005-12-30 10:44:51.000000000 +0100
+@@ -17,6 +17,8 @@
+ *
+ * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
+ * to have all "void" functions so declared.
++ *
++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
+ */
+ /*
+ * rle_getrow.c - Read an RLE file in.
+@@ -168,6 +170,7 @@ rle_get_setup(rle_hdr * const the_hdr) {
+ register char * cp;
-- MALLOCARRAY(v, (unsigned) (nh - nl + 1));
-+ overflow_add(nh, 1);
-+ if(nh < nl)
-+ pm_error("assert: h < l");
-+ v = (float *) malloc2 ((nh - nl + 1), sizeof (float));
- if (v == NULL)
- pm_error("Unable to allocate memory for a vector.");
- return v - nl;
-@@ -91,16 +94,22 @@ matrix (int nrl, int nrh, int ncl, int n
- float **m;
-
- /* allocate pointers to rows */
-- MALLOCARRAY(m, (unsigned) (nrh - nrl + 1));
-+ overflow_add(nrh, 1);
-+ if(nrh < nrl)
-+ pm_error("assert: nrh < nrl");
-+ m = (float **) malloc2(nrh - nrl + 1, sizeof (float *));
- if (m == NULL)
- pm_error("Unable to allocate memory for a matrix.");
-
- m -= ncl;
-
-+ if(nch < ncl)
-+ pm_error("assert: nch < ncl");
-+ overflow_add(nch, 1);
- /* allocate rows and set pointers to them */
- for (i = nrl; i <= nrh; i++)
- {
-- MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1));
-+ m[i] = (float *) malloc2(nch - ncl + 1, sizeof (float));
- if (m[i] == NULL)
- pm_error("Unable to allocate memory for a matrix row.");
- m[i] -= ncl;
+ VAXSHORT( comlen, infile ); /* get comment length */
++ overflow_add(comlen, 1);
+ evenlen = (comlen + 1) & ~1; /* make it even */
+ if ( evenlen )
+ {
+--- netpbm-10.31/urt/rle_putcom.c.security 2005-10-07 18:01:42.000000000 +0200
++++ netpbm-10.31/urt/rle_putcom.c 2005-12-30 10:44:51.000000000 +0100
+@@ -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,
+ * and the reason for such modification.
++ *
++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
+ */
+ /*
+ * rle_putcom.c - Add a picture comment to the header struct.
+@@ -98,12 +100,14 @@ rle_putcom(const char * const value,
+ const char * v;
+ const char ** old_comments;
+ int i;
+- for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp)
++ for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp) {
++ overflow_add(i, 1);
+ if (match(value, *cp) != NULL) {
+ v = *cp;
+ *cp = value;
+ return v;
+ }
++ }
+ /* Not found */
+ /* Can't realloc because somebody else might be pointing to this
+ * comments block. Of course, if this were true, then the
netpbm-10.27-bmptopnm.patch:
bmptopnm.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: netpbm-10.27-bmptopnm.patch
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-4/netpbm-10.27-bmptopnm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netpbm-10.27-bmptopnm.patch 9 May 2005 10:18:31 -0000 1.1
+++ netpbm-10.27-bmptopnm.patch 4 Jan 2006 12:19:36 -0000 1.2
@@ -9,15 +9,6 @@
unsigned int pos;
/* The following are all information from the BMP headers */
-@@ -1081,7 +1081,7 @@ main(int argc, char ** argv) {
- parse_command_line(argc, argv, &cmdline);
-
- ifP = pm_openr(cmdline.input_filespec);
-- if (strcmp(cmdline.input_filespec, "-"))
-+ if (!strcmp(cmdline.input_filespec, "-"))
- ifname = "Standard Input";
- else
- ifname = cmdline.input_filespec;
@@ -1106,7 +1106,7 @@ main(int argc, char ** argv) {
writeRaster(BMPraster, cols, rows, outputType, cBitCount, pixelformat,
colormap);
netpbm-10.28-CAN-2005-2471.patch:
pstopnm.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: netpbm-10.28-CAN-2005-2471.patch
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-4/netpbm-10.28-CAN-2005-2471.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netpbm-10.28-CAN-2005-2471.patch 9 Aug 2005 11:27:25 -0000 1.1
+++ netpbm-10.28-CAN-2005-2471.patch 4 Jan 2006 12:19:36 -0000 1.2
@@ -1,18 +1,15 @@
---- netpbm-10.28/converter/other/pstopnm.c.CAN-2005-2471 2004-06-23 04:22:33.000000000 +0200
-+++ netpbm-10.28/converter/other/pstopnm.c 2005-08-09 08:41:42.000000000 +0200
-@@ -702,13 +702,13 @@
-
- if (verbose) {
- pm_message("execing '%s' with args '%s' (arg 0), "
-- "'%s', '%s', '%s', '%s', '%s', '%s', '%s'",
-+ "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'",
+--- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471 2005-08-15 02:39:46.000000000 +0200
++++ netpbm-10.29/converter/other/pstopnm.c 2005-08-16 15:38:15.000000000 +0200
+@@ -711,11 +711,11 @@
+ "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'",
ghostscriptProg, arg0,
-- deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-");
-+ deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-dPARANOIDSAFER", "-");
+ deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE",
+- "-dSAFER", "-");
++ "-dPARANOIDSAFER", "-");
}
execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q",
-- "-dNOPAUSE", "-", NULL);
+- "-dNOPAUSE", "-dSAFER", "-", NULL);
+ "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL);
pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)",
netpbm-10.28-gcc4.patch:
lib/pm.h | 1 +
urt/rle.h | 1 +
2 files changed, 2 insertions(+)
Index: netpbm-10.28-gcc4.patch
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-4/netpbm-10.28-gcc4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netpbm-10.28-gcc4.patch 29 Jul 2005 08:18:20 -0000 1.1
+++ netpbm-10.28-gcc4.patch 4 Jan 2006 12:19:36 -0000 1.2
@@ -1,26 +1,5 @@
---- netpbm-10.28/converter/ppm/ppmtowinicon.c.gcc4 2005-06-10 10:34:45.341676768 +0200
-+++ netpbm-10.28/converter/ppm/ppmtowinicon.c 2005-06-10 10:34:51.749702600 +0200
-@@ -745,7 +745,7 @@ addEntryToIcon(MS_Ico const MSIcon
- * Perhaps I should use something that allocs a decent amount at start...
- */
- MSIconData->entries =
-- realloc2 (MSIconData->entries, MSIconData->count * sizeof(IC_Entry *));
-+ (IC_Entry*)realloc2 (MSIconData->entries, MSIconData->count * sizeof(IC_Entry *));
- MSIconData->entries[MSIconData->count-1] = entry;
- }
-
---- netpbm-10.28/buildtools/typegen.c.gcc4 2005-04-27 18:24:29.000000000 +0200
-+++ netpbm-10.28/buildtools/typegen.c 2005-06-10 10:34:51.749702600 +0200
-@@ -28,6 +28,7 @@
- We also include the multiple inclusion guard ifdef.
- -----------------------------------------------------------------------------*/
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
-
-
---- netpbm-10.28/lib/pm.h.gcc4 2005-06-10 10:34:45.399667952 +0200
-+++ netpbm-10.28/lib/pm.h 2005-06-10 10:34:51.750702448 +0200
+--- netpbm-10.30/lib/pm.h.gcc4 2005-10-21 12:19:56.000000000 +0200
++++ netpbm-10.30/lib/pm.h 2005-10-21 12:20:03.000000000 +0200
@@ -18,6 +18,7 @@
#include <sys/types.h>
#include <ctype.h>
@@ -29,37 +8,13 @@
#include <errno.h>
#include <setjmp.h>
#include <sys/stat.h>
---- netpbm-10.28/urt/rle_getrow.c.gcc4 2005-06-10 10:34:45.401667648 +0200
-+++ netpbm-10.28/urt/rle_getrow.c 2005-06-10 10:34:51.751702296 +0200
-@@ -32,7 +32,8 @@
- * $Id$
- */
-
--#include "stdio.h"
-+#include <stdio.h>
-+#include <string.h>
- #include "rle.h"
- #include "rle_code.h"
- #include "vaxshort.h"
---- netpbm-10.28/urt/rle.h.gcc4 2005-06-10 10:34:45.402667496 +0200
-+++ netpbm-10.28/urt/rle.h 2005-06-10 10:34:51.752702144 +0200
+--- netpbm-10.30/urt/rle.h.gcc4 2005-10-21 12:19:56.000000000 +0200
++++ netpbm-10.30/urt/rle.h 2005-10-21 12:21:31.000000000 +0200
@@ -36,6 +36,7 @@
- #include "rle_config.h" /* Configuration parameters. */
+ #include "rle_config.h" /* Configuration parameters. */
- #include <stdio.h> /* Declare FILE. */
+ #include <stdio.h> /* Declare FILE. */
+#include <string.h>
#ifdef c_plusplus
#define USE_PROTOTYPES
---- netpbm-10.28/urt/Runput.c.gcc4 2005-06-10 10:34:45.400667800 +0200
-+++ netpbm-10.28/urt/Runput.c 2005-06-10 10:34:51.753701992 +0200
-@@ -92,7 +92,8 @@
- * follow the last byte in the run.
- */
-
--#include "stdio.h"
-+#include <stdio.h>
-+#include <string.h>
- #include "rle_put.h"
- #include "rle.h"
- #include "rle_code.h"
Index: netpbm.spec
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-4/netpbm.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- netpbm.spec 9 Aug 2005 11:27:25 -0000 1.40
+++ netpbm.spec 4 Jan 2006 12:19:36 -0000 1.41
@@ -1,25 +1,25 @@
Summary: A library for handling different graphics file formats.
Name: netpbm
-Version: 10.28
-Release: 1.FC4.2
+Version: 10.31
+Release: 1.FC4
License: freeware
Group: System Environment/Libraries
URL: http://netpbm.sourceforge.net/
Source0: netpbm-%{version}.tar.bz2
Source1: netpbmdoc-%{version}.tar.bz2
+Patch0: netpbm-10.28-legal.patch
Patch1: netpbm-10.17-time.patch
Patch2: netpbm-9.24-strip.patch
-Patch3: netpbm-10.18-manpath.patch
-Patch4: netpbm-10.19-message.patch
-Patch5: netpbm-10.22-security2.patch
-Patch6: netpbm-10.22-cmapsize.patch
-Patch7: netpbm-10.23-security.patch
-Patch9: netpbm-10.24-nodoc.patch
-Patch10: netpbm-10.28-gcc4.patch
-Patch12: netpbm-10.27-bmptopnm.patch
-Patch13: netpbm-10.27-libpm.patch
-Patch14: netpbm-10.27-pnmtojpeg.patch
-Patch15: netpbm-10.28-CAN-2005-2471.patch
+Patch3: netpbm-10.19-message.patch
+Patch4: netpbm-10.22-security2.patch
+Patch5: netpbm-10.22-cmapsize.patch
+Patch6: netpbm-10.23-security.patch
+Patch7: netpbm-10.24-nodoc.patch
+Patch8: netpbm-10.28-gcc4.patch
+Patch9: netpbm-10.27-bmptopnm.patch
+Patch10: netpbm-10.28-CAN-2005-2471.patch
+Patch11: netpbm-10.29-pnmtopng.patch
+Patch12: netpbm-10.30-rgbtxt.patch
Buildroot: %{_tmppath}/%{name}-root
BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl
Obsoletes: libgr
@@ -63,19 +63,19 @@
%prep
%setup -q
+%patch0 -p1 -b .legal
%patch1 -p1 -b .time
%patch2 -p1 -b .strip
-%patch3 -p1 -b .manpath
-%patch4 -p1 -b .message
-%patch5 -p1 -b .security2
-%patch6 -p1 -b .cmapsize
-%patch7 -p1 -b .security
-%patch9 -p1 -b .nodoc
-%patch10 -p1 -b .gcc4
-%patch12 -p1 -b .bmptopnm
-%patch13 -p1 -b .libpm
-%patch14 -p1 -b .pnmtojpeg
-%patch15 -p1 -b .CAN-2005-2471
+%patch3 -p1 -b .message
+%patch4 -p1 -b .security2
+%patch5 -p1 -b .cmapsize
+%patch6 -p1 -b .security
+%patch7 -p1 -b .nodoc
+%patch8 -p1 -b .gcc4
+%patch9 -p1 -b .bmptopnm
+%patch10 -p1 -b .CAN-2005-2471
+%patch11 -p1 -b .pnmtopng
+%patch12 -p1 -b .rgbtxt
##mv shhopt/shhopt.h shhopt/pbmshhopt.h
##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -173,6 +173,15 @@
%{_mandir}/man5/*
%changelog
+* Wed Jan 04 2006 Jindrich Novy <jnovy at redhat.com> 10.31-1.FC4
+- update to 10.31
+- update security patch
+- regenerate man pages
+- drop manpath patch
+- add .legal, .pnmtopng, .rgbtxt patches
+- update .security, .security2, .bmptopnm, .CAN-2005-2471, .gcc4 patches
+- new version fixes error in pnmnorm #176845
+
* Tue Aug 09 2005 Jindrich Novy <jnovy at redhat.com> 10.28-1.FC4.2
- fix CAN-2005-2471, unsafe gs calls from pstopnm (#165355)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 29 Jul 2005 08:14:30 -0000 1.17
+++ sources 4 Jan 2006 12:19:36 -0000 1.18
@@ -1,2 +1,2 @@
-f1b766be9e0ba2470f762ee0717b834f netpbm-10.28.tar.bz2
-41f281d183afded0118f2fde2b8b79f1 netpbmdoc-10.28.tar.bz2
+34910af6b21f0de0142876455f27ad88 netpbm-10.31.tar.bz2
+0399e7b78da0291369004f9c19761075 netpbmdoc-10.31.tar.bz2
--- netpbm-10.18-manpath.patch DELETED ---
More information about the fedora-cvs-commits
mailing list