rpms/netpbm/devel netpbm-noppmtompeg.patch, NONE, 1.1 .cvsignore, 1.66, 1.67 netpbm-security-code.patch, 1.1, 1.2 netpbm.spec, 1.160, 1.161 sources, 1.70, 1.71 netpbm-ppmtompeg.patch, 1.1, NONE
Tom Callaway
spot at fedoraproject.org
Tue Apr 27 14:39:06 UTC 2010
- Previous message: rpms/netpbm/F-13 netpbm-noppmtompeg.patch, NONE, 1.1 netpbm-security-code.patch, 1.1, 1.2 netpbm.spec, 1.157, 1.158 sources, 1.70, 1.71 netpbm-ppmtompeg.patch, 1.1, NONE
- Next message: File ucommon-2.1.2.tar.gz uploaded to lookaside cache by dyfet
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27532/devel
Modified Files:
.cvsignore netpbm-security-code.patch netpbm.spec sources
Added Files:
netpbm-noppmtompeg.patch
Removed Files:
netpbm-ppmtompeg.patch
Log Message:
remove ppmtompeg
netpbm-noppmtompeg.patch:
buildtools/manpage.mk | 1 -
converter/ppm/Makefile | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE netpbm-noppmtompeg.patch ---
diff -up netpbm-10.47.12/buildtools/manpage.mk.noppmtompeg netpbm-10.47.12/buildtools/manpage.mk
--- netpbm-10.47.12/buildtools/manpage.mk.noppmtompeg 2010-04-27 09:54:52.121522491 -0400
+++ netpbm-10.47.12/buildtools/manpage.mk 2010-04-27 09:55:10.337642487 -0400
@@ -251,7 +251,6 @@ MAN1 = \
ppmtolj.1 \
ppmtomap.1 \
ppmtomitsu.1 \
- ppmtompeg.1 \
ppmtoneo.1 \
ppmtopcx.1 \
ppmtopgm.1 \
diff -up netpbm-10.47.12/converter/ppm/Makefile.noppmtompeg netpbm-10.47.12/converter/ppm/Makefile
--- netpbm-10.47.12/converter/ppm/Makefile.noppmtompeg 2010-04-27 09:55:20.293517254 -0400
+++ netpbm-10.47.12/converter/ppm/Makefile 2010-04-27 09:55:41.534642567 -0400
@@ -7,7 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
include $(BUILDDIR)/config.mk
-SUBDIRS = hpcdtoppm ppmtompeg
+SUBDIRS = hpcdtoppm
PORTBINARIES = 411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
leaftoppm mtvtoppm neotoppm \
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore 24 Feb 2010 07:58:36 -0000 1.66
+++ .cvsignore 27 Apr 2010 14:39:05 -0000 1.67
@@ -1 +1 @@
-netpbm-10.47.10.tar.xz
+netpbm-10.47.12.tar.xz
netpbm-security-code.patch:
analyzer/pgmtexture.c | 9 ++++++
converter/other/gemtopnm.c | 1
converter/other/jpegtopnm.c | 2 +
converter/other/pbmtopgm.c | 1
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 | 4 ++
converter/other/xwdtopnm.c | 5 +++
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/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/pbmtoppa/pbm.c | 4 ++
converter/pbm/pbmtoppa/pbmtoppa.c | 1
converter/pbm/pbmtoxbm.c | 2 +
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 | 27 ++++++++++++++++++
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/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 | 2 +
converter/ppm/ximtoppm.c | 4 ++
converter/ppm/xpmtoppm.c | 1
converter/ppm/yuvtoppm.c | 1
editor/pamcut.c | 2 +
editor/pbmpscale.c | 1
editor/pbmreduce.c | 1
editor/pnmgamma.c | 1
editor/pnmhisteq.c | 1
editor/pnmindex.csh | 3 ++
editor/pnmpad.c | 2 +
editor/pnmremap.c | 3 +-
editor/pnmscalefixed.c | 7 ++++
editor/pnmshear.c | 6 ++++
editor/ppmdither.c | 6 +++-
editor/specialty/pamoil.c | 1
generator/pbmpage.c | 3 ++
generator/pbmtext.c | 4 ++
generator/pgmcrater.c | 2 -
generator/pgmkernel.c | 2 -
lib/libpam.c | 3 +-
lib/libpammap.c | 2 +
lib/libpbm1.c | 1
lib/libpbmvms.c | 2 +
lib/libpm.c | 49 ++++++++++++++++++++++++++++++++
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 | 57 --------------------------------------
urt/rle_putcom.c | 6 +++-
urt/scanargs.c | 6 ++--
90 files changed, 379 insertions(+), 98 deletions(-)
Index: netpbm-security-code.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm-security-code.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netpbm-security-code.patch 21 Oct 2009 15:11:20 -0000 1.1
+++ netpbm-security-code.patch 27 Apr 2010 14:39:05 -0000 1.2
@@ -878,102 +878,6 @@ diff -up netpbm-10.47.04/converter/ppm/p
medias.maxcols *= 2;
medias.maxrows *= 2;
}
-diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c
---- netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c.security 2009-10-21 13:39:09.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c 2009-10-21 15:09:33.000000000 +0200
-@@ -800,7 +800,8 @@ BlockComputeSNR(MpegFrame * const curren
- if (needs_init) {
- int ysz = (Fsize_y>>3) * sizeof(int32 *);
- int xsz = (Fsize_x>>3);
--
-+
-+ overflow2((Fsize_y>>3), sizeof(int32 *));
- needs_init = FALSE;
- for (y=0; y<3; y++) {
- varDiff[y] = ratio[y] = total[y] = 0.0;
-@@ -819,6 +820,7 @@ BlockComputeSNR(MpegFrame * const curren
- fprintf(stderr, "Out of memory in BlockComputeSNR\n");
- exit(-1);
- }
-+ overflow2(xsz,4);
- for (y = 0; y < ySize[0]>>3; y++) {
- SignalY[y] = (int32 *) calloc(xsz,4);
- SignalCr[y] = (int32 *) calloc(xsz,4);
-diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c
---- netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c.security 2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c 2009-10-21 15:09:33.000000000 +0200
-@@ -2161,7 +2161,9 @@ DecodeServer(int const numInput
- const char * error;
-
- /* should keep list of port numbers to notify when frames become ready */
--
-+
-+ overflow2(numInputFiles, sizeof(int));
-+ overflow2(numInputFiles, sizeof(boolean));
- ready = (boolean *) calloc(numInputFiles, sizeof(boolean));
- waitMachine = (int *) calloc(numInputFiles, sizeof(int));
- waitPort = (int *) malloc(numMachines*sizeof(int));
-diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c
---- netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c.security 2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c 2009-10-21 15:09:33.000000000 +0200
-@@ -216,7 +216,14 @@ SetSearchRange(int const pixelsP, int co
- int const max_search = max(searchRangeP, searchRangeB);
-
- int index;
--
-+
-+ overflow2(searchRangeP, 2);
-+ overflow2(searchRangeB, 2);
-+ overflow_add(searchRangeP*2, 3);
-+ overflow_add(searchRangeB*2, 3);
-+ overflow2(2*searchRangeB+3, sizeof(int));
-+ overflow2(2*searchRangeP+3, sizeof(int));
-+
- pmvHistogram = (int **) malloc((2*searchRangeP+3)*sizeof(int *));
- bbmvHistogram = (int **) malloc((2*searchRangeB+3)*sizeof(int *));
- bfmvHistogram = (int **) malloc((2*searchRangeB+3)*sizeof(int *));
-@@ -800,6 +807,9 @@ ShowPMVHistogram(fpointer)
- int *columnTotals;
- int rowTotal;
-
-+ overflow2(searchRangeP, 2);
-+ overflow_add(searchRangeP*2, 3);
-+ overflow2(searchRangeP*2+3, sizeof(int));
- columnTotals = (int *) calloc(2*searchRangeP+3, sizeof(int));
-
- #ifdef COMPLETE_DISPLAY
-@@ -847,6 +857,9 @@ ShowBBMVHistogram(fpointer)
-
- fprintf(fpointer, "B-frame Backwards:\n");
-
-+ overflow2(searchRangeB, 2);
-+ overflow_add(searchRangeB*2, 3);
-+ overflow2(searchRangeB*2+3, sizeof(int));
- columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int));
-
- #ifdef COMPLETE_DISPLAY
-@@ -894,6 +907,9 @@ ShowBFMVHistogram(fpointer)
-
- fprintf(fpointer, "B-frame Forwards:\n");
-
-+ overflow2(searchRangeB, 2);
-+ overflow_add(searchRangeB*2, 3);
-+ overflow2(searchRangeB*2+3, sizeof(int));
- columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int));
-
- #ifdef COMPLETE_DISPLAY
-diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c
---- netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c.security 2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c 2009-10-21 15:09:33.000000000 +0200
-@@ -72,6 +72,8 @@ compute_mult_tables(const pixval maxval)
- }
- table_maxval = maxval;
-
-+ overflow_add(table_maxval, 1);
-+ overflow2(table_maxval+1, sizeof(float));
- mult299 = malloc((table_maxval+1)*sizeof(float));
- mult587 = malloc((table_maxval+1)*sizeof(float));
- mult114 = malloc((table_maxval+1)*sizeof(float));
diff -up netpbm-10.47.04/converter/ppm/ppmtopcx.c.security netpbm-10.47.04/converter/ppm/ppmtopcx.c
--- netpbm-10.47.04/converter/ppm/ppmtopcx.c.security 2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtopcx.c 2009-10-21 15:09:33.000000000 +0200
Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- netpbm.spec 18 Mar 2010 09:45:46 -0000 1.160
+++ netpbm.spec 27 Apr 2010 14:39:05 -0000 1.161
@@ -1,7 +1,7 @@
Summary: A library for handling different graphics file formats
Name: netpbm
-Version: 10.47.10
-Release: 3%{?dist}
+Version: 10.47.12
+Release: 1%{?dist}
# See copyright_summary for details
License: BSD and GPLv2 and IJG and MIT and Public Domain
Group: System Environment/Libraries
@@ -9,7 +9,8 @@ URL: http://netpbm.sourceforge.net/
# Source0 is prepared by
# svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/stable netpbm-%{version}
# svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/userguide netpbm-%{version}/userguide
-# and removing the .svn directories
+# and removing the .svn directories ( find -name "\.svn" -type d -print0 | xargs -0 rm -rf )
+# and removing the ppmtompeg code, due to patents ( rm -rf netpbm-%{version}/converter/ppm/ppmtompeg/ )
Source0: netpbm-%{version}.tar.xz
Patch1: netpbm-time.patch
Patch2: netpbm-message.patch
@@ -20,7 +21,6 @@ Patch6: netpbm-gcc4.patch
Patch7: netpbm-bmptopnm.patch
Patch8: netpbm-CAN-2005-2471.patch
Patch9: netpbm-xwdfix.patch
-Patch10: netpbm-ppmtompeg.patch
Patch11: netpbm-multilib.patch
Patch12: netpbm-pamscale.patch
Patch13: netpbm-glibc.patch
@@ -30,6 +30,7 @@ Patch16: netpbm-ppmfadeusage.patch
Patch17: netpbm-fiasco-overflow.patch
Patch18: netpbm-lz.patch
Patch19: netpbm-pnmmontagefix.patch
+Patch20: netpbm-noppmtompeg.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
BuildRequires: libX11-devel, python, jasper-devel
@@ -93,7 +94,6 @@ netpbm-doc. You'll also need to install
%patch7 -p1 -b .bmptopnm
%patch8 -p1 -b .CAN-2005-2471
%patch9 -p1 -b .xwdfix
-%patch10 -p1 -b .ppmtompeg
%patch11 -p1 -b .multilib
%patch12 -p1 -b .pamscale
%patch13 -p1 -b .glibc
@@ -103,6 +103,7 @@ netpbm-doc. You'll also need to install
%patch17 -p1 -b .fiasco-overflow
%patch18 -p1 -b .lz
%patch19 -p1 -b .pnmmmontagefix
+%patch20 -p1 -b .noppmtompeg
sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
@@ -243,6 +244,10 @@ rm -rf $RPM_BUILD_ROOT
%doc userguide/*
%changelog
+* Tue Apr 27 2010 Tom "spot" Callaway <tcallawa at redhat.com> 10.47.12-1
+- update to 10.47.12
+- remove ppmtompeg, due to legal issues
+
* Thu Mar 18 2010 Jindrich Novy <jnovy at redhat.com> 10.47.10-3
- package docs in separate netpbm-doc package (#492437)
- don't package patch backups in documentation
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources 24 Feb 2010 07:58:36 -0000 1.70
+++ sources 27 Apr 2010 14:39:06 -0000 1.71
@@ -1 +1 @@
-8594b62d03c3c2215fadefa0e2ec0ad4 netpbm-10.47.10.tar.xz
+a143fec68d2e720e944e427563d0c684 netpbm-10.47.12.tar.xz
--- netpbm-ppmtompeg.patch DELETED ---
- Previous message: rpms/netpbm/F-13 netpbm-noppmtompeg.patch, NONE, 1.1 netpbm-security-code.patch, 1.1, 1.2 netpbm.spec, 1.157, 1.158 sources, 1.70, 1.71 netpbm-ppmtompeg.patch, 1.1, NONE
- Next message: File ucommon-2.1.2.tar.gz uploaded to lookaside cache by dyfet
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list