svn commit: r305722 - in head/mail/qmail: . files

[Renato Botelho]

Author: garga
Date: Thu Oct 11 13:35:55 2012
New Revision: 305722
URL: http://svn.freebsd.org/changeset/ports/305722

Log:
  Fix MAILDIRQUOTA patch that was calculating the wrong email size.
  
  PR:		ports/168870
  Submitted by:	Michael Gmelin <freebsd at grem.de>
  Feature safe:	yes

Added:
  head/mail/qmail/files/extra-patch-maildir++   (contents, props changed)
Modified:
  head/mail/qmail/Makefile

Modified: head/mail/qmail/Makefile
==============================================================================
--- head/mail/qmail/Makefile	Thu Oct 11 13:31:53 2012	(r305721)
+++ head/mail/qmail/Makefile	Thu Oct 11 13:35:55 2012	(r305722)
@@ -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)

Added: head/mail/qmail/files/extra-patch-maildir++
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/qmail/files/extra-patch-maildir++	Thu Oct 11 13:35:55 2012	(r305722)
@@ -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);