diff --git a/0001-add-secure-compile-option-in-Makefile.patch b/0001-add-secure-compile-option-in-Makefile.patch index 4607a0644eed748d8d7c5ddcbaf30ba9d7b2bf8a..e6de4e857ce69d275e282dc6080c2e3789219580 100644 --- a/0001-add-secure-compile-option-in-Makefile.patch +++ b/0001-add-secure-compile-option-in-Makefile.patch @@ -2,13 +2,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index c62d7f9..b046e90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -38,6 +38,8 @@ set(LWS_LIBRARY_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH}) - +@@ -344,6 +344,8 @@ set(LWS_LIBRARY_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH}) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/") + +set(CMAKE_C_FLAGS "-Wl,-z,now ${CMAKE_C_FLAGS}") + message(STATUS "CMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'") - # Try to find the current Git hash. + if(WIN32) diff --git a/libwebsockets-2.4.2.tar.gz b/libwebsockets-2.4.2.tar.gz deleted file mode 100644 index 6d9d0d6cff775459380411a44a712029ef0efa21..0000000000000000000000000000000000000000 Binary files a/libwebsockets-2.4.2.tar.gz and /dev/null differ diff --git a/libwebsockets-4.0.1.tar.gz b/libwebsockets-4.0.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1c7e2e4616617bf9e02f9b64f6fd88295f0c19f7 Binary files /dev/null and b/libwebsockets-4.0.1.tar.gz differ diff --git a/libwebsockets-fix-coredump.patch b/libwebsockets-fix-coredump.patch deleted file mode 100644 index 47e78086142e86b842c0b1e42e19450abf0702ad..0000000000000000000000000000000000000000 --- a/libwebsockets-fix-coredump.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/context.c b/lib/context.c -index 9f221f5..207b032 100644 ---- a/lib/context.c -+++ b/lib/context.c -@@ -1109,7 +1109,7 @@ lws_create_context(struct lws_context_creation_info *info) - - #if LWS_MAX_SMP > 1 - /* each thread serves his own chunk of fds */ -- for (n = 1; n < (int)info->count_threads; n++) -+ for (n = 1; n < (int)context->count_threads; n++) - context->pt[n].fds = context->pt[n - 1].fds + - context->fd_limit_per_thread; - #endif diff --git a/libwebsockets.spec b/libwebsockets.spec index db69c84a6f419c81d994596f53d4638b56dc8ace..fc8cbec9f175fb1e62c6f863e796185a392e411c 100644 --- a/libwebsockets.spec +++ b/libwebsockets.spec @@ -1,14 +1,14 @@ Name: libwebsockets -Version: 2.4.2 -Release: 3 +Version: 4.0.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 Source0: https://github.com/warmcat/libwebsockets/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch6000: libwebsockets-fix-coredump.patch + Patch9000: 0001-add-secure-compile-option-in-Makefile.patch -BuildRequires: cmake openssl-devel zlib-devel libev-devel git +BuildRequires: cmake openssl-devel zlib-devel libev-devel git libwebsockets Provides: bundled(sha1-hollerbach) bundled(base64-decode) bundled(ssl-http2) @@ -35,20 +35,43 @@ This package contains the header files needed for developing mkdir -p build cd build %cmake \ + -D LWS_WITH_HTTP2=ON \ + -D LWS_IPV6=ON \ + -D LWS_WITH_ZIP_FOPS=ON \ + -D LWS_WITH_SOCKS5=ON \ + -D LWS_WITH_RANGES=ON \ + -D LWS_WITH_ACME=ON \ + -D LWS_WITH_LIBUV=OFF \ + -D LWS_WITH_LIBEV=OFF \ + -D LWS_WITH_LIBEVENT=OFF \ + -D LWS_WITH_FTS=ON \ + -D LWS_WITH_THREADPOOL=ON \ + -D LWS_UNIX_SOCK=ON \ + -D LWS_WITH_HTTP_PROXY=ON \ + -D LWS_WITH_DISKCACHE=ON \ + -D LWS_WITH_LWSAC=ON \ -D LWS_LINK_TESTAPPS_DYNAMIC=ON \ - -D LWS_USE_LIBEV=OFF \ -D LWS_WITHOUT_BUILTIN_GETIFADDRS=ON \ -D LWS_USE_BUNDLED_ZLIB=OFF \ -D LWS_WITHOUT_BUILTIN_SHA1=ON \ -D LWS_WITH_STATIC=OFF \ - -D LWS_MAX_SMP=32 \ - -D CMAKE_BUILD_TYPE=Debug \ + -D LWS_WITHOUT_CLIENT=OFF \ + -D LWS_WITHOUT_SERVER=OFF \ + -D LWS_WITHOUT_TESTAPPS=OFF \ + -D LWS_WITHOUT_TEST_SERVER=ON \ + -D LWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \ + -D LWS_WITHOUT_TEST_PING=ON \ + -D LWS_WITHOUT_TEST_CLIENT=ON \ .. + %make_build %install cd build %make_install + +cp -a %{_libdir}/libwebsockets.so.12* %{buildroot}%{_libdir} + %delete_la_and_a find %{buildroot} -name '*.cmake' -exec rm -f {} ';' find %{buildroot} -name '*_static.pc' -exec rm -f {} ';' @@ -63,6 +86,7 @@ find %{buildroot} -name '*_static.pc' -exec rm -f {} ';' %files devel %defattr(-,root,root) %{_includedir}/*.h +%{_includedir}/%{name} %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %{_bindir}/%{name}-test-* @@ -74,6 +98,12 @@ find %{buildroot} -name '*_static.pc' -exec rm -f {} ';' %doc changelog README.md READMEs/ %changelog +* Mon May 11 2020 openEuler Buildteam - 4.0.1-1 +- Type:requirement +- ID:NA +- SUG:NA +- DESC:update to 4.0.1 + * Tue Jan 21 2020 openEuler Buildteam - 2.4.2-3 - Type:bugfix - ID:NA