Fix complaint about Base64: overflowed buffer.

Patch from Fedora.

4 files changed, 37 insertions, 3 deletions

diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index a7e4a90ef37..ffe0a090e80 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2012/10/08 23:02:00 adam Exp $
+# $NetBSD: Makefile,v 1.72 2012/10/10 19:39:57 markd Exp $
 #
 
 DISTNAME=	mail-notification-5.4
-PKGREVISION=	19
+PKGREVISION=	20
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://savannah.nongnu.org/download/mailnotify/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/mail-notification/distinfo b/mail/mail-notification/distinfo
index 5e7e4f96bf7..d02e03457f3 100644
--- a/mail/mail-notification/distinfo
+++ b/mail/mail-notification/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2009/11/10 20:33:38 markd Exp $
+$NetBSD: distinfo,v 1.14 2012/10/10 19:39:57 markd Exp $
 
 SHA1 (mail-notification-5.4.tar.bz2) = c148449c5d2fd0a75571e4e42932da1f1ae013f6
 RMD160 (mail-notification-5.4.tar.bz2) = 64946509ef99fdeba8ff547ffac3830c36131484
@@ -7,3 +7,5 @@ SHA1 (patch-ag) = c337f8df3898c4fb1055525b6756b0586c396883
 SHA1 (patch-ah) = 572787f23bfca47ff10f6ef1dd796a1dce0d20ff
 SHA1 (patch-ai) = 0178794de2141bed09f51bd5c80405b785d688b0
 SHA1 (patch-aj) = 694c3f99157189c357eaef32913c3d9c7d61162a
+SHA1 (patch-build_src_mn-pop3-mailbox.c) = 26a59e91c227f277962cb613d04facdb95682aea
+SHA1 (patch-src_mn-client-session.c) = 6c858d4491738484a38593c31ebbd34163a04eee
diff --git a/mail/mail-notification/patches/patch-build_src_mn-pop3-mailbox.c b/mail/mail-notification/patches/patch-build_src_mn-pop3-mailbox.c
new file mode 100644
index 00000000000..03cfddcd592
--- /dev/null
+++ b/mail/mail-notification/patches/patch-build_src_mn-pop3-mailbox.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-build_src_mn-pop3-mailbox.c,v 1.1 2012/10/10 19:39:57 markd Exp $
+
+Fix complaint about Base64: overflowed buffer. 
+Patch from Fedora. 
+
+--- build/src/mn-pop3-mailbox.c.orig	2008-05-22 15:47:50.000000000 +0000
++++ build/src/mn-pop3-mailbox.c
+@@ -742,7 +742,7 @@ mn_pop3_mailbox_enter_auth_cb (MNClientS
+ 
+ 	if (initial_clientoutlen > 0)
+ 	  {
+-	    char buf64[initial_clientoutlen * 2]; /* Base64 is 33% larger than the data it encodes */
++	    char buf64[initial_clientoutlen * 2 + 1]; /* Base64 is 33% larger than the data it encodes */
+ 	    unsigned int outlen;
+ 	    int result;
+ 	    char *str;
diff --git a/mail/mail-notification/patches/patch-src_mn-client-session.c b/mail/mail-notification/patches/patch-src_mn-client-session.c
new file mode 100644
index 00000000000..748348fefeb
--- /dev/null
+++ b/mail/mail-notification/patches/patch-src_mn-client-session.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_mn-client-session.c,v 1.1 2012/10/10 19:39:57 markd Exp $
+
+Fix complaint about Base64: overflowed buffer.
+Patch from Fedora.
+
+--- src/mn-client-session.c.orig	2008-05-22 15:45:35.000000000 +0000
++++ src/mn-client-session.c
+@@ -1030,7 +1030,7 @@ mn_client_session_write (MNClientSession
+ static int
+ write_base64 (MNClientSession *session, const char *buf, unsigned int len)
+ {
+-  char buf64[len * 2];		/* Base64 is 33% larger than the data it encodes */
++  char buf64[len * 2 + 1];		/* Base64 is 33% larger than the data it encodes */
+   unsigned int outlen;
+   int result;
+   char *str;