From owner-svn-ports-all@freebsd.org Thu Aug 20 20:30:36 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 729F83C7C95; Thu, 20 Aug 2020 20:30:36 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BXbrD2K5Xz3yBs; Thu, 20 Aug 2020 20:30:36 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 19C301A242; Thu, 20 Aug 2020 20:30:36 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07KKUZTT028639; Thu, 20 Aug 2020 20:30:35 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07KKUZlc028637; Thu, 20 Aug 2020 20:30:35 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202008202030.07KKUZlc028637@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Thu, 20 Aug 2020 20:30:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r545559 - head/net/libwebsockets X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: head/net/libwebsockets X-SVN-Commit-Revision: 545559 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Aug 2020 20:30:36 -0000 Author: lwhsu Date: Thu Aug 20 20:30:35 2020 New Revision: 545559 URL: https://svnweb.freebsd.org/changeset/ports/545559 Log: net/libwebsockets: Update to 3.2.2 PR: 246878 Submitted by: smh Approved by: Iblis Lin Modified: head/net/libwebsockets/Makefile head/net/libwebsockets/distinfo head/net/libwebsockets/pkg-plist Modified: head/net/libwebsockets/Makefile ============================================================================== --- head/net/libwebsockets/Makefile Thu Aug 20 19:34:50 2020 (r545558) +++ head/net/libwebsockets/Makefile Thu Aug 20 20:30:35 2020 (r545559) @@ -3,8 +3,7 @@ PORTNAME= libwebsockets DISTVERSIONPREFIX= v -DISTVERSION= 2.4.2 -PORTREVISION= 1 +DISTVERSION= 3.2.2 CATEGORIES= net devel MAINTAINER= iblis@hs.ntnu.edu.tw @@ -25,17 +24,18 @@ CMAKE_ARGS= -DLWS_WITHOUT_TESTAPPS=ON \ -DLWS_WITHOUT_TEST_SERVER=ON \ -DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \ -DLWS_WITHOUT_TEST_PING=ON \ - -DLWS_WITHOUT_TEST_ECHO=ON \ - -DLWS_WITHOUT_TEST_CLIENT=ON \ - -DLWS_WITHOUT_TEST_FRAGGLE=ON + -DLWS_WITHOUT_TEST_CLIENT=ON -OPTIONS_DEFINE= HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS +OPTIONS_DEFINE= HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS \ + SOCKS5 OPTIONS_DEFAULT=HTTP2 LIBUV OPTIONS_SUB= yes +HTTP2_DESC= Compile with server support for HTTP/2 HTTP_PROXY_DESC= HTTP proxy support LIBUV_DESC= Asynchronous I/O support via libuv UNIX_SOCK_DESC= Unix domain socket support +SOCKS5_DESC= Allow use of SOCKS5 proxy on client connections HTTP2_CMAKE_ON= -DLWS_WITH_HTTP2=ON @@ -60,5 +60,7 @@ PLUGINS_CMAKE_ON= -DLWS_WITH_PLUGINS=ON \ -DLWS_WITH_SERVER_STATUS=ON \ -DLWS_WITH_GENERIC_SESSIONS=ON PLUGINS_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 + +SOCKS5_CMAKE_ON= -DLWS_WITH_SOCKS5=ON .include Modified: head/net/libwebsockets/distinfo ============================================================================== --- head/net/libwebsockets/distinfo Thu Aug 20 19:34:50 2020 (r545558) +++ head/net/libwebsockets/distinfo Thu Aug 20 20:30:35 2020 (r545559) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538641163 -SHA256 (warmcat-libwebsockets-v2.4.2_GH0.tar.gz) = 73012d7fcf428dedccc816e83a63a01462e27819d5537b8e0d0c7264bfacfad6 -SIZE (warmcat-libwebsockets-v2.4.2_GH0.tar.gz) = 3777160 +TIMESTAMP = 1590791127 +SHA256 (warmcat-libwebsockets-v3.2.2_GH0.tar.gz) = 166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c +SIZE (warmcat-libwebsockets-v3.2.2_GH0.tar.gz) = 9867911 Modified: head/net/libwebsockets/pkg-plist ============================================================================== --- head/net/libwebsockets/pkg-plist Thu Aug 20 19:34:50 2020 (r545558) +++ head/net/libwebsockets/pkg-plist Thu Aug 20 20:30:35 2020 (r545559) @@ -1,6 +1,60 @@ %%WEBSERVER%%bin/lwsws -%%WEBSERVER%%include/lejp.h include/libwebsockets.h +include/libwebsockets/abstract/abstract.h +include/libwebsockets/abstract/protocols.h +include/libwebsockets/abstract/protocols/smtp.h +include/libwebsockets/abstract/transports.h +include/libwebsockets/abstract/transports/raw-skt.h +include/libwebsockets/abstract/transports/unit-test.h +include/libwebsockets/lws-adopt.h +include/libwebsockets/lws-callbacks.h +include/libwebsockets/lws-cgi.h +include/libwebsockets/lws-client.h +include/libwebsockets/lws-context-vhost.h +include/libwebsockets/lws-dbus.h +include/libwebsockets/lws-diskcache.h +include/libwebsockets/lws-dsh.h +include/libwebsockets/lws-esp32.h +include/libwebsockets/lws-fts.h +include/libwebsockets/lws-genaes.h +include/libwebsockets/lws-gencrypto.h +include/libwebsockets/lws-genec.h +include/libwebsockets/lws-genhash.h +include/libwebsockets/lws-genrsa.h +include/libwebsockets/lws-http.h +include/libwebsockets/lws-jose.h +include/libwebsockets/lws-jwe.h +include/libwebsockets/lws-jwk.h +include/libwebsockets/lws-jws.h +include/libwebsockets/lws-lejp.h +include/libwebsockets/lws-logs.h +include/libwebsockets/lws-lwsac.h +include/libwebsockets/lws-misc.h +include/libwebsockets/lws-network-helper.h +include/libwebsockets/lws-optee.h +include/libwebsockets/lws-plugin-generic-sessions.h +include/libwebsockets/lws-protocols-plugins.h +include/libwebsockets/lws-purify.h +include/libwebsockets/lws-retry.h +include/libwebsockets/lws-ring.h +include/libwebsockets/lws-sequencer.h +include/libwebsockets/lws-service.h +include/libwebsockets/lws-sha1-base64.h +include/libwebsockets/lws-spa.h +include/libwebsockets/lws-stats.h +include/libwebsockets/lws-struct.h +include/libwebsockets/lws-system.h +include/libwebsockets/lws-test-sequencer.h +include/libwebsockets/lws-threadpool.h +include/libwebsockets/lws-timeout-timer.h +include/libwebsockets/lws-tokenize.h +include/libwebsockets/lws-vfs.h +include/libwebsockets/lws-write.h +include/libwebsockets/lws-writeable.h +include/libwebsockets/lws-ws-close.h +include/libwebsockets/lws-ws-ext.h +include/libwebsockets/lws-ws-state.h +include/libwebsockets/lws-x509.h include/lws-plugin-ssh.h include/lws_config.h lib/cmake/libwebsockets/LibwebsocketsConfig.cmake @@ -9,14 +63,17 @@ lib/cmake/libwebsockets/LibwebsocketsTargets-%%CMAKE_B lib/cmake/libwebsockets/LibwebsocketsTargets.cmake lib/libwebsockets.a lib/libwebsockets.so -lib/libwebsockets.so.12 +lib/libwebsockets.so.15 libdata/pkgconfig/libwebsockets.pc libdata/pkgconfig/libwebsockets_static.pc -%%DATADIR%%-test-server/lws-ssh-test-keys -%%DATADIR%%-test-server/lws-ssh-test-keys.pub +%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.css +%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.js +%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/drop.svg +%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/index.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/failed-login.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/index.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs-logo.png +%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs.css %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs.js %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/needadmin/admin-login.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/needauth/successful-login.html @@ -32,4 +89,6 @@ libdata/pkgconfig/libwebsockets_static.pc %%PLUGINS%%%%DATADIR%%-test-server/generic-table/index.html %%PLUGINS%%%%DATADIR%%-test-server/generic-table/lwsgt.js %%PLUGINS%%%%DATADIR%%-test-server/server-status/lwsws-logo.png +%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.css %%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.html +%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.js