diff --git a/net/libwebsockets/Makefile b/net/libwebsockets/Makefile index 366b87ba3c2b..d90914d67acb 100644 --- a/net/libwebsockets/Makefile +++ b/net/libwebsockets/Makefile @@ -1,81 +1,81 @@ PORTNAME= libwebsockets DISTVERSIONPREFIX= v -DISTVERSION= 4.3.10 +DISTVERSION= 4.4.4 CATEGORIES= net devel MAINTAINER= bofh@FreeBSD.org COMMENT= C library for lightweight websocket clients and servers WWW= https://libwebsockets.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake localbase pkgconfig USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= warmcat BUILDINFO= ${HOSTARCH}-portbld-${OPSYS:tl}-${OSREL:R} CMAKE_ARGS= -DLWS_BUILD_HASH:STRING="${BUILDINFO}" CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Git \ LWS_WITH_DISKCACHE LWS_WITH_FTS LWS_IPV6 LWS_WITH_RANGES \ LWS_WITH_SSL LWS_WITH_THREADPOOL LWS_WITH_ZLIB \ LWS_WITHOUT_BUILTIN_SHA1 \ 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 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 LWS_WITH_EXTERNAL_POLL PEERLIMITS_CMAKE_BOOL= LWS_WITH_PEER_LIMITS PLUGINS_CMAKE_BOOL= LWS_WITH_PLUGINS \ LWS_WITH_PLUGINS_API PLUGINS_CMAKE_BOOL_OFF= DISABLE_WERROR 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/mbedtls3 MBEDTLS_CMAKE_BOOL= LWS_WITH_MBEDTLS OPENSSL_USES= ssl OPENSSL_CMAKE_BOOL= LWS_WITHOUT_BUILTIN_SHA1 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 .include diff --git a/net/libwebsockets/distinfo b/net/libwebsockets/distinfo index 010940710db7..c3c42dfe58cc 100644 --- a/net/libwebsockets/distinfo +++ b/net/libwebsockets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1777387562 -SHA256 (warmcat-libwebsockets-v4.3.10_GH0.tar.gz) = 9454e9b52a26f8cdf6d085afde5404a4caa3c8f8331929d144c5c4db664f9508 -SIZE (warmcat-libwebsockets-v4.3.10_GH0.tar.gz) = 15618691 +TIMESTAMP = 1778666037 +SHA256 (warmcat-libwebsockets-v4.4.4_GH0.tar.gz) = c0e08492e368551e08ebdb3c940fb92dad61b9c53c02eb9576bd012da0eb990d +SIZE (warmcat-libwebsockets-v4.4.4_GH0.tar.gz) = 20003406 diff --git a/net/libwebsockets/files/patch-lib_CMakeLists.txt b/net/libwebsockets/files/patch-lib_CMakeLists.txt deleted file mode 100644 index 7e684131fabb..000000000000 --- a/net/libwebsockets/files/patch-lib_CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ ---- lib/CMakeLists.txt.orig 2023-02-14 23:28:15 UTC -+++ lib/CMakeLists.txt -@@ -316,7 +316,7 @@ includedir=\${prefix}/include - - Name: libwebsockets - Description: Websockets server and client library --Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH} -+Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH_NUMBER} - - Libs: -L\${libdir} -lwebsockets - Cflags: -I\${includedir} -@@ -328,7 +328,7 @@ endif() - - - install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc" -- DESTINATION lib${LIB_SUFFIX}/pkgconfig) -+ DESTINATION libdata/pkgconfig) - - file(WRITE "${PROJECT_BINARY_DIR}/libwebsockets_static.pc" - "prefix=\"${CMAKE_INSTALL_PREFIX}\" -@@ -338,7 +338,7 @@ includedir=\${prefix}/include - - Name: libwebsockets_static - Description: Websockets server and client static library --Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH} -+Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH_NUMBER} - - Libs: -L\${libdir} -l:libwebsockets${CMAKE_STATIC_LIBRARY_SUFFIX} - Libs.private: -@@ -352,7 +352,7 @@ endif() - - - install(FILES "${PROJECT_BINARY_DIR}/libwebsockets_static.pc" -- DESTINATION lib${LIB_SUFFIX}/pkgconfig) -+ DESTINATION libdata/pkgconfig) - - endif(UNIX OR MINGW) - diff --git a/net/libwebsockets/files/patch-lib_tls_CMakeLists.txt b/net/libwebsockets/files/patch-lib_tls_CMakeLists.txt deleted file mode 100644 index b816a12382e2..000000000000 --- a/net/libwebsockets/files/patch-lib_tls_CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -Disable usage of pkg-config for OpenSSL to avoid linking two different versions. -See PRs: 258345, 271495 - ---- lib/tls/CMakeLists.txt.orig 2023-05-19 06:48:43 UTC -+++ lib/tls/CMakeLists.txt -@@ -264,10 +264,10 @@ if (LWS_WITH_SSL) - if (NOT OPENSSL_FOUND AND NOT LWS_WITH_BORINGSSL) - # TODO: Add support for STATIC also. - if (NOT LWS_PLAT_FREERTOS) -- find_package(PkgConfig QUIET) -- pkg_check_modules(PC_OPENSSL openssl QUIET) -+ #find_package(PkgConfig QUIET) -+ #pkg_check_modules(PC_OPENSSL openssl QUIET) - find_package(OpenSSL REQUIRED) -- list(APPEND OPENSSL_LIBRARIES ${PC_OPENSSL_LINK_LIBRARIES}) -+ #list(APPEND OPENSSL_LIBRARIES ${PC_OPENSSL_LINK_LIBRARIES}) - set(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} PARENT_SCOPE) - endif() - set(OPENSSL_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}") diff --git a/net/libwebsockets/pkg-plist b/net/libwebsockets/pkg-plist index a97c3724dcf7..775d331d0b46 100644 --- a/net/libwebsockets/pkg-plist +++ b/net/libwebsockets/pkg-plist @@ -1,116 +1,123 @@ %%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-backtrace.h include/libwebsockets/lws-bb-i2c.h include/libwebsockets/lws-bb-spi.h include/libwebsockets/lws-button.h include/libwebsockets/lws-cache-ttl.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-cose.h include/libwebsockets/lws-dbus.h include/libwebsockets/lws-diskcache.h include/libwebsockets/lws-display.h include/libwebsockets/lws-dll2.h +include/libwebsockets/lws-dlo.h include/libwebsockets/lws-dsh.h +include/libwebsockets/lws-esp32-spi.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-html.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-jpeg.h +include/libwebsockets/lws-jrpc.h include/libwebsockets/lws-jwe.h include/libwebsockets/lws-jwk.h include/libwebsockets/lws-jws.h include/libwebsockets/lws-lecp.h include/libwebsockets/lws-led.h include/libwebsockets/lws-lejp.h include/libwebsockets/lws-logs.h include/libwebsockets/lws-lwsac.h include/libwebsockets/lws-map.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-ota.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-serialization.h +include/libwebsockets/lws-secure-streams-transport-proxy.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-spd1656-spi.h include/libwebsockets/lws-spi.h include/libwebsockets/lws-ssd1306-i2c.h +include/libwebsockets/lws-ssd1675b-spi.h include/libwebsockets/lws-state.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-uc8176-spi.h +include/libwebsockets/lws-upng.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.19 +lib/libwebsockets.so.20 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_fulltext_demo.so %%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_mirror.so %%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_openmetrics_export.so %%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_raw_proxy.so %%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_raw_test.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 +%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_urlarg.so