diff options
Diffstat (limited to 'mail/postfix-current')
| -rw-r--r-- | mail/postfix-current/Makefile | 22 | ||||
| -rw-r--r-- | mail/postfix-current/PLIST | 55 | ||||
| -rw-r--r-- | mail/postfix-current/distinfo | 23 | ||||
| -rw-r--r-- | mail/postfix-current/patches/patch-aa | 13 | ||||
| -rw-r--r-- | mail/postfix-current/patches/patch-ad | 13 | ||||
| -rw-r--r-- | mail/postfix-current/patches/patch-af | 17 | ||||
| -rw-r--r-- | mail/postfix-current/patches/patch-ag | 6 | ||||
| -rw-r--r-- | mail/postfix-current/patches/patch-ai | 17 | ||||
| -rw-r--r-- | mail/postfix-current/patches/patch-bg | 17 | ||||
| -rw-r--r-- | mail/postfix-current/patches/patch-bk | 13 | ||||
| -rw-r--r-- | mail/postfix-current/patches/patch-bs | 17 | ||||
| -rw-r--r-- | mail/postfix-current/patches/patch-bt | 17 |
12 files changed, 145 insertions, 85 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 9bf12a1e42d..da093643cef 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.31 2004/04/21 21:09:31 cube Exp $ +# $NetBSD: Makefile,v 1.32 2004/06/06 13:50:41 taca Exp $ -DISTNAME= postfix-2.0.19-20040312 -PKGNAME= postfix-20040312 +DISTNAME= postfix-2.2-20040504 +PKGNAME= postfix-20040504 CATEGORIES= mail MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \ http://public.planetmirror.com.au/pub/postfix/experimental/ @@ -40,6 +40,7 @@ RCD_SCRIPTS= postfix .endif FIX_RPATH+= AUXLIBS +REPLACE_PERL+= examples/smtpd-policy/greylist.pl examples/smtpd-policy/spf.pl BUILD_DEFS+= POSTFIX_USE_INET6 #BUILD_DEFS+= POSTFIX_USE_TLS @@ -52,8 +53,8 @@ BUILD_DEFS+= USE_SASL2 .if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES" . include "../../security/openssl/buildlink3.mk" -PATCHFILES+= tls+ipv6-1.22-pf-2.0.19-20040312.patch.gz -PATCH_SITES+= ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.22/ +PATCHFILES+= tls+ipv6-1.24-pf-2.2-20040504.patch.gz +PATCH_SITES+= ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.24/ PATCH_DIST_STRIP= -p1 CCARGS+= -DHAS_SSL @@ -135,7 +136,7 @@ MAKE_ENV= CC="${CC}" OPT="${CFLAGS}" MAKE_ENV+= AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}" POSTFIX_CONF_FILES= conf/main.cf src/util/sys_defs.h postfix-install -POSTFIX_CONF_FILES+= conf/sample-misc.cf src/global/mail_params.h +POSTFIX_CONF_FILES+= src/global/mail_params.h FILES_SUBST+= SHAREDIR=${SHAREDIR} MESSAGE_SUBST+= SHAREDIR=${SHAREDIR} @@ -211,6 +212,15 @@ pre-install: do-install: cd ${WRKSRC} && ${SETENV} config_directory="${SHAREDIR}" \ ${SH} postfix-install -non-interactive +.if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES" + ${INSTALL_DATA} ${WRKSRC}/conf/sample-ipv6.cf ${SHAREDIR} + ${INSTALL_DATA} ${WRKSRC}/conf/sample-tls.cf ${SHAREDIR} +.endif + ${INSTALL_DATA_DIR} ${SHAREDIR}/smtpd-policy + ${INSTALL_SCRIPT} ${WRKSRC}/examples/smtpd-policy/greylist.pl \ + ${SHAREDIR}/smtpd-policy + ${INSTALL_SCRIPT} ${WRKSRC}/examples/smtpd-policy/spf.pl \ + ${SHAREDIR}/smtpd-policy .if ${OPSYS} == "Linux" . include "../../databases/db/buildlink3.mk" diff --git a/mail/postfix-current/PLIST b/mail/postfix-current/PLIST index 74f4dc11003..9ca711f1cea 100644 --- a/mail/postfix-current/PLIST +++ b/mail/postfix-current/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/03/06 15:04:12 grant Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/06/06 13:50:41 taca Exp $ bin/mailq bin/newaliases libexec/postfix/anvil @@ -39,12 +39,21 @@ man/man1/postsuper.1 man/man1/sendmail.1 man/man5/access.5 man/man5/aliases.5 +man/man5/body_checks.5 man/man5/canonical.5 +man/man5/cidr_table.5 +man/man5/header_checks.5 +man/man5/ldap_table.5 +man/man5/mysql_table.5 +man/man5/pgsql_table.5 +man/man5/postconf.5 man/man5/pcre_table.5 man/man5/regexp_table.5 man/man5/relocated.5 +man/man5/tcp_table.5 man/man5/transport.5 man/man5/virtual.5 +man/man8/anvil.8 man/man8/bounce.8 man/man8/cleanup.8 man/man8/defer.8 @@ -53,6 +62,7 @@ man/man8/flush.8 man/man8/lmtp.8 man/man8/local.8 man/man8/master.8 +man/man8/oqmgr.8 man/man8/pickup.8 man/man8/pipe.8 man/man8/proxymap.8 @@ -62,7 +72,9 @@ man/man8/showq.8 man/man8/smtp.8 man/man8/smtpd.8 man/man8/spawn.8 +man/man8/trace.8 man/man8/trivial-rewrite.8 +man/man8/verify.8 man/man8/virtual.8 sbin/postalias sbin/postcat @@ -76,32 +88,42 @@ sbin/postmap sbin/postqueue sbin/postsuper sbin/sendmail +share/doc/postfix/AAAREADME share/doc/postfix/ADDRESS_CLASS_README +share/doc/postfix/ADDRESS_REWRITING_README share/doc/postfix/ADDRESS_VERIFICATION_README +share/doc/postfix/BACKSCATTER_README +share/doc/postfix/BASIC_CONFIGURATION_README +share/doc/postfix/BUILTIN_FILTER_README +share/doc/postfix/CONTENT_INSPECTION_README +share/doc/postfix/DATABASE_README share/doc/postfix/DB_README share/doc/postfix/DEBUG_README share/doc/postfix/ETRN_README share/doc/postfix/FILTER_README -share/doc/postfix/HOSTING_README share/doc/postfix/INSTALL share/doc/postfix/LDAP_README share/doc/postfix/LINUX_README share/doc/postfix/LMTP_README share/doc/postfix/LOCAL_RECIPIENT_README -share/doc/postfix/MACOSX_README share/doc/postfix/MAILDROP_README share/doc/postfix/MYSQL_README share/doc/postfix/NFS_README +share/doc/postfix/OVERVIEW share/doc/postfix/PACKAGE_README share/doc/postfix/PCRE_README share/doc/postfix/PGSQL_README +share/doc/postfix/QSHAPE_README share/doc/postfix/QMQP_README -share/doc/postfix/SCHEDULER_README share/doc/postfix/RELEASE_NOTES +share/doc/postfix/SCHEDULER_README share/doc/postfix/RESTRICTION_CLASS_README share/doc/postfix/SASL_README +share/doc/postfix/SMTPD_ACCESS_README share/doc/postfix/SMTPD_POLICY_README share/doc/postfix/SMTPD_PROXY_README +share/doc/postfix/STANDARD_CONFIGURATION_README +share/doc/postfix/TUNING_README share/doc/postfix/ULTRIX_README share/doc/postfix/UUCP_README share/doc/postfix/VERP_README @@ -114,28 +136,9 @@ share/examples/postfix/master.cf share/examples/postfix/post-install share/examples/postfix/postfix-files share/examples/postfix/postfix-script -share/examples/postfix/sample-aliases.cf -share/examples/postfix/sample-auth.cf -share/examples/postfix/sample-compatibility.cf -share/examples/postfix/sample-debug.cf -share/examples/postfix/sample-flush.cf -share/examples/postfix/sample-ldap.cf -share/examples/postfix/sample-lmtp.cf -share/examples/postfix/sample-local.cf -share/examples/postfix/sample-mime.cf -share/examples/postfix/sample-misc.cf -share/examples/postfix/sample-pgsql-aliases.cf -share/examples/postfix/sample-qmqpd.cf -share/examples/postfix/sample-rate.cf -share/examples/postfix/sample-relocated.cf -share/examples/postfix/sample-resource.cf -share/examples/postfix/sample-rewrite.cf -share/examples/postfix/sample-scheduler.cf -share/examples/postfix/sample-smtp.cf -share/examples/postfix/sample-smtpd.cf -share/examples/postfix/sample-transport.cf -share/examples/postfix/sample-verify.cf -share/examples/postfix/sample-virtual.cf +share/examples/postfix/smtpd-policy/greylist.pl +share/examples/postfix/smtpd-policy/spf.pl +@dirrm share/examples/postfix/smtpd-policy @dirrm share/examples/postfix @dirrm share/doc/postfix @dirrm libexec/postfix diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo index 50c5b62f705..e03255fed00 100644 --- a/mail/postfix-current/distinfo +++ b/mail/postfix-current/distinfo @@ -1,17 +1,20 @@ -$NetBSD: distinfo,v 1.5 2004/05/04 19:59:06 minskim Exp $ +$NetBSD: distinfo,v 1.6 2004/06/06 13:50:41 taca Exp $ -SHA1 (postfix/postfix-2.0.19-20040312.tar.gz) = 68ade8c704c3c54ad6465d695ff9b8f0230e8758 -Size (postfix/postfix-2.0.19-20040312.tar.gz) = 1531471 bytes -SHA1 (postfix/tls+ipv6-1.22-pf-2.0.19-20040312.patch.gz) = adde688f01f56906b57968e35d66de715e5df9df -Size (postfix/tls+ipv6-1.22-pf-2.0.19-20040312.patch.gz) = 256057 bytes -SHA1 (patch-aa) = 39a89a28cec3fd264dbda97633e34695eaad01e9 +SHA1 (postfix/postfix-2.2-20040504.tar.gz) = c0b2493c8f407396117e453b011633ea72f21e93 +Size (postfix/postfix-2.2-20040504.tar.gz) = 1989111 bytes +SHA1 (postfix/tls+ipv6-1.24-pf-2.2-20040504.patch.gz) = 6bfe5abbe051fc412280fae1f7d13a7c2b8e5d13 +Size (postfix/tls+ipv6-1.24-pf-2.2-20040504.patch.gz) = 256490 bytes +SHA1 (patch-aa) = 2c29fa353a07d651b2c32a6ee2e5e80f31e1c08f SHA1 (patch-ab) = ac4c75fb7a36491edf03b54915c7a47461748b4d SHA1 (patch-ac) = b0d26742fe8496b2fd4729a41fecadc275e71cf2 -SHA1 (patch-ad) = 60d98330d4b20508c03bb0bccebbe564ffea621f SHA1 (patch-ae) = 9ea314db37541a1a9c7765e000687c0fdef90d8e -SHA1 (patch-af) = 9b0521751704fd1377d8215dc16a873c1d5ca032 -SHA1 (patch-ag) = 23f24d535d1f3922f396ce05953dc197dd390bee +SHA1 (patch-af) = db5b23950e18d6914718d785396873bcdabed941 +SHA1 (patch-ag) = e3b1bb58d193f487e0eb3844a72969dc8d9d4f61 SHA1 (patch-ah) = 6beedd15ee3a7cfd46cf3ed0b9ee579b9906300b -SHA1 (patch-ai) = eb9406c02f91d20201ebdcdc8bfadab506a1174f +SHA1 (patch-ai) = 1e9954ff10db17870f27671e8b72ea8f816802bc SHA1 (patch-bd) = 652b96357164208e39d322e84ee9a2ad2bd4ccc4 SHA1 (patch-be) = dd00235af79a8d5e46a7d393e18840241bb685a8 +SHA1 (patch-bg) = d09d7fce17e27b1e91c0914b4e7b1b3f418f5356 +SHA1 (patch-bk) = aa3516374629a525c75caca4ed89c2225c47506f +SHA1 (patch-bs) = 2dfa789f4fb2ef6fbf4ba85387c8c29bafe224c0 +SHA1 (patch-bt) = 912cc7811743ce1ff8b556085dbc2ffc73808333 diff --git a/mail/postfix-current/patches/patch-aa b/mail/postfix-current/patches/patch-aa index c51107d02ef..403a584ed98 100644 --- a/mail/postfix-current/patches/patch-aa +++ b/mail/postfix-current/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.11 2004/03/06 15:08:32 grant Exp $ +$NetBSD: patch-aa,v 1.12 2004/06/06 13:50:41 taca Exp $ ---- postfix-install.orig 2003-03-21 20:04:53.000000000 +0100 +--- postfix-install.orig 2004-04-15 00:45:23.000000000 +0900 +++ postfix-install -@@ -338,33 +338,13 @@ README files. Specify \"no\" if you do n +@@ -354,33 +354,13 @@ HTML files. Specify \"no\" if you do not : ${tempdir=`pwd`} : ${config_directory=`bin/postconf -h -d config_directory`} @@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.11 2004/03/06 15:08:32 grant Exp $ # If a parameter is not set via the command line or environment, # try to use settings from installed configuration files. -@@ -652,13 +632,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \ +@@ -715,10 +695,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \ "sample_directory = $sample_directory" \ "readme_directory = $readme_directory" \ || exit 1 @@ -46,8 +46,5 @@ $NetBSD: patch-aa,v 1.11 2004/03/06 15:08:32 grant Exp $ -# post-install processing now. - -test -n "$install_root" || { -- export daemon_directory command_directory queue_directory sendmail_path \ -- newaliases_path mailq_path mail_owner setgid_group manpage_directory \ -- sample_directory readme_directory -- ${SHELL} conf/post-install $post_install_options || exit 1 +- bin/postfix post-install $post_install_options || exit 1 -} diff --git a/mail/postfix-current/patches/patch-ad b/mail/postfix-current/patches/patch-ad deleted file mode 100644 index e2bb4c64cf8..00000000000 --- a/mail/postfix-current/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2004/03/06 15:08:32 grant Exp $ - ---- conf/sample-misc.cf.orig 2003-08-12 19:20:19.000000000 +0300 -+++ conf/sample-misc.cf 2004-01-21 08:40:15.000000000 +0200 -@@ -360,7 +360,7 @@ - # The daemon_directory parameter specifies the location of Postfix - # support programs and daemons. This directory must be owned by root. - # --daemon_directory = /usr/libexec/postfix -+daemon_directory = __PREFIX/libexec/postfix - - # The queue_directory specifies the location of the Postfix queue. - # This is also the root directory of Postfix daemons that run chrooted. diff --git a/mail/postfix-current/patches/patch-af b/mail/postfix-current/patches/patch-af index 27212df3bd4..e96ec88897b 100644 --- a/mail/postfix-current/patches/patch-af +++ b/mail/postfix-current/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.8 2004/03/06 15:08:32 grant Exp $ +$NetBSD: patch-af,v 1.9 2004/06/06 13:50:41 taca Exp $ ---- conf/main.cf.orig 2003-09-06 03:30:35.000000000 +0300 -+++ conf/main.cf 2004-01-21 08:40:42.000000000 +0200 -@@ -31,13 +31,18 @@ +--- conf/main.cf.orig 2004-04-15 22:27:21.000000000 +0900 ++++ conf/main.cf +@@ -32,13 +32,18 @@ queue_directory = /var/spool/postfix # The command_directory parameter specifies the location of all # postXXX commands. # @@ -23,7 +23,7 @@ $NetBSD: patch-af,v 1.8 2004/03/06 15:08:32 grant Exp $ # QUEUE AND PROCESS OWNERSHIP # -@@ -55,7 +60,7 @@ +@@ -56,7 +61,7 @@ mail_owner = postfix # These rights are used in the absence of a recipient user context. # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER. # @@ -32,19 +32,24 @@ $NetBSD: patch-af,v 1.8 2004/03/06 15:08:32 grant Exp $ # INTERNET HOST AND DOMAIN NAMES # -@@ -621,16 +626,16 @@ +@@ -611,7 +616,7 @@ mailq_path = # commands. This must be a group name with a numerical group ID that # is not shared with other accounts, not even with the Postfix account. # -setgid_group = +setgid_group = maildrop + # html_directory: The location of the Postfix HTML documentation. + # +@@ -619,13 +624,13 @@ html_directory = + # manpage_directory: The location of the Postfix on-line manual pages. # -manpage_directory = +manpage_directory = __PREFIX/man # sample_directory: The location of the Postfix sample configuration files. + # This parameter is obsolete as of Postfix 2.1. # -sample_directory = +sample_directory = __PREFIX/share/examples/postfix diff --git a/mail/postfix-current/patches/patch-ag b/mail/postfix-current/patches/patch-ag index 8532bd6c3fe..aa593d661d1 100644 --- a/mail/postfix-current/patches/patch-ag +++ b/mail/postfix-current/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.3 2004/05/04 19:59:06 minskim Exp $ +$NetBSD: patch-ag,v 1.4 2004/06/06 13:50:41 taca Exp $ ---- src/util/sys_defs.h.orig 2004-01-04 15:49:15.000000000 -0600 +--- src/util/sys_defs.h.orig 2004-04-15 04:49:40.000000000 +0900 +++ src/util/sys_defs.h -@@ -48,8 +48,13 @@ +@@ -50,8 +50,13 @@ #endif #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0) #define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin" diff --git a/mail/postfix-current/patches/patch-ai b/mail/postfix-current/patches/patch-ai index f4284a67ce4..1d33174f62f 100644 --- a/mail/postfix-current/patches/patch-ai +++ b/mail/postfix-current/patches/patch-ai @@ -1,17 +1,8 @@ -$NetBSD: patch-ai,v 1.5 2004/04/20 17:50:40 taca Exp $ +$NetBSD: patch-ai,v 1.6 2004/06/06 13:50:41 taca Exp $ ---- makedefs.orig 2004-04-18 20:26:56.000000000 +0900 +--- makedefs.orig 2004-04-15 04:18:06.000000000 +0900 +++ makedefs -@@ -97,7 +97,7 @@ case "$SYSTEM.$RELEASE" in - ;; - OpenBSD.3*) SYSTYPE=OPENBSD3 - ;; -- NetBSD.1*) SYSTYPE=NETBSD1 -+ NetBSD.*) SYSTYPE=NETBSD1 - ;; - BSD/OS.2*) SYSTYPE=BSDI2 - ;; -@@ -178,22 +178,6 @@ case "$SYSTEM.$RELEASE" in +@@ -182,22 +182,6 @@ case "$SYSTEM.$RELEASE" in SYSLIBS="-ldb" ;; Linux.2*) SYSTYPE=LINUX2 @@ -34,7 +25,7 @@ $NetBSD: patch-ai,v 1.5 2004/04/20 17:50:40 taca Exp $ # GDBM locks the DBM .pag file after open. This breaks postmap. # if [ -f /usr/include/gdbm-ndbm.h ] # then -@@ -204,7 +188,6 @@ case "$SYSTEM.$RELEASE" in +@@ -208,7 +192,6 @@ case "$SYSTEM.$RELEASE" in # CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'" # GDBM_LIBS=gdbm # fi diff --git a/mail/postfix-current/patches/patch-bg b/mail/postfix-current/patches/patch-bg new file mode 100644 index 00000000000..8f76730275c --- /dev/null +++ b/mail/postfix-current/patches/patch-bg @@ -0,0 +1,17 @@ +$NetBSD: patch-bg,v 1.3 2004/06/06 13:50:41 taca Exp $ + +--- src/local/file.c.orig 2002-11-17 08:44:57.000000000 +0900 ++++ src/local/file.c +@@ -181,7 +181,11 @@ int deliver_file(LOCAL_STATE state, + if (mail_copy_status & MAIL_COPY_STAT_CORRUPT) { + deliver_status = DEL_STAT_DEFER; + } else if (mail_copy_status != 0) { +- deliver_status = (errno == EAGAIN || errno == ENOSPC || errno == ESTALE ? ++ deliver_status = (errno == EAGAIN || errno == ENOSPC || ++#ifdef EDQUOT ++ errno == EDQUOT || ++#endif ++ errno == ESTALE ? + defer_append : bounce_append) + (BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr), + "cannot append message to destination file %s: %s", diff --git a/mail/postfix-current/patches/patch-bk b/mail/postfix-current/patches/patch-bk new file mode 100644 index 00000000000..1358a028aeb --- /dev/null +++ b/mail/postfix-current/patches/patch-bk @@ -0,0 +1,13 @@ +$NetBSD: patch-bk,v 1.3 2004/06/06 13:50:41 taca Exp $ + +--- src/util/sys_defs.h.orig 2004-06-06 01:38:41.000000000 +0900 ++++ src/util/sys_defs.h +@@ -951,6 +951,8 @@ extern int h_errno; + #endif + #endif + ++#define RECEIVED_ENVELOPE_FROM ++ + #define CAST_CHAR_PTR_TO_INT(cptr) ((int) (long) (cptr)) + #define CAST_INT_TO_CHAR_PTR(ival) ((char *) (long) (ival)) + diff --git a/mail/postfix-current/patches/patch-bs b/mail/postfix-current/patches/patch-bs new file mode 100644 index 00000000000..9b3dd71f057 --- /dev/null +++ b/mail/postfix-current/patches/patch-bs @@ -0,0 +1,17 @@ +$NetBSD: patch-bs,v 1.1 2004/06/06 13:50:41 taca Exp $ + +--- src/local/mailbox.c.orig 2002-11-17 08:44:57.000000000 +0900 ++++ src/local/mailbox.c +@@ -213,7 +213,11 @@ static int deliver_mailbox_file(LOCAL_ST + if (mail_copy_status & MAIL_COPY_STAT_CORRUPT) { + deliver_status = DEL_STAT_DEFER; + } else if (mail_copy_status != 0) { +- deliver_status = (errno == EAGAIN || errno == ENOSPC || errno == ESTALE ? ++ deliver_status = (errno == EAGAIN || errno == ENOSPC || ++#ifdef EDQUOT ++ errno == EDQUOT || ++#endif ++ errno == ESTALE ? + defer_append : bounce_append) + (BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr), + "cannot access mailbox %s for user %s. %s", diff --git a/mail/postfix-current/patches/patch-bt b/mail/postfix-current/patches/patch-bt new file mode 100644 index 00000000000..485fe37a21b --- /dev/null +++ b/mail/postfix-current/patches/patch-bt @@ -0,0 +1,17 @@ +$NetBSD: patch-bt,v 1.1 2004/06/06 13:50:41 taca Exp $ + +--- src/local/maildir.c.orig 2003-04-17 00:03:02.000000000 +0900 ++++ src/local/maildir.c +@@ -212,7 +212,11 @@ int deliver_maildir(LOCAL_STATE stat + if (mail_copy_status & MAIL_COPY_STAT_CORRUPT) { + deliver_status = DEL_STAT_DEFER; + } else if (mail_copy_status != 0) { +- deliver_status = (errno == ENOSPC || errno == ESTALE ? ++ deliver_status = (errno == ENOSPC || ++#ifdef EDQUOT ++ errno == EDQUOT || ++#endif ++ errno == ESTALE ? + defer_append : bounce_append) + (BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr), + "maildir delivery failed: %s", vstring_str(why)); |