opensmtpd: imported patch from DragonFly's dports

diff --git a/opensmtpd/distinfo b/opensmtpd/distinfo
index 35234dab0657a39db036ff8ab3f25965e29b784f..2f7058c7d9b10b692b9dec7af21d18d92b122290 100644 (file)
--- a/opensmtpd/distinfo
+++ b/opensmtpd/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.6 2016/06/01 11:47:06 wiz Exp $
 
-RMD160 (opensmtpd-6.8.0p2.tar.gz) = 740a0904594f47caa1261b4be3bc7de8165678e7
+BLAKE2s (opensmtpd-6.8.0p2.tar.gz) = 2c4877e8f2de1ba710b3da2aea0129bb4a8746a8211d2c9763bac75043f58eb4
 SHA512 (opensmtpd-6.8.0p2.tar.gz) = 48f152b75575146fdd09bdf47123041ea62fefb6e5de33a69826bf91a2126a918f8db1caffadb2f142a1a21de8126d492de88cb65bdf169e61c0b22d3e78d290
 Size (opensmtpd-6.8.0p2.tar.gz) = 860189 bytes
 SHA1 (patch-contrib_libexec_mail.local_mail.local.c) = bec19540fa52c7c6596ab5923f3a67b334ddf168
@@ -10,3 +10,4 @@ SHA1 (patch-openbsd-compat_imsg-buffer.c) = 88ca16db5dd400de14dafe7cc35d40adfd45
 SHA1 (patch-openbsd-compat_imsg.c) = ef84b7883b75bfc726085dac67b7bead16029e20
 SHA1 (patch-smtpd_proxy.c) = 895d3e9532bf53dcdb7a52825043acacac51b378
 SHA1 (patch-smtpd_smtp__session.c) = 565b1df1a6d4d3c5ee786f4501c1cd73992f2d3e
+SHA1 (patch-usr.sbin_smtpd_queue__fs.c) = f3c7f867e6542a0b080acd2b6ce9f28efed1a5e6

diff --git a/opensmtpd/patches/patch-usr.sbin_smtpd_queue__fs.c b/opensmtpd/patches/patch-usr.sbin_smtpd_queue__fs.c
new file mode 100644 (file)
index 0000000..c74423d
--- /dev/null
+++ b/opensmtpd/patches/patch-usr.sbin_smtpd_queue__fs.c
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- usr.sbin/smtpd/queue_fs.c.orig     2020-12-24 13:42:14.000000000 +0000
++++ usr.sbin/smtpd/queue_fs.c
+@@ -16,6 +16,17 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#ifdef __DragonFly__
++#include <sys/queue.h>
++/*
++ * XXX: the openbsd-compat/sys/queue.h intercepts <sys/queue.h> and our
++ * <sys/mount.h> needs "STAILQ_ENTRY(vfsconf) vfc_next;".
++ */
++#ifndef STAILQ_ENTRY
++#define STAILQ_ENTRY(type) struct { struct type *stqe_next; /* next element */ }
++#endif
++#endif
++
+ #include "includes.h"
+ 
+ #include <sys/types.h>