* Update to version 2.19.1

 *  Upgrade UW-IMAP to Panda IMAP from https://github.com/jonabbey/panda-imap.
 *  Replace tabs by spaces in From and Subject fields to control for size in
    screen of these fields. Change only in index screen display.

1 files changed, 29 insertions, 27 deletions

diff --git a/imap/Makefile b/imap/Makefile
index 81e63ef2..f696afba 100644
--- a/imap/Makefile
+++ b/imap/Makefile
@@ -1,24 +1,24 @@
 # ========================================================================
-# Copyright 1988-2008 University of Washington
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# 
+# Copyright 2008-2011 Mark Crispin
 # ========================================================================
+#
 
 # Program:	IMAP Toolkit Makefile
 #
 # Author:	Mark Crispin
-#		UW Technology
-#		Seattle, WA  98195
-#		Internet: MRC@Washington.EDU
 #
 # Date:		7 December 1989
-# Last Edited:	August 16, 2013
+# Last Edited:	15 April 2013 (jonabbey@arlut.utexas.edu)
+#
+# Previous versions of this file were
+#
+# Copyright 1988-2008 University of Washington
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
 
 
 # Normal command to build IMAP toolkit:
@@ -37,7 +37,7 @@
 # The following ports are bundled:
 # a32	AIX 3.2 for RS/6000
 # a41	AIX 4.1 for RS/6000
-# a52	Attempt at AIX 5.2
+# a52	AIX 5.2
 # aix	AIX/370 (not RS/6000!!)
 # ami	AmigaDOS
 # am2	AmigaDOS with a 68020+
@@ -79,13 +79,13 @@
 # hxd	HP-UX 10.x with DCE security (see shp)
 # isc	Interactive Systems
 # ldb	Debian Linux
-# lfd	Fedora Core 4
+# lfd	Fedora Linux
 # ln8	Linux for Nokia N800
 # lnx	Linux with traditional passwords and crypt() in the C library
 #	 (see lnp, sl4, sl5, and slx)
 # lnp	Linux with Pluggable Authentication Modules (PAM)
 # lmd	Mandrake Linux
-# lr5	RedHat Enterprise 5 and later (same as lfd)
+# lr5	RedHat Enterprise Linux 5 and later (same as lfd)
 # lrh	RedHat Linux 7.2 and later
 # lsu	SuSE Linux (same as lrh)
 # lyn	LynxOS
@@ -93,7 +93,7 @@
 # mnt	Atari ST Mint (not MacMint)
 # neb	NetBSD
 # nec	NEC UX
-# nto	QNX Neutrine RTP
+# nto	QNX Neutrino RTP
 # nxt	NEXTSTEP
 # nx3	NEXTSTEP 3.x
 # osf	OSF/1 (see sos, os4)
@@ -101,10 +101,11 @@
 # osi	Apple iPhone and iPod Touch
 # osx	Mac OS X
 # oxp	Mac OS X with Pluggable Authentication Modules (PAM)
-# osx	Mac OS X Snow Leopard
+# oxs	Mac OS X Snow Leopard
 # ptx	PTX
 # pyr	Pyramid
 # qnx	QNX 4
+# qn6	QNX 6
 # s40	SUN-OS 4.0 (*not* Solaris)
 # sc5	SCO Open Server 5.0.x (see go5)
 # sco	Santa Cruz Operation (see sc5, go5)
@@ -187,7 +188,6 @@ SSLTYPE=nopwd
 # IP protocol version
 #
 # The following IP protocol versions are defined:
-# o	IPv4 support, no DNS (truly ancient systems)
 # 4	(default) IPv4 support only
 # 6	IPv6 and IPv4 support
 
@@ -308,7 +308,7 @@ SPECIALS:
 
 # Note on SCO you may have to set LN to "ln".
 
-a32 a41 a52 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul h11 hpp hpx lnp lyn mct mnt nec nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos uw2: an
+a32 a41 a52 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul h11 hpp hpx lnp lyn mct mnt nec nto nxt nx3 osf os4 ptx qnx qn6 sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos uw2: an
 	$(BUILD) BUILDTYPE=$@
 
 # If you use sv4, you may find that it works to move it to use the an process.
@@ -365,7 +365,7 @@ ln8:	an
 	SPECIALS="MAILSPOOL=/var/mail"
 
 
-# RHE5 does not have the IPv6 bug
+# RHEL5/6 does not have the IPv6 bug
 
 lr5:	an
 	$(TOUCH) ip6
@@ -376,7 +376,7 @@ lmd:	an
 	$(BUILD) BUILDTYPE=lnp IP=$(IP6) \
 	SPECIALS="GSSINCLUDE=/usr/include GSSLIB=/usr/lib"
 
-# RHE3 definitely has the IPv6 bug
+# RHEL3 definitely has the IPv6 bug
 
 lrh:	lrhok an
 	$(BUILD) BUILDTYPE=lnp IP=$(IP6) \
@@ -388,7 +388,7 @@ lrhok:
 
 lrhwarn:
 	@echo You are building for OLD versions of RedHat Linux.  This build
-	@echo is NOT suitable for RedHat Enterprise 5, which stores SSL/TLS
+	@echo is NOT suitable for RedHat Enterprise 5 / 6, which store SSL/TLS
 	@echo certificates and keys in /etc/pki/tls rather than /usr/share/ssl.
 	@echo If you want to build for modern RedHat Linux, you should use
 	@echo make lr5 instead.
@@ -412,20 +412,22 @@ lsu:	an
 
 osi:	an
 	$(TOUCH) ip6
-	$(BUILD) BUILDTYPE=osx IP=$(IP6) CC=arm-apple-darwin-gcc
+	$(BUILD) BUILDTYPE=osx IP=$(IP6) CC=arm-apple-darwin-gcc \
+	EXTRACFLAGS="$(EXTRACFLAGS) -DMAC_OSX_KLUDGE=1 -Dhash_create=Hash_create -Dhash_destroy=Hash_destroy -Dlogout=Logout" \
 
 oxp:	an
 	$(TOUCH) ip6
 	$(BUILD) BUILDTYPE=osx IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \
 	PASSWDTYPE=pam \
 	EXTRACFLAGS="$(EXTRACFLAGS) -DMAC_OSX_KLUDGE=1" \
-	SPECIALS="GSSLIB=/usr/lib PAMLDFLAGS=-lpam"
+	SPECIALS="GSSINCLUDE=/usr/include GSSLIB=/usr/lib PAMDLFLAGS=-lpam"
 
 oxs:	an
 	$(TOUCH) ip6
 	$(BUILD) BUILDTYPE=osx IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \
 	PASSWDTYPE=pam \
-	SPECIALS="GSSINCLUDE=/usr/include GSSLIB=/usr/lib PAMLDFLAGS=-lpam"
+	EXTRACFLAGS="$(EXTRACFLAGS)" \
+	SPECIALS="GSSINCLUDE=/usr/include GSSLIB=/usr/lib PAMDLFLAGS=-lpam"
 
 osx:	osxok an
 	$(TOUCH) ip6
@@ -733,7 +735,7 @@ sysexitwarn:
 
 clean:
 	@echo Removing old processed sources and binaries...
-	$(SH) -c '$(RM) an ua OSTYPE SPECIALS c-client mtest imapd ipopd mailutil mlock dmail tmail || true'
+	$(SH) -c '$(RM) an ua OSTYPE SPECIALS c-client mtest imapd ipopd mailutil mlock dmail tmail ip6 || true'
 	$(CD) tools;$(MAKE) clean