[uw-imap/el6] backport 2007f fix for mac os x lion compatibility

[Rex Dieter]

commit 906363bdc7f79cae6e7d0f358bf06efd91636627
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Aug 2 23:15:06 2011 -0500

    backport 2007f fix for mac os x lion compatibility

 imap-2007e-osx.patch |   12 ++++++++++++
 uw-imap.spec         |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/imap-2007e-osx.patch b/imap-2007e-osx.patch
new file mode 100644
index 0000000..e1bb4f3
--- /dev/null
+++ b/imap-2007e-osx.patch
@@ -0,0 +1,12 @@
+diff -up imap-2007e/src/imapd/imapd.c.osx imap-2007e/src/imapd/imapd.c
+--- imap-2007e/src/imapd/imapd.c.osx	2008-11-18 12:46:59.000000000 -0600
++++ imap-2007e/src/imapd/imapd.c	2011-08-02 23:13:44.555693720 -0500
+@@ -2141,7 +2141,7 @@ unsigned char *snarf_base64 (unsigned ch
+ 				/* must be at least one BASE64 char */
+   else if (!base64mask[*ret]) return NIL;
+   else {			/* quick and dirty */
+-    while (base64mask[*s++]);	/* scan until end of BASE64 */
++    while (base64mask[*s]) s++;	/* scan until end of BASE64 */
+     if (*s == '=') ++s;		/* allow up to two padding chars */
+     if (*s == '=') ++s;
+   }
diff --git a/uw-imap.spec b/uw-imap.spec
index f0a7ad9..18226a4 100644
--- a/uw-imap.spec
+++ b/uw-imap.spec
@@ -16,7 +16,7 @@
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2007e
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: ASL 2.0 
@@ -64,6 +64,9 @@ Patch5: imap-2007e-overflow.patch
 Patch9: imap-2007e-shared.patch
 Patch10: imap-2007e-authmd5.patch
 Patch11: imap-2007e-system_c_client.patch
+# mac os x lion compatibility
+# http://mailman2.u.washington.edu/pipermail/imap-uw/2011-July/002838.html
+Patch12: imap-2007e-osx.patch
 
 BuildRequires: krb5-devel
 BuildRequires: openssl-devel
@@ -168,6 +171,7 @@ install -p -m644 %{SOURCE22} imap.pam
 %if 0%{?_with_system_libc_client}
 %patch11 -p1 -b .system_c_client
 %endif
+%patch12 -p1 -b .osx
 
 
 %build
@@ -348,6 +352,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 02 2011 Rex Dieter <rdieter at fedoraproject.org> 2007e-14
+- backport 2007f fix for mac os x lion compatibility
+
 * Mon Jun 13 2011 Rex Dieter <rdieter at fedoraproject.org> 2007e-13
 - _with_system_libc_client option (el6+) 
 - tight deps via %%?_isa