Adding GSSAPI support to this package. It is turned on by default for

NetBSD and off for everything else.

4 files changed, 127 insertions, 75 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 8ce5a13877d..612697e8ade 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2002/08/28 08:45:41 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2002/10/28 22:21:14 elric Exp $
 
 DISTNAME=       imap-2001a
 PKGNAME=        imap-uw-2001.1
+PKGREVISION=	1
 CATEGORIES=     mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
@@ -29,6 +30,10 @@ ALL_TARGET=	lrh
 ALL_TARGET=	osx
 .else
 ALL_TARGET=	neb
+.if (${USE_KERBEROS} != "no")
+PKG_USE_KERBEROS=	#defined
+ALL_TARGET+=	EXTRAAUTHENTICATORS="gss"
+.endif
 .endif
 
 BUILD_DEFS+=	IMAP_UW_CCLIENT_MBOX_FMT IMAP_UW_NO_CLEARTEXT
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index ddb508b051c..2a6f0942274 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2001/12/15 08:30:26 martti Exp $
+$NetBSD: distinfo,v 1.6 2002/10/28 22:21:14 elric Exp $
 
 SHA1 (imap-2001a.tar.Z) = 505ea704159846cc79e517d719d10bef94e2dc88
 Size (imap-2001a.tar.Z) = 1959777 bytes
-SHA1 (patch-ae) = b8468d9171098c9df996929c846bbd4349cb573f
 SHA1 (patch-ai) = aaa778f60684c797cc53a109b8430fa05ec7f424
+SHA1 (patch-aj) = 75a9f0fda0f29d5c768ed235a664b57717412d74
diff --git a/mail/imap-uw/patches/patch-ae b/mail/imap-uw/patches/patch-ae
deleted file mode 100644
index cbc28e3f134..00000000000
--- a/mail/imap-uw/patches/patch-ae
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-ae,v 1.13 2001/10/11 15:34:51 martti Exp $
-
---- src/osdep/unix/Makefile.orig	Thu Oct 11 16:15:24 2001
-+++ src/osdep/unix/Makefile	Thu Oct 11 16:20:54 2001
-@@ -28,8 +28,6 @@
- 
- # Extended flags needed for SSL.  You may need to modify.
- 
--SSLDIR=/usr/local/ssl
--SSLCERTS=$(SSLDIR)/certs
- SSLINCLUDE=$(SSLDIR)/include
- SSLLIB=$(SSLDIR)/lib
- 
-@@ -46,7 +44,7 @@
- 
- SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
-  -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\"
--SSLLDFLAGS= -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
-+SSLLDFLAGS= -lssl $(SSLCRYPTO) $(SSLRSA)
- 
- 
- # Extended flags needed for non-standard passwd types.  You may need to modify.
-@@ -90,14 +88,14 @@
- # set certain other formats (e.g. mbx and mx) as the EMPTYPROTO since these
- # formats can never be empty files.
- 
--CREATEPROTO=unixproto
-+#CREATEPROTO=unixproto
- EMPTYPROTO=unixproto
- 
- 
- # Commands possibly overriden by the individual port
- 
- ARRC=ar rc
--CC=cc
-+#CC=cc
- LN=ln -s
- RANLIB=ranlib
- 
-@@ -380,9 +378,9 @@
- 	 SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
- 	 ACTIVEFILE=/usr/share/news/active \
- 	 RSHPATH=/usr/bin/rsh \
--	 BASECFLAGS="-g -O2" \
-+	 BASECFLAGS="-O2" \
- 	 BASELDFLAGS="-lsocket -lnsl -lgen" \
--	 RANLIB=true CC=gcc
-+	 RANLIB=true
- 
- gsu:	# GCC SUN-OS
- 	$(BUILD) `$(CAT) SPECIALS` OS=sun \
-@@ -472,9 +470,9 @@
- 	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
- 	 CRXTYPE=nfs \
- 	 SPOOLDIR=/var \
--	 ACTIVEFILE=/var/db/news/active \
-+	 ACTIVEFILE=/var/news/db/active \
- 	 RSHPATH=/usr/bin/rsh \
--	 BASECFLAGS="-g -O -pipe" \
-+	 BASECFLAGS="-O -pipe" \
- 	 BASELDFLAGS="-lcrypt"
- 
- nec:	# NEC UX
-@@ -871,7 +869,7 @@
- 	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
- 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
- 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
--	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
-+	echo "$(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info $(CCLIENT_MAJOR):$(CCLIENT_MINOR)" > ARCHIVE
- 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
- 	./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
- 	$(LN) os_$(OS).h osdep.h
diff --git a/mail/imap-uw/patches/patch-aj b/mail/imap-uw/patches/patch-aj
new file mode 100644
index 00000000000..11654c7fb8b
--- /dev/null
+++ b/mail/imap-uw/patches/patch-aj
@@ -0,0 +1,119 @@
+$NetBSD: patch-aj,v 1.7 2002/10/28 22:21:16 elric Exp $
+
+--- src/c-client/auth_gss.c.orig	Wed Oct 23 16:05:35 2002
++++ src/c-client/auth_gss.c	Wed Oct 23 16:06:44 2002
+@@ -18,9 +18,17 @@
+  * CPYRIGHT, included with this Distribution.
+  */
+ 
++#ifdef __NetBSD__
++/* This is really Heimdal specific, but . . . */
++#include <gssapi/gssapi.h>
++#include <krb5/krb5.h>
++
++#define gss_nt_service_name	GSS_C_NT_HOSTBASED_SERVICE
++#else
+ #define PROTOTYPE(x) x
+ #include <gssapi/gssapi_generic.h>
+ #include <gssapi/gssapi_krb5.h>
++#endif
+ 
+ long auth_gssapi_valid (void);
+ long auth_gssapi_client (authchallenge_t challenger,authrespond_t responder,
+--- src/osdep/unix/Makefile.gss.orig	Wed Oct 23 17:23:36 2002
++++ src/osdep/unix/Makefile.gss	Wed Oct 23 17:41:19 2002
+@@ -20,12 +20,16 @@
+ 
+ # Extended flags needed for additional authenticators.  You may need to modify.
+ 
+-GSSDIR=/usr/local
+-GSSCFLAGS= -I$(GSSDIR)/include
+-GSSOLDLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err
+-GSSNEWLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
+-
+-gss:	# GSSAPI Kerberos V flags
+-	echo $(GSSCFLAGS) >> OSCFLAGS
+-	sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS
++#GSSDIR=/usr/local
++#GSSCFLAGS= -I$(GSSDIR)/include
++#GSSOLDLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err
++#GSSNEWLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
++#
++#gss:	# GSSAPI Kerberos V flags
++#	echo $(GSSCFLAGS) >> OSCFLAGS
++#	sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS
++#
+ 
++gss:
++	echo "-I/usr/include/krb5" >> OSCFLAGS
++	echo "-lgssapi -lkrb5 -lasn1 -lcrypto -lcom_err -lroken" >> LDFLAGS
+--- src/osdep/unix/Makefile.orig	Wed Oct 23 17:53:35 2002
++++ src/osdep/unix/Makefile	Wed Oct 23 18:10:34 2002
+@@ -28,8 +28,6 @@
+ 
+ # Extended flags needed for SSL.  You may need to modify.
+ 
+-SSLDIR=/usr/local/ssl
+-SSLCERTS=$(SSLDIR)/certs
+ SSLINCLUDE=$(SSLDIR)/include
+ SSLLIB=$(SSLDIR)/lib
+ 
+@@ -46,7 +44,7 @@
+ 
+ SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
+  -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\"
+-SSLLDFLAGS= -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
++SSLLDFLAGS= -lssl $(SSLCRYPTO) $(SSLRSA)
+ 
+ 
+ # Extended flags needed for non-standard passwd types.  You may need to modify.
+@@ -90,14 +88,14 @@
+ # set certain other formats (e.g. mbx and mx) as the EMPTYPROTO since these
+ # formats can never be empty files.
+ 
+-CREATEPROTO=unixproto
++#CREATEPROTO=unixproto
+ EMPTYPROTO=unixproto
+ 
+ 
+ # Commands possibly overriden by the individual port
+ 
+ ARRC=ar rc
+-CC=cc
++#CC=cc
+ LN=ln -s
+ RANLIB=ranlib
+ 
+@@ -380,9 +378,9 @@
+ 	 SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
+ 	 ACTIVEFILE=/usr/share/news/active \
+ 	 RSHPATH=/usr/bin/rsh \
+-	 BASECFLAGS="-g -O2" \
++	 BASECFLAGS="-O2" \
+ 	 BASELDFLAGS="-lsocket -lnsl -lgen" \
+-	 RANLIB=true CC=gcc
++	 RANLIB=true
+ 
+ gsu:	# GCC SUN-OS
+ 	$(BUILD) `$(CAT) SPECIALS` OS=sun \
+@@ -472,9 +470,9 @@
+ 	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
+ 	 CRXTYPE=nfs \
+ 	 SPOOLDIR=/var \
+-	 ACTIVEFILE=/var/db/news/active \
++	 ACTIVEFILE=/var/news/db/active \
+ 	 RSHPATH=/usr/bin/rsh \
+-	 BASECFLAGS="-g -O -pipe" \
++	 BASECFLAGS="-O -pipe" \
+ 	 BASELDFLAGS="-lcrypt"
+ 
+ nec:	# NEC UX
+@@ -871,7 +869,7 @@
+ 	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
+ 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
+ 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
+-	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
++	echo "$(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info $(CCLIENT_MAJOR):$(CCLIENT_MINOR) \`cat LDFLAGS\`" > ARCHIVE
+ 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
+ 	./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
+ 	$(LN) os_$(OS).h osdep.h