Version bump; fix for security bug 67667

5 files changed, 202 insertions, 26 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index e0a610a51c2e..762c986d6708 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.4 2004/10/06 18:23:45 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.5 2004/10/30 17:12:15 stuart Exp $
+
+*cherokee-0.4.17.1 (30 Oct 2004)
+
+  30 Oct 2004; Stuart Herbert <stuart@gentoo.org>
+  +files/cherokee-0.4.17-cherokee.conf, +cherokee-0.4.17.1.ebuild:
+  Version bump; addresses security bug #67667; thanks to Florian Schihabel
+  <florian.schihabel@gmx.net> for the report
 
   06 Oct 2004; Olivier Crete <tester@gentoo.org> cherokee-0.4.17.ebuild:
   Marked stable on x86 wrt security bug #66543
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index 92831b30e0ff..6561b9a2b3e1 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,35 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 693100f7d7a22ddb1762918c931a3885 cherokee-0.4.17.ebuild 1315
 MD5 911df2f612d09bcd971b872551026ef9 ChangeLog 4971
-MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 MD5 1d0701b3aab6f278ee8fbce211e037f6 cherokee-0.4.0.ebuild 640
-MD5 89e05a275427eda4b12b3c72520c1c83 cherokee-0.4.15.ebuild 1698
-MD5 2a338274e3b176bc1b83221670a84b46 cherokee-0.4.5.ebuild 1723
-MD5 cc9f30c20fb6d25d81b67bfe582faaf1 cherokee-0.4.14.ebuild 1697
 MD5 ac6a6f8727422772a96a87b34619fd89 cherokee-0.4.1.ebuild 702
 MD5 def6629e7cd82ee6acb3f3e7e63b9371 cherokee-0.4.10.ebuild 1693
-MD5 81e40f00c4b9884288b2c337d7ba5da3 cherokee-0.4.4.ebuild 619
+MD5 cc9f30c20fb6d25d81b67bfe582faaf1 cherokee-0.4.14.ebuild 1697
+MD5 89e05a275427eda4b12b3c72520c1c83 cherokee-0.4.15.ebuild 1698
 MD5 ed0e528223775b6bbc99ac89f2c20fcb cherokee-0.4.16.ebuild 1334
-MD5 af8c59cc3ff3018823e5050bc61c619d files/digest-cherokee-0.4.10 67
-MD5 9039251180a9ae02ee3b8077cd09c274 files/digest-cherokee-0.4.14 67
-MD5 298dfdd3c83893b3123d85278d1c1e7e files/digest-cherokee-0.4.5 66
+MD5 693100f7d7a22ddb1762918c931a3885 cherokee-0.4.17.ebuild 1315
+MD5 81e40f00c4b9884288b2c337d7ba5da3 cherokee-0.4.4.ebuild 619
+MD5 2a338274e3b176bc1b83221670a84b46 cherokee-0.4.5.ebuild 1723
+MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
+MD5 92efb5bed5dc74bef8aa3c40df5c252f cherokee-0.4.17.1.ebuild 1312
+MD5 88661e2618ec207291c2a9948ee90d73 files/cherokee-0.4.1-gcc3.patch 674
 MD5 13c50109a3ebd047c357fcf95f70bed7 files/cherokee-0.4.17-init.d 789
-MD5 328043d9bd3472aa21ed3eab65a8bb87 files/digest-cherokee-0.4.0 72
+MD5 6da94000869b804248b03d61703b69bb files/cherokee-0.4.5-Makefile.am.patch 956
 MD5 8278b4acda7637c68885863ddd58f712 files/cherokee-0.4.5-cherokee.conf 2769
+MD5 a9f08f404f9b738a52e2c82c7ed88e04 files/cherokee-0.4.5-init.d 787
+MD5 328043d9bd3472aa21ed3eab65a8bb87 files/digest-cherokee-0.4.0 72
 MD5 c4c2ec2b5ce18737c27b306f0ba93578 files/digest-cherokee-0.4.1 66
-MD5 f5860d77fca2046152680af040c1a978 files/digest-cherokee-0.4.16 67
-MD5 6da94000869b804248b03d61703b69bb files/cherokee-0.4.5-Makefile.am.patch 956
-MD5 a4010247cc6d338421781155b7ad324b files/digest-cherokee-0.4.4 66
+MD5 af8c59cc3ff3018823e5050bc61c619d files/digest-cherokee-0.4.10 67
+MD5 9039251180a9ae02ee3b8077cd09c274 files/digest-cherokee-0.4.14 67
 MD5 57162fc67ff684e4198d041a8cd90f47 files/digest-cherokee-0.4.15 67
-MD5 a9f08f404f9b738a52e2c82c7ed88e04 files/cherokee-0.4.5-init.d 787
+MD5 f5860d77fca2046152680af040c1a978 files/digest-cherokee-0.4.16 67
 MD5 7abc32dac306688c90e1ef1757603b3a files/digest-cherokee-0.4.17 67
-MD5 88661e2618ec207291c2a9948ee90d73 files/cherokee-0.4.1-gcc3.patch 674
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBZDewwDHaUUJ0mYMRAtDkAJ0fELU/MLPE3IAPLJi5dB7zgigSGQCfSEZj
-jybwAIsC5LuvHSsZGNV70FQ=
-=iA4l
------END PGP SIGNATURE-----
+MD5 a4010247cc6d338421781155b7ad324b files/digest-cherokee-0.4.4 66
+MD5 298dfdd3c83893b3123d85278d1c1e7e files/digest-cherokee-0.4.5 66
+MD5 289de164081060280437629085fce186 files/digest-cherokee-0.4.17.1 69
diff --git a/www-servers/cherokee/cherokee-0.4.17.1.ebuild b/www-servers/cherokee/cherokee-0.4.17.1.ebuild
new file mode 100644
index 000000000000..5a7c85e96c77
--- /dev/null
+++ b/www-servers/cherokee/cherokee-0.4.17.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.17.1.ebuild,v 1.1 2004/10/30 17:12:15 stuart Exp $
+
+MY_PV=0.4.17
+
+DESCRIPTION="An extremely fast and tiny web server."
+SRC_URI="ftp://alobbs.com/cherokee/0.4/${MY_PV}/${P}.tar.gz"
+HOMEPAGE="http://www.alobbs.com/cherokee"
+LICENSE="GPL-2"
+
+RDEPEND="virtual/libc
+	>=sys-libs/zlib-1.1.4-r1"
+
+DEPEND=">=sys-devel/automake-1.7.5
+	${RDEPEND}"
+
+KEYWORDS="x86 ~ppc"
+SLOT="0"
+IUSE=""
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_compile() {
+
+# 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}/${PN}-${MY_PV}-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}/${PN}-${MY_PV}-init.d ${D}/etc/init.d/cherokee
+}
diff --git a/www-servers/cherokee/files/cherokee-0.4.17-cherokee.conf b/www-servers/cherokee/files/cherokee-0.4.17-cherokee.conf
new file mode 100644
index 000000000000..f1ee6b988472
--- /dev/null
+++ b/www-servers/cherokee/files/cherokee-0.4.17-cherokee.conf
@@ -0,0 +1,123 @@
+##
+## 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.
+## Security: if you do start the server as root, be sure not to set
+## "User" to root. 
+##
+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
+
+##
+## Chroot:
+##
+# Chroot /var/www
+
+##
+## 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
+
+##
+## MaxKeepAliveRequests: The MaxKeepAliveRequests directive limits the 
+## number of requests allowed per connection when KeepAlive is on.
+## We recommend that this setting be kept to a high value for maximum 
+## server performance.
+##
+MaxKeepAliveRequests 500
+
+##
+## DirectoryIndex: Name of the file or files to use as a pre-written HTML
+## directory index.  Separate multiple entries with commas.
+##
+DirectoryIndex index.php, index.html, index.htm, index.shtml
+
+##
+## 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
+
+##
+## Hide Version:  Hide the software version
+##
+HideVersion Off
+
+##
+## Hide ServerName:  Hide the software version and the server name
+##
+HideServerName Off
+
+##
+## PidFile: The file in which the server should record its process
+## identification number when it starts.
+##
+PidFile /var/run/cherokee.pid
+
+##
+## Icons: Extension to icon file.
+##
+Icons /etc/cherokee/icons.conf
+
+##
+## MimeFile: Mime types file. By default you should leave it 
+## commented
+##
+MimeFile /etc/cherokee/mime.conf
+
+##
+## Load the GZip encoder plugin
+## only used if the client support the encoding ("Accept-Encoding:")
+##
+# Encoder gzip {
+#	   Allow html, htm, txt
+#	   Deny jpg, png, gz
+# }
+
+##
+## Advanced settings, do not change if you are not sure..
+##
+Include /etc/cherokee/advanced.conf
+
+##
+## Include the module configuration:
+##
+Include /etc/cherokee/mods-enabled
+
+##
+## Include the virtual host configuration:
+##
+Include /etc/cherokee/sites-enabled
+
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.17.1 b/www-servers/cherokee/files/digest-cherokee-0.4.17.1
new file mode 100644
index 000000000000..cdcec2309009
--- /dev/null
+++ b/www-servers/cherokee/files/digest-cherokee-0.4.17.1
@@ -0,0 +1 @@
+MD5 53cf1fc92e98ef33b064a5c5af5c0795 cherokee-0.4.17.1.tar.gz 805906