diff options
author | obache <obache@pkgsrc.org> | 2006-10-04 12:07:53 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2006-10-04 12:07:53 +0000 |
commit | b67cfe7b01a56543a76a306729b8a65e9b3851da (patch) | |
tree | 3157dd1de15c069bb0023ec21da3450fc332523f /security/cyrus-sasl | |
parent | 0db58fd6b95b7fdd233488f5f57df481ee2e0454 (diff) | |
download | pkgsrc-b67cfe7b01a56543a76a306729b8a65e9b3851da.tar.gz |
Update cyrus-sasl (and plugins, authd) to 2.1.22.
New in 2.1.22
-------------
* Added support for spliting big data blocks (bigger than maxbuf)
into multiple SASL packets in sasl_encodev
* Various sasl_decode64() fixes
* Increase canonicalization buffer size to 1024 bytes
* Call do_authorization() after successful APOP authentication
* Allow for configuration file location to be configurable independently
of plugin location (bug # 2795)
* Added sasl_set_path function, which provides a more convenient way
of setting plugin and config paths. Changed the default
sasl_getpath_t/sasl_getconfpath_t callbacks to calculate
the value only once and cache it for later use.
* Fixed load_config to search for the config file in all directories
(bug # 2796). Changed the default search path to be
/usr/lib/sasl2:/etc/sasl2
* Don't ignore log_level configuration option in default UNIX syslog
logging callback
* (Windows) Minor IPv6 related changes in Makefiles for Visual Studio 6
* (Windows) Fixed bug of not setting the CODEGEN (code generation option)
nmake option if STATIC nmake option is set.
* Several fixed to DIGEST-MD5 plugin:
- Enable RC4 cipher in Windows build of DIGEST-MD5
- Server side: handle missing realm option as if realm="" was sent
- Fix DIGEST-MD5 to properly advertise maxssf when both DES and RC4
are disabled
- Check that DIGEST-MD5 SASL packet are no shorter than 16 bytes
* Several changes/fixed to SASLDB plugin:
- Prevent spurious SASL_NOUSER errors
- Added ability to keep BerkleyDB handle open between operations
(for performance reason). New behavior can be enabled
with --enable-keep-db-open.
* Better error checking in SQL (MySQL) auxprop plugin code
* Added support for HTTP POST password validation in saslauthd
* Added new application ("pluginviewer") that helps report information
about installed plugins
* Allow for building with OpenSSL 0.9.8
* Allow for building with OpenLDAP 2.3+
* Several quoting fixes to configure script
* A large number of other minor bugfixes and cleanups
Diffstat (limited to 'security/cyrus-sasl')
-rw-r--r-- | security/cyrus-sasl/Makefile.common | 4 | ||||
-rw-r--r-- | security/cyrus-sasl/PLIST | 5 | ||||
-rw-r--r-- | security/cyrus-sasl/distinfo | 26 | ||||
-rw-r--r-- | security/cyrus-sasl/patches/patch-aa | 6 | ||||
-rw-r--r-- | security/cyrus-sasl/patches/patch-ab | 6 | ||||
-rw-r--r-- | security/cyrus-sasl/patches/patch-ac | 6 | ||||
-rw-r--r-- | security/cyrus-sasl/patches/patch-ae | 8 | ||||
-rw-r--r-- | security/cyrus-sasl/patches/patch-af | 13 | ||||
-rw-r--r-- | security/cyrus-sasl/patches/patch-ai | 16 | ||||
-rw-r--r-- | security/cyrus-sasl/patches/patch-ak | 6 | ||||
-rw-r--r-- | security/cyrus-sasl/patches/patch-al | 8 | ||||
-rw-r--r-- | security/cyrus-sasl/patches/patch-aq | 10 | ||||
-rw-r--r-- | security/cyrus-sasl/patches/patch-at | 12 |
13 files changed, 51 insertions, 75 deletions
diff --git a/security/cyrus-sasl/Makefile.common b/security/cyrus-sasl/Makefile.common index 16dd7a1c1ea..78141a4da6e 100644 --- a/security/cyrus-sasl/Makefile.common +++ b/security/cyrus-sasl/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2006/04/18 17:41:30 jlam Exp $ +# $NetBSD: Makefile.common,v 1.10 2006/10/04 12:07:53 obache 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.21 +DISTNAME= cyrus-sasl-2.1.22 CATEGORIES= security MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/ diff --git a/security/cyrus-sasl/PLIST b/security/cyrus-sasl/PLIST index 21a4eb0c511..824eae6322f 100644 --- a/security/cyrus-sasl/PLIST +++ b/security/cyrus-sasl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2006/04/18 17:41:30 jlam Exp $ +@comment $NetBSD: PLIST,v 1.6 2006/10/04 12:07:53 obache Exp $ include/sasl/hmac-md5.h include/sasl/md5.h include/sasl/md5global.h @@ -30,6 +30,7 @@ man/man3/sasl_encodev.3 man/man3/sasl_errdetail.3 man/man3/sasl_errors.3 man/man3/sasl_errstring.3 +man/man3/sasl_getconfpath_t.3 man/man3/sasl_getopt_t.3 man/man3/sasl_getpath_t.3 man/man3/sasl_getprop.3 @@ -50,8 +51,10 @@ man/man3/sasl_setpass.3 man/man3/sasl_setprop.3 man/man3/sasl_user_exists.3 man/man3/sasl_verifyfile_t.3 +man/man8/pluginviewer.8 man/man8/sasldblistusers2.8 man/man8/saslpasswd2.8 +sbin/pluginviewer sbin/sasldblistusers2 sbin/saslpasswd2 share/doc/cyrus-sasl/advanced.html diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo index 3b49a6a0606..9a7a2c61ff0 100644 --- a/security/cyrus-sasl/distinfo +++ b/security/cyrus-sasl/distinfo @@ -1,19 +1,17 @@ -$NetBSD: distinfo,v 1.15 2006/04/18 17:41:30 jlam Exp $ +$NetBSD: distinfo,v 1.16 2006/10/04 12:07:53 obache Exp $ -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 (cyrus-sasl-2.1.22.tar.gz) = d23454ab12054714ab97d229c86cb934ce63fbb1 +RMD160 (cyrus-sasl-2.1.22.tar.gz) = 086e20d01588cb86decad001244b72a37223354c +Size (cyrus-sasl-2.1.22.tar.gz) = 1609278 bytes +SHA1 (patch-aa) = a20fca0058a04d00debb78d8cc051ec8d8f57af2 +SHA1 (patch-ab) = e1cb24eb8888ae93846efbb5ef42028ac52a44bd +SHA1 (patch-ac) = 1b653bee1a1b98e8e197911cc193c2c9b6d9f736 SHA1 (patch-ad) = c3fe38777a281b6800115711b732254f72887107 -SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad -SHA1 (patch-af) = 40ec1378971536daddc543a66a1923451a4c381c +SHA1 (patch-ae) = ac9403e8cdbebb8be04947c9ff8a7505002b3a36 SHA1 (patch-ag) = 6a2713504078dad681dcc6f7ba296972d03d5b15 SHA1 (patch-ah) = 595e58bd756e75bda5f25a19119f2fc7c27bc7d9 -SHA1 (patch-ai) = 6309e9117be65e64de635cb004385e9badcd687c -SHA1 (patch-ak) = 1f727d2bc0536ac5d9ba28f5e4cf01c6c1998987 -SHA1 (patch-al) = d706fb15cdff279251bed0a2c0a7b5cd1bad3584 +SHA1 (patch-ai) = 8b09b26e66f64895de069ebccb582d6d5f38287d +SHA1 (patch-ak) = e76a0ac7559845ed374c63f0261df9817e383ac1 +SHA1 (patch-al) = d1bfddb749b2f234d3750e3a83bf800bdba4cec4 SHA1 (patch-ap) = eb87cd283f99da69916a7eb251000f2d9254f17d -SHA1 (patch-aq) = 6d2f126a52c589a4789d1d3e3d3e8ab5e31cd82f -SHA1 (patch-at) = cf35ac66873a5bc18216e13a1240019da99563ca +SHA1 (patch-aq) = e7ed617db1935ed8f8c23d934da70582468c7dea diff --git a/security/cyrus-sasl/patches/patch-aa b/security/cyrus-sasl/patches/patch-aa index 2327ba38e33..01b231bd4c5 100644 --- a/security/cyrus-sasl/patches/patch-aa +++ b/security/cyrus-sasl/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.8 2006/04/18 17:41:30 jlam Exp $ +$NetBSD: patch-aa,v 1.9 2006/10/04 12:07:53 obache Exp $ ---- configure.in.orig 2005-05-07 00:54:18.000000000 -0400 +--- configure.in.orig 2006-05-18 15:06:13.000000000 -0400 +++ configure.in @@ -44,12 +44,7 @@ dnl AC_INIT(lib/saslint.h) @@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.8 2006/04/18 17:41:30 jlam Exp $ AC_CONFIG_AUX_DIR(config) AC_CANONICAL_HOST -@@ -506,7 +501,6 @@ SASL_KERBEROS_V4_CHK +@@ -528,7 +523,6 @@ SASL_KERBEROS_V4_CHK SASL_GSSAPI_CHK if test "$gssapi" != "no"; then diff --git a/security/cyrus-sasl/patches/patch-ab b/security/cyrus-sasl/patches/patch-ab index c09079943f3..796eb200cdf 100644 --- a/security/cyrus-sasl/patches/patch-ab +++ b/security/cyrus-sasl/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.5 2006/04/18 17:41:30 jlam Exp $ +$NetBSD: patch-ab,v 1.6 2006/10/04 12:07:53 obache Exp $ ---- aclocal.m4.orig 2005-05-15 01:58:02.000000000 -0400 +--- aclocal.m4.orig 2006-05-18 15:30:08.000000000 -0400 +++ aclocal.m4 @@ -1696,7 +1696,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB], LIBS="$saved_LIBS -l$dbname" @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.5 2006/04/18 17:41:30 jlam Exp $ dblib="no") if test "$dblib" = "berkeley"; then break; fi done -@@ -3010,8 +3010,11 @@ if test "$gssapi" != no; then +@@ -3016,8 +3016,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" diff --git a/security/cyrus-sasl/patches/patch-ac b/security/cyrus-sasl/patches/patch-ac index 7759ed0cc78..9699b1d59ed 100644 --- a/security/cyrus-sasl/patches/patch-ac +++ b/security/cyrus-sasl/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.4 2006/04/18 17:41:30 jlam Exp $ +$NetBSD: patch-ac,v 1.5 2006/10/04 12:07:53 obache Exp $ ---- cmulocal/sasl2.m4.orig 2005-05-07 00:15:17.000000000 -0400 +--- cmulocal/sasl2.m4.orig 2006-05-18 15:25:34.000000000 -0400 +++ cmulocal/sasl2.m4 -@@ -249,8 +249,11 @@ if test "$gssapi" != no; then +@@ -252,8 +252,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" diff --git a/security/cyrus-sasl/patches/patch-ae b/security/cyrus-sasl/patches/patch-ae index 92814ccb36c..6fd167613ed 100644 --- a/security/cyrus-sasl/patches/patch-ae +++ b/security/cyrus-sasl/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.3 2006/04/13 21:32:40 wiz Exp $ +$NetBSD: patch-ae,v 1.4 2006/10/04 12:07:53 obache Exp $ ---- sample/server.c.orig Sun Oct 27 14:15:37 2002 -+++ sample/server.c Sun Oct 27 14:15:40 2002 -@@ -117,9 +117,9 @@ +--- sample/server.c.orig 2004-03-29 09:56:40.000000000 -0500 ++++ sample/server.c +@@ -117,9 +117,9 @@ int *listensock(const char *port, const } #if defined(IPV6_V6ONLY) && !(defined(__FreeBSD__) && __FreeBSD__ < 3) if (r->ai_family == AF_INET6) { diff --git a/security/cyrus-sasl/patches/patch-af b/security/cyrus-sasl/patches/patch-af deleted file mode 100644 index 797c9a3254b..00000000000 --- a/security/cyrus-sasl/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.4 2006/04/13 21:32:40 wiz Exp $ - ---- lib/client.c.orig 2003-11-12 02:26:06.000000000 +1000 -+++ lib/client.c -@@ -61,8 +61,6 @@ - - static cmech_list_t *cmechlist; /* global var which holds the list */ - --static sasl_global_callbacks_t global_callbacks; -- - static int _sasl_client_active = 0; - - static int init_mechlist() diff --git a/security/cyrus-sasl/patches/patch-ai b/security/cyrus-sasl/patches/patch-ai index f25affc41e8..3f7d1004633 100644 --- a/security/cyrus-sasl/patches/patch-ai +++ b/security/cyrus-sasl/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.5 2006/04/18 17:41:30 jlam Exp $ +$NetBSD: patch-ai,v 1.6 2006/10/04 12:07:53 obache Exp $ ---- configure.orig 2005-05-15 01:58:28.000000000 -0400 +--- configure.orig 2006-05-18 15:30:13.000000000 -0400 +++ configure -@@ -1331,8 +1331,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -1334,8 +1334,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -11,7 +11,7 @@ $NetBSD: patch-ai,v 1.5 2006/04/18 17:41:30 jlam Exp $ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. -@@ -1350,8 +1348,6 @@ echo "$as_me: creating cache $cache_file +@@ -1353,8 +1351,6 @@ echo "$as_me: creating cache $cache_file >$cache_file fi @@ -20,7 +20,7 @@ $NetBSD: patch-ai,v 1.5 2006/04/18 17:41:30 jlam Exp $ ac_aux_dir= for ac_dir in config $srcdir/config; do if test -f $ac_dir/install-sh; then -@@ -5155,7 +5151,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -5156,7 +5152,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -29,7 +29,7 @@ $NetBSD: patch-ai,v 1.5 2006/04/18 17:41:30 jlam Exp $ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -5912,7 +5908,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -5913,7 +5909,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -38,7 +38,7 @@ $NetBSD: patch-ai,v 1.5 2006/04/18 17:41:30 jlam Exp $ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -11158,8 +11154,15 @@ if test $ac_cv_lib_resolv_res_search = y +@@ -11304,8 +11300,15 @@ if test $ac_cv_lib_resolv_res_search = y fi SASL_MECHS="$SASL_MECHS libgssapiv2.la" @@ -56,7 +56,7 @@ $NetBSD: patch-ai,v 1.5 2006/04/18 17:41:30 jlam Exp $ cmu_save_LIBS="$LIBS" LIBS="$LIBS $GSSAPIBASE_LIBS" -@@ -11257,11 +11260,6 @@ fi +@@ -11403,11 +11406,6 @@ fi if test "$gssapi" != "no"; then diff --git a/security/cyrus-sasl/patches/patch-ak b/security/cyrus-sasl/patches/patch-ak index 3bef823484e..a56cf5704c8 100644 --- a/security/cyrus-sasl/patches/patch-ak +++ b/security/cyrus-sasl/patches/patch-ak @@ -1,6 +1,6 @@ -$NetBSD: patch-ak,v 1.4 2006/04/13 21:32:41 wiz Exp $ +$NetBSD: patch-ak,v 1.5 2006/10/04 12:07:53 obache Exp $ ---- Makefile.am.orig 2004-10-19 19:48:11.000000000 -0400 +--- Makefile.am.orig 2006-05-19 10:29:48.000000000 -0400 +++ Makefile.am @@ -69,7 +69,7 @@ else INSTALLOSX = @@ -8,6 +8,6 @@ $NetBSD: patch-ak,v 1.4 2006/04/13 21:32:41 wiz Exp $ -SUBDIRS=include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) $(SAD) +SUBDIRS=include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) - EXTRA_DIST=config cmulocal win32 mac dlcompat-20010505 NTMakefile + EXTRA_DIST=config cmulocal win32 mac dlcompat-20010505 NTMakefile INSTALL.TXT dist-hook: diff --git a/security/cyrus-sasl/patches/patch-al b/security/cyrus-sasl/patches/patch-al index cd30fb08e54..41d50a4256e 100644 --- a/security/cyrus-sasl/patches/patch-al +++ b/security/cyrus-sasl/patches/patch-al @@ -1,13 +1,13 @@ -$NetBSD: patch-al,v 1.4 2006/04/18 17:41:30 jlam Exp $ +$NetBSD: patch-al,v 1.5 2006/10/04 12:07:53 obache Exp $ ---- Makefile.in.orig 2005-05-15 01:58:33.000000000 -0400 +--- Makefile.in.orig 2006-05-19 10:30:34.000000000 -0400 +++ Makefile.in -@@ -241,7 +241,7 @@ AUTOMAKE_OPTIONS = 1.7 +@@ -242,7 +242,7 @@ AUTOMAKE_OPTIONS = 1.7 @MACOSX_FALSE@INSTALLOSX = @MACOSX_TRUE@INSTALLOSX = install-exec-local-osx -SUBDIRS = include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) $(SAD) +SUBDIRS = include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) - EXTRA_DIST = config cmulocal win32 mac dlcompat-20010505 NTMakefile + EXTRA_DIST = config cmulocal win32 mac dlcompat-20010505 NTMakefile INSTALL.TXT framedir = /Library/Frameworks/SASL2.framework diff --git a/security/cyrus-sasl/patches/patch-aq b/security/cyrus-sasl/patches/patch-aq index cb7d2d1a66d..b5f01cc4018 100644 --- a/security/cyrus-sasl/patches/patch-aq +++ b/security/cyrus-sasl/patches/patch-aq @@ -1,8 +1,8 @@ -$NetBSD: patch-aq,v 1.4 2006/04/18 17:41:30 jlam Exp $ +$NetBSD: patch-aq,v 1.5 2006/10/04 12:07:53 obache Exp $ ---- sasldb/Makefile.in.orig 2005-05-15 01:58:41.000000000 -0400 +--- sasldb/Makefile.in.orig 2006-05-18 15:30:16.000000000 -0400 +++ sasldb/Makefile.in -@@ -239,26 +239,18 @@ extra_common_sources = db_none.c db_ndbm +@@ -240,26 +240,18 @@ extra_common_sources = db_none.c db_ndbm EXTRA_DIST = NTMakefile noinst_LTLIBRARIES = libsasldb.la @@ -29,7 +29,7 @@ $NetBSD: patch-aq,v 1.4 2006/04/18 17:41:30 jlam Exp $ LTLIBRARIES = $(noinst_LTLIBRARIES) libsasldb_la_LDFLAGS = -@@ -278,10 +270,9 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $( +@@ -279,10 +271,9 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $( CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -42,7 +42,7 @@ $NetBSD: patch-aq,v 1.4 2006/04/18 17:41:30 jlam Exp $ all: all-am -@@ -542,8 +533,6 @@ uninstall-am: uninstall-info-am +@@ -543,8 +534,6 @@ uninstall-am: uninstall-info-am tags uninstall uninstall-am uninstall-info-am diff --git a/security/cyrus-sasl/patches/patch-at b/security/cyrus-sasl/patches/patch-at deleted file mode 100644 index c10bf85e66b..00000000000 --- a/security/cyrus-sasl/patches/patch-at +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-at,v 1.1 2006/04/13 21:32:41 wiz Exp $ - ---- plugins/ntlm.c.orig 2006-01-27 17:45:34.000000000 +0000 -+++ plugins/ntlm.c -@@ -74,6 +74,7 @@ - #endif /* WIN32 */ - - #include <openssl/md4.h> -+#include <openssl/md5.h> - #include <openssl/hmac.h> - #include <openssl/des.h> - #include <openssl/opensslv.h> |