svn commit: r409457 - in head/security: . cyrus-sasl2-srp cyrus-sasl2/files

[Hajimu UMEMOTO]

Author: ume
Date: Wed Feb 24 10:39:50 2016
New Revision: 409457
URL: https://svnweb.freebsd.org/changeset/ports/409457

Log:
  Add Cyrus SASL SRP authentication plugin.
  
  Requested by:	Kyle Amon <amonk__at__backwatcher.com>

Added:
  head/security/cyrus-sasl2-srp/
     - copied from r409451, head/security/cyrus-sasl2-gssapi/
Modified:
  head/security/Makefile
  head/security/cyrus-sasl2-srp/Makefile
  head/security/cyrus-sasl2-srp/pkg-descr
  head/security/cyrus-sasl2/files/pkg-message.in

Modified: head/security/Makefile
==============================================================================
--- head/security/Makefile	Wed Feb 24 10:33:12 2016	(r409456)
+++ head/security/Makefile	Wed Feb 24 10:39:50 2016	(r409457)
@@ -94,6 +94,7 @@
     SUBDIR += cyrus-sasl2-gssapi
     SUBDIR += cyrus-sasl2-ldapdb
     SUBDIR += cyrus-sasl2-saslauthd
+    SUBDIR += cyrus-sasl2-srp
     SUBDIR += d0_blind_id
     SUBDIR += dcetest
     SUBDIR += ddos_scan

Modified: head/security/cyrus-sasl2-srp/Makefile
==============================================================================
--- head/security/cyrus-sasl2-gssapi/Makefile	Wed Feb 24 01:19:32 2016	(r409451)
+++ head/security/cyrus-sasl2-srp/Makefile	Wed Feb 24 10:39:50 2016	(r409457)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-PORTNAME=	gssapi
+PORTNAME=	srp
 PORTVERSION=	2.1.26
-PORTREVISION=	7
+#PORTREVISION=	0
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
 		http://cyrusimap.org/releases/
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	cyrus-sasl-
 DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	ume at FreeBSD.org
-COMMENT=	SASL GSSAPI authentication plugin
+COMMENT=	SASL SRP authentication plugin
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -22,7 +22,7 @@ DISTINFO_FILE=	${CYRUS_SASL2_DIR}/distin
 PATCHDIR=	${CYRUS_SASL2_DIR}/files
 INSTALL_WRKSRC=	${WRKSRC}/plugins
 
-USES=		libtool:build
+USES=		libtool
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
@@ -38,37 +38,25 @@ CONFIGURE_ARGS+=--with-dblib=none \
 		--disable-anon \
 		--disable-cram \
 		--disable-digest \
+		--disable-gssapi \
 		--disable-krb4 \
 		--disable-ntlm \
 		--disable-otp \
 		--disable-plain \
 		--disable-scram
+CONFIGURE_ARGS+=--enable-srp
 
 MAKE_ENV+=	INSTALL_STRIP_FLAG=${STRIP}
 
-OPTIONS_SINGLE=		KERBEROS
-OPTIONS_SINGLE_KERBEROS=BASE HEIMDAL MIT
-OPTIONS_DEFAULT=	BASE
-BASE_DESC=		Use Heimdal in base
-BASE_USES=		gssapi
-BASE_CONFIGURE_ENABLE=	gssapi
-HEIMDAL_DESC=		Use Heimdal from ports
-HEIMDAL_USES=		gssapi:heimdal,flags
-HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
-			--with-gss_impl=heimdal
-HEIMDAL_PLIST_FILES=	lib/sasl2/libgs2.a \
-			lib/sasl2/libgs2.so \
-			lib/sasl2/libgs2.so.3 \
-			lib/sasl2/libgs2.so.3.0.0
-MIT_DESC=		Use MIT Kerberos V5
-MIT_USES=		gssapi:mit
-MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
-			--with-gss_impl=mit
-
-PLIST_FILES=	lib/sasl2/libgssapiv2.a \
-		lib/sasl2/libgssapiv2.so \
-		lib/sasl2/libgssapiv2.so.3 \
-		lib/sasl2/libgssapiv2.so.3.0.0
+OPTIONS_DEFINE=			SRP_SETPASS
+OPTIONS_DEFAULT=		SRP_SETPASS
+SRP_SETPASS_DESC=		setting SRP secrets with saslpasswd
+SRP_SETPASS_CONFIGURE_ENABLE=	srp-setpass
+
+PLIST_FILES=	lib/sasl2/libsrp.a \
+		lib/sasl2/libsrp.so \
+		lib/sasl2/libsrp.so.3 \
+		lib/sasl2/libsrp.so.3.0.0
 
 .include <bsd.port.pre.mk>
 
@@ -78,13 +66,6 @@ CONFIGURE_ARGS+=--with-openssl=yes
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 .endif
 
-LIBTOOL=	${LOCALBASE}/bin/libtool
-
-post-patch:
-	@${REINPLACE_CMD} \
-		-e "/^LIBTOOL=/s|\$$(top_builddir)/libtool|${LIBTOOL}|g" \
-		${WRKSRC}/configure
-
 do-build:
 	cd ${WRKSRC}/include && ${MAKE}
 	cd ${WRKSRC}/plugins && ${MAKE}

Modified: head/security/cyrus-sasl2-srp/pkg-descr
==============================================================================
--- head/security/cyrus-sasl2-gssapi/pkg-descr	Wed Feb 24 01:19:32 2016	(r409451)
+++ head/security/cyrus-sasl2-srp/pkg-descr	Wed Feb 24 10:39:50 2016	(r409457)
@@ -1,3 +1,3 @@
-SASL GSSAPI authentication plugin
+SASL SRP authentication plugin
 
 WWW: http://cyrusimap.web.cmu.edu/

Modified: head/security/cyrus-sasl2/files/pkg-message.in
==============================================================================
--- head/security/cyrus-sasl2/files/pkg-message.in	Wed Feb 24 10:33:12 2016	(r409456)
+++ head/security/cyrus-sasl2/files/pkg-message.in	Wed Feb 24 10:39:50 2016	(r409457)
@@ -15,6 +15,8 @@ NOTE: This port has been compiled with a
       pwcheck_method.
       If you want to use GSSAPI mechanism, install
       ports/security/cyrus-sasl2-gssapi.
+      If you want to use SRP mechanism, install
+      ports/security/cyrus-sasl2-srp.
       If you want to use LDAP auxprop plugin, install
       ports/security/cyrus-sasl2-ldapdb.