SPECS: pngcrush.spec - up to 1.6.2, fixes CVE-2005-1849 - rel 2 (1...

[glen]

Author: glen                         Date: Tue Mar 21 14:25:59 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.6.2, fixes CVE-2005-1849
- rel 2 (1 reserved for Ra)
- STBR to Ac?

---- Files affected:
SPECS:
   pngcrush.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/pngcrush.spec
diff -u SPECS/pngcrush.spec:1.16 SPECS/pngcrush.spec:1.17
--- SPECS/pngcrush.spec:1.16	Tue Apr 27 21:55:07 2004
+++ SPECS/pngcrush.spec	Tue Mar 21 15:25:53 2006
@@ -3,17 +3,35 @@
 # Conditional build:
 %bcond_with	systemlibs	# use system libraries instead of modified ones
 #				  (modified can give little better results)
+# NOTE:
+# - bundled zlib-1.2.3 differs from zlib-1.2.3 that it defines TOO_FAR
+#   32767 instead of 4096
+# - libpng diffs (this is bad?):
+#diff -ur ../libpng-1.2.8/pngrutil.c ./pngrutil.c
+#--- ../libpng-1.2.8/pngrutil.c    2006-03-21 16:12:37.000000000 +0200
+#+++ ./pngrutil.c    2005-02-28 15:55:20.000000000 +0200
+#@@ -1056,12 +1056,6 @@
+#    prefix_length = profile - chunkdata;
+#    chunkdata = png_decompress_chunk(png_ptr, compression_type, chunkdata,
+#                                     slength, prefix_length, &data_length);
+#-   if(chunkdata)
+#-       png_set_iCCP(png_ptr, info_ptr, chunkdata, compression_type,
+#-               chunkdata + prefix_length, data_length);
+#-   else
+#-       png_set_iCCP(png_ptr, info_ptr, chunkdata, compression_type,
+#-               0x00, prefix_length);
 #
+#    profile_length = data_length - prefix_length;
 Summary:	Optimizer for png files
 Summary(pl):	Optymalizator plików png
 Summary(pt_BR):	Utilitário para compressăo de pngs
 Name:		pngcrush
-Version:	1.5.10
-Release:	3
+Version:	1.6.2
+Release:	2
 License:	BSD-like (see README.txt)
 Group:		Applications/Graphics
 Source0:	http://dl.sourceforge.net/pmt/%{name}-%{version}.tar.bz2
-# Source0-md5:	a659cc4d9f7cf57bbc979193a054704f
+# Source0-md5:	ca036dc08ffe1f47b43f6d19d93a1af4
 URL:		http://pmt.sf.net/pngcrush/
 %if %{with systemlibs}
 BuildRequires:	libpng-devel
@@ -41,13 +59,18 @@
 %prep
 %setup -q
 
+# create some real documentation
+# NOTE: remember to check these on upgrade!
+sed -ne '1,/*\//p' pngcrush.c | cut -b 4- > README
+sed -ne '/\/* To do/,/*\/$/p;/PNG_INTERNAL/q' pngcrush.c | cut -b 4- > TODO
+
 %if %{with systemlibs}
 # workaround for Makefile and #include "png.h"
 echo '#include <png.h>' > png.h
 %endif
 
 %build
-%{__make} -f Makefile.gcc \
+%{__make} \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags} -Wall" \
 %if %{with systemlibs}
@@ -55,12 +78,6 @@
 	LDFLAGS="%{rpmldflags} -lpng -lz"
 %endif
 
-# create some real documentation
-# NOTE: remember to update line numbers on upgrade!
-head -n 24 pngcrush.c | cut -b 4- > README
-head -n 378 pngcrush.c | tail -n 310 | cut -b 4- > CHANGELOG
-head -n 415 pngcrush.c | tail -n 35 | cut -b 4- > TODO
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
@@ -72,8 +89,8 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README CHANGELOG TODO README.txt
-%attr(755,root,root) %{_bindir}/*
+%doc README TODO ChangeLog.txt
+%attr(755,root,root) %{_bindir}/pngcrush
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -81,6 +98,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2006/03/21 14:25:53  glen
+- up to 1.6.2, fixes CVE-2005-1849
+- rel 2 (1 reserved for Ra)
+- STBR to Ac?
+
 Revision 1.16  2004/04/27 19:55:07  qboosh
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pngcrush.spec?r1=1.16&r2=1.17&f=u