aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorgarga <garga@FreeBSD.org>2012-10-11 21:35:55 +0800
committergarga <garga@FreeBSD.org>2012-10-11 21:35:55 +0800
commite9f4a887bf322859dc94c043403a579bb79c5a17 (patch)
tree4336fd58ca5fb025c37a75284865ca5ee707849b /mail
parentb8dd1cb44664035a4e74ce69a59eeeaaf955fa2c (diff)
downloadfreebsd-ports-gnome-e9f4a887bf322859dc94c043403a579bb79c5a17.tar.gz
freebsd-ports-gnome-e9f4a887bf322859dc94c043403a579bb79c5a17.tar.zst
freebsd-ports-gnome-e9f4a887bf322859dc94c043403a579bb79c5a17.zip
Fix MAILDIRQUOTA patch that was calculating the wrong email size.
PR: ports/168870 Submitted by: Michael Gmelin <freebsd@grem.de> Feature safe: yes
Diffstat (limited to 'mail')
-rw-r--r--mail/qmail/Makefile1
-rw-r--r--mail/qmail/files/extra-patch-maildir++11
2 files changed, 12 insertions, 0 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 5ac3a80c3b58..ca18f80a9e08 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -378,6 +378,7 @@ DISTFILES+= ${AUTH_PATCH}:smtp_auth
.if defined(WITH_MAILDIRQUOTA_PATCH) && !defined(BARRIER_MAILDIRQUOTA_PATCH)
PATCH_SITES+= http://www.alexdupre.com/qmail/:quota
PATCHFILES+= qmail-maildir++.patch:quota
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-maildir++
.endif
.if defined(WITH_BLOCKEXEC_PATCH) && !defined(BARRIER_BLOCKEXEC_PATCH)
diff --git a/mail/qmail/files/extra-patch-maildir++ b/mail/qmail/files/extra-patch-maildir++
new file mode 100644
index 000000000000..cd8a55ec0b94
--- /dev/null
+++ b/mail/qmail/files/extra-patch-maildir++
@@ -0,0 +1,11 @@
+--- qmail-local.c.orig 2012-10-11 10:22:24.000000000 -0300
++++ qmail-local.c 2012-10-11 10:23:24.000000000 -0300
+@@ -109,7 +109,7 @@
+ s += fmt_strn(s,host,sizeof(host));
+ s += fmt_strn(s,",S=",sizeof(",S="));
+ if (fstat(0,&st) == -1) if (errno == error_noent) break;
+- s += fmt_ulong(s,st.st_size); *s++ = 0;
++ s += fmt_ulong(s,st.st_size+rpline.len+dtline.len); *s++ = 0;
+ if (stat(fntmptph,&st) == -1) if (errno == error_noent) break;
+ /* really should never get to this point */
+ if (loop == 2) _exit(1);