4 files changed, 45 insertions, 34 deletions
diff --git a/network/citadel/README b/network/citadel/README
index d1af369c83..6d098c6e0c 100644
--- a/network/citadel/README
+++ b/network/citadel/README
@@ -1,8 +1,9 @@
 Citadel is a turnkey open-source solution for email and collaboration.
 
-It contains both the server and a text-mode client. You can build an entire
-working system with this, or you can just build the client and connect to
-some other existing system. It also provides connectivity through:
+It contains both the server and a text-mode client. You can build 
+an entire working system with this, or you can just build the 
+client and connect to some other existing system. It also provides 
+connectivity through:
 
  * SMTP (Port 25 by default)
  * POP3 (Port 110 by default; SSL Enabled on port 995)
@@ -21,3 +22,12 @@ some other existing system. It also provides connectivity through:
  * citadel.socket (Citadel protocol)
 
 After installation, run /opt/citadel/setup to configure Citadel.
+That script requires a 'citadel' user/group to exist before
+running.
+The recommended UID/GID is 276. You can create these like so:
+  groupadd -g 276 citadel
+  useradd -u 276 -g 276 -c "Citadel" -m citadel
+
+It is very easy: just be careful to specify a new user "citadel" 
+(or whatever, see above) who will run the server and specify a valid
+username and password to log into Citadel.
diff --git a/network/citadel/citadel.SlackBuild b/network/citadel/citadel.SlackBuild
index 443a098ea1..8fc5999bc8 100644
--- a/network/citadel/citadel.SlackBuild
+++ b/network/citadel/citadel.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Slackware build script for ejabberd
+# Slackware build script for citadel
 
 # Copyright (c) 2010  Roberto Metere. All rights reserved.
 #
@@ -24,7 +24,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=citadel
-VERSION=7.85
+VERSION=${VERSION:-8.22}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,15 +61,19 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS -I/usr/local/ctdlsupport/include" \
+CFLAGS="$SLKCFLAGS -I/opt/citadel/ctdlsupport/include" \
 CXXFLAGS="$SLKCFLAGS" \
-CPPFLAGS=-I/usr/local/ctdlsupport/include \
-LDFLAGS='-L/usr/local/ctdlsupport/lib -Wl,--rpath -Wl,/usr/local/ctdlsupport/lib' \
+CPPFLAGS="-I/opt/citadel/ctdlsupport/include" \
+LDFLAGS="-L/opt/citadel/ctdlsupport/lib -Wl,--rpath -Wl,/opt/citadel/ctdlsupport/lib" \
 ./configure \
   --prefix=/opt/citadel \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -77,21 +81,18 @@ LDFLAGS='-L/usr/local/ctdlsupport/lib -Wl,--rpath -Wl,/usr/local/ctdlsupport/lib
   --localstatedir=/var \
   --mandir=/usr/man \
   --with-db=/opt/citadel/ctdlsupport \
-  --with-pam \
-  --with-libical \
-  --disable-threaded-client \
   --build=$ARCH-slackware-linux
 make
 make install DESTDIR=$PKG
 
 # Create some symlinks
+mkdir -p $PKG/usr/bin
 for f in citadel citserver citmail ; do
-  ln -s /opt/citadel/$f /usr/bin/$f
+  ln -s /opt/citadel/$f $PKG/usr/bin/$f
 done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README.txt config.log \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/citadel/citadel.info b/network/citadel/citadel.info
index 9d1f651756..fed73a72d9 100644
--- a/network/citadel/citadel.info
+++ b/network/citadel/citadel.info
@@ -1,10 +1,10 @@
 PRGNAM="citadel"
-VERSION="7.85"
+VERSION="8.22"
 HOMEPAGE="http://www.citadel.org"
-DOWNLOAD="http://easyinstall.citadel.org/citadel-7.85.tar.gz"
-MD5SUM="c578393d76864ca5fae3ef4f8c244d15"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/citadel/citadel-8.22.tar.gz"
+MD5SUM="2d5d3456292dcbb25ed4dfc511a2e8bc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libcitadel libsieve"
+REQUIRES="libsieve libcitadel c-ares libev"
 MAINTAINER="Roberto Metere"
-EMAIL="roberto{at}metere{dot}it"
+EMAIL="roberto@metere.it"
diff --git a/network/citadel/slack-desc b/network/citadel/slack-desc
index b6bd0c22e6..f61a9ad784 100644
--- a/network/citadel/slack-desc
+++ b/network/citadel/slack-desc
@@ -1,19 +1,19 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
 citadel: citadel (Citadel server)
 citadel:
 citadel: Citadel is a turnkey open-source solution for email and collaboration.
-citadel: One simple installation delivers a multitude of powerful features.
-citadel:
-citadel:
-citadel:
-citadel:
-citadel:
-citadel:
-citadel:
+citadel: A multitude of powerful features are available, including:
+citadel: * email                             * instant messaging
+citadel: * calendaring/scheduling            * wiki
+citadel: * address books                     * multiple domain support
+citadel: * bulletin boards                   * a powerful web interface
+citadel: * mailing list server               
+citadel:
+citadel: homepage: http://www.citadel.org/