Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David Kowis (7f97882e4df6650c4826595316be2ebb27f6ad55)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Kowis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Kowis (7f97882e4df6650c4826595316be2ebb27f6ad55)
  • Date: Wed, 30 May 2007 18:28:29 -0500

GIT changes to master grimoire by David Kowis <dkowis AT shlrm.org>:

chat-im/jabberd/BUILD | 5 +++++
chat-im/jabberd/CONFIGURE | 6 ++++++
chat-im/jabberd/HISTORY | 1 +
3 files changed, 12 insertions(+)

New commits:
commit 7f97882e4df6650c4826595316be2ebb27f6ad55
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

jabberd: Oops. Didn't do the cyrus-sasl/gsasl selection correctly

diff --git a/chat-im/jabberd/BUILD b/chat-im/jabberd/BUILD
index 6fa2c99..3c2046e 100755
--- a/chat-im/jabberd/BUILD
+++ b/chat-im/jabberd/BUILD
@@ -3,5 +3,10 @@ create_account "jabber" &&
OPTS="$OPTS $JABBERD_PIPE $JABBERD_ANON $JABBERD_FS $JABBERD_DEBUG\
$JABBERD_NAD_DEBUG $JABBERD_POOL_DEBUG $JABBERD_DEVELOPER\
--enable-MIO=$JABBERD_MIO --sysconfdir=${INSTALLROOT}/etc/jabberd" &&
+if [[ "$JABBER_SASL" == "cyrus-sasl" ]]; then
+ OPTS="$OPTS --enable-cyrus --disable-gsasl"
+else
+ OPTS="$OPTS --enable-gsasl --disable-cyrus"
+fi

default_build
diff --git a/chat-im/jabberd/CONFIGURE b/chat-im/jabberd/CONFIGURE
index 201c06e..ea182ce 100755
--- a/chat-im/jabberd/CONFIGURE
+++ b/chat-im/jabberd/CONFIGURE
@@ -1,3 +1,9 @@
+if spell_ok cyrus-sasl; then
+ JABBERD_SASL="cyrus-sasl"
+elif spell_ok gsasl; then
+ JABBERD_SASL="gsasl"
+fi
+
config_query_list JABBERD_SASL 'Choose your SASL implementation' \
gsasl cyrus-sasl &&

diff --git a/chat-im/jabberd/HISTORY b/chat-im/jabberd/HISTORY
index 6c132c5..bf819c3 100644
--- a/chat-im/jabberd/HISTORY
+++ b/chat-im/jabberd/HISTORY
@@ -1,6 +1,7 @@
2007-05-30 David Kowis <dkowis AT shlrm.org>
* DEPENDS, DETAILS, CONFIGURE, BUILD, INSTALL: Rewrote spell to work
with version 2.1.6
+ * CONFIGURE, BUILD: fixed the gsasl or cyrus-sasl setup

2006-10-11 David Kowis <dkowis AT shlrm.org>
* init.d/jabberd: rewrote the entire thing to not need daemon anymore



  • [SM-Commit] GIT changes to master grimoire by David Kowis (7f97882e4df6650c4826595316be2ebb27f6ad55), David Kowis, 05/30/2007

Archive powered by MHonArc 2.6.24.

Top of Page