packages: libpng1/libpng1-SONAME.patch, libpng1/libpng1-opt.patch, libpng1/...

qboosh qboosh at pld-linux.org
Wed Apr 25 20:00:23 CEST 2012 

Author: qboosh                       Date: Wed Apr 25 18:00:23 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.0.59 (fixes CVE-2008-3964 CVE-2011-3026 CVE-2011-3048)
- updated opt,pngminus,SONAME patches
- added default_libpng bcond

---- Files affected:
packages/libpng1:
   libpng1-SONAME.patch (1.12 -> 1.13) , libpng1-opt.patch (1.4 -> 1.5) , libpng1-pngminus.patch (1.2 -> 1.3) , libpng1.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: packages/libpng1/libpng1-SONAME.patch
diff -u packages/libpng1/libpng1-SONAME.patch:1.12 packages/libpng1/libpng1-SONAME.patch:1.13
--- packages/libpng1/libpng1-SONAME.patch:1.12	Sat Mar 15 16:01:24 2008
+++ packages/libpng1/libpng1-SONAME.patch	Wed Apr 25 20:00:17 2012
@@ -1,18 +1,18 @@
---- libpng-1.0.31/scripts/makefile.linux.orig	2008-03-15 15:25:16.211287745 +0100
-+++ libpng-1.0.31/scripts/makefile.linux	2008-03-15 15:26:07.390401066 +0100
-@@ -4,8 +4,8 @@
- # For conditions of distribution and use, see copyright notice in png.h
+--- libpng-1.0.59/scripts/makefile.linux.orig	2012-04-25 19:27:07.640508188 +0200
++++ libpng-1.0.59/scripts/makefile.linux	2012-04-25 19:27:36.627174251 +0200
+@@ -8,8 +8,8 @@
+ # and license in png.h
  
  # Library name:
 -LIBNAME = libpng10
 -PNGMAJ = 0
 +LIBNAME = libpng
 +PNGMAJ = 2
- PNGMIN = 1.0.31
+ PNGMIN = 1.0.59
  PNGVER = $(PNGMAJ).$(PNGMIN)
  
-@@ -50,7 +50,7 @@
- CFLAGS=-I$(ZLIBINC) -Wall $(OPT_FLAGS) -funroll-loops -DPNG_NO_MMX_CODE \
+@@ -54,7 +54,7 @@
+ CFLAGS=-I$(ZLIBINC) -W -Wall $(OPT_FLAGS) -funroll-loops -DPNG_NO_MMX_CODE \
  	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
  
 -LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng10 -lz -lm
@@ -20,7 +20,7 @@
  LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
  
  INCPATH=$(prefix)/include
-@@ -114,12 +114,16 @@
+@@ -118,12 +118,16 @@
  	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
  
  $(LIBSOVER): $(OBJSDLL)
@@ -39,7 +39,7 @@
  
  pngtest: pngtest.o $(LIBSO)
  	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
-@@ -139,43 +143,42 @@
+@@ -143,43 +147,42 @@
  
  install-headers: png.h pngconf.h
  	- at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
@@ -98,7 +98,7 @@
  
  install-man: libpng.3 libpngpf.3 png.5
  	- at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
-@@ -190,11 +193,11 @@
+@@ -194,11 +197,11 @@
  
  install-config: libpng-config
  	- at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
@@ -112,8 +112,8 @@
  
  install: install-static install-shared install-man install-config
  
---- libpng-1.0.31/scripts/makefile.gcmmx.orig	2008-03-15 15:25:16.211287745 +0100
-+++ libpng-1.0.31/scripts/makefile.gcmmx	2008-03-15 15:25:55.143148910 +0100
+--- libpng-1.0.59/scripts/makefile.gcmmx.orig	2008-03-15 15:25:16.211287745 +0100
++++ libpng-1.0.59/scripts/makefile.gcmmx	2008-03-15 15:25:55.143148910 +0100
 @@ -12,8 +12,8 @@
  #        the background!  Context switches between MMX and FPU are expensive.
  
@@ -122,7 +122,7 @@
 -PNGMAJ = 0
 +LIBNAME = libpng
 +PNGMAJ = 2
- PNGMIN = 1.0.31
+ PNGMIN = 1.0.59
  PNGVER = $(PNGMAJ).$(PNGMIN)
  
 @@ -70,8 +70,8 @@

================================================================
Index: packages/libpng1/libpng1-opt.patch
diff -u packages/libpng1/libpng1-opt.patch:1.4 packages/libpng1/libpng1-opt.patch:1.5
--- packages/libpng1/libpng1-opt.patch:1.4	Sat Mar 15 16:01:24 2008
+++ packages/libpng1/libpng1-opt.patch	Wed Apr 25 20:00:17 2012
@@ -1,22 +1,22 @@
---- libpng-1.0.31/scripts/makefile.gcmmx.orig	2008-02-18 23:29:42.000000000 +0100
-+++ libpng-1.0.31/scripts/makefile.gcmmx	2008-03-15 15:24:19.431906700 +0100
-@@ -58,7 +58,7 @@
+--- libpng-1.0.59/scripts/makefile.gcmmx.orig	2012-03-29 07:00:13.000000000 +0200
++++ libpng-1.0.59/scripts/makefile.gcmmx	2012-04-25 19:24:05.670511980 +0200
+@@ -61,7 +61,7 @@
  
  # Remove -DPNG_THREAD_UNSAFE_OK if you need thread safety
  ### for generic gcc:
--CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -Wall -O \
-+CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -Wall $(OPT_FLAGS) \
+-CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -W -Wall -O \
++CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -W -Wall $(OPT_FLAGS) \
  	$(ALIGN) -funroll-loops \
  	-fomit-frame-pointer  # $(WARNMORE) -g -DPNG_DEBUG=5
  ### for gcc 2.95.2 on 686:
---- libpng-1.0.31/scripts/makefile.linux.orig	2008-02-18 23:29:42.000000000 +0100
-+++ libpng-1.0.31/scripts/makefile.linux	2008-03-15 15:24:46.896552999 +0100
-@@ -47,7 +47,7 @@
+--- libpng-1.0.59/scripts/makefile.linux.orig	2012-03-29 07:00:13.000000000 +0200
++++ libpng-1.0.59/scripts/makefile.linux	2012-04-25 19:23:47.990512349 +0200
+@@ -51,7 +51,7 @@
  
  # for pgcc version 2.95.1, -O3 is buggy; don't use it.
  
--CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \
-+CFLAGS=-I$(ZLIBINC) -Wall $(OPT_FLAGS) -funroll-loops -DPNG_NO_MMX_CODE \
+-CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \
++CFLAGS=-I$(ZLIBINC) -W -Wall $(OPT_FLAGS) -funroll-loops -DPNG_NO_MMX_CODE \
  	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
  
  LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng10 -lz -lm

================================================================
Index: packages/libpng1/libpng1-pngminus.patch
diff -u packages/libpng1/libpng1-pngminus.patch:1.2 packages/libpng1/libpng1-pngminus.patch:1.3
--- packages/libpng1/libpng1-pngminus.patch:1.2	Fri Jul 19 21:30:13 2002
+++ packages/libpng1/libpng1-pngminus.patch	Wed Apr 25 20:00:17 2012
@@ -1,5 +1,5 @@
---- libpng-1.0.14/contrib/pngminus/makefile.std.orig	Mon Jul  8 02:47:58 2002
-+++ libpng-1.0.14/contrib/pngminus/makefile.std	Thu Jul 18 20:03:13 2002
+--- libpng-1.0.59/contrib/pngminus/makefile.std.orig	2012-03-29 07:00:13.000000000 +0200
++++ libpng-1.0.59/contrib/pngminus/makefile.std	2012-04-25 19:26:45.070508661 +0200
 @@ -19,11 +19,11 @@
  #ZINC = -I$(ZPATH)/include
  #ZLIB = -L$(ZPATH)/lib -lz
@@ -7,12 +7,12 @@
 -ZINC = -I../../../zlib
 -ZLIB = -L../../../zlib -lz
 -ZLIBS = ../../../zlib/libz.a
-+ZINC =
++ZINC = 
 +ZLIB = -lz
 +ZLIBS = -lz
  
--CFLAGS=-O3 $(PNGINC) $(ZINC)
+-CFLAGS=$(PNGINC) $(ZINC)
 +CFLAGS=$(OPT_FLAGS) $(PNGINC) $(ZINC)
- LDFLAGS=$(PNGLIB) $(ZLIB)
- LDFLAGSS=$(PNGLIBS) $(ZLIBS)
+ LDLIBS=$(PNGLIB) $(ZLIB)
+ LDLIBSS=$(PNGLIBS) $(ZLIBS)
  C=.c

================================================================
Index: packages/libpng1/libpng1.spec
diff -u packages/libpng1/libpng1.spec:1.36 packages/libpng1/libpng1.spec:1.37
--- packages/libpng1/libpng1.spec:1.36	Sat Jan 29 01:06:54 2011
+++ packages/libpng1/libpng1.spec	Wed Apr 25 20:00:17 2012
@@ -1,17 +1,24 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	tests		# don't perform "make check"
+%bcond_with	default_libpng	# use this libpng as default system libpng
+#
 Summary:	PNG library
 Summary(de.UTF-8):	PNG-Library
+Summary(es.UTF-8):	Biblioteca PNG
 Summary(fr.UTF-8):	Librarie PNG
 Summary(pl.UTF-8):	Biblioteka PNG
+Summary(pt_BR.UTF-8):	Biblioteca PNG
 Summary(tr.UTF-8):	PNG kitaplığı
 Name:		libpng1
-Version:	1.0.31
+Version:	1.0.59
 Release:	1
 Epoch:		2
 License:	distributable
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/libpng/libpng-%{version}.tar.bz2
-# Source0-md5:	de77acd48b5e288fbc58cd82628367cc
+Source0:	http://downloads.sourceforge.net/libpng/libpng-%{version}.tar.bz2
+# Source0-md5:	ac6db872db91b50f12dacb40221451da
 Patch0:		%{name}-opt.patch
 Patch1:		%{name}-pngminus.patch
 Patch2:		%{name}-SONAME.patch
@@ -36,6 +43,11 @@
 Bearbeiten von Grafiken im PNG-Format. Das PNG-Format wurde als Ersatz
 für GIF entwickelt und enthält viele Verbesserungen und Erweiterungen.
 
+%description -l es.UTF-8
+Esta biblioteca es una colección de rutinas para crear y manipular
+archivos gráficos en el formato PNG. Este formato fue proyectado para
+substituir el
+
 %description -l fr.UTF-8
 La librairie PNG est un ensemble de routines utilisées pour créer et
 manipuler des fichiers graphiques au format PNG. Le format PNG a été
@@ -43,9 +55,14 @@
 extensions.
 
 %description -l pl.UTF-8
-Biblioteka PNG to zestaw funkcji używanych do tworzenia i obróbki
-plików w formacie graficznym PNG. Format ten został stworzony jako
-zamiennik dla formatu GIF, z wieloma ulepszeniami i rozszerzeniami.
+Biblioteki PNG są kolekcją form używanych do tworzenia i manipulowania
+plikami w formacie graficznym PNG. Format ten został stworzony jako
+zamiennik dla formatu GIF, z wieloma rozszerzeniami i nowościami.
+
+%description -l pt_BR.UTF-8
+Esta biblioteca é uma coleção de rotinas para criar e manipular
+arquivos gráficos no formato PNG. Este formato foi projetado para
+substituir o formato GIF, com extensões e melhorias.
 
 %description -l tr.UTF-8
 PNG kitaplığı, PNG formatındaki resim dosyalarını işlemeye yönelik
@@ -53,24 +70,28 @@
 bir resim formatıdır.
 
 %package devel
-Summary:	libpng header files
-Summary(de.UTF-8):	Headers und statische Libraries
-Summary(fr.UTF-8):	En-têtes et bibliothèques statiques
+Summary:	Header files for libpng
+Summary(de.UTF-8):	libpng Headers
+Summary(es.UTF-8):	Archivos de inclusión y bibliotecas estáticas
+Summary(fr.UTF-8):	en-têtes et bibliothèques statiques
 Summary(pl.UTF-8):	Pliki nagłówkowe libpng
-Summary(tr.UTF-8):	Başlık dosyaları ve statik kitaplıklar
+Summary(pt_BR.UTF-8):	Arquivos de inclusão e bibliotecas estáticas
+Summary(tr.UTF-8):	başlık dosyaları ve statik kitaplıklar
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	zlib-devel
-Provides:	libpng-devel = %{version}
-Conflicts:	libpng-devel >= 1.2.0
 
 %description devel
-The header files and static libraries are only needed for development
-of programs using the PNG library.
+The header files are only needed for development of programs using the
+PNG library.
 
 %description devel -l de.UTF-8
-Die Header-Dateien und statischen Libraries werden nur zur Entwicklung
-von Programmen mit der PNG-Library benötigt.
+Die Header-Dateien werden nur zur Entwicklung von Programmen mit der
+PNG-Library benötigt.
+
+%description devel -l es.UTF-8
+Archivos de inclusión y bibliotecas estáticas que son necesarios
+solamente para el desarrollo de programas que usan la biblioteca PNG.
 
 %description devel -l fr.UTF-8
 Fichiers d'en-tete et les librairies qui sont requis seulement pour le
@@ -78,40 +99,50 @@
 
 %description devel -l pl.UTF-8
 W pakiecie tym znajdują się pliki nagłówkowe, przeznaczone dla
-programistów używających biblioteki PNG.
+programistów używających bibliotek PNG.
+
+%description devel -l pt_BR.UTF-8
+Arquivos de inclusão e bibliotecas estáticas que são necessários
+somente para o desenvolvimento de programas que usam a biblioteca PNG.
 
 %description devel -l tr.UTF-8
 PNG kitaplığını kullanan programlar geliştirmek için gereken
 kitaplıklar ve başlık dosyaları.
 
 %package static
-Summary:	Static libpng libraries
-Summary(pl.UTF-8):	Biblioteki statyczne libpng
+Summary:	Static PNG library
+Summary(de.UTF-8):	Statisch PNG Library
+Summary(pl.UTF-8):	Biblioteka statyczna PNG
+Summary(pt_BR.UTF-8):	Bibliotecas estáticas para desenvolvimento com libpng
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
-Provides:	libpng-static = %{version}
-Conflicts:	libpng-static >= 1.2.0
 
 %description static
-Static libraries.
+Static PNG library.
+
+%description static -l de.UTF-8
+Statisch PNG Library.
 
 %description static -l pl.UTF-8
-Biblioteki statyczne.
+Biblioteka statyczna PNG.
+
+%description static -l pt_BR.UTF-8
+Bibliotecas estáticas para desenvolvimento com libpng.
 
 %package progs
 Summary:	libpng utility programs
-Summary(pl.UTF-8):	Programy użytkowe libpng
+Summary(pl.UTF-8):	Narzędzia do plików PNG
 Group:		Applications/Graphics
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	libpng-progs = %{version}
 Conflicts:	libpng-progs >= 1.2.0
 
 %description progs
-This package contains utility programs to convert png files to and
-from pnm files.
+This package contains utility programs to convert PNG files to and
+from PNM files.
 
 %description progs -l pl.UTF-8
-Narzędzia do konwersji plików png z lub do plików pnm.
+Narzędzia do konwersji plików PNG z lub do plików PNM.
 
 %prep
 %setup -q -n libpng-%{version}
@@ -153,6 +184,20 @@
 
 install contrib/pngminus/{png2pnm,pnm2png} $RPM_BUILD_ROOT%{_bindir}
 
+%if %{without default_libpng}
+# verify that these are symlinks, exchange them with pointing files
+[ -h $RPM_BUILD_ROOT%{_libdir}/libpng10.a ] || exit 1
+[ -h $RPM_BUILD_ROOT%{_bindir}/libpng10-config ] || exit 1
+[ -h $RPM_BUILD_ROOT%{_pkgconfigdir}/libpng10.pc ] || exit 1
+mv $RPM_BUILD_ROOT%{_libdir}/{libpng,libpng10}.a
+mv $RPM_BUILD_ROOT%{_bindir}/{libpng,libpng10}-config
+mv $RPM_BUILD_ROOT%{_pkgconfigdir}/{libpng,libpng10}.pc
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/pn?2pn? \
+	$RPM_BUILD_ROOT%{_libdir}/libpng.so \
+	$RPM_BUILD_ROOT%{_includedir}/{png*.h,libpng} \
+	$RPM_BUILD_ROOT%{_mandir}/man[35]/*png*
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -169,27 +214,34 @@
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/libpng-config
 %attr(755,root,root) %{_bindir}/libpng10-config
-%attr(755,root,root) %{_libdir}/libpng.so
 %attr(755,root,root) %{_libdir}/libpng10.so
-%{_includedir}/libpng
 %{_includedir}/libpng10
+%{_pkgconfigdir}/libpng10.pc
+%if %{with default_libpng}
+%attr(755,root,root) %{_bindir}/libpng-config
+%attr(755,root,root) %{_libdir}/libpng.so
+%{_includedir}/libpng
 %{_includedir}/png*.h
 %{_pkgconfigdir}/libpng.pc
-%{_pkgconfigdir}/libpng10.pc
-%{_mandir}/man3/libpng*.3*
+%{_mandir}/man3/libpng.3*
+%{_mandir}/man3/libpngpf.3*
 %{_mandir}/man5/png.5*
+%endif
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libpng.a
 %{_libdir}/libpng10.a
+%if %{with default_libpng}
+%{_libdir}/libpng.a
+%endif
 
+%if %{with default_libpng}
 %files progs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/png2pnm
 %attr(755,root,root) %{_bindir}/pnm2png
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -197,6 +249,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2012/04/25 18:00:17  qboosh
+- updated to 1.0.59 (fixes CVE-2008-3964 CVE-2011-3026 CVE-2011-3048)
+- updated opt,pngminus,SONAME patches
+- added default_libpng bcond
+
 Revision 1.36  2011/01/29 00:06:54  sparky
 - dropped pre-cvs changelog
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/libpng1/libpng1-SONAME.patch?r1=1.12&r2=1.13
    http://cvs.pld-linux.org/packages/libpng1/libpng1-opt.patch?r1=1.4&r2=1.5
    http://cvs.pld-linux.org/packages/libpng1/libpng1-pngminus.patch?r1=1.2&r2=1.3
    http://cvs.pld-linux.org/packages/libpng1/libpng1.spec?r1=1.36&r2=1.37

More information about the pld-cvs-commit mailing list