Merge branch 'el6' into el5

This reverts commit 31c5aaa8b1.

.gitignore

@@ -1 +1 @@
-/imap-2007f.tar.gz
+imap-2007e.tar.gz

imap-2001a-overflow.patch

@@ -1,12 +0,0 @@
---- imap-2001a/src/c-client/rfc822.c.overflow	Wed Apr 17 22:39:13 2002
-+++ imap-2001a/src/c-client/rfc822.c	Wed Apr 17 22:40:25 2002
-@@ -610,6 +610,9 @@
- 	if (CHR (bs) == '\012'){/* following LF? */
- 	  c = SNX (bs); i--;	/* yes, slurp it */
- 	}
-+	if (!i)			/* Make sure we don't get an overflow for */
-+	  break;		/* messages ending on \015 (or the following */
-+				/* i-- will cause i to be MAXINT. Not good.) */
-       case '\012':		/* at start of a line, start with -- ? */
- 	if (i-- && ((c = SNX (bs)) == '-') && i-- && ((c = SNX (bs)) == '-')) {
- 				/* see if cookie matches */

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;
+   }

sources

@@ -1 +1 @@
-2126fd125ea26b73b20f01fcd5940369  imap-2007f.tar.gz
+7903800dc2604000016de070e0c55840  imap-2007e.tar.gz

uw-imap.spec

@@ -15,8 +15,8 @@
 
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
-Version: 2007f
-Release: 1%{?dist}
+Version: 2007e
+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
@@ -262,6 +266,10 @@ mkdir -p $RPM_BUILD_ROOT%{ssldir}/certs
 touch $RPM_BUILD_ROOT%{ssldir}/certs/{imapd,ipop3d}.pem
 
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
 # FIXME, do on first launch (or not at all?), not here -- Rex
 %post
 {
@@ -289,14 +297,6 @@ done
 %postun
 /sbin/service xinetd reload > /dev/null 2>&1 || :
 
-%post -n %{imap_libs} -p /sbin/ldconfig
-
-%postun -n %{imap_libs} -p /sbin/ldconfig
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %files
 %defattr(-,root,root,-)
@@ -324,6 +324,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %if ! 0%{?_with_system_libc_client}
+%post -n %{imap_libs} -p /sbin/ldconfig
+%postun -n %{imap_libs} -p /sbin/ldconfig
+
 %files -n %{imap_libs} 
 %defattr(-,root,root)
 %doc LICENSE.txt NOTICE SUPPORT 
@@ -348,8 +351,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Aug 02 2011 Rex Dieter <rdieter@fedoraproject.org> 2007f-1
-- imap-2007f
+* Tue Aug 02 2011 Rex Dieter <rdieter@fedoraproject.org> 2007e-14
+- backport 2007f fix for mac os x lion compatibility
 
 * Mon Jun 13 2011 Rex Dieter <rdieter@fedoraproject.org> 2007e-13
 - _with_system_libc_client option (el6+)