Attachment 248781 Details for Bug 276704 – a patch to fix the bug causes crash on lua 5.4

[patch] a patch to fix the bug causes crash on lua 5.4

mail_opendkim_fix_lua_patch.txt (text/plain), 4.38 KB, created by Yasuhito FUTATSUKI on 2024-02-27 07:18:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhito FUTATSUKI

Created: 2024-02-27 07:18:47 UTC

Size: 4.38 KB

patch

obsolete

>diff --git a/mail/opendkim/files/patch-miltertest_miltertest.c b/mail/opendkim/files/patch-miltertest_miltertest.c
>index bd902a7d6886..d20b746027e4 100644
>--- a/mail/opendkim/files/patch-miltertest_miltertest.c
>+++ b/mail/opendkim/files/patch-miltertest_miltertest.c
>@@ -1,6 +1,6 @@
>---- miltertest/miltertest.c.orig	2014-03-20 04:36:13 UTC
>-+++ miltertest/miltertest.c
>-@@ -4009,12 +4009,12 @@ main(int argc, char **argv)
>+--- miltertest/miltertest.c.orig	2014-03-20 13:36:13.000000000 +0900
>++++ miltertest/miltertest.c	2024-02-27 16:08:44.630920000 +0900
>+@@ -4009,13 +4009,13 @@ main(int argc, char **argv)
>  	}
>  
>  	/* register functions */
>@@ -12,10 +12,11 @@
> +#else /* LUA_VERSION_NUM >= 502 */
>  	luaL_register(l, "mt", mt_library);
> -#endif /* LUA_VERSION_NUM == 502 */
>-+#endif /* LUA_VERSION_NUM >= 502 */
>  	lua_pop(l, 1);
>++#endif /* LUA_VERSION_NUM >= 502 */
>  
>  	/* register constants */
>+ 	lua_pushnumber(l, MT_HDRINSERT);
> @@ -4163,13 +4163,13 @@ main(int argc, char **argv)
>  	lua_setglobal(l, "SMFIF_SETSYMLIST");
>  #endif /* SMFIF_SETSYMLIST */
>diff --git a/mail/opendkim/files/patch-opendkim_opendkim-lua.c b/mail/opendkim/files/patch-opendkim_opendkim-lua.c
>index 431d5a8eb1fc..c6dee84d9160 100644
>--- a/mail/opendkim/files/patch-opendkim_opendkim-lua.c
>+++ b/mail/opendkim/files/patch-opendkim_opendkim-lua.c
>@@ -1,5 +1,5 @@
>---- opendkim/opendkim-lua.c.orig	2015-02-04 00:31:11 UTC
>-+++ opendkim/opendkim-lua.c
>+--- opendkim/opendkim-lua.c.orig	2015-02-04 09:31:11.000000000 +0900
>++++ opendkim/opendkim-lua.c	2024-02-27 16:09:48.812597000 +0900
> @@ -282,11 +282,11 @@ dkimf_lua_alloc(void *ud, void *ptr, size_t osize, siz
>  		free(ptr);
>  		return NULL;
>@@ -15,7 +15,7 @@
>  	{
>  		return malloc(nsize);
>  	}
>-@@ -482,12 +482,12 @@ dkimf_lua_setup_hook(void *ctx, const char *script, si
>+@@ -482,13 +482,13 @@ dkimf_lua_setup_hook(void *ctx, const char *script, si
>  	**  Register functions.
>  	*/
>  
>@@ -27,10 +27,11 @@
> +# else /* LUA_VERSION_NUM >= 502 */
>  	luaL_register(l, "odkim", dkimf_lua_lib_setup);
> -# endif /* LUA_VERSION_NUM == 502 */
>-+# endif /* LUA_VERSION_NUM >= 502 */
>  	lua_pop(l, 1);
>++# endif /* LUA_VERSION_NUM >= 502 */
>  
>  	/*
>+ 	**  Register constants.
> @@ -529,11 +529,11 @@ dkimf_lua_setup_hook(void *ctx, const char *script, si
>  	/* import other globals */
>  	dkimf_import_globals(ctx, l);
>@@ -58,7 +59,7 @@
>  		{
>  			*keep = (void *) io.lua_io_script;
>  			*funclen = io.lua_io_len;
>-@@ -637,12 +641,12 @@ dkimf_lua_screen_hook(void *ctx, const char *script, s
>+@@ -637,13 +641,13 @@ dkimf_lua_screen_hook(void *ctx, const char *script, s
>  	**  Register functions.
>  	*/
>  
>@@ -70,10 +71,11 @@
> +# else /* LUA_VERSION_NUM >= 502 */
>  	luaL_register(l, "odkim", dkimf_lua_lib_screen);
> -# endif /* LUA_VERSION_NUM == 502 */
>-+# endif /* LUA_VERSION_NUM >= 502 */
>  	lua_pop(l, 1);
>++# endif /* LUA_VERSION_NUM >= 502 */
>  
>  	/*
>+ 	**  Register constants.
> @@ -674,11 +678,11 @@ dkimf_lua_screen_hook(void *ctx, const char *script, s
>  	/* import other globals */
>  	dkimf_import_globals(ctx, l);
>@@ -101,7 +103,7 @@
>  		{
>  			*keep = (void *) io.lua_io_script;
>  			*funclen = io.lua_io_len;
>-@@ -782,12 +790,12 @@ dkimf_lua_stats_hook(void *ctx, const char *script, si
>+@@ -782,13 +790,13 @@ dkimf_lua_stats_hook(void *ctx, const char *script, si
>  	**  Register functions.
>  	*/
>  
>@@ -113,10 +115,11 @@
> +# else /* LUA_VERSION_NUM >= 502 */
>  	luaL_register(l, "odkim", dkimf_lua_lib_stats);
> -# endif /* LUA_VERSION_NUM == 502 */
>-+# endif /* LUA_VERSION_NUM >= 502 */
>  	lua_pop(l, 1);
>++# endif /* LUA_VERSION_NUM >= 502 */
>  
>  	/*
>+ 	**  Register constants.
> @@ -911,11 +919,11 @@ dkimf_lua_stats_hook(void *ctx, const char *script, si
>  	/* import other globals */
>  	dkimf_import_globals(ctx, l);
>@@ -144,7 +147,7 @@
>  		{
>  			*keep = (void *) io.lua_io_script;
>  			*funclen = io.lua_io_len;
>-@@ -1019,12 +1031,12 @@ dkimf_lua_final_hook(void *ctx, const char *script, si
>+@@ -1019,13 +1031,13 @@ dkimf_lua_final_hook(void *ctx, const char *script, si
>  	**  Register functions.
>  	*/
>  
>@@ -156,10 +159,11 @@
> +# else /* LUA_VERSION_NUM >= 502 */
>  	luaL_register(l, "odkim", dkimf_lua_lib_final);
> -# endif /* LUA_VERSION_NUM == 502 */
>-+# endif /* LUA_VERSION_NUM >= 502 */
>  	lua_pop(l, 1);
>++# endif /* LUA_VERSION_NUM >= 502 */
>  
>  	/*
>+ 	**  Register constants.
> @@ -1148,11 +1160,11 @@ dkimf_lua_final_hook(void *ctx, const char *script, si
>  	/* import other globals */
>  	dkimf_import_globals(ctx, l);

Actions: View | Diff

Attachments on bug 276704: 248781