From 032d9402640a947375a50ef21ece9fa669c276da Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 20 Aug 2012 00:10:49 +0200
Subject: [PATCH] zlib: Update to 1.2.7.

---
 config/rootfiles/common/zlib |  4 ++--
 lfs/zlib                     | 24 +++++++++++-------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/config/rootfiles/common/zlib b/config/rootfiles/common/zlib
index b275de54b9..8b95f121dd 100644
--- a/config/rootfiles/common/zlib
+++ b/config/rootfiles/common/zlib
@@ -1,7 +1,7 @@
 lib/libz.so.1
-lib/libz.so.1.2.3
+lib/libz.so.1.2.7
 #usr/include/zconf.h
 #usr/include/zlib.h
-#usr/lib/libz.a
+usr/lib/libz.a
 usr/lib/libz.so
 #usr/share/man/man3/zlib.3
diff --git a/lfs/zlib b/lfs/zlib
index 1f47d652ee..5337c7724a 100644
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 1.2.3
+VER        = 1.2.7
 
 THISAPP    = zlib-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-CFLAGS    += -fPIC
+CFLAGS    += -fPIC -DPIC
 
 ###############################################################################
 # Top-level Rules
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE)                           = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5                       = dee233bf288ee795ac96a98cc2e369b6
+$(DL_FILE)_MD5                       = 60df6a37c56e7c1366cca812414f7b85
 
 install : $(TARGET)
 
@@ -70,16 +70,14 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --shared --libdir=/lib
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr --shared
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	rm -v /lib/libz.so
-	ln -sfv ../../lib/libz.so.1.2.3 /usr/lib/libz.so
-	cd $(DIR_APP) && make clean
-	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
-	chmod -v 644 /usr/lib/libz.a
+
+	mv -v /usr/lib/libz.so.$(VER) /lib/libz.so.$(VER)
+	ln -svf libz.so.$(VER) /lib/libz.so.1
+	rm -vf /usr/lib/libz.so.1
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
-- 
2.39.5