Attachment #199619 for bug #232953




LDFLAGS+=		-lpthread
.endif

.include <bsd.port.pre.mk>

.if ${PORT_OPTIONS:MLUA} && ${LUA_VER_STR} >= 53
BROKEN=		Does not build with Lua 5.3: miltertest.c:4171:54: error: too few arguments to function call, expected 5, have 4
.endif

pre-configure:
	${REINPLACE_CMD} -e '/PKG_CHECK_MODULES/s/lua5\.[0-9]/lua-${LUA_VER}/' \
	    -e '/PKG_CONFIG/s/cyrussasl/libsasl2/'			 \

	${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample \
	    ${STAGEDIR}${PREFIX}/etc/mail/

.include <bsd.port.mk>




--- miltertest/miltertest.c.orig	2014-03-20 04:36:13 UTC
+++ miltertest/miltertest.c
@@ -4009,7 +4009,7 @@ main(int argc, char **argv)
 	}
 
 	/* register functions */
-#if LUA_VERSION_NUM == 502
+#if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
         luaL_newlib(l, mt_library);
 	lua_setglobal(l, "mt");
 #else /* LUA_VERSION_NUM == 502 */
@@ -4163,7 +4163,7 @@ 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)
 	switch (lua_load(l, mt_lua_reader, (void *) &io,
 	                 script == NULL ? "(stdin)" : script, NULL))
 #else /* LUA_VERSION_NUM == 502 */




--- opendkim/opendkim-lua.c.orig	2015-02-04 00:31:11.000000000 +0000
+++ opendkim/opendkim-lua.c	2017-06-16 03:37:07.741427000 +0000
@@ -282,7 +282,7 @@
 		free(ptr);
 		return NULL;
 	}
-# if LUA_VERSION_NUM == 502
+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
 	else if (nsize != 0 && ptr == NULL)
 # else /* LUA_VERSION_NUM == 502 */
 	else if (nsize != 0 && osize == 0)
@@ -482,7 +482,7 @@
 	**  Register functions.
 	*/
 
-# if LUA_VERSION_NUM == 502
+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
 	luaL_newlib(l, dkimf_lua_lib_setup);
 	lua_setglobal(l, "odkim");
 # else /* LUA_VERSION_NUM == 502 */
@@ -529,7 +529,7 @@
 	/* import other globals */
 	dkimf_import_globals(ctx, l);
 
-# if LUA_VERSION_NUM == 502
+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
 	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name, NULL))
 # else /* LUA_VERSION_NUM == 502 */
 	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name))
@@ -561,7 +561,7 @@
 		io.lua_io_len = 0;
 		io.lua_io_alloc = 0;
 
-		if (lua_dump(l, dkimf_lua_writer, &io) == 0)
+		if (lua_dump(l, dkimf_lua_writer, &io, 0) == 0)
 		{
 			*keep = (void *) io.lua_io_script;
 			*funclen = io.lua_io_len;
@@ -637,7 +637,7 @@
 	**  Register functions.
 	*/
 
-# if LUA_VERSION_NUM == 502
+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
 	luaL_newlib(l, dkimf_lua_lib_screen);
 	lua_setglobal(l, "odkim");
 # else /* LUA_VERSION_NUM == 502 */
@@ -674,7 +674,7 @@
 	/* import other globals */
 	dkimf_import_globals(ctx, l);
 
-# if LUA_VERSION_NUM == 502
+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
 	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name, NULL))
 # else /* LUA_VERSION_NUM == 502 */
 	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name))
@@ -706,7 +706,7 @@
 		io.lua_io_len = 0;
 		io.lua_io_alloc = 0;
 
-		if (lua_dump(l, dkimf_lua_writer, &io) == 0)
+		if (lua_dump(l, dkimf_lua_writer, &io, 0) == 0)
 		{
 			*keep = (void *) io.lua_io_script;
 			*funclen = io.lua_io_len;
@@ -782,7 +782,7 @@
 	**  Register functions.
 	*/
 
-# if LUA_VERSION_NUM == 502
+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
 	luaL_newlib(l, dkimf_lua_lib_stats);
 	lua_setglobal(l, "odkim");
 # else /* LUA_VERSION_NUM == 502 */
@@ -911,7 +911,7 @@
 	/* import other globals */
 	dkimf_import_globals(ctx, l);
 
-# if LUA_VERSION_NUM == 502
+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
 	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name, NULL))
 # else /* LUA_VERSION_NUM == 502 */
 	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name))
@@ -943,7 +943,7 @@
 		io.lua_io_len = 0;
 		io.lua_io_alloc = 0;
 
-		if (lua_dump(l, dkimf_lua_writer, &io) == 0)
+		if (lua_dump(l, dkimf_lua_writer, &io, 0) == 0)
 		{
 			*keep = (void *) io.lua_io_script;
 			*funclen = io.lua_io_len;
@@ -1019,7 +1019,7 @@
 	**  Register functions.
 	*/
 
-# if LUA_VERSION_NUM == 502
+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
 	luaL_newlib(l, dkimf_lua_lib_final);
 	lua_setglobal(l, "odkim");
 # else /* LUA_VERSION_NUM == 502 */
@@ -1148,7 +1148,7 @@
 	/* import other globals */
 	dkimf_import_globals(ctx, l);
 
-# if LUA_VERSION_NUM == 502
+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
 	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name, NULL))
 # else /* LUA_VERSION_NUM == 502 */
 	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name))
@@ -1180,7 +1180,7 @@
 		io.lua_io_len = 0;
 		io.lua_io_alloc = 0;
 
-		if (lua_dump(l, dkimf_lua_writer, &io) == 0)
+		if (lua_dump(l, dkimf_lua_writer, &io, 0) == 0)
 		{
 			*keep = (void *) io.lua_io_script;
 			*funclen = io.lua_io_len;
@@ -1249,7 +1249,7 @@
 		lua_pushstring(l, query);
 	lua_setglobal(l, "query");
 
-# if LUA_VERSION_NUM == 502
+# if (LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503)
 	switch (lua_load(l, dkimf_lua_reader, (void *) &io, script, NULL))
 # else /* LUA_VERSION_NUM == 502 */
 	switch (lua_load(l, dkimf_lua_reader, (void *) &io, script))
@@ -1281,7 +1281,7 @@
 		io.lua_io_len = 0;
 		io.lua_io_alloc = 0;
 
-		if (lua_dump(l, dkimf_lua_writer, &io) == 0)
+		if (lua_dump(l, dkimf_lua_writer, &io, 0) == 0)
 		{
 			*keep = (void *) io.lua_io_script;
 			*funclen = io.lua_io_len;

Return to bug 232953

Lines 154-165 Link Here

(-)mail/opendkim/Makefile (-7 / +1 lines)
154	LDFLAGS+= -lpthread	154	LDFLAGS+= -lpthread
155	.endif	155	.endif
156		156
157	.include <bsd.port.pre.mk>
158
159	.if ${PORT_OPTIONS:MLUA} && ${LUA_VER_STR} >= 53
160	BROKEN= Does not build with Lua 5.3: miltertest.c:4171:54: error: too few arguments to function call, expected 5, have 4
161	.endif
162
163	pre-configure:	157	pre-configure:
164	${REINPLACE_CMD} -e '/PKG_CHECK_MODULES/s/lua5\.[0-9]/lua-${LUA_VER}/' \	158	${REINPLACE_CMD} -e '/PKG_CHECK_MODULES/s/lua5\.[0-9]/lua-${LUA_VER}/' \
165	-e '/PKG_CONFIG/s/cyrussasl/libsasl2/' \	159	-e '/PKG_CONFIG/s/cyrussasl/libsasl2/' \
Lines 175-178 Link Here
175	${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample \	169	${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample \
176	${STAGEDIR}${PREFIX}/etc/mail/	170	${STAGEDIR}${PREFIX}/etc/mail/
177		171
178	.include <bsd.port.post.mk>	172	.include <bsd.port.mk>

Line 0 Link Here

(-)mail/opendkim/files/patch-miltertest_miltertest.c (+20 lines)
	1	--- miltertest/miltertest.c.orig 2014-03-20 04:36:13 UTC
	2	+++ miltertest/miltertest.c
	3	@@ -4009,7 +4009,7 @@ main(int argc, char **argv)
	4	}
	5
	6	/* register functions */
	7	-#if LUA_VERSION_NUM == 502
	8	+#if (LUA_VERSION_NUM == 502 \|\| LUA_VERSION_NUM == 503)
	9	luaL_newlib(l, mt_library);
	10	lua_setglobal(l, "mt");
	11	#else /* LUA_VERSION_NUM == 502 */
	12	@@ -4163,7 +4163,7 @@ main(int argc, char **argv)
	13	lua_setglobal(l, "SMFIF_SETSYMLIST");
	14	#endif /* SMFIF_SETSYMLIST */
	15
	16	-#if LUA_VERSION_NUM == 502
	17	+#if (LUA_VERSION_NUM == 502 \|\| LUA_VERSION_NUM == 503)
	18	switch (lua_load(l, mt_lua_reader, (void *) &io,
	19	script == NULL ? "(stdin)" : script, NULL))
	20	#else /* LUA_VERSION_NUM == 502 */

Line 0 Link Here

(-)mail/opendkim/files/patch-opendkim_opendkim-lua.c (+137 lines)
		1	--- opendkim/opendkim-lua.c.orig 2015-02-04 00:31:11.000000000 +0000
		2	+++ opendkim/opendkim-lua.c 2017-06-16 03:37:07.741427000 +0000
		3	@@ -282,7 +282,7 @@
		4	free(ptr);
		5	return NULL;
		6	}
		7	-# if LUA_VERSION_NUM == 502
		8	+# if (LUA_VERSION_NUM == 502 \|\| LUA_VERSION_NUM == 503)
		9	else if (nsize != 0 && ptr == NULL)
		10	# else /* LUA_VERSION_NUM == 502 */
		11	else if (nsize != 0 && osize == 0)
		12	@@ -482,7 +482,7 @@
		13	** Register functions.
		14	*/
		15
		16	-# if LUA_VERSION_NUM == 502
		17	+# if (LUA_VERSION_NUM == 502 \|\| LUA_VERSION_NUM == 503)
		18	luaL_newlib(l, dkimf_lua_lib_setup);
		19	lua_setglobal(l, "odkim");
		20	# else /* LUA_VERSION_NUM == 502 */
		21	@@ -529,7 +529,7 @@
		22	/* import other globals */
		23	dkimf_import_globals(ctx, l);
		24
		25	-# if LUA_VERSION_NUM == 502
		26	+# if (LUA_VERSION_NUM == 502 \|\| LUA_VERSION_NUM == 503)
		27	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name, NULL))
		28	# else /* LUA_VERSION_NUM == 502 */
		29	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name))
		30	@@ -561,7 +561,7 @@
		31	io.lua_io_len = 0;
		32	io.lua_io_alloc = 0;
		33
		34	- if (lua_dump(l, dkimf_lua_writer, &io) == 0)
		35	+ if (lua_dump(l, dkimf_lua_writer, &io, 0) == 0)
		36	{
		37	keep = (void ) io.lua_io_script;
		38	*funclen = io.lua_io_len;
		39	@@ -637,7 +637,7 @@
		40	** Register functions.
		41	*/
		42
		43	-# if LUA_VERSION_NUM == 502
		44	+# if (LUA_VERSION_NUM == 502 \|\| LUA_VERSION_NUM == 503)
		45	luaL_newlib(l, dkimf_lua_lib_screen);
		46	lua_setglobal(l, "odkim");
		47	# else /* LUA_VERSION_NUM == 502 */
		48	@@ -674,7 +674,7 @@
		49	/* import other globals */
		50	dkimf_import_globals(ctx, l);
		51
		52	-# if LUA_VERSION_NUM == 502
		53	+# if (LUA_VERSION_NUM == 502 \|\| LUA_VERSION_NUM == 503)
		54	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name, NULL))
		55	# else /* LUA_VERSION_NUM == 502 */
		56	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name))
		57	@@ -706,7 +706,7 @@
		58	io.lua_io_len = 0;
		59	io.lua_io_alloc = 0;
		60
		61	- if (lua_dump(l, dkimf_lua_writer, &io) == 0)
		62	+ if (lua_dump(l, dkimf_lua_writer, &io, 0) == 0)
		63	{
		64	keep = (void ) io.lua_io_script;
65	*funclen = io.lua_io_len;
66	@@ -782,7 +782,7 @@
67	** Register functions.
68	*/
69
70	-# if LUA_VERSION_NUM == 502
71	+# if (LUA_VERSION_NUM == 502 \|\| LUA_VERSION_NUM == 503)
72	luaL_newlib(l, dkimf_lua_lib_stats);
73	lua_setglobal(l, "odkim");
74	# else /* LUA_VERSION_NUM == 502 */
75	@@ -911,7 +911,7 @@
76	/* import other globals */
77	dkimf_import_globals(ctx, l);
78
79	-# if LUA_VERSION_NUM == 502
80	+# if (LUA_VERSION_NUM == 502 \|\| LUA_VERSION_NUM == 503)
81	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name, NULL))
82	# else /* LUA_VERSION_NUM == 502 */
83	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name))
84	@@ -943,7 +943,7 @@
85	io.lua_io_len = 0;
86	io.lua_io_alloc = 0;
87
88	- if (lua_dump(l, dkimf_lua_writer, &io) == 0)
89	+ if (lua_dump(l, dkimf_lua_writer, &io, 0) == 0)
90	{
91	keep = (void ) io.lua_io_script;
92	*funclen = io.lua_io_len;
93	@@ -1019,7 +1019,7 @@
94	** Register functions.
95	*/
96
97	-# if LUA_VERSION_NUM == 502
98	+# if (LUA_VERSION_NUM == 502 \|\| LUA_VERSION_NUM == 503)
99	luaL_newlib(l, dkimf_lua_lib_final);
100	lua_setglobal(l, "odkim");
101	# else /* LUA_VERSION_NUM == 502 */
102	@@ -1148,7 +1148,7 @@
103	/* import other globals */
104	dkimf_import_globals(ctx, l);
105
106	-# if LUA_VERSION_NUM == 502
107	+# if (LUA_VERSION_NUM == 502 \|\| LUA_VERSION_NUM == 503)
108	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name, NULL))
109	# else /* LUA_VERSION_NUM == 502 */
110	switch (lua_load(l, dkimf_lua_reader, (void *) &io, name))
111	@@ -1180,7 +1180,7 @@
112	io.lua_io_len = 0;
113	io.lua_io_alloc = 0;
114
115	- if (lua_dump(l, dkimf_lua_writer, &io) == 0)
116	+ if (lua_dump(l, dkimf_lua_writer, &io, 0) == 0)
117	{
118	keep = (void ) io.lua_io_script;
119	*funclen = io.lua_io_len;
120	@@ -1249,7 +1249,7 @@
121	lua_pushstring(l, query);
122	lua_setglobal(l, "query");
123
124	-# if LUA_VERSION_NUM == 502
125	+# if (LUA_VERSION_NUM == 502 \|\| LUA_VERSION_NUM == 503)
126	switch (lua_load(l, dkimf_lua_reader, (void *) &io, script, NULL))
127	# else /* LUA_VERSION_NUM == 502 */
128	switch (lua_load(l, dkimf_lua_reader, (void *) &io, script))
129	@@ -1281,7 +1281,7 @@
130	io.lua_io_len = 0;
131	io.lua_io_alloc = 0;
132
133	- if (lua_dump(l, dkimf_lua_writer, &io) == 0)
134	+ if (lua_dump(l, dkimf_lua_writer, &io, 0) == 0)
135	{
136	keep = (void ) io.lua_io_script;
137	*funclen = io.lua_io_len;