--- a/components/cyrus-sasl/Makefile Thu Jun 09 13:52:17 2016 -0700
+++ b/components/cyrus-sasl/Makefile Thu Jun 09 14:00:56 2016 -0700
@@ -80,8 +80,8 @@
CONFIGURE_OPTIONS += --sysconfdir=$(ETCDIR)
CONFIGURE_OPTIONS += --enable-auth-sasldb
+CONFIGURE_OPTIONS += --with-saslauthd=/var/run/saslauthd
CONFIGURE_OPTIONS += --with-dblib=berkeley
-CONFIGURE_OPTIONS += --with-saslauthd=$(USRSBINDIR)/saslauthd
ifeq ($(KRB5_API), solaris)
CONFIGURE_OPTIONS += --with-gss_impl=seam
else
--- a/components/cyrus-sasl/patches/109-saslauthd.8.patch Thu Jun 09 13:52:17 2016 -0700
+++ b/components/cyrus-sasl/patches/109-saslauthd.8.patch Thu Jun 09 14:00:56 2016 -0700
@@ -3,14 +3,26 @@
when delivered as a man page.
diff -rupN old/saslauthd/saslauthd.8 new/saslauthd/saslauthd.8
---- old/saslauthd/saslauthd.8 2016-02-17 17:30:55.547115294 -0800
-+++ new/saslauthd/saslauthd.8 2016-02-17 17:32:11.708452759 -0800
+--- old/saslauthd/saslauthd.8 2016-05-31 17:50:59.886478299 -0700
++++ new/saslauthd/saslauthd.8 2016-05-31 17:54:05.126761218 -0700
@@ -1,3 +1,4 @@
+.nf
SASLAUTHD(8) BSD System Manager’s Manual SASLAUTHD(8)
NNAAMMEE
-@@ -189,3 +190,4 @@ SSEEEE AALLSSOO
+@@ -181,11 +182,14 @@ NNOOTTEESS
+ FFIILLEESS
+ /var/run/saslauthd/mux The default communications socket.
+
+- /usr/local/etc/saslauthd.conf
+- The default configuration file for ldap support.
++ /etc/sasl2/saslauthd.conf
++ The default configuration file if using -a ldap with saslauthd
++ (the preferred method for Solaris is -a shadow, which uses
++ naming services instead.)
+
+ SSEEEE AALLSSOO
+ passwd(1), getpwent(3), getspnam(3), getuserpw(3), sasl_checkpass(3)
sia_authenticate_user(3),
CMU-SASL 12 12 2005 CMU-SASL