From 43bc222182e578e79b7563a1f6f7a97e82515229 Mon Sep 17 00:00:00 2001
From: Sam Bingner <sam@bingner.com>
Date: Wed, 15 Aug 2018 14:59:57 -1000
Subject: Update curl to 7.61.0 and enable http2 support.  Add libnghttp2 and
 libevent for http2 support.

---
 data/curl/_metadata/libnghttp2.dep         |   1 +
 data/curl/_metadata/libssh2.dep            |   1 +
 data/curl/_metadata/version                |   2 +-
 data/curl/curl-7.33.0.tar.bz2              | Bin 2747507 -> 0 bytes
 data/curl/curl-7.61.0.tar.xz               | Bin 0 -> 2348892 bytes
 data/curl/flags.diff                       |  47 +++++++++++++++++++++++++++++
 data/curl/make.sh                          |   2 +-
 data/libevent/_metadata/description        |   1 +
 data/libevent/_metadata/homepage           |   1 +
 data/libevent/_metadata/license            |   1 +
 data/libevent/_metadata/maintainer         |   1 +
 data/libevent/_metadata/openssl.dep        |   1 +
 data/libevent/_metadata/priority           |   1 +
 data/libevent/_metadata/role               |   1 +
 data/libevent/_metadata/section            |   1 +
 data/libevent/_metadata/tags               |   1 +
 data/libevent/_metadata/version            |   1 +
 data/libevent/libevent-2.1.8-stable.tar.gz | Bin 0 -> 1026485 bytes
 data/libevent/make.sh                      |   4 +++
 data/libnghttp2/_metadata/description      |   1 +
 data/libnghttp2/_metadata/homepage         |   1 +
 data/libnghttp2/_metadata/libevent.dep     |   1 +
 data/libnghttp2/_metadata/license          |  23 ++++++++++++++
 data/libnghttp2/_metadata/maintainer       |   1 +
 data/libnghttp2/_metadata/openssl.dep      |   1 +
 data/libnghttp2/_metadata/priority         |   1 +
 data/libnghttp2/_metadata/role             |   1 +
 data/libnghttp2/_metadata/section          |   1 +
 data/libnghttp2/_metadata/tags             |   1 +
 data/libnghttp2/_metadata/version          |   1 +
 data/libnghttp2/make.sh                    |   4 +++
 data/libnghttp2/nghttp2-1.32.0.tar.xz      | Bin 0 -> 1548528 bytes
 32 files changed, 102 insertions(+), 2 deletions(-)
 create mode 120000 data/curl/_metadata/libnghttp2.dep
 create mode 120000 data/curl/_metadata/libssh2.dep
 delete mode 100644 data/curl/curl-7.33.0.tar.bz2
 create mode 100644 data/curl/curl-7.61.0.tar.xz
 create mode 100644 data/curl/flags.diff
 create mode 100644 data/libevent/_metadata/description
 create mode 100644 data/libevent/_metadata/homepage
 create mode 120000 data/libevent/_metadata/license
 create mode 120000 data/libevent/_metadata/maintainer
 create mode 120000 data/libevent/_metadata/openssl.dep
 create mode 100644 data/libevent/_metadata/priority
 create mode 100644 data/libevent/_metadata/role
 create mode 100644 data/libevent/_metadata/section
 create mode 100644 data/libevent/_metadata/tags
 create mode 100644 data/libevent/_metadata/version
 create mode 100644 data/libevent/libevent-2.1.8-stable.tar.gz
 create mode 100644 data/libevent/make.sh
 create mode 100644 data/libnghttp2/_metadata/description
 create mode 100644 data/libnghttp2/_metadata/homepage
 create mode 120000 data/libnghttp2/_metadata/libevent.dep
 create mode 100644 data/libnghttp2/_metadata/license
 create mode 120000 data/libnghttp2/_metadata/maintainer
 create mode 120000 data/libnghttp2/_metadata/openssl.dep
 create mode 100644 data/libnghttp2/_metadata/priority
 create mode 100644 data/libnghttp2/_metadata/role
 create mode 100644 data/libnghttp2/_metadata/section
 create mode 100644 data/libnghttp2/_metadata/tags
 create mode 100644 data/libnghttp2/_metadata/version
 create mode 100644 data/libnghttp2/make.sh
 create mode 100644 data/libnghttp2/nghttp2-1.32.0.tar.xz

(limited to 'data')

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
Binary files a/data/curl/curl-7.33.0.tar.bz2 and /dev/null differ
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
Binary files /dev/null and b/data/curl/curl-7.61.0.tar.xz differ
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
diff --git a/data/libevent/_metadata/description b/data/libevent/_metadata/description
new file mode 100644
index 000000000..6e3d49940
--- /dev/null
+++ b/data/libevent/_metadata/description
@@ -0,0 +1 @@
+provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been reached
diff --git a/data/libevent/_metadata/homepage b/data/libevent/_metadata/homepage
new file mode 100644
index 000000000..c2b656b28
--- /dev/null
+++ b/data/libevent/_metadata/homepage
@@ -0,0 +1 @@
+http://libevent.org/
diff --git a/data/libevent/_metadata/license b/data/libevent/_metadata/license
new file mode 120000
index 000000000..8a4bc1936
--- /dev/null
+++ b/data/libevent/_metadata/license
@@ -0,0 +1 @@
+../../../licenses/modified-bsd
\ No newline at end of file
diff --git a/data/libevent/_metadata/maintainer b/data/libevent/_metadata/maintainer
new file mode 120000
index 000000000..573d7ebef
--- /dev/null
+++ b/data/libevent/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/sbingner
\ No newline at end of file
diff --git a/data/libevent/_metadata/openssl.dep b/data/libevent/_metadata/openssl.dep
new file mode 120000
index 000000000..9b58fd56b
--- /dev/null
+++ b/data/libevent/_metadata/openssl.dep
@@ -0,0 +1 @@
+../../openssl
\ No newline at end of file
diff --git a/data/libevent/_metadata/priority b/data/libevent/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/libevent/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/libevent/_metadata/role b/data/libevent/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/libevent/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/libevent/_metadata/section b/data/libevent/_metadata/section
new file mode 100644
index 000000000..e0eb96881
--- /dev/null
+++ b/data/libevent/_metadata/section
@@ -0,0 +1 @@
+Development
diff --git a/data/libevent/_metadata/tags b/data/libevent/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/libevent/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/libevent/_metadata/version b/data/libevent/_metadata/version
new file mode 100644
index 000000000..ebf14b469
--- /dev/null
+++ b/data/libevent/_metadata/version
@@ -0,0 +1 @@
+2.1.8
diff --git a/data/libevent/libevent-2.1.8-stable.tar.gz b/data/libevent/libevent-2.1.8-stable.tar.gz
new file mode 100644
index 000000000..2004f8415
Binary files /dev/null and b/data/libevent/libevent-2.1.8-stable.tar.gz differ
diff --git a/data/libevent/make.sh b/data/libevent/make.sh
new file mode 100644
index 000000000..8780dfc63
--- /dev/null
+++ b/data/libevent/make.sh
@@ -0,0 +1,4 @@
+pkg:setup
+pkg:configure
+pkg:make -j8
+pkg:install
diff --git a/data/libnghttp2/_metadata/description b/data/libnghttp2/_metadata/description
new file mode 100644
index 000000000..18ad98d17
--- /dev/null
+++ b/data/libnghttp2/_metadata/description
@@ -0,0 +1 @@
+an implementation of HTTP/2 and its header compression algorithm HPACK in C.
diff --git a/data/libnghttp2/_metadata/homepage b/data/libnghttp2/_metadata/homepage
new file mode 100644
index 000000000..f8840b4b2
--- /dev/null
+++ b/data/libnghttp2/_metadata/homepage
@@ -0,0 +1 @@
+https://nghttp2.org/
diff --git a/data/libnghttp2/_metadata/libevent.dep b/data/libnghttp2/_metadata/libevent.dep
new file mode 120000
index 000000000..c79b2082c
--- /dev/null
+++ b/data/libnghttp2/_metadata/libevent.dep
@@ -0,0 +1 @@
+../../libevent
\ No newline at end of file
diff --git a/data/libnghttp2/_metadata/license b/data/libnghttp2/_metadata/license
new file mode 100644
index 000000000..80201792e
--- /dev/null
+++ b/data/libnghttp2/_metadata/license
@@ -0,0 +1,23 @@
+The MIT License
+
+Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa
+Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/data/libnghttp2/_metadata/maintainer b/data/libnghttp2/_metadata/maintainer
new file mode 120000
index 000000000..febca4610
--- /dev/null
+++ b/data/libnghttp2/_metadata/maintainer
@@ -0,0 +1 @@
+../../_libxml2/_metadata/maintainer
\ No newline at end of file
diff --git a/data/libnghttp2/_metadata/openssl.dep b/data/libnghttp2/_metadata/openssl.dep
new file mode 120000
index 000000000..9b58fd56b
--- /dev/null
+++ b/data/libnghttp2/_metadata/openssl.dep
@@ -0,0 +1 @@
+../../openssl
\ No newline at end of file
diff --git a/data/libnghttp2/_metadata/priority b/data/libnghttp2/_metadata/priority
new file mode 100644
index 000000000..a6a7b9cd7
--- /dev/null
+++ b/data/libnghttp2/_metadata/priority
@@ -0,0 +1 @@
+standard
diff --git a/data/libnghttp2/_metadata/role b/data/libnghttp2/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/libnghttp2/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/libnghttp2/_metadata/section b/data/libnghttp2/_metadata/section
new file mode 100644
index 000000000..e0eb96881
--- /dev/null
+++ b/data/libnghttp2/_metadata/section
@@ -0,0 +1 @@
+Development
diff --git a/data/libnghttp2/_metadata/tags b/data/libnghttp2/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/libnghttp2/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/libnghttp2/_metadata/version b/data/libnghttp2/_metadata/version
new file mode 100644
index 000000000..359c41089
--- /dev/null
+++ b/data/libnghttp2/_metadata/version
@@ -0,0 +1 @@
+1.32.0
diff --git a/data/libnghttp2/make.sh b/data/libnghttp2/make.sh
new file mode 100644
index 000000000..8780dfc63
--- /dev/null
+++ b/data/libnghttp2/make.sh
@@ -0,0 +1,4 @@
+pkg:setup
+pkg:configure
+pkg:make -j8
+pkg:install
diff --git a/data/libnghttp2/nghttp2-1.32.0.tar.xz b/data/libnghttp2/nghttp2-1.32.0.tar.xz
new file mode 100644
index 000000000..255ce79e2
Binary files /dev/null and b/data/libnghttp2/nghttp2-1.32.0.tar.xz differ
-- 
cgit v1.2.3