From 805b920e4f060303a3c0f0459357ea968ccb0efd Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 15 Jan 2017 16:28:16 +0100
Subject: [PATCH] update: curl, lcms, libunistring, libusb1, xz, zlib

---
 src/curl.mk                   |  4 +--
 src/lcms.mk                   |  4 +--
 src/libunistring.mk           |  4 +--
 src/libusb1.mk                |  4 +--
 src/xz.mk                     |  4 +--
 src/zlib-1-win32-static.patch | 50 +++++++++++++++++++++--------------
 src/zlib.mk                   |  4 +--
 7 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/src/curl.mk b/src/curl.mk
index 1d9da873..6f487760 100644
--- a/src/curl.mk
+++ b/src/curl.mk
@@ -4,8 +4,8 @@ PKG             := curl
 $(PKG)_WEBSITE  := http://curl.haxx.se/libcurl/
 $(PKG)_DESCR    := cURL
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 7.52.0
-$(PKG)_CHECKSUM := c8f0114c7c72c8627d716416326593d061274b208cdf123c418c20c6dbe009c2
+$(PKG)_VERSION  := 7.52.1
+$(PKG)_CHECKSUM := 44286d4b825936e2430fc44ad730ce899afb736a5d328cbb8b5d42462f3f2365
 $(PKG)_SUBDIR   := curl-$($(PKG)_VERSION)
 $(PKG)_FILE     := curl-$($(PKG)_VERSION).tar.lzma
 $(PKG)_URL      := http://curl.haxx.se/download/$($(PKG)_FILE)
diff --git a/src/lcms.mk b/src/lcms.mk
index 20f773f7..40f2b6df 100644
--- a/src/lcms.mk
+++ b/src/lcms.mk
@@ -3,8 +3,8 @@
 PKG             := lcms
 $(PKG)_WEBSITE  := http://www.littlecms.com/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.7
-$(PKG)_CHECKSUM := 4524234ae7de185e6b6da5d31d6875085b2198bc63b1211f7dde6e2d197d6a53
+$(PKG)_VERSION  := 2.8
+$(PKG)_CHECKSUM := 66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22
 $(PKG)_SUBDIR   := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION))
 $(PKG)_FILE     := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION)).tar.gz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(subst a,,$($(PKG)_VERSION))/$($(PKG)_FILE)
diff --git a/src/libunistring.mk b/src/libunistring.mk
index 41f9c17c..3db8b213 100644
--- a/src/libunistring.mk
+++ b/src/libunistring.mk
@@ -3,8 +3,8 @@
 PKG             := libunistring
 $(PKG)_WEBSITE  := https://www.gnu.org/software/libunistring/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.9.4
-$(PKG)_CHECKSUM := f5246d63286a42902dc096d6d44541fbe4204b6c02d6d5d28b457c9882ddd8a6
+$(PKG)_VERSION  := 0.9.7
+$(PKG)_CHECKSUM := 9ce081cbee1951b55597b30e7030bda9d7b2f034ef901a135ff3a020be5a41e5
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE)
diff --git a/src/libusb1.mk b/src/libusb1.mk
index d1dfc22d..2f184bf5 100644
--- a/src/libusb1.mk
+++ b/src/libusb1.mk
@@ -4,8 +4,8 @@ PKG             := libusb1
 $(PKG)_WEBSITE  := http://libusb.org/
 $(PKG)_DESCR    := LibUsb-1.0
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.19
-$(PKG)_CHECKSUM := 6c502c816002f90d4f76050a6429c3a7e0d84204222cbff2dce95dd773ba6840
+$(PKG)_VERSION  := 1.0.21
+$(PKG)_CHECKSUM := 7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b
 $(PKG)_SUBDIR   := libusb-$($(PKG)_VERSION)
 $(PKG)_FILE     := libusb-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/libusb/libusb-1.0/libusb-$($(PKG)_VERSION)/$($(PKG)_FILE)
diff --git a/src/xz.mk b/src/xz.mk
index 7b759315..20084f51 100644
--- a/src/xz.mk
+++ b/src/xz.mk
@@ -4,8 +4,8 @@ PKG             := xz
 $(PKG)_WEBSITE  := http://tukaani.org/xz/
 $(PKG)_DESCR    := XZ
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.2.2
-$(PKG)_CHECKSUM := 73df4d5d34f0468bd57d09f2d8af363e95ed6cc3a4a86129d2f2c366259902a2
+$(PKG)_VERSION  := 5.2.3
+$(PKG)_CHECKSUM := 71928b357d0a09a12a4b4c5fafca8c31c19b0e7d3b8ebb19622e96f26dbf28cb
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://tukaani.org/xz/$($(PKG)_FILE)
diff --git a/src/zlib-1-win32-static.patch b/src/zlib-1-win32-static.patch
index f5372500..b07581f4 100644
--- a/src/zlib-1-win32-static.patch
+++ b/src/zlib-1-win32-static.patch
@@ -1,35 +1,45 @@
 This file is part of MXE. See LICENSE.md for licensing information.
 
-Contains ad hoc patches for cross building.
+From 2de67e2eedc9bd458c1e5170ae43d815b466f012 Mon Sep 17 00:00:00 2001
+From: Volker Grabsch <vog@notjusthosting.com>
+Date: Sun, 15 Jan 2017 16:10:19 +0100
+Subject: [PATCH] build fix for mxe static
 
-diff -urN a/configure b/configure
---- a/configure	2013-03-24 06:30:09.000000000 +0100
-+++ b/configure	2013-04-29 12:19:25.526304670 +0200
-@@ -191,10 +191,7 @@
-   CYGWIN* | Cygwin* | cygwin* | OS/2*)
-         EXE='.exe' ;;
-   MINGW* | mingw*)
--# temporary bypass
-         rm -f $test.[co] $test $test$shared_ext
--        echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
--        leave 1
-         LDSHARED=${LDSHARED-"$cc -shared"}
-         LDSHAREDLIBC=""
-         EXE='.exe' ;;
-diff -urN a/Makefile.in b/Makefile.in
---- a/Makefile.in	2013-04-29 00:57:11.000000000 +0200
-+++ b/Makefile.in	2013-04-29 12:16:08.631379491 +0200
-@@ -190,11 +190,11 @@
- 	-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
+
+diff --git a/Makefile.in b/Makefile.in
+index 1852192..c88f5b5 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -310,12 +310,12 @@ install-libs: $(LIBS)
  	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
  	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
+ 	rm -f $(DESTDIR)$(libdir)/$(STATICLIB)
 -	cp $(STATICLIB) $(DESTDIR)$(libdir)
 +	[ -z '$(STATICLIB)'  ] || cp $(STATICLIB)  $(DESTDIR)$(libdir)
  	chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
  	-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
  	-@if test -n "$(SHAREDLIBV)"; then \
+ 	  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
 -	  cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
 +	  [ -z '$(SHAREDLIBV)' ] || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
  	  echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
  	  chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
  	  echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
+diff --git a/configure b/configure
+index e974d1f..f023947 100755
+--- a/configure
++++ b/configure
+@@ -215,10 +215,7 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
+   CYGWIN* | Cygwin* | cygwin* | OS/2*)
+         EXE='.exe' ;;
+   MINGW* | mingw*)
+-# temporary bypass
+         rm -f $test.[co] $test $test$shared_ext
+-        echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
+-        leave 1
+         LDSHARED=${LDSHARED-"$cc -shared"}
+         LDSHAREDLIBC=""
+         EXE='.exe' ;;
+-- 
+2.9.3
+
diff --git a/src/zlib.mk b/src/zlib.mk
index 64016956..e2962f94 100644
--- a/src/zlib.mk
+++ b/src/zlib.mk
@@ -3,8 +3,8 @@
 PKG             := zlib
 $(PKG)_WEBSITE  := http://zlib.net/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2.8
-$(PKG)_CHECKSUM := 831df043236df8e9a7667b9e3bb37e1fcb1220a0f163b6de2626774b9590d057
+$(PKG)_VERSION  := 1.2.10
+$(PKG)_CHECKSUM := 9612bf086047078ce3a1c154fc9052113fc1a2a97234a059da17a6299bd4dd32
 $(PKG)_SUBDIR   := zlib-$($(PKG)_VERSION)
 $(PKG)_FILE     := zlib-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://zlib.net/$($(PKG)_FILE)