Received: by mail.netbsd.org (Postfix, from userid 605) id ADC3184D41; Sat, 21 Mar 2020 14:16:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 361EA84D37 for ; Sat, 21 Mar 2020 14:16:05 +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 y3iP3WioMoT2 for ; Sat, 21 Mar 2020 14:16:04 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 6961284CDF for ; Sat, 21 Mar 2020 14:16:04 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5E0F9FB27; Sat, 21 Mar 2020 14:16:04 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158480016438180" MIME-Version: 1.0 Date: Sat, 21 Mar 2020 14:16:04 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/www/h2o To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200321141604.5E0F9FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_158480016438180 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sat Mar 21 14:16:04 UTC 2020 Modified Files: pkgsrc/www/h2o: Makefile PLIST distinfo Added Files: pkgsrc/www/h2o/patches: patch-CMakeLists.txt Log Message: h2o: Update to 2.2.6 and build shared libraries. From @Habbie on GitHub. Closes NetBSD/pkgsrc#56 Changes: 2.2.6 2019-08-13 17:00:00+0000 - [security fix][http2] fix HTTP/2 DoS attack vectors CVE-2019-9512 CVE-2019-9514 CVE-2019-9515 #2090 (Kazuho Oku) To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/h2o/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/h2o/PLIST cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/h2o/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/www/h2o/patches/patch-CMakeLists.txt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158480016438180 Content-Disposition: inline Content-Length: 4017 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/h2o/Makefile diff -u pkgsrc/www/h2o/Makefile:1.20 pkgsrc/www/h2o/Makefile:1.21 --- pkgsrc/www/h2o/Makefile:1.20 Sat Jan 18 21:51:07 2020 +++ pkgsrc/www/h2o/Makefile Sat Mar 21 14:16:04 2020 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.20 2020/01/18 21:51:07 jperkin Exp $ +# $NetBSD: Makefile,v 1.21 2020/03/21 14:16:04 nia Exp $ -DISTNAME= h2o-2.2.5 -PKGREVISION= 3 +DISTNAME= h2o-2.2.6 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_GITHUB:=h2o/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -20,6 +19,7 @@ PKGCONFIG_OVERRIDE+= libh2o.pc.in CMAKE_ARGS+= -DWITH_BUNDLED_SSL=off # TODO: make it an option CMAKE_ARGS+= -DWITH_MRUBY=off +CMAKE_ARGS+= -DBUILD_SHARED_LIBS=on SUBST_CLASSES+= interp SUBST_STAGE.interp= post-extract Index: pkgsrc/www/h2o/PLIST diff -u pkgsrc/www/h2o/PLIST:1.5 pkgsrc/www/h2o/PLIST:1.6 --- pkgsrc/www/h2o/PLIST:1.5 Thu Jan 26 21:11:53 2017 +++ pkgsrc/www/h2o/PLIST Sat Mar 21 14:16:04 2020 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2017/01/26 21:11:53 adam Exp $ +@comment $NetBSD: PLIST,v 1.6 2020/03/21 14:16:04 nia Exp $ bin/h2o include/h2o.h include/h2o/cache.h @@ -33,8 +33,12 @@ include/h2o/tunnel.h include/h2o/url.h include/h2o/version.h include/h2o/websocket.h -lib/libh2o-evloop.a -lib/libh2o.a +lib/libh2o-evloop.so +lib/libh2o-evloop.so.0.13 +lib/libh2o-evloop.so.0.13.6 +lib/libh2o.so +lib/libh2o.so.0.13 +lib/libh2o.so.0.13.6 lib/pkgconfig/libh2o-evloop.pc lib/pkgconfig/libh2o.pc share/doc/h2o/assets/8mbps100msec-nginx195-h2o150.png Index: pkgsrc/www/h2o/distinfo diff -u pkgsrc/www/h2o/distinfo:1.11 pkgsrc/www/h2o/distinfo:1.12 --- pkgsrc/www/h2o/distinfo:1.11 Sun Jun 24 09:17:03 2018 +++ pkgsrc/www/h2o/distinfo Sat Mar 21 14:16:04 2020 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.11 2018/06/24 09:17:03 adam Exp $ +$NetBSD: distinfo,v 1.12 2020/03/21 14:16:04 nia Exp $ -SHA1 (h2o-2.2.5.tar.gz) = 188cd4792d28cd7c88a572f6a92949c6aaef5693 -RMD160 (h2o-2.2.5.tar.gz) = 4036c8ec4042fd3d9191aa38cff0754072b9067f -SHA512 (h2o-2.2.5.tar.gz) = 24b07140d24fbb7796038aab44f44be5ffabc6f2841954273e2ad9f1a864e5482051dd7abfa6446297a46b6868763114695fa4f123ee3175bdac53b4c1868bc2 -Size (h2o-2.2.5.tar.gz) = 16257295 bytes +SHA1 (h2o-2.2.6.tar.gz) = 5cc09af1baf35938a86d7cfafe8a0b876ff2ee81 +RMD160 (h2o-2.2.6.tar.gz) = bf99a74257ccb4c9efbd7e11ce7aab2a7af01a95 +SHA512 (h2o-2.2.6.tar.gz) = f2f28905c01782a0432c9dfdb2f21054e0a4741ac4c5f26802d4b439d0172840aa215aba5dc7c9af62275dcc24de105674a3819384dc38246e43ce3e8263eb20 +Size (h2o-2.2.6.tar.gz) = 16257760 bytes +SHA1 (patch-CMakeLists.txt) = 32177a5bcf75a0bd4ec3e80e12ef1cb5d284072c Added files: Index: pkgsrc/www/h2o/patches/patch-CMakeLists.txt diff -u /dev/null pkgsrc/www/h2o/patches/patch-CMakeLists.txt:1.1 --- /dev/null Sat Mar 21 14:16:04 2020 +++ pkgsrc/www/h2o/patches/patch-CMakeLists.txt Sat Mar 21 14:16:04 2020 @@ -0,0 +1,30 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2020/03/21 14:16:04 nia Exp $ + +https://github.com/h2o/h2o/pull/2196 + +--- CMakeLists.txt.orig 2019-08-12 14:09:44.000000000 +0000 ++++ CMakeLists.txt +@@ -386,13 +386,21 @@ SET_TARGET_PROPERTIES(libh2o PROPERTIES + OUTPUT_NAME h2o + VERSION ${LIBRARY_VERSION} + SOVERSION ${LIBRARY_SOVERSION}) +-TARGET_LINK_LIBRARIES(libh2o ${LIBUV_LIBRARIES} ${EXTRA_LIBS}) ++IF (WSLAY_FOUND) ++ TARGET_LINK_LIBRARIES(libh2o ${WSLAY_LIBRARIES} ${LIBUV_LIBRARIES} ${EXTRA_LIBS}) ++ELSE () ++ TARGET_LINK_LIBRARIES(libh2o ${LIBUV_LIBRARIES} ${EXTRA_LIBS}) ++ENDIF (WSLAY_FOUND) + SET_TARGET_PROPERTIES(libh2o-evloop PROPERTIES + OUTPUT_NAME h2o-evloop + COMPILE_FLAGS "-DH2O_USE_LIBUV=0" + VERSION ${LIBRARY_VERSION} + SOVERSION ${LIBRARY_SOVERSION}) +-TARGET_LINK_LIBRARIES(libh2o-evloop ${EXTRA_LIBS}) ++IF (WSLAY_FOUND) ++ TARGET_LINK_LIBRARIES(libh2o-evloop ${WSLAY_LIBRARIES} ${EXTRA_LIBS}) ++ELSE () ++ TARGET_LINK_LIBRARIES(libh2o-evloop ${EXTRA_LIBS}) ++ENDIF (WSLAY_FOUND) + + IF (OPENSSL_FOUND) + TARGET_INCLUDE_DIRECTORIES(libh2o PUBLIC ${OPENSSL_INCLUDE_DIR}) --_----------=_158480016438180--