From e1a1e1e32120b9f1159f7731b206386ad1b0a5ad Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Sun, 8 Apr 2018 20:06:04 +0200
Subject: [PATCH] curl: update to 7.59.0

---
 curl/build.sh                                             | 8 +++++---
 curl/meta/ChangeLog                                       | 4 ++++
 ...7.55.1-socklen_t.patch => curl-7.59.0-socklen_t.patch} | 8 ++++----
 3 files changed, 13 insertions(+), 7 deletions(-)
 rename curl/src/{curl-7.55.1-socklen_t.patch => curl-7.59.0-socklen_t.patch} (56%)

diff --git a/curl/build.sh b/curl/build.sh
index acd92eb..c9e634f 100755
--- a/curl/build.sh
+++ b/curl/build.sh
@@ -6,14 +6,14 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=curl
-version=7.55.1
+version=7.59.0
 pkgver=1
 source[0]=http://curl.haxx.se/download/$topdir-$version.tar.bz2
 # https://curl.haxx.se/docs/caextract.html
-certdate=2017-06-07
+certdate=2018-03-07
 source[1]=https://curl.haxx.se/ca/cacert-$certdate.pem
 # If there are no patches, simply comment this
-patch[0]=curl-7.55.1-socklen_t.patch
+patch[0]=curl-7.59.0-socklen_t.patch
 # We need this since ioctl() is now defined in stropts.h due to enabling
 # XPG4_2 via _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED=1
 patch[1]=curl-7.55.1-stropts_h.patch
@@ -22,6 +22,7 @@ patch[1]=curl-7.55.1-stropts_h.patch
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
 
 # Global settings
+# To expose utimes() in XPG4_2 features
 export CC="gcc -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
 export CPPFLAGS="-I$prefix/include"
 export LDFLAGS="-L$prefix/lib -R$prefix/lib"
@@ -76,6 +77,7 @@ install()
     compat curl 7.50.3 1 1
     compat curl 7.51.0 1 1
     compat curl 7.52.1 1 1
+    compat curl 7.55.1 1 1
 }
 
 reg pack
diff --git a/curl/meta/ChangeLog b/curl/meta/ChangeLog
index 045072a..cf9dce9 100644
--- a/curl/meta/ChangeLog
+++ b/curl/meta/ChangeLog
@@ -1,5 +1,9 @@
 CHANGELOG
 ---------
+* Sun Apr 08 2018 Tom G. Christensen <swpkg@jupiterrise.com> - 7.59.0-1
+- Update to 7.59.0
+- Update CA bundle to 2018-03-07
+
 * Fri Aug 18 2017 Tom G. Christensen <swpkg@jupiterrise.com> - 7.55.1-1
 - Update to 7.55.1
 - Update CA bundle to 2017-06-07
diff --git a/curl/src/curl-7.55.1-socklen_t.patch b/curl/src/curl-7.59.0-socklen_t.patch
similarity index 56%
rename from curl/src/curl-7.55.1-socklen_t.patch
rename to curl/src/curl-7.59.0-socklen_t.patch
index cf014f4..38b8643 100644
--- a/curl/src/curl-7.55.1-socklen_t.patch
+++ b/curl/src/curl-7.59.0-socklen_t.patch
@@ -1,11 +1,11 @@
---- curl-7.55.1/include/curl/system.h.socklen_t	2017-08-18 22:07:38.315224000 +0200
-+++ curl-7.55.1/include/curl/system.h	2017-08-18 22:54:17.204258000 +0200
-@@ -447,7 +447,7 @@
+--- curl-7.59.0/include/curl/system.h.socklen_t	2018-01-30 23:02:52.000000000 +0100
++++ curl-7.59.0/include/curl/system.h	2018-04-08 17:44:33.797554000 +0200
+@@ -365,7 +365,7 @@
  #    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_TYPEOF_CURL_SOCKLEN_T int
- #  define CURL_SIZEOF_CURL_SOCKLEN_T 4
  #  define CURL_PULL_SYS_TYPES_H      1
  #  define CURL_PULL_SYS_SOCKET_H     1
+