rpms/netpbm/FC-5 netpbm-10.32-pnmdepth.patch, NONE, 1.1 netpbm-10.35-pbmtog3segfault.patch, NONE, 1.1 netpbm-10.35-ppmquantall.patch, NONE, 1.1 netpbm-10.23-security.patch, 1.14, 1.15 netpbm-10.27-bmptopnm.patch, 1.3, 1.4 netpbm-10.31-xwdfix.patch, 1.1, 1.2 netpbm-10.33-ppmtompeg.patch, 1.2, 1.3 netpbm.spec, 1.63, 1.64 sources, 1.23, 1.24 netpbm-10.28-legal.patch, 1.2, NONE netpbm-10.29-pnmtopng.patch, 1.4, NONE netpbm-10.30-rgbtxt.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jan 29 14:32:51 UTC 2007
- Previous message (by thread): rpms/xdelta/devel xdelta-1.1.4-glib2.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xdelta.spec, 1.23, 1.24 xdelta-1.1.3-allocbug.patch, 1.1, NONE xdelta-1.1.3-freegen.patch, 1.1, NONE xdelta-1.1.3-gcc4.patch, 1.1, NONE xdelta-1.1.3-glib2.patch, 1.2, NONE
- Next message (by thread): rpms/arts/FC-6 arts.spec,1.66,1.67 sources,1.30,1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jnovy
Update of /cvs/dist/rpms/netpbm/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1460
Modified Files:
netpbm-10.23-security.patch netpbm-10.27-bmptopnm.patch
netpbm-10.31-xwdfix.patch netpbm-10.33-ppmtompeg.patch
netpbm.spec sources
Added Files:
netpbm-10.32-pnmdepth.patch netpbm-10.35-pbmtog3segfault.patch
netpbm-10.35-ppmquantall.patch
Removed Files:
netpbm-10.28-legal.patch netpbm-10.29-pnmtopng.patch
netpbm-10.30-rgbtxt.patch
Log Message:
- bmptopnm won't crash with "BMPlencolormap: internal error!" (#224554)
- pbmtog3 won't segfault on 64bit arches (#220739)
- fix ppmquantall (#207799), thanks to Steve Grubb
- remove bogus man pages (#220112, #220113)
- overflow2() no more conflicts with libgd.so (#216116)
- remove OSL 1.1 from security patch (#208587)
- fix BuildRoot
netpbm-10.32-pnmdepth.patch:
Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE netpbm-10.32-pnmdepth.patch ---
--- netpbm-10.32/other/Makefile.pnmdepth 2006-01-03 23:47:15.000000000 +0100
+++ netpbm-10.32/other/Makefile 2006-04-03 14:53:17.000000000 +0200
@@ -66,7 +66,7 @@
$(SYMLINK) pamsplit$(EXE) pnmsplit
# In February 2006, pamdepth replaced pnmdepth
cd $(PKGDIR)/bin ; \
- rm -f pnmsdepth ; \
- $(SYMLINK) pnmsdepth$(EXE) pnmdepth
+ rm -f pnmdepth ; \
+ $(SYMLINK) pamdepth$(EXE) pnmdepth
FORCE:
netpbm-10.35-pbmtog3segfault.patch:
pbmtog3.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE netpbm-10.35-pbmtog3segfault.patch ---
--- netpbm-10.35/converter/pbm/pbmtog3.c.pbmtog3segfault 2006-09-18 12:20:32.000000000 +0200
+++ netpbm-10.35/converter/pbm/pbmtog3.c 2006-12-28 11:43:19.000000000 +0100
@@ -371,7 +371,7 @@
r2 <<= c++; r2 <<= 1; k += c;
}
}
- if (milepost[n - 1] != cols)
+ if (!n || milepost[n - 1] != cols)
milepost[n++] = cols;
*lengthP = n;
}
netpbm-10.35-ppmquantall.patch:
ppmquantall | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE netpbm-10.35-ppmquantall.patch ---
diff -ur netpbm-10.35.orig/editor/ppmquantall netpbm-10.35/editor/ppmquantall
--- netpbm-10.35.orig/editor/ppmquantall 2006-09-22 13:47:25.000000000 -0400
+++ netpbm-10.35/editor/ppmquantall 2006-09-22 13:48:07.000000000 -0400
@@ -62,8 +62,8 @@
# To be robust, we need to use Pnmfile to get that information, or
# Put this program in C and use ppm_readppminit().
-set widths=()
-set heights=()
+set widths
+set heights
for i in ${files[@]}; do
widths=(${widths[*]} `grep -v '^#' $i | sed '1d; s/ .*//; 2q'`)
netpbm-10.23-security.patch:
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 | 12 +++++---
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 | 2 +
converter/ppm/picttoppm.c | 2 +
converter/ppm/pjtoppm.c | 21 +++++++++-----
converter/ppm/ppmtoeyuv.c | 1
converter/ppm/ppmtoicr.c | 2 -
converter/ppm/ppmtoilbm.c | 8 ++++-
converter/ppm/ppmtolj.c | 3 +-
converter/ppm/ppmtomitsu.c | 2 +
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
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/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 | 52 ++++++++++++++++++++++++++++++++++++-
lib/pm.h | 7 ++++
other/pnmcolormap.c | 1
urt/README | 5 +++
urt/Runput.c | 10 ++++---
urt/rle.h | 14 +++++++++
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 ++--
104 files changed, 458 insertions(+), 65 deletions(-)
Index: netpbm-10.23-security.patch
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-5/netpbm-10.23-security.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- netpbm-10.23-security.patch 12 Aug 2006 19:35:24 -0000 1.14
+++ netpbm-10.23-security.patch 29 Jan 2007 14:32:48 -0000 1.15
@@ -1,169 +1,3 @@
---- /dev/null 2006-06-21 18:54:37.100867000 +0200
-+++ netpbm-10.34/OPENLICENSE 2006-06-22 12:45:18.000000000 +0200
-@@ -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.
--- netpbm-10.34/generator/pbmtext.c.security 2005-07-18 03:14:10.000000000 +0200
+++ netpbm-10.34/generator/pbmtext.c 2006-06-22 12:45:18.000000000 +0200
@@ -89,12 +89,14 @@
@@ -285,20 +119,6 @@
}
{
unsigned int const intQuotient = colormap.size / pamP->width;
---- netpbm-10.34/doc/COPYRIGHT.PATENT.security 2004-05-01 01:54:22.000000000 +0200
-+++ netpbm-10.34/doc/COPYRIGHT.PATENT 2006-06-22 12:45:18.000000000 +0200
-@@ -33,6 +33,11 @@
- all the above to be modified by "to the best of the Netpbm
- maintainer's knowledge."
-
-+These security fixes for netpbm are (c) Copyright 2002 Red Hat Inc.
-+Red Hat has not fixed those items with patent claims or commercial
-+use restrictions. These changes include NO WARRANTY and are provided
-+under the Open Software License v.1 (see file OPENLICENSE).
-+
-
-
- PATENTS
--- netpbm-10.34/converter/pgm/psidtopgm.c.security 2005-08-27 20:38:40.000000000 +0200
+++ netpbm-10.34/converter/pgm/psidtopgm.c 2006-06-22 12:45:18.000000000 +0200
@@ -78,6 +78,7 @@
@@ -1568,13 +1388,14 @@
}
--- netpbm-10.34/lib/pm.h.security 2006-05-19 22:39:07.000000000 +0200
+++ netpbm-10.34/lib/pm.h 2006-06-22 12:45:18.000000000 +0200
-@@ -340,4 +340,10 @@
+@@ -340,4 +340,11 @@
#endif
+void *malloc2(int, int);
+void *malloc3(int, int, int);
-+void overflow2(int, int);
++#define overflow2(a,b) __overflow2(a,b)
++void __overflow2(int, int);
+void overflow3(int, int, int);
+void overflow_add(int, int);
+
@@ -1629,7 +1450,7 @@
+ * Maths wrapping
+ */
+
-+void overflow2(int a, int b)
++void __overflow2(int a, int b)
+{
+ if(a < 0 || b < 0)
+ pm_error("object too large");
@@ -1943,7 +1764,7 @@
*/
/*
* rle.h - Global declarations for Utah Raster Toolkit RLE programs.
-@@ -166,6 +169,16 @@
+@@ -166,6 +169,17 @@
*/
extern rle_hdr rle_dflt_hdr;
@@ -1952,7 +1773,8 @@
+ */
+
+extern void overflow_add(int, int);
-+extern void overflow2(int, int);
++#define overflow2(a,b) __overflow2(a,b)
++extern void __overflow2(int, int);
+extern void overflow3(int, int, int);
+extern void *malloc2(int, int);
+extern void *malloc3(int, int, int);
netpbm-10.27-bmptopnm.patch:
bmptopnm.c | 3 +--
1 files changed, 1 insertion(+), 2 deletions(-)
Index: netpbm-10.27-bmptopnm.patch
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-5/netpbm-10.27-bmptopnm.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- netpbm-10.27-bmptopnm.patch 28 Feb 2006 12:59:04 -0000 1.3
+++ netpbm-10.27-bmptopnm.patch 29 Jan 2007 14:32:49 -0000 1.4
@@ -1,6 +1,6 @@
---- netpbm-10.32/converter/other/bmptopnm.c.bmptopnm 2006-02-27 15:02:02.000000000 +0100
-+++ netpbm-10.32/converter/other/bmptopnm.c 2006-02-27 15:07:31.000000000 +0100
-@@ -1248,7 +1248,7 @@ readBmp(FILE * const ifP,
+--- netpbm-10.35/converter/other/bmptopnm.c.bmptopnm 2007-01-29 13:08:46.000000000 +0100
++++ netpbm-10.35/converter/other/bmptopnm.c 2007-01-29 13:32:21.000000000 +0100
+@@ -1262,7 +1262,7 @@ readBmp(FILE * const ifP,
xel ** const colormapP,
bool const verbose) {
@@ -9,12 +9,11 @@
unsigned int pos;
/* Current byte position in the BMP file */
-@@ -1455,7 +1455,7 @@ main(int argc, char ** argv) {
- writeRasterGen(BMPraster, cols, rows, outputType, cBitCount,
- pixelformat, colormap);
+@@ -1278,7 +1278,6 @@ readBmp(FILE * const ifP,
+ BMPreadfileheader(ifP, &bytesRead, &offBits);
+ pos += bytesRead;
}
-- free(colormap);
-+ if (colormap) free(colormap);
- free(BMPraster);
-
- return 0;
+- if(BMPheader.cmapsize != 0)
+ {
+ unsigned int bytesRead;
+ BMPreadinfoheader(ifP, &bytesRead, &BMPheader);
netpbm-10.31-xwdfix.patch:
xwdtopnm.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: netpbm-10.31-xwdfix.patch
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-5/netpbm-10.31-xwdfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netpbm-10.31-xwdfix.patch 14 Feb 2006 14:25:38 -0000 1.1
+++ netpbm-10.31-xwdfix.patch 29 Jan 2007 14:32:49 -0000 1.2
@@ -1,11 +1,11 @@
---- netpbm-10.31/converter/other/xwdtopnm.c.xwdfix 2006-02-14 15:13:58.000000000 +0100
-+++ netpbm-10.31/converter/other/xwdtopnm.c 2006-02-14 15:15:37.000000000 +0100
-@@ -985,7 +985,7 @@ getpix(pixelReader * const rdrP) {
+--- netpbm-10.35/converter/other/xwdtopnm.c.xwdfix 2006-09-18 13:24:50.000000000 +0200
++++ netpbm-10.35/converter/other/xwdtopnm.c 2006-09-18 13:27:26.000000000 +0200
+@@ -945,7 +945,7 @@ getpix(pixelReader * const rdrP) {
unsigned long const bitsToTakeMask = lsbmask[nBitsToTake];
/* E.g. if nbitsToTake is 4, this is 0x0000000F */
- unsigned long bitsToTake;
+ unsigned int bitsToTake;
+ /* The actual bits we take, in the 'nBitsToTake' low bits */
assert(nBitsToTake <= 32);
-
netpbm-10.33-ppmtompeg.patch:
fsize.c | 3 +--
parallel.c | 2 --
2 files changed, 1 insertion(+), 4 deletions(-)
Index: netpbm-10.33-ppmtompeg.patch
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-5/netpbm-10.33-ppmtompeg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- netpbm-10.33-ppmtompeg.patch 12 Aug 2006 19:35:25 -0000 1.2
+++ netpbm-10.33-ppmtompeg.patch 29 Jan 2007 14:32:49 -0000 1.3
@@ -1,22 +1,23 @@
---- netpbm-10.33/converter/ppm/ppmtompeg/fsize.c.ppmtompeg 1995-07-03 23:57:05.000000000 +0200
-+++ netpbm-10.33/converter/ppm/ppmtompeg/fsize.c 2006-04-05 12:44:04.000000000 +0200
-@@ -117,8 +117,8 @@
+--- netpbm-10.35/converter/ppm/ppmtompeg/fsize.c.ppmtompeg 2006-09-18 12:20:24.000000000 +0200
++++ netpbm-10.35/converter/ppm/ppmtompeg/fsize.c 2006-09-18 13:35:53.000000000 +0200
+@@ -115,8 +115,7 @@ Fsize_Note(int const id,
Fsize_Validate(&Fsize_x, &Fsize_y);
- if ((Fsize_x==0) || (Fsize_y==0)) {
-- fprintf(stderr,"Frame %d: size is zero!\n",id);
--/* exit(1); */
-+ fprintf(stderr,"Frame %d: image dimensions need to be integer multiples of 16 for ppmtompeg!\n",id);
-+ exit(1);
+ if ((Fsize_x == 0) || (Fsize_y == 0)) {
+- fprintf(stderr,"Frame %d: size is less than the minimum: %d x %d!\n",
+- id, DCTSIZE*2, DCTSIZE*2);
++ fprintf(stderr,"Frame %d: image dimensions need to be integer multiples of 16 for ppmtompeg!\n",id);
+ exit(1);
}
- #ifdef BLEAH
---- netpbm-10.34/converter/ppm/ppmtompeg/parallel.c.ppmtompeg 2006-07-19 14:53:27.000000000 +0200
-+++ netpbm-10.34/converter/ppm/ppmtompeg/parallel.c 2006-07-19 15:11:42.000000000 +0200
-@@ -1315,8 +1315,6 @@
+--- netpbm-10.35/converter/ppm/ppmtompeg/parallel.c.ppmtompeg 2006-09-18 13:30:49.000000000 +0200
++++ netpbm-10.35/converter/ppm/ppmtompeg/parallel.c 2006-09-18 13:32:24.000000000 +0200
+@@ -1316,8 +1316,6 @@ CombineServer(int const numFram
TransmitPortNum(masterHostName, masterPortNum, combinePortNum);
-
+
close(outputServerSocket);
-
-- fclose(ofp);
+- fclose(ofP);
}
+
+
Index: netpbm.spec
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-5/netpbm.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- netpbm.spec 14 Aug 2006 08:59:07 -0000 1.63
+++ netpbm.spec 29 Jan 2007 14:32:49 -0000 1.64
@@ -1,13 +1,12 @@
Summary: A library for handling different graphics file formats.
Name: netpbm
-Version: 10.34
+Version: 10.35
Release: 1%{?dist}
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
+Source0: netpbm-%{version}.l1.tar.bz2
+Source1: netpbmdoc-%{version}.l1.tar.bz2
Patch1: netpbm-10.17-time.patch
Patch2: netpbm-9.24-strip.patch
Patch3: netpbm-10.19-message.patch
@@ -18,15 +17,15 @@
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
-Patch13: netpbm-10.31-xwdfix.patch
-Patch14: netpbm-10.33-ppmtompeg.patch
-Patch15: netpbm-10.33-multilib.patch
-Patch16: netpbm-10.34-pamscale.patch
-Buildroot: %{_tmppath}/%{name}-root
+Patch11: netpbm-10.31-xwdfix.patch
+Patch12: netpbm-10.33-ppmtompeg.patch
+Patch13: netpbm-10.33-multilib.patch
+Patch14: netpbm-10.34-pamscale.patch
+Patch15: netpbm-10.35-ppmquantall.patch
+Patch16: netpbm-10.35-pbmtog3segfault.patch
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, perl, flex
-BuildRequires: libX11-devel, libxml2-devel
+BuildRequires: libX11-devel
Obsoletes: libgr
%description
@@ -68,7 +67,6 @@
%prep
%setup -q
-%patch0 -p1 -b .legal
%patch1 -p1 -b .time
%patch2 -p1 -b .strip
%patch3 -p1 -b .message
@@ -79,12 +77,12 @@
%patch8 -p1 -b .gcc4
%patch9 -p1 -b .bmptopnm
%patch10 -p1 -b .CAN-2005-2471
-%patch11 -p1 -b .pnmtopng
-%patch12 -p1 -b .rgbtxt
-%patch13 -p1 -b .xwdfix
-%patch14 -p1 -b .ppmtompeg
-%patch15 -p1 -b .multilib
-%patch16 -p1 -b .pamscale
+%patch11 -p1 -b .xwdfix
+%patch12 -p1 -b .ppmtompeg
+%patch13 -p1 -b .multilib
+%patch14 -p1 -b .pamscale
+%patch15 -p1 -b .pqall
+%patch16 -p1 -b .pbmtog3segfault
##mv shhopt/shhopt.h shhopt/pbmshhopt.h
##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -125,13 +123,14 @@
PNGLIB_DIR=%{_libdir} \
TIFFLIB_DIR=%{_libdir} \
LINUXSVGALIB="NONE" \
- X11LIB=%{_libdir}/libX11.so
+ X11LIB=%{_libdir}/libX11.so \
+ XML2LIBS="NONE"
%install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT
-make package pkgdir=$RPM_BUILD_ROOT/usr LINUXSVGALIB="NONE"
+make package pkgdir=$RPM_BUILD_ROOT/usr LINUXSVGALIB="NONE" XML2LIBS="NONE"
# Ugly hack to have libs in correct dir on 64bit archs.
mkdir -p $RPM_BUILD_ROOT%{_libdir}
@@ -145,11 +144,14 @@
mkdir -p $RPM_BUILD_ROOT%{_mandir}
tar jxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{_mandir}
-# Don't ship man packages for non-existent binaries
-for i in hpcdtoppm.1 pcdovtoppm.1 pnmtojbig.1 \
- ppmsvgalib.1 vidtoppm.1 picttoppm.1 jbigtopnm.1; do
- rm -f $RPM_BUILD_ROOT%{_mandir}/man1/${i}
+# Don't ship man pages for non-existent binaries and bogus ones
+for i in hpcdtoppm pcdovtoppm pnmtojbig \
+ ppmsvgalib vidtoppm picttoppm jbigtopnm \
+ directory error extendedopacity \
+ pam pbm pgm pnm ppm; do
+ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/${i}.1
done
+rm -f $RPM_BUILD_ROOT%{_mandir}/man5/extendedopacity.5
mv $RPM_BUILD_ROOT/usr/misc/*.map $RPM_BUILD_ROOT%{_libdir}
rm -rf $RPM_BUILD_ROOT/usr/README
@@ -161,7 +163,6 @@
rm -rf $RPM_BUILD_ROOT/usr/config_template
-
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -188,6 +189,15 @@
%{_mandir}/man5/*
%changelog
+* Mon Jan 29 2007 Jindrich Novy <jnovy at redhat.com> 10.35-1.fc5
+- bmptopnm won't crash with "BMPlencolormap: internal error!" (#224554)
+- pbmtog3 won't segfault on 64bit arches (#220739)
+- fix ppmquantall (#207799), thanks to Steve Grubb
+- remove bogus man pages (#220112, #220113)
+- overflow2() no more conflicts with libgd.so (#216116)
+- remove OSL 1.1 from security patch (#208587)
+- fix BuildRoot
+
* Sat Aug 12 2006 Jindrich Novy <jnovy at redhat.com> 10.34-1.fc5
- update to 10.34
- drop .ppmtogif, .nstring patches
@@ -198,7 +208,7 @@
- fix double free corruption in ppmtompeg (#199409),
thanks to Milan Zazrivec
- don't use svgalib by default (don't compile/ship ppmsvgalib)
-- add BuildRequires libX11-devel, libxml2-deve, use %%{?dist}
+- add BuildRequires libX11-devel, libxml2-devel, use %%{?dist}
- fix build on x86_64 and ppc64
* Fri Apr 14 2006 Jindrich Novy <jnovy at redhat.com> 10.33-1.fc5
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 12 Aug 2006 19:35:25 -0000 1.23
+++ sources 29 Jan 2007 14:32:49 -0000 1.24
@@ -1,2 +1,2 @@
-061ee465f4336d5191841362a64eaa50 netpbm-10.34.tar.bz2
-21f91a8f9e508b9428455cb24e0f41c1 netpbmdoc-10.34.tar.bz2
+90a5855e3f08bce4c239ffd205df2a37 netpbm-10.35.l1.tar.bz2
+8a76bd4a10ba0dd122e7fee759a2bdab netpbmdoc-10.35.l1.tar.bz2
--- netpbm-10.28-legal.patch DELETED ---
--- netpbm-10.29-pnmtopng.patch DELETED ---
--- netpbm-10.30-rgbtxt.patch DELETED ---
- Previous message (by thread): rpms/xdelta/devel xdelta-1.1.4-glib2.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xdelta.spec, 1.23, 1.24 xdelta-1.1.3-allocbug.patch, 1.1, NONE xdelta-1.1.3-freegen.patch, 1.1, NONE xdelta-1.1.3-gcc4.patch, 1.1, NONE xdelta-1.1.3-glib2.patch, 1.2, NONE
- Next message (by thread): rpms/arts/FC-6 arts.spec,1.66,1.67 sources,1.30,1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list