From nobody Thu Feb 16 06:52:03 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PHQbl2fLzz3pFM5; Thu, 16 Feb 2023 06:52:03 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PHQbl2CkQz4lMV; Thu, 16 Feb 2023 06:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676530323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w7saL5WEkRERUFVSBDwefa5dEbabIXfWP2KlOkBmzL8=; b=G4s8l1NRf+CMX5H361ErL4YYcyk/MFSg8NHNxJXov6qdNhduCehOzjDGPkLAUseTxmzuHh 79TxAfLaMrjlLjqf+09KN9ZEPtZo1up7hZCjdfxLXnty+wucPgkFd9k7hzdCbUV07GnW6p JW+bHIix+T9j4gLq6h/KF43aB2LNPXkbVqcPaNZt19F8HBwZt2tBNSspWwrZ+4AFJhjToo xB+bvGKyS+Mp0fwabOUinXyGwvBP2JCvnWDqHzYiGbr6rFbXRj/4UImSum+nhdJw31RJFq 1zWG7OSramhgBpNSyPDKkWhNul/ZzBZIskfPAugvzXYoqY2e+HDnGbrt0OT0nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676530323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w7saL5WEkRERUFVSBDwefa5dEbabIXfWP2KlOkBmzL8=; b=KJAl+mB2PJjSkfLWiYzR9/GVkc0wd4Dhxv81nXu/zbz5TVsYA/WyfKh3AEcj0oe/GqxlAo CetF2Uocz9s7ObcPC3UldFAsGGzea0eFn/4liBElrpfbtVqtzmaBprL39BNVOo/C3B1kRQ ajS3dLz1d8iFiAXpmeeX90KsYpRuO6J9AEmMP4Je3PigO4cK2pRyMrpLGtGfrUOFe/gQtA I1KpaPK7TTJxpb7H8QC+QV+VfoSuEadq/YqPgFLrlHr3EL6HXWWV/RD6VaOkL8QEuAH2CS Qysdr8mv4VqM/A3Y88/46ZgE9VZyNmjrrz2yPEyuGB7PaW/QLqIJVlJi8SyE4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676530323; a=rsa-sha256; cv=none; b=eUE2O/4lQLvaRc7bitfI/rs2Eq9ofymw7CYImNRK/fqPP9jAbTyBR8/3K65x+byaa1eYSu adt3NQsOJEyzassy/WeySwo6kEskJbKagTmr5EnJ+VH0hz5Fp8nwh0JqhyieWQAjthCBSk 68jizCkRkjMJ8iZzNsVpyX7zpAFbQmd8fdVaYpKlWuCzxiNlk10TZBIy4xMpsSAu+pOWaU iZaFjoTGGeFTUc6GA9InMe+ddYkRpiVyzX64IuBSMKslaPbMS6uY+in7PQjML3SLTx0qWk 20KXyYEoZ70dVN4Mnm5/xheb1UlbVaruFWFWYyk9jbtNP77U1cQgNXMuhNRQPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PHQbl1Gn0zvR9; Thu, 16 Feb 2023 06:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31G6q348027073; Thu, 16 Feb 2023 06:52:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31G6q3a7027072; Thu, 16 Feb 2023 06:52:03 GMT (envelope-from git) Date: Thu, 16 Feb 2023 06:52:03 GMT Message-Id: <202302160652.31G6q3a7027072@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 7a57329645f1 - main - net/libwebsockets: Update to 4.3.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a57329645f1189d8708f3624f59cd6115c0c706 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7a57329645f1189d8708f3624f59cd6115c0c706 commit 7a57329645f1189d8708f3624f59cd6115c0c706 Author: Daniel Engberg AuthorDate: 2023-02-16 06:32:10 +0000 Commit: Daniel Engberg CommitDate: 2023-02-16 06:33:40 +0000 net/libwebsockets: Update to 4.3.2 Adjust configuration options to closer match other distributions and also upstream's recommendations. Mosquitto also requires LWS_WITH_EXTERNAL_POLL to be enabled when linked with this library. Enable following options: LWS_WITH_DISKCACHE, LWS_WITH_FTS, LWS_WITH_RANGES, LWS_WITH_THREADPOOL and (LWS_WITH_EXTERNAL_POLL via MQTT option). Use SHA1 via OpenSSL (LWS_WITHOUT_BUILTIN_SHA1) While at also adjust .cmake and .pc files to properly report version Changelog: https://github.com/warmcat/libwebsockets/blob/v4.3.0/changelog https://github.com/warmcat/libwebsockets/compare/v4.3.0...v4.3.2 PR: 262552 Reported by: Leo Schneider Tested by: Rod Morgan --- net/libwebsockets/Makefile | 15 +++++---- net/libwebsockets/distinfo | 6 ++-- ...tch-cmake_libwebsockets-config-version.cmake.in | 8 +++++ net/libwebsockets/files/patch-lib_CMakeLists.txt | 38 ++++++++++++++++++++++ net/libwebsockets/pkg-plist | 6 +++- 5 files changed, 62 insertions(+), 11 deletions(-) diff --git a/net/libwebsockets/Makefile b/net/libwebsockets/Makefile index 4b73d06f7957..639b07bfdeaf 100644 --- a/net/libwebsockets/Makefile +++ b/net/libwebsockets/Makefile @@ -1,7 +1,6 @@ PORTNAME= libwebsockets DISTVERSIONPREFIX= v -DISTVERSION= 4.2.2 -PORTREVISION= 1 +DISTVERSION= 4.3.2 CATEGORIES= net devel MASTER_SITES= https://libwebsockets.org/git/libwebsockets/snapshot/ @@ -15,9 +14,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake localbase pkgconfig tar:xz USE_LDCONFIG= yes +BUILDINFO= ${HOSTARCH}-portbld-${OPSYS:tl}-${OSREL:R} + CMAKE_ARGS= -DLWS_BUILD_HASH:STRING="${BUILDINFO}" CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Git \ - LWS_IPV6 LWS_WITH_SSL LWS_WITH_ZLIB \ + 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 @@ -45,7 +48,7 @@ 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 +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 @@ -77,13 +80,11 @@ 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} - .include # Allow usage of LibreSSL via OPENSSL option .if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT} == libressl -CMAKE_ARGS+= -DLWS_OPENSSL_LIBRARIES='${OPENSSLLIB}/libtls.so;${OPENSSLLIB}/libssl.so;${OPENSSLLIB}/libcrypto.so' -DLWS_OPENSSL_INCLUDE_DIRS=${OPENSSLINC}/ssl +CMAKE_ARGS+= -DLWS_OPENSSL_LIBRARIES='${OPENSSLLIB}/libtls.so;${OPENSSLLIB}/libssl.so;${OPENSSLLIB}/libcrypto.so' -DLWS_OPENSSL_INCLUDE_DIRS=${OPENSSLINC}/ssl .endif .include diff --git a/net/libwebsockets/distinfo b/net/libwebsockets/distinfo index 381779501270..d2460b3de794 100644 --- a/net/libwebsockets/distinfo +++ b/net/libwebsockets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633420177 -SHA256 (libwebsockets-v4.2.2.tar.xz) = 0d8cf2abeea4a6ad24935c60a26120ed864fb263dd95b6abf7d19356b7095410 -SIZE (libwebsockets-v4.2.2.tar.xz) = 12769280 +TIMESTAMP = 1676237078 +SHA256 (libwebsockets-v4.3.2.tar.xz) = 287ad6f63344323c4e2404d2ab3a8a0803932d554c724aaffbb1e8fe2e5e9243 +SIZE (libwebsockets-v4.3.2.tar.xz) = 13598720 diff --git a/net/libwebsockets/files/patch-cmake_libwebsockets-config-version.cmake.in b/net/libwebsockets/files/patch-cmake_libwebsockets-config-version.cmake.in new file mode 100644 index 000000000000..9566f8f72cd6 --- /dev/null +++ b/net/libwebsockets/files/patch-cmake_libwebsockets-config-version.cmake.in @@ -0,0 +1,8 @@ +--- cmake/libwebsockets-config-version.cmake.in.orig 1970-01-01 00:00:00 UTC ++++ cmake/libwebsockets-config-version.cmake.in +@@ -1,4 +1,4 @@ +-set(PACKAGE_VERSION "@CPACK_PACKAGE_VERSION@") ++set(PACKAGE_VERSION "@CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@.@CPACK_PACKAGE_VERSION_PATCH_NUMBER@") + + # Check whether the requested PACKAGE_FIND_VERSION is compatible + if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") diff --git a/net/libwebsockets/files/patch-lib_CMakeLists.txt b/net/libwebsockets/files/patch-lib_CMakeLists.txt new file mode 100644 index 000000000000..7e684131fabb --- /dev/null +++ b/net/libwebsockets/files/patch-lib_CMakeLists.txt @@ -0,0 +1,38 @@ +--- 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/pkg-plist b/net/libwebsockets/pkg-plist index f3933d39f15c..cbe09a5b2282 100644 --- a/net/libwebsockets/pkg-plist +++ b/net/libwebsockets/pkg-plist @@ -11,11 +11,13 @@ 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-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 @@ -38,10 +40,12 @@ include/libwebsockets/lws-jose.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 @@ -91,7 +95,7 @@ lib/cmake/libwebsockets/libwebsockets-config.cmake %%LIBUV%%lib/libwebsockets-evlib_uv.so lib/libwebsockets.a lib/libwebsockets.so -lib/libwebsockets.so.18 +lib/libwebsockets.so.19 libdata/pkgconfig/libwebsockets.pc libdata/pkgconfig/libwebsockets_static.pc %%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.css