[pkgsrc/pkgsrc-2006Q3]: pkgsrc/mail/dovecot Pullup ticket 1915 - requested by...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5c23b9fa3417
branches:  pkgsrc-2006Q3
changeset: 519202:5c23b9fa3417
user:      salo <salo%pkgsrc.org@localhost>
date:      Thu Nov 23 19:56:43 2006 +0000

description:
Pullup ticket 1915 - requested by ghen
security fix for dovecot

Patch provided by the submitter.

Fixes a buffer-overflow in the cache file handling.
Bump PKGREVISION.

diffstat:

 mail/dovecot/Makefile         |   3 ++-
 mail/dovecot/distinfo         |   3 ++-
 mail/dovecot/patches/patch-aj |  29 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diffs (60 lines):

diff -r 298136d0ca04 -r 5c23b9fa3417 mail/dovecot/Makefile
--- a/mail/dovecot/Makefile     Thu Nov 23 12:30:27 2006 +0000
+++ b/mail/dovecot/Makefile     Thu Nov 23 19:56:43 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.67 2006/08/18 06:46:05 ghen Exp $
+# $NetBSD: Makefile,v 1.67.2.1 2006/11/23 19:56:43 salo Exp $
 
 DISTNAME=              dovecot-1.0.rc7
 PKGNAME=               ${DISTNAME:S/.rc/rc/}
+PKGREVISION=           1
 CATEGORIES=            mail
 MASTER_SITES=          http://www.dovecot.org/releases/
 
diff -r 298136d0ca04 -r 5c23b9fa3417 mail/dovecot/distinfo
--- a/mail/dovecot/distinfo     Thu Nov 23 12:30:27 2006 +0000
+++ b/mail/dovecot/distinfo     Thu Nov 23 19:56:43 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2006/08/18 06:46:06 ghen Exp $
+$NetBSD: distinfo,v 1.40.2.1 2006/11/23 19:56:43 salo Exp $
 
 SHA1 (dovecot-1.0.rc7.tar.gz) = be1f7efe3cdf15c7581580954e42438173bb67a5
 RMD160 (dovecot-1.0.rc7.tar.gz) = 6edd633380da810d21a729330fa9c3ccec6d7039
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = b2d48d991cb57f1ae99617d26a5d9f30fcdc4700
 SHA1 (patch-ab) = 1f5ce4a9d0db770246f838ea2f9f80e66c6da287
 SHA1 (patch-ag) = ffb66cf054c0377245f3b400f65eabd975a225aa
+SHA1 (patch-aj) = 89389d5cc51d9afdc2c5dc9ac0f50aac1dd85c53
diff -r 298136d0ca04 -r 5c23b9fa3417 mail/dovecot/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot/patches/patch-aj     Thu Nov 23 19:56:43 2006 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-aj,v 1.1.2.1 2006/11/23 19:56:43 salo Exp $
+
+Fix a file-cache buffer overflow as documented in
+http://www.dovecot.org/list/dovecot-news/2006-November/000023.html
+
+From dovecot-1.0rc15.
+
+--- src/lib/file-cache.c       28 May 2006 23:43:44 -0000      1.12.2.1
++++ src/lib/file-cache.c       18 Nov 2006 23:35:35 -0000      1.12.2.4
+@@ -128,8 +128,8 @@
+       i_assert(psize > 0);
+ 
+       bits = buffer_get_space_unsafe(cache->page_bitmask, 0,
+-                                     poffset / CHAR_BIT +
+-                                     (psize + CHAR_BIT - 1) / CHAR_BIT);
++                                     (poffset + psize + CHAR_BIT - 1) /
++                                     CHAR_BIT);
+ 
+       dest_offset = poffset * page_size;
+       dest = PTR_OFFSET(cache->mmap_base, dest_offset);
+@@ -282,7 +282,7 @@
+       }
+ 
+       bits = buffer_get_space_unsafe(cache->page_bitmask, offset / CHAR_BIT,
+-                                     (size + CHAR_BIT - 1) / CHAR_BIT);
++                                     1 + (size + CHAR_BIT - 1) / CHAR_BIT);
+ 
+       /* set the first byte */
+       for (i = offset % CHAR_BIT, mask = 0; i < CHAR_BIT && size > 0; i++) {