- updated to 1.6.37 (solves CVE-2019-7317)

diff --git a/libpng-pngminus.patch b/libpng-pngminus.patch
index d929f9f5b7dbf9e02f78df6d11278060e6ca77a8..385e1d7c35d3b510782f0c11742c1ee0a7c55db7 100644 (file)
--- a/libpng-pngminus.patch
+++ b/libpng-pngminus.patch
@@ -1,40 +1,33 @@
---- libpng-1.5.7/contrib/pngminus/makefile.std.orig    2011-12-15 16:45:32.000000000 +0100
-+++ libpng-1.5.7/contrib/pngminus/makefile.std 2011-12-18 16:24:38.099367091 +0100
-@@ -12,21 +12,21 @@
- #PNGLIB = -L$(PNGPATH)/lib -lpng16
- #PNGLIBS = $(PNGPATH)/lib/libpng16.a
+--- libpng-1.6.37/contrib/pngminus/Makefile~   2019-04-14 20:10:32.000000000 +0200
++++ libpng-1.6.37/contrib/pngminus/Makefile    2019-04-23 09:25:47.422459927 +0200
+@@ -8,7 +8,7 @@
+ RM = rm -f
+ 
  PNGINC = -I../..
--PNGLIB = -L../.. -lpng
-+PNGLIB = -L../.. -L../../.libs -lpng16
- PNGLIBS = ../../libpng.a
+-PNGLIB_SHARED = -L../.. -lpng
++PNGLIB_SHARED = -L../.. -L../../.libs/ -lpng16
+ PNGLIB_STATIC = ../../libpng.a
+ 
+ # Uncomment the following if you have a custom zlib build at ../../../zlib
+@@ -20,10 +20,10 @@
+ ZLIB_SHARED = -lz
+ ZLIB_STATIC = -lz
  
- #ZPATH = /usr/local
- #ZINC = -I$(ZPATH)/include
- #ZLIB = -L$(ZPATH)/lib -lz
- #ZLIBS = $(ZPATH)/lib/libz.a
--ZINC = -I../../../zlib
--ZLIB = -L../../../zlib -lz
--ZLIBS = ../../../zlib/libz.a
-+ZINC =
-+ZLIB = -lz
-+ZLIBS = -lz
+-CPPFLAGS = $(PNGINC) $(ZINC)
++CPPFLAGS = $(OPT_FLAGS) $(PNGINC) $(ZINC)
+ CFLAGS =
+ LDFLAGS =
+-LIBS_SHARED = $(PNGLIB_SHARED) $(ZLIB_SHARED)
++LIBS_SHARED = $(LD_FLAGS) $(PNGLIB_SHARED) $(ZLIB_SHARED)
+ LIBS_STATIC = $(PNGLIB_STATIC) $(ZLIB_STATIC)
  
--CPPFLAGS=$(PNGINC) $(ZINC)
-+CPPFLAGS=$(OPT_FLAGS) $(PNGINC) $(ZINC)
- CFLAGS=
- LDLIBS=$(PNGLIB) $(ZLIB)
--LDLIBSS=$(PNGLIBS) $(ZLIBS)
-+LDLIBSS=$(LD_FLAGS) $(PNGLIBS) $(ZLIBS)
- C=.c
- O=.o
- L=.a
-@@ -33,8 +33,7 @@
+ EXEEXT =
+@@ -31,7 +31,7 @@
  
  # dependencies
  
--#all: png2pnm$(E) pnm2png$(E)
--all: png2pnm$(E) pnm2png$(E) png2pnm-static$(E) pnm2png-static$(E)
-+all: png2pnm$(E) pnm2png$(E)
+-all: png2pnm$(EXEEXT) pnm2png$(EXEEXT) png2pnm-static$(EXEEXT) pnm2png-static$(EXEEXT)
++all: png2pnm$(EXEEXT) pnm2png$(EXEEXT)
  
- png2pnm$(O): png2pnm$(C)
-       $(CC) -c $(CFLAGS) png2pnm$(C)
+ png2pnm.o: png2pnm.c
+       $(CC) -c $(CPPFLAGS) $(CFLAGS) png2pnm.c

diff --git a/libpng.spec b/libpng.spec
index 7b80aae073ef26c5e258d7c014477315a77aa7ea..3c1137ffdbecb9c61dc7b649fde93d038e24867a 100644 (file)
--- a/libpng.spec
+++ b/libpng.spec
@@ -13,16 +13,16 @@ Summary(pl.UTF-8):  Biblioteka PNG
 Summary(pt_BR.UTF-8):  Biblioteca PNG
 Summary(tr.UTF-8):     PNG kitaplığı
 Name:          libpng
-Version:       1.6.36
+Version:       1.6.37
 Release:       1
 Epoch:         2
 License:       distributable
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/libpng/%{name}-%{version}.tar.xz
-# Source0-md5: df2be2d29c40937fe1f5349b16bc2826
+# Source0-md5: 015e8e15db1eecde5f2eb9eb5b6e59e9
 Patch0:                %{name}-pngminus.patch
 Patch1:                http://downloads.sourceforge.net/libpng-apng/%{name}-%{version}-apng.patch.gz
-# Patch1-md5:  bd1f5f7dd99003128d747c5597308a44
+# Patch1-md5:  f02073fd96816b184c79b297775e37dc
 URL:           http://www.libpng.org/pub/png/libpng.html
 BuildRequires: rpmbuild(macros) >= 1.213
 BuildRequires: tar >= 1:1.22
@@ -162,12 +162,12 @@ Narzędzia do konwersji plików PNG z lub do plików PNM.
 
 %{__make}
 
-%{__make} -C contrib/pngminus -f makefile.std \
+%{__make} -C contrib/pngminus \
        LIBPATH=%{_libdir} \
        CC="%{__cc}" \
        OPT_FLAGS="%{rpmcppflags} %{rpmcflags}"
 
-%{?with_tests:%{__make} check}
+%{?with_tests:%{__make} -j1 check}
 
 %install
 rm -rf $RPM_BUILD_ROOT