packages/libwebsockets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!58 update to 4.3.2

Browse Source 
* update to 4.3.2
This commit is contained in:
ger202 2023-07-20 08:43:46 +00:00 committed by haozi007
parent f569ae0989
commit 2a9bea02eb
6 changed files with 22 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
0001-add-secure-compile-option-in-Makefile.patch
View File

@ -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/")

14
0002-solve-the-BEP-problem.patch
View File

@ -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
#

40
0003-route-extend-lws_route_uidx_t-from-1-byte-to-2-bytes.patch
View File

@ -1,40 +0,0 @@
From 8bae551a6dad97f1f3b5688d917b90011cd272e1 Mon Sep 17 00:00:00 2001
From: wayneonway <121931005@qq.com>
Date: Mon, 21 Feb 2022 15:16:35 +0800
Subject: [PATCH] route: extend lws_route_uidx_t from 1 byte to 2 bytes
---
include/libwebsockets/lws-network-helper.h | 3 ++-
lib/core-net/route.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/libwebsockets/lws-network-helper.h b/include/libwebsockets/lws-network-helper.h
index 4ad16bef..72c9f932 100644
--- a/include/libwebsockets/lws-network-helper.h
+++ b/include/libwebsockets/lws-network-helper.h
@@ -33,7 +33,8 @@
#include <lwip/sockets.h>
#endif
-typedef uint8_t lws_route_uidx_t;
+/* cope with large amounts of route information */
+typedef uint16_t lws_route_uidx_t;
typedef struct lws_dns_score {
uint8_t precedence;
diff --git a/lib/core-net/route.c b/lib/core-net/route.c
index 91744372..0f3746fe 100644
--- a/lib/core-net/route.c
+++ b/lib/core-net/route.c
@@ -96,7 +96,7 @@ _lws_routing_table_dump(struct lws_context *cx)
lws_route_uidx_t
_lws_route_get_uidx(struct lws_context *cx)
{
- uint8_t ou;
+ lws_route_uidx_t ou;
if (!cx->route_uidx)
cx->route_uidx++;
--
2.25.1

26
0004-fix-outside-array-bounds.patch
View File

@ -1,26 +0,0 @@
From e658252c1883535de8595efe1a1f4a3420e60b6a Mon Sep 17 00:00:00 2001
From: songbuhuang <544824346@qq.com>
Date: Fri, 7 Jul 2023 10:14:40 +0800
Subject: [PATCH] fix outside array bounds
Signed-off-by: songbuhuang <544824346@qq.com>
---
lib/core-net/client/sort-dns.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/core-net/client/sort-dns.c b/lib/core-net/client/sort-dns.c
index c8d6686..db105c5 100644
--- a/lib/core-net/client/sort-dns.c
+++ b/lib/core-net/client/sort-dns.c
@@ -406,7 +406,7 @@ lws_sort_dns_dcomp(const lws_dns_sort_t *da, const lws_dns_sort_t *db)
*/
scopea = lws_ipv6_unicast_scope(to_v6_sa(&da->dest));
- scopeb = lws_ipv6_unicast_scope(to_v6_sa(&db));
+ scopeb = lws_ipv6_unicast_scope(to_v6_sa(&db->dest));
scope_srca = lws_ipv6_unicast_scope(to_v6_sa(&da->source));
scope_srcb = lws_ipv6_unicast_scope(to_v6_sa(&db->source));
--
2.25.1

BIN
libwebsockets-4.3.0.tar.gz → libwebsockets-4.3.2.tar.gz
View File

Binary file not shown.

12
libwebsockets.spec
View File

@ -1,6 +1,6 @@
Name: libwebsockets
Version: 4.3.0
Release: 5
Version: 4.3.2
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,6 @@ 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-route-extend-lws_route_uidx_t-from-1-byte-to-2-bytes.patch
Patch9004: 0004-fix-outside-array-bounds.patch
BuildRequires: cmake openssl-devel zlib-devel libev-devel gcc gcc-c++
@ -100,6 +98,12 @@ find %{buildroot} -name '*_static.pc' -exec rm -f {} ';'
%doc changelog README.md READMEs/
%changelog
* 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