diff options
Diffstat (limited to 'mail/dbmail/files')
| -rw-r--r-- | mail/dbmail/files/patch-acinclude.m4 | 19 | ||||
| -rw-r--r-- | mail/dbmail/files/patch-src_clientbase.c | 33 | ||||
| -rw-r--r-- | mail/dbmail/files/patch-src_dbmail.h.in | 11 |
3 files changed, 40 insertions, 23 deletions
diff --git a/mail/dbmail/files/patch-acinclude.m4 b/mail/dbmail/files/patch-acinclude.m4 index 8130b502937f..95087c401415 100644 --- a/mail/dbmail/files/patch-acinclude.m4 +++ b/mail/dbmail/files/patch-acinclude.m4 @@ -1,4 +1,4 @@ ---- acinclude.m4.orig 2025-01-09 16:25:33 UTC +--- acinclude.m4.orig 2025-05-31 16:37:09 UTC +++ acinclude.m4 @@ -43,7 +43,7 @@ AC_DEFINE_UNQUOTED([DM_VERSION], "$PACKAGE_VERSION", [ AC_DEFINE_UNQUOTED([DM_PWD], "$ac_pwd", [Build directory]) @@ -98,15 +98,24 @@ [JEMALLOCLIB="no"], [[ #include <jemalloc.h> -@@ -288,7 +288,7 @@ AC_DEFUN([DM_CHECK_ZDB], [dnl - CFLAGS="$CFLAGS -I${lookforzdb}/include/zdb" +@@ -285,13 +285,13 @@ AC_DEFUN([DM_CHECK_ZDB], [dnl + if test [ "x$lookforzdb" = "xno" ] ; then + CFLAGS="$CFLAGS -I${ac_default_prefix}/include/zdb -I/usr/include/zdb" + else +- CFLAGS="$CFLAGS -I${lookforzdb}/include/zdb" ++ CFLAGS="$CFLAGS -I${lookforzdb}/include -I${lookforzdb}/include/zdb" fi - AC_CHECK_HEADERS([zdb.h], +- AC_CHECK_HEADERS([zdb.h], - [ZDBLIB="-lzdb"], ++ AC_CHECK_HEADERS([zdb/zdb.h], + [ZDBLIB="-lzdb"], [ZDBLIB="failed"], [[ - #include <zdb.h> +- #include <zdb.h> ++ #include <zdb/zdb.h> + ]]) + if test [ "x$ZDBLIB" = "xfailed" ]; then + AC_MSG_ERROR([Could not find ZDB library.]) @@ -334,7 +334,7 @@ AC_DEFUN([DM_CHECK_SSL], [ AC_DEFUN([DM_CHECK_SSL], [ diff --git a/mail/dbmail/files/patch-src_clientbase.c b/mail/dbmail/files/patch-src_clientbase.c index 19e6aa57533b..aa7fb8b4f9f4 100644 --- a/mail/dbmail/files/patch-src_clientbase.c +++ b/mail/dbmail/files/patch-src_clientbase.c @@ -1,29 +1,26 @@ ---- src/clientbase.c.orig 2022-10-15 15:02:38 UTC +--- src/clientbase.c.orig 2025-10-04 10:47:08 UTC +++ src/clientbase.c -@@ -152,7 +152,7 @@ ClientBase_T * client_init(client_sock *c) +@@ -152,20 +152,20 @@ ClientBase_T * client_init(client_sock *c) client->tx = STDOUT_FILENO; } else { /* server-side */ -- if ((serr = getnameinfo(&c->saddr, c->saddr_len, client->dst_ip, -+ if ((serr = getnameinfo(&c->saddr, c->saddr.sa_len, client->dst_ip, - NI_MAXHOST, client->dst_port, - NI_MAXSERV, NI_NUMERICHOST | NI_NUMERICSERV))) { +- if ((serr = getnameinfo(&c->saddr, c->saddr_len, client->dst_ip, ++ if ((serr = getnameinfo(&c->saddr, c->saddr.sa_len, client->dst_ip, + NI_MAXHOST, client->dst_port, + NI_MAXSERV, NI_NUMERICHOST | NI_NUMERICSERV))) { TRACE(TRACE_INFO, "getnameinfo::error [%s]", gai_strerror(serr)); -@@ -160,7 +160,7 @@ ClientBase_T * client_init(client_sock *c) + } /* client-side */ +- if ((serr = getnameinfo(&c->caddr, c->caddr_len, client->src_ip, ++ if ((serr = getnameinfo(&c->caddr, c->caddr.sa_len, client->src_ip, + NI_MAXHOST-1, client->src_port, + NI_MAXSERV-1, NI_NUMERICHOST | NI_NUMERICSERV))) { + TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr)); + } if (server_conf->resolveIP) { - if ((serr = getnameinfo(&c->caddr, c->caddr_len, client->clientname, + if ((serr = getnameinfo(&c->caddr, c->caddr.sa_len, client->clientname, - NI_MAXHOST-1, NULL, 0, NI_NAMEREQD))) { - TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr)); - } -@@ -171,7 +171,7 @@ ClientBase_T * client_init(client_sock *c) - client->clientname[0] ? client->clientname : "Lookup failed"); - } else { - -- if ((serr = getnameinfo(&c->caddr, c->caddr_len, client->src_ip, -+ if ((serr = getnameinfo(&c->caddr, c->caddr.sa_len, client->src_ip, - NI_MAXHOST-1, client->src_port, - NI_MAXSERV-1, NI_NUMERICHOST | NI_NUMERICSERV))) { + NI_MAXHOST-1, NULL, 0, NI_NAMEREQD))) { TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr)); + } diff --git a/mail/dbmail/files/patch-src_dbmail.h.in b/mail/dbmail/files/patch-src_dbmail.h.in new file mode 100644 index 000000000000..7dcd44f191d5 --- /dev/null +++ b/mail/dbmail/files/patch-src_dbmail.h.in @@ -0,0 +1,11 @@ +--- src/dbmail.h.in.orig 2025-05-31 16:37:09 UTC ++++ src/dbmail.h.in +@@ -118,7 +118,7 @@ + #include <ldap.h> + #endif + +-#include <zdb.h> ++#include <zdb/zdb.h> + + #include "dm_cram.h" + #include "dm_capa.h" |