Thu Feb 24 11:00:04 2022 UTC ()
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 窶電isable-shared 窶兎nable-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 窶兎nable-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)


(wiz)
diff -r1.23 -r1.24 pkgsrc/security/cy2-digestmd5/Makefile
diff -r1.30 -r1.31 pkgsrc/security/cy2-gssapi/Makefile
diff -r1.15 -r1.16 pkgsrc/security/cy2-ldapdb/Makefile
diff -r1.31 -r1.32 pkgsrc/security/cy2-ntlm/Makefile
diff -r1.24 -r1.25 pkgsrc/security/cy2-otp/Makefile
diff -r1.11 -r1.12 pkgsrc/security/cy2-scram/Makefile
diff -r1.48 -r1.49 pkgsrc/security/cy2-sql/Makefile
diff -r1.79 -r1.80 pkgsrc/security/cyrus-sasl/Makefile
diff -r1.33 -r1.34 pkgsrc/security/cyrus-sasl/Makefile.common
diff -r1.40 -r1.41 pkgsrc/security/cyrus-sasl/distinfo
diff -r1.1 -r0 pkgsrc/security/cyrus-sasl/patches/patch-CVE-2019-19906
diff -r1.2 -r0 pkgsrc/security/cyrus-sasl/patches/patch-saslauthd_Makefile.in
diff -r1.56 -r1.57 pkgsrc/security/cyrus-saslauthd/Makefile
diff -r1.14 -r1.15 pkgsrc/security/cyrus-saslauthd/PLIST

cvs diff -r1.23 -r1.24 pkgsrc/security/cy2-digestmd5/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cy2-digestmd5/Makefile 2020/01/18 21:50:34 1.23
+++ pkgsrc/security/cy2-digestmd5/Makefile 2022/02/24 11:00:03 1.24
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.23 2020/01/18 21:50:34 jperkin Exp $ 1# $NetBSD: Makefile,v 1.24 2022/02/24 11:00:03 wiz Exp $
2 2
3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-digestmd5/} 3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-digestmd5/}
4PKGREVISION= 1 
5COMMENT= Cyrus SASL DIGEST-MD5 authentication plugin 4COMMENT= Cyrus SASL DIGEST-MD5 authentication plugin
6SASL_PLUGIN= yes 5SASL_PLUGIN= yes
7 6
8CONFLICTS= cyrus-sasl<=2.1.19nb1 7CONFLICTS= cyrus-sasl<=2.1.19nb1
9 8
10.include "../../security/cyrus-sasl/Makefile.common" 9.include "../../security/cyrus-sasl/Makefile.common"
11 10
12CONFIGURE_ARGS+= --enable-digest 11CONFIGURE_ARGS+= --enable-digest
13CONFIGURE_ARGS+= --with-rc4 12CONFIGURE_ARGS+= --with-rc4
14CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 13CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
15 14
16BUILD_DIRS= plugins 15BUILD_DIRS= plugins
17BUILD_TARGET= libdigestmd5.la 16BUILD_TARGET= libdigestmd5.la

cvs diff -r1.30 -r1.31 pkgsrc/security/cy2-gssapi/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cy2-gssapi/Makefile 2021/10/21 07:46:37 1.30
+++ pkgsrc/security/cy2-gssapi/Makefile 2022/02/24 11:00:03 1.31
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.30 2021/10/21 07:46:37 wiz Exp $ 1# $NetBSD: Makefile,v 1.31 2022/02/24 11:00:03 wiz Exp $
2 2
3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-gssapi/} 3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-gssapi/}
4PKGREVISION= 2 
5COMMENT= Cyrus SASL GSSAPI authentication plugin 4COMMENT= Cyrus SASL GSSAPI authentication plugin
6SASL_PLUGIN= yes 5SASL_PLUGIN= yes
7 6
8CONFLICTS= cyrus-sasl<=2.1.19nb1 7CONFLICTS= cyrus-sasl<=2.1.19nb1
9 8
10.include "../../security/cyrus-sasl/Makefile.common" 9.include "../../security/cyrus-sasl/Makefile.common"
11 10
12CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 11CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
13CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE:Q} 12CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE:Q}
14CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}} 13CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
15GSSIMPL.heimdal= heimdal 14GSSIMPL.heimdal= heimdal
16GSSIMPL.mit-krb5= mit 15GSSIMPL.mit-krb5= mit
17 16

cvs diff -r1.15 -r1.16 pkgsrc/security/cy2-ldapdb/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cy2-ldapdb/Makefile 2020/01/18 21:50:34 1.15
+++ pkgsrc/security/cy2-ldapdb/Makefile 2022/02/24 11:00:03 1.16
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.15 2020/01/18 21:50:34 jperkin Exp $ 1# $NetBSD: Makefile,v 1.16 2022/02/24 11:00:03 wiz Exp $
2 2
3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-ldapdb/} 3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-ldapdb/}
4PKGREVISION= 1 
5COMMENT= Cyrus SASL LDAPDB authentication plugin 4COMMENT= Cyrus SASL LDAPDB authentication plugin
6SASL_PLUGIN= yes 5SASL_PLUGIN= yes
7 6
8.include "../../security/cyrus-sasl/Makefile.common" 7.include "../../security/cyrus-sasl/Makefile.common"
9 8
10CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap} 9CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap}
11CONFIGURE_ARGS+= --enable-ldapdb 10CONFIGURE_ARGS+= --enable-ldapdb
12 11
13BUILD_DIRS= plugins 12BUILD_DIRS= plugins
14BUILD_TARGET= libldapdb.la 13BUILD_TARGET= libldapdb.la
15 14
16.include "../../databases/openldap-client/buildlink3.mk" 15.include "../../databases/openldap-client/buildlink3.mk"
17 16

cvs diff -r1.31 -r1.32 pkgsrc/security/cy2-ntlm/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cy2-ntlm/Makefile 2020/01/18 21:50:34 1.31
+++ pkgsrc/security/cy2-ntlm/Makefile 2022/02/24 11:00:03 1.32
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.31 2020/01/18 21:50:34 jperkin Exp $ 1# $NetBSD: Makefile,v 1.32 2022/02/24 11:00:03 wiz Exp $
2 2
3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-ntlm/} 3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-ntlm/}
4PKGREVISION= 1 
5COMMENT= Cyrus SASL NTLM authentication plugin 4COMMENT= Cyrus SASL NTLM authentication plugin
6SASL_PLUGIN= yes 5SASL_PLUGIN= yes
7 6
8.include "../../security/cyrus-sasl/Makefile.common" 7.include "../../security/cyrus-sasl/Makefile.common"
9 8
10CONFIGURE_ARGS+= --enable-ntlm 9CONFIGURE_ARGS+= --enable-ntlm
11CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 10CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
12 11
13BUILD_DIRS= plugins 12BUILD_DIRS= plugins
14BUILD_TARGET= libntlm.la 13BUILD_TARGET= libntlm.la
15 14
16.include "../../security/openssl/buildlink3.mk" 15.include "../../security/openssl/buildlink3.mk"
17 16

cvs diff -r1.24 -r1.25 pkgsrc/security/cy2-otp/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cy2-otp/Makefile 2020/01/18 21:50:34 1.24
+++ pkgsrc/security/cy2-otp/Makefile 2022/02/24 11:00:03 1.25
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.24 2020/01/18 21:50:34 jperkin Exp $ 1# $NetBSD: Makefile,v 1.25 2022/02/24 11:00:03 wiz Exp $
2 2
3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-otp/} 3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-otp/}
4PKGREVISION= 1 
5COMMENT= Cyrus SASL OTP authentication plugin 4COMMENT= Cyrus SASL OTP authentication plugin
6SASL_PLUGIN= yes 5SASL_PLUGIN= yes
7 6
8CONFLICTS= cyrus-sasl<=2.1.19nb1 7CONFLICTS= cyrus-sasl<=2.1.19nb1
9 8
10.include "../../security/cyrus-sasl/Makefile.common" 9.include "../../security/cyrus-sasl/Makefile.common"
11 10
12CONFIGURE_ARGS+= --enable-otp 11CONFIGURE_ARGS+= --enable-otp
13CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 12CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
14 13
15BUILD_DIRS= plugins 14BUILD_DIRS= plugins
16#BUILD_TARGET= libotp.la 15#BUILD_TARGET= libotp.la
17 16

cvs diff -r1.11 -r1.12 pkgsrc/security/cy2-scram/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cy2-scram/Makefile 2020/01/18 21:50:35 1.11
+++ pkgsrc/security/cy2-scram/Makefile 2022/02/24 11:00:03 1.12
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.11 2020/01/18 21:50:35 jperkin Exp $ 1# $NetBSD: Makefile,v 1.12 2022/02/24 11:00:03 wiz Exp $
2 2
3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-scram/} 3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-scram/}
4PKGREVISION= 1 
5COMMENT= Cyrus SASL SCRAM authentication plugin 4COMMENT= Cyrus SASL SCRAM authentication plugin
6SASL_PLUGIN= yes 5SASL_PLUGIN= yes
7 6
8.include "../../security/cyrus-sasl/Makefile.common" 7.include "../../security/cyrus-sasl/Makefile.common"
9 8
10CONFIGURE_ARGS+= --enable-scram 9CONFIGURE_ARGS+= --enable-scram
11CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 10CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
12 11
13BUILD_DIRS= plugins 12BUILD_DIRS= plugins
14BUILD_TARGET= libscram.la 13BUILD_TARGET= libscram.la
15 14
16.include "../../security/openssl/buildlink3.mk" 15.include "../../security/openssl/buildlink3.mk"
17 16

cvs diff -r1.48 -r1.49 pkgsrc/security/cy2-sql/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cy2-sql/Makefile 2021/12/08 16:06:16 1.48
+++ pkgsrc/security/cy2-sql/Makefile 2022/02/24 11:00:03 1.49
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.48 2021/12/08 16:06:16 adam Exp $ 1# $NetBSD: Makefile,v 1.49 2022/02/24 11:00:03 wiz Exp $
2 2
3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-sql/} 3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-sql/}
4PKGREVISION= 9 
5COMMENT= Cyrus SASL SQL authentication plugin 4COMMENT= Cyrus SASL SQL authentication plugin
6SASL_PLUGIN= yes 5SASL_PLUGIN= yes
7 6
8.include "../../security/cyrus-sasl/Makefile.common" 7.include "../../security/cyrus-sasl/Makefile.common"
9 8
10PKG_OPTIONS_VAR= PKG_OPTIONS.cy2-sql 9PKG_OPTIONS_VAR= PKG_OPTIONS.cy2-sql
11PKG_SUPPORTED_OPTIONS= mysql pgsql sqlite sqlite3 10PKG_SUPPORTED_OPTIONS= mysql pgsql sqlite sqlite3
12PKG_SUGGESTED_OPTIONS= mysql 11PKG_SUGGESTED_OPTIONS= mysql
13 12
14.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
15 14
16.if !empty(PKG_OPTIONS:Mmysql) 15.if !empty(PKG_OPTIONS:Mmysql)
17. include "../../mk/mysql.buildlink3.mk" 16. include "../../mk/mysql.buildlink3.mk"

cvs diff -r1.79 -r1.80 pkgsrc/security/cyrus-sasl/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cyrus-sasl/Makefile 2021/05/24 19:53:51 1.79
+++ pkgsrc/security/cyrus-sasl/Makefile 2022/02/24 11:00:03 1.80
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.79 2021/05/24 19:53:51 wiz Exp $ 1# $NetBSD: Makefile,v 1.80 2022/02/24 11:00:03 wiz Exp $
2 2
3PKGREVISION= 2 
4COMMENT= Simple Authentication and Security Layer 3COMMENT= Simple Authentication and Security Layer
5 4
6.include "Makefile.common" 5.include "Makefile.common"
7 6
8CPPFLAGS+= -DPIC -fPIC 7CPPFLAGS+= -DPIC -fPIC
9 8
10.include "options.mk" 9.include "options.mk"
11 10
12BUILD_DEFS+= VARBASE 11BUILD_DEFS+= VARBASE
13 12
14# Support using Cyrus saslauthd (security/cyrus-saslauthd) for plaintext 13# Support using Cyrus saslauthd (security/cyrus-saslauthd) for plaintext
15# password authentication. 14# password authentication.
16# 15#

cvs diff -r1.33 -r1.34 pkgsrc/security/cyrus-sasl/Makefile.common (expand / switch to unified diff)

--- pkgsrc/security/cyrus-sasl/Makefile.common 2020/05/14 14:31:16 1.33
+++ pkgsrc/security/cyrus-sasl/Makefile.common 2022/02/24 11:00:03 1.34
@@ -1,42 +1,36 @@ @@ -1,42 +1,36 @@
1# $NetBSD: Makefile.common,v 1.33 2020/05/14 14:31:16 nia Exp $ 1# $NetBSD: Makefile.common,v 1.34 2022/02/24 11:00:03 wiz Exp $
2# 2#
3# used by security/cyrus-sasl/Makefile 3# used by security/cyrus-sasl/Makefile
4# used by security/cy2-anonymous/Makefile 4# used by security/cy2-anonymous/Makefile
5# used by security/cy2-crammd5/Makefile 5# used by security/cy2-crammd5/Makefile
6# used by security/cy2-digestmd5/Makefile 6# used by security/cy2-digestmd5/Makefile
7# used by security/cy2-gssapi/Makefile 7# used by security/cy2-gssapi/Makefile
8# used by security/cy2-ldapdb/Makefile 8# used by security/cy2-ldapdb/Makefile
9# used by security/cy2-login/Makefile 9# used by security/cy2-login/Makefile
10# used by security/cy2-ntlm/Makefile 10# used by security/cy2-ntlm/Makefile
11# used by security/cy2-otp/Makefile 11# used by security/cy2-otp/Makefile
12# used by security/cy2-plain/Makefile 12# used by security/cy2-plain/Makefile
13# used by security/cy2-scram/Makefile 13# used by security/cy2-scram/Makefile
14# used by security/cy2-sql/Makefile 14# used by security/cy2-sql/Makefile
15# used by security/cyrus-saslauthd/Makefile 15# used by security/cyrus-saslauthd/Makefile
16# 16#
17# This Makefile fragment should be included _below_ any SASL_PLUGIN 17# This Makefile fragment should be included _below_ any SASL_PLUGIN
18# definition and _above_ any CONFIGURE_ARGS definitions. 18# definition and _above_ any CONFIGURE_ARGS definitions.
19 19
20DISTNAME= cyrus-sasl-2.1.27 20DISTNAME= cyrus-sasl-2.1.28
21DISTFILES= ${DISTNAME}-rc7${EXTRACT_SUFX} 
22CATEGORIES= security 21CATEGORIES= security
23MASTER_SITES= https://www.cyrusimap.org/releases/ 22MASTER_SITES+= ${MASTER_SITE_GITHUB:=cyrusimap/}
24MASTER_SITES+= https://www.cyrusimap.org/releases/old/ 23GITHUB_RELEASE= ${DISTNAME}
25#MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-sasl/OLD-VERSIONS/ 
26#PATCHFILES+= cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2 
27#SITES.cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2= \ 
28# -https://cgit.cyrus.foundation/cyrus-sasl/patch/?id=dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d 
29#PATCH_DIST_STRIP= -p1 
30 24
31MAINTAINER= pkgsrc-users@NetBSD.org 25MAINTAINER= pkgsrc-users@NetBSD.org
32HOMEPAGE= https://www.cyrusimap.org/sasl/ 26HOMEPAGE= https://www.cyrusimap.org/sasl/
33LICENSE= original-bsd # CMU version 27LICENSE= original-bsd # CMU version
34 28
35DISTINFO_FILE= ${.CURDIR}/../../security/cyrus-sasl/distinfo 29DISTINFO_FILE= ${.CURDIR}/../../security/cyrus-sasl/distinfo
36PATCHDIR= ${.CURDIR}/../../security/cyrus-sasl/patches 30PATCHDIR= ${.CURDIR}/../../security/cyrus-sasl/patches
37 31
38PKG_SYSCONFSUBDIR= sasl2 32PKG_SYSCONFSUBDIR= sasl2
39 33
40.include "../../mk/bsd.prefs.mk" 34.include "../../mk/bsd.prefs.mk"
41 35
42.if defined(SASL_PLUGIN) && !empty(SASL_PLUGIN:M[yY][eE][sS]) 36.if defined(SASL_PLUGIN) && !empty(SASL_PLUGIN:M[yY][eE][sS])

cvs diff -r1.40 -r1.41 pkgsrc/security/cyrus-sasl/distinfo (expand / switch to unified diff)

--- pkgsrc/security/cyrus-sasl/distinfo 2021/11/15 18:12:45 1.40
+++ pkgsrc/security/cyrus-sasl/distinfo 2022/02/24 11:00:03 1.41
@@ -1,10 +1,8 @@ @@ -1,10 +1,8 @@
1$NetBSD: distinfo,v 1.40 2021/11/15 18:12:45 wiz Exp $ 1$NetBSD: distinfo,v 1.41 2022/02/24 11:00:03 wiz Exp $
2 2
3BLAKE2s (cyrus-sasl-2.1.27-rc7.tar.gz) = 66acec5390a4b208f8492fae9538b9df46169d00dc3228b41452cdc6eee28bdf 3BLAKE2s (cyrus-sasl-2.1.28.tar.gz) = 617623570c40af652ef1c19a746e2346f53591a4594cffdce835df29fc5aba61
4SHA512 (cyrus-sasl-2.1.27-rc7.tar.gz) = 498b0f83e99f77dcf56bd2b735e71b554571703305ef9ef64038f04ef235b39d49e7b2363fc8b9952dbe2f4921542c31811e93618d7ceb468d73b4f6dafa89aa 4SHA512 (cyrus-sasl-2.1.28.tar.gz) = db15af9079758a9f385457a79390c8a7cd7ea666573dace8bf4fb01bb4b49037538d67285727d6a70ad799d2e2318f265c9372e2427de9371d626a1959dd6f78
5Size (cyrus-sasl-2.1.27-rc7.tar.gz) = 4146356 bytes 5Size (cyrus-sasl-2.1.28.tar.gz) = 4034803 bytes
6SHA1 (patch-CVE-2019-19906) = 752de2053696f13de098267f8605b4b7afb24a6c 
7SHA1 (patch-common_crypto-compat) = ad8575c62648aba83983172ec8fef08d2c9f537e 6SHA1 (patch-common_crypto-compat) = ad8575c62648aba83983172ec8fef08d2c9f537e
8SHA1 (patch-configure) = 1afa4777f2cc2a24bb526fab9fb6d9265677fb9f 7SHA1 (patch-configure) = 1afa4777f2cc2a24bb526fab9fb6d9265677fb9f
9SHA1 (patch-plugins_otp.c) = 1dd8763d5b14c2f2462349ce5f73353ae70313fa 8SHA1 (patch-plugins_otp.c) = 1dd8763d5b14c2f2462349ce5f73353ae70313fa
10SHA1 (patch-saslauthd_Makefile.in) = 397bc893975ff4d8b0067dae571381f06486493d 

File Deleted: pkgsrc/security/cyrus-sasl/patches/Attic/patch-CVE-2019-19906

File Deleted: pkgsrc/security/cyrus-sasl/patches/Attic/patch-saslauthd_Makefile.in

cvs diff -r1.56 -r1.57 pkgsrc/security/cyrus-saslauthd/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cyrus-saslauthd/Makefile 2021/10/21 07:46:37 1.56
+++ pkgsrc/security/cyrus-saslauthd/Makefile 2022/02/24 11:00:04 1.57
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.56 2021/10/21 07:46:37 wiz Exp $ 1# $NetBSD: Makefile,v 1.57 2022/02/24 11:00:04 wiz Exp $
2 2
3PKGNAME= ${DISTNAME:S/sasl/saslauthd/} 3PKGNAME= ${DISTNAME:S/sasl/saslauthd/}
4PKGREVISION= 2 
5CONFLICTS+= cyrus-sasl<2.1.15nb2 4CONFLICTS+= cyrus-sasl<2.1.15nb2
6 5
7.include "../../security/cyrus-sasl/Makefile.common" 6.include "../../security/cyrus-sasl/Makefile.common"
8 7
9COMMENT= Cyrus SASL plaintext authentication daemon 8COMMENT= Cyrus SASL plaintext authentication daemon
10 9
11CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 10CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
12 11
13BUILD_TARGET= all 12BUILD_TARGET= all
14 13
15SASLSOCKETDIR?= ${VARBASE}/run/saslauthd 14SASLSOCKETDIR?= ${VARBASE}/run/saslauthd
16BUILD_DEFS+= SASLSOCKETDIR 15BUILD_DEFS+= SASLSOCKETDIR
17FILES_SUBST+= SASLSOCKETDIR=${SASLSOCKETDIR:Q} 16FILES_SUBST+= SASLSOCKETDIR=${SASLSOCKETDIR:Q}
@@ -28,24 +27,20 @@ SMF_NAME= saslauthd @@ -28,24 +27,20 @@ SMF_NAME= saslauthd
28FILES_SUBST+= ROOT_USER=${REAL_ROOT_USER:Q} 27FILES_SUBST+= ROOT_USER=${REAL_ROOT_USER:Q}
29 28
30INSTALLATION_DIRS= bin 29INSTALLATION_DIRS= bin
31 30
32.include "../../security/openssl/buildlink3.mk" 31.include "../../security/openssl/buildlink3.mk"
33 32
34SUBST_CLASSES+= sysconf 33SUBST_CLASSES+= sysconf
35SUBST_MESSAGE.sysconf= Fixing path to ${PKG_SYSCONFDIR} 34SUBST_MESSAGE.sysconf= Fixing path to ${PKG_SYSCONFDIR}
36SUBST_STAGE.sysconf= post-build 35SUBST_STAGE.sysconf= post-build
37SUBST_FILES.sysconf= saslauthd/LDAP_SASLAUTHD saslauthd/saslauthd.mdoc 36SUBST_FILES.sysconf= saslauthd/LDAP_SASLAUTHD saslauthd/saslauthd.mdoc
38SUBST_SED.sysconf= -e "s,/usr/local/etc/,${PKG_SYSCONFDIR}/,g" 37SUBST_SED.sysconf= -e "s,/usr/local/etc/,${PKG_SYSCONFDIR}/,g"
39 38
40post-install: 39post-install:
41 for f in saslcache ; do \ 
42 ${INSTALL_PROGRAM} ${WRKSRC}/saslauthd/$$f \ 
43 ${DESTDIR}${PREFIX}/bin/$$f; \ 
44 done 
45.if !empty(PKG_OPTIONS:Mldap) 40.if !empty(PKG_OPTIONS:Mldap)
46 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/cyrus-saslauthd 41 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/cyrus-saslauthd
47 ${INSTALL_DATA} ${WRKSRC}/saslauthd/LDAP_SASLAUTHD \ 42 ${INSTALL_DATA} ${WRKSRC}/saslauthd/LDAP_SASLAUTHD \
48 ${DESTDIR}${PREFIX}/share/doc/cyrus-saslauthd 43 ${DESTDIR}${PREFIX}/share/doc/cyrus-saslauthd
49.endif 44.endif
50 45
51.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"

cvs diff -r1.14 -r1.15 pkgsrc/security/cyrus-saslauthd/PLIST (expand / switch to unified diff)

--- pkgsrc/security/cyrus-saslauthd/PLIST 2018/04/17 01:57:18 1.14
+++ pkgsrc/security/cyrus-saslauthd/PLIST 2022/02/24 11:00:04 1.15
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1@comment $NetBSD: PLIST,v 1.14 2018/04/17 01:57:18 christos Exp $ 1@comment $NetBSD: PLIST,v 1.15 2022/02/24 11:00:04 wiz Exp $
2bin/saslcache 
3man/man8/saslauthd.8 2man/man8/saslauthd.8
4sbin/saslcache 3man/man8/testsaslauthd.8
5sbin/saslauthd 4sbin/saslauthd
6sbin/testsaslauthd 5sbin/testsaslauthd
7${PLIST.ldap}share/doc/cyrus-saslauthd/LDAP_SASLAUTHD 6${PLIST.ldap}share/doc/cyrus-saslauthd/LDAP_SASLAUTHD