Update to 0.4.5; closes bug #27722

8 files changed, 288 insertions, 4 deletions

diff --git a/net-www/cherokee/ChangeLog b/net-www/cherokee/ChangeLog
index 3819bcb9e89b..0d82909b9497 100644
--- a/net-www/cherokee/ChangeLog
+++ b/net-www/cherokee/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-www/cherokee
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/cherokee/ChangeLog,v 1.6 2003/07/25 12:52:50 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/cherokee/ChangeLog,v 1.7 2003/10/05 12:45:42 stuart Exp $
+
+*cherokee-0.4.5 (05 Oct 2003)
+
+  05 Oct 2003; Stuart Herbert <stuart@gentoo.org> cherokee-0.4.5.ebuild,
+  metadata.xml, files/cherokee-0.4.5-Makefile.am.patch,
+  files/cherokee-0.4.5-cherokee.conf, files/cherokee-0.4.5-init.d:
+  Updated to cherokee-0.4.5
+  Added /etc/init.d/cherokee init script
+  Added Gentoo-ised default config file
+  Closes bug #27722
 
 *cherokee-0.4.4 (25 Jul 2003)
 
diff --git a/net-www/cherokee/Manifest b/net-www/cherokee/Manifest
index 5aa716522039..72d285849898 100644
--- a/net-www/cherokee/Manifest
+++ b/net-www/cherokee/Manifest
@@ -1,13 +1,13 @@
 MD5 45b09c4b687508552c48d2700280adec cherokee-0.4.4.ebuild 656
 MD5 35cb1a6a7c553264ff8d39b240339d7a cherokee-0.4.1.ebuild 649
-MD5 061f6169e37cfe72d8e7d113b15fe449 cherokee-0.4.5.ebuild 1796
+MD5 645c6de161dd3574a5c6a30867431b38 cherokee-0.4.5.ebuild 1794
 MD5 9c2d0a7311b83d11f447d8a15f8ff628 cherokee-0.4.0.ebuild 665
-MD5 108f75c57ac6719723d7987eccce6f2f ChangeLog 855
+MD5 cbbd6431d6cad2c47e9e42f39dc2e204 ChangeLog 1214
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 MD5 8278b4acda7637c68885863ddd58f712 files/cherokee-0.4.5-cherokee.conf 2769
 MD5 328043d9bd3472aa21ed3eab65a8bb87 files/digest-cherokee-0.4.0 72
 MD5 c4c2ec2b5ce18737c27b306f0ba93578 files/digest-cherokee-0.4.1 66
 MD5 a4010247cc6d338421781155b7ad324b files/digest-cherokee-0.4.4 66
 MD5 298dfdd3c83893b3123d85278d1c1e7e files/digest-cherokee-0.4.5 66
-MD5 42070236579aeaa4415ebb6f49ec25a7 files/cherokee-0.4.5-init.d 772
+MD5 5583731c6ea8f60b92df0b57aab6e68d files/cherokee-0.4.5-init.d 879
 MD5 6da94000869b804248b03d61703b69bb files/cherokee-0.4.5-Makefile.am.patch 956
diff --git a/net-www/cherokee/cherokee-0.4.5.ebuild b/net-www/cherokee/cherokee-0.4.5.ebuild
new file mode 100644
index 000000000000..0ca3a279f3f0
--- /dev/null
+++ b/net-www/cherokee/cherokee-0.4.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/cherokee/cherokee-0.4.5.ebuild,v 1.1 2003/10/05 12:45:42 stuart Exp $
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="An extremely fast and tiny web server."
+SRC_URI="ftp://alobbs.com/cherokee/${PV}/${P}.tar.gz
+	ftp://laurel.datsi.fi.upm.es/pub/linux/cherokee/${PV}/${P}.tar.gz"
+HOMEPAGE="http://www.alobbs.com/cherokee"
+LICENSE="GPL-2"
+DEPEND="sys-libs/glibc
+	    >=sys-devel/automake-1.7.5"
+RDEPEND="$DEPEND
+gnome? ( >=dev-libs/glib-2.2.2 >=gnome-base/ORBit2-2.6.1 >=gnome-base/bonobo-activation-2.2.2 >=gnome-base/gnome-vfs-2.2.4 >=net-libs/linc-1.0.2 )
+>=sys-libs/zlib-1.1.4-r1"
+
+KEYWORDS="~x86"
+SLOT="0"
+IUSE="gnome"
+
+src_unpack ()
+{
+	unpack "${A}"
+
+	# patch to fix Makefile DESTDIR compliance
+
+	einfo "Applying Makefile.am patch"
+	patch ${S}/Makefile.am < ${FILESDIR}/${P}-Makefile.am.patch
+
+	einfo "Running automake to update Makefile.in"
+	cd ${S}
+	automake
+}
+
+src_compile ()
+{
+	use gnome && my_conf="$my_conf --enable-gnomevfs"
+
+# coming soon ;-)
+#	use php && my_conf="$my_conf --with-php"
+#	use mono && my_conf="$my_conf --with-mono"
+
+	./configure --prefix=/usr --sysconfdir=/etc --disable-static $my_conf --with-pic
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS ChangeLog COPYING INSTALL README
+
+	# install the Gentoo-ised config file
+
+	cp ${FILESDIR}/${P}-cherokee.conf ${D}/etc/cherokee/cherokee.conf
+
+	# remove the installed sample config file
+	rm ${D}/etc/cherokee/cherokee.conf.sample
+
+	# add default doc-root and cgi-bin locations
+	dodir /var/www/localhost/htdocs
+	dodir /var/www/localhost/cgi-bin
+
+	# add init.d script
+
+	dodir /etc/init.d
+	cp ${FILESDIR}/${P}-init.d ${D}/etc/init.d/cherokee
+}
diff --git a/net-www/cherokee/files/cherokee-0.4.5-Makefile.am.patch b/net-www/cherokee/files/cherokee-0.4.5-Makefile.am.patch
new file mode 100644
index 000000000000..40bdd440bf8d
--- /dev/null
+++ b/net-www/cherokee/files/cherokee-0.4.5-Makefile.am.patch
@@ -0,0 +1,22 @@
+--- Makefile.am	2003-07-04 14:54:38.000000000 +0100
++++ /tmp/Makefile.am	2003-10-05 11:04:55.000000000 +0100
+@@ -23,14 +23,14 @@
+ 
+ 
+ install-data-local:
+-	@if test -f $(cherokeeconfdir)/cherokee.conf ; then \
++	@if test -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf ; then \
+ 		echo "$@ will not overwrite existing $(cherokeeconfdir)/cherokee.conf"; \
+ 	else \
+-		$(mkinstalldirs) $(cherokeeconfdir) \
+-		echo "$(INSTALL_DATA) cherokee.conf.sample $(cherokeeconfdir)/cherokee.conf"; \
+-		$(INSTALL_DATA) cherokee.conf.sample $(cherokeeconfdir)/cherokee.conf; \
++		$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir) ;\
++		echo "$(INSTALL_DATA) cherokee.conf.sample $(DESTDIR)$(cherokeeconfdir)/cherokee.conf"; \
++		$(INSTALL_DATA) cherokee.conf.sample $(DESTDIR)$(cherokeeconfdir)/cherokee.conf; \
+ 	fi
+-	$(mkinstalldirs) $(localstatedir)
++	$(mkinstalldirs) $(DESTDIR)$(localstatedir)
+ 
+ uninstall-local:
+ 	@if test -f $(cherokeeconfdir)/cherokee.conf ; then \
diff --git a/net-www/cherokee/files/cherokee-0.4.5-cherokee.conf b/net-www/cherokee/files/cherokee-0.4.5-cherokee.conf
new file mode 100644
index 000000000000..fa67f8521c93
--- /dev/null
+++ b/net-www/cherokee/files/cherokee-0.4.5-cherokee.conf
@@ -0,0 +1,148 @@
+##
+## cherokee.conf -- Cherokee HTTP server configuration file
+##
+
+##
+## Port: The port to which the standalone server listens. For
+## ports < 1023, you will need cherokee to be run as root initially.
+##
+Port 80
+
+##
+## IPv6 support
+##
+IPv6 On
+
+##
+## This directiveis used to tell the server which IP address to listen to.
+##
+#Listen 127.0.0.1
+
+##
+## If you wish cherokee to run as a different user or group, you must run
+## cherokee as root initially and it will switch.
+##
+## Eg: User "www-data"
+##     Group "www-data"
+##
+## Eg: User 65534
+##     Group 65534
+##
+#User nobody
+#Group nogroup
+
+##
+## Timeout: The number of seconds before receives and sends time out.
+##
+Timeout 15
+
+##
+## KeepAlive: Whether or not to allow persistent connections (more than
+## one request per connection). Set to "Off" to deactivate.
+##
+KeepAlive On
+
+##
+## ThreadNumber:  
+##
+# ThreadNumber 5
+
+##
+## DocumentRoot: The directory out of which you will serve your
+## documents. By default, all requests are taken from this directory, but
+## symbolic links and aliases may be used to point to other locations.
+##
+DocumentRoot /var/www/localhost/htdocs
+
+##
+## Log: Turn On/Off the logging in to syslog
+##
+## Parameters:
+## ncsa - AccessLog, ErrorLog
+## w3c  - LogFile
+##
+#Log w3c {
+#    LogFile /var/log/cherokee.w3c.log
+#}
+Log ncsa {
+    AccessLog /var/log/cherokee.access
+    ErrorLog  /var/log/cherokee.error
+}
+
+##
+## Hide Versions:  Hide the software version
+##
+HideVersion Off
+
+##
+## PidFile: The file in which the server should record its process
+## identification number when it starts.
+##
+PidFile /var/run/cherokee.pid
+
+##
+## UserDir: The name of the directory which is appended onto a user's home
+## directory if a ~user request is received.
+##
+## NOTE: Take in mind the permissions. If you have changed the User/Group
+##       the server maybe will have problems accessing the personal users' 
+##       content.
+##
+UserDir public_html {
+	   Handler common
+}
+
+##
+## MimeFile: Mime types file. By default you should leave it 
+## commented
+##
+#MimeFile /usr/share/cherokee/mime_types.txt
+
+##
+## Load the GZip encoder plugin
+##
+Encoder gzip {
+	   Allow html, htm, txt
+	   Deny jpg, png, gz
+}
+
+##
+## Handler to directory configuration
+##
+Directory / {
+		Handler common
+}
+
+Directory /icons {
+		Handler file
+		DocumentRoot /usr/share/cherokee/icons/
+}
+
+Directory /google {
+		Handler redir {
+			   URL http://www.google.com/search?sourceid=cherokee-search&q=
+		}
+}
+
+Directory /cgi-bin {
+		Handler cgi
+		DocumentRoot /var/www/localhost/cgi-bin/
+}
+
+#Directory /gnome {
+#		Handler gnomevfs {
+#			   FileDir /var/www/compressed/
+#		}
+#}
+
+##
+## Virtual servers
+##
+# Server tesoro.alobbs.com {
+#	  DocumentRoot /var/www/tesoro.alobbs.com/htdocs
+#
+#	  Directory / {
+#			  Handler common
+#	  }
+#}
+
diff --git a/net-www/cherokee/files/cherokee-0.4.5-init.d b/net-www/cherokee/files/cherokee-0.4.5-init.d
new file mode 100644
index 000000000000..1168af99a992
--- /dev/null
+++ b/net-www/cherokee/files/cherokee-0.4.5-init.d
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-www/cherokee/files/cherokee-0.4.5-init.d,v 1.1 2003/10/05 12:45:42 stuart Exp $
+#
+
+PIDFILE=/var/run/cherokee.pid
+
+depend() {
+    need net
+}
+
+start() {
+    ebegin "Starting Cherokee Web Server"
+    # make sure they can't break our startup by passing -d (which would
+    # cause incorrect PID to be written to pidfile), or the incorrect
+    # depot root
+    start-stop-daemon --start --quiet \
+                      --pidfile ${PIDFILE} --make-pidfile -b \
+                      --exec /usr/bin/cherokee
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping Perforce SCM"
+    if [ -f ${PIDFILE} ]; then
+        start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+    fi
+    rm -f ${PIDFILE}
+    eend $?
+}
diff --git a/net-www/cherokee/files/digest-cherokee-0.4.5 b/net-www/cherokee/files/digest-cherokee-0.4.5
new file mode 100644
index 000000000000..3e5e5a48bd4e
--- /dev/null
+++ b/net-www/cherokee/files/digest-cherokee-0.4.5
@@ -0,0 +1 @@
+MD5 d06bfce5bbb6c99f6d3349383be7377c cherokee-0.4.5.tar.gz 508784
diff --git a/net-www/cherokee/metadata.xml b/net-www/cherokee/metadata.xml
new file mode 100644
index 000000000000..95c06f0095bb
--- /dev/null
+++ b/net-www/cherokee/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>web-apps</herd>
+</pkgmetadata>