From fdc58b3faf5cb9a416e312faf588d0a08fef7ee0 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Sat, 19 Aug 2017 22:20:20 +0200
Subject: [PATCH] curl: update to 7.55.1

---
 curl/build.sh                        | 11 ++++++++---
 curl/meta/ChangeLog                  |  4 ++++
 curl/meta/pkgdef                     |  2 --
 curl/src/curl-7.55.1-socklen_t.patch | 11 +++++++++++
 curl/src/curl-7.55.1-stropts_h.patch | 10 ++++++++++
 5 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 curl/src/curl-7.55.1-socklen_t.patch
 create mode 100644 curl/src/curl-7.55.1-stropts_h.patch

diff --git a/curl/build.sh b/curl/build.sh
index b0e9652..acd92eb 100755
--- a/curl/build.sh
+++ b/curl/build.sh
@@ -6,19 +6,23 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=curl
-version=7.52.1
+version=7.55.1
 pkgver=1
 source[0]=http://curl.haxx.se/download/$topdir-$version.tar.bz2
 # https://curl.haxx.se/docs/caextract.html
-certdate=2016-11-02
+certdate=2017-06-07
 source[1]=https://curl.haxx.se/ca/cacert-$certdate.pem
 # If there are no patches, simply comment this
-#patch[0]=
+patch[0]=curl-7.55.1-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
 
 # Source function library
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
 
 # Global settings
+export CC="gcc -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
 export CPPFLAGS="-I$prefix/include"
 export LDFLAGS="-L$prefix/lib -R$prefix/lib"
 
@@ -71,6 +75,7 @@ install()
     compat curl 7.50.0 1 1
     compat curl 7.50.3 1 1
     compat curl 7.51.0 1 1
+    compat curl 7.52.1 1 1
 }
 
 reg pack
diff --git a/curl/meta/ChangeLog b/curl/meta/ChangeLog
index 4f497a8..045072a 100644
--- a/curl/meta/ChangeLog
+++ b/curl/meta/ChangeLog
@@ -1,5 +1,9 @@
 CHANGELOG
 ---------
+* 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
+
 * Thu Dec 29 2016 Tom G. Christensen <swpkg@jupiterrise.com> - 7.52.1-1
 - Update to 7.52.1
 
diff --git a/curl/meta/pkgdef b/curl/meta/pkgdef
index 0e4f860..fef69f7 100644
--- a/curl/meta/pkgdef
+++ b/curl/meta/pkgdef
@@ -11,10 +11,8 @@ $_vdocdir/README
 $_vdocdir/RELEASE-NOTES
 $_vdocdir/COPYING
 $_vdocdir/docs/BUGS
-$_vdocdir/docs/CONTRIBUTE
 $_vdocdir/docs/FAQ
 $_vdocdir/docs/FEATURES
-$_vdocdir/docs/INTERNALS
 $_vdocdir/docs/MANUAL
 $_vdocdir/docs/RESOURCES
 $_vdocdir/docs/TODO
diff --git a/curl/src/curl-7.55.1-socklen_t.patch b/curl/src/curl-7.55.1-socklen_t.patch
new file mode 100644
index 0000000..cf014f4
--- /dev/null
+++ b/curl/src/curl-7.55.1-socklen_t.patch
@@ -0,0 +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 @@
+ #    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
diff --git a/curl/src/curl-7.55.1-stropts_h.patch b/curl/src/curl-7.55.1-stropts_h.patch
new file mode 100644
index 0000000..083efa0
--- /dev/null
+++ b/curl/src/curl-7.55.1-stropts_h.patch
@@ -0,0 +1,10 @@
+--- curl-7.55.1/tests/server/tftpd.c.stropts	2017-08-08 00:42:29.000000000 +0200
++++ curl-7.55.1/tests/server/tftpd.c	2017-08-19 00:08:11.691109000 +0200
+@@ -51,6 +51,7 @@
+ 
+ #ifdef HAVE_SYS_IOCTL_H
+ #include <sys/ioctl.h>
++#include <stropts.h>
+ #endif
+ #ifdef HAVE_SIGNAL_H
+ #include <signal.h>