7 files changed, 94 insertions, 24 deletions
diff --git a/network/cherokee/ChangeLog.txt b/network/cherokee/ChangeLog.txt
new file mode 100644
index 0000000000000..94c24d33a9610
--- /dev/null
+++ b/network/cherokee/ChangeLog.txt
@@ -0,0 +1,20 @@
+Mon 07 Sep 2009 - Pablo Hernan Saro (pablosaro@gmail.com)
+- SlackBuild script for Cherokee 0.99.24
+- Cherokee rc script updated
+
+Fri 07 Aug 2009 - Pablo Hernan Saro (pablosaro@gmail.com)
+- SlackBuild script for Cherokee 0.99.22
+- Fixes little bug in doinst script (missing path for cherokee.conf)
+
+Sun 26 Jul 2009 - Pablo Hernan Saro (pablosaro@gmail.com)
+- SlackBuild script for Cherokee 0.99.20
+- Adds the ability to enable/disable IPv6 support
+- Adds the ability to enable/disable Cherokee-admin installation
+- Adds the ability to set the WWW root directory
+- Adds the ability to add/remove support for MySQL client library
+- Adds the ability to enable/disable trace facility (debugging options)
+- Little fix to keep Cherokee configuration file permissions when upgrading
+
+Sat 06 Jun 2009 - Pablo Hernan Saro (pablosaro@gmail.com)
+- First release
+- SlackBuild script for Cherokee 0.99.15
diff --git a/network/cherokee/README b/network/cherokee/README
index fb8b1af2cf50b..c0424311d2afc 100644
--- a/network/cherokee/README
+++ b/network/cherokee/README
@@ -6,3 +6,38 @@ Authentication, on the fly encoding, Load Balancing, Apache
 compatible log files, Data Base Balancing, Reverse HTTP Proxy,
 Traffic Shaper, Video Streaming and much more.
 
+A user friendly interface called cherokee-admin is provided for a
+no-hassle configuration of the server.
+
+If you are installing a high load http server, you will probably need
+a zero-downtime process of log rotation. To achieve this, I strongly
+recommend you to take a look to this cookbook:
+  *  http://www.cherokee-project.com/doc/cookbook_managing_logs.html
+
+If need to get popular web applications working or fine tune your
+server, follow the cherokee's cookbooks page:
+  *  http://www.cherokee-project.com/doc/cookbook.html
+
+Notes about using this SlackBuild
+---------------------------------
+
+1) To specify the WWW root directory pass WWWROOT=/path/to/www/root
+   to the script, like this:
+
+      WWWROOT=/var/www ./cherokee.SlackBuild
+
+2) If you want to enable IPv6 support, pass IPV6=yes to the script.
+3) If you want to disable the Cherokee-admin installation, pass
+   ADMIN=no to the script.
+4) This script builds Cherokee with support for MySQL client library
+   by default. If you want to avoid the dependency on MySQL client
+   library, or just build Cherokee without this support, pass MYSQL=no
+   to the script.
+5) If you want to build Cherokee with debugging options, enable trace
+   facility by passing TRACE=yes to the script.
+
+Comments, suggestions or bug reports
+------------------------------------
+
+If you have anything to say about this SlackBuild, event reporting a
+bug, don't hesitate to contact me at pablosaro@gmail.com
diff --git a/network/cherokee/README.SBo b/network/cherokee/README.SBo
deleted file mode 100644
index 81fd88186a049..0000000000000
--- a/network/cherokee/README.SBo
+++ /dev/null
@@ -1,11 +0,0 @@
- A user friendly interface called cherokee-admin is provided for a
-no-hassle configuration of the server.
-
-If you are installing a high load http server, you will probably need
-a zero-downtime process of log rotation. To achieve this, I strongly
-recommend you to take a look to this cookbook:
-  *  http://www.cherokee-project.com/doc/cookbook_managing_logs.html
-
-If need to get popular web applications working or fine tune your
-server, follow the cherokee's cookbooks page:
-  *  http://www.cherokee-project.com/doc/cookbook.html
diff --git a/network/cherokee/cherokee.SlackBuild b/network/cherokee/cherokee.SlackBuild
index 3b01678cb02c8..08d7b2ffbab71 100644
--- a/network/cherokee/cherokee.SlackBuild
+++ b/network/cherokee/cherokee.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Pablo Hernan Saro (pablosaro@gmail.com)
 
 PRGNAM=cherokee
-VERSION=${VERSION:-0.99.15}
+VERSION=${VERSION:-0.99.24}
 ARCH=${ARCH:-i686}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -26,6 +26,21 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
+# Set the WWW root directory
+WWWROOT=${WWWROOT:-/var/www}
+
+# Enable/Disable IPv6 support
+IPV6=${IPV6:-no}
+
+# Enable/Disable Cherokee-admin installation
+ADMIN=${ADMIN:-yes}
+
+# Add/Remove MySQL client library support
+MYSQL=${MYSQL:-yes}
+
+# Enable/Disable trace facility (debugging options)
+TRACE=${TRACE:-no}
+
 set -e
 
 rm -rf $PKG
@@ -51,9 +66,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  --with-mysql \
-  --with-wwwroot=/var/www \
-  --disable-ipv6
+  --with-wwwroot=$WWWROOT \
+  --with-mysql=$MYSQL \
+  --enable-ipv6=$IPV6 \
+  --enable-admin=$ADMIN \
+  --enable-trace=$TRACE
 
 make
 make install DESTDIR=$PKG
@@ -75,7 +92,6 @@ cp -a \
   AUTHORS COPYING ChangeLog INSTALL NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README.SBo > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
 
 install -D -m 0755 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
 mv $PKG/etc/cherokee/cherokee.conf $PKG/etc/cherokee/cherokee.conf.new
@@ -85,5 +101,6 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+
 
diff --git a/network/cherokee/cherokee.info b/network/cherokee/cherokee.info
index e3bc275b7746a..427929e9cc40b 100644
--- a/network/cherokee/cherokee.info
+++ b/network/cherokee/cherokee.info
@@ -1,8 +1,10 @@
 PRGNAM="cherokee"
-VERSION="0.99.15"
+VERSION="0.99.24"
 HOMEPAGE="http://www.cherokee-project.com"
-DOWNLOAD="http://www.cherokee-project.com/download/0.99/0.99.15/cherokee-0.99.15.tar.gz"
-MD5SUM="7be68913909ec46b8862e3a6ebe1b547"
+DOWNLOAD="http://www.cherokee-project.com/download/0.99/0.99.24/cherokee-0.99.24.tar.gz"
+MD5SUM="5afed8bdd6020dc5bf0ba9ec83b947f1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Pablo Hernan Saro"
 EMAIL="pablosaro@gmail.com" 
 APPROVED="dsomero"
diff --git a/network/cherokee/doinst.sh b/network/cherokee/doinst.sh
index 5d729841f008e..095b7f2381ff7 100644
--- a/network/cherokee/doinst.sh
+++ b/network/cherokee/doinst.sh
@@ -9,9 +9,15 @@ config() {
 }
 
 if [ -e etc/rc.d/rc.cherokee ]; then
-  cp -a etc/rc.d/rc.cherokee etc/rc.d/rc.cherokee.new.incoming
-  cat etc/rc.d/rc.cherokee.new > etc/rc.d/rc.cherokee.new.incoming
-  mv etc/rc.d/rc.cherokee.new.incoming etc/rc.d/rc.cherokee.new
+	cp -a etc/rc.d/rc.cherokee etc/rc.d/rc.cherokee.new.incoming
+	cat etc/rc.d/rc.cherokee.new > etc/rc.d/rc.cherokee.new.incoming
+	mv etc/rc.d/rc.cherokee.new.incoming etc/rc.d/rc.cherokee.new
+fi
+
+if [ -e etc/cherokee/cherokee.conf ]; then
+	cp -a etc/cherokee/cherokee.conf etc/cherokee/cherokee.conf.new.incoming
+	cat etc/cherokee/cherokee.conf.new > etc/cherokee/cherokee.conf.new.incoming
+	mv etc/cherokee/cherokee.conf.new.incoming etc/cherokee/cherokee.conf.new
 fi
 
 config etc/rc.d/rc.cherokee.new
diff --git a/network/cherokee/rc.cherokee b/network/cherokee/rc.cherokee
index 4b52f7033979e..381c011c03162 100644
--- a/network/cherokee/rc.cherokee
+++ b/network/cherokee/rc.cherokee
@@ -16,6 +16,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/lib/cherokee
 DAEMON=/usr/sbin/cherokee
 PIDFILE=/var/run/cherokee.pid
 CONF=/etc/cherokee/cherokee.conf
+OPTIONS="-d -C $CONF"
 
 export PATH
 
@@ -24,7 +25,7 @@ test -f $DAEMON || exit 0
 case "$1" in
   start)
     echo "Starting $NAME web server..."
-    $DAEMON -C $CONF &
+    $DAEMON $OPTIONS
     sleep 2
     echo -n "done"
     ;;