!2 add bind now secure compile option

Merge pull request !2 from orange-snn/master
This commit is contained in:
openeuler-ci-bot 2020-02-03 14:41:35 +08:00 committed by Gitee
commit 70687b2e10
2 changed files with 22 additions and 1 deletions

View File

@ -0,0 +1,14 @@
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})
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.

View File

@ -1,11 +1,12 @@
Name: libwebsockets Name: libwebsockets
Version: 2.4.2 Version: 2.4.2
Release: 2 Release: 3
Summary: A lightweight C library for Websockets Summary: A lightweight C library for Websockets
License: LGPLv2 and Public Domain and BSD and MIT and zlib License: LGPLv2 and Public Domain and BSD and MIT and zlib
URL: https://libwebsockets.org URL: https://libwebsockets.org
Source0: https://github.com/warmcat/libwebsockets/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source0: https://github.com/warmcat/libwebsockets/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch6000: libwebsockets-fix-coredump.patch 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
@ -73,5 +74,11 @@ find %{buildroot} -name '*_static.pc' -exec rm -f {} ';'
%doc changelog README.md READMEs/ %doc changelog README.md READMEs/
%changelog %changelog
* Tue Jan 21 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.4.2-3
- Type:bugfix
- ID:NA
- SUG:reboot
- DESC:add bind now secure compile option
* Mon Sep 16 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.4.2-2 * Mon Sep 16 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.4.2-2
- Package init - Package init