network/cherokee: Updated for version 20131105_d91c9c1.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

5 files changed, 13 insertions, 54 deletions

diff --git a/network/cherokee/ChangeLog.txt b/network/cherokee/ChangeLog.txt
index 21f7868fa9..07697a7c59 100644
--- a/network/cherokee/ChangeLog.txt
+++ b/network/cherokee/ChangeLog.txt
@@ -1,4 +1,7 @@
-Sun 27 Dec 2011 - ponce (matteo.bernardini@gmail.com)
+Sat 16 Nov 2013 - Matteo Bernardini (ponce@slackbuilds.org)
+- Slackbuild script for Cherokee 20131105_d91c9c1
+
+Sun 27 Dec 2011 - Matteo Bernardini (ponce@slackbuilds.org)
 - SlackBuild script for Cherokee 1.2.101
 - Added the possibility to specify WWWUSER and WWWGROUP
 - Default document root defaults to /var/www/htdocs-cherokee
diff --git a/network/cherokee/README b/network/cherokee/README
index 5891e7ac20..085222d835 100644
--- a/network/cherokee/README
+++ b/network/cherokee/README
@@ -18,7 +18,7 @@ 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
 
-ffmpeg is an optional dependency (for video streaming - BROKEN ATM).
+ffmpeg is an optional dependency (for multimedia streaming).
 
 Notes about using this SlackBuild
 ---------------------------------
@@ -60,4 +60,4 @@ Comments, suggestions or bug reports
 If you have anything to say about this SlackBuild, even reporting a
 bug, don't hesitate to contact me at pablosaro@gmail.com
 (be aware that pablo might not know that I wrecked his build
-script for 1.2.101, ndponce <matteo.bernardini@gmail.com>)
+script for the latest git, ndMatteo <ponce@slackbuilds.org>)
diff --git a/network/cherokee/cherokee.SlackBuild b/network/cherokee/cherokee.SlackBuild
index f204ea8b16..f9a81a2090 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:-1.2.101}
+VERSION=${VERSION:-20131105_d91c9c1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -93,7 +93,7 @@ done
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure \
+./autogen.sh \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -108,6 +108,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-ipv6=$IPV6 \
   --enable-admin=$ADMIN \
   --disable-pam \
+  --disable-static \
   --enable-trace=$TRACE
 
 make
@@ -124,7 +125,7 @@ chown -R $WWWUSER:$WWWGROUP $PKG/var/log/cherokee
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog NEWS README \
+  AUTHORS COPYING NEWS README.rst \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/cherokee/cherokee.info b/network/cherokee/cherokee.info
index 3b5589f393..a922ff35b5 100644
--- a/network/cherokee/cherokee.info
+++ b/network/cherokee/cherokee.info
@@ -1,8 +1,8 @@
 PRGNAM="cherokee"
-VERSION="1.2.101"
+VERSION="20131105_d91c9c1"
 HOMEPAGE="http://www.cherokee-project.com"
-DOWNLOAD="http://ftp.heanet.ie/mirrors/cherokee/1.2/1.2.101/cherokee-1.2.101.tar.gz"
-MD5SUM="ef47003355a2e368e4d9596cd070ef23"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/cherokee-20131105_d91c9c1.tar.xz"
+MD5SUM="845ed7bdb3b038d277607a47288aaec1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/cherokee/patches/cherokee-1.2.98-linux3.patch b/network/cherokee/patches/cherokee-1.2.98-linux3.patch
deleted file mode 100644
index e1e335264b..0000000000
--- a/network/cherokee/patches/cherokee-1.2.98-linux3.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur cherokee-1.2.98.orig/admin/SystemStats.py cherokee-1.2.98/admin/SystemStats.py
---- cherokee-1.2.98.orig/admin/SystemStats.py	2011-05-03 18:01:41.000000000 +0900
-+++ cherokee-1.2.98/admin/SystemStats.py	2011-08-26 13:05:08.128851462 +0900
-@@ -39,7 +39,7 @@
-     global _stats
- 
-     if not _stats:
--        if sys.platform == 'linux2':
-+        if sys.platform == 'linux2' or sys.platform == 'linux3':
-             _stats = System_stats__Linux()
-         elif sys.platform == 'darwin':
-             _stats = System_stats__Darwin()
-diff -Naur cherokee-1.2.98.orig/admin/market/InstallUtil.py cherokee-1.2.98/admin/market/InstallUtil.py
---- cherokee-1.2.98.orig/admin/market/InstallUtil.py	2011-05-03 18:01:41.000000000 +0900
-+++ cherokee-1.2.98/admin/market/InstallUtil.py	2011-08-26 13:05:06.596844132 +0900
-@@ -56,7 +56,7 @@
-         first_group = str(root_group)
- 
-     # Systems
--    if sys.platform == 'linux2':
-+    if sys.platform == 'linux2' or sys.platform == 'linux3':
-         if os.getuid() == 0:
-             return root_group
-         return first_group
-@@ -72,7 +72,7 @@
- 
- 
- def current_UID_is_admin():
--    if sys.platform == 'linux2':
-+    if sys.platform == 'linux2' or sys.platform == 'linux3':
-         return os.getuid() == 0
-     elif sys.platform == 'darwin':
-         return os.getuid() == 0
-diff -Naur cherokee-1.2.98.orig/admin/util.py cherokee-1.2.98/admin/util.py
---- cherokee-1.2.98.orig/admin/util.py	2011-03-31 17:30:04.000000000 +0900
-+++ cherokee-1.2.98/admin/util.py	2011-08-26 13:05:04.622834682 +0900
-@@ -341,7 +341,7 @@
- def os_get_document_root():
-     if sys.platform == 'darwin':
-         return "/Library/WebServer/Documents"
--    elif sys.platform == 'linux2':
-+    elif sys.platform == 'linux2' or sys.platform == 'linux3':
-         if os.path.exists ("/etc/redhat-release"):
-             return '/var/www'
-         elif os.path.exists ("/etc/fedora-release"):