1.2.12

2 files changed, 16 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a816f8cda65a..d7790f18a07a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Mon Jan 16 18:00:01 UTC 2017
 pkgbase = mingw-w64-zlib
 	pkgdesc = A compression/decompression Library (mingw-w64)
-	pkgver = 1.2.11
+	pkgver = 1.2.12
 	pkgrel = 1
 	url = http://www.zlib.net/
 	arch = any
@@ -12,8 +10,7 @@ pkgbase = mingw-w64-zlib
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = http://zlib.net/zlib-1.2.11.tar.gz
-	md5sums = 1c9f62f0778697a09d36121ead88e08e
+	source = http://zlib.net/zlib-1.2.12.tar.gz
+	sha256sums = 91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9
 
 pkgname = mingw-w64-zlib
-
diff --git a/PKGBUILD b/PKGBUILD
index c75933a86af3..4c517418478a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,5 @@
-# Contributor: Daniel Kirchner <daniel AT ekpyron DOT org>
-
 pkgname=mingw-w64-zlib
-pkgver=1.2.11
+pkgver=1.2.12
 pkgrel=1
 pkgdesc="A compression/decompression Library (mingw-w64)"
 arch=('any')
@@ -11,26 +9,24 @@ makedepends=(mingw-w64-gcc)
 url="http://www.zlib.net/"
 source=("http://zlib.net/zlib-${pkgver}.tar.gz")
 options=(!strip !buildflags staticlibs)
-md5sums=('1c9f62f0778697a09d36121ead88e08e')
+sha256sums=('91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
   for _arch in ${_architectures}; do
     rm -rf "${srcdir}/build-${_arch}"
-  	cp -r "${srcdir}/zlib-${pkgver}" "${srcdir}/build-${_arch}"
-  	cd "${srcdir}/build-${_arch}"
-  	sed -ie "s,dllwrap,${_arch}-dllwrap," win32/Makefile.gcc
-  	
-  	CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4" \
+    cp -r "${srcdir}/zlib-${pkgver}" "${srcdir}/build-${_arch}"
+    cd "${srcdir}/build-${_arch}"
+    sed -ie "s,dllwrap,${_arch}-dllwrap," win32/Makefile.gcc
     ./configure --prefix=/usr/${_arch} -shared -static
-  	make -f win32/Makefile.gcc \
-  	    CC=${_arch}-gcc \
-    	AR=${_arch}-ar \
-    	RC=${_arch}-windres \
-    	STRIP=${_arch}-strip \
-    	IMPLIB=libz.dll.a \
-    	CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
+    make -f win32/Makefile.gcc \
+      CC=${_arch}-gcc \
+      AR=${_arch}-ar \
+      RC=${_arch}-windres \
+      STRIP=${_arch}-strip \
+      IMPLIB=libz.dll.a \
+      CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -O2 -g -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4 -Wformat -Werror=format-security -fcf-protection"
   done
 }
 
@@ -41,8 +37,8 @@ package () {
     install -m644 -t "${pkgdir}/usr/${_arch}/include" zlib.h zconf.h
     install -m644 -t "${pkgdir}/usr/${_arch}/lib" libz.a libz.dll.a
     install -m755 -t "${pkgdir}/usr/${_arch}/bin" zlib1.dll
+
     install -d "${pkgdir}/usr/${_arch}/lib/pkgconfig"
-    
     sed "s,@prefix@,/usr/${_arch},;s,@exec_prefix@,\${prefix},;s,@libdir@,\${exec_prefix}/lib,;s,@sharedlibdir@,\${libdir},;s,@includedir@,\${prefix}/include,;s,@VERSION@,$pkgver," < zlib.pc.in > "${pkgdir}/usr/${_arch}/lib/pkgconfig/zlib.pc"
     
     ${_arch}-strip -x -g "${pkgdir}/usr/${_arch}/bin/"*.dll