Attachment #248781 for bug #276704

View | Details | Raw Unified | Return to bug 276704
Collapse All | Expand All




--- 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 */

+#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 */




--- 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;

 	{
 		return malloc(nsize);
 	}
@@ -482,13 +482,13 @@ dkimf_lua_setup_hook(void *ctx, const char *script, si
 	**  Register functions.
 	*/
 

+# 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);

 		{
 			*keep = (void *) io.lua_io_script;
 			*funclen = io.lua_io_len;
@@ -637,13 +641,13 @@ dkimf_lua_screen_hook(void *ctx, const char *script, s
 	**  Register functions.
 	*/
 

+# 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);

 		{
 			*keep = (void *) io.lua_io_script;
 			*funclen = io.lua_io_len;
@@ -782,13 +790,13 @@ dkimf_lua_stats_hook(void *ctx, const char *script, si
 	**  Register functions.
 	*/
 

+# 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);

 		{
 			*keep = (void *) io.lua_io_script;
 			*funclen = io.lua_io_len;
@@ -1019,13 +1031,13 @@ dkimf_lua_final_hook(void *ctx, const char *script, si
 	**  Register functions.
 	*/
 

+# 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);

Return to bug 276704

Lines 1-6 Link Here

(-)b/mail/opendkim/files/patch-miltertest_miltertest.c (-4 / +5 lines)
1	--- miltertest/miltertest.c.orig 2014-03-20 04:36:13 UTC	1	--- miltertest/miltertest.c.orig 2014-03-20 13:36:13.000000000 +0900
2	+++ miltertest/miltertest.c	2	+++ miltertest/miltertest.c 2024-02-27 16:08:44.630920000 +0900
3	@@ -4009,12 +4009,12 @@ main(int argc, char **argv)	3	@@ -4009,13 +4009,13 @@ main(int argc, char **argv)
4	}	4	}
5		5
6	/* register functions */	6	/* register functions */
Lines 12-21 Link Here
12	+#else /* LUA_VERSION_NUM >= 502 */	12	+#else /* LUA_VERSION_NUM >= 502 */
13	luaL_register(l, "mt", mt_library);	13	luaL_register(l, "mt", mt_library);
14	-#endif /* LUA_VERSION_NUM == 502 */	14	-#endif /* LUA_VERSION_NUM == 502 */
15	+#endif /* LUA_VERSION_NUM >= 502 */
16	lua_pop(l, 1);	15	lua_pop(l, 1);
		16	+#endif /* LUA_VERSION_NUM >= 502 */
17		17
18	/* register constants */	18	/* register constants */
		19	lua_pushnumber(l, MT_HDRINSERT);
19	@@ -4163,13 +4163,13 @@ main(int argc, char **argv)	20	@@ -4163,13 +4163,13 @@ main(int argc, char **argv)
20	lua_setglobal(l, "SMFIF_SETSYMLIST");	21	lua_setglobal(l, "SMFIF_SETSYMLIST");
21	#endif /* SMFIF_SETSYMLIST */	22	#endif /* SMFIF_SETSYMLIST */

Lines 1-5 Link Here

(-)b/mail/opendkim/files/patch-opendkim_opendkim-lua.c (-10 / +14 lines)
1	--- opendkim/opendkim-lua.c.orig 2015-02-04 00:31:11 UTC	1	--- opendkim/opendkim-lua.c.orig 2015-02-04 09:31:11.000000000 +0900
2	+++ opendkim/opendkim-lua.c	2	+++ opendkim/opendkim-lua.c 2024-02-27 16:09:48.812597000 +0900
3	@@ -282,11 +282,11 @@ dkimf_lua_alloc(void ud, void ptr, size_t osize, siz	3	@@ -282,11 +282,11 @@ dkimf_lua_alloc(void ud, void ptr, size_t osize, siz
4	free(ptr);	4	free(ptr);
5	return NULL;	5	return NULL;
Lines 15-21 Link Here
15	{	15	{
16	return malloc(nsize);	16	return malloc(nsize);
17	}	17	}
18	@@ -482,12 +482,12 @@ dkimf_lua_setup_hook(void ctx, const char script, si	18	@@ -482,13 +482,13 @@ dkimf_lua_setup_hook(void ctx, const char script, si
19	** Register functions.	19	** Register functions.
20	*/	20	*/
21		21
Lines 27-36 Link Here
27	+# else /* LUA_VERSION_NUM >= 502 */	27	+# else /* LUA_VERSION_NUM >= 502 */
28	luaL_register(l, "odkim", dkimf_lua_lib_setup);	28	luaL_register(l, "odkim", dkimf_lua_lib_setup);
29	-# endif /* LUA_VERSION_NUM == 502 */	29	-# endif /* LUA_VERSION_NUM == 502 */
30	+# endif /* LUA_VERSION_NUM >= 502 */
31	lua_pop(l, 1);	30	lua_pop(l, 1);
		31	+# endif /* LUA_VERSION_NUM >= 502 */
32		32
33	/*	33	/*
		34	** Register constants.
34	@@ -529,11 +529,11 @@ dkimf_lua_setup_hook(void ctx, const char script, si	35	@@ -529,11 +529,11 @@ dkimf_lua_setup_hook(void ctx, const char script, si
35	/* import other globals */	36	/* import other globals */
36	dkimf_import_globals(ctx, l);	37	dkimf_import_globals(ctx, l);
Lines 58-64 Link Here
58	{	59	{
59	keep = (void ) io.lua_io_script;	60	keep = (void ) io.lua_io_script;
60	*funclen = io.lua_io_len;	61	*funclen = io.lua_io_len;
61	@@ -637,12 +641,12 @@ dkimf_lua_screen_hook(void ctx, const char script, s	62	@@ -637,13 +641,13 @@ dkimf_lua_screen_hook(void ctx, const char script, s
62	** Register functions.	63	** Register functions.
63	*/	64	*/
64		65
Lines 70-79 Link Here
70	+# else /* LUA_VERSION_NUM >= 502 */	71	+# else /* LUA_VERSION_NUM >= 502 */
71	luaL_register(l, "odkim", dkimf_lua_lib_screen);	72	luaL_register(l, "odkim", dkimf_lua_lib_screen);
72	-# endif /* LUA_VERSION_NUM == 502 */	73	-# endif /* LUA_VERSION_NUM == 502 */
73	+# endif /* LUA_VERSION_NUM >= 502 */
74	lua_pop(l, 1);	74	lua_pop(l, 1);
		75	+# endif /* LUA_VERSION_NUM >= 502 */
75		76
76	/*	77	/*
		78	** Register constants.
77	@@ -674,11 +678,11 @@ dkimf_lua_screen_hook(void ctx, const char script, s	79	@@ -674,11 +678,11 @@ dkimf_lua_screen_hook(void ctx, const char script, s
78	/* import other globals */	80	/* import other globals */
79	dkimf_import_globals(ctx, l);	81	dkimf_import_globals(ctx, l);
Lines 101-107 Link Here
101	{	103	{
102	keep = (void ) io.lua_io_script;	104	keep = (void ) io.lua_io_script;
103	*funclen = io.lua_io_len;	105	*funclen = io.lua_io_len;
104	@@ -782,12 +790,12 @@ dkimf_lua_stats_hook(void ctx, const char script, si	106	@@ -782,13 +790,13 @@ dkimf_lua_stats_hook(void ctx, const char script, si
105	** Register functions.	107	** Register functions.
106	*/	108	*/
107		109
Lines 113-122 Link Here
113	+# else /* LUA_VERSION_NUM >= 502 */	115	+# else /* LUA_VERSION_NUM >= 502 */
114	luaL_register(l, "odkim", dkimf_lua_lib_stats);	116	luaL_register(l, "odkim", dkimf_lua_lib_stats);
115	-# endif /* LUA_VERSION_NUM == 502 */	117	-# endif /* LUA_VERSION_NUM == 502 */
116	+# endif /* LUA_VERSION_NUM >= 502 */
117	lua_pop(l, 1);	118	lua_pop(l, 1);
		119	+# endif /* LUA_VERSION_NUM >= 502 */
118		120
119	/*	121	/*
		122	** Register constants.
120	@@ -911,11 +919,11 @@ dkimf_lua_stats_hook(void ctx, const char script, si	123	@@ -911,11 +919,11 @@ dkimf_lua_stats_hook(void ctx, const char script, si
121	/* import other globals */	124	/* import other globals */
122	dkimf_import_globals(ctx, l);	125	dkimf_import_globals(ctx, l);
Lines 144-150 Link Here
144	{	147	{
145	keep = (void ) io.lua_io_script;	148	keep = (void ) io.lua_io_script;
146	*funclen = io.lua_io_len;	149	*funclen = io.lua_io_len;
147	@@ -1019,12 +1031,12 @@ dkimf_lua_final_hook(void ctx, const char script, si	150	@@ -1019,13 +1031,13 @@ dkimf_lua_final_hook(void ctx, const char script, si
148	** Register functions.	151	** Register functions.
149	*/	152	*/
150		153
Lines 156-165 Link Here
156	+# else /* LUA_VERSION_NUM >= 502 */	159	+# else /* LUA_VERSION_NUM >= 502 */
157	luaL_register(l, "odkim", dkimf_lua_lib_final);	160	luaL_register(l, "odkim", dkimf_lua_lib_final);
158	-# endif /* LUA_VERSION_NUM == 502 */	161	-# endif /* LUA_VERSION_NUM == 502 */
159	+# endif /* LUA_VERSION_NUM >= 502 */
160	lua_pop(l, 1);	162	lua_pop(l, 1);
		163	+# endif /* LUA_VERSION_NUM >= 502 */
161		164
162	/*	165	/*
		166	** Register constants.
163	@@ -1148,11 +1160,11 @@ dkimf_lua_final_hook(void ctx, const char script, si	167	@@ -1148,11 +1160,11 @@ dkimf_lua_final_hook(void ctx, const char script, si
164	/* import other globals */	168	/* import other globals */
165	dkimf_import_globals(ctx, l);	169	dkimf_import_globals(ctx, l);