- Make saslauthd a separate port to avoid dependency loop between

  cyrus-sasl2 and openldap.
- Stop using configuration menu.  I believe it ease to maintain
  consistency with other SASL related ports.

2 files changed, 15 insertions, 78 deletions

diff --git a/security/cyrus-sasl2/files/patch-configure b/security/cyrus-sasl2/files/patch-configure
index 10f6faea803e..f80f687b22b2 100644
--- a/security/cyrus-sasl2/files/patch-configure
+++ b/security/cyrus-sasl2/files/patch-configure
@@ -1,5 +1,7 @@
---- configure.orig	Mon Apr 14 20:07:48 2003
-+++ configure	Tue Apr 15 01:39:33 2003
+Index: configure
+diff -u configure.orig configure
+--- configure.orig	Tue Apr 15 03:07:48 2003
++++ configure	Tue May 27 17:29:16 2003
 @@ -2652,7 +2652,7 @@
  	    BDB_LIBADD=""
  	fi
@@ -18,7 +20,16 @@
            do
              echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
  echo "configure:3050: checking for db_create in -l$dbname" >&5
-@@ -5456,7 +5456,7 @@
+@@ -3761,6 +3761,8 @@
+   SASLAUTHD_TRUE='#'
+   SASLAUTHD_FALSE=
+ fi
++SASLAUTHD_TRUE='#'
++SASLAUTHD_FALSE=
+ echo $ac_n "checking if I should include saslauthd""... $ac_c" 1>&6
+ echo "configure:3766: checking if I should include saslauthd" >&5
+ echo "$ac_t""$with_saslauthd" 1>&6
+@@ -5456,7 +5458,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
@@ -27,7 +38,7 @@
  cat > conftest.$ac_ext <<EOF
  #line 5462 "configure"
  #include "confdefs.h"
-@@ -5494,7 +5494,7 @@
+@@ -5494,7 +5496,7 @@
       GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
       GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
    elif test "$gss_impl" = "heimdal"; then
diff --git a/security/cyrus-sasl2/files/saslauthd.sh b/security/cyrus-sasl2/files/saslauthd.sh
deleted file mode 100644
index 1ada300c3783..000000000000
--- a/security/cyrus-sasl2/files/saslauthd.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-action=$1
-
-PREFIX=%%PREFIX%%
-
-# Suck in the configuration variables.
-if [ -z "${source_rc_confs_defined}" ]; then
-        if [ -r /etc/defaults/rc.conf ]; then
-                . /etc/defaults/rc.conf
-                source_rc_confs
-        elif [ -r /etc/rc.conf ]; then
-                . /etc/rc.conf
-        fi
-fi
-
-# The following sasl_saslauthd_* variables may be defined in rc.conf
-#
-# 	sasl_saslauthd_enable  - Set to YES to enable saslauthd
-#				 Default: %%ENABLEPWCHECK%%
-#
-#	sasl_saslauthd_program - Path to saslauthd program
-#				 Default: ${PREFIX}/sbin/%%PWCHECK%%
-#
-#	sasl_saslauthd_flags   - Flags to saslauthd program
-#				 Default: -a pam
-
-if [ -z "${sasl_saslauthd_enable}" ]; then
-	sasl_saslauthd_enable=%%ENABLEPWCHECK%%
-fi
-
-if [ -z "${sasl_saslauthd_program}" ]; then
-	sasl_saslauthd_program=${PREFIX}/sbin/%%PWCHECK%%
-fi
-
-if [ -z "${sasl_saslauthd_flags}" ]; then
-	sasl_saslauthd_flags="-a pam"
-fi
-
-rc=0
-
-case "${sasl_saslauthd_enable}" in
-    [Yy][Ee][Ss])
-	case "${action}" in
-
-	    start)
-		if [ -x ${sasl_saslauthd_program} ] ; then
-		    ${sasl_saslauthd_program} ${sasl_saslauthd_flags} \
-			&& echo -n " saslauthd"
-		fi
-		;;
-
-	    stop)
-		if [ -r /var/state/saslauthd/saslauthd.pid ]; then
-		    kill `cat /var/state/saslauthd/saslauthd.pid` && \
-			echo -n " saslauthd"
-		fi
-		;;
-
-	    *)
-		echo "usage: $0 {start|stop}" 1>&2
-		rc=64
-		;;
-	esac
-	;;
-    *)
-	rc=0
-	;;
-esac
-
-exit $rc