diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..c9a618551d7d788cde5f4326178966a3917277e9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..acb2175a5f534021cd56c7d0664b217753168115 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/libwebsockets diff --git a/0003-client-hs-fix-segmentation-fault.patch b/0003-client-hs-fix-segmentation-fault.patch deleted file mode 100644 index c825b8b3f4460a2fff23611d28903deada6f0bd0..0000000000000000000000000000000000000000 --- a/0003-client-hs-fix-segmentation-fault.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fdde9119f72f315a453d30c3f7448cbccc69fa8a Mon Sep 17 00:00:00 2001 -From: zzblydia <13098426+zzblydia@users.noreply.github.com> -Date: Mon, 24 Jun 2024 15:11:17 +0800 -Subject: [PATCH] client hs: fix segmentation fault - -reason:sync with upstream -Conflict:NA -Reference:https://github.com/warmcat/libwebsockets/pull/3171 ---- - lib/roles/http/client/client-http.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/roles/http/client/client-http.c b/lib/roles/http/client/client-http.c -index 57dda701..05532f29 100644 ---- a/lib/roles/http/client/client-http.c -+++ b/lib/roles/http/client/client-http.c -@@ -1641,6 +1641,8 @@ lws_generate_client_handshake(struct lws *wsi, char *pkt) - // if (!wsi->client_pipeline) - // conn1 = "close, "; - p = lws_generate_client_ws_handshake(wsi, p, conn1); -+ if (!p) -+ return NULL; - } else - #endif - { --- -2.43.0 - diff --git a/libwebsockets-4.4.1-deal-with-libsuffix-removal.patch b/libwebsockets-4.4.1-deal-with-libsuffix-removal.patch new file mode 100644 index 0000000000000000000000000000000000000000..607eb6d25ff98cf6daf3209f4eabd69af0da406d --- /dev/null +++ b/libwebsockets-4.4.1-deal-with-libsuffix-removal.patch @@ -0,0 +1,19 @@ +--- libwebsockets-4.4.1/CMakeLists.txt.orig 2025-08-22 23:08:57.534446000 +0800 ++++ libwebsockets-4.4.1/CMakeLists.txt 2025-08-22 23:10:37.396513900 +0800 +@@ -79,6 +79,7 @@ + if (LWS_WITH_SECURE_STREAMS_CPP) + enable_language(CXX) + endif() ++include(GNUInstallDirs) + include(CTest) + + if (PICO_SDK_PATH) +@@ -539,7 +540,7 @@ + endif() + + if (NOT LIB_SUFFIX) +- set(LIB_SUFFIX "") ++ STRING(REPLACE "lib" "" LIB_SUFFIX ${CMAKE_INSTALL_LIBDIR}) + endif() + + if (WIN32) diff --git a/libwebsockets-disable-command-if-not-building-test-server.patch b/libwebsockets-disable-command-if-not-building-test-server.patch new file mode 100644 index 0000000000000000000000000000000000000000..f019e8cd29459dd5f5665544fc8fa8b8827233f6 --- /dev/null +++ b/libwebsockets-disable-command-if-not-building-test-server.patch @@ -0,0 +1,20 @@ +diff --git a/test-apps/CMakeLists.txt b/test-apps/CMakeLists.txt +index 485391a..32a102a 100644 +--- a/test-apps/CMakeLists.txt ++++ b/test-apps/CMakeLists.txt +@@ -211,6 +211,7 @@ if ((LWS_ROLE_H1 OR LWS_ROLE_H2)) + "${PROJECT_SOURCE_DIR}/test-apps/test.css" + "${PROJECT_SOURCE_DIR}/test-apps/test.js") + ++ if (NOT LWS_WITHOUT_TEST_SERVER) + add_custom_command(TARGET test-server + POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E make_directory "$/../share/libwebsockets-test-server") +@@ -224,6 +225,7 @@ if ((LWS_ROLE_H1 OR LWS_ROLE_H2)) + COMMAND "${CMAKE_COMMAND}" -E copy "${TEST_FILE}" "$/../share/libwebsockets-test-server" VERBATIM) + endif() + endforeach() ++ endif(NOT LWS_WITHOUT_TEST_SERVER) + endif(NOT LWS_WITHOUT_SERVER AND LWS_WITH_FILE_OPS) + + if (NOT LWS_WITHOUT_CLIENT) diff --git a/libwebsockets.spec b/libwebsockets.spec index 0fc880b958fa241189e47f7759eee65a7bc25d0b..32853abc894804de6b09e98354c48e1ef906122e 100644 --- a/libwebsockets.spec +++ b/libwebsockets.spec @@ -1,6 +1,6 @@ Name: libwebsockets -Version: 4.3.3 -Release: 4 +Version: 4.4.1 +Release: 1 Summary: A lightweight C library for Websockets License: LGPLv2 and Public Domain and BSD and MIT and zlib URL: https://libwebsockets.org @@ -8,8 +8,9 @@ Source0: https://github.com/warmcat/libwebsockets/archive/v%{version}.tar Patch9001: 0001-add-secure-compile-option-in-Makefile.patch Patch9002: 0002-solve-the-BEP-problem.patch -Patch9003: 0003-client-hs-fix-segmentation-fault.patch Patch9004: 0004-fix-the-politically-sensitive-words.patch +Patch0005: libwebsockets-disable-command-if-not-building-test-server.patch +Patch0006: libwebsockets-4.4.1-deal-with-libsuffix-removal.patch BuildRequires: cmake openssl-devel zlib-devel libev-devel gcc gcc-c++ @@ -59,12 +60,13 @@ This package contains the header files needed for developing -D LWS_WITH_STATIC=OFF \ -D LWS_WITHOUT_CLIENT=OFF \ -D LWS_WITHOUT_SERVER=OFF \ - -D LWS_WITHOUT_TESTAPPS=OFF \ - -D LWS_WITHOUT_TEST_SERVER=ON \ + -D LWS_WITHOUT_TESTAPPS=ON \ + -D LWS_WITHOUT_TEST_SERVER=OFF \ -D LWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \ -D LWS_WITHOUT_TEST_PING=ON \ -D LWS_WITHOUT_TEST_CLIENT=ON \ - -D LWS_WITHOUT_EXTENSIONS=OFF + -D LWS_WITHOUT_EXTENSIONS=OFF \ + -D LWS_WITH_MINIMAL_EXAMPLES=OFF %cmake_build @@ -82,14 +84,14 @@ find %{buildroot} -name '*_static.pc' -exec rm -f {} ';' %{_includedir}/%{name} %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -%{_bindir}/%{name}-test-* -%{_datadir}/%{name}-test-server/ - %files help %doc changelog README.md READMEs/ %changelog +* Fri Aug 22 2025 Funda Wang - 4.4.1-1 +- update to 4.4.1 + * Tue Aug 12 2025 xiaoyuliang - 4.3.3-4 - Type:bugfix - ID:NA diff --git a/libwebsockets.yaml b/libwebsockets.yaml index 04521daff0ee6e079532841baa44b5d815f457de..32afc7e9e703ba28ab1f1a351c7af1897df326b6 100644 --- a/libwebsockets.yaml +++ b/libwebsockets.yaml @@ -1,4 +1,4 @@ version_control: git src_repo: https://libwebsockets.org/repo/libwebsockets tag_prefix: ^v -seperator: . +separator: . diff --git a/v4.3.3.tar.gz b/v4.3.3.tar.gz deleted file mode 100644 index 30be624c47d994de22643cb25c8c0aaba9678a7c..0000000000000000000000000000000000000000 Binary files a/v4.3.3.tar.gz and /dev/null differ diff --git a/v4.4.1.tar.gz b/v4.4.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4a0ccdfc8d0374c1de1f429d8234dbecff0c1bbb --- /dev/null +++ b/v4.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:472e6cfa77b6f80ff2cc176bc59f6cb2856df7e30e8f31afcbd1fc94ffd2f828 +size 19997574