summaryrefslogtreecommitdiff
path: root/security/cyrus-sasl/patches
diff options
context:
space:
mode:
Diffstat (limited to 'security/cyrus-sasl/patches')
-rw-r--r--security/cyrus-sasl/patches/patch-aa25
-rw-r--r--security/cyrus-sasl/patches/patch-ab25
-rw-r--r--security/cyrus-sasl/patches/patch-ac16
-rw-r--r--security/cyrus-sasl/patches/patch-ad13
-rw-r--r--security/cyrus-sasl/patches/patch-ae16
-rw-r--r--security/cyrus-sasl/patches/patch-af13
-rw-r--r--security/cyrus-sasl/patches/patch-ag13
-rw-r--r--security/cyrus-sasl/patches/patch-ah13
-rw-r--r--security/cyrus-sasl/patches/patch-ai68
-rw-r--r--security/cyrus-sasl/patches/patch-ak13
-rw-r--r--security/cyrus-sasl/patches/patch-al13
-rw-r--r--security/cyrus-sasl/patches/patch-ap25
-rw-r--r--security/cyrus-sasl/patches/patch-aq55
-rw-r--r--security/cyrus-sasl/patches/patch-ar19
-rw-r--r--security/cyrus-sasl/patches/patch-as39
-rw-r--r--security/cyrus-sasl/patches/patch-at12
16 files changed, 378 insertions, 0 deletions
diff --git a/security/cyrus-sasl/patches/patch-aa b/security/cyrus-sasl/patches/patch-aa
new file mode 100644
index 00000000000..4022e64a101
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-aa
@@ -0,0 +1,25 @@
+$NetBSD: patch-aa,v 1.7 2006/04/13 21:32:40 wiz Exp $
+
+--- configure.in.orig 2005-02-15 07:16:40.000000000 -0500
++++ configure.in
+@@ -44,12 +44,7 @@ dnl
+ AC_INIT(lib/saslint.h)
+ AC_PREREQ([2.54])
+
+-dnl use ./config.cache as the default cache file.
+-dnl we require a cache file to successfully configure our build.
+-if test $cache_file = "/dev/null"; then
+-cache_file="./config.cache"
+ AC_CACHE_LOAD
+-fi
+
+ AC_CONFIG_AUX_DIR(config)
+ AC_CANONICAL_HOST
+@@ -486,7 +481,6 @@ SASL_KERBEROS_V4_CHK
+ SASL_GSSAPI_CHK
+
+ if test "$gssapi" != "no"; then
+- AC_DEFINE(STATIC_GSSAPIV2,[],[Link GSSAPI Staticly])
+ mutex_default="no"
+ if test "$gss_impl" = "mit"; then
+ mutex_default="yes"
diff --git a/security/cyrus-sasl/patches/patch-ab b/security/cyrus-sasl/patches/patch-ab
new file mode 100644
index 00000000000..361d4d3780d
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-ab
@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.4 2006/04/13 21:32:40 wiz Exp $
+
+--- aclocal.m4.orig 2004-10-24 16:21:05.000000000 -0400
++++ aclocal.m4
+@@ -1678,7 +1678,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")
+ done
+ if test "$dblib" = "no"; then
+@@ -2923,7 +2923,10 @@ AC_DEFUN([SASL_GSSAPI_CHK],[
+ 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"
++ if test "$enable_static" = yes; then
++ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
++ AC_DEFINE(STATIC_GSSAPIV2, [], [Link GSSAPI Staticly])
++ fi
+
+ cmu_save_LIBS="$LIBS"
+ LIBS="$LIBS $GSSAPIBASE_LIBS"
diff --git a/security/cyrus-sasl/patches/patch-ac b/security/cyrus-sasl/patches/patch-ac
new file mode 100644
index 00000000000..f3dcf63cf21
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.3 2006/04/13 21:32:40 wiz Exp $
+
+--- cmulocal/sasl2.m4.orig 2004-09-13 17:06:34.000000000 -0400
++++ cmulocal/sasl2.m4
+@@ -227,7 +227,10 @@ AC_DEFUN([SASL_GSSAPI_CHK],[
+ 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"
++ if test "$enable_static" = yes; then
++ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
++ AC_DEFINE(STATIC_GSSAPIV2, [], [Link GSSAPI Staticly])
++ fi
+
+ cmu_save_LIBS="$LIBS"
+ LIBS="$LIBS $GSSAPIBASE_LIBS"
diff --git a/security/cyrus-sasl/patches/patch-ad b/security/cyrus-sasl/patches/patch-ad
new file mode 100644
index 00000000000..5b39a7f67cc
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2006/04/13 21:32:40 wiz Exp $
+
+--- cmulocal/berkdb.m4.orig 2004-09-13 17:57:17.000000000 -0400
++++ cmulocal/berkdb.m4
+@@ -217,7 +217,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")
+ done
+ if test "$dblib" = "no"; then
diff --git a/security/cyrus-sasl/patches/patch-ae b/security/cyrus-sasl/patches/patch-ae
new file mode 100644
index 00000000000..92814ccb36c
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.3 2006/04/13 21:32:40 wiz 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 @@
+ }
+ #if defined(IPV6_V6ONLY) && !(defined(__FreeBSD__) && __FreeBSD__ < 3)
+ if (r->ai_family == AF_INET6) {
+- if (setsockopt(*sock, IPPROTO_IPV6, IPV6_BINDV6ONLY,
++ if (setsockopt(*sock, IPPROTO_IPV6, IPV6_V6ONLY,
+ (void *) &on, sizeof(on)) < 0) {
+- perror("setsockopt (IPV6_BINDV6ONLY)");
++ perror("setsockopt (IPV6_V6ONLY)");
+ close(*sock);
+ continue;
+ }
diff --git a/security/cyrus-sasl/patches/patch-af b/security/cyrus-sasl/patches/patch-af
new file mode 100644
index 00000000000..797c9a3254b
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-af
@@ -0,0 +1,13 @@
+$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-ag b/security/cyrus-sasl/patches/patch-ag
new file mode 100644
index 00000000000..5aaa09d70e8
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.4 2006/04/13 21:32:40 wiz Exp $
+
+--- plugins/Makefile.in.orig Fri Jul 2 15:40:16 2004
++++ plugins/Makefile.in
+@@ -125,7 +125,7 @@ JAVA_TRUE = @JAVA_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+-LIBTOOL = @LIBTOOL@
++LIBTOOL = $(SHLIBTOOL)
+ LIB_CRYPT = @LIB_CRYPT@
+ LIB_DES = @LIB_DES@
+ LIB_DOOR = @LIB_DOOR@
diff --git a/security/cyrus-sasl/patches/patch-ah b/security/cyrus-sasl/patches/patch-ah
new file mode 100644
index 00000000000..3cc132f0539
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.5 2006/04/13 21:32:40 wiz Exp $
+
+--- lib/Makefile.in.orig Fri Aug 13 13:53:00 2004
++++ lib/Makefile.in
+@@ -121,7 +121,7 @@ JAVA_TRUE = @JAVA_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+-LIBTOOL = @LIBTOOL@
++LIBTOOL = $(SHLIBTOOL)
+ LIB_CRYPT = @LIB_CRYPT@
+ LIB_DES = @LIB_DES@
+ LIB_DOOR = @LIB_DOOR@
diff --git a/security/cyrus-sasl/patches/patch-ai b/security/cyrus-sasl/patches/patch-ai
new file mode 100644
index 00000000000..7e499ef3205
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-ai
@@ -0,0 +1,68 @@
+$NetBSD: patch-ai,v 1.4 2006/04/13 21:32:40 wiz Exp $
+
+--- configure.orig 2004-10-24 16:21:08.000000000 -0400
++++ configure
+@@ -1326,8 +1326,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+-if test $cache_file = "/dev/null"; then
+-cache_file="./config.cache"
+ if test -r "$cache_file"; then
+ # Some versions of bash will fail to source /dev/null (special
+ # files actually), so we avoid doing that.
+@@ -1345,8 +1343,6 @@ echo "$as_me: creating cache $cache_file
+ >$cache_file
+ fi
+
+-fi
+-
+ ac_aux_dir=
+ for ac_dir in config $srcdir/config; do
+ if test -f $ac_dir/install-sh; then
+@@ -5160,7 +5156,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
++ BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db; break
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5916,7 +5912,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
++ BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db; break
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -10680,7 +10676,14 @@ if test $ac_cv_lib_resolv_res_search = y
+ fi
+
+ SASL_MECHS="$SASL_MECHS libgssapiv2.la"
+- SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
++ if test "$enable_static" = yes; then
++ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
++
++cat >>confdefs.h <<\_ACEOF
++#define STATIC_GSSAPIV2
++_ACEOF
++
++ fi
+
+ cmu_save_LIBS="$LIBS"
+ LIBS="$LIBS $GSSAPIBASE_LIBS"
+@@ -10778,11 +10781,6 @@ fi
+
+
+ if test "$gssapi" != "no"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define STATIC_GSSAPIV2
+-_ACEOF
+-
+ mutex_default="no"
+ if test "$gss_impl" = "mit"; then
+ mutex_default="yes"
diff --git a/security/cyrus-sasl/patches/patch-ak b/security/cyrus-sasl/patches/patch-ak
new file mode 100644
index 00000000000..3bef823484e
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.4 2006/04/13 21:32:41 wiz Exp $
+
+--- Makefile.am.orig 2004-10-19 19:48:11.000000000 -0400
++++ Makefile.am
+@@ -69,7 +69,7 @@ else
+ INSTALLOSX =
+ endif
+
+-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
+
+ dist-hook:
diff --git a/security/cyrus-sasl/patches/patch-al b/security/cyrus-sasl/patches/patch-al
new file mode 100644
index 00000000000..da19f913e36
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.3 2006/04/13 21:32:41 wiz Exp $
+
+--- Makefile.in.orig 2004-10-24 16:21:09.000000000 -0400
++++ Makefile.in
+@@ -237,7 +237,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
+
+ framedir = /Library/Frameworks/SASL2.framework
diff --git a/security/cyrus-sasl/patches/patch-ap b/security/cyrus-sasl/patches/patch-ap
new file mode 100644
index 00000000000..1dcf972feca
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-ap
@@ -0,0 +1,25 @@
+$NetBSD: patch-ap,v 1.3 2006/04/13 21:32:41 wiz Exp $
+
+--- sasldb/Makefile.am.orig Fri Jul 2 15:39:41 2004
++++ sasldb/Makefile.am
+@@ -51,20 +51,8 @@ extra_common_sources = db_none.c db_ndbm
+ EXTRA_DIST = NTMakefile
+
+ noinst_LTLIBRARIES = libsasldb.la
+-noinst_LIBRARIES = libsasldb.a
+
+ libsasldb_la_SOURCES = allockey.c sasldb.h
+ EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
+ libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
+ libsasldb_la_LIBADD = $(SASL_DB_BACKEND)
+-
+-LOCAL_SASL_DB_BACKEND_STATIC := $(shell echo $(SASL_DB_BACKEND_STATIC) | sed -e "s%\.\./sasldb/%%g")
+-
+-# Prevent make dist stupidity
+-libsasldb_a_SOURCES =
+-EXTRA_libsasldb_a_SOURCES =
+-
+-libsasldb.a: libsasldb.la $(LOCAL_SASL_DB_BACKEND_STATIC)
+- $(AR) cru .libs/$@ $(LOCAL_SASL_DB_BACKEND_STATIC)
+-
+-
diff --git a/security/cyrus-sasl/patches/patch-aq b/security/cyrus-sasl/patches/patch-aq
new file mode 100644
index 00000000000..8a43834474b
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-aq
@@ -0,0 +1,55 @@
+$NetBSD: patch-aq,v 1.3 2006/04/13 21:32:41 wiz Exp $
+
+--- sasldb/Makefile.in.orig Fri Jul 2 15:40:18 2004
++++ sasldb/Makefile.in
+@@ -235,28 +235,18 @@ extra_common_sources = db_none.c db_ndbm
+ EXTRA_DIST = NTMakefile
+
+ noinst_LTLIBRARIES = libsasldb.la
+-noinst_LIBRARIES = libsasldb.a
+
+ libsasldb_la_SOURCES = allockey.c sasldb.h
+ EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
+ libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
+ libsasldb_la_LIBADD = $(SASL_DB_BACKEND)
+
+-LOCAL_SASL_DB_BACKEND_STATIC := $(shell echo $(SASL_DB_BACKEND_STATIC) | sed -e "s%\.\./sasldb/%%g")
+-
+-# Prevent make dist stupidity
+-libsasldb_a_SOURCES =
+-EXTRA_libsasldb_a_SOURCES =
+ subdir = sasldb
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ LIBRARIES = $(noinst_LIBRARIES)
+
+-libsasldb_a_AR = $(AR) cru
+-libsasldb_a_LIBADD =
+-am_libsasldb_a_OBJECTS =
+-libsasldb_a_OBJECTS = $(am_libsasldb_a_OBJECTS)
+ LTLIBRARIES = $(noinst_LTLIBRARIES)
+
+ libsasldb_la_LDFLAGS =
+@@ -276,10 +266,9 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(libsasldb_a_SOURCES) $(EXTRA_libsasldb_a_SOURCES) \
+- $(libsasldb_la_SOURCES) $(EXTRA_libsasldb_la_SOURCES)
++DIST_SOURCES = $(libsasldb_la_SOURCES) $(EXTRA_libsasldb_la_SOURCES)
+ DIST_COMMON = Makefile.am Makefile.in
+-SOURCES = $(libsasldb_a_SOURCES) $(EXTRA_libsasldb_a_SOURCES) $(libsasldb_la_SOURCES) $(EXTRA_libsasldb_la_SOURCES)
++SOURCES = $(libsasldb_la_SOURCES) $(EXTRA_libsasldb_la_SOURCES)
+
+ all: all-am
+
+@@ -540,8 +529,6 @@ uninstall-am: uninstall-info-am
+ tags uninstall uninstall-am uninstall-info-am
+
+
+-libsasldb.a: libsasldb.la $(LOCAL_SASL_DB_BACKEND_STATIC)
+- $(AR) cru .libs/$@ $(LOCAL_SASL_DB_BACKEND_STATIC)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/security/cyrus-sasl/patches/patch-ar b/security/cyrus-sasl/patches/patch-ar
new file mode 100644
index 00000000000..bd234336b7f
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-ar
@@ -0,0 +1,19 @@
+$NetBSD: patch-ar,v 1.3 2006/04/13 21:32:41 wiz Exp $
+
+--- utils/Makefile.am.orig Thu May 27 15:11:25 2004
++++ utils/Makefile.am
+@@ -56,11 +56,11 @@ else
+ man_MANS = saslpasswd2.8 sasldblistusers2.8
+ endif
+
+-saslpasswd2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
++saslpasswd2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs)
+ saslpasswd2_SOURCES = saslpasswd.c
+-sasldblistusers2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
++sasldblistusers2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs)
+ sasldblistusers2_SOURCES = sasldblistusers.c
+-dbconverter_2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
++dbconverter_2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs)
+
+ testsuite_LDADD = $(all_sasl_libs) @DMALLOC_LIBS@
+
diff --git a/security/cyrus-sasl/patches/patch-as b/security/cyrus-sasl/patches/patch-as
new file mode 100644
index 00000000000..fb95f2fc46e
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-as
@@ -0,0 +1,39 @@
+$NetBSD: patch-as,v 1.1 2006/04/13 21:32:41 wiz Exp $
+
+--- utils/Makefile.in.orig Fri Jul 2 15:40:14 2004
++++ utils/Makefile.in
+@@ -237,11 +237,11 @@ noinst_PROGRAMS = dbconverter-2
+
+ @NO_SASL_DB_MANS_TRUE@man_MANS =
+
+-saslpasswd2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
++saslpasswd2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs)
+ saslpasswd2_SOURCES = saslpasswd.c
+-sasldblistusers2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
++sasldblistusers2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs)
+ sasldblistusers2_SOURCES = sasldblistusers.c
+-dbconverter_2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
++dbconverter_2_LDADD = $(SASL_DB_BACKEND_STATIC) $(all_sasl_libs)
+
+ testsuite_LDADD = $(all_sasl_libs) @DMALLOC_LIBS@
+
+@@ -287,16 +287,16 @@ PROGRAMS = $(noinst_PROGRAMS) $(sbin_PRO
+
+ dbconverter_2_SOURCES = dbconverter-2.c
+ dbconverter_2_OBJECTS = dbconverter-2.$(OBJEXT)
+-dbconverter_2_DEPENDENCIES = ../sasldb/libsasldb.la ../lib/libsasl2.la
++dbconverter_2_DEPENDENCIES = $(SASL_DB_BACKEND_STATIC) ../lib/libsasl2.la
+ dbconverter_2_LDFLAGS =
+ am_sasldblistusers2_OBJECTS = sasldblistusers.$(OBJEXT)
+ sasldblistusers2_OBJECTS = $(am_sasldblistusers2_OBJECTS)
+-sasldblistusers2_DEPENDENCIES = ../sasldb/libsasldb.la \
++sasldblistusers2_DEPENDENCIES = $(SASL_DB_BACKEND_STATIC) \
+ ../lib/libsasl2.la
+ sasldblistusers2_LDFLAGS =
+ am_saslpasswd2_OBJECTS = saslpasswd.$(OBJEXT)
+ saslpasswd2_OBJECTS = $(am_saslpasswd2_OBJECTS)
+-saslpasswd2_DEPENDENCIES = ../sasldb/libsasldb.la ../lib/libsasl2.la
++saslpasswd2_DEPENDENCIES = $(SASL_DB_BACKEND_STATIC) ../lib/libsasl2.la
+ saslpasswd2_LDFLAGS =
+ am_smtptest_OBJECTS =
+ smtptest_OBJECTS = $(am_smtptest_OBJECTS)
diff --git a/security/cyrus-sasl/patches/patch-at b/security/cyrus-sasl/patches/patch-at
new file mode 100644
index 00000000000..c10bf85e66b
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-at
@@ -0,0 +1,12 @@
+$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>