Add SSL support for clients.

5 files changed, 48 insertions, 19 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 588087bad23..e07a533cc5d 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/12/17 17:07:56 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2000/12/17 18:25:43 jlam Exp $
 
 DISTNAME=       imap-2000a
 PKGNAME=        imap-uw-2000a
@@ -27,7 +27,13 @@ ALL_TARGET=	neb
 .endif
 
 NO_CONFIGURE=	# defined
-MAKE_ENV+=	EXTRACFLAGS="${CFLAGS}"
+
+USE_SSL=	# defined
+MAKE_ENV+=	SSLBASE="${SSLBASE}"
+MAKE_ENV+=	SSLCERTS="/etc/openssl/certs"
+ALL_TARGET+=	CC="${LIBTOOL} ${CC}"
+ALL_TARGET+=	EXTRACFLAGS="${CFLAGS}"
+ALL_TARGET+=	SPECIALAUTHENTICATORS="ssl"
 
 post-build:
 	${SED} -e 's|@PREFIX@|${PREFIX}|g' \
diff --git a/mail/imap-uw/files/patch-sum b/mail/imap-uw/files/patch-sum
index a161cea4b5a..64a8bb9de9b 100644
--- a/mail/imap-uw/files/patch-sum
+++ b/mail/imap-uw/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.10 2000/12/17 17:07:57 jlam Exp $
+$NetBSD: patch-sum,v 1.11 2000/12/17 18:25:44 jlam Exp $
 
-MD5 (patch-aa) = 8fc46b28f1ed163310ba2db06ed67124
+MD5 (patch-aa) = 751122d855e826ecb44a0e9892250212
 MD5 (patch-ab) = bb937534f987fe7a8a365c1ffcd8760d
 MD5 (patch-ac) = b105631b853f128cbae3e00a72bfbf78
 MD5 (patch-ad) = 6b10bb3e3475a2bad35c4f704b10f6a4
@@ -9,3 +9,4 @@ MD5 (patch-af) = 3301d969c79118ae742f824aa9d90812
 MD5 (patch-ag) = 0da043e9e17ea708ee15b71d4747ea93
 MD5 (patch-ah) = 0d0d8a769e951e4422163d0912d906a9
 MD5 (patch-ai) = 4757f3135f2fb6112419fadc44201e9f
+MD5 (patch-aj) = e3383e25f017220c5efcd4fdb2994a73
diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa
index 9e849758e6f..2e5d083cdfc 100644
--- a/mail/imap-uw/patches/patch-aa
+++ b/mail/imap-uw/patches/patch-aa
@@ -1,16 +1,7 @@
-$NetBSD: patch-aa,v 1.8 2000/12/17 17:07:58 jlam Exp $
+$NetBSD: patch-aa,v 1.9 2000/12/17 18:25:44 jlam Exp $
 
 --- Makefile.orig	Thu Nov  2 16:04:11 2000
 +++ Makefile
-@@ -272,7 +272,7 @@
- #	gradually-increasing intervals, starting at 2800-2900, and becoming
- #	permanent at 48,300.
- 
--EXTRACFLAGS=
-+#EXTRACFLAGS=
- 
- 
- # Extra linker flags (additional/alternative libraries, etc.)
 @@ -285,7 +285,7 @@
  #SPECIALS=
  EXTRASPECIALS=
@@ -25,7 +16,7 @@ $NetBSD: patch-aa,v 1.8 2000/12/17 17:07:58 jlam Exp $
  	echo $(SPECIALS) $(EXTRASPECIALS) > c-client/SPECIALS
  	$(CD) c-client;$(MAKE) $(OS) BUILDOPTIONS="$(BUILDOPTIONS)" \
 -	 $(SPECIALS) $(EXTRASPECIALS)
-+	 $(SPECIALS) $(EXTRASPECIALS) PREFIX=$(PREFIX) CC="${LIBTOOL} $(CC)"
++	 $(SPECIALS) $(EXTRASPECIALS) PREFIX=$(PREFIX) CC="$(CC)"
  	echo $(OS) > OSTYPE
  	$(TOUCH) rebuild
  
diff --git a/mail/imap-uw/patches/patch-aj b/mail/imap-uw/patches/patch-aj
new file mode 100644
index 00000000000..2498616b927
--- /dev/null
+++ b/mail/imap-uw/patches/patch-aj
@@ -0,0 +1,24 @@
+$NetBSD: patch-aj,v 1.3 2000/12/17 18:25:44 jlam Exp $
+
+--- src/osdep/unix/Makefile.ssl.orig	Sat Oct 28 15:09:55 2000
++++ src/osdep/unix/Makefile.ssl
+@@ -20,8 +20,8 @@
+ 
+ # Extended flags needed for additional authenticators.  You may need to modify.
+ 
+-SSLDIR=/usr/local/ssl
+-SSLCERTS=$(SSLDIR)/certs
++SSLDIR=${SSLBASE}
++#SSLCERTS=$(SSLDIR)/certs
+ SSLINCLUDE=$(SSLDIR)/include
+ SSLLIB=$(SSLDIR)/lib
+ 
+@@ -38,7 +38,7 @@
+ 
+ SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
+  -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\"
+-SSLLDFLAGS= -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
++SSLLDFLAGS= -L$(SSLLIB) -Wl,-R$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
+ 
+ 
+ ssl:	# SSL flags
diff --git a/mail/imap-uw/pkg/MESSAGE b/mail/imap-uw/pkg/MESSAGE
index 0ff7c64b368..41e0f16a23c 100644
--- a/mail/imap-uw/pkg/MESSAGE
+++ b/mail/imap-uw/pkg/MESSAGE
@@ -1,16 +1,23 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2000/05/19 03:58:58 jlam Exp $
+$NetBSD: MESSAGE,v 1.6 2000/12/17 18:25:44 jlam Exp $
 
 Add the following to /etc/services:
- imap           143/tcp            # Internet Message Access Protocol
- imap           143/udp
+
+ imap		143/tcp		# Internet Message Access Protocol
+ imap		143/udp
+ imaps		993/tcp		# imap4 protocol over TLS/SSL
+ imaps		993/udp		# imap4 protocol over TLS/SSL
+ pop3s		995/tcp		# pop3 protocol over TLS/SSL (was spop3)
+ pop3s		995/udp		# pop3 protocol over TLS/SSL (was spop3)
 
 Add the following to /etc/inetd.conf:
+
  imap   stream  tcp     nowait  root    @PREFIX@/libexec/imapd    imapd
+ imaps  stream  tcp     nowait  root    @PREFIX@/libexec/imapd    imapd
  pop2   stream  tcp     nowait  root    @PREFIX@/libexec/ipop2d   ipop2d
  pop3   stream  tcp     nowait  root    @PREFIX@/libexec/ipop3d   ipop3d
+ pop3s  stream  tcp     nowait  root    @PREFIX@/libexec/ipop3d   ipop3d
 
 To put the changes into effect, reboot the machine or "kill -HUP"
 your inetd.
-
 ===========================================================================