Update curl to 7.61.0 and enable http2 support. Add libnghttp2 and libevent for http2 support.

7 files changed, 51 insertions, 2 deletions

diff --git a/data/curl/_metadata/libnghttp2.dep b/data/curl/_metadata/libnghttp2.dep
new file mode 120000
index 000000000..a300ffaee
--- /dev/null
+++ b/data/curl/_metadata/libnghttp2.dep
@@ -0,0 +1 @@
+../../libnghttp2
\ No newline at end of file
diff --git a/data/curl/_metadata/libssh2.dep b/data/curl/_metadata/libssh2.dep
new file mode 120000
index 000000000..e5424dba9
--- /dev/null
+++ b/data/curl/_metadata/libssh2.dep
@@ -0,0 +1 @@
+../../libssh2
\ No newline at end of file
diff --git a/data/curl/_metadata/version b/data/curl/_metadata/version
index fc7552203..4a41042a4 100644
--- a/data/curl/_metadata/version
+++ b/data/curl/_metadata/version
@@ -1 +1 @@
-7.33.0
+7.61.0
diff --git a/data/curl/curl-7.33.0.tar.bz2 b/data/curl/curl-7.33.0.tar.bz2
deleted file mode 100644
index 483cdeccd..000000000
--- a/data/curl/curl-7.33.0.tar.bz2
+++ /dev/null
diff --git a/data/curl/curl-7.61.0.tar.xz b/data/curl/curl-7.61.0.tar.xz
new file mode 100644
index 000000000..f0ab97141
--- /dev/null
+++ b/data/curl/curl-7.61.0.tar.xz
diff --git a/data/curl/flags.diff b/data/curl/flags.diff
new file mode 100644
index 000000000..9276f7e90
--- /dev/null
+++ b/data/curl/flags.diff
@@ -0,0 +1,47 @@
+diff -ur curl-7.61.0/acinclude.m4 curl-7.61.0+iPhone/acinclude.m4
+--- curl-7.61.0/acinclude.m4	2018-07-08 20:42:12.000000000 -1000
++++ curl-7.61.0+iPhone/acinclude.m4	2018-07-30 23:44:08.000000000 -1000
+@@ -2615,18 +2615,6 @@
+   AC_MSG_RESULT([$tst_cflags]);
+ 
+   if test "$tst_cflags" = "yes"; then
+-    AC_MSG_CHECKING([for *version-min in CFLAGS])
+-    min=""
+-    if test -z "$(echo $CFLAGS | grep m.*os.*-version-min)"; then
+-      min="-mmacosx-version-min=10.8"
+-      CFLAGS="$CFLAGS $min"
+-    fi
+-    if test -z "$min"; then
+-      AC_MSG_RESULT([set by user])
+-    else
+-      AC_MSG_RESULT([$min set])
+-    fi
+-
+     old_CFLAGS=$CFLAGS
+     CFLAGS="$CFLAGS -Werror=partial-availability"
+     AC_MSG_CHECKING([whether $CC accepts -Werror=partial-availability])
+diff -ur curl-7.61.0/configure curl-7.61.0+iPhone/configure
+--- curl-7.61.0/configure	2018-07-08 20:52:18.000000000 -1000
++++ curl-7.61.0+iPhone/configure	2018-07-30 23:44:40.000000000 -1000
+@@ -19046,21 +19046,6 @@
+ $as_echo "$tst_cflags" >&6; };
+ 
+   if test "$tst_cflags" = "yes"; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for *version-min in CFLAGS" >&5
+-$as_echo_n "checking for *version-min in CFLAGS... " >&6; }
+-    min=""
+-    if test -z "$(echo $CFLAGS | grep m.*os.*-version-min)"; then
+-      min="-mmacosx-version-min=10.8"
+-      CFLAGS="$CFLAGS $min"
+-    fi
+-    if test -z "$min"; then
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: set by user" >&5
+-$as_echo "set by user" >&6; }
+-    else
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $min set" >&5
+-$as_echo "$min set" >&6; }
+-    fi
+-
+     old_CFLAGS=$CFLAGS
+     CFLAGS="$CFLAGS -Werror=partial-availability"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Werror=partial-availability" >&5
diff --git a/data/curl/make.sh b/data/curl/make.sh
index 7aad85705..c5467843f 100644
--- a/data/curl/make.sh
+++ b/data/curl/make.sh
@@ -1,4 +1,4 @@
 pkg:setup
 pkg:configure ac_cv_file___dev_urandom_=yes
-pkg:make
+pkg:make -j8
 pkg:install