diff options
Diffstat (limited to 'security/cyrus-sasl2/files')
| -rw-r--r-- | security/cyrus-sasl2/files/patch-configure | 4 | ||||
| -rw-r--r-- | security/cyrus-sasl2/files/patch-saslauthd::configure | 4 | ||||
| -rw-r--r-- | security/cyrus-sasl2/files/saslauthd.sh | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/security/cyrus-sasl2/files/patch-configure b/security/cyrus-sasl2/files/patch-configure index e55fc8c0c98a..10f6faea803e 100644 --- a/security/cyrus-sasl2/files/patch-configure +++ b/security/cyrus-sasl2/files/patch-configure @@ -5,7 +5,7 @@ fi - for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db -+ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db ++ for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db do echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6 echo "configure:2659: checking for db_create in -l$dbname" >&5 @@ -14,7 +14,7 @@ fi - for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db -+ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db ++ for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db 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 diff --git a/security/cyrus-sasl2/files/patch-saslauthd::configure b/security/cyrus-sasl2/files/patch-saslauthd::configure index a59ce6b7aa34..4e16075fc650 100644 --- a/security/cyrus-sasl2/files/patch-saslauthd::configure +++ b/security/cyrus-sasl2/files/patch-saslauthd::configure @@ -23,7 +23,7 @@ fi - for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db -+ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db ++ for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db do echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6 echo "configure:3448: checking for db_create in -l$dbname" >&5 @@ -32,7 +32,7 @@ fi - for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db -+ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db ++ for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db do echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6 echo "configure:3839: checking for db_create in -l$dbname" >&5 diff --git a/security/cyrus-sasl2/files/saslauthd.sh b/security/cyrus-sasl2/files/saslauthd.sh index 39bd6fc091fc..1ada300c3783 100644 --- a/security/cyrus-sasl2/files/saslauthd.sh +++ b/security/cyrus-sasl2/files/saslauthd.sh @@ -54,10 +54,9 @@ case "${sasl_saslauthd_enable}" in ;; stop) - if [ -r /var/state/saslauthd/mux.pid ]; then - kill `cat /var/state/saslauthd/mux.pid` && \ + if [ -r /var/state/saslauthd/saslauthd.pid ]; then + kill `cat /var/state/saslauthd/saslauthd.pid` && \ echo -n " saslauthd" - rm /var/state/saslauthd/mux.pid fi ;; |