[pkgsrc/trunk]: pkgsrc/security/cyrus-sasl Updated security/cyrus-sasl to 2.1...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/security/cyrus-sasl Updated security/cyrus-sasl to 2.1...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:22:29 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f1fec98c473
branches:  trunk
changeset: 511641:4f1fec98c473
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Apr 18 17:41:30 2006 +0000

description:
Updated security/cyrus-sasl to 2.1.21.  Changes from version 2.1.20 include:

* lib/dlopen.c: log the reason for opendir() failure
  when loading plugin.
* lib/common.c: honor log level setting
* sample/sample-client.c, sample/sample-server.c: Fixed several
  64 bit portability warnings.
* utils/testsuite.c: Fixed several 64 bit portability warnings.
* utils/saslpasswd.c: Fixed typo in an auxprop name.
* include/saslplug.h, lib/common.c, lib/saslint.h,
  lib/server.c: Added sasl_server_plugin_info().
* lib/common.c: initialize path in case caller didn't.

diffstat:

 security/cyrus-sasl/DEINSTALL        |   4 +-
 security/cyrus-sasl/MESSAGE          |   4 +-
 security/cyrus-sasl/Makefile         |   5 +--
 security/cyrus-sasl/Makefile.common  |  18 +++++++---------
 security/cyrus-sasl/PLIST            |  24 +++++++++++-----------
 security/cyrus-sasl/buildlink3.mk    |   4 +-
 security/cyrus-sasl/distinfo         |  30 ++++++++++++--------------
 security/cyrus-sasl/patches/patch-aa |   6 ++--
 security/cyrus-sasl/patches/patch-ab |  18 +++++++++-------
 security/cyrus-sasl/patches/patch-ac |  14 +++++++-----
 security/cyrus-sasl/patches/patch-ad |   8 +++---
 security/cyrus-sasl/patches/patch-ag |   6 ++--
 security/cyrus-sasl/patches/patch-ah |   6 ++--
 security/cyrus-sasl/patches/patch-ai |  22 +++++++++++---------
 security/cyrus-sasl/patches/patch-al |   6 ++--
 security/cyrus-sasl/patches/patch-ap |  12 ++++------
 security/cyrus-sasl/patches/patch-aq |  16 ++++++--------
 security/cyrus-sasl/patches/patch-ar |  19 -----------------
 security/cyrus-sasl/patches/patch-as |  39 ------------------------------------
 19 files changed, 100 insertions(+), 161 deletions(-)

diffs (truncated from 591 to 300 lines):

diff -r 593fd1eaf36a -r 4f1fec98c473 security/cyrus-sasl/DEINSTALL
--- a/security/cyrus-sasl/DEINSTALL     Tue Apr 18 17:31:47 2006 +0000
+++ b/security/cyrus-sasl/DEINSTALL     Tue Apr 18 17:41:30 2006 +0000
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.8 2006/04/13 21:32:40 wiz Exp $
+# $NetBSD: DEINSTALL,v 1.9 2006/04/18 17:41:30 jlam Exp $
 
 SASLDB=@PKG_SYSCONFDIR@/sasldb.db
 
 case ${STAGE} in
 POST-DEINSTALL)
-       if [ -f ${SASLDB} ]; then
+       if ${TEST} -f ${SASLDB}; then
                ${CAT} << EOF
 ===========================================================================
 You may want to remove the SASL password data file:
diff -r 593fd1eaf36a -r 4f1fec98c473 security/cyrus-sasl/MESSAGE
--- a/security/cyrus-sasl/MESSAGE       Tue Apr 18 17:31:47 2006 +0000
+++ b/security/cyrus-sasl/MESSAGE       Tue Apr 18 17:41:30 2006 +0000
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2006/04/13 21:32:40 wiz Exp $
+$NetBSD: MESSAGE,v 1.2 2006/04/18 17:41:30 jlam Exp $
 
 ${PKGNAME} by default does *not* install any authentication plugin
 modules.  Until the necessary authentication plugin modules are
@@ -9,7 +9,7 @@
 ${PKGNAME} will use the following directory as the default
 path to its plugin modules:
 
-       ${_PLUGINDIR}
+       ${PLUGINDIR}
 
 The search path for plugin modules can be customized by setting the
 SASL_PATH variable to a colon-delimted list of directories in the shell
diff -r 593fd1eaf36a -r 4f1fec98c473 security/cyrus-sasl/Makefile
--- a/security/cyrus-sasl/Makefile      Tue Apr 18 17:31:47 2006 +0000
+++ b/security/cyrus-sasl/Makefile      Tue Apr 18 17:41:30 2006 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2006/04/13 21:32:40 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2006/04/18 17:41:30 jlam Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=   3
 SVR4_PKGNAME=  csasl
 COMMENT=       Simple Authentication and Security Layer
 
@@ -60,7 +59,7 @@
 PKG_GROUPS=            ${CYRUS_GROUP}
 PKG_USERS=             ${CYRUS_USER}:${CYRUS_GROUP}::::${SH}
 
-MESSAGE_SUBST+=                _PLUGINDIR=${_PLUGINDIR:Q}
+MESSAGE_SUBST+=                PLUGINDIR=${PLUGINDIR:Q}
 
 post-install:
        ${INSTALL_DATA_DIR} ${DOCDIR}
diff -r 593fd1eaf36a -r 4f1fec98c473 security/cyrus-sasl/Makefile.common
--- a/security/cyrus-sasl/Makefile.common       Tue Apr 18 17:31:47 2006 +0000
+++ b/security/cyrus-sasl/Makefile.common       Tue Apr 18 17:41:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2006/04/13 21:32:40 wiz Exp $
+# $NetBSD: Makefile.common,v 1.9 2006/04/18 17:41:30 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.20
+DISTNAME=      cyrus-sasl-2.1.21
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
                ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
@@ -27,30 +27,26 @@
 DISTINFO_FILE=         ${.CURDIR}/../cyrus-sasl/distinfo
 PATCHDIR=              ${.CURDIR}/../cyrus-sasl/patches
 
-PKG_INSTALLATION_TYPES=        overwrite pkgviews
-
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(SASL_PLUGIN) && !empty(SASL_PLUGIN:M[yY][eE][sS])
+BUILDLINK_ABI_DEPENDS.cyrus-sasl+=     \
+                       cyrus-sasl>=${PKGVERSION:S/nb*//}
 .  include "../../security/cyrus-sasl/buildlink3.mk"
 CPPFLAGS+=             -I${BUILDLINK_PREFIX.cyrus-sasl}/include/sasl
-.  if defined(DEFAULT_VIEW.cyrus-sasl)
-DEFAULT_VIEW.${PKGBASE}=       ${DEFAULT_VIEW.cyrus-sasl}
-.  endif
 .endif
 
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            gmake
 
 USE_LIBTOOL=           yes
-LTCONFIG_OVERRIDE+=    ${WRKSRC}/config/ltconfig
 MAKE_ENV+=             SHLIBTOOL=${SHLIBTOOL:Q}
 
 DOCDIR=                        ${PREFIX}/share/doc/cyrus-sasl
 PLUGINDIR=             ${PREFIX}/lib/sasl2
-_PLUGINDIR=            ${VIEWBASE}/lib/sasl2
 
-CONFIGURE_ARGS+=       --with-plugindir=${_PLUGINDIR:Q}
+CONFIGURE_ARGS+=       --with-plugindir=${PLUGINDIR:Q}
+CONFIGURE_ARGS+=       --disable-java
 
 # Authentication mechanisms
 CONFIGURE_ARGS+=       --disable-anon          # ANONYMOUS
@@ -59,9 +55,11 @@
 CONFIGURE_ARGS+=       --disable-digest        # DIGEST-MD5
 CONFIGURE_ARGS+=       --disable-gssapi        # GSSAPI
 CONFIGURE_ARGS+=       --disable-krb4          # KERBEROS_V4
+CONFIGURE_ARGS+=       --disable-ldapdb        # LDAP
 CONFIGURE_ARGS+=       --disable-login         # LOGIN
 CONFIGURE_ARGS+=       --disable-ntlm          # NTLM
 CONFIGURE_ARGS+=       --disable-otp           # OTP
+CONFIGURE_ARGS+=       --disable-passdss       # PASSDSS
 CONFIGURE_ARGS+=       --disable-plain         # PLAIN
 CONFIGURE_ARGS+=       --disable-sql           # SQL
 CONFIGURE_ARGS+=       --disable-srp           # SRP
diff -r 593fd1eaf36a -r 4f1fec98c473 security/cyrus-sasl/PLIST
--- a/security/cyrus-sasl/PLIST Tue Apr 18 17:31:47 2006 +0000
+++ b/security/cyrus-sasl/PLIST Tue Apr 18 17:41:30 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/13 21:32:40 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/18 17:41:30 jlam Exp $
 include/sasl/hmac-md5.h
 include/sasl/md5.h
 include/sasl/md5global.h
@@ -57,23 +57,23 @@
 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/draft-burdis-cat-srp-sasl-xx.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-anon-xx.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-crammd5-xx.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-gssapi-xx.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-plain-xx.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-rfc2222bis-xx.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-rfc2831bis-xx.txt
+share/doc/cyrus-sasl/draft-ietf-sasl-saslprep-xx.txt
+share/doc/cyrus-sasl/draft-murchison-sasl-login-xx.txt
+share/doc/cyrus-sasl/draft-newman-sasl-c-api-xx.txt
+share/doc/cyrus-sasl/draft-newman-sasl-passdss-xx.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
diff -r 593fd1eaf36a -r 4f1fec98c473 security/cyrus-sasl/buildlink3.mk
--- a/security/cyrus-sasl/buildlink3.mk Tue Apr 18 17:31:47 2006 +0000
+++ b/security/cyrus-sasl/buildlink3.mk Tue Apr 18 17:41:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/13 21:32:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/18 17:41:30 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 CYRUS_SASL_BUILDLINK3_MK:=     ${CYRUS_SASL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=   cyrus-sasl
 
 .if !empty(CYRUS_SASL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.cyrus-sasl+=             cyrus-sasl>=2.1.12
+BUILDLINK_API_DEPENDS.cyrus-sasl+=     cyrus-sasl>=2.1.12
 BUILDLINK_ABI_DEPENDS.cyrus-sasl?=     cyrus-sasl>=2.1.20nb3
 BUILDLINK_PKGSRCDIR.cyrus-sasl?=       ../../security/cyrus-sasl
 .endif # CYRUS_SASL_BUILDLINK3_MK
diff -r 593fd1eaf36a -r 4f1fec98c473 security/cyrus-sasl/distinfo
--- a/security/cyrus-sasl/distinfo      Tue Apr 18 17:31:47 2006 +0000
+++ b/security/cyrus-sasl/distinfo      Tue Apr 18 17:41:30 2006 +0000
@@ -1,21 +1,19 @@
-$NetBSD: distinfo,v 1.14 2006/04/13 21:32:40 wiz Exp $
+$NetBSD: distinfo,v 1.15 2006/04/18 17:41:30 jlam Exp $
 
-SHA1 (cyrus-sasl-2.1.20.tar.gz) = d1eec5644c4e87edb95fa5ab8bf124cfdf277eb6
-RMD160 (cyrus-sasl-2.1.20.tar.gz) = 45f8d9e91e5ba4840f57d2f0526b8f41f90bbb8c
-Size (cyrus-sasl-2.1.20.tar.gz) = 1775163 bytes
-SHA1 (patch-aa) = c3542cc0e7887fa92b8b3cfa3c970b0dc2f27a8d
-SHA1 (patch-ab) = f3e86c1125e302466e876e5bf31764b9b5cff3ac
-SHA1 (patch-ac) = e03731395cefef42c5070021c09928c939fc6a58
-SHA1 (patch-ad) = 8a6663e358a67c27380e37be72d71841fd553fdf
+SHA1 (cyrus-sasl-2.1.21.tar.gz) = 6449f730c963d29d43600a95373a6e2db52d6d66
+RMD160 (cyrus-sasl-2.1.21.tar.gz) = 93e0e1868453c5781602b5cce23e746b8823a26b
+Size (cyrus-sasl-2.1.21.tar.gz) = 1584931 bytes
+SHA1 (patch-aa) = 0267569a89aade1c5aa455d618ebb0016022ecc4
+SHA1 (patch-ab) = 55cd67f8856239ab90696456a16af9498a4354ae
+SHA1 (patch-ac) = 671c462164f0c763b4a646aca9afe293be9448ef
+SHA1 (patch-ad) = c3fe38777a281b6800115711b732254f72887107
 SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad
 SHA1 (patch-af) = 40ec1378971536daddc543a66a1923451a4c381c
-SHA1 (patch-ag) = f62062ecee2bf133572d09049a77c5624ddb7f70
-SHA1 (patch-ah) = 1b0cd2d822dac2b01523fbc712f6544cd9fc298d
-SHA1 (patch-ai) = 4181f13bf69fec11aa42d98bcb85d5d8bd83dfe2
+SHA1 (patch-ag) = 6a2713504078dad681dcc6f7ba296972d03d5b15
+SHA1 (patch-ah) = 595e58bd756e75bda5f25a19119f2fc7c27bc7d9
+SHA1 (patch-ai) = 6309e9117be65e64de635cb004385e9badcd687c
 SHA1 (patch-ak) = 1f727d2bc0536ac5d9ba28f5e4cf01c6c1998987
-SHA1 (patch-al) = a4d7aa722b334df6b7b9f532b02eb5bc7a797486
-SHA1 (patch-ap) = 3c1f4e554fd49772d2f8f279af3b571eca3a7076
-SHA1 (patch-aq) = 7e4375f0bc8c5b346d050a269fd2eea87f0aaf7c
-SHA1 (patch-ar) = f03a9bddfeb7aeb8af19c2bde315a630ce03f331
-SHA1 (patch-as) = c8cebac879afda69b282f5c334ffb2c8b5eee6cd
+SHA1 (patch-al) = d706fb15cdff279251bed0a2c0a7b5cd1bad3584
+SHA1 (patch-ap) = eb87cd283f99da69916a7eb251000f2d9254f17d
+SHA1 (patch-aq) = 6d2f126a52c589a4789d1d3e3d3e8ab5e31cd82f
 SHA1 (patch-at) = cf35ac66873a5bc18216e13a1240019da99563ca
diff -r 593fd1eaf36a -r 4f1fec98c473 security/cyrus-sasl/patches/patch-aa
--- a/security/cyrus-sasl/patches/patch-aa      Tue Apr 18 17:31:47 2006 +0000
+++ b/security/cyrus-sasl/patches/patch-aa      Tue Apr 18 17:41:30 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2006/04/13 21:32:40 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2006/04/18 17:41:30 jlam Exp $
 
---- configure.in.orig  2005-02-15 07:16:40.000000000 -0500
+--- configure.in.orig  2005-05-07 00:54:18.000000000 -0400
 +++ configure.in
 @@ -44,12 +44,7 @@ dnl
  AC_INIT(lib/saslint.h)
@@ -15,7 +15,7 @@
  
  AC_CONFIG_AUX_DIR(config)
  AC_CANONICAL_HOST
-@@ -486,7 +481,6 @@ SASL_KERBEROS_V4_CHK
+@@ -506,7 +501,6 @@ SASL_KERBEROS_V4_CHK
  SASL_GSSAPI_CHK
  
  if test "$gssapi" != "no"; then
diff -r 593fd1eaf36a -r 4f1fec98c473 security/cyrus-sasl/patches/patch-ab
--- a/security/cyrus-sasl/patches/patch-ab      Tue Apr 18 17:31:47 2006 +0000
+++ b/security/cyrus-sasl/patches/patch-ab      Tue Apr 18 17:41:30 2006 +0000
@@ -1,23 +1,25 @@
-$NetBSD: patch-ab,v 1.4 2006/04/13 21:32:40 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2006/04/18 17:41:30 jlam Exp $
 
---- aclocal.m4.orig    2004-10-24 16:21:05.000000000 -0400
+--- aclocal.m4.orig    2005-05-15 01:58:02.000000000 -0400
 +++ aclocal.m4
-@@ -1678,7 +1678,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
+@@ -1696,7 +1696,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
            LIBS="$saved_LIBS -l$dbname"
            AC_TRY_LINK([#include <db.h>],
            [db_create(NULL, NULL, 0);],
 -          BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
 +          BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db; break,
              dblib="no")
+           if test "$dblib" = "berkeley"; then break; fi
            done
-         if test "$dblib" = "no"; then
-@@ -2923,7 +2923,10 @@ AC_DEFUN([SASL_GSSAPI_CHK],[
-   AC_MSG_RESULT(with implementation ${gss_impl})
+@@ -3010,8 +3010,11 @@ if test "$gssapi" != no; then
+   AC_MSG_RESULT([with implementation ${gss_impl}])
    AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv")
    SASL_MECHS="$SASL_MECHS libgssapiv2.la"
--  SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
+-  SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
+-  SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
 +  if test "$enable_static" = yes; then
-+    SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
++    SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
++    SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
 +    AC_DEFINE(STATIC_GSSAPIV2, [], [Link GSSAPI Staticly])
 +  fi
  
diff -r 593fd1eaf36a -r 4f1fec98c473 security/cyrus-sasl/patches/patch-ac
--- a/security/cyrus-sasl/patches/patch-ac      Tue Apr 18 17:31:47 2006 +0000
+++ b/security/cyrus-sasl/patches/patch-ac      Tue Apr 18 17:41:30 2006 +0000
@@ -1,14 +1,16 @@
-$NetBSD: patch-ac,v 1.3 2006/04/13 21:32:40 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2006/04/18 17:41:30 jlam Exp $
 
---- cmulocal/sasl2.m4.orig     2004-09-13 17:06:34.000000000 -0400
+--- cmulocal/sasl2.m4.orig     2005-05-07 00:15:17.000000000 -0400
 +++ cmulocal/sasl2.m4
-@@ -227,7 +227,10 @@ AC_DEFUN([SASL_GSSAPI_CHK],[
-   AC_MSG_RESULT(with implementation ${gss_impl})
+@@ -249,8 +249,11 @@ if test "$gssapi" != no; then
+   AC_MSG_RESULT([with implementation ${gss_impl}])
    AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv")
    SASL_MECHS="$SASL_MECHS libgssapiv2.la"
--  SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
Prev by Date: [pkgsrc/trunk]: pkgsrc/emulators/suse100_slang Initial import of suse100_slan...
Next by Date: [pkgsrc/trunk]: pkgsrc/emulators Add and enable suse100_gtk.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/emulators/suse100_slang Initial import of suse100_slan...
Next by Thread: [pkgsrc/trunk]: pkgsrc/emulators Add and enable suse100_gtk.
Indexes:
Home | Main Index | Thread Index | Old Index