Date: Mon, 11 Mar 2024 15:16:04 GMT From: Norikatsu Shigemura <nork@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fb4ba36cba6f - main - mail/opendkim: Fix fail to start with lua54 if lua files is really specified Message-ID: <202403111516.42BFG4iN099413@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nork: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb4ba36cba6f14d96323cee7f2e16b56a9ed205c commit fb4ba36cba6f14d96323cee7f2e16b56a9ed205c Author: Yasuhito FUTATSUKI <freebsd-bug-report-yf@yf.bsdclub.org> AuthorDate: 2024-03-11 15:15:30 +0000 Commit: Norikatsu Shigemura <nork@FreeBSD.org> CommitDate: 2024-03-11 15:15:30 +0000 mail/opendkim: Fix fail to start with lua54 if lua files is really specified PR: 276704 Approved by: hrs (mentor), maintainer timeout --- mail/opendkim/Makefile | 2 +- mail/opendkim/files/patch-miltertest_miltertest.c | 5 +++-- mail/opendkim/files/patch-opendkim_opendkim-lua.c | 20 ++++++++++++-------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile index 9e10cdd23229..8f581a63630e 100644 --- a/mail/opendkim/Makefile +++ b/mail/opendkim/Makefile @@ -1,6 +1,6 @@ PORTNAME= opendkim PORTVERSION= 2.10.3 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= mail security MASTER_SITES= SF/${PORTNAME} \ SF/${PORTNAME}/Previous%20Releases \ diff --git a/mail/opendkim/files/patch-miltertest_miltertest.c b/mail/opendkim/files/patch-miltertest_miltertest.c index bd902a7d6886..807096a5c01a 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) +@@ -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..070539161e39 100644 --- a/mail/opendkim/files/patch-opendkim_opendkim-lua.c +++ b/mail/opendkim/files/patch-opendkim_opendkim-lua.c @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403111516.42BFG4iN099413>