Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 766297A46B for ; Fri, 1 Jul 2016 20:32:37 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 2364B85E8D; Fri, 1 Jul 2016 20:32:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A9DD785E6F for ; Fri, 1 Jul 2016 20:32:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id AW2seQrD7IQa for ; Fri, 1 Jul 2016 20:32:35 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 914B585E62 for ; Fri, 1 Jul 2016 20:32:35 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8BA13FBB5; Fri, 1 Jul 2016 20:32:35 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1467405155183120" MIME-Version: 1.0 Date: Fri, 1 Jul 2016 20:32:35 +0000 From: "Alistair G. Crooks" Subject: CVS commit: pkgsrc/net To: pkgsrc-changes@NetBSD.org Reply-To: agc@netbsd.org X-Mailer: log_accum Message-Id: <20160701203235.8BA13FBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1467405155183120 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: agc Date: Fri Jul 1 20:32:35 UTC 2016 Modified Files: pkgsrc/net: Makefile Added Files: pkgsrc/net/libquic: DESCR Makefile PLIST distinfo pkgsrc/net/libquic/patches: patch-Makefile patch-crypto__bio__bio_test.cc patch-crypto__bio__internal.h patch-crypto__bio__socket_helper.c patch-crypto__lhash__lhash_test.c patch-crypto__mem.c patch-include__openssl__thread.h patch-src__base__base_paths_posix.cc patch-src__build__build_config.h Log Message: Add libquic-0.0.3 to the packages collection. QUIC is an experimental protocol aimed at reducing web latency over that of TCP. On the surface, QUIC is very similar to TCP+TLS+SPDY implemented on UDP. Because TCP is implement in operating system kernels, and middlebox firmware, making significant changes to TCP is next to impossible. However, since QUIC is built on top of UDP, it suffers from no such limitations. Key features of QUIC over existing TCP+TLS+SPDY include + Dramatically reduced connection establishment time + Improved congestion control + Multiplexing without head of line blocking + Forward error correction + Connection migration To generate a diff of this commit: cvs rdiff -u -r1.1122 -r1.1123 pkgsrc/net/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/net/libquic/DESCR pkgsrc/net/libquic/Makefile \ pkgsrc/net/libquic/PLIST pkgsrc/net/libquic/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/net/libquic/patches/patch-Makefile \ pkgsrc/net/libquic/patches/patch-crypto__bio__bio_test.cc \ pkgsrc/net/libquic/patches/patch-crypto__bio__internal.h \ pkgsrc/net/libquic/patches/patch-crypto__bio__socket_helper.c \ pkgsrc/net/libquic/patches/patch-crypto__lhash__lhash_test.c \ pkgsrc/net/libquic/patches/patch-crypto__mem.c \ pkgsrc/net/libquic/patches/patch-include__openssl__thread.h \ pkgsrc/net/libquic/patches/patch-src__base__base_paths_posix.cc \ pkgsrc/net/libquic/patches/patch-src__build__build_config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1467405155183120 Content-Disposition: inline Content-Length: 13542 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/Makefile diff -u pkgsrc/net/Makefile:1.1122 pkgsrc/net/Makefile:1.1123 --- pkgsrc/net/Makefile:1.1122 Thu Jun 30 17:48:27 2016 +++ pkgsrc/net/Makefile Fri Jul 1 20:32:35 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1122 2016/06/30 17:48:27 wiz Exp $ +# $NetBSD: Makefile,v 1.1123 2016/07/01 20:32:35 agc Exp $ # COMMENT= Networking tools @@ -288,6 +288,7 @@ SUBDIR+= libnice SUBDIR+= libnids SUBDIR+= libnipper SUBDIR+= libpcap +SUBDIR+= libquic SUBDIR+= libquvi SUBDIR+= libquvi-scripts SUBDIR+= libradius Added files: Index: pkgsrc/net/libquic/DESCR diff -u /dev/null pkgsrc/net/libquic/DESCR:1.1 --- /dev/null Fri Jul 1 20:32:35 2016 +++ pkgsrc/net/libquic/DESCR Fri Jul 1 20:32:35 2016 @@ -0,0 +1,14 @@ +QUIC is an experimental protocol aimed at reducing web latency over +that of TCP. On the surface, QUIC is very similar to TCP+TLS+SPDY +implemented on UDP. Because TCP is implement in operating system +kernels, and middlebox firmware, making significant changes to TCP is +next to impossible. However, since QUIC is built on top of UDP, it +suffers from no such limitations. + +Key features of QUIC over existing TCP+TLS+SPDY include + ++ Dramatically reduced connection establishment time ++ Improved congestion control ++ Multiplexing without head of line blocking ++ Forward error correction ++ Connection migration Index: pkgsrc/net/libquic/Makefile diff -u /dev/null pkgsrc/net/libquic/Makefile:1.1 --- /dev/null Fri Jul 1 20:32:35 2016 +++ pkgsrc/net/libquic/Makefile Fri Jul 1 20:32:35 2016 @@ -0,0 +1,42 @@ +# $NetBSD: Makefile,v 1.1 2016/07/01 20:32:35 agc Exp $ + +DISTNAME= libquic-0.0.3 +CATEGORIES= net +MASTER_SITES= ${MASTER_SITE_GITHUB:=devsisters/} +GITHUB_TAG= v0.0.3-6e3a05d + +MAINTAINER= agc@NetBSD.org +COMMENT= Multiplexed stream transport over UDP +LICENSE= modified-bsd + +SUBST_CLASSES+= path +SUBST_STAGE.link= post-patch +SUBST_MESSAGE.link= Fix paths +SUBST_FILES.link= src/base/base_paths_posix.cc +SUBST_SED.link= -e 's|@PREFIX@|'${PREFIX}'|' + +USE_LANGUAGES+= c c++ +USE_TOOLS+= cmake gmake perl + +AUTO_MKDIRS= yes + +pre-build: + mkdir -p ${WRKSRC}/build + +do-build: + cd ${WRKSRC}/build && ${SETENV} ${MAKE_ENV} cmake -DCMAKE_BUILD_TYPE=Release .. + cd ${WRKSRC}/build && ${SETENV} ${MAKE_ENV} gmake + +INSTLIBS+= build/boringssl/crypto/libcrypto.a +INSTLIBS+= build/boringssl/ssl/libssl.a +INSTLIBS+= build/boringssl/decrepit/libdecrepit.a +INSTLIBS+= build/protobuf/libprotobuf.a +INSTLIBS+= build/libquic.a + +do-install: + mkdir -p ${DESTDIR}${PREFIX}/quic/lib + for f in ${INSTLIBS}; do \ + ${INSTALL_LIB} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/quic/lib/; \ + done + +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/libquic/PLIST diff -u /dev/null pkgsrc/net/libquic/PLIST:1.1 --- /dev/null Fri Jul 1 20:32:35 2016 +++ pkgsrc/net/libquic/PLIST Fri Jul 1 20:32:35 2016 @@ -0,0 +1,6 @@ +@comment $NetBSD: PLIST,v 1.1 2016/07/01 20:32:35 agc Exp $ +quic/lib/libcrypto.a +quic/lib/libdecrepit.a +quic/lib/libprotobuf.a +quic/lib/libquic.a +quic/lib/libssl.a Index: pkgsrc/net/libquic/distinfo diff -u /dev/null pkgsrc/net/libquic/distinfo:1.1 --- /dev/null Fri Jul 1 20:32:35 2016 +++ pkgsrc/net/libquic/distinfo Fri Jul 1 20:32:35 2016 @@ -0,0 +1,15 @@ +$NetBSD: distinfo,v 1.1 2016/07/01 20:32:35 agc Exp $ + +SHA1 (libquic-0.0.3.tar.gz) = ff2e58b2b32a64f9280895c8f34a8c601562ade2 +RMD160 (libquic-0.0.3.tar.gz) = a5225e609fbdbc2e56942b3dcf063359fe5b2e10 +SHA512 (libquic-0.0.3.tar.gz) = a04f5285b2448cd763daa9833574e5977e903975dd20980c80020ee4177df6ff6294ee2c1821d97a8ac34e44aae215178f57b52a12826135f5ee4efc8e74643b +Size (libquic-0.0.3.tar.gz) = 5848330 bytes +SHA1 (patch-Makefile) = 5cdfd0daf53e61b5d14f6bc1e60c8f03a72da99d +SHA1 (patch-crypto__bio__bio_test.cc) = 36d61ff4b424ca29b320b3ac132dc1f0bf468f85 +SHA1 (patch-crypto__bio__internal.h) = 39e070e153db2c3a8ba814e1902f8abc96f9a082 +SHA1 (patch-crypto__bio__socket_helper.c) = 91d0321882a2c843f31f202cc66bee10c2e66530 +SHA1 (patch-crypto__lhash__lhash_test.c) = 4183d05f29062bb8e67fe23b1a8795509f049a02 +SHA1 (patch-crypto__mem.c) = c65a57491c2cf98b4c0b0b3309bd20cb70a22852 +SHA1 (patch-include__openssl__thread.h) = f4cc2433a30be7bd476dabdff7d8be186a95ce0d +SHA1 (patch-src__base__base_paths_posix.cc) = 8fbf7865f16fd89017a33b8c3ae9f5cdccb598a2 +SHA1 (patch-src__build__build_config.h) = b0cb41d7418836b9327c09fb843a2dc3278863a6 Index: pkgsrc/net/libquic/patches/patch-Makefile diff -u /dev/null pkgsrc/net/libquic/patches/patch-Makefile:1.1 --- /dev/null Fri Jul 1 20:32:35 2016 +++ pkgsrc/net/libquic/patches/patch-Makefile Fri Jul 1 20:32:35 2016 @@ -0,0 +1,48 @@ +$NetBSD: patch-Makefile,v 1.1 2016/07/01 20:32:35 agc Exp $ + +avoid some hardcoded paths + +--- Makefile 2016/07/01 17:48:16 1.1 ++++ Makefile 2016/07/01 17:49:30 +@@ -39,19 +39,19 @@ + SHELL = /bin/sh + + # The CMake executable. +-CMAKE_COMMAND = /usr/local/Cellar/cmake/3.4.1/bin/cmake ++CMAKE_COMMAND = cmake + + # The command to remove a file. +-RM = /usr/local/Cellar/cmake/3.4.1/bin/cmake -E remove -f ++RM = cmake -E remove -f + + # Escaping for special characters. + EQUALS = = + + # The top-level source directory on which CMake was run. +-CMAKE_SOURCE_DIR = /Users/hodduc/go/src/github.com/devsisters/goquic/libquic ++CMAKE_SOURCE_DIR:= $(shell pwd) + + # The top-level build directory on which CMake was run. +-CMAKE_BINARY_DIR = /Users/hodduc/go/src/github.com/devsisters/goquic/libquic ++CMAKE_BINARY_DIR:= $(shell pwd) + + #============================================================================= + # Targets provided globally by CMake. +@@ -59,7 +59,7 @@ + # Special rule for the target edit_cache + edit_cache: + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..." +- /usr/local/Cellar/cmake/3.4.1/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) ++ ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) + .PHONY : edit_cache + + # Special rule for the target edit_cache +@@ -70,7 +70,7 @@ + # Special rule for the target rebuild_cache + rebuild_cache: + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." +- /usr/local/Cellar/cmake/3.4.1/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) ++ cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) + .PHONY : rebuild_cache + + # Special rule for the target rebuild_cache Index: pkgsrc/net/libquic/patches/patch-crypto__bio__bio_test.cc diff -u /dev/null pkgsrc/net/libquic/patches/patch-crypto__bio__bio_test.cc:1.1 --- /dev/null Fri Jul 1 20:32:35 2016 +++ pkgsrc/net/libquic/patches/patch-crypto__bio__bio_test.cc Fri Jul 1 20:32:35 2016 @@ -0,0 +1,16 @@ +$NetBSD: patch-crypto__bio__bio_test.cc,v 1.1 2016/07/01 20:32:35 agc Exp $ + +NetBSD portability patches + +--- boringssl/crypto/bio/bio_test.cc.orig 2015-12-30 15:55:50.000000000 -0800 ++++ boringssl/crypto/bio/bio_test.cc 2015-12-30 18:06:05.000000000 -0800 +@@ -13,7 +13,9 @@ + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + + #if !defined(_POSIX_C_SOURCE) ++# if !defined(__NetBSD__) + #define _POSIX_C_SOURCE 201410L ++# endif + #endif + + #include Index: pkgsrc/net/libquic/patches/patch-crypto__bio__internal.h diff -u /dev/null pkgsrc/net/libquic/patches/patch-crypto__bio__internal.h:1.1 --- /dev/null Fri Jul 1 20:32:35 2016 +++ pkgsrc/net/libquic/patches/patch-crypto__bio__internal.h Fri Jul 1 20:32:35 2016 @@ -0,0 +1,15 @@ +$NetBSD: patch-crypto__bio__internal.h,v 1.1 2016/07/01 20:32:35 agc Exp $ + +NetBSD portability patches + +--- boringssl/crypto/bio/internal.h.orig 2015-12-30 15:55:50.000000000 -0800 ++++ boringssl/crypto/bio/internal.h 2015-12-30 18:06:05.000000000 -0800 +@@ -59,6 +59,8 @@ + + #include + ++#include ++ + #if !defined(OPENSSL_WINDOWS) + #if defined(OPENSSL_PNACL) + /* newlib uses u_short in socket.h without defining it. */ Index: pkgsrc/net/libquic/patches/patch-crypto__bio__socket_helper.c diff -u /dev/null pkgsrc/net/libquic/patches/patch-crypto__bio__socket_helper.c:1.1 --- /dev/null Fri Jul 1 20:32:35 2016 +++ pkgsrc/net/libquic/patches/patch-crypto__bio__socket_helper.c Fri Jul 1 20:32:35 2016 @@ -0,0 +1,17 @@ +$NetBSD: patch-crypto__bio__socket_helper.c,v 1.1 2016/07/01 20:32:35 agc Exp $ + +NetBSD portability patches + +--- boringssl/crypto/bio/socket_helper.c.orig 2015-12-30 15:55:50.000000000 -0800 ++++ boringssl/crypto/bio/socket_helper.c 2015-12-30 18:06:05.000000000 -0800 +@@ -12,8 +12,10 @@ + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + ++#if !defined(__NetBSD__) + #undef _POSIX_C_SOURCE + #define _POSIX_C_SOURCE 200112L ++#endif + + #include + #include Index: pkgsrc/net/libquic/patches/patch-crypto__lhash__lhash_test.c diff -u /dev/null pkgsrc/net/libquic/patches/patch-crypto__lhash__lhash_test.c:1.1 --- /dev/null Fri Jul 1 20:32:35 2016 +++ pkgsrc/net/libquic/patches/patch-crypto__lhash__lhash_test.c Fri Jul 1 20:32:35 2016 @@ -0,0 +1,16 @@ +$NetBSD: patch-crypto__lhash__lhash_test.c,v 1.1 2016/07/01 20:32:35 agc Exp $ + +NetBSD portability patches + +--- boringssl/crypto/lhash/lhash_test.c.orig 2015-12-30 15:55:51.000000000 -0800 ++++ boringssl/crypto/lhash/lhash_test.c 2015-12-30 18:06:05.000000000 -0800 +@@ -13,7 +13,9 @@ + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + + #if !defined(_POSIX_C_SOURCE) ++# if !defined(__NetBSD__) + #define _POSIX_C_SOURCE 201410L ++# endif + #endif + + #include Index: pkgsrc/net/libquic/patches/patch-crypto__mem.c diff -u /dev/null pkgsrc/net/libquic/patches/patch-crypto__mem.c:1.1 --- /dev/null Fri Jul 1 20:32:35 2016 +++ pkgsrc/net/libquic/patches/patch-crypto__mem.c Fri Jul 1 20:32:35 2016 @@ -0,0 +1,16 @@ +$NetBSD: patch-crypto__mem.c,v 1.1 2016/07/01 20:32:35 agc Exp $ + +NetBSD portability patches + +--- boringssl/crypto/mem.c.orig 2015-12-30 15:55:51.000000000 -0800 ++++ boringssl/crypto/mem.c 2015-12-30 18:06:05.000000000 -0800 +@@ -55,7 +55,9 @@ + * [including the GNU Public Licence.] */ + + #if !defined(_POSIX_C_SOURCE) ++# if !defined(__NetBSD__) + #define _POSIX_C_SOURCE 201410L /* needed for strdup, snprintf, vprintf etc */ ++# endif + #endif + + #include Index: pkgsrc/net/libquic/patches/patch-include__openssl__thread.h diff -u /dev/null pkgsrc/net/libquic/patches/patch-include__openssl__thread.h:1.1 --- /dev/null Fri Jul 1 20:32:35 2016 +++ pkgsrc/net/libquic/patches/patch-include__openssl__thread.h Fri Jul 1 20:32:35 2016 @@ -0,0 +1,16 @@ +$NetBSD: patch-include__openssl__thread.h,v 1.1 2016/07/01 20:32:35 agc Exp $ + +NetBSD portability patches + +--- boringssl/include/openssl/thread.h.orig 2015-12-30 15:55:52.000000000 -0800 ++++ boringssl/include/openssl/thread.h 2015-12-30 18:06:05.000000000 -0800 +@@ -87,6 +87,9 @@ + typedef union crypto_mutex_st { + double alignment; + uint8_t padding[3*sizeof(int) + 5*sizeof(unsigned) + 16 + 8]; ++#if defined(__NetBSD__) ++ uint8_t nbpad[64 + 8]; ++#endif + } CRYPTO_MUTEX; + #endif + Index: pkgsrc/net/libquic/patches/patch-src__base__base_paths_posix.cc diff -u /dev/null pkgsrc/net/libquic/patches/patch-src__base__base_paths_posix.cc:1.1 --- /dev/null Fri Jul 1 20:32:35 2016 +++ pkgsrc/net/libquic/patches/patch-src__base__base_paths_posix.cc Fri Jul 1 20:32:35 2016 @@ -0,0 +1,22 @@ +$NetBSD: patch-src__base__base_paths_posix.cc,v 1.1 2016/07/01 20:32:35 agc Exp $ + +Portability fixes + +--- src/base/base_paths_posix.cc 2015/12/30 22:26:32 1.1 ++++ src/base/base_paths_posix.cc 2015/12/30 22:28:31 +@@ -63,13 +63,13 @@ + } + *result = FilePath(bin_dir); + return true; +-#elif defined(OS_OPENBSD) ++#elif defined(OS_OPENBSD) || defined(OS_NETBSD) + // There is currently no way to get the executable path on OpenBSD + char* cpath; + if ((cpath = getenv("CHROME_EXE_PATH")) != NULL) + *result = FilePath(cpath); + else +- *result = FilePath("/usr/local/chrome/chrome"); ++ *result = FilePath(@PREFIX@ "/chrome/chrome"); + return true; + #endif + } Index: pkgsrc/net/libquic/patches/patch-src__build__build_config.h diff -u /dev/null pkgsrc/net/libquic/patches/patch-src__build__build_config.h:1.1 --- /dev/null Fri Jul 1 20:32:35 2016 +++ pkgsrc/net/libquic/patches/patch-src__build__build_config.h Fri Jul 1 20:32:35 2016 @@ -0,0 +1,31 @@ +$NetBSD: patch-src__build__build_config.h,v 1.1 2016/07/01 20:32:35 agc Exp $ + +NetBSD definitions + +--- src/build/build_config.h 2015/12/30 22:23:16 1.1 ++++ src/build/build_config.h 2015/12/30 22:24:35 +@@ -51,6 +51,8 @@ + #define TOOLKIT_VIEWS 1 + #elif defined(__FreeBSD__) + #define OS_FREEBSD 1 ++#elif defined(__NetBSD__) ++#define OS_NETBSD 1 + #elif defined(__OpenBSD__) + #define OS_OPENBSD 1 + #elif defined(__sun) +@@ -67,13 +69,14 @@ + + // For access to standard BSD features, use OS_BSD instead of a + // more specific macro. +-#if defined(OS_FREEBSD) || defined(OS_OPENBSD) ++#if defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_NETBSD) + #define OS_BSD 1 + #endif + + // For access to standard POSIXish features, use OS_POSIX instead of a + // more specific macro. + #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \ ++ defined(OS_NETBSD) || \ + defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_ANDROID) || \ + defined(OS_NACL) || defined(OS_QNX) + #define OS_POSIX 1 --_----------=_1467405155183120--