Fix Lua version checks and thus unbreak the build against Lua 5.4.

PR:		251688
Submitted by:	dim

2 files changed, 120 insertions, 41 deletions

diff --git a/mail/opendkim/files/patch-miltertest_miltertest.c b/mail/opendkim/files/patch-miltertest_miltertest.c
index 11c2ff7c7634..bd902a7d6886 100644
--- a/mail/opendkim/files/patch-miltertest_miltertest.c
+++ b/mail/opendkim/files/patch-miltertest_miltertest.c
@@ -1,20 +1,35 @@
 --- miltertest/miltertest.c.orig	2014-03-20 04:36:13 UTC
 +++ miltertest/miltertest.c
-@@ -4009,7 +4009,7 @@ main(int argc, char **argv)
+@@ -4009,12 +4009,12 @@ main(int argc, char **argv)
  	}
  
  	/* register functions */
 -#if LUA_VERSION_NUM == 502
-+#if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
++#if LUA_VERSION_NUM >= 502
          luaL_newlib(l, mt_library);
  	lua_setglobal(l, "mt");
- #else /* LUA_VERSION_NUM == 502 */
-@@ -4163,7 +4163,7 @@ main(int argc, char **argv)
+-#else /* LUA_VERSION_NUM == 502 */
++#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);
+ 
+ 	/* register constants */
+@@ -4163,13 +4163,13 @@ main(int argc, char **argv)
  	lua_setglobal(l, "SMFIF_SETSYMLIST");
  #endif /* SMFIF_SETSYMLIST */
  
 -#if LUA_VERSION_NUM == 502
-+#if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
++#if LUA_VERSION_NUM >= 502
  	switch (lua_load(l, mt_lua_reader, (void *) &io,
  	                 script == NULL ? "(stdin)" : script, NULL))
- #else /* LUA_VERSION_NUM == 502 */
+-#else /* LUA_VERSION_NUM == 502 */
++#else /* LUA_VERSION_NUM >= 502 */
+ 	switch (lua_load(l, mt_lua_reader, (void *) &io,
+ 	                 script == NULL ? "(stdin)" : script))
+-#endif /* LUA_VERSION_NUM == 502 */
++#endif /* LUA_VERSION_NUM >= 502 */
+ 	{
+ 	  case 0:
+ 		break;
diff --git a/mail/opendkim/files/patch-opendkim_opendkim-lua.c b/mail/opendkim/files/patch-opendkim_opendkim-lua.c
index a11256458223..431d5a8eb1fc 100644
--- a/mail/opendkim/files/patch-opendkim_opendkim-lua.c
+++ b/mail/opendkim/files/patch-opendkim_opendkim-lua.c
@@ -1,37 +1,56 @@
 --- opendkim/opendkim-lua.c.orig	2015-02-04 00:31:11 UTC
 +++ opendkim/opendkim-lua.c
-@@ -282,7 +282,7 @@ dkimf_lua_alloc(void *ud, void *ptr, size_t osize, siz
+@@ -282,11 +282,11 @@ dkimf_lua_alloc(void *ud, void *ptr, size_t osize, siz
  		free(ptr);
  		return NULL;
  	}
 -# if LUA_VERSION_NUM == 502
-+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
++# if LUA_VERSION_NUM >= 502
  	else if (nsize != 0 && ptr == NULL)
- # else /* LUA_VERSION_NUM == 502 */
+-# else /* LUA_VERSION_NUM == 502 */
++# else /* LUA_VERSION_NUM >= 502 */
  	else if (nsize != 0 && osize == 0)
-@@ -482,7 +482,7 @@ dkimf_lua_setup_hook(void *ctx, const char *script, si
+-# endif /* LUA_VERSION_NUM == 502 */
++# endif /* LUA_VERSION_NUM >= 502 */
+ 	{
+ 		return malloc(nsize);
+ 	}
+@@ -482,12 +482,12 @@ dkimf_lua_setup_hook(void *ctx, const char *script, si
  	**  Register functions.
  	*/
  
 -# if LUA_VERSION_NUM == 502
-+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
++# if LUA_VERSION_NUM >= 502
  	luaL_newlib(l, dkimf_lua_lib_setup);
  	lua_setglobal(l, "odkim");
- # else /* LUA_VERSION_NUM == 502 */
-@@ -529,7 +529,7 @@ dkimf_lua_setup_hook(void *ctx, const char *script, si
+-# else /* LUA_VERSION_NUM == 502 */
++# 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);
+ 
+ 	/*
+@@ -529,11 +529,11 @@ dkimf_lua_setup_hook(void *ctx, const char *script, si
  	/* import other globals */
  	dkimf_import_globals(ctx, l);
  
 -# if LUA_VERSION_NUM == 502
-+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
++# if LUA_VERSION_NUM >= 502
  	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name, NULL))
- # else /* LUA_VERSION_NUM == 502 */
+-# else /* LUA_VERSION_NUM == 502 */
++# else /* LUA_VERSION_NUM >= 502 */
  	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name))
+-# endif /* LUA_VERSION_NUM == 502 */
++# endif /* LUA_VERSION_NUM >= 502 */
+ 	{
+ 	  case 0:
+ 		break;
 @@ -561,7 +561,11 @@ dkimf_lua_setup_hook(void *ctx, const char *script, si
  		io.lua_io_len = 0;
  		io.lua_io_alloc = 0;
  
-+#if (LUA_VERSION_NUM == 503)
++#if (LUA_VERSION_NUM >= 503)
 +		if (lua_dump(l, dkimf_lua_writer, &io, 0) == 0)
 +#else
  		if (lua_dump(l, dkimf_lua_writer, &io) == 0)
@@ -39,29 +58,42 @@
  		{
  			*keep = (void *) io.lua_io_script;
  			*funclen = io.lua_io_len;
-@@ -637,7 +641,7 @@ dkimf_lua_screen_hook(void *ctx, const char *script, s
+@@ -637,12 +641,12 @@ dkimf_lua_screen_hook(void *ctx, const char *script, s
  	**  Register functions.
  	*/
  
 -# if LUA_VERSION_NUM == 502
-+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
++# if LUA_VERSION_NUM >= 502
  	luaL_newlib(l, dkimf_lua_lib_screen);
  	lua_setglobal(l, "odkim");
- # else /* LUA_VERSION_NUM == 502 */
-@@ -674,7 +678,7 @@ dkimf_lua_screen_hook(void *ctx, const char *script, s
+-# else /* LUA_VERSION_NUM == 502 */
++# 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);
+ 
+ 	/*
+@@ -674,11 +678,11 @@ dkimf_lua_screen_hook(void *ctx, const char *script, s
  	/* import other globals */
  	dkimf_import_globals(ctx, l);
  
 -# if LUA_VERSION_NUM == 502
-+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
++# if LUA_VERSION_NUM >= 502
  	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name, NULL))
- # else /* LUA_VERSION_NUM == 502 */
+-# else /* LUA_VERSION_NUM == 502 */
++# else /* LUA_VERSION_NUM >= 502 */
  	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name))
+-# endif /* LUA_VERSION_NUM == 502 */
++# endif /* LUA_VERSION_NUM >= 502 */
+ 	{
+ 	  case 0:
+ 		break;
 @@ -706,7 +710,11 @@ dkimf_lua_screen_hook(void *ctx, const char *script, s
  		io.lua_io_len = 0;
  		io.lua_io_alloc = 0;
  
-+#if (LUA_VERSION_NUM == 503)
++#if (LUA_VERSION_NUM >= 503)
 +		if (lua_dump(l, dkimf_lua_writer, &io, 0) == 0)
 +#else
  		if (lua_dump(l, dkimf_lua_writer, &io) == 0)
@@ -69,29 +101,42 @@
  		{
  			*keep = (void *) io.lua_io_script;
  			*funclen = io.lua_io_len;
-@@ -782,7 +790,7 @@ dkimf_lua_stats_hook(void *ctx, const char *script, si
+@@ -782,12 +790,12 @@ dkimf_lua_stats_hook(void *ctx, const char *script, si
  	**  Register functions.
  	*/
  
 -# if LUA_VERSION_NUM == 502
-+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
++# if LUA_VERSION_NUM >= 502
  	luaL_newlib(l, dkimf_lua_lib_stats);
  	lua_setglobal(l, "odkim");
- # else /* LUA_VERSION_NUM == 502 */
-@@ -911,7 +919,7 @@ dkimf_lua_stats_hook(void *ctx, const char *script, si
+-# else /* LUA_VERSION_NUM == 502 */
++# 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);
+ 
+ 	/*
+@@ -911,11 +919,11 @@ dkimf_lua_stats_hook(void *ctx, const char *script, si
  	/* import other globals */
  	dkimf_import_globals(ctx, l);
  
 -# if LUA_VERSION_NUM == 502
-+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
++# if LUA_VERSION_NUM >= 502
  	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name, NULL))
- # else /* LUA_VERSION_NUM == 502 */
+-# else /* LUA_VERSION_NUM == 502 */
++# else /* LUA_VERSION_NUM >= 502 */
  	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name))
+-# endif /* LUA_VERSION_NUM == 502 */
++# endif /* LUA_VERSION_NUM >= 502 */
+ 	{
+ 	  case 0:
+ 		break;
 @@ -943,7 +951,11 @@ dkimf_lua_stats_hook(void *ctx, const char *script, si
  		io.lua_io_len = 0;
  		io.lua_io_alloc = 0;
  
-+#if (LUA_VERSION_NUM == 503)
++#if (LUA_VERSION_NUM >= 503)
 +		if (lua_dump(l, dkimf_lua_writer, &io, 0) == 0)
 +#else
  		if (lua_dump(l, dkimf_lua_writer, &io) == 0)
@@ -99,29 +144,42 @@
  		{
  			*keep = (void *) io.lua_io_script;
  			*funclen = io.lua_io_len;
-@@ -1019,7 +1031,7 @@ dkimf_lua_final_hook(void *ctx, const char *script, si
+@@ -1019,12 +1031,12 @@ dkimf_lua_final_hook(void *ctx, const char *script, si
  	**  Register functions.
  	*/
  
 -# if LUA_VERSION_NUM == 502
-+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
++# if LUA_VERSION_NUM >= 502
  	luaL_newlib(l, dkimf_lua_lib_final);
  	lua_setglobal(l, "odkim");
- # else /* LUA_VERSION_NUM == 502 */
-@@ -1148,7 +1160,7 @@ dkimf_lua_final_hook(void *ctx, const char *script, si
+-# else /* LUA_VERSION_NUM == 502 */
++# 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);
+ 
+ 	/*
+@@ -1148,11 +1160,11 @@ dkimf_lua_final_hook(void *ctx, const char *script, si
  	/* import other globals */
  	dkimf_import_globals(ctx, l);
  
 -# if LUA_VERSION_NUM == 502
-+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
++# if LUA_VERSION_NUM >= 502
  	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name, NULL))
- # else /* LUA_VERSION_NUM == 502 */
+-# else /* LUA_VERSION_NUM == 502 */
++# else /* LUA_VERSION_NUM >= 502 */
  	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name))
+-# endif /* LUA_VERSION_NUM == 502 */
++# endif /* LUA_VERSION_NUM >= 502 */
+ 	{
+ 	  case 0:
+ 		break;
 @@ -1180,7 +1192,11 @@ dkimf_lua_final_hook(void *ctx, const char *script, si
  		io.lua_io_len = 0;
  		io.lua_io_alloc = 0;
  
-+#if (LUA_VERSION_NUM == 503)
++#if (LUA_VERSION_NUM >= 503)
 +		if (lua_dump(l, dkimf_lua_writer, &io, 0) == 0)
 +#else
  		if (lua_dump(l, dkimf_lua_writer, &io) == 0)
@@ -129,20 +187,26 @@
  		{
  			*keep = (void *) io.lua_io_script;
  			*funclen = io.lua_io_len;
-@@ -1249,7 +1265,7 @@ dkimf_lua_db_hook(const char *script, size_t scriptlen
+@@ -1249,11 +1265,11 @@ dkimf_lua_db_hook(const char *script, size_t scriptlen
  		lua_pushstring(l, query);
  	lua_setglobal(l, "query");
  
 -# if LUA_VERSION_NUM == 502
-+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
++# if LUA_VERSION_NUM >= 502
  	switch (lua_load(l, dkimf_lua_reader, (void *) &io, script, NULL))
- # else /* LUA_VERSION_NUM == 502 */
+-# else /* LUA_VERSION_NUM == 502 */
++# else /* LUA_VERSION_NUM >= 502 */
  	switch (lua_load(l, dkimf_lua_reader, (void *) &io, script))
+-# endif /* LUA_VERSION_NUM == 502 */
++# endif /* LUA_VERSION_NUM >= 502 */
+ 	{
+ 	  case 0:
+ 		break;
 @@ -1281,7 +1297,11 @@ dkimf_lua_db_hook(const char *script, size_t scriptlen
  		io.lua_io_len = 0;
  		io.lua_io_alloc = 0;
  
-+#if (LUA_VERSION_NUM == 503)
++#if (LUA_VERSION_NUM >= 503)
 +		if (lua_dump(l, dkimf_lua_writer, &io, 0) == 0)
 +#else
  		if (lua_dump(l, dkimf_lua_writer, &io) == 0)