[pkgsrc/trunk]: pkgsrc Update security/cyrus-sasl2 and associated plugins to ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2c1812d5eb12
branches:  trunk
changeset: 483607:2c1812d5eb12
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Nov 15 21:58:16 2004 +0000

description:
Update security/cyrus-sasl2 and associated plugins to 2.1.20.  Changes
from version 2.1.19 include:

* Fixes to cram plugin to avoid attempting to canonify uninitialized data
  (This removes the need for patch-af).
* NTLM portability fixes.
* Avoid potential attack using SASL_PATH when sasl is used in a setuid
  environment.
* A trivial number of small bugfixes.

diffstat:

 doc/CHANGES                           |   3 +-
 security/cy2-digestmd5/Makefile       |   3 +-
 security/cy2-gssapi/Makefile          |   3 +-
 security/cy2-ntlm/Makefile            |   3 +-
 security/cy2-otp/Makefile             |   3 +-
 security/cy2-sql/Makefile             |   5 +-
 security/cyrus-sasl2/Makefile         |   8 +-
 security/cyrus-sasl2/Makefile.common  |   7 +-
 security/cyrus-sasl2/PLIST            |  85 +++++++++++++++++-----------------
 security/cyrus-sasl2/distinfo         |  24 ++++-----
 security/cyrus-sasl2/patches/patch-aa |  17 ++----
 security/cyrus-sasl2/patches/patch-ab |  24 ++++----
 security/cyrus-sasl2/patches/patch-ac |   6 +-
 security/cyrus-sasl2/patches/patch-ad |  22 ++++----
 security/cyrus-sasl2/patches/patch-af |  14 -----
 security/cyrus-sasl2/patches/patch-ai |  39 +++++++++++----
 security/cyrus-sasl2/patches/patch-ak |   6 +-
 security/cyrus-sasl2/patches/patch-al |   6 +-
 security/cyrus-sasl2/patches/patch-am |  38 ---------------
 security/cyrus-sasl2/patches/patch-an |  15 ------
 security/cyrus-sasl2/patches/patch-ao |  14 -----
 21 files changed, 135 insertions(+), 210 deletions(-)

diffs (truncated from 563 to 300 lines):

diff -r 9ab6f148ec88 -r 2c1812d5eb12 doc/CHANGES
--- a/doc/CHANGES       Mon Nov 15 19:13:41 2004 +0000
+++ b/doc/CHANGES       Mon Nov 15 21:58:16 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.7870 2004/11/15 17:03:32 xtraeme Exp $
+$NetBSD: CHANGES,v 1.7871 2004/11/15 21:58:19 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -5291,3 +5291,4 @@
        Updated libstatgrab to 0.11 [reed 2004-11-15]
        Updated tin to 1.6.2 [dillo 2004-11-15]
        Updated distcc to 2.18.2 [xtraeme 2004-11-15]
+       Updated cyrus-sasl2 to 2.1.20 [jlam 2004-11-15]
diff -r 9ab6f148ec88 -r 2c1812d5eb12 security/cy2-digestmd5/Makefile
--- a/security/cy2-digestmd5/Makefile   Mon Nov 15 19:13:41 2004 +0000
+++ b/security/cy2-digestmd5/Makefile   Mon Nov 15 21:58:16 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2004/10/03 00:18:07 tv Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/15 21:58:17 jlam Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-digestmd5/}
-PKGREVISION=   1
 COMMENT=       Cyrus SASL DIGEST-MD5 authentication plugin
 SASL_PLUGIN=   yes
 
diff -r 9ab6f148ec88 -r 2c1812d5eb12 security/cy2-gssapi/Makefile
--- a/security/cy2-gssapi/Makefile      Mon Nov 15 19:13:41 2004 +0000
+++ b/security/cy2-gssapi/Makefile      Mon Nov 15 21:58:16 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2004/10/03 00:18:07 tv Exp $
+# $NetBSD: Makefile,v 1.5 2004/11/15 21:58:17 jlam Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-gssapi/}
-PKGREVISION=   2
 COMMENT=       Cyrus SASL GSSAPI authentication plugin
 SASL_PLUGIN=   yes
 
diff -r 9ab6f148ec88 -r 2c1812d5eb12 security/cy2-ntlm/Makefile
--- a/security/cy2-ntlm/Makefile        Mon Nov 15 19:13:41 2004 +0000
+++ b/security/cy2-ntlm/Makefile        Mon Nov 15 21:58:16 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2004/10/03 00:18:07 tv Exp $
+# $NetBSD: Makefile,v 1.11 2004/11/15 21:58:17 jlam Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-ntlm/}
-PKGREVISION=   1
 COMMENT=       Cyrus SASL NTLM authentication plugin
 SASL_PLUGIN=   yes
 
diff -r 9ab6f148ec88 -r 2c1812d5eb12 security/cy2-otp/Makefile
--- a/security/cy2-otp/Makefile Mon Nov 15 19:13:41 2004 +0000
+++ b/security/cy2-otp/Makefile Mon Nov 15 21:58:16 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2004/10/03 00:18:08 tv Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/15 21:58:17 jlam Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-otp/}
-PKGREVISION=   1
 COMMENT=       Cyrus SASL OTP authentication plugin
 SASL_PLUGIN=   yes
 
diff -r 9ab6f148ec88 -r 2c1812d5eb12 security/cy2-sql/Makefile
--- a/security/cy2-sql/Makefile Mon Nov 15 19:13:41 2004 +0000
+++ b/security/cy2-sql/Makefile Mon Nov 15 21:58:16 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2004/10/03 00:18:08 tv Exp $
+# $NetBSD: Makefile,v 1.5 2004/11/15 21:58:17 jlam Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-sql/}
-PKGREVISION=   1
 COMMENT=       Cyrus SASL SQL authentication plugin
 SASL_PLUGIN=   yes
 
@@ -31,7 +30,7 @@
 CONFIGURE_ARGS+=       --with-sqlite=${BUILDLINK_PREFIX.sqlite}
 .endif
 
-CONFIGURE_ARGS+=       --enable-sql            # LOGIN
+CONFIGURE_ARGS+=       --enable-sql
 
 BUILD_DIRS=    ${WRKSRC}/plugins
 ALL_TARGET=    libsql.la
diff -r 9ab6f148ec88 -r 2c1812d5eb12 security/cyrus-sasl2/Makefile
--- a/security/cyrus-sasl2/Makefile     Mon Nov 15 19:13:41 2004 +0000
+++ b/security/cyrus-sasl2/Makefile     Mon Nov 15 21:58:16 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2004/10/03 00:18:08 tv Exp $
+# $NetBSD: Makefile,v 1.39 2004/11/15 21:58:16 jlam Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=   3
+PKGREVISION=   # empty
 SVR4_PKGNAME=  csasl
 COMMENT=       Simple Authentication and Security Layer
 
@@ -67,9 +67,9 @@
 MESSAGE_SUBST+=                _PLUGINDIR=${_PLUGINDIR}
 
 post-install:
-       ${INSTALL_DATA_DIR} ${HTMLDIR}
+       ${INSTALL_DATA_DIR} ${DOCDIR}
        cd ${WRKSRC}/doc; for file in *.fig *.html *.txt; do            \
-               ${INSTALL_DATA} $$file ${HTMLDIR};                      \
+               ${INSTALL_DATA} $$file ${DOCDIR};                       \
        done
 
 .include "../../mk/bsd.pkg.mk"
diff -r 9ab6f148ec88 -r 2c1812d5eb12 security/cyrus-sasl2/Makefile.common
--- a/security/cyrus-sasl2/Makefile.common      Mon Nov 15 19:13:41 2004 +0000
+++ b/security/cyrus-sasl2/Makefile.common      Mon Nov 15 21:58:16 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2004/09/12 05:08:49 jlam Exp $
+# $NetBSD: Makefile.common,v 1.26 2004/11/15 21:58:17 jlam Exp $
 #
 # This file is currently included by:
 #
@@ -16,7 +16,7 @@
 # This Makefile fragment should be included _below_ any SASL_PLUGIN
 # definition and _above_ any CONFIGURE_ARGS definitions.
 
-DISTNAME=      cyrus-sasl-2.1.19
+DISTNAME=      cyrus-sasl-2.1.20
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
                ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
@@ -34,6 +34,7 @@
 
 .if defined(SASL_PLUGIN) && !empty(SASL_PLUGIN:M[yY][eE][sS])
 .  include "../../security/cyrus-sasl2/buildlink3.mk"
+CPPFLAGS+=             -I${BUILDLINK_PREFIX.cyrus-sasl}/include/sasl
 .  if defined(DEFAULT_VIEW.cyrus-sasl)
 DEFAULT_VIEW.${PKGBASE}=       ${DEFAULT_VIEW.cyrus-sasl}
 .  endif
@@ -47,7 +48,7 @@
 USE_LIBTOOL=           yes
 MAKE_ENV+=             SHLIBTOOL=${SHLIBTOOL:Q}
 
-HTMLDIR=               ${PREFIX}/share/doc/html/cyrus-sasl
+DOCDIR=                        ${PREFIX}/share/doc/cyrus-sasl
 PLUGINDIR=             ${PREFIX}/lib/sasl2
 _PLUGINDIR=            ${VIEWBASE}/lib/sasl2
 
diff -r 9ab6f148ec88 -r 2c1812d5eb12 security/cyrus-sasl2/PLIST
--- a/security/cyrus-sasl2/PLIST        Mon Nov 15 19:13:41 2004 +0000
+++ b/security/cyrus-sasl2/PLIST        Mon Nov 15 21:58:16 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/11/15 21:58:17 jlam Exp $
 include/sasl/hmac-md5.h
 include/sasl/md5.h
 include/sasl/md5global.h
@@ -54,45 +54,46 @@
 man/man8/saslpasswd2.8
 sbin/sasldblistusers2
 sbin/saslpasswd2
-share/doc/html/cyrus-sasl/advanced.html
-share/doc/html/cyrus-sasl/appconvert.html
-share/doc/html/cyrus-sasl/components.html
-share/doc/html/cyrus-sasl/draft-burdis-cat-srp-sasl-08.txt
-share/doc/html/cyrus-sasl/draft-ietf-sasl-anon-02.txt
-share/doc/html/cyrus-sasl/draft-ietf-sasl-crammd5-01.txt
-share/doc/html/cyrus-sasl/draft-ietf-sasl-gssapi-00.txt
-share/doc/html/cyrus-sasl/draft-ietf-sasl-plain-03.txt
-share/doc/html/cyrus-sasl/draft-ietf-sasl-rfc2222bis-03.txt
-share/doc/html/cyrus-sasl/draft-ietf-sasl-rfc2831bis-02.txt
-share/doc/html/cyrus-sasl/draft-ietf-sasl-saslprep-04.txt
-share/doc/html/cyrus-sasl/draft-murchison-sasl-login-00.txt
-share/doc/html/cyrus-sasl/draft-newman-sasl-c-api-01.txt
-share/doc/html/cyrus-sasl/gssapi.html
-share/doc/html/cyrus-sasl/index.html
-share/doc/html/cyrus-sasl/install.html
-share/doc/html/cyrus-sasl/macosx.html
-share/doc/html/cyrus-sasl/mechanisms.html
-share/doc/html/cyrus-sasl/options.html
-share/doc/html/cyrus-sasl/plugprog.html
-share/doc/html/cyrus-sasl/programming.html
-share/doc/html/cyrus-sasl/readme.html
-share/doc/html/cyrus-sasl/rfc1321.txt
-share/doc/html/cyrus-sasl/rfc1939.txt
-share/doc/html/cyrus-sasl/rfc2104.txt
-share/doc/html/cyrus-sasl/rfc2195.txt
-share/doc/html/cyrus-sasl/rfc2222.txt
-share/doc/html/cyrus-sasl/rfc2243.txt
-share/doc/html/cyrus-sasl/rfc2245.txt
-share/doc/html/cyrus-sasl/rfc2289.txt
-share/doc/html/cyrus-sasl/rfc2444.txt
-share/doc/html/cyrus-sasl/rfc2595.txt
-share/doc/html/cyrus-sasl/rfc2831.txt
-share/doc/html/cyrus-sasl/rfc2945.txt
-share/doc/html/cyrus-sasl/rfc3174.txt
-share/doc/html/cyrus-sasl/server-plugin-flow.fig
-share/doc/html/cyrus-sasl/sysadmin.html
-share/doc/html/cyrus-sasl/testing.txt
-share/doc/html/cyrus-sasl/upgrading.html
-share/doc/html/cyrus-sasl/windows.html
-@dirrm share/doc/html/cyrus-sasl
+share/doc/cyrus-sasl/advanced.html
+share/doc/cyrus-sasl/appconvert.html
+share/doc/cyrus-sasl/components.html
+share/doc/cyrus-sasl/draft-burdis-cat-srp-sasl-08.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-anon-02.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-crammd5-01.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-gssapi-00.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-plain-03.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-rfc2222bis-03.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-rfc2831bis-02.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-saslprep-04.txt
+share/doc/cyrus-sasl/draft-murchison-sasl-login-00.txt
+share/doc/cyrus-sasl/draft-newman-sasl-c-api-01.txt
+share/doc/cyrus-sasl/gssapi.html
+share/doc/cyrus-sasl/index.html
+share/doc/cyrus-sasl/install.html
+share/doc/cyrus-sasl/macosx.html
+share/doc/cyrus-sasl/mechanisms.html
+share/doc/cyrus-sasl/options.html
+share/doc/cyrus-sasl/os390.html
+share/doc/cyrus-sasl/plugprog.html
+share/doc/cyrus-sasl/programming.html
+share/doc/cyrus-sasl/readme.html
+share/doc/cyrus-sasl/rfc1321.txt
+share/doc/cyrus-sasl/rfc1939.txt
+share/doc/cyrus-sasl/rfc2104.txt
+share/doc/cyrus-sasl/rfc2195.txt
+share/doc/cyrus-sasl/rfc2222.txt
+share/doc/cyrus-sasl/rfc2243.txt
+share/doc/cyrus-sasl/rfc2245.txt
+share/doc/cyrus-sasl/rfc2289.txt
+share/doc/cyrus-sasl/rfc2444.txt
+share/doc/cyrus-sasl/rfc2595.txt
+share/doc/cyrus-sasl/rfc2831.txt
+share/doc/cyrus-sasl/rfc2945.txt
+share/doc/cyrus-sasl/rfc3174.txt
+share/doc/cyrus-sasl/server-plugin-flow.fig
+share/doc/cyrus-sasl/sysadmin.html
+share/doc/cyrus-sasl/testing.txt
+share/doc/cyrus-sasl/upgrading.html
+share/doc/cyrus-sasl/windows.html
+@dirrm share/doc/cyrus-sasl
 @dirrm include/sasl
diff -r 9ab6f148ec88 -r 2c1812d5eb12 security/cyrus-sasl2/distinfo
--- a/security/cyrus-sasl2/distinfo     Mon Nov 15 19:13:41 2004 +0000
+++ b/security/cyrus-sasl2/distinfo     Mon Nov 15 21:58:16 2004 +0000
@@ -1,21 +1,17 @@
-$NetBSD: distinfo,v 1.22 2004/08/13 18:08:02 jlam Exp $
+$NetBSD: distinfo,v 1.23 2004/11/15 21:58:17 jlam Exp $
 
-SHA1 (cyrus-sasl-2.1.19.tar.gz) = 9512d70ecea33b9d44e69d185a323a0f7b133705
-Size (cyrus-sasl-2.1.19.tar.gz) = 1537350 bytes
-SHA1 (patch-aa) = c81a2f854ee445fde7a480c9f6c64dfa55f168c2
-SHA1 (patch-ab) = 33be71f563bdfeee75c9b965ca8ef8d85d38968a
-SHA1 (patch-ac) = 8536fec6241a87e2a199b4aa8da788a2439f5507
-SHA1 (patch-ad) = 351184f685a8e71f1add59452cca44728ddfec25
+SHA1 (cyrus-sasl-2.1.20.tar.gz) = d1eec5644c4e87edb95fa5ab8bf124cfdf277eb6
+Size (cyrus-sasl-2.1.20.tar.gz) = 1775163 bytes
+SHA1 (patch-aa) = a6da3823a3a8bd9e90f757245e0e5a60f44123ab
+SHA1 (patch-ab) = f3e86c1125e302466e876e5bf31764b9b5cff3ac
+SHA1 (patch-ac) = e03731395cefef42c5070021c09928c939fc6a58
+SHA1 (patch-ad) = 8a6663e358a67c27380e37be72d71841fd553fdf
 SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad
-SHA1 (patch-af) = c024ff3fe7712b9fce2e064bdc037323838231ef
 SHA1 (patch-ag) = f62062ecee2bf133572d09049a77c5624ddb7f70
 SHA1 (patch-ah) = 1b0cd2d822dac2b01523fbc712f6544cd9fc298d
-SHA1 (patch-ai) = 6cc7ee82c3e0faad0c39868ac156fddf53d36ba7
-SHA1 (patch-ak) = 32521eef7f8a9b590089f078edaa706c74d91651
-SHA1 (patch-al) = fd99c13ec5618888eb79201363475da6e376d7cb
-SHA1 (patch-am) = f0bd15b4f55e5204936a25c558d4bd2b1d4816d5
-SHA1 (patch-an) = d6ccabc24d16b63a1c1f4b4f2667b60c37aa88ec
-SHA1 (patch-ao) = c4388bd3d467a91539e9adedc287a2a7ba333744
+SHA1 (patch-ai) = a85078230b06189f4705cfd48b7a6156fbd6ee56
+SHA1 (patch-ak) = 1f727d2bc0536ac5d9ba28f5e4cf01c6c1998987
+SHA1 (patch-al) = a4d7aa722b334df6b7b9f532b02eb5bc7a797486
 SHA1 (patch-ap) = 3c1f4e554fd49772d2f8f279af3b571eca3a7076
 SHA1 (patch-aq) = 7e4375f0bc8c5b346d050a269fd2eea87f0aaf7c
 SHA1 (patch-ar) = f03a9bddfeb7aeb8af19c2bde315a630ce03f331
diff -r 9ab6f148ec88 -r 2c1812d5eb12 security/cyrus-sasl2/patches/patch-aa
--- a/security/cyrus-sasl2/patches/patch-aa     Mon Nov 15 19:13:41 2004 +0000
+++ b/security/cyrus-sasl2/patches/patch-aa     Mon Nov 15 21:58:16 2004 +0000
@@ -1,15 +1,12 @@
-$NetBSD: patch-aa,v 1.8 2004/08/04 19:41:07 jlam Exp $
+$NetBSD: patch-aa,v 1.9 2004/11/15 21:58:17 jlam Exp $
 
---- configure.in.orig  Fri Jul  2 15:39:34 2004
+--- configure.in.orig  2004-10-24 16:05:13.000000000 -0400
 +++ configure.in
-@@ -485,10 +485,6 @@ SASL_KERBEROS_V4_CHK
+@@ -486,7 +486,6 @@ SASL_KERBEROS_V4_CHK
  SASL_GSSAPI_CHK
- SASL_PLAIN_CHK
  
--if test "$gssapi" != "no"; then
+ if test "$gssapi" != "no"; then
 -  AC_DEFINE(STATIC_GSSAPIV2,[],[Link GSSAPI Staticly])
--fi
--
- dnl ANONYMOUS
- AC_ARG_ENABLE(anon, [  --enable-anon           enable ANONYMOUS authentication [yes] ],
-   anon=$enableval,
+   mutex_default="no"