rpms/netpbm/devel netpbm-10.23-security.patch, 1.14, 1.15 netpbm.spec, 1.77, 1.78
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Sep 29 16:50:53 UTC 2006
Author: jnovy
Update of /cvs/dist/rpms/netpbm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16907
Modified Files:
netpbm-10.23-security.patch netpbm.spec
Log Message:
- remove OSI 1.1 from security patch (#208587)
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
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/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 | 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 ++--
105 files changed, 461 insertions(+), 65 deletions(-)
Index: netpbm-10.23-security.patch
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/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 22 Jun 2006 14:42:51 -0000 1.14
+++ netpbm-10.23-security.patch 29 Sep 2006 16:50:51 -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 @@
Index: netpbm.spec
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- netpbm.spec 24 Sep 2006 05:04:34 -0000 1.77
+++ netpbm.spec 29 Sep 2006 16:50:51 -0000 1.78
@@ -1,7 +1,7 @@
Summary: A library for handling different graphics file formats.
Name: netpbm
Version: 10.35
-Release: 2%{?dist}
+Release: 3%{?dist}
License: freeware
Group: System Environment/Libraries
URL: http://netpbm.sourceforge.net/
@@ -185,6 +185,9 @@
%{_mandir}/man5/*
%changelog
+* Fri Sep 29 2006 Jindrich Novy <jnovy at redhat.com> 10.35-3
+- remove OSI 1.1 from security patch (#208587)
+
* Sun Sep 24 2006 Jindrich Novy <jnovy at redhat.com> 10.35-2
- fix ppmquantall (#207799), thanks to Steve Grubb
More information about the fedora-cvs-commits
mailing list