diff --git a/net/libwebsockets/Makefile b/net/libwebsockets/Makefile index 3ca23e689d61..a1236c01821b 100644 --- a/net/libwebsockets/Makefile +++ b/net/libwebsockets/Makefile @@ -1,78 +1,85 @@ # Created by: Iblis Lin PORTNAME= libwebsockets DISTVERSIONPREFIX= v -DISTVERSION= 4.1.6 +DISTVERSION= 4.2.0 CATEGORIES= net devel MASTER_SITES= https://libwebsockets.org/git/libwebsockets/snapshot/ MAINTAINER= iblis@hs.ntnu.edu.tw COMMENT= C library for lightweight websocket clients and servers LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake localbase pkgconfig tar:xz USE_LDCONFIG= yes -CMAKE_ON= LWS_IPV6 LWS_WITH_SSL LWS_WITH_ZLIB \ +CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Git \ + LWS_IPV6 LWS_WITH_SSL LWS_WITH_ZLIB \ LWS_WITHOUT_TESTAPPS LWS_WITHOUT_TEST_SERVER \ LWS_WITHOUT_TEST_SERVER_EXTPOLL \ LWS_WITHOUT_TEST_PING LWS_WITHOUT_TEST_CLIENT OPTIONS_DEFINE= HTTP_PROXY HTTP2 MQTT PEERLIMITS PLUGINS \ SECURE_STREAMS SOCKS SQLITE WEBSERVER -OPTIONS_DEFAULT= HTTP2 OPENSSL LIBUV +OPTIONS_DEFAULT= HTTP2 MQTT OPENSSL LIBUV OPTIONS_SUB= yes OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= MBEDTLS OPENSSL OPTIONS_GROUP= EVLOOP OPTIONS_GROUP_EVLOOP= GLIB LIBEV LIBEVENT LIBUV HTTP_PROXY_DESC= HTTP proxy support MQTT_DESC= MQTT client support PEERLIMITS_DESC= Tracking and limiting of resources of peer(s) PLUGINS_DESC= Plugins support SECURE_STREAMS_DESC= Secure streams protocol API support SOCKS_DESC= Allow use of SOCKS5 proxy on client connections EVLOOP_DESC= Event loop support GLIB_DESC= Events support via Glib LIBEVENT_DESC= Asynchronous event notification via libevent LIBUV_DESC= Asynchronous I/O support via libuv HTTP_PROXY_CMAKE_BOOL= LWS_WITH_HTTP_PROXY HTTP2_CMAKE_BOOL= LWS_WITH_HTTP2 MQTT_CMAKE_BOOL= LWS_ROLE_MQTT PEERLIMITS_CMAKE_BOOL= LWS_WITH_PEER_LIMITS PLUGINS_CMAKE_BOOL= LWS_WITH_PLUGINS \ LWS_WITH_PLUGINS_API SECURE_STREAMS_CMAKE_BOOL= LWS_WITH_SECURE_STREAMS \ LWS_WITH_SECURE_STREAMS_PROXY_API SOCKS_CMAKE_BOOL= LWS_WITH_SOCKS5 SQLITE_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 SQLITE_CMAKE_BOOL= LWS_WITH_SQLITE3 WEBSERVER_CMAKE_BOOL= LWS_WITH_LWSWS WEBSERVER_IMPLIES= PEERLIMITS PLUGINS LIBUV MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls MBEDTLS_CMAKE_BOOL= LWS_WITH_MBEDTLS OPENSSL_USES= ssl OPENSSL_CMAKE_BOOL= LWS_WITHOUT_BUILTIN_SHA1 # WolfSSL need to be compiled with --enable-libwebsockets to be compatible # WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl # WOLFSSL_CMAKE_BOOL= LWS_WITH_SSL LWS_WITH_WOLFSSL # WOLFSSL_CMAKE_ON= -DLWS_WOLFSSL_INCLUDE_DIRS=${LOCALBASE}/include \ # -DLWS_WOLFSSL_LIBRARIES=${LOCALBASE}/lib/libwolfssl.so GLIB_USES= gnome GLIB_USE= GNOME=glib20 GLIB_CMAKE_BOOL= LWS_WITH_GLIB LIBEV_LIB_DEPENDS= libev.so:devel/libev LIBEV_CMAKE_BOOL= LWS_WITH_LIBEV LIBEVENT_LIB_DEPENDS= libevent.so:devel/libevent LIBEVENT_CMAKE_BOOL= LWS_WITH_LIBEVENT LIBUV_LIB_DEPENDS= libuv.so:devel/libuv LIBUV_CMAKE_BOOL= LWS_WITH_LIBUV +BUILDINFO= ${HOSTARCH}-portbld-${OPSYS:tl}-${OSREL:R} + +post-patch: + @${REINPLACE_CMD} -e 's|%%BUILDINFO%%|${BUILDINFO}|g' \ + ${PATCH_WRKSRC}/CMakeLists.txt + .include diff --git a/net/libwebsockets/distinfo b/net/libwebsockets/distinfo index 5b26cf42e526..a8c1000b0aa6 100644 --- a/net/libwebsockets/distinfo +++ b/net/libwebsockets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1607873825 -SHA256 (libwebsockets-v4.1.6.tar.xz) = d24b644bb1686c6dd6e3499b9407bb7e22f08f43da22ae7be435c74433a2641f -SIZE (libwebsockets-v4.1.6.tar.xz) = 8570880 +TIMESTAMP = 1621466017 +SHA256 (libwebsockets-v4.2.0.tar.xz) = 4d1e42c2be5951b49cda195008f9c39b7dd29a8956ea00bbe52fcf7efb6a623a +SIZE (libwebsockets-v4.2.0.tar.xz) = 12769280 diff --git a/net/libwebsockets/pkg-plist b/net/libwebsockets/pkg-plist index 1a05235c2685..dfc61553e02a 100644 --- a/net/libwebsockets/pkg-plist +++ b/net/libwebsockets/pkg-plist @@ -1,113 +1,115 @@ %%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-bb-i2c.h include/libwebsockets/lws-bb-spi.h include/libwebsockets/lws-button.h include/libwebsockets/lws-callbacks.h include/libwebsockets/lws-cgi.h include/libwebsockets/lws-client.h +include/libwebsockets/lws-conmon.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-display.h include/libwebsockets/lws-dll2.h include/libwebsockets/lws-dsh.h include/libwebsockets/lws-eventlib-exports.h +include/libwebsockets/lws-fault-injection.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-gpio.h include/libwebsockets/lws-http.h include/libwebsockets/lws-i2c.h include/libwebsockets/lws-ili9341-spi.h include/libwebsockets/lws-jose.h include/libwebsockets/lws-jwe.h include/libwebsockets/lws-jwk.h include/libwebsockets/lws-jws.h include/libwebsockets/lws-led.h include/libwebsockets/lws-lejp.h include/libwebsockets/lws-logs.h include/libwebsockets/lws-lwsac.h +include/libwebsockets/lws-metrics.h include/libwebsockets/lws-misc.h include/libwebsockets/lws-mqtt.h include/libwebsockets/lws-netdev.h include/libwebsockets/lws-network-helper.h include/libwebsockets/lws-optee.h include/libwebsockets/lws-protocols-plugins.h include/libwebsockets/lws-purify.h include/libwebsockets/lws-pwm.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-settings.h include/libwebsockets/lws-sha1-base64.h include/libwebsockets/lws-smd.h include/libwebsockets/lws-spa.h include/libwebsockets/lws-spi.h include/libwebsockets/lws-ssd1306-i2c.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-tls-sessions.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_config.h lib/cmake/libwebsockets/LibwebsocketsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/libwebsockets/LibwebsocketsTargets.cmake lib/cmake/libwebsockets/LwsCheckRequirements.cmake lib/cmake/libwebsockets/libwebsockets-config-version.cmake lib/cmake/libwebsockets/libwebsockets-config.cmake %%GLIB%%lib/libwebsockets-evlib_glib.so %%LIBEV%%lib/libwebsockets-evlib_ev.so %%LIBEVENT%%lib/libwebsockets-evlib_event.so %%LIBUV%%lib/libwebsockets-evlib_uv.so lib/libwebsockets.a lib/libwebsockets.so -lib/libwebsockets.so.17 +lib/libwebsockets.so.18 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/plugins/libprotocol_client_loopback_test.so %%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_deaddrop.so %%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_dumb_increment.so %%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_mirror.so %%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_raw_proxy.so %%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_raw_test.so %%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_server_status.so %%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_ssh_base.so %%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_sshd_demo.so %%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_status.so %%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_post_demo.so %%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/server-status/lwsws-logo.png %%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.css %%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.html %%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.js