From 8cbc8e01b382df53d9882d7a7e0970287575ad08 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 4 Feb 2012 11:17:22 +0100
Subject: [PATCH] libpng: Update to 1.2.46.

Fixes several security issues from 2011.
---
 config/rootfiles/common/libpng | 4 ++--
 lfs/libpng                     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/rootfiles/common/libpng b/config/rootfiles/common/libpng
index 2b2ab107f..c29eaa7db 100644
--- a/config/rootfiles/common/libpng
+++ b/config/rootfiles/common/libpng
@@ -9,12 +9,12 @@
 #usr/lib/libpng.la
 usr/lib/libpng.so
 usr/lib/libpng.so.3
-usr/lib/libpng.so.3.44.0
+usr/lib/libpng.so.3.46.0
 #usr/lib/libpng12.a
 #usr/lib/libpng12.la
 usr/lib/libpng12.so
 usr/lib/libpng12.so.0
-usr/lib/libpng12.so.0.44.0
+usr/lib/libpng12.so.0.46.0
 #usr/lib/pkgconfig/libpng.pc
 #usr/lib/pkgconfig/libpng12.pc
 #usr/share/man/man3/libpng.3
diff --git a/lfs/libpng b/lfs/libpng
index 60b25a009..707511867 100644
--- a/lfs/libpng
+++ b/lfs/libpng
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 1.2.44
+VER        = 1.2.46
 
 THISAPP    = libpng-$(VER)
-DL_FILE    = $(THISAPP).tar.xz
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 098ab673ab74015978db98667febc4a9
+$(DL_FILE)_MD5 = 03ddfc17ad321db93f984581e9415d22
 
 install : $(TARGET)
 
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-- 
2.39.2