From 82d1c1d9ebaf6e2f5eb81c05223d1f6bb7679bce Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 14 May 2012 09:04:26 +0100
Subject: bump zlib to 1.2.7

Change-Id: I003d1a8ff86f94c15b295e11ad109929708fa561
---
 zlib/makefile.mk           | 10 +++----
 zlib/zlib-1.2.5.patch      | 67 ----------------------------------------------
 zlib/zlib-dmakebuild.patch | 67 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 72 deletions(-)
 delete mode 100644 zlib/zlib-1.2.5.patch
 create mode 100644 zlib/zlib-dmakebuild.patch

(limited to 'zlib')

diff --git a/zlib/makefile.mk b/zlib/makefile.mk
index 8ec3a5e185f9..7a677e50cdb2 100644
--- a/zlib/makefile.mk
+++ b/zlib/makefile.mk
@@ -44,10 +44,10 @@ all:
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=zlib-1.2.5
-TARFILE_MD5=c735eab2d659a96e5a594c9e8541ad63
+TARFILE_NAME=zlib-1.2.7
+TARFILE_MD5=2ab442d169156f34c379c968f3f482dd
 
-PATCH_FILES=zlib-1.2.5.patch
+PATCH_FILES=zlib-dmakebuild.patch
 ADDITIONAL_FILES=makefile.mk
 
 #relative to CONFIGURE_DIR
@@ -64,8 +64,8 @@ PATCHED_HEADERS=$(INCCOM)$/patched$/zlib.h
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
-.INCLUDE :	target.mk
-.INCLUDE :	tg_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
 
 ALLTAR: $(PATCHED_HEADERS)
 
diff --git a/zlib/zlib-1.2.5.patch b/zlib/zlib-1.2.5.patch
deleted file mode 100644
index 3389b88c0ae9..000000000000
--- a/zlib/zlib-1.2.5.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- misc/zlib-1.2.5/makefile.mk	Fri Mar 14 10:17:06 2008
-+++ misc/build/zlib-1.2.5/makefile.mk	Fri Mar 14 10:16:56 2008
-@@ -1 +1,63 @@
--dummy
-+#*************************************************************************
-+#
-+#   Copyright according the GNU Public License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..
-+
-+PRJNAME=zlib
-+TARGET=zlib
-+LIBTARGET=NO
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+INCEXT=contrib$/minizip
-+
-+SLOFILES=	$(SLO)$/adler32.obj		\
-+			$(SLO)$/compress.obj	\
-+			$(SLO)$/deflate.obj		\
-+			$(SLO)$/crc32.obj		\
-+			$(SLO)$/inffast.obj		\
-+			$(SLO)$/inflate.obj		\
-+			$(SLO)$/inftrees.obj	\
-+			$(SLO)$/trees.obj		\
-+			$(SLO)$/zutil.obj
-+
-+
-+LIB1TARGET=$(SLB)$/$(TARGET).lib
-+LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-+LIB1OBJFILES=$(SLOFILES)
-+
-+.IF "$(BUILD_X64)"!=""
-+SLOFILES_X64=	$(SLO_X64)$/adler32.obj		\
-+			$(SLO_X64)$/compress.obj	\
-+			$(SLO_X64)$/deflate.obj		\
-+			$(SLO_X64)$/crc32.obj		\
-+			$(SLO_X64)$/inffast.obj		\
-+			$(SLO_X64)$/inflate.obj		\
-+			$(SLO_X64)$/inftrees.obj	\
-+			$(SLO_X64)$/trees.obj		\
-+			$(SLO_X64)$/zutil.obj
-+
-+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib
-+LIB1OBJFILES_X64=$(SLOFILES_X64)
-+.ENDIF # "$(BUILD_X64)"!=""
-+
-+
-+# --- Targets ------------------------------------------------------
-+
-+$(MISC)$/%.c : contrib$/minizip$/%.c
-+	@echo ------------------------------
-+	@echo Making: $@
-+    @$(COPY) $< $@
-+
-+.INCLUDE :  set_wntx64.mk
-+.INCLUDE :  target.mk
-+.INCLUDE :  tg_wntx64.mk
-+
diff --git a/zlib/zlib-dmakebuild.patch b/zlib/zlib-dmakebuild.patch
new file mode 100644
index 000000000000..6c2de996fa90
--- /dev/null
+++ b/zlib/zlib-dmakebuild.patch
@@ -0,0 +1,67 @@
+--- misc/zlib-1.2.7/makefile.mk	Fri Mar 14 10:17:06 2008
++++ misc/build/zlib-1.2.7/makefile.mk	Fri Mar 14 10:16:56 2008
+@@ -1 +1,63 @@
+-dummy
++#*************************************************************************
++#
++#   Copyright according the GNU Public License.
++#
++#*************************************************************************
++
++PRJ=..$/..$/..$/..
++
++PRJNAME=zlib
++TARGET=zlib
++LIBTARGET=NO
++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :  settings.mk
++
++# --- Files --------------------------------------------------------
++
++INCEXT=contrib$/minizip
++
++SLOFILES=	$(SLO)$/adler32.obj		\
++			$(SLO)$/compress.obj	\
++			$(SLO)$/deflate.obj		\
++			$(SLO)$/crc32.obj		\
++			$(SLO)$/inffast.obj		\
++			$(SLO)$/inflate.obj		\
++			$(SLO)$/inftrees.obj	\
++			$(SLO)$/trees.obj		\
++			$(SLO)$/zutil.obj
++
++
++LIB1TARGET=$(SLB)$/$(TARGET).lib
++LIB1ARCHIV=$(LB)$/lib$(TARGET).a
++LIB1OBJFILES=$(SLOFILES)
++
++.IF "$(BUILD_X64)"!=""
++SLOFILES_X64=	$(SLO_X64)$/adler32.obj		\
++			$(SLO_X64)$/compress.obj	\
++			$(SLO_X64)$/deflate.obj		\
++			$(SLO_X64)$/crc32.obj		\
++			$(SLO_X64)$/inffast.obj		\
++			$(SLO_X64)$/inflate.obj		\
++			$(SLO_X64)$/inftrees.obj	\
++			$(SLO_X64)$/trees.obj		\
++			$(SLO_X64)$/zutil.obj
++
++LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib
++LIB1OBJFILES_X64=$(SLOFILES_X64)
++.ENDIF # "$(BUILD_X64)"!=""
++
++
++# --- Targets ------------------------------------------------------
++
++$(MISC)$/%.c : contrib$/minizip$/%.c
++	@echo ------------------------------
++	@echo Making: $@
++    @$(COPY) $< $@
++
++.INCLUDE :  set_wntx64.mk
++.INCLUDE :  target.mk
++.INCLUDE :  tg_wntx64.mk
++
-- 
cgit v1.2.3