diff --git a/0001-add-secure-compile-option-in-Makefile.patch b/0001-add-secure-compile-option-in-Makefile.patch index aa1d9dca9063ecb8057843efd0cfcfa4152ebe67..c6f4eca4bf480781602270cebd4f6f3cc2e93808 100644 --- 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 -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 +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/") diff --git a/0002-solve-the-BEP-problem.patch b/0002-solve-the-BEP-problem.patch index a9e62c51bf01000233df5b4d4ba3783075f3a3e2..4f66884f6115487956d3f2891c2c111f8e4e5640 100644 --- 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 -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 +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 # diff --git a/0003-route-extend-lws_route_uidx_t-from-1-byte-to-2-bytes.patch b/0003-route-extend-lws_route_uidx_t-from-1-byte-to-2-bytes.patch deleted file mode 100644 index 2c39cd983057e00045edb08b625750cd728ae496..0000000000000000000000000000000000000000 --- a/0003-route-extend-lws_route_uidx_t-from-1-byte-to-2-bytes.patch +++ /dev/null @@ -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 - #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 - diff --git a/0004-fix-outside-array-bounds.patch b/0004-fix-outside-array-bounds.patch deleted file mode 100644 index bccbdecf100eda203426f6257fd305b74c1ff9a7..0000000000000000000000000000000000000000 --- a/0004-fix-outside-array-bounds.patch +++ /dev/null @@ -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 - diff --git a/libwebsockets-4.3.0.tar.gz b/libwebsockets-4.3.2.tar.gz similarity index 70% rename from libwebsockets-4.3.0.tar.gz rename to libwebsockets-4.3.2.tar.gz index 9225256dce87944449c4164e19bd2ed2a047e8e2..4da187334395ac367a018b69eee9e05b46b0e112 100644 Binary files a/libwebsockets-4.3.0.tar.gz and b/libwebsockets-4.3.2.tar.gz differ diff --git a/libwebsockets.spec b/libwebsockets.spec index 98e614f8886fe9855612d472d8156e43401894c7..41efb03e4e8ef59bc73cdb14f658209cf6a26fa1 100644 --- a/libwebsockets.spec +++ b/libwebsockets.spec @@ -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 - 4.3.2-1 +- Type:requirement +- ID:NA +- SUG:NA +- DESC:update to 4.3.2 + * Fri Jul 07 2023 huangsong - 4.3.0-5 - Type:bugfix - ID:NA