Star0
8
Code
Code
Issues
Pull Requests2
Discussion
Wiki
Analysis
Star0
8
Merged
update to 4.3.2 #58
AtomGit-BotAdd on Jul 20, 2023
update to 4.3.2 #58
Merged
AtomGit-BotAdd on Jul 20, 2023
Merged fromrefs/pull/58/headintomaster
Total: 6 files changed+22-84
M0001-add-secure-compile-option-in-Makefile.patch+7-7
@@ -1,18 +1,18 @@
1-From 99280a207fb1af5f885662542638690e9f14fe37 Mon Sep 17 00:00:00 20011+From 5bf5e974229174f03fdaf360b8ffee1a6517e7c6 Mon Sep 17 00:00:00 2001
2-From: zhangxiaoyu <zhangxiaoyu58@huawei.com>2+From: songbuhuang <544824346@qq.com>
3-Date: Mon, 29 Nov 2021 11:26:43 +08003+Date: Thu, 20 Jul 2023 10:46:28 +0800
4-Subject: [PATCH 1/2] add secure compile option in Makefile4+Subject: [PATCH] add secure compile option in Makefile
5 5 
6-Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>6+Signed-off-by: songbuhuang <544824346@qq.com>
7---7---
8 CMakeLists.txt | 1 +8 CMakeLists.txt | 1 +
9 1 file changed, 1 insertion(+)9 1 file changed, 1 insertion(+)
10 10 
11diff --git a/CMakeLists.txt b/CMakeLists.txt11diff --git a/CMakeLists.txt b/CMakeLists.txt
12-index 6e428af8..2eb897db 10064412+index 166d48a..49d0f5f 100644
13--- a/CMakeLists.txt13--- a/CMakeLists.txt
14+++ b/CMakeLists.txt14+++ b/CMakeLists.txt
15-@@ -451,6 +451,7 @@ if (NOT CMAKE_MODULE_PATH)15+@@ -458,6 +458,7 @@ if (NOT CMAKE_MODULE_PATH)
16 endif()16 endif()
17 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")17 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
18 18
M0002-solve-the-BEP-problem.patch+7-7
@@ -1,18 +1,18 @@
1-From 47b8fcd650e77e701614cbb5def910476f33bbd6 Mon Sep 17 00:00:00 20011+From a863ca27b6012f72337cdfd539b0b6c347bba73d Mon Sep 17 00:00:00 2001
2-From: zhangxiaoyu <zhangxiaoyu58@huawei.com>2+From: songbuhuang <544824346@qq.com>
3-Date: Mon, 29 Nov 2021 11:32:52 +08003+Date: Thu, 20 Jul 2023 10:49:04 +0800
4-Subject: [PATCH 2/2] solve the BEP problem4+Subject: [PATCH] solve the BEP problem
5 5 
6-Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>6+Signed-off-by: songbuhuang <544824346@qq.com>
7---7---
8 CMakeLists.txt | 2 +-8 CMakeLists.txt | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)9 1 file changed, 1 insertion(+), 1 deletion(-)
10 10 
11diff --git a/CMakeLists.txt b/CMakeLists.txt11diff --git a/CMakeLists.txt b/CMakeLists.txt
12-index 2eb897db..5d6b254a 10064412+index 49d0f5f..be9812d 100644
13--- a/CMakeLists.txt13--- a/CMakeLists.txt
14+++ b/CMakeLists.txt14+++ b/CMakeLists.txt
15-@@ -363,7 +363,7 @@ endmacro()15+@@ -370,7 +370,7 @@ endmacro()
16 # Try to find the current Git hash16 # Try to find the current Git hash
17 #17 #
18 18
D0003-route-extend-lws_route_uidx_t-from-1-byte-to-2-bytes.patch+0-40
@@ -1,40 +0,0 @@
1-From 8bae551a6dad97f1f3b5688d917b90011cd272e1 Mon Sep 17 00:00:00 2001
2-From: wayneonway <121931005@qq.com>
3-Date: Mon, 21 Feb 2022 15:16:35 +0800
4-Subject: [PATCH] route: extend lws_route_uidx_t from 1 byte to 2 bytes
5- 
6----
7- include/libwebsockets/lws-network-helper.h | 3 ++-
8- lib/core-net/route.c | 2 +-
9- 2 files changed, 3 insertions(+), 2 deletions(-)
10- 
11-diff --git a/include/libwebsockets/lws-network-helper.h b/include/libwebsockets/lws-network-helper.h
12-index 4ad16bef..72c9f932 100644
13---- a/include/libwebsockets/lws-network-helper.h
14-+++ b/include/libwebsockets/lws-network-helper.h
15-@@ -33,7 +33,8 @@
16- #include <lwip/sockets.h>
17- #endif
18-
19--typedef uint8_t lws_route_uidx_t;
20-+/* cope with large amounts of route information */
21-+typedef uint16_t lws_route_uidx_t;
22-
23- typedef struct lws_dns_score {
24- uint8_t precedence;
25-diff --git a/lib/core-net/route.c b/lib/core-net/route.c
26-index 91744372..0f3746fe 100644
27---- a/lib/core-net/route.c
28-+++ b/lib/core-net/route.c
29-@@ -96,7 +96,7 @@ _lws_routing_table_dump(struct lws_context *cx)
30- lws_route_uidx_t
31- _lws_route_get_uidx(struct lws_context *cx)
32- {
33-- uint8_t ou;
34-+ lws_route_uidx_t ou;
35-
36- if (!cx->route_uidx)
37- cx->route_uidx++;
38---
39-2.25.1
40- 
D0004-fix-outside-array-bounds.patch+0-26
@@ -1,26 +0,0 @@
1-From e658252c1883535de8595efe1a1f4a3420e60b6a Mon Sep 17 00:00:00 2001
2-From: songbuhuang <544824346@qq.com>
3-Date: Fri, 7 Jul 2023 10:14:40 +0800
4-Subject: [PATCH] fix outside array bounds
5- 
6-Signed-off-by: songbuhuang <544824346@qq.com>
7----
8- lib/core-net/client/sort-dns.c | 2 +-
9- 1 file changed, 1 insertion(+), 1 deletion(-)
10- 
11-diff --git a/lib/core-net/client/sort-dns.c b/lib/core-net/client/sort-dns.c
12-index c8d6686..db105c5 100644
13---- a/lib/core-net/client/sort-dns.c
14-+++ b/lib/core-net/client/sort-dns.c
15-@@ -406,7 +406,7 @@ lws_sort_dns_dcomp(const lws_dns_sort_t *da, const lws_dns_sort_t *db)
16- */
17-
18- scopea = lws_ipv6_unicast_scope(to_v6_sa(&da->dest));
19-- scopeb = lws_ipv6_unicast_scope(to_v6_sa(&db));
20-+ scopeb = lws_ipv6_unicast_scope(to_v6_sa(&db->dest));
21- scope_srca = lws_ipv6_unicast_scope(to_v6_sa(&da->source));
22- scope_srcb = lws_ipv6_unicast_scope(to_v6_sa(&db->source));
23-
24---
25-2.25.1
26- 
Rlibwebsockets-4.3.0.tar.gz→libwebsockets-4.3.2.tar.gz+0-0
Binary files do not support preview
Mlibwebsockets.spec+8-4
@@ -1,6 +1,6 @@
1Name: libwebsockets1Name: libwebsockets
2-Version: 4.3.02+Version: 4.3.2
3-Release: 53+Release: 1
4Summary: A lightweight C library for Websockets4Summary: A lightweight C library for Websockets
5License: LGPLv2 and Public Domain and BSD and MIT and zlib5License: LGPLv2 and Public Domain and BSD and MIT and zlib
6URL: https://libwebsockets.org6URL: https://libwebsockets.org
@@ -8,8 +8,6 @@ Source0: https://github.com/warmcat/libwebsockets/archive/v%{version}.tar
8 8 
9Patch9001: 0001-add-secure-compile-option-in-Makefile.patch9Patch9001: 0001-add-secure-compile-option-in-Makefile.patch
10Patch9002: 0002-solve-the-BEP-problem.patch10Patch9002: 0002-solve-the-BEP-problem.patch
11-Patch9003: 0003-route-extend-lws_route_uidx_t-from-1-byte-to-2-bytes.patch
12-Patch9004: 0004-fix-outside-array-bounds.patch
13 11 
14BuildRequires: cmake openssl-devel zlib-devel libev-devel gcc gcc-c++12BuildRequires: cmake openssl-devel zlib-devel libev-devel gcc gcc-c++
15 13 
@@ -100,6 +98,12 @@ find %{buildroot} -name '*_static.pc' -exec rm -f {} ';'
100%doc changelog README.md READMEs/98%doc changelog README.md READMEs/
101 99 
102%changelog100%changelog
101+* Thu Jul 20 2023 huangsong <huangsong14@huawei.com> - 4.3.2-1
102+- Type:requirement
103+- ID:NA
104+- SUG:NA
105+- DESC:update to 4.3.2
106+ 
103* Fri Jul 07 2023 huangsong <huangsong14@huawei.com> - 4.3.0-5107* Fri Jul 07 2023 huangsong <huangsong14@huawei.com> - 4.3.0-5
104- Type:bugfix108- Type:bugfix
105- ID:NA109- ID:NA