update: curl, dbus

This commit is contained in:
Mark Brand 2017-02-24 22:14:25 +01:00
parent 6c2867432d
commit 7c70fe10e5
3 changed files with 4 additions and 34 deletions

View File

@ -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

View File

@ -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)

View File

@ -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)