diff --git a/security/cyrus-sasl2-gssapi/Makefile b/security/cyrus-sasl2-gssapi/Makefile
index e8432d9db8da..34dac0d0ef18 100644
--- a/security/cyrus-sasl2-gssapi/Makefile
+++ b/security/cyrus-sasl2-gssapi/Makefile
@@ -1,28 +1,27 @@
 PKGNAMESUFFIX=	-gssapi
-PORTREVISION=	2
 
 COMMENT=	SASL GSSAPI authentication plugin
 
 OPTIONS_SINGLE=			GSSAPI
 OPTIONS_SINGLE_GSSAPI=		GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 OPTIONS_DEFAULT=		GSSAPI_BASE
 GSSAPI_BASE_USES=		gssapi:base
 GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_HEIMDAL_PLIST_FILES=	${LIBGS2_PLIST_FILES}
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=mit
 GSSAPI_MIT_PLIST_FILES=		${LIBGS2_PLIST_FILES}
 
 LIBGS2_PLIST_FILES=		lib/sasl2/libgs2.a \
 				lib/sasl2/libgs2.so \
 				lib/sasl2/libgs2.so.3 \
 				lib/sasl2/libgs2.so.3.0.0
 
 CYRUS_BUILD_TARGET=		gssapiv2
 
 .include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"
diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile
index 2326128c4914..af1478e08005 100644
--- a/security/cyrus-sasl2-saslauthd/Makefile
+++ b/security/cyrus-sasl2-saslauthd/Makefile
@@ -1,63 +1,62 @@
 PKGNAMESUFFIX=	-saslauthd
-PORTREVISION=	2
 
 COMMENT=	SASL authentication server for cyrus-sasl2
 
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 INSTALL_WRKSRC=	${WRKSRC}/saslauthd
 
 USE_RC_SUBR=	saslauthd
 
 CYRUS_CONFIGURE_ARGS=	--with-saslauthd=${SASLAUTHD_RUNPATH}
 CONFIGURE_ENV+=		andrew_cv_runpath_switch=none
 
 OPTIONS_DEFINE=		DOCS HTTPFORM OPENLDAP
 OPTIONS_RADIO=		GSSAPI SASLDB
 OPTIONS_RADIO_SASLDB=	BDB1 BDB GDBM LMDB
 OPTIONS_DEFAULT=	BDB1
 
 HTTPFORM_DESC=		Enable HTTP form authentication
 HTTPFORM_CONFIGURE_ENABLE=httpform
 OPENLDAP_DESC=		Use OpenLDAP
 OPENLDAP_USE=		OPENLDAP=yes
 OPENLDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
 
 SASLDB_DESC=		Experimental SASLdb authentication module
 BDB_USES=		bdb
 BDB_CONFIGURE_ON=	--enable-auth-sasldb \
 			--with-dblib=berkeley \
 			--with-bdb-libdir=${BDB_LIB_DIR} \
 			--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 			--with-bdb=${BDB_LIB_NAME}
 BDB1_CONFIGURE_ON=	--enable-auth-sasldb \
 			--with-dblib=ndbm
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_ON=	--enable-auth-sasldb \
 			--with-dblib=gdbm \
 			--with-gdbm=${LOCALBASE}
 LMDB_DESC=		OpenLDAP Lightning Memory-Mapped Database support
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 LMDB_CONFIGURE_ON=	--enable-auth-sasldb \
 			--with-dblib=lmdb
 LMDB_CFLAGS=		-I${LOCALBASE}/include
 LMDB_LDFLAGS=		-L${LOCALBASE}/lib
 
 .if exists(/usr/lib/libkrb5.a)
 OPTIONS_RADIO_GSSAPI+=	GSSAPI_BASE
 OPTIONS_DEFAULT+=	GSSAPI_BASE
 .endif
 OPTIONS_RADIO_GSSAPI+=	GSSAPI_HEIMDAL GSSAPI_MIT
 GSSAPI_BASE_USES=		gssapi:base
 GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=heimdal
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=mit
 
 DOCS=		COPYING ChangeLog LDAP_SASLAUTHD
 
 .include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"
diff --git a/security/cyrus-sasl2-saslauthd/pkg-plist b/security/cyrus-sasl2-saslauthd/pkg-plist
index 0eb40ac2a76c..4ea4bf02d6c3 100644
--- a/security/cyrus-sasl2-saslauthd/pkg-plist
+++ b/security/cyrus-sasl2-saslauthd/pkg-plist
@@ -1,5 +1,6 @@
 man/man8/saslauthd.8.gz
+man/man8/testsaslauthd.8.gz
 sbin/saslauthd
 sbin/saslcache
 sbin/testsaslauthd
 %%RUNPATH%%@dir(cyrus,mail,750) /var/run/saslauthd
diff --git a/security/cyrus-sasl2-sql/Makefile b/security/cyrus-sasl2-sql/Makefile
index c8ef4ce4f261..471cc4038e0f 100644
--- a/security/cyrus-sasl2-sql/Makefile
+++ b/security/cyrus-sasl2-sql/Makefile
@@ -1,28 +1,27 @@
 PKGNAMESUFFIX=	-sql
-PORTREVISION=	1
 
 COMMENT=	SASL SQL plugins
 
 OPTIONS_DEFINE=	MYSQL PGSQL
 OPTIONS_RADIO=	SQLITE
 OPTIONS_RADIO_SQLITE=	SQLITE2 SQLITE3
 
 OPTIONS_DEFAULT=	MYSQL
 OPTIONS_SUB=	yes
 
 MYSQL_USES=	mysql
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
 MYSQL_CONFIGURE_OFF=	--without-mysql
 PGSQL_USES=	pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-pgsql
 SQLITE2_USES=	sqlite:2
 SQLITE2_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 SQLITE2_CONFIGURE_OFF=	--without-sqlite
 SQLITE3_USES=	sqlite:3
 SQLITE3_CONFIGURE_ON=	--with-sqlite3=${LOCALBASE}
 SQLITE3_CONFIGURE_OFF=	--without-sqlite3
 
 CONFIGURE_ARGS+=	--enable-sql
 
 .include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index f580a60b79c2..10e1b1a82794 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,65 +1,63 @@
-PORTREVISION=	2
-
 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer)
 
 USES=		cpe libtool:keepla pathfix perl5
 USE_PERL5=	patch
 
 CYRUS_CONFIGURE_ARGS=	--with-saslauthd=${SASLAUTHD_RUNPATH}
 
 NO_OPTIONS_SORT=	yes
 OPTIONS_DEFINE=		ALWAYSTRUE AUTHDAEMOND DOCS KEEP_DB_OPEN \
 			OBSOLETE_CRAM_ATTR OBSOLETE_DIGEST_ATTR
 OPTIONS_RADIO=		SASLDB
 OPTIONS_RADIO_SASLDB=	BDB1 BDB GDBM LMDB
 OPTIONS_GROUP=		PLUGIN
 OPTIONS_GROUP_PLUGIN=	ANONYMOUS CRAM DIGEST LOGIN NTLM OTP PLAIN SCRAM
 OPTIONS_DEFAULT=	ANONYMOUS AUTHDAEMOND BDB1 OBSOLETE_CRAM_ATTR CRAM \
 			OBSOLETE_DIGEST_ATTR DIGEST LOGIN NTLM OTP PLAIN SCRAM
 OPTIONS_SUB=		yes
 ALWAYSTRUE_DESC=	Alwaystrue password verifier (discouraged)
 ALWAYSTRUE_CONFIGURE_ENABLE=alwaystrue
 AUTHDAEMOND_DESC=	Use of authdaemon
 AUTHDAEMOND_CONFIGURE_ON=--with-authdaemond=/var/run/authdaemond/socket
 AUTHDAEMOND_CONFIGURE_OFF=--with-authdaemond=no
 KEEP_DB_OPEN_DESC=	Keep handle to Berkeley DB open
 KEEP_DB_OPEN_CONFIGURE_ENABLE=keep-db-open
 OBSOLETE_CRAM_ATTR_DESC=cmusaslsecretCRAM-MD5 auxprop property
 OBSOLETE_CRAM_ATTR_CONFIGURE_OFF=--enable-obsolete_cram_attr=no
 OBSOLETE_DIGEST_ATTR_DESC=cmusaslsecretDIGEST-MD5 auxprop property
 OBSOLETE_DIGEST_ATTR_CONFIGURE_OFF=--enable-obsolete_digest_attr=no
 SASLDB_DESC=		SASLdb auxprop plugin
 BDB_USES=		bdb
 BDB_CONFIGURE_ON=	--with-dblib=berkeley \
 			--with-bdb-libdir=${BDB_LIB_DIR} \
 			--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 			--with-bdb=${BDB_LIB_NAME}
 BDB1_CONFIGURE_ON=	--with-dblib=ndbm
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_ON=	--with-dblib=gdbm \
 			--with-gdbm=${LOCALBASE}
 LMDB_DESC=		OpenLDAP Lightning Memory-Mapped Database support
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 LMDB_CONFIGURE_ON=	--with-dblib=lmdb
 LMDB_CFLAGS=		-I${LOCALBASE}/include
 LMDB_LDFLAGS=		-L${LOCALBASE}/lib
 ANONYMOUS_DESC=			ANONYMOUS authentication
 ANONYMOUS_CONFIGURE_ENABLE=	anon
 CRAM_DESC=		CRAM-MD5 authentication
 CRAM_CONFIGURE_ENABLE=	cram
 DIGEST_DESC=		DIGEST-MD5 authentication
 DIGEST_CONFIGURE_ENABLE=digest
 LOGIN_DESC=		LOGIN authentication
 LOGIN_CONFIGURE_ENABLE=	login
 NTLM_DESC=		NTLM authentication
 NTLM_CONFIGURE_ENABLE=	ntlm
 OTP_DESC=		OTP authentication
 OTP_CONFIGURE_ENABLE=	otp
 PLAIN_DESC=		PLAIN authentication
 PLAIN_CONFIGURE_ENABLE=	plain
 SCRAM_DESC=		SCRAM authentication
 SCRAM_CONFIGURE_ENABLE=	scram
 
-DOCS=	AUTHORS COPYING ChangeLog INSTALL INSTALL.TXT README
+DOCS=	AUTHORS COPYING ChangeLog INSTALL.TXT README
 
 .include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"
diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
index 530307db0187..a216f017037c 100644
--- a/security/cyrus-sasl2/Makefile.common
+++ b/security/cyrus-sasl2/Makefile.common
@@ -1,189 +1,189 @@
 PORTNAME=	cyrus-sasl
-PORTVERSION=	2.1.27
+PORTVERSION=	2.1.28
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-sasl/releases/download/${PORTNAME}-${PORTVERSION}/
 
 MAINTAINER=	ume@FreeBSD.org
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES+=		gmake
 USE_LDCONFIG=	yes
 USES+=		ssl
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc \
 		--with-configdir=${PREFIX}/lib/sasl2:${PREFIX}/etc/sasl2 \
 		--with-plugindir=${PREFIX}/lib/sasl2 \
 		--with-dbpath=${PREFIX}/etc/sasldb2 \
 		--with-lib-subdir=lib \
 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
 		--includedir=${PREFIX}/include \
 		--enable-static \
 		--with-rc4=openssl \
 		--with-sphinx-build=no
 CONFIGURE_ARGS+=--disable-anon \
 		--disable-cram \
 		--disable-digest \
 		--disable-gssapi \
 		--disable-krb4 \
 		--disable-login \
 		--disable-ntlm \
 		--disable-otp \
 		--disable-plain \
 		--disable-scram \
 		--disable-srp \
 		--with-dblib=none
 CONFIGURE_ARGS+=${CYRUS_CONFIGURE_ARGS}
 CONFIGURE_ENV=	CC_FOR_BUILD="${CC}"
 MAKE_ENV+=	INSTALL_STRIP_FLAG=${STRIP}
 
 DOCSDIR=	${PREFIX}/share/doc/cyrus-sasl2
 
 CPE_VENDOR=	cmu
 
 SASLAUTHD_RUNPATH?=	/var/run/saslauthd
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 CYRUS_SASL2_DIR=${MASTERDIR}/../../security/cyrus-sasl2
 DISTINFO_FILE=	${CYRUS_SASL2_DIR}/distinfo
 PATCHDIR=	${CYRUS_SASL2_DIR}/files
 
 .if defined(PKGNAMESUFFIX)
 CYRUS_BUILD_TARGET?=	${PKGNAMESUFFIX:S/^-//}
 .else
 CYRUS_BUILD_TARGET?=	${PORTNAME}
 .endif
 
 .if ${CYRUS_BUILD_TARGET} != "cyrus-sasl" && ${CYRUS_BUILD_TARGET} != "saslauthd"
 
 INSTALL_WRKSRC=	${WRKSRC}/plugins
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 USES+=		libtool:build
 
 PLIST_FILES+=	lib/sasl2/lib${CYRUS_BUILD_TARGET}.a \
 		lib/sasl2/lib${CYRUS_BUILD_TARGET}.so \
 		lib/sasl2/lib${CYRUS_BUILD_TARGET}.so.3 \
 		lib/sasl2/lib${CYRUS_BUILD_TARGET}.so.3.0.0
 
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OPENSSLBASE} == /usr
 CONFIGURE_ARGS+=--with-openssl=yes
 .else
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 .endif
 
 .if ${ARCH} == "amd64"
 CPPFLAGS+=	-fPIC
 .endif
 
 .if ${CYRUS_BUILD_TARGET} == "cyrus-sasl"
 
 .if ${PORT_OPTIONS:MBDB1}
 SASLDB_NAME=	sasldb2.db
 .elif ${PORT_OPTIONS:MBDB}
 INVALID_BDB_VER=2
 SASLDB_NAME=	sasldb2
 .elif ${PORT_OPTIONS:MGDBM} || ${PORT_OPTIONS:MLMDB}
 SASLDB_NAME=	sasldb2
 .else
 SASLDB=	"@comment "
 .endif
 
 SUB_FILES=	pkg-deinstall pkg-install pkg-message
 SUB_LIST=	CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP} \
 		SASLDB_NAME=${SASLDB_NAME}
 
 PLIST_SUB+=	PREFIX=${PREFIX} \
 		SASLDB=${SASLDB}
 PORTDOCS=	*
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! ( -path */html/_sources* -o -name .buildinfo \
 		-o -name Makefile -o -name Makefile.in \
 		-o -name Makefile.in.bak -o -name Makefile.am \
 		-o -name NTMakefile -o -name .cvsignore )"
 .for f in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 	@${INSTALL_DATA} ${FILESDIR}/Sendmail.README ${STAGEDIR}${DOCSDIR}
 
 .elif ${CYRUS_BUILD_TARGET} == "saslauthd"
 
 .if ${PORT_OPTIONS:MBDB}
 INVALID_BDB_VER=2
 .endif
 
 .if ${PORT_OPTIONS:MOPENLDAP}
 .if defined(WITH_OPENLDAP_VER)
 WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
 .endif
 .endif
 
 .if ${SASLAUTHD_RUNPATH} != /var/run/saslauthd
 RUNPATH=	"@comment "
 .endif
 
 PLIST_SUB+=	PREFIX=${PREFIX} \
 		RUNPATH=${RUNPATH}
 PORTDOCS=	*
 
 SUB_LIST+=	SASLAUTHD_RUNPATH=${SASLAUTHD_RUNPATH}
 
 do-build:
 	cd ${WRKSRC}/include && gmake
 	cd ${WRKSRC}/common && gmake
 #.if ${PORT_OPTIONS:MBDB1} || ${PORT_OPTIONS:MBDB} || ${PORT_OPTIONS:MGDBM}
 	cd ${WRKSRC}/sasldb && gmake
 #.endif
 	cd ${WRKSRC}/saslauthd && gmake
 	cd ${WRKSRC}/saslauthd && gmake saslcache
 	cd ${WRKSRC}/saslauthd && gmake testsaslauthd
 
 post-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/saslauthd/saslcache \
 		${STAGEDIR}${PREFIX}/sbin/saslcache
 	@${INSTALL_PROGRAM} ${WRKSRC}/saslauthd/testsaslauthd \
 		${STAGEDIR}${PREFIX}/sbin/testsaslauthd
 .if ${SASLAUTHD_RUNPATH} != /var/run/saslauthd
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "SASLAUTHD_RUNPATH was specified."
 	@${ECHO_MSG} "Make sure you create ${SASLAUTHD_RUNPATH}."
 	@${ECHO_MSG} ""
 .else
 	@${MKDIR} ${STAGEDIR}/var/run/saslauthd
 .endif
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/saslauthd
 .for file in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/saslauthd/${file} \
 		${STAGEDIR}${DOCSDIR}/saslauthd
 .endfor
 
 .else		# plugin
 
 LIBTOOL=	${LOCALBASE}/bin/libtool
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "/^LIBTOOL=/s|\$$(top_builddir)/libtool|${LIBTOOL}|g" \
 		${WRKSRC}/configure
 
 do-build:
 	cd ${WRKSRC}/include && gmake
 	cd ${WRKSRC}/common && gmake
 	cd ${WRKSRC}/lib && gmake libobj.la
 	cd ${WRKSRC}/plugins && gmake
 
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index 661810dc9df6..145a23d6cd42 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542468728
-SHA256 (cyrus-sasl-2.1.27.tar.gz) = 26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5
-SIZE (cyrus-sasl-2.1.27.tar.gz) = 4111249
+TIMESTAMP = 1645585277
+SHA256 (cyrus-sasl-2.1.28.tar.gz) = 7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c
+SIZE (cyrus-sasl-2.1.28.tar.gz) = 4034803
diff --git a/security/cyrus-sasl2/files/patch-plugins__sql.c b/security/cyrus-sasl2/files/patch-plugins__sql.c
deleted file mode 100644
index 1983317092bf..000000000000
--- a/security/cyrus-sasl2/files/patch-plugins__sql.c
+++ /dev/null
@@ -1,66 +0,0 @@
---- plugins/sql.c.orig	2016-12-10 15:45:55 UTC
-+++ plugins/sql.c
-@@ -1150,6 +1150,7 @@ static int sql_auxprop_store(void *glob_context,
-     char *statement = NULL;
-     char *escap_userid = NULL;
-     char *escap_realm = NULL;
-+    char *escap_passwd = NULL;
-     const char *cmd;
-     
-     sql_settings_t *settings;
-@@ -1221,6 +1222,11 @@ static int sql_auxprop_store(void *glob_context,
- 			    "Unable to begin transaction\n");
-     }
-     for (cur = to_store; ret == SASL_OK && cur->name; cur++) {
-+	/* Free the buffer, current content is from previous loop. */
-+	if (escap_passwd) {
-+	    sparams->utils->free(escap_passwd);
-+	    escap_passwd = NULL;
-+	}
- 
- 	if (cur->name[0] == '*') {
- 	    continue;
-@@ -1242,19 +1248,32 @@ static int sql_auxprop_store(void *glob_context,
- 	}
- 	sparams->utils->free(statement);
- 
-+	if (cur->values[0]) {
-+	    escap_passwd = (char *)sparams->utils->malloc(strlen(cur->values[0])*2+1);
-+	    if (!escap_passwd) {
-+		ret = SASL_NOMEM;
-+		break;
-+	    }
-+	    settings->sql_engine->sql_escape_str(escap_passwd, cur->values[0]);
-+	}
-+
- 	/* create a statement that we will use */
- 	statement = sql_create_statement(cmd, cur->name, escap_userid,
- 					 escap_realm,
--					 cur->values && cur->values[0] ?
--					 cur->values[0] : SQL_NULL_VALUE,
-+					 escap_passwd ?
-+					 escap_passwd : SQL_NULL_VALUE,
- 					 sparams->utils);
-+	if (!statement) {
-+	    ret = SASL_NOMEM;
-+	    break;
-+	}
- 	
- 	{
- 	    char *log_statement =
- 		sql_create_statement(cmd, cur->name,
- 				     escap_userid,
- 				     escap_realm,
--				     cur->values && cur->values[0] ?
-+				     escap_passwd ?
- 				     "<omitted>" : SQL_NULL_VALUE,
- 				     sparams->utils);
- 	    sparams->utils->log(sparams->utils->conn, SASL_LOG_DEBUG,
-@@ -1287,6 +1306,7 @@ static int sql_auxprop_store(void *glob_context,
-   done:
-     if (escap_userid) sparams->utils->free(escap_userid);
-     if (escap_realm) sparams->utils->free(escap_realm);
-+    if (escap_passwd) sparams->utils->free(escap_passwd);
-     if (conn) settings->sql_engine->sql_close(conn);
-     if (userid) sparams->utils->free(userid);
-     if (realm) sparams->utils->free(realm);
diff --git a/security/cyrus-sasl2/files/patch-saslauthd__Makefile.in b/security/cyrus-sasl2/files/patch-saslauthd__Makefile.in
deleted file mode 100644
index df4ecbb209a2..000000000000
--- a/security/cyrus-sasl2/files/patch-saslauthd__Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: saslauthd/Makefile.in
-diff -u saslauthd/Makefile.in.orig saslauthd/Makefile.in
---- saslauthd/Makefile.in.orig	2011-09-07 22:13:56.000000000 +0900
-+++ saslauthd/Makefile.in	2011-09-14 15:16:53.207259788 +0900
-@@ -722,7 +722,7 @@
- 
- install-data-local: saslauthd.8
- 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man8
--	$(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8
-+	$(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.