sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mail/opendkim: Fix fail to start with lua54 if lua files is really specified

Browse source 
PR:		276704
Approved by:	hrs (mentor), maintainer timeout
This commit is contained in:
Yasuhito FUTATSUKI 2024-03-12 00:15:30 +09:00 • committed by Norikatsu Shigemura
parent 354d9da5f3
commit fb4ba36cba
No known key found for this signature in database
GPG key ID: 2D010D1315CC541F
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mail/opendkim/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= opendkim PORTNAME= opendkim
PORTVERSION= 2.10.3 PORTVERSION= 2.10.3
PORTREVISION= 18 PORTREVISION= 19
CATEGORIES= mail security CATEGORIES= mail security
MASTER_SITES= SF/${PORTNAME} \ MASTER_SITES= SF/${PORTNAME} \
SF/${PORTNAME}/Previous%20Releases \ SF/${PORTNAME}/Previous%20Releases \

5
mail/opendkim/files/patch-miltertest_miltertest.c
View file

@ -1,6 +1,6 @@
--- miltertest/miltertest.c.orig 2014-03-20 04:36:13 UTC --- miltertest/miltertest.c.orig 2014-03-20 04:36:13 UTC
+++ miltertest/miltertest.c +++ miltertest/miltertest.c
@@ -4009,12 +4009,12 @@ main(int argc, char **argv) @@ -4009,13 +4009,13 @@ main(int argc, char **argv)
} }
/* register functions */ /* register functions */
@ -12,10 +12,11 @@
+#else /* LUA_VERSION_NUM >= 502 */ +#else /* LUA_VERSION_NUM >= 502 */
luaL_register(l, "mt", mt_library); luaL_register(l, "mt", mt_library);
-#endif /* LUA_VERSION_NUM == 502 */ -#endif /* LUA_VERSION_NUM == 502 */
+#endif /* LUA_VERSION_NUM >= 502 */
lua_pop(l, 1); lua_pop(l, 1);
+#endif /* LUA_VERSION_NUM >= 502 */
/* register constants */ /* register constants */
lua_pushnumber(l, MT_HDRINSERT);
@@ -4163,13 +4163,13 @@ main(int argc, char **argv) @@ -4163,13 +4163,13 @@ main(int argc, char **argv)
lua_setglobal(l, "SMFIF_SETSYMLIST"); lua_setglobal(l, "SMFIF_SETSYMLIST");
#endif /* SMFIF_SETSYMLIST */ #endif /* SMFIF_SETSYMLIST */

20
mail/opendkim/files/patch-opendkim_opendkim-lua.c
View file

@ -15,7 +15,7 @@
{ {
return malloc(nsize); 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. ** Register functions.
*/ */
@ -27,10 +27,11 @@
+# else /* LUA_VERSION_NUM >= 502 */ +# else /* LUA_VERSION_NUM >= 502 */
luaL_register(l, "odkim", dkimf_lua_lib_setup); luaL_register(l, "odkim", dkimf_lua_lib_setup);
-# endif /* LUA_VERSION_NUM == 502 */ -# endif /* LUA_VERSION_NUM == 502 */
+# endif /* LUA_VERSION_NUM >= 502 */
lua_pop(l, 1); 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 @@ -529,11 +529,11 @@ dkimf_lua_setup_hook(void *ctx, const char *script, si
/* import other globals */ /* import other globals */
dkimf_import_globals(ctx, l); dkimf_import_globals(ctx, l);
@ -58,7 +59,7 @@
{ {
*keep = (void *) io.lua_io_script; *keep = (void *) io.lua_io_script;
*funclen = io.lua_io_len; *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. ** Register functions.
*/ */
@ -70,10 +71,11 @@
+# else /* LUA_VERSION_NUM >= 502 */ +# else /* LUA_VERSION_NUM >= 502 */
luaL_register(l, "odkim", dkimf_lua_lib_screen); luaL_register(l, "odkim", dkimf_lua_lib_screen);
-# endif /* LUA_VERSION_NUM == 502 */ -# endif /* LUA_VERSION_NUM == 502 */
+# endif /* LUA_VERSION_NUM >= 502 */
lua_pop(l, 1); 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 @@ -674,11 +678,11 @@ dkimf_lua_screen_hook(void *ctx, const char *script, s
/* import other globals */ /* import other globals */
dkimf_import_globals(ctx, l); dkimf_import_globals(ctx, l);
@ -101,7 +103,7 @@
{ {
*keep = (void *) io.lua_io_script; *keep = (void *) io.lua_io_script;
*funclen = io.lua_io_len; *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. ** Register functions.
*/ */
@ -113,10 +115,11 @@
+# else /* LUA_VERSION_NUM >= 502 */ +# else /* LUA_VERSION_NUM >= 502 */
luaL_register(l, "odkim", dkimf_lua_lib_stats); luaL_register(l, "odkim", dkimf_lua_lib_stats);
-# endif /* LUA_VERSION_NUM == 502 */ -# endif /* LUA_VERSION_NUM == 502 */
+# endif /* LUA_VERSION_NUM >= 502 */
lua_pop(l, 1); 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 @@ -911,11 +919,11 @@ dkimf_lua_stats_hook(void *ctx, const char *script, si
/* import other globals */ /* import other globals */
dkimf_import_globals(ctx, l); dkimf_import_globals(ctx, l);
@ -144,7 +147,7 @@
{ {
*keep = (void *) io.lua_io_script; *keep = (void *) io.lua_io_script;
*funclen = io.lua_io_len; *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. ** Register functions.
*/ */
@ -156,10 +159,11 @@
+# else /* LUA_VERSION_NUM >= 502 */ +# else /* LUA_VERSION_NUM >= 502 */
luaL_register(l, "odkim", dkimf_lua_lib_final); luaL_register(l, "odkim", dkimf_lua_lib_final);
-# endif /* LUA_VERSION_NUM == 502 */ -# endif /* LUA_VERSION_NUM == 502 */
+# endif /* LUA_VERSION_NUM >= 502 */
lua_pop(l, 1); 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 @@ -1148,11 +1160,11 @@ dkimf_lua_final_hook(void *ctx, const char *script, si
/* import other globals */ /* import other globals */
dkimf_import_globals(ctx, l); dkimf_import_globals(ctx, l);