diff options
-rw-r--r-- | opendkim.lua_load_dump.patch | 107 | ||||
-rw-r--r-- | opendkim.spec | 9 |
2 files changed, 7 insertions, 109 deletions
diff --git a/opendkim.lua_load_dump.patch b/opendkim.lua_load_dump.patch deleted file mode 100644 index d5ba92d..0000000 --- a/opendkim.lua_load_dump.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff --git a/miltertest/miltertest.c b/miltertest/miltertest.c -index 04e50c0..c96d9e3 100644 ---- a/miltertest/miltertest.c -+++ b/miltertest/miltertest.c -@@ -4168,7 +4168,7 @@ main(int argc, char **argv) - script == NULL ? "(stdin)" : script, NULL)) - #else /* LUA_VERSION_NUM == 502 */ - switch (lua_load(l, mt_lua_reader, (void *) &io, -- script == NULL ? "(stdin)" : script)) -+ script == NULL ? "(stdin)" : script, NULL)) - #endif /* LUA_VERSION_NUM == 502 */ - { - case 0: -diff --git a/opendkim/opendkim-lua.c b/opendkim/opendkim-lua.c -index 4720862..e265ba9 100644 ---- a/opendkim/opendkim-lua.c -+++ b/opendkim/opendkim-lua.c -@@ -535,7 +535,7 @@ dkimf_lua_setup_hook(void *ctx, const char *script, size_t scriptlen, - # if LUA_VERSION_NUM == 502 - 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)) -+ switch (lua_load(l, dkimf_lua_reader, (void *) &io, name, NULL)) - # endif /* LUA_VERSION_NUM == 502 */ - { - case 0: -@@ -564,7 +564,7 @@ dkimf_lua_setup_hook(void *ctx, const char *script, size_t scriptlen, - 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, NULL) == 0) - { - *keep = (void *) io.lua_io_script; - *funclen = io.lua_io_len; -@@ -680,7 +680,7 @@ dkimf_lua_screen_hook(void *ctx, const char *script, size_t scriptlen, - # if LUA_VERSION_NUM == 502 - 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)) -+ switch (lua_load(l, dkimf_lua_reader, (void *) &io, name, NULL)) - # endif /* LUA_VERSION_NUM == 502 */ - { - case 0: -@@ -709,7 +709,7 @@ dkimf_lua_screen_hook(void *ctx, const char *script, size_t scriptlen, - 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, NULL) == 0) - { - *keep = (void *) io.lua_io_script; - *funclen = io.lua_io_len; -@@ -917,7 +917,7 @@ dkimf_lua_stats_hook(void *ctx, const char *script, size_t scriptlen, - # if LUA_VERSION_NUM == 502 - 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)) -+ switch (lua_load(l, dkimf_lua_reader, (void *) &io, name, NULL)) - # endif /* LUA_VERSION_NUM == 502 */ - { - case 0: -@@ -946,7 +946,7 @@ dkimf_lua_stats_hook(void *ctx, const char *script, size_t scriptlen, - 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, NULL) == 0) - { - *keep = (void *) io.lua_io_script; - *funclen = io.lua_io_len; -@@ -1154,7 +1154,7 @@ dkimf_lua_final_hook(void *ctx, const char *script, size_t scriptlen, - # if LUA_VERSION_NUM == 502 - 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)) -+ switch (lua_load(l, dkimf_lua_reader, (void *) &io, name, NULL)) - # endif /* LUA_VERSION_NUM == 502 */ - { - case 0: -@@ -1183,7 +1183,7 @@ dkimf_lua_final_hook(void *ctx, const char *script, size_t scriptlen, - 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, NULL) == 0) - { - *keep = (void *) io.lua_io_script; - *funclen = io.lua_io_len; -@@ -1255,7 +1255,7 @@ dkimf_lua_db_hook(const char *script, size_t scriptlen, const char *query, - # if LUA_VERSION_NUM == 502 - 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)) -+ switch (lua_load(l, dkimf_lua_reader, (void *) &io, script, NULL)) - # endif /* LUA_VERSION_NUM == 502 */ - { - case 0: -@@ -1284,7 +1284,7 @@ dkimf_lua_db_hook(const char *script, size_t scriptlen, const char *query, - 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, NULL) == 0) - { - *keep = (void *) io.lua_io_script; - *funclen = io.lua_io_len; diff --git a/opendkim.spec b/opendkim.spec index ab51789..4e19f1f 100644 --- a/opendkim.spec +++ b/opendkim.spec @@ -6,7 +6,7 @@ Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail Name: opendkim Version: 2.11.0 -Release: 0.12%{?dist} +Release: 0.13%{?dist} License: BSD and Sendmail URL: http://%{name}.org/ Source0: https://github.com/trusteddomainproject/OpenDKIM/archive/%{full_version}.tar.gz @@ -173,6 +173,11 @@ exit 0 %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jun 24 2020 Tomas Korbar <tkorbar@redhat.com> - 2.11.0-0.13 +- Change /run/opendkim permissions to group writable +- Improve the patch which adds support for lua +- Credit: mdomsch + * Mon Jun 22 2020 Tomas Korbar <tkorbar@redhat.com> - 2.11.0-0.12 - Rebase to 2.11.0-beta2 version - Clean specfile and move configuration to their own files @@ -291,7 +296,7 @@ exit 0 - Remove global _pkgdocdir variable - Use defaultdocdir variable in default config file - Setting permissions special mode bit explicitly in all cases for consistency -- Change /run/opendkim permissions to group writable for Bug #1120080 +- Change /var/run/opendkim permissions to group writable for Bug #1120080 * Wed Mar 25 2015 Steve Jenkins <steve@stevejenkins.com> - 2.10.1-5 - Combined systemd and SysV spec files using conditionals |