From nobody Mon Mar 11 15:16:04 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TtgMn1r6Fz5D90Q; Mon, 11 Mar 2024 15:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TtgMn0kPFz4XSS; Mon, 11 Mar 2024 15:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710170165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MNH8wMNoYcQ0u+7XpeUwKS7vXNeIM+p35GzfGLN1vcE=; b=Mt9UukAJcDp2w5byTaNu/dr+FYhp20aK3dPxsukbC+IsokOZrbJ/FbON33LKO9mr8Fesls 2YDJ7cwQY48RlGfAnpG9XTXcpX7BJ0g4RgiBXHrP73Kcz2opIzv6aRGsMe7v9ZGHDVsKu6 1lfk2Debp0W6Eexo5/VGiCFrW1HywRqBtQa2+V1gvBxb0JAHMi90XQokfEhBnh75CQ6U/r lqMvzBnrRNpz1On+Zkp1Rzo1qr700w17zMceqJpAG9RChg9t1GpditvH4Q6RFyTdVwmoD0 lycQm15FKgEs9B+9hePMhECwZ7Shog0/oTQrAzSDizRDOSsJQ8iZu/rHEFk+CQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710170165; a=rsa-sha256; cv=none; b=vUdlTF72Cj2WfZcko57MeuDM3+SPzRswb5No2gILZDcPdaVxzZ6mFbRwp4OEm57174RFN4 xVBsbM62uDbC2YVERYnO/jXTejNDotvIrBfm1urlgn3+3YOUq/hNRHJRNm2476cdl+l7Bo w9mNGZfxaVw8Ul2cBkN/Fw3ATNCDpfLtLgLH5XT0VXkyHKBsW9Nz1A9lql1m60tsNnNCsZ lz+y3k7uZ6QzP/La3/S1AzJjDOqJX4ejTinoXP35rMpSVzUw64lJINVZD41M93Kl9k/p0l QEWxuskuvlfNVBxydlTjrg5Py7El3rd9vfSbsOo5fq9XHsMmAlafFdAj6+AkqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710170165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MNH8wMNoYcQ0u+7XpeUwKS7vXNeIM+p35GzfGLN1vcE=; b=ZCjScz8LvGb37vZfJcp677o5mWh+J43QDd2iKLv/ACQMAn9nAfaBnU1r6tz3vA8mLB5mpM yrXr7ZYAQ377EWY/k7UkcD2NK7LJP3dd8xj9D+9zj6SZAMh7HgJKe8HM8e9nhRt+7mQJBP 5bJ4xhLj9DfEbZMA4Mo9l3nv2W0EhyIxKatdOoPGXxAfkFNtDzH9dhu1Fh05b9gcM4KDdn o9Um1WVMc3eoUFPf/QMXp7y6ICQF8vgC2+KPXlEGsXT0OX5oBuwqKXSdV04polnMt8CtgO PhdG7aZwf9gkJLVBYa2tOHOdPksvr51OUJ3GcM0+HvYca6rOSag0uJACe8VwEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TtgMn0KXBzb3N; Mon, 11 Mar 2024 15:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42BFG4jP099415; Mon, 11 Mar 2024 15:16:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42BFG4iN099413; Mon, 11 Mar 2024 15:16:04 GMT (envelope-from git) Date: Mon, 11 Mar 2024 15:16:04 GMT Message-Id: <202403111516.42BFG4iN099413@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Norikatsu Shigemura Subject: git: fb4ba36cba6f - main - mail/opendkim: Fix fail to start with lua54 if lua files is really specified List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nork X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb4ba36cba6f14d96323cee7f2e16b56a9ed205c Auto-Submitted: auto-generated The branch main has been updated by nork: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb4ba36cba6f14d96323cee7f2e16b56a9ed205c commit fb4ba36cba6f14d96323cee7f2e16b56a9ed205c Author: Yasuhito FUTATSUKI AuthorDate: 2024-03-11 15:15:30 +0000 Commit: Norikatsu Shigemura 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);