curl: update to 7.61.1

curl/build.sh

@@ -6,24 +6,19 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=curl
-version=7.59.0
+version=7.61.1
 pkgver=1
 source[0]=http://curl.haxx.se/download/$topdir-$version.tar.bz2
 # https://curl.haxx.se/docs/caextract.html
-certdate=2018-03-07
+certdate=2018-10-17
 source[1]=https://curl.haxx.se/ca/cacert-$certdate.pem
 # If there are no patches, simply comment this
 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
 
 # Source function library
 . ${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"
 
@@ -33,6 +28,13 @@ reg prep
 prep()
 {
     generic_prep
+    # In one instance we rely on implicit function declaration (utimes() in sys/time.h)
+    setdir source
+    ${__gsed} -i 's/Werror-implicit-function-declaration/Wimplicit-function-declaration/' configure
+    # There are weak pthread_* symbols in libc but curl actually needs the real
+    # thing so we reverse the test that would normally make configure skip
+    # looking for the pthread symbols in libpthread.
+    ${__gsed} -i '/USE_THREADS_POSIX/ s/\!= "1"/\= "1"/' configure
 }
 
 reg build
@@ -78,6 +80,7 @@ install()
     compat curl 7.51.0 1 1
     compat curl 7.52.1 1 1
     compat curl 7.55.1 1 1
+    compat curl 7.59.0 1 1
 }
 
 reg pack

curl/meta/ChangeLog

@@ -1,5 +1,9 @@
 CHANGELOG
 ---------
+* Mon Oct 29 2018 Tom G. Christensen <swpkg@jupiterrise.com> - 7.61.1-1
+- Update to 7.61.1
+- Update CA bundle to 2018-10-17
+
 * 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

curl/src/curl-7.55.1-stropts_h.patch

@@ -1,10 +0,0 @@
---- 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>