diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2017-02-24 21:14:25 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2017-02-24 21:14:25 (GMT) |
| commit | 7c70fe10e58e95a6609e0ba918b6a71d500de824 (patch) | |
| tree | f2e492d64f5bd1dc59b110aed187313059719c28 | |
| parent | 6c2867432d6e597f77aeb990ae0f7799dbb4e402 (diff) | |
| download | mxe-7c70fe10e58e95a6609e0ba918b6a71d500de824.zip mxe-7c70fe10e58e95a6609e0ba918b6a71d500de824.tar.gz mxe-7c70fe10e58e95a6609e0ba918b6a71d500de824.tar.bz2 | |
update: curl, dbus
| -rw-r--r-- | src/curl-1-fixes.patch | 30 | ||||
| -rw-r--r-- | src/curl.mk | 4 | ||||
| -rw-r--r-- | src/dbus.mk | 4 |
3 files changed, 4 insertions, 34 deletions
diff --git a/src/curl-1-fixes.patch b/src/curl-1-fixes.patch deleted file mode 100644 index cacc70d..0000000 --- a/src/curl-1-fixes.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a893a953217ad8c8041de64049e133c12eb5ee54 Mon Sep 17 00:00:00 2001 -From: Viktor Szakats <vszakats@users.noreply.github.com> -Date: Tue, 21 Feb 2017 23:01:37 -0500 -Subject: [PATCH] urldata: include curl_sspi.h when Windows SSPI is enabled - -f77dabe broke builds in Windows using Windows SSPI but not Windows SSL. - -Bug: https://github.com/curl/curl/issues/1276 -Reported-by: jveazey@users.noreply.github.com -(cherry picked from commit f4739f639fc481a7bec7da73041dfcb3d26ed220) - -diff --git a/lib/urldata.h b/lib/urldata.h -index 648b3e8..7f87913 100644 ---- a/lib/urldata.h -+++ b/lib/urldata.h -@@ -136,8 +136,10 @@ - #undef realloc - #endif /* USE_AXTLS */ - --#ifdef USE_SCHANNEL -+#if defined(USE_SCHANNEL) || defined(USE_WINDOWS_SSPI) - #include "curl_sspi.h" -+#endif -+#ifdef USE_SCHANNEL - #include <schnlsp.h> - #include <schannel.h> - #endif --- -2.9.3 - diff --git a/src/curl.mk b/src/curl.mk index 4774793..2cdfb46 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.53.0 -$(PKG)_CHECKSUM := 38bf7820a72ae476a7637d55ec1e794cb3bb78b111521a0c2300ade77b1811cc +$(PKG)_VERSION := 7.53.1 +$(PKG)_CHECKSUM := 4b124ff5984f2b537790a8f50dbf3d44da89e57d0505ba567128535a2426f5e2 $(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/dbus.mk b/src/dbus.mk index 4e86f18..eec2374 100644 --- a/src/dbus.mk +++ b/src/dbus.mk @@ -3,8 +3,8 @@ PKG := dbus $(PKG)_WEBSITE := http://dbus.freedesktop.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 1.11.8 -$(PKG)_CHECKSUM := fa207530d694706e33378c87e65b2b4304eb99fff71fc6d6caa6f70591b9afd5 +$(PKG)_VERSION := 1.11.10 +$(PKG)_CHECKSUM := d3d0b5f88a34b9f29120a2d4d5b2b46d3d9fe7af8b45e12fc4af93ed3f447275 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE) |