[SM-Commit] GIT changes to master grimoire by David Kowis (2826e2b5bb799a2cf4c252316fde70c1dcbd6b8d)

David Kowis scm at sourcemage.org
Wed May 30 16:45:40 EDT 2007


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

 chat-im/jabberd/BUILD                     |   30 ++++---------------------
 chat-im/jabberd/CONFIGURE                 |   26 +++++++++++++++++++++
 chat-im/jabberd/DEPENDS                   |   36 ++++++++++++++++++++----------
 chat-im/jabberd/DETAILS                   |   20 +++++++---------
 chat-im/jabberd/FINAL                     |    3 --
 chat-im/jabberd/HISTORY                   |    4 +++
 chat-im/jabberd/INSTALL                   |    7 ++---
 chat-im/jabberd/jabberd-2.0s11.tar.gz.sig |    0 
 dev/null                                  |binary
 9 files changed, 71 insertions(+), 55 deletions(-)

New commits:
commit 2826e2b5bb799a2cf4c252316fde70c1dcbd6b8d
Author: David Kowis <dkowis at shlrm.org>
Commit: David Kowis <dkowis at shlrm.org>

    jabberd: rewrote entire spell to work with version 2.1.6
    
    Site moved to a different location. Everything is a ./configure option.
    More storage options. Added debug options. Put rather generic /etc/ files
    in /etc/jabberd.

diff --git a/chat-im/jabberd/BUILD b/chat-im/jabberd/BUILD
index d166ffa..6fa2c99 100755
--- a/chat-im/jabberd/BUILD
+++ b/chat-im/jabberd/BUILD
@@ -1,27 +1,7 @@
- create_account "jabber" &&
+create_account "jabber" &&
 
-  for f in $(find . -name "*" -type f); do
-    sedit 's|/jabberd/log|/log/jabberd|' $f
-  done &&
+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 echo "$OPTS" | grep -q 'enable-db'; then STORAGE="$STORAGE db" && AUTHREG="$AUTHREG db"; fi &&
-  if echo "$OPTS" | grep -q 'enable-mysql'; then STORAGE="$STORAGE mysql" && AUTHREG="$AUTHREG mysql"; fi &&
-  if echo "$OPTS" | grep -q 'enable-pgsql'; then STORAGE="$STORAGE pgsql" && AUTHREG="$AUTHREG pgsql"; fi &&
-
-  if echo "$OPTS" | grep -q 'enable-ldap'; then AUTHREG="$AUTHREG ldap"; fi &&
-  if echo "$OPTS" | grep -q 'enable-pam'; then AUTHREG="$AUTHREG pam"; fi &&
-
-  message "Storage drivers:$STORAGE" &&
-  message "Authentication modules:$AUTHREG" &&
-
-  ./configure \
-    --build=$BUILD \
-    --host=$HOST   \
-    --prefix=$INSTALL_ROOT/usr \
-    --sysconfdir=$INSTALL_ROOT/etc \
-    --localstatedir=$INSTALL_ROOT/var \
-    --enable-storage="$STORAGE" \
-    --enable-authreg="$AUTHREG" \
-    --enable-debug \
-    $OPTS &&
-  make
+default_build
diff --git a/chat-im/jabberd/CONFIGURE b/chat-im/jabberd/CONFIGURE
new file mode 100755
index 0000000..201c06e
--- /dev/null
+++ b/chat-im/jabberd/CONFIGURE
@@ -0,0 +1,26 @@
+config_query_list   JABBERD_SASL       'Choose your SASL implementation' \
+   gsasl cyrus-sasl &&
+
+config_query_list   JABBERD_MIO        'Select MIO backend' poll select &&
+
+config_query_option JABBERD_PIPE       'Enable pipe auth/reg support?' \
+   n '--enable-pipe' '--disable-pipe' &&
+
+config_query_option JABBERD_ANON       'Enable anonymous auth support?' \
+   n '--enable-anon' '--disable-anon' &&
+
+config_query_option JABBERD_FS         'Enable filesystem storage support(NOT RECCOMENDED)?' \
+   n '--enable-fs' '--disable-fs' &&
+
+config_query_option JABBERD_DEBUG      'Enable debugging output when run with -D?' \
+   n '--enable-debug' '--disable-debug' &&
+
+config_query_option JABBERD_NAD_DEBUG  'Compile with NAD pointer tracking?' \
+   n '--enable-nad-debug' '--disable-nad-debug' &&
+
+config_query_option JABBERD_POOL_DEBUG 'Compile with pool statistics?' \
+   n '--enable-pool-debug' '--disable-pool-debug' &&
+
+config_query_option JABBERD_DEVELOPER  'Compile with full warnings and debugging symbols?' \
+   n '--enable-developer' '--disable-developer'
+
diff --git a/chat-im/jabberd/DEPENDS b/chat-im/jabberd/DEPENDS
index 547f91d..830fae2 100755
--- a/chat-im/jabberd/DEPENDS
+++ b/chat-im/jabberd/DEPENDS
@@ -1,23 +1,35 @@
-depends openssl &&
-depends libidn &&
+depends expat &&
+depends $JABBERD_SASL &&
 
+optional_depends openssl \
+                 '--enable-ssl' \
+                 '--disable-ssl' \
+                 'Needed for SSL/TLS support' &&
+optional_depends libidn \
+                 '--enable-idn'  \
+                 '--disable-idn' \
+                 'Needed for JID canonicalization' &&
+optional_depends sqlite \
+                 '--enable-sqlite'  \
+                 '--disable-sqlite' \
+                 'for SQLite storage support' &&
 optional_depends mysql \
-                 '--enable-mysql' \
+                 '--enable-mysql'  \
                  '--disable-mysql' \
-                 'for MySQL storage and authentication driver [recommended]' &&
+                 'for MySQL auth/reg/storage support' &&
 optional_depends db \
-                 '--enable-db' \
+                 '--enable-db'  \
                  '--disable-db' \
-                 'for Berkeley DB storage and authentication driver' &&
+                 'for Berkeley DB auth/reg/storage support' &&
 optional_depends postgresql \
-                 '--enable-pgsql' \
+                 '--enable-pgsql'  \
                  '--disable-pgsql' \
-                 'for PostgreSQL storage and authentication driver' &&
+                 'for PostgreSQL auth/reg/storage support' &&
 optional_depends openldap \
-                 '--enable-ldap' \
+                 '--enable-ldap'  \
                  '--disable-ldap' \
-                 'for LDAP-based authentication driver' &&
+                 'for LDAP-based auth/reg support' &&
 optional_depends linux-pam \
-                 '--enable-pam' \
+                 '--enable-pam'  \
                  '--disable-pam' \
-                 'for PAM-based authentication driver'
+                 'for PAM-based auth/reg support'
diff --git a/chat-im/jabberd/DETAILS b/chat-im/jabberd/DETAILS
index 8df83ca..4b5e5db 100755
--- a/chat-im/jabberd/DETAILS
+++ b/chat-im/jabberd/DETAILS
@@ -1,19 +1,17 @@
            SPELL=jabberd
-         VERSION=2.0s11
-          SOURCE=$SPELL-$VERSION.tar.gz
-          SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+         VERSION=2.1.6
+          SOURCE=$SPELL-$VERSION.tar.bz2
+     SOURCE_HASH=sha512:d00a5006c92ecb1b6e33851cfcf3b41af0a5a4addff2c4036ba36eb56094c7adb55c7c635745a85076807b0bba062df3b40f77b3436dff8761bf1ffd96d92e4b
       LICENSE[0]=GPL
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://jabberstudio.2nw.net/jabberd2/$SOURCE
-        WEB_SITE=http://www.jabberstudio.org/projects/jabberd2/project/view.php
+   SOURCE_URL[0]=http://ftp.xiaoka.com/jabberd2/releases/$SOURCE
+        WEB_SITE=http://jabberd2.xiaoka.com/
          ENTERED=20030102
-         UPDATED=20030810
         KEYWORDS="messaging chat"
            SHORT='JabberD is a Jabber-protocol instant messaging daemon'
 cat << EOF
-The jabberd server is the original server implementation of the Jabber
-protocols for instant messaging and XML routing. The jabberd server is
-both open-source and free software, since it is dual-licensed under the
-JOSL and the GPL.
-Some more information is available at http://jabberd.jabberstudio.org/.
+jabberd2 is the next generation of the Jabber/XMPP server.
+
+It has been rewritten from the ground up to be scalable, architecturally sound
+and to support the latest protocol extensions coming out of the XSF.
 EOF
diff --git a/chat-im/jabberd/FINAL b/chat-im/jabberd/FINAL
deleted file mode 100755
index 5325fcc..0000000
--- a/chat-im/jabberd/FINAL
+++ /dev/null
@@ -1,3 +0,0 @@
-  mkdir -p --mode=700 ${INSTALL_ROOT}/var/jabberd/db
-  mkdir -p --mode=700 ${INSTALL_ROOT}/var/log/jabberd
-  chown -R jabber:jabber /var/jabberd /var/log/jabberd
diff --git a/chat-im/jabberd/HISTORY b/chat-im/jabberd/HISTORY
index 647673a..6c132c5 100644
--- a/chat-im/jabberd/HISTORY
+++ b/chat-im/jabberd/HISTORY
@@ -1,3 +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
+
 2006-10-11 David Kowis <dkowis at shlrm.org>
 	* init.d/jabberd: rewrote the entire thing to not need daemon anymore
 	  Jabber is a PITA service :/
diff --git a/chat-im/jabberd/INSTALL b/chat-im/jabberd/INSTALL
index cf331d5..46f2dbb 100755
--- a/chat-im/jabberd/INSTALL
+++ b/chat-im/jabberd/INSTALL
@@ -1,7 +1,6 @@
 default_install   &&
 mkdir -p /usr/share/jabberd  &&
-cp -v $SOURCE_DIRECTORY/tools/db-setup.* /usr/share/jabberd  &&
-cp -v $SOURCE_DIRECTORY/tools/db-update.* /usr/share/jabberd &&
-cp -v $SOURCE_DIRECTORY/tools/jabberd    /usr/share/jabberd  &&
-cp -v $SOURCE_DIRECTORY/tools/*.pl      /usr/share/jabberd
+cp -v $SOURCE_DIRECTORY/tools/db-*       /usr/share/jabberd  &&
+cp -v $SOURCE_DIRECTORY/tools/jabberd*   /usr/share/jabberd  &&
+cp -v $SOURCE_DIRECTORY/tools/*.pl       /usr/share/jabberd
 
diff --git a/chat-im/jabberd/jabberd-2.0s11.tar.gz.sig b/chat-im/jabberd/jabberd-2.0s11.tar.gz.sig
deleted file mode 100644
index 0eb80dd..0000000
Binary files a/chat-im/jabberd/jabberd-2.0s11.tar.gz.sig and /dev/null differ



More information about the SM-Commit mailing list