4 files changed, 121 insertions, 51 deletions

diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 05101ba3e798..01b4ff719d84 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cyrus-sasl
-PORTVERSION=	1.5.15
+PORTVERSION=	1.5.21
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@@ -14,21 +14,24 @@ MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 
 MAINTAINER=	hetzels@westbend.net
 
-USE_OPENSSL=	NORSA
+USE_OPENSSL=	RSA
 
 .include <bsd.port.pre.mk>
 
-SASL_VER=	${PORTVERSION} #note, may not be needed any more
-
 Y2K=		http://asg.web.cmu.edu/cyrus/imapd/y2k.html
 
-MAN3=		sasl_client.3 sasl_server.3
-MAN8=		saslpasswd.8
+MAN3=		sasl.3 sasl_authorize_t.3 sasl_callbacks.3 sasl_checkpass.3 \
+		sasl_client_init.3 sasl_client_new.3 sasl_client_start.3 sasl_client_step.3 \
+		sasl_decode.3 sasl_done.3 sasl_encode.3 sasl_errstring.3 sasl_getopt_t.3 \
+		sasl_getpath_t.3 sasl_getprop.3 sasl_getsecret_t.3 sasl_getsimple_t.3 \
+		sasl_listmech.3 sasl_log_t.3 \
+		sasl_server_init.3 sasl_server_new.3 sasl_server_start.3 sasl_server_step.3 \
+		sasl_setprop.3 sasl_usererr.3
+MAN8=		sasldblistusers.8 saslpasswd.8
 
 USE_AUTOCONF=	YES
 USE_LIBTOOL=	YES
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--sysconfdir=${PREFIX}/etc \
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-plugindir=${PREFIX}/lib/sasl \
 		--with-dbpath=${PREFIX}/etc/sasldb \
 		--includedir=${PREFIX}/include/sasl \
@@ -37,22 +40,55 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-pwcheck=/var/pwcheck \
 		--with-rc4=openssl
 
+# JavaSASL is currently Broken
+#JAVADIR=        jdk1.1.8
+#JAVALIBDIR=     ${PREFIX}/${JAVADIR}/lib/i386/green_threads/
+
+#.if defined(USE_JAVA) || exists(${LOCALBASE}/${JAVADIR}/bin/java)
+#BUILD_DEPENDS=  ${LOCALBASE}/${JAVADIR}/bin/java:${PORTSDIR}/java/jdk
+#CONFIGURE_ARGS+= --with-java \
+#		 --with-javabase=${LOCALBASE}/include
+#
+#CONFIGURE_ENV=	JAVAC="${LOCALBASE}/${JAVADIR}/bin/javac" \
+#		JAVAH="${LOCALBASE}/${JAVADIR}/bin/javah" \
+#		JAVADOC="${LOCALBASE}/${JAVADIR}/bin/javadoc"
+#.endif
+
 .if defined(KRB5_HOME) && exists(${KRB5_HOME})
 CONFIGURE_ARGS+= --enable-gssapi=${KRB5_HOME}
+.else
+CONFIGURE_ARGS+= --disable-gssapi
+GSSAPI=	"@comment "
+.endif
+
+.if exists(/usr/lib/libkrb.a)
+CONFIGURE_ARGS+= --enable-krb4
+.else
+CONFIGURE_ARGS+= --disable-krb4
+EBONES=	"@comment "
 .endif
 
 CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE} \
 		OPENSSLINC=${OPENSSLINC} \
 		OPENSSLLIB=${OPENSSLLIB}
 
-DOCS=	README README.Y2K TODO INSTALL ChangeLog NEWS
+DOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 
-DOC2=	draft-newman-auth-scram-03.txt \
-	draft-newman-sasl-anon-00.txt \
-	draft-leach-digest-sasl-03.txt \
-	rfc1321.txt rfc2095.txt rfc2104.txt rfc2222.txt
+DOC2=	draft-leach-digest-sasl-05.txt \
+	draft-newman-auth-scram-03.txt \
+	rfc1321.txt rfc2095.txt rfc2104.txt \
+	rfc2222.txt rfc2245.txt
 
-HTDOCS=	index programming sysadmin
+HTDOCS=	gssapi index programming sysadmin
+
+.if defined(NOPORTDOCS)
+NODOCS=	"@comment "
+.endif
+
+PLIST_SUB=	PREFIX=${PREFIX} \
+		GSSAPI=${GSSAPI} \
+		EBONES=${EBONES} \
+		NOPORTDOCS=${NODOCS}
 
 # Create Cyrus user and group
 pre-install:
@@ -67,27 +103,25 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/SASL/html
 .for file in ${DOCS}
-	@${ECHO} share/doc/SASL/${file} >>${TMPPLIST}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SASL
 .endfor
 .for file in ${DOC2}
-	@${ECHO} share/doc/SASL/${file} >>${TMPPLIST}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/SASL
 .endfor
 .for file in ${HTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${PREFIX}/share/doc/SASL/html
-	@${ECHO} share/doc/SASL/html/${file}.html >>${TMPPLIST}
 .endfor
-	@${ECHO} "@dirrm share/doc/SASL/html" >>${TMPPLIST}
-	@${ECHO} "@dirrm share/doc/SASL" >>${TMPPLIST}
 .endif
-.if !defined(KRB5_HOME) || !exists(${KRB5_HOME})
-	@${GREP} -v libgssapiv2 ${TMPPLIST} > ${WRKDIR}/tmp.plist
-	@${MV} ${WRKDIR}/tmp.plist ${TMPPLIST}
-.endif
-.if !defined(MAKE_EBONES) || exists(/usr/lib/libkrb.a)
-	@${GREP} -v libkerberos4 ${TMPPLIST} > ${WRKDIR}/tmp.plist
-	@${MV} ${WRKDIR}/tmp.plist ${TMPPLIST}
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+post-clean:
+	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.elif ${PREFIX} != ${LOCALBASE}
+# Save PREFIX so that it can be used during make install
+.BEGIN:
+	@echo "PREFIX=	${PREFIX}" > ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index d84401cee1a3..e79ca2b3aab1 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1 +1 @@
-MD5 (cyrus-sasl-1.5.15.tar.gz) = a1c0f6ef22f34b0a2366e7ec70bdf705
+MD5 (cyrus-sasl-1.5.21.tar.gz) = ada3a2b8ca3fd27982dcb6a97a65f4aa
diff --git a/security/cyrus-sasl2/files/patch-ab b/security/cyrus-sasl2/files/patch-ab
index b26d8a1f71c7..334527822474 100644
--- a/security/cyrus-sasl2/files/patch-ab
+++ b/security/cyrus-sasl2/files/patch-ab
@@ -1,6 +1,6 @@
---- configure.in.orig	Fri Jan 14 00:00:16 2000
-+++ configure.in	Mon Feb  7 15:14:50 2000
-@@ -49,8 +49,9 @@
+--- configure.in.orig	Mon May  8 12:51:13 2000
++++ configure.in	Sat Jun 10 20:23:18 2000
+@@ -66,8 +66,9 @@
  dnl check for -R, etc. switch
  CMU_GUESS_RUNPATH_SWITCH
  dnl let's just link against local.  otherwise we never find anything useful.
@@ -10,13 +10,26 @@
 +CMU_ADD_LIBPATH("${LOCALBASE}/lib")
 +CMU_ADD_LIBPATH("${OPENSSLLIB}")
  
- if test "$enable_java" = yes; then
-   AC_PATH_PROG(JAVAC, javac, no)
-@@ -222,6 +223,7 @@
-   AC_CHECK_LIB(crypt, crypt,
- 	       LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes,
- 	       cmu_have_crypt=no))
-+AC_SUBST(LIB_CRYPT)
+ AM_DISABLE_STATIC
  
- CMU_SOCKETS
+@@ -413,8 +414,9 @@
  
+   if test "$with_des" != no; then
+     AC_CHECK_HEADER(krb.h,
+-      AC_CHECK_LIB(krb, krb_mk_priv,:,
+-                   AC_WARN(No Kerberos V4 found); krb4=no,
++      AC_CHECK_LIB(krb, krb_mk_priv, COM_ERR="",
++                   AC_CHECK_LIB(krb, krb_mk_err, COM_ERR="-lcom_err",
++			AC_WARN(No Kerberos V4 found); krb4=no,-ldes -lcom_err),
+ 		   -ldes),
+       AC_WARN(No Kerberos V4 found); krb4=no)
+   else
+@@ -428,7 +430,7 @@
+   AC_MSG_RESULT(enabled)
+   SASL_MECHS="$SASL_MECHS libkerberos4.la"
+   AC_DEFINE(HAVE_KRB)
+-  SASL_KRB_LIB="-lkrb -ldes"
++  SASL_KRB_LIB="-lkrb -ldes $COM_ERR"
+   AC_SUBST(SASL_KRB_LIB)
+ else
+   AC_MSG_RESULT(disabled)
diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist
index 7490f80ec2a7..b31962f6a4d7 100644
--- a/security/cyrus-sasl2/pkg-plist
+++ b/security/cyrus-sasl2/pkg-plist
@@ -1,4 +1,4 @@
-@unexec %D/etc/rc.d/pwcheck.sh stop ; echo " stopped."
+@unexec %D/etc/rc.d/pwcheck.sh stop ; echo "pwcheck stopped."
 etc/rc.d/pwcheck.sh
 include/sasl/hmac-md5.h
 include/sasl/md5.h
@@ -9,7 +9,7 @@ include/sasl/saslutil.h
 @dirrm include/sasl
 lib/libsasl.a
 lib/libsasl.so
-lib/libsasl.so.7
+lib/libsasl.so.8
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/sasl/libanonymous.a
@@ -21,12 +21,12 @@ lib/sasl/libcrammd5.so.1
 lib/sasl/libdigestmd5.a
 lib/sasl/libdigestmd5.so
 lib/sasl/libdigestmd5.so.0
-lib/sasl/libgssapiv2.a
-lib/sasl/libgssapiv2.so
-lib/sasl/libgssapiv2.so.1
-lib/sasl/libkerberos4.a
-lib/sasl/libkerberos4.so
-lib/sasl/libkerberos4.so.1
+%%GSSAPI%%lib/sasl/libgssapiv2.a
+%%GSSAPI%%lib/sasl/libgssapiv2.so
+%%GSSAPI%%lib/sasl/libgssapiv2.so.1
+%%EBONES%%lib/sasl/libkerberos4.a
+%%EBONES%%lib/sasl/libkerberos4.so
+%%EBONES%%lib/sasl/libkerberos4.so.1
 lib/sasl/liblogin.a
 lib/sasl/liblogin.so
 lib/sasl/liblogin.so.0
@@ -34,12 +34,35 @@ lib/sasl/libplain.a
 lib/sasl/libplain.so
 lib/sasl/libplain.so.1
 @dirrm lib/sasl
+sbin/sasldblistusers
 sbin/saslpasswd
 sbin/pwcheck
+%%NOPORTDOCS%%share/doc/SASL/AUTHORS
+%%NOPORTDOCS%%share/doc/SASL/COPYING
+%%NOPORTDOCS%%share/doc/SASL/ChangeLog
+%%NOPORTDOCS%%share/doc/SASL/INSTALL
+%%NOPORTDOCS%%share/doc/SASL/NEWS
+%%NOPORTDOCS%%share/doc/SASL/README
+%%NOPORTDOCS%%share/doc/SASL/TODO
+%%NOPORTDOCS%%share/doc/SASL/draft-leach-digest-sasl-05.txt
+%%NOPORTDOCS%%share/doc/SASL/draft-newman-auth-scram-03.txt
+%%NOPORTDOCS%%share/doc/SASL/rfc1321.txt
+%%NOPORTDOCS%%share/doc/SASL/rfc2095.txt
+%%NOPORTDOCS%%share/doc/SASL/rfc2104.txt
+%%NOPORTDOCS%%share/doc/SASL/rfc2222.txt
+%%NOPORTDOCS%%share/doc/SASL/rfc2245.txt
+%%NOPORTDOCS%%share/doc/SASL/html/gssapi.html
+%%NOPORTDOCS%%share/doc/SASL/html/index.html
+%%NOPORTDOCS%%share/doc/SASL/html/programming.html
+%%NOPORTDOCS%%share/doc/SASL/html/sysadmin.html
+%%NOPORTDOCS%%@dirrm share/doc/SASL/html
+%%NOPORTDOCS%%@dirrm share/doc/SASL
 @mode u=rwx,go=
-@exec mkdir /var/pwcheck
-@exec chown cyrus:cyrus /var/pwcheck
-@exec chmod go= /var/pwcheck
+@cwd /var
+@exec mkdir pwcheck
+@exec chown cyrus:cyrus pwcheck
+@exec chmod go= pwcheck
 @comment This file gets create by the pwcheck program
-@unexec rm -f /var/pwcheck/pwcheck
-@dirrm /var/pwcheck
+@unexec rm -f pwcheck/pwcheck
+@dirrm pwcheck
+@cwd %%PREFIX%%