cyrus-sasl: update to 2.1.28

New in 2.1.28

    build:
        configure - Restore LIBS after checking gss_inquire_sec_context_by_oid
        makemd5.c - Fix potential out of bound writes
        fix build with –disable-shared –enable-static
        Dozens of fixes for Windows specific builds
        Fix cross platform builds with SPNEGO
        Do not try to build broken java subtree
        Fix build error with –enable-auth-sasldb
    common:
        plugin_common.c:
            Ensure size is always checked if called repeatedly (#617)
    documentation:
        Fixed generation of saslauthd(8) man page
        Fixed installation of saslauthd(8) and testsaslauthd(8) man pages (#373)
        Updates for additional SCRAM mechanisms
        Fix sasl_decode64 and sasl_encode64 man pages
        Tons of fixes for Sphinx
    include:
        sasl.h:
            Allow up to 16 bits for security flags
    lib:
        checkpw.c:
            Skip one call to strcat
            Disable auxprop-hashed (#374)
        client.c:
            Use proper length for fully qualified domain names
        common.c:
            CVE-2019-19906 Fix off by one error (#587)
        external.c:
            fix EXTERNAL with non-terminated input (#689)
        saslutil.c:
            fix index_64 to be a signed char (#619)
    plugins:
        gssapi.c:
            Emit debug log only in case of errors
        ntlm.c:
            Fail compile if MD4 is not available (#632)
        sql.c:
            Finish reading residual return data (#639)
            CVE-2022-24407 Escape password for SQL insert/update commands.
    sasldb:
        db_gdbm.c:
            fix gdbm_errno overlay from gdbm_close
    DIGEST-MD5 plugin:
        Prevent double free of RC4 context
        Use OpenSSL RC4 implementation if available
    SCRAM plugin:
        Return BADAUTH on incorrect password (#545)
        Add -224, -384, -512 (#552)
        Remove SCRAM_HASH_SIZE
        Add function to return SCRAM auth method name
        Allocate enough memory in scam_setpass()
        Add function to sort SCRAM methods by hash strength
        Update windows build for newer SCRAM options
    saslauthd:
        auth_httpform.c:
            Avoid signed overflow with non-ascii characters (#576)
        auth_krb5.c:
            support setting an explicit auth_krb5 server name
            support setting an explicit servername with Heimdal
            unify the MIT and Heimdal auth_krb5 implementations
            Remove call to krbtf
        auth_rimap.c:
            provide native memmem implementation if missing
        lak.c:
            Allow LDAP_OPT_X_TLS_REQUIRE_CERT to be 0 (no certificate verification)
        lak.h:
            Increase supported DN length to 4096 (#626)

14 files changed, 19 insertions, 86 deletions

diff --git a/security/cy2-digestmd5/Makefile b/security/cy2-digestmd5/Makefile
index f199896e857..25fd1085455 100644
--- a/security/cy2-digestmd5/Makefile
+++ b/security/cy2-digestmd5/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2020/01/18 21:50:34 jperkin Exp $
+# $NetBSD: Makefile,v 1.24 2022/02/24 11:00:03 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-digestmd5/}
-PKGREVISION=	1
 COMMENT=	Cyrus SASL DIGEST-MD5 authentication plugin
 SASL_PLUGIN=	yes
 
diff --git a/security/cy2-gssapi/Makefile b/security/cy2-gssapi/Makefile
index 9dc1a1c3978..b21aa22272e 100644
--- a/security/cy2-gssapi/Makefile
+++ b/security/cy2-gssapi/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2021/10/21 07:46:37 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2022/02/24 11:00:03 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-gssapi/}
-PKGREVISION=	2
 COMMENT=	Cyrus SASL GSSAPI authentication plugin
 SASL_PLUGIN=	yes
 
diff --git a/security/cy2-ldapdb/Makefile b/security/cy2-ldapdb/Makefile
index 9bb0bc4b96b..7045c2c275b 100644
--- a/security/cy2-ldapdb/Makefile
+++ b/security/cy2-ldapdb/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2020/01/18 21:50:34 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2022/02/24 11:00:03 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-ldapdb/}
-PKGREVISION=	1
 COMMENT=	Cyrus SASL LDAPDB authentication plugin
 SASL_PLUGIN=	yes
 
diff --git a/security/cy2-ntlm/Makefile b/security/cy2-ntlm/Makefile
index c9faa88e782..1c7140de9bc 100644
--- a/security/cy2-ntlm/Makefile
+++ b/security/cy2-ntlm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2020/01/18 21:50:34 jperkin Exp $
+# $NetBSD: Makefile,v 1.32 2022/02/24 11:00:03 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-ntlm/}
-PKGREVISION=	1
 COMMENT=	Cyrus SASL NTLM authentication plugin
 SASL_PLUGIN=	yes
 
diff --git a/security/cy2-otp/Makefile b/security/cy2-otp/Makefile
index 5d7d0f4ce75..c09674ca621 100644
--- a/security/cy2-otp/Makefile
+++ b/security/cy2-otp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2020/01/18 21:50:34 jperkin Exp $
+# $NetBSD: Makefile,v 1.25 2022/02/24 11:00:03 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-otp/}
-PKGREVISION=	1
 COMMENT=	Cyrus SASL OTP authentication plugin
 SASL_PLUGIN=	yes
 
diff --git a/security/cy2-scram/Makefile b/security/cy2-scram/Makefile
index cb948729268..b1bd1f626a2 100644
--- a/security/cy2-scram/Makefile
+++ b/security/cy2-scram/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2020/01/18 21:50:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2022/02/24 11:00:03 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-scram/}
-PKGREVISION=	1
 COMMENT=	Cyrus SASL SCRAM authentication plugin
 SASL_PLUGIN=	yes
 
diff --git a/security/cy2-sql/Makefile b/security/cy2-sql/Makefile
index eb23a047df5..e8efdc37381 100644
--- a/security/cy2-sql/Makefile
+++ b/security/cy2-sql/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2021/12/08 16:06:16 adam Exp $
+# $NetBSD: Makefile,v 1.49 2022/02/24 11:00:03 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-sql/}
-PKGREVISION=	9
 COMMENT=	Cyrus SASL SQL authentication plugin
 SASL_PLUGIN=	yes
 
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index e9381ad0d59..9c2ac5e4bfb 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.79 2021/05/24 19:53:51 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2022/02/24 11:00:03 wiz Exp $
 
-PKGREVISION=	2
 COMMENT=	Simple Authentication and Security Layer
 
 .include "Makefile.common"
diff --git a/security/cyrus-sasl/Makefile.common b/security/cyrus-sasl/Makefile.common
index 5da1db4a684..4e1f7c263b9 100644
--- a/security/cyrus-sasl/Makefile.common
+++ b/security/cyrus-sasl/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2020/05/14 14:31:16 nia Exp $
+# $NetBSD: Makefile.common,v 1.34 2022/02/24 11:00:03 wiz Exp $
 #
 # used by security/cyrus-sasl/Makefile
 # used by security/cy2-anonymous/Makefile
@@ -17,16 +17,10 @@
 # This Makefile fragment should be included _below_ any SASL_PLUGIN
 # definition and _above_ any CONFIGURE_ARGS definitions.
 
-DISTNAME=		cyrus-sasl-2.1.27
-DISTFILES=		${DISTNAME}-rc7${EXTRACT_SUFX}
+DISTNAME=		cyrus-sasl-2.1.28
 CATEGORIES=		security
-MASTER_SITES=		https://www.cyrusimap.org/releases/
-MASTER_SITES+=		https://www.cyrusimap.org/releases/old/
-#MASTER_SITES+=		ftp://ftp.cyrusimap.org/cyrus-sasl/OLD-VERSIONS/
-#PATCHFILES+=		cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2
-#SITES.cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2= \
-#			-https://cgit.cyrus.foundation/cyrus-sasl/patch/?id=dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d
-#PATCH_DIST_STRIP=	-p1
+MASTER_SITES+=		${MASTER_SITE_GITHUB:=cyrusimap/}
+GITHUB_RELEASE=		${DISTNAME}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.cyrusimap.org/sasl/
diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo
index 9285e3dc47e..b70ea71c0eb 100644
--- a/security/cyrus-sasl/distinfo
+++ b/security/cyrus-sasl/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.40 2021/11/15 18:12:45 wiz Exp $
+$NetBSD: distinfo,v 1.41 2022/02/24 11:00:03 wiz Exp $
 
-BLAKE2s (cyrus-sasl-2.1.27-rc7.tar.gz) = 66acec5390a4b208f8492fae9538b9df46169d00dc3228b41452cdc6eee28bdf
-SHA512 (cyrus-sasl-2.1.27-rc7.tar.gz) = 498b0f83e99f77dcf56bd2b735e71b554571703305ef9ef64038f04ef235b39d49e7b2363fc8b9952dbe2f4921542c31811e93618d7ceb468d73b4f6dafa89aa
-Size (cyrus-sasl-2.1.27-rc7.tar.gz) = 4146356 bytes
-SHA1 (patch-CVE-2019-19906) = 752de2053696f13de098267f8605b4b7afb24a6c
+BLAKE2s (cyrus-sasl-2.1.28.tar.gz) = 617623570c40af652ef1c19a746e2346f53591a4594cffdce835df29fc5aba61
+SHA512 (cyrus-sasl-2.1.28.tar.gz) = db15af9079758a9f385457a79390c8a7cd7ea666573dace8bf4fb01bb4b49037538d67285727d6a70ad799d2e2318f265c9372e2427de9371d626a1959dd6f78
+Size (cyrus-sasl-2.1.28.tar.gz) = 4034803 bytes
 SHA1 (patch-common_crypto-compat) = ad8575c62648aba83983172ec8fef08d2c9f537e
 SHA1 (patch-configure) = 1afa4777f2cc2a24bb526fab9fb6d9265677fb9f
 SHA1 (patch-plugins_otp.c) = 1dd8763d5b14c2f2462349ce5f73353ae70313fa
-SHA1 (patch-saslauthd_Makefile.in) = 397bc893975ff4d8b0067dae571381f06486493d
diff --git a/security/cyrus-sasl/patches/patch-CVE-2019-19906 b/security/cyrus-sasl/patches/patch-CVE-2019-19906
deleted file mode 100644
index 60d09687b8a..00000000000
--- a/security/cyrus-sasl/patches/patch-CVE-2019-19906
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-CVE-2019-19906,v 1.1 2020/05/14 14:27:32 nia Exp $
-
-https://github.com/cyrusimap/cyrus-sasl/commit/dcc9f51cbd4ed622cfb0f9b1c141eb2ffe3b12f1.patch
-
---- lib/common.c.orig	2018-01-19 14:13:40.000000000 +0000
-+++ lib/common.c
-@@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t 
- 
-   if (add==NULL) add = "(null)";
- 
--  addlen=strlen(add); /* only compute once */
-+  addlen=strlen(add)+1; /* only compute once */
-   if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK)
-     return SASL_NOMEM;
- 
diff --git a/security/cyrus-sasl/patches/patch-saslauthd_Makefile.in b/security/cyrus-sasl/patches/patch-saslauthd_Makefile.in
deleted file mode 100644
index 387d2b4dba8..00000000000
--- a/security/cyrus-sasl/patches/patch-saslauthd_Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-saslauthd_Makefile.in,v 1.2 2018/04/17 01:57:18 christos Exp $
-
-* install man source into $(mandir)/man8 instead of catman.
-  https://bugzilla.cyrusimap.org/show_bug.cgi?id=3740
-
---- saslauthd/Makefile.in.orig	2018-01-19 09:14:18.000000000 -0500
-+++ saslauthd/Makefile.in	2018-04-16 21:21:07.610121926 -0400
-@@ -89,8 +89,8 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
--sbin_PROGRAMS = saslauthd$(EXEEXT) testsaslauthd$(EXEEXT)
--EXTRA_PROGRAMS = saslcache$(EXEEXT)
-+sbin_PROGRAMS = saslauthd$(EXEEXT) testsaslauthd$(EXEEXT) saslcache$(EXEEXT)
-+#EXTRA_PROGRAMS = saslcache$(EXEEXT)
- subdir = saslauthd
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \
-@@ -787,9 +787,9 @@
- saslauthd.8: saslauthd.mdoc
- 	nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8
- 
--install-data-local: saslauthd.8
-+install-data-local: saslauthd.mdoc
- 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man8
--	$(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8
-+	$(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8
- 
- uninstall-local:
- 	-rm -rf $(DESTDIR)$(mandir)/man8/saslauthd.8
diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile
index b5ae4df47bf..caf7c72af23 100644
--- a/security/cyrus-saslauthd/Makefile
+++ b/security/cyrus-saslauthd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2021/10/21 07:46:37 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2022/02/24 11:00:04 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/sasl/saslauthd/}
-PKGREVISION=	2
 CONFLICTS+=	cyrus-sasl<2.1.15nb2
 
 .include "../../security/cyrus-sasl/Makefile.common"
@@ -38,10 +37,6 @@ SUBST_FILES.sysconf=	saslauthd/LDAP_SASLAUTHD saslauthd/saslauthd.mdoc
 SUBST_SED.sysconf=	-e "s,/usr/local/etc/,${PKG_SYSCONFDIR}/,g"
 
 post-install:
-	for f in saslcache ; do				\
-		${INSTALL_PROGRAM} ${WRKSRC}/saslauthd/$$f \
-			${DESTDIR}${PREFIX}/bin/$$f;	\
-	done
 .if !empty(PKG_OPTIONS:Mldap)
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/cyrus-saslauthd
 	${INSTALL_DATA} ${WRKSRC}/saslauthd/LDAP_SASLAUTHD		\
diff --git a/security/cyrus-saslauthd/PLIST b/security/cyrus-saslauthd/PLIST
index 329855b3fa0..c1b6612d22e 100644
--- a/security/cyrus-saslauthd/PLIST
+++ b/security/cyrus-saslauthd/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.14 2018/04/17 01:57:18 christos Exp $
-bin/saslcache
+@comment $NetBSD: PLIST,v 1.15 2022/02/24 11:00:04 wiz Exp $
 man/man8/saslauthd.8
-sbin/saslcache
+man/man8/testsaslauthd.8
 sbin/saslauthd
 sbin/testsaslauthd
 ${PLIST.ldap}share/doc/cyrus-saslauthd/LDAP_SASLAUTHD