!69 [sync] PR-60: client hs: fix segmentation fault

From: @openeuler-sync-bot Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian
client hs: fix segmentation fault
2024-11-25 11:20:18 +00:00 · 2024-11-25 16:48:53 +08:00 · 2024-01-09 03:26:01 +00:00 · 2023-07-20 08:43:46 +00:00 · 2023-07-07 06:46:09 +00:00 · 2023-07-07 10:32:37 +08:00
5 changed files with 98 additions and 32 deletions
--- a/0001-add-secure-compile-option-in-Makefile.patch
+++ b/0001-add-secure-compile-option-in-Makefile.patch
@ -1,18 +1,18 @@
-From 99280a207fb1af5f885662542638690e9f14fe37 Mon Sep 17 00:00:00 2001
-From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
-Date: Mon, 29 Nov 2021 11:26:43 +0800
-Subject: [PATCH 1/2] add secure compile option in Makefile
+From 5bf5e974229174f03fdaf360b8ffee1a6517e7c6 Mon Sep 17 00:00:00 2001
+From: songbuhuang <544824346@qq.com>
+Date: Thu, 20 Jul 2023 10:46:28 +0800
+Subject: [PATCH] add secure compile option in Makefile

-Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+Signed-off-by: songbuhuang <544824346@qq.com>
 ---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6e428af8..2eb897db 100644
+index 166d48a..49d0f5f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -451,6 +451,7 @@ if (NOT CMAKE_MODULE_PATH)
+@@ -458,6 +458,7 @@ if (NOT CMAKE_MODULE_PATH)
 endif()
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
 
--- a/0002-solve-the-BEP-problem.patch
+++ b/0002-solve-the-BEP-problem.patch
@ -1,18 +1,18 @@
-From 47b8fcd650e77e701614cbb5def910476f33bbd6 Mon Sep 17 00:00:00 2001
-From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
-Date: Mon, 29 Nov 2021 11:32:52 +0800
-Subject: [PATCH 2/2] solve the BEP problem
+From a863ca27b6012f72337cdfd539b0b6c347bba73d Mon Sep 17 00:00:00 2001
+From: songbuhuang <544824346@qq.com>
+Date: Thu, 20 Jul 2023 10:49:04 +0800
+Subject: [PATCH] solve the BEP problem

-Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+Signed-off-by: songbuhuang <544824346@qq.com>
 ---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2eb897db..5d6b254a 100644
+index 49d0f5f..be9812d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -363,7 +363,7 @@ endmacro()
+@@ -370,7 +370,7 @@ endmacro()
 # Try to find the current Git hash
 #
 
--- a/0003-client-hs-fix-segmentation-fault.patch
+++ b/0003-client-hs-fix-segmentation-fault.patch
@ -0,0 +1,28 @@
+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
+
--- a/libwebsockets.spec
+++ b/libwebsockets.spec
@ -1,13 +1,14 @@
 Name:           libwebsockets
-Version:        4.3.0
+Version:        4.3.3
 Release:        2
 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
+Source0:        https://github.com/warmcat/libwebsockets/archive/v%{version}.tar.gz

-Patch9001:	0001-add-secure-compile-option-in-Makefile.patch
-Patch9002:	0002-solve-the-BEP-problem.patch
+Patch9001:      0001-add-secure-compile-option-in-Makefile.patch
+Patch9002:      0002-solve-the-BEP-problem.patch
+Patch9003:      0003-client-hs-fix-segmentation-fault.patch

 BuildRequires:  cmake openssl-devel zlib-devel libev-devel gcc gcc-c++

@ -32,6 +33,7 @@ This package contains the header files needed for developing

 %prep
 %autosetup -n %{name}-%{version} -p1
+
 %build
 mkdir -p build
 cd build
@ -98,52 +100,88 @@ find %{buildroot} -name '*_static.pc' -exec rm -f {} ';'
 %doc changelog README.md READMEs/

 %changelog
-* Tue 30 Nov 2021 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 4.3.0-2
+* Tue Aug 27 2024 liuxu <liuxu156@huawei.com> - 4.3.3-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:client hs: fix segmentation fault
+
+* Wed Dec 27 2023 Paul Thomas <paulthomas100199@gmail.com> - 4.3.3-1
+- Type: requirement
+- ID: NA
+- SUG: NA
+- DESC: update to 4.3.3
+
+* Thu Jul 20 2023 huangsong <huangsong14@huawei.com> - 4.3.2-1
+- Type:requirement
+- ID:NA
+- SUG:NA
+- DESC:update to 4.3.2
+
+* Fri Jul 07 2023 huangsong <huangsong14@huawei.com> - 4.3.0-5
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix outside array bounds of lws_dns_sort_t
+
+* Thu May 05 2022 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 4.3.0-4
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:extend lws_route_uidx_t from 1 byte to 2 bytes
+
+* Tue May 03 2022 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 4.3.0-3
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix changelog error
+
+* Tue Nov 30 2021 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 4.3.0-2
 - Type:bugfix
 - ID:NA
 - SUG:NA
 - DESC:set LWS_WITHOUT_EXTENSIONS option OFF

-* Mon 29 Nov 2021 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 4.3.0-1
+* Mon Nov 29 2021 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 4.3.0-1
 - Type:bugfix
 - ID:NA
 - SUG:NA
- DESC: add build require gcc and gcc-c++
+- DESC:add build require gcc and gcc-c++

 * Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 4.0.20-8
- DESC: delete -S git from %autosetup, and delete BuildRequires git
+- DESC:delete -S git from autosetup, and delete BuildRequires git

-* Mon 28 Jun 2021 lifeng <lifeng68@huawei.com> - 4.0.20-7
+* Mon Jun 28 2021 lifeng <lifeng68@huawei.com> - 4.0.20-7
 - Type:bugfix
 - ID:NA
 - SUG:NA
- DESC: add build require gcc and gcc-c++
+- DESC:add build require gcc and gcc-c++

-* Mon 10 May 2021 wujing <wujing50@huawei.com> - 4.0.20-6
+* Mon May 10 2021 wujing <wujing50@huawei.com> - 4.0.20-6
 - Type:bugfix
 - ID:NA
 - SUG:NA
- DESC: solve the BEP problem
+- DESC:solve the BEP problem

-* Tue 16 Mar 2021 lifeng <lifeng68@huawei.com> - 4.0.20-5
+* Tue Mar 16 2021 lifeng <lifeng68@huawei.com> - 4.0.20-5
 - Type:bugfix
 - ID:NA
 - SUG:NA
- DESC: add secure compile options
+- DESC:add secure compile options

-* Fri 19 Feb 2021 lifeng <lifeng68@huawei.com> - 4.0.20-4
+* Fri Feb 19 2021 lifeng <lifeng68@huawei.com> - 4.0.20-4
 - Type:bugfix
 - ID:NA
 - SUG:NA
- DESC: remove unused head file directory
+- DESC:remove unused head file directory

-* Fri 20 Nov 2020 jikui <jikui2@huawei.com> - 4.0.20-3
+* Fri Nov 20 2020 jikui <jikui2@huawei.com> - 4.0.20-3
 - Type:bugfix
 - ID:NA
 - SUG:NA
 - DESC:modify spec file

-* Tue 4 Aug 2020 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 4.0.20-2
+* Tue Aug 4 2020 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 4.0.20-2
 - Type:requirement
 - ID:NA
 - SUG:NA
--- a/libwebsockets-4.3.0.tar.gz
+++ b/libwebsockets-4.3.0.tar.gz
Author	SHA1	Message	Date
openeuler-ci-bot	ac5a62f7cf	!69 [sync] PR-60: client hs: fix segmentation fault From: @openeuler-sync-bot Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian	2024-11-25 11:20:18 +00:00
liuxu	dcd9865240	client hs: fix segmentation fault Signed-off-by: liuxu <liuxu156@huawei.com> (cherry picked from commit 734d9e798029860d7fdd9905ae46a1da84deda10)	2024-11-25 16:48:53 +08:00
Paul Thomas	b6bb23cb9c	!59 update to version 4.3.3 * update to version 5-1	2024-01-09 03:26:01 +00:00
ger202	2a9bea02eb	!58 update to 4.3.2 * update to 4.3.2	2023-07-20 08:43:46 +00:00
openeuler-ci-bot	f569ae0989	!57 fix outside array bounds From: @songbuhuang Reviewed-by: @jingwoo Signed-off-by: @jingwoo	2023-07-07 06:46:09 +00:00
songbuhuang	fcc24508b0	fix outside array bounds Signed-off-by: songbuhuang <544824346@qq.com>	2023-07-07 10:32:37 +08:00
openeuler-ci-bot	ff3eaa6e7a	!50 [sync] PR-46: route: extend lws_route_uidx_t from 1 byte to 2 bytes From: @openeuler-sync-bot Reviewed-by: @jingwoo Signed-off-by: @jingwoo	2022-05-05 11:19:13 +00:00
zhangxiaoyu	d7af6a85c3	route: extend lws_route_uidx_t from 1 byte to 2 bytes Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com> (cherry picked from commit a494ccc3c0d7c3f5a720f0bb1ada2be9bb1bc56a)	2022-05-05 17:08:00 +08:00
openeuler-ci-bot	b854462e32	!45 upgrade to v4.3.0 From: @zh_xiaoyu Reviewed-by: @duguhaotian, @jingwoo Signed-off-by: @jingwoo	2022-05-05 06:23:57 +00:00
zhangxiaoyu	be44ab74cf	fix changelog error Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>	2022-05-03 18:12:11 +08:00