Attachment 199619 Details for Bug 232953 – svn diff from /usr/ports

[patch] svn diff from /usr/ports

opendkim.diff (text/plain), 7.00 KB, created by Chad Jacob Milios on 2018-11-27 23:13:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chad Jacob Milios

Created: 2018-11-27 23:13:24 UTC

Size: 7.00 KB

patch

obsolete

>Index: mail/opendkim/Makefile
>===================================================================
>--- mail/opendkim/Makefile	(revision 486064)
>+++ mail/opendkim/Makefile	(working copy)
>@@ -154,12 +154,6 @@
> 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/'			 \
>@@ -175,4 +169,4 @@
> 	${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample \
> 	    ${STAGEDIR}${PREFIX}/etc/mail/
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: mail/opendkim/files/patch-miltertest_miltertest.c
>===================================================================
>--- mail/opendkim/files/patch-miltertest_miltertest.c	(nonexistent)
>+++ mail/opendkim/files/patch-miltertest_miltertest.c	(working copy)
>@@ -0,0 +1,20 @@
>+--- 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 */
>
>Property changes on: mail/opendkim/files/patch-miltertest_miltertest.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: mail/opendkim/files/patch-opendkim_opendkim-lua.c
>===================================================================
>--- mail/opendkim/files/patch-opendkim_opendkim-lua.c	(nonexistent)
>+++ mail/opendkim/files/patch-opendkim_opendkim-lua.c	(working copy)
>@@ -0,0 +1,137 @@
>+--- 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;
>
>Property changes on: mail/opendkim/files/patch-opendkim_opendkim-lua.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 232953: 198932 | 199487 | 199619 | 199968