* [Buildroot] [PATCH 2/2] package/luvi: bump version to 102-g9fa6c141a
2026-09-12 22:58 [Buildroot] [PATCH 1/2] package/luvi: fix build without c++ Bernd Kuhls
@ 2026-09-12 22:58 ` Bernd Kuhls
0 siblings, 0 replies; 2+ messages in thread
From: Bernd Kuhls @ 2026-09-12 22:58 UTC (permalink / raw)
To: buildroot
This bump includes a bump of the lua-openssl submodule
https://github.com/luvit/luvi/commit/98fa10f2823d4a9bb93306bf445d596aa8c4a75f
which is a prerequisite for the upcoming bump of OpenSSL to 4.0.2.
Removed patches 0001 & 0002 which are included in this bump.
Renumbered and rebased remaining patch.
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
Series passed Gitlab pipelines:
https://gitlab.com/bkuhls/buildroot/-/commits/465efd43cab3493abf235cecdca493fee0897397
...Lists.txt-only-require-a-C-compiler.patch} | 9 ++-
...ly-disable-GCC-diagnostics-in-ocsp.c.patch | 80 -------------------
...isable-Wincompatible-pointer-types-f.patch | 54 -------------
package/luvi/luvi.hash | 2 +-
package/luvi/luvi.mk | 2 +-
5 files changed, 7 insertions(+), 140 deletions(-)
rename package/luvi/{0003-CMakeLists.txt-only-require-a-C-compiler.patch => 0001-CMakeLists.txt-only-require-a-C-compiler.patch} (89%)
delete mode 100644 package/luvi/0001-Selectively-disable-GCC-diagnostics-in-ocsp.c.patch
delete mode 100644 package/luvi/0002-CMakeLists.txt-disable-Wincompatible-pointer-types-f.patch
diff --git a/package/luvi/0003-CMakeLists.txt-only-require-a-C-compiler.patch b/package/luvi/0001-CMakeLists.txt-only-require-a-C-compiler.patch
similarity index 89%
rename from package/luvi/0003-CMakeLists.txt-only-require-a-C-compiler.patch
rename to package/luvi/0001-CMakeLists.txt-only-require-a-C-compiler.patch
index c68e05bdc7..550c0fecf8 100644
--- a/package/luvi/0003-CMakeLists.txt-only-require-a-C-compiler.patch
+++ b/package/luvi/0001-CMakeLists.txt-only-require-a-C-compiler.patch
@@ -12,6 +12,7 @@ Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
Upstream: https://github.com/richgel999/miniz/commit/383e551cccf41fc2ce1177712d6a37a85d936642
+[Bernd: rebased for 102-g9fa6c141a]
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
deps/miniz/CMakeLists.txt | 5 +++--
@@ -34,14 +35,14 @@ index 156df83..e0933f8 100644
set(CMAKE_C_STANDARD 90)
set(CMAKE_VERBOSE_MAKEFILE ON)
# set(CMAKE_C_VISIBILITY_PRESET hidden)
-@@ -309,6 +309,7 @@ if(BUILD_FUZZERS)
+@@ -298,6 +298,7 @@ if(BUILD_FUZZERS)
endif()
if(BUILD_TESTS)
+ enable_language(CXX)
- set(CMAKE_CXX_STANDARD 20)
- set(CMAKE_CXX_STANDARD_REQUIRED YES)
-
+ set(CMAKE_CXX_STANDARD 20)
+ set(CMAKE_CXX_STANDARD_REQUIRED YES)
+
--
2.47.3
diff --git a/package/luvi/0001-Selectively-disable-GCC-diagnostics-in-ocsp.c.patch b/package/luvi/0001-Selectively-disable-GCC-diagnostics-in-ocsp.c.patch
deleted file mode 100644
index d29ba37bcf..0000000000
--- a/package/luvi/0001-Selectively-disable-GCC-diagnostics-in-ocsp.c.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 52bc36f5a548543835c24b87e7b7b72a327b1df7 Mon Sep 17 00:00:00 2001
-From: RDW <duckwhale@mail.ru>
-Date: Sun, 14 Sep 2025 00:33:10 +0200
-Subject: [PATCH] Selectively disable GCC diagnostics in ocsp.c
-
-GCC 14 fails to compile the library because -Wincompatible-pointer-types is now fatal.
-Since the warning is already disabled for clang here, might as well include GCC also.
-Needless to say, this is a workaround and a proper fix would require upstream changes.
-
-Upstream: https://github.com/zhaozg/lua-openssl/commit/bfeedbe8c06d8b4400fa670edecd452a433ddac4
-[Romain:
- - rebase on lua-openssl 0.9.0-0
- - format the patch as luvi patch (patching lua-openssl submodule)
-]
-Signed-off-by: Romain Naour <romain.naour@smile.fr>
----
- deps/lua-openssl/src/ocsp.c | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/deps/lua-openssl/src/ocsp.c b/deps/lua-openssl/src/ocsp.c
-index ac67a53..00e3b61 100644
---- a/deps/lua-openssl/src/ocsp.c
-+++ b/deps/lua-openssl/src/ocsp.c
-@@ -183,15 +183,26 @@ static int openssl_ocsp_request_read(lua_State *L)
- BIO *bio = load_bio_object(L, 1);
- int pem = lua_gettop(L) > 1 ? auxiliar_checkboolean(L, 2) : 0;
-
-+#if defined(__GNUC__)
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
-+#endif
-+
- #if defined(__clang__)
- #pragma clang diagnostic push
- #pragma clang diagnostic ignored "-Wincompatible-pointer-types"
- #endif
- OCSP_REQUEST *req = pem ? PEM_read_bio_OCSP_REQUEST(bio, NULL, NULL)
- : d2i_OCSP_REQUEST_bio(bio, NULL);
-+
-+#if defined(__GNUC__)
-+#pragma GCC diagnostic pop
-+#endif
-+
- #if defined(__clang__)
- #pragma clang diagnostic pop
- #endif
-+
- BIO_free(bio);
-
- if (req)
-@@ -359,15 +370,26 @@ static int openssl_ocsp_response_read(lua_State *L)
- int pem = lua_gettop(L) > 1 ? auxiliar_checkboolean(L, 2) : 0;
- int ret = 0;
-
-+#if defined(__GNUC__)
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
-+#endif
-+
- #if defined(__clang__)
- #pragma clang diagnostic push
- #pragma clang diagnostic ignored "-Wincompatible-pointer-types"
- #endif
- OCSP_RESPONSE *res = pem ? PEM_read_bio_OCSP_RESPONSE(bio, NULL, NULL)
- : d2i_OCSP_RESPONSE_bio(bio, NULL);
-+
-+#if defined(__GNUC__)
-+#pragma GCC diagnostic pop
-+#endif
-+
- #if defined(__clang__)
- #pragma clang diagnostic pop
- #endif
-+
- if (res)
- {
- PUSH_OBJECT(res, "openssl.ocsp_response");
---
-2.51.0
-
diff --git a/package/luvi/0002-CMakeLists.txt-disable-Wincompatible-pointer-types-f.patch b/package/luvi/0002-CMakeLists.txt-disable-Wincompatible-pointer-types-f.patch
deleted file mode 100644
index b658fed202..0000000000
--- a/package/luvi/0002-CMakeLists.txt-disable-Wincompatible-pointer-types-f.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From c82c147e83d6a21f572353bf6e95dcf3a736490c Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@smile.fr>
-Date: Sat, 13 Sep 2025 23:21:04 +0200
-Subject: [PATCH] CMakeLists.txt: disable Wincompatible-pointer-types for gcc
- >= 14
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Backport partially a patch [1] disabling GCC 14 warning
-Wincompatible-pointer-types.
-
-From [1]:
-"lua-openssl triggering the incompatible pointer types error by
-silencing the warning, which lua-openssl does internally but only for
-clang."
-
-Latest lua-openssl version (0.9.1-0) also disable this warning [2].
-
-Fixes:
-https://gitlab.com/buildroot.org/buildroot/-/jobs/11271124430 (TestLuvi)
-
-[1] https://github.com/luvit/luvi/commit/85d7d7bf51bc523159ad579d846cbefbbff38fdb
-[2] https://github.com/zhaozg/lua-openssl/commit/bfeedbe8c06d8b4400fa670edecd452a433ddac4
-
-Upstream: https://github.com/luvit/luvi/commit/85d7d7bf51bc523159ad579d846cbefbbff38fdb
-
-Signed-off-by: Romain Naour <romain.naour@smile.fr>
----
- CMakeLists.txt | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0b0007d..bf10de5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -141,6 +141,14 @@ if (WIN32)
- add_library (luvi_renamed src/luvi_renamed.c)
- endif ()
-
-+if (CMAKE_C_COMPILER_ID MATCHES "Clang|GNU")
-+ add_compile_options(-Wno-incompatible-pointer-types)
-+endif()
-+
-+if(UNIX)
-+ add_definitions(-Wall)
-+endif()
-+
- if (WITH_LUA_ENGINE STREQUAL Lua)
- add_definitions(-DWITH_PLAIN_LUA)
- endif ()
---
-2.51.0
-
diff --git a/package/luvi/luvi.hash b/package/luvi/luvi.hash
index d8825487db..4b322c119e 100644
--- a/package/luvi/luvi.hash
+++ b/package/luvi/luvi.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 f933bf1899a5419b26d46d7f111aaa50101831922716ffaed62e355b1bc9de1d luvi-v2.15.0-git4.tar.gz
+sha256 8dee14773ffa59e3015c2f3923d4fb62f0021961aa5669373f6bcf553847c73b luvi-102-g9fa6c141abf24a5a7fe49ca39335210fa1be3ab4-git4.tar.gz
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt
diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk
index 78de76aa45..157d9a1401 100644
--- a/package/luvi/luvi.mk
+++ b/package/luvi/luvi.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LUVI_VERSION = v2.15.0
+LUVI_VERSION = 102-g9fa6c141abf24a5a7fe49ca39335210fa1be3ab4
LUVI_SITE = https://github.com/luvit/luvi.git
LUVI_SITE_METHOD = git
LUVI_GIT_SUBMODULES = YES
--
2.47.3
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread