pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update security/cyrus-sasl2 to 2.1.18. Changes from v...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e01914f5c80b
branches: trunk
changeset: 471557:e01914f5c80b
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Mar 29 05:47:30 2004 +0000
description:
Update security/cyrus-sasl2 to 2.1.18. Changes from version 2.1.17
include:
* Better error-handling.
* Support for Courier-IMAP authdaemond for plaintext password verification.
* Fixed resource leaks and buffer overruns.
pkgsrc changes include:
* SASL_DBTYPE is either "ndbm" or "berkeley" and sets the db format of the
sasldb authentication database, defaulting to ndbm.
* SASLSOCKETDIR is the location of the saslauthd socket directory.
* AUTHDAEMONVAR is the localt of the authdaemond socket directory.
* SASL_ENTROPY_SOURCE is a file of random bytes used as a PRNG.
This closes PR 24649 and PR 24694.
diffstat:
doc/CHANGES | 3 +-
security/cy2-login/Makefile | 4 +-
security/cy2-login/PLIST | 4 +-
security/cy2-ntlm/Makefile | 5 +--
security/cy2-ntlm/PLIST | 4 +-
security/cyrus-sasl2/DEINSTALL | 5 +--
security/cyrus-sasl2/Makefile | 42 +++++++++++++++++++++++++++++-----
security/cyrus-sasl2/Makefile.common | 34 ++++++++++++++--------------
security/cyrus-sasl2/PLIST.common | 15 ++++++-----
security/cyrus-sasl2/PLIST.krb5 | 4 +-
security/cyrus-sasl2/PLIST.plugins | 14 +++++-----
security/cyrus-sasl2/distinfo | 23 ++++++++++---------
security/cyrus-sasl2/patches/patch-aa | 26 +++++----------------
security/cyrus-sasl2/patches/patch-ab | 15 ++++++++++--
security/cyrus-sasl2/patches/patch-ad | 13 ++++++++++
security/cyrus-sasl2/patches/patch-af | 6 ++--
security/cyrus-sasl2/patches/patch-ai | 21 +++--------------
security/cyrus-sasl2/patches/patch-ak | 6 ++--
security/cyrus-sasl2/patches/patch-al | 6 ++--
security/cyrus-sasl2/patches/patch-an | 8 +++---
security/cyrus-sasl2/patches/patch-ao | 6 ++--
21 files changed, 144 insertions(+), 120 deletions(-)
diffs (truncated from 583 to 300 lines):
diff -r 7455e3905633 -r e01914f5c80b doc/CHANGES
--- a/doc/CHANGES Mon Mar 29 05:43:28 2004 +0000
+++ b/doc/CHANGES Mon Mar 29 05:47:30 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5341 2004/03/29 05:15:43 ben Exp $
+$NetBSD: CHANGES,v 1.5342 2004/03/29 05:47:30 jlam Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -1569,3 +1569,4 @@
Updated sqsh to 2.1 [grant 2004-03-29]
Updated qmail to 1.03nb4 [snj 2004-03-29]
Updated xmill to 0.9.1 [ben 2004-03-29]
+ Updated cyrus-sasl2 to 2.1.18 [jlam 2004-03-29]
diff -r 7455e3905633 -r e01914f5c80b security/cy2-login/Makefile
--- a/security/cy2-login/Makefile Mon Mar 29 05:43:28 2004 +0000
+++ b/security/cy2-login/Makefile Mon Mar 29 05:47:30 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2004/03/26 02:27:52 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/29 05:47:31 jlam Exp $
PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-login/}
PKGREVISION= 1
COMMENT= Cyrus SASL LOGIN authentication plugin
-SASL_PLUGIN= YES
+SASL_PLUGIN= yes
.include "../cyrus-sasl2/Makefile.common"
diff -r 7455e3905633 -r e01914f5c80b security/cy2-login/PLIST
--- a/security/cy2-login/PLIST Mon Mar 29 05:43:28 2004 +0000
+++ b/security/cy2-login/PLIST Mon Mar 29 05:47:30 2004 +0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2004/02/14 14:43:51 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/03/29 05:47:31 jlam Exp $
lib/sasl2/liblogin.la
lib/sasl2/liblogin.so
lib/sasl2/liblogin.so.2
-lib/sasl2/liblogin.so.2.17
+lib/sasl2/liblogin.so.2.18
diff -r 7455e3905633 -r e01914f5c80b security/cy2-ntlm/Makefile
--- a/security/cy2-ntlm/Makefile Mon Mar 29 05:43:28 2004 +0000
+++ b/security/cy2-ntlm/Makefile Mon Mar 29 05:47:30 2004 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/03/26 02:27:52 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/29 05:47:31 jlam Exp $
PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-ntlm/}
-PKGREVISION= 2
COMMENT= Cyrus SASL NTLM authentication plugin
-SASL_PLUGIN= YES
+SASL_PLUGIN= yes
.include "../cyrus-sasl2/Makefile.common"
diff -r 7455e3905633 -r e01914f5c80b security/cy2-ntlm/PLIST
--- a/security/cy2-ntlm/PLIST Mon Mar 29 05:43:28 2004 +0000
+++ b/security/cy2-ntlm/PLIST Mon Mar 29 05:47:30 2004 +0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2004/02/14 14:43:51 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/03/29 05:47:31 jlam Exp $
lib/sasl2/libntlm.la
lib/sasl2/libntlm.so
lib/sasl2/libntlm.so.2
-lib/sasl2/libntlm.so.2.17
+lib/sasl2/libntlm.so.2.18
diff -r 7455e3905633 -r e01914f5c80b security/cyrus-sasl2/DEINSTALL
--- a/security/cyrus-sasl2/DEINSTALL Mon Mar 29 05:43:28 2004 +0000
+++ b/security/cyrus-sasl2/DEINSTALL Mon Mar 29 05:47:30 2004 +0000
@@ -1,13 +1,12 @@
#!/bin/sh
#
-# $NetBSD: DEINSTALL,v 1.3 2004/01/09 19:37:48 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.4 2004/03/29 05:47:31 jlam Exp $
SASLDB=@PKG_SYSCONFDIR@/sasldb.db
case ${STAGE} in
POST-DEINSTALL)
- if [ -e ${SASLDB} ]
- then
+ if [ -f ${SASLDB} ]; then
${CAT} << EOF
===========================================================================
You may want to remove the SASL password data file:
diff -r 7455e3905633 -r e01914f5c80b security/cyrus-sasl2/Makefile
--- a/security/cyrus-sasl2/Makefile Mon Mar 29 05:43:28 2004 +0000
+++ b/security/cyrus-sasl2/Makefile Mon Mar 29 05:47:30 2004 +0000
@@ -1,13 +1,27 @@
-# $NetBSD: Makefile,v 1.27 2004/03/26 02:27:52 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2004/03/29 05:47:31 jlam Exp $
.include "Makefile.common"
-PKGREVISION= 2
SVR4_PKGNAME= csasl
COMMENT= Simple Authentication and Security Layer
PLIST_SRC+= ${PKGDIR}/PLIST.common
+.if exists(/usr/include/ndbm.h)
+SASL_DBTYPE?= ndbm
+.else
+SASL_DBTYPE?= berkeley
+.endif
+BUILD_DEFS+= SASL_DBTYPE
+
+.if ${SASL_DBTYPE} == "berkeley"
+USE_DB185= no
+. include "../../mk/bdb.buildlink3.mk"
+.endif
+
+CONFIGURE_ARGS+= --with-dblib=${SASL_DBTYPE}
+CONFIGURE_ARGS+= --with-dbpath=${PKG_SYSCONFDIR}/sasldb
+
# Authentication mechanisms
CONFIGURE_ARGS+= --enable-anon # ANONYMOUS
CONFIGURE_ARGS+= --enable-checkapop # CHECKAPOP
@@ -20,14 +34,25 @@
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
.include "../../security/openssl/buildlink3.mk"
-BUILD_DEFS+= SASL_USE_GSSAPI
+# Support using the Courier authdaemon (mail/courier-auth*) for
+# plaintext password authentication.
+#
+AUTHDAEMONVAR?= /var/authdaemon
+CONFIGURE_ARGS+= --with-authdaemond=${AUTHDAEMONVAR}
+BUILD_DEFS+= AUTHDAEMONVAR
.if exists(/dev/urandom)
-CONFIGURE_ARGS+= --with-devrandom=/dev/urandom
+SASL_ENTROPY_SOURCE?= /dev/urandom
.endif
+.if defined(SASL_ENTROPY_SOURCE)
+CONFIGURE_ARGS+= --with-devrandom=${SASL_ENTROPY_SOURCE}
+.endif
+BUILD_DEFS+= SASL_ENTROPY_SOURCE
-.if defined(KERBEROS) || \
- (defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]))
+.if defined(KERBEROS)
+SASL_USE_GSSAPI= yes
+.endif
+.if (defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]))
. include "../../mk/krb5.buildlink3.mk"
CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE} # GSSAPI
CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
@@ -35,6 +60,7 @@
GSSIMPL.mit-krb5= mit
PLIST_SRC+= ${PKGDIR}/PLIST.krb5
.endif
+BUILD_DEFS+= SASL_USE_GSSAPI
PLIST_SRC+= ${PKGDIR}/PLIST.plugins
@@ -49,6 +75,8 @@
post-install:
${INSTALL_DATA_DIR} ${HTMLDIR}
- cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt ${HTMLDIR}
+ cd ${WRKSRC}/doc; for file in *.fig *.html *.txt; do \
+ ${INSTALL_DATA} $$file ${HTMLDIR}; \
+ done
.include "../../mk/bsd.pkg.mk"
diff -r 7455e3905633 -r e01914f5c80b security/cyrus-sasl2/Makefile.common
--- a/security/cyrus-sasl2/Makefile.common Mon Mar 29 05:43:28 2004 +0000
+++ b/security/cyrus-sasl2/Makefile.common Mon Mar 29 05:47:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2004/02/14 17:21:50 jlam Exp $
+# $NetBSD: Makefile.common,v 1.19 2004/03/29 05:47:31 jlam Exp $
#
# This file is currently included by:
#
@@ -9,7 +9,7 @@
# This Makefile fragment should be included _below_ any SASL_PLUGIN
# definition and _above_ any CONFIGURE_ARGS definitions.
-DISTNAME= cyrus-sasl-2.1.17
+DISTNAME= cyrus-sasl-2.1.18
CATEGORIES= security
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
@@ -32,11 +32,11 @@
. endif
.endif
-USE_BUILDLINK3= YES
-USE_PKGINSTALL= YES
-GNU_CONFIGURE= YES
+USE_BUILDLINK3= yes
+USE_PKGINSTALL= yes
+GNU_CONFIGURE= yes
-USE_LIBTOOL= YES
+USE_LIBTOOL= yes
MAKE_ENV+= SHLIBTOOL=${SHLIBTOOL:Q}
# CYRUS_USER username of the Cyrus administrator
@@ -46,19 +46,16 @@
CYRUS_GROUP?= mail
FILES_SUBST+= CYRUS_USER=${CYRUS_USER}
FILES_SUBST+= ROOT_USER=${ROOT_USER}
+BUILD_DEFS+= CYRUS_USER CYRUS_GROUP
PLUGINDIR= ${PREFIX}/lib/sasl2
_PLUGINDIR= ${VIEWBASE}/lib/sasl2
HTMLDIR= ${PREFIX}/share/doc/html/cyrus-sasl
-# /var/run/saslauthd matches the default value in configure.
-SASLSOCKETDIR= /var/run/saslauthd
-
-BUILD_DEFS+= CYRUS_USER CYRUS_GROUP
+SASLSOCKETDIR?= /var/run/saslauthd
+BUILD_DEFS+= SASLSOCKETDIR
CONFIGURE_ARGS+= --with-saslauthd=${SASLSOCKETDIR}
-CONFIGURE_ARGS+= --with-dblib=ndbm
-CONFIGURE_ARGS+= --with-dbpath=${PKG_SYSCONFDIR}/sasldb
CONFIGURE_ARGS+= --with-plugindir=${_PLUGINDIR}
# Authentication mechanisms
@@ -75,20 +72,23 @@
CONFIGURE_ARGS+= --disable-sql # SQL
CONFIGURE_ARGS+= --disable-srp # SRP
CONFIGURE_ARGS+= --disable-srp-setpass
+CONFIGURE_ARGS+= --with-dblib=none
CONFIGURE_ARGS+= --without-pam
# clean up a bit to help package maintainer produce patch files
post-extract:
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${_PKG_SILENT}${_PKG_DEBUG} \
${FIND} ${WRKSRC} -type f -name "*.orig" -print | ${XARGS} ${RM} -f
# Left here as reference for patch makers...
#pre-configure:
-# cd ${WRKSRC}; \
-# ${ACLOCAL} -I cmulocal -I config; \
-# ${AUTOHEADER}; \
-# ${AUTOMAKE} -a --gnu -i ; \
+# cd ${WRKSRC}; \
+# ${ACLOCAL} -I cmulocal -I config; \
+# ${AUTOHEADER}; \
+# ${AUTOMAKE} -a --gnu -i ; \
# ${AUTOCONF}
+#
+#.include "../../mk/automake.mk"
post-configure:
cd ${WRKSRC}; for file in plugins/Makefile; do \
diff -r 7455e3905633 -r e01914f5c80b security/cyrus-sasl2/PLIST.common
--- a/security/cyrus-sasl2/PLIST.common Mon Mar 29 05:43:28 2004 +0000
+++ b/security/cyrus-sasl2/PLIST.common Mon Mar 29 05:47:30 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.12 2004/02/14 03:16:58 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.13 2004/03/29 05:47:31 jlam Exp $
include/sasl/hmac-md5.h
include/sasl/md5.h
include/sasl/md5global.h
@@ -10,7 +10,7 @@
lib/libsasl2.la
lib/libsasl2.so
lib/libsasl2.so.2
-lib/libsasl2.so.2.17
+lib/libsasl2.so.2.18
man/man3/sasl.3
man/man3/sasl_authorize_t.3
man/man3/sasl_auxprop.3
@@ -61,13 +61,13 @@
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-cat-sasl-gssapi-05.txt
share/doc/html/cyrus-sasl/draft-ietf-sasl-anon-02.txt
-share/doc/html/cyrus-sasl/draft-ietf-sasl-crammd5-00.txt
-share/doc/html/cyrus-sasl/draft-ietf-sasl-plain-02.txt
-share/doc/html/cyrus-sasl/draft-ietf-sasl-rfc2222bis-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-03.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
@@ -92,6 +92,7 @@
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
diff -r 7455e3905633 -r e01914f5c80b security/cyrus-sasl2/PLIST.krb5
--- a/security/cyrus-sasl2/PLIST.krb5 Mon Mar 29 05:43:28 2004 +0000
+++ b/security/cyrus-sasl2/PLIST.krb5 Mon Mar 29 05:47:30 2004 +0000
Home |
Main Index |
Thread Index |
Old Index