[pkgsrc/trunk]: pkgsrc/www/curl Add optional support for HTTP/2 via www/nghtt...

[fhajny <fhajny%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b09ca440da74
branches:  trunk
changeset: 652482:b09ca440da74
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Wed Jun 03 12:00:06 2015 +0000

description:
Add optional support for HTTP/2 via www/nghttp2. Patch nghttp2 support
until the curl interface is updated in 7.43. Bump PKGREVISION.

diffstat:

 www/curl/Makefile                  |   3 ++-
 www/curl/distinfo                  |   3 ++-
 www/curl/options.mk                |  11 +++++++++--
 www/curl/patches/patch-lib_http2.c |  18 ++++++++++++++++++
 4 files changed, 31 insertions(+), 4 deletions(-)

diffs (72 lines):

diff -r 9859fac56c10 -r b09ca440da74 www/curl/Makefile
--- a/www/curl/Makefile Wed Jun 03 11:56:28 2015 +0000
+++ b/www/curl/Makefile Wed Jun 03 12:00:06 2015 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.148 2015/05/03 10:11:55 wiz Exp $
+# $NetBSD: Makefile,v 1.149 2015/06/03 12:00:06 fhajny Exp $
 
 DISTNAME=      curl-7.42.1
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  http://curl.haxx.se/download/ \
                ftp://ftp.sunet.se/pub/www/utilities/curl/
diff -r 9859fac56c10 -r b09ca440da74 www/curl/distinfo
--- a/www/curl/distinfo Wed Jun 03 11:56:28 2015 +0000
+++ b/www/curl/distinfo Wed Jun 03 12:00:06 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.104 2015/05/03 10:11:55 wiz Exp $
+$NetBSD: distinfo,v 1.105 2015/06/03 12:00:06 fhajny Exp $
 
 SHA1 (curl-7.42.1.tar.bz2) = f65708915875b8cb35edb51d8dd31440dc02fbd3
 RMD160 (curl-7.42.1.tar.bz2) = 76d5b23fae60356342e2bac2e4c706ed544d4adf
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = 59ec0be3ac90470fdc5935881da6a14dbab9d378
 SHA1 (patch-curl-config.in) = fd87c97b601a6b9269f67fbc066604ee7e22570e
 SHA1 (patch-lib_hostcheck.c) = 9faf94f44703c7d37377fd3af319ca5c27df34c2
+SHA1 (patch-lib_http2.c) = 4ba0164ffdba714c620daccbf80eedd51562acf4
diff -r 9859fac56c10 -r b09ca440da74 www/curl/options.mk
--- a/www/curl/options.mk       Wed Jun 03 11:56:28 2015 +0000
+++ b/www/curl/options.mk       Wed Jun 03 12:00:06 2015 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.12 2015/01/08 19:23:53 wiz Exp $
+# $NetBSD: options.mk,v 1.13 2015/06/03 12:00:06 fhajny Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.curl
-PKG_SUPPORTED_OPTIONS= inet6 libssh2 gssapi ldap rtmp libidn
+PKG_SUPPORTED_OPTIONS= inet6 libssh2 gssapi ldap rtmp libidn http2
 PKG_SUGGESTED_OPTIONS= inet6 libidn
 
 .include "../../mk/bsd.prefs.mk"
@@ -54,3 +54,10 @@
 .else
 CONFIGURE_ARGS+=       --without-libidn
 .endif
+
+.if !empty(PKG_OPTIONS:Mhttp2)
+CONFIGURE_ARGS+=       --with-nghttp2=${BUILDLINK_PREFIX.nghttp2}
+.include "../../www/nghttp2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-nghttp2
+.endif
diff -r 9859fac56c10 -r b09ca440da74 www/curl/patches/patch-lib_http2.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/curl/patches/patch-lib_http2.c        Wed Jun 03 12:00:06 2015 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-lib_http2.c,v 1.1 2015/06/03 12:00:06 fhajny Exp $
+
+Update compatibility for nghttp2 1.0. This patch should become obsolete
+with curl-7.43.
+
+--- lib/http2.c.orig   2015-04-29 06:06:52.000000000 +0000
++++ lib/http2.c
+@@ -1019,8 +1019,8 @@ CURLcode Curl_http2_switched(struct conn
+ 
+   rv = (int) ((Curl_send*)httpc->send_underlying)
+     (conn, FIRSTSOCKET,
+-     NGHTTP2_CLIENT_CONNECTION_PREFACE,
+-     NGHTTP2_CLIENT_CONNECTION_PREFACE_LEN,
++     NGHTTP2_CLIENT_MAGIC,
++     NGHTTP2_CLIENT_MAGIC_LEN,
+      &result);
+   if(result)
+     /* TODO: This may get CURLE_AGAIN */