Revision: 26266 http://sourceforge.net/p/gar/code/26266 Author: dmichelsen Date: 2017-08-14 08:22:18 +0000 (Mon, 14 Aug 2017) Log Message: ----------- curl/trunk: Update to 7.55.1
Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/curl/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/curl/trunk/files/0001-Fix-for-issue-1752.patch Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2017-08-12 14:00:51 UTC (rev 26265) +++ csw/mgar/pkg/curl/trunk/Makefile 2017-08-14 08:22:18 UTC (rev 26266) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.55.0 +VERSION = 7.55.1 GARTYPE = v2 DESCRIPTION = Command line tool and library for client-side URL transfers @@ -16,10 +16,6 @@ MASTER_SITES = http://curl.haxx.se/download/ DISTFILES += $(NAME)-$(VERSION).tar.xz -# Use patch until this issue is fixed: -# https://github.com/curl/curl/issues/1752 -PATCHFILES += 0001-Fix-for-issue-1752.patch - VENDOR_URL = http://curl.haxx.se # Because of OpenSSL 1.0 update Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2017-08-12 14:00:51 UTC (rev 26265) +++ csw/mgar/pkg/curl/trunk/checksums 2017-08-14 08:22:18 UTC (rev 26266) @@ -1 +1 @@ -d8335766d8768bc54a2dd2823f390dde curl-7.55.0.tar.xz +ac4a59c38c47adc160ea71eace20257b curl-7.55.1.tar.xz Deleted: csw/mgar/pkg/curl/trunk/files/0001-Fix-for-issue-1752.patch =================================================================== --- csw/mgar/pkg/curl/trunk/files/0001-Fix-for-issue-1752.patch 2017-08-12 14:00:51 UTC (rev 26265) +++ csw/mgar/pkg/curl/trunk/files/0001-Fix-for-issue-1752.patch 2017-08-14 08:22:18 UTC (rev 26266) @@ -1,48 +0,0 @@ -From adf017b5d0501b848df0a04d536e16a91a04ac11 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen <d...@opencsw.org> -Date: Sat, 12 Aug 2017 09:50:02 +0200 -Subject: [PATCH] Fix for issue #1752 - ---- - include/curl/system.h | 25 +++++++++++++++++++++++++ - 1 file changed, 25 insertions(+) - -diff --git a/include/curl/system.h b/include/curl/system.h -index 79abf8f..239e2f8 100644 ---- a/include/curl/system.h -+++ b/include/curl/system.h -@@ -370,6 +370,31 @@ - # define CURL_PULL_SYS_TYPES_H 1 - # define CURL_PULL_SYS_SOCKET_H 1 - -+#elif defined(__SUNPRO_C) /* Oracle Solaris Studio */ -+# if !defined(__LP64) && (defined(__ILP32) || \ -+ defined(__i386) || defined(__sparcv8)) -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long long -+# define CURL_FORMAT_CURL_OFF_T "lld" -+# define CURL_FORMAT_CURL_OFF_TU "llu" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T LL -+# define CURL_SUFFIX_CURL_OFF_TU ULL -+# elif defined(__LP64) || \ -+ defined(__amd64) || defined(__sparcv9) -+# define CURL_SIZEOF_LONG 8 -+# define CURL_TYPEOF_CURL_OFF_T long -+# define CURL_FORMAT_CURL_OFF_T "ld" -+# define CURL_FORMAT_CURL_OFF_TU "lu" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T L -+# define CURL_SUFFIX_CURL_OFF_TU UL -+# endif -+# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_PULL_SYS_TYPES_H 1 -+# define CURL_PULL_SYS_SOCKET_H 1 -+ - /* ===================================== */ - /* KEEP MSVC THE PENULTIMATE ENTRY */ - /* ===================================== */ --- -2.4.0 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.