diff --git a/net/libwebsockets/Makefile b/net/libwebsockets/Makefile index 2321d5c60aee..a38680283769 100644 --- a/net/libwebsockets/Makefile +++ b/net/libwebsockets/Makefile @@ -1,66 +1,74 @@ # Created by: Iblis Lin # $FreeBSD$ PORTNAME= libwebsockets DISTVERSIONPREFIX= v -DISTVERSION= 3.2.2 +DISTVERSION= 4.0.21 CATEGORIES= net devel MAINTAINER= iblis@hs.ntnu.edu.tw COMMENT= C library for lightweight websocket clients and servers -LICENSE= LGPL21 +LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake pkgconfig ssl USE_LDCONFIG= yes PORTSCOUT= limit:^v\d+\.* USE_GITHUB= yes GH_ACCOUNT= warmcat 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_CLIENT=ON OPTIONS_DEFINE= HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS \ - SOCKS5 + SOCKS5 MQTT SECURE_STREAMS 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 +MQTT_DESC= MQTT client support +SECURE_STREAMS_DESC= Secure Streams API support HTTP2_CMAKE_ON= -DLWS_WITH_HTTP2=ON HTTP_PROXY_CMAKE_ON= -DLWS_WITH_HTTP_PROXY=ON \ -DLIBHUBBUB_LIBRARIES=${LOCALBASE}/lib/libhubbub.so HTTP_PROXY_LIB_DEPENDS= libhubbub.so:www/libhubbub IPV6_CMAKE_ON= -DLWS_IPV6=ON LIBEV_CMAKE_ON= -DLWS_WITH_LIBEV=ON LIBEV_LIB_DEPENDS= libev.so:devel/libev LIBUV_CMAKE_ON= -DLWS_WITH_LIBUV=ON LIBUV_LIB_DEPENDS= libuv.so:devel/libuv UNIX_SOCK_CMAKE_ON= -DLWS_UNIX_SOCK=ON WEBSERVER_CMAKE_ON= -DLWS_WITH_LWSWS=ON WEBSERVER_IMPLIES= LIBUV 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 +MQTT_CMAKE_ON= -DLWS_ROLE_MQTT=ON + +SECURE_STREAMS_CMAKE_ON=-DLWS_WITH_SECURE_STREAMS=ON \ + -DLWS_WITH_SECURE_STREAMS_PROXY_API=ON \ + -DLWS_WITH_SECURE_STREAMS_SYS_AUTH_API_AMAZON_COM=ON + .include diff --git a/net/libwebsockets/distinfo b/net/libwebsockets/distinfo index 32c8fc7c19e7..42c2aa3035cd 100644 --- a/net/libwebsockets/distinfo +++ b/net/libwebsockets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1590791127 -SHA256 (warmcat-libwebsockets-v3.2.2_GH0.tar.gz) = 166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c -SIZE (warmcat-libwebsockets-v3.2.2_GH0.tar.gz) = 9867911 +TIMESTAMP = 1603959557 +SHA256 (warmcat-libwebsockets-v4.0.21_GH0.tar.gz) = 6ece1f422c6d38aabedec2476f2ac12e9aede8691b08137068ad85545ce3ff78 +SIZE (warmcat-libwebsockets-v4.0.21_GH0.tar.gz) = 12342078 diff --git a/net/libwebsockets/pkg-plist b/net/libwebsockets/pkg-plist index b8a5fa32e455..a55eef96f3d1 100644 --- a/net/libwebsockets/pkg-plist +++ b/net/libwebsockets/pkg-plist @@ -1,94 +1,103 @@ %%WEBSERVER%%bin/lwsws 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-async-dns.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-detailed-latency.h include/libwebsockets/lws-diskcache.h +include/libwebsockets/lws-dll2.h include/libwebsockets/lws-dsh.h include/libwebsockets/lws-esp32.h +include/libwebsockets/lws-freertos.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-mqtt.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-secure-streams-client.h +include/libwebsockets/lws-secure-streams-policy.h +include/libwebsockets/lws-secure-streams.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-state.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 lib/cmake/libwebsockets/LibwebsocketsConfigVersion.cmake lib/cmake/libwebsockets/LibwebsocketsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/libwebsockets/LibwebsocketsTargets.cmake lib/libwebsockets.a lib/libwebsockets.so -lib/libwebsockets.so.15 +lib/libwebsockets.so.16 libdata/pkgconfig/libwebsockets.pc libdata/pkgconfig/libwebsockets_static.pc %%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 %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-forgot-fail.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-forgot-ok.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-register-fail.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-register-ok.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-verify-fail.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-verify-ok.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/seats.jpg %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/sent-forgot-fail.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/sent-forgot-ok.html %%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