[pkgsrc/trunk]: pkgsrc/mail/dovecot Get the arithmetic for quota right (chang...

[bouyer <bouyer%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/00a7aa0abc27
branches:  trunk
changeset: 524667:00a7aa0abc27
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Mon Jan 29 22:01:07 2007 +0000

description:
Get the arithmetic for quota right (changed to match what our quota(8)
utility does). Without this, the ration used/total displayed by clients
is right but the absolute values are wrong.
Submitted to dovecot developers, OK'd by ghen@
bump PKGREVISION

diffstat:

 mail/dovecot/Makefile         |   3 ++-
 mail/dovecot/distinfo         |   3 ++-
 mail/dovecot/patches/patch-ah |  15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diffs (46 lines):

diff -r ccb9d03a2754 -r 00a7aa0abc27 mail/dovecot/Makefile
--- a/mail/dovecot/Makefile     Mon Jan 29 21:43:54 2007 +0000
+++ b/mail/dovecot/Makefile     Mon Jan 29 22:01:07 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2007/01/23 17:34:45 ghen Exp $
+# $NetBSD: Makefile,v 1.81 2007/01/29 22:01:07 bouyer Exp $
 
 DISTNAME=              dovecot-1.0.rc19
 PKGNAME=               ${DISTNAME:S/.rc/rc/}
+PKGREVISION=           1
 CATEGORIES=            mail
 MASTER_SITES=          http://www.dovecot.org/releases/
 
diff -r ccb9d03a2754 -r 00a7aa0abc27 mail/dovecot/distinfo
--- a/mail/dovecot/distinfo     Mon Jan 29 21:43:54 2007 +0000
+++ b/mail/dovecot/distinfo     Mon Jan 29 22:01:07 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2007/01/23 17:34:45 ghen Exp $
+$NetBSD: distinfo,v 1.53 2007/01/29 22:01:07 bouyer Exp $
 
 SHA1 (dovecot-1.0.rc19.tar.gz) = c9c41ed83c775e8eecc40fe13bab135261383b82
 RMD160 (dovecot-1.0.rc19.tar.gz) = feb9e5927ab2c651273c9aaec1727b894a5a6e17
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = 6258057d49add91f06d4dd51ded72e42f6774354
 SHA1 (patch-ab) = 7a6441459bcf6d291d9fef7d99f46e825283f673
 SHA1 (patch-ag) = bd180441a0983ceccc898024370a3bdefdc11b1f
+SHA1 (patch-ah) = bc56d796b32670f59fb1476cd1c018fdd922829b
diff -r ccb9d03a2754 -r 00a7aa0abc27 mail/dovecot/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot/patches/patch-ah     Mon Jan 29 22:01:07 2007 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.3 2007/01/29 22:01:07 bouyer Exp $
+
+--- src/plugins/quota/quota-fs.c.orig  2007-01-28 22:35:32.000000000 +0100
++++ src/plugins/quota/quota-fs.c       2007-01-28 22:36:12.000000000 +0100
+@@ -250,8 +250,8 @@
+               quota_set_error(_root->setup->quota, "Internal quota error");
+               return -1;
+       }
+-      *value_r = (uint64_t)dqblk.dqb_curblocks * 1024 / DEV_BSIZE;
+-      *limit_r = (uint64_t)dqblk.dqb_bsoftlimit * 1024 / DEV_BSIZE;
++      *value_r = (uint64_t)dqblk.dqb_curblocks * DEV_BSIZE / 1024;
++      *limit_r = (uint64_t)dqblk.dqb_bsoftlimit * DEV_BSIZE / 1024;
+ #else
+       /* Solaris */
+       if (root->mount->fd == -1)