summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/dovecot/Makefile5
-rw-r--r--mail/dovecot/distinfo10
-rw-r--r--mail/dovecot/patches/patch-ah15
-rw-r--r--mail/dovecot/patches/patch-ak16
4 files changed, 6 insertions, 40 deletions
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 042a7679c31..48316a4ac50 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.83 2007/02/05 20:31:13 ghen Exp $
+# $NetBSD: Makefile,v 1.84 2007/02/07 08:42:50 ghen Exp $
-DISTNAME= dovecot-1.0.rc21
+DISTNAME= dovecot-1.0.rc22
PKGNAME= ${DISTNAME:S/.rc/rc/}
-PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.dovecot.org/releases/
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 8e5ad57460c..f5243e1b5bf 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.55 2007/02/05 20:31:14 ghen Exp $
+$NetBSD: distinfo,v 1.56 2007/02/07 08:42:50 ghen Exp $
-SHA1 (dovecot-1.0.rc21.tar.gz) = efe6c70af07b8792f16a578ee855deb31ecef4d6
-RMD160 (dovecot-1.0.rc21.tar.gz) = 58193d387acde95d1bec5fcfa18d4c767c207788
-Size (dovecot-1.0.rc21.tar.gz) = 1500380 bytes
+SHA1 (dovecot-1.0.rc22.tar.gz) = 966d5f1e251f63f21633666e6a65402e4129fc22
+RMD160 (dovecot-1.0.rc22.tar.gz) = e0fdb65d668f5fdaedd10d4359bd2bf3e42728d2
+Size (dovecot-1.0.rc22.tar.gz) = 1501122 bytes
SHA1 (patch-aa) = 6258057d49add91f06d4dd51ded72e42f6774354
SHA1 (patch-ab) = 7a6441459bcf6d291d9fef7d99f46e825283f673
SHA1 (patch-ag) = bd180441a0983ceccc898024370a3bdefdc11b1f
-SHA1 (patch-ah) = bc56d796b32670f59fb1476cd1c018fdd922829b
-SHA1 (patch-ak) = 2de6cac6d2e686c81a287e920c61e7bc80f7b743
diff --git a/mail/dovecot/patches/patch-ah b/mail/dovecot/patches/patch-ah
deleted file mode 100644
index 14115d318e1..00000000000
--- a/mail/dovecot/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$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)
diff --git a/mail/dovecot/patches/patch-ak b/mail/dovecot/patches/patch-ak
deleted file mode 100644
index 58d0cc1ede8..00000000000
--- a/mail/dovecot/patches/patch-ak
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2007/02/05 20:31:14 ghen Exp $
-
-From dovecot CVS, to fix "dovecot -a" segfault:
-http://dovecot.org/pipermail/dovecot/2007-February/019246.html
-
---- src/master/master-settings-defs.c.orig 2007-02-02 12:14:31.000000000 +0100
-+++ src/master/master-settings-defs.c
-@@ -96,7 +96,7 @@ static struct setting_def setting_defs[]
- DEF(SET_STR, mail_plugins),
- DEF(SET_STR, mail_plugin_dir),
- DEF(SET_STR, mail_log_prefix),
-- DEF(SET_STR, mail_log_max_lines_per_sec),
-+ DEF(SET_INT, mail_log_max_lines_per_sec),
-
- /* imap */
- DEF(SET_INT, imap_max_line_length),