New version. Important bugfix.

Package-Manager: portage-2.0.54

4 files changed, 116 insertions, 2 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index a424c2086998..f81dfd22d5a0 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.23 2006/04/10 12:27:40 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.24 2006/04/17 10:53:27 bass Exp $
+
+*cherokee-0.5.2 (17 Apr 2006)
+
+  17 Apr 2006; J. Alberto Suárez López <bass@gentoo.orgrg>
+  +cherokee-0.5.2.ebuild:
+  New version. Important bugfix.
 
   10 Apr 2006; J. Alberto Suárez López <bass@gentoo.orgrg>
   -cherokee-0.4.25.ebuild, -cherokee-0.4.29.ebuild, +cherokee-0.5.1.ebuild:
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index 144e5bd2e178..020e05263767 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,7 +1,8 @@
-MD5 2dbbb05bc34077e172ca27dc70158a6e ChangeLog 9000
+MD5 296f79493ccc818696df208c7dc4c8f8 ChangeLog 9152
 MD5 4f52419400eefa01d2e747af6d8c1ab0 cherokee-0.4.30.ebuild 3084
 MD5 b41957984b97b592f9de7ac9c20f289c cherokee-0.5.0.ebuild 3272
 MD5 39a7be3ecf0f0b28664386440e187ca5 cherokee-0.5.1.ebuild 3272
+MD5 30c4fa6dde2e1db2c4c4e76eaed50770 cherokee-0.5.2.ebuild 2863
 MD5 b44b2de7ebfdc07ee94d54a514a738f0 files/cherokee-0.4.17-cherokee.conf 2611
 MD5 13c50109a3ebd047c357fcf95f70bed7 files/cherokee-0.4.17-init.d 789
 MD5 e0af76fef298222ff6ad8e6e5aeb10d7 files/cherokee-0.4.21-no-handler_admin.diff 1151
@@ -12,4 +13,5 @@ MD5 a9f08f404f9b738a52e2c82c7ed88e04 files/cherokee-0.4.5-init.d 787
 MD5 58b1bf1602a172a1c435c1b63fc29eff files/digest-cherokee-0.4.30 68
 MD5 82f4b542845515ba0a8ce892bed1007f files/digest-cherokee-0.5.0 67
 MD5 6fb4fb1a87bde8a4d09047345076137b files/digest-cherokee-0.5.1 67
+MD5 ed98de5a563301aab6018e2d45d05357 files/digest-cherokee-0.5.2 67
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
diff --git a/www-servers/cherokee/cherokee-0.5.2.ebuild b/www-servers/cherokee/cherokee-0.5.2.ebuild
new file mode 100644
index 000000000000..ad22284fbde5
--- /dev/null
+++ b/www-servers/cherokee/cherokee-0.5.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.5.2.ebuild,v 1.1 2006/04/17 10:53:27 bass Exp $
+
+inherit eutils pam
+
+NAME=cherokee
+S="${WORKDIR}/${NAME}-${PV}"
+
+DESCRIPTION="An extremely fast and tiny web server."
+SRC_URI="http://www.0x50.org/download/${PV%.*}/${PV}/${NAME}-${PV}.tar.gz"
+HOMEPAGE="http://www.0x50.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="ipv6 ssl gnutls static doc pam fastcgi scgi"
+
+RDEPEND=">=sys-libs/zlib-1.1.4-r1
+	gnutls? ( net-libs/gnutls )
+	ssl? ( dev-libs/openssl )
+	pam? ( virtual/pam )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7.5"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# remove "doc" from SUBDIRS so that html docs don't get installed
+	# to the wrong place (/usr/share/doc/cherokee) and we can install
+	# them conditionally via dohtml in src_install.
+	sed -i -e 's|\(SUBDIRS =.*\)doc\(.*\)$|\1\2|' Makefile.in || \
+		die "sed Makefile.in failed"
+
+	# use cherokee user/group
+	sed -i -e 's|^#\(User \).*$|\1cherokee|' \
+		   -e 's|^#\(Group \).*$|\1cherokee|' cherokee.conf.sample.pre || \
+		   die "sed cherokee.conf failed"
+}
+
+src_compile() {
+	local myconf
+
+	if use ssl && use gnutls ; then
+		myconf="${myconf} --enable-tls=gnutls"
+	elif use ssl && ! use gnutls ; then
+		myconf="${myconf}  --enable-tls=openssl"
+	else
+		myconf="${myconf} --disable-tls"
+	fi
+
+	if use static ; then
+		myconf="${myconf} --enable-static --enable-static-module=all"
+	else
+		myconf="${myconf} --disable-static"
+	fi
+
+	if use fastcgi ; then
+		myconf="${myconf} --enable-fcgi"
+	fi
+
+	if use scgi ; then
+		myconf="${myconf} --enable-scgi"
+	fi
+
+	econf \
+		${myconf} \
+		$(use_enable pam) \
+		$(use_enable ipv6) \
+		--enable-os-string="Gentoo Linux" \
+		--with-wwwroot=/var/www/localhost/htdocs \
+		|| die "configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog INSTALL README TODO
+	use doc && dohtml -r doc/*
+
+	newpamd pam.d_cherokee ${PN} || die "newpamd failed"
+	newinitd ${FILESDIR}/${PN}-0.4.17-init.d ${PN} || die "newinitd failed"
+
+	# be nice and don't overwrite a user's pre-existing index.html
+	# (unless they're the same).
+	if [[ -f ${ROOT}/var/www/localhost/htdocs/index.html ]] ; then
+		diff ${ROOT}/var/www/localhost/htdocs/index.html \
+		${D}/var/www/localhost/htdocs/index.html &>/dev/null || \
+			mv ${D}/var/www/localhost/htdocs/{,cherokee-}index.html
+	fi
+}
+
+pkg_postinst() {
+	enewgroup cherokee
+	enewuser cherokee -1 -1 /var/www/localhost cherokee
+	echo
+	einfo "Since version 0.4.30 /etc/cherokee/mime.conf is deprecated so"
+	einfo "you need to update your cherokee.conf with: "
+	einfo "		""MimeFile /etc/cherokee/mime.types"
+	einfo "		""MimeFile /etc/cherokee/mime.compression.types"
+	echo
+}
diff --git a/www-servers/cherokee/files/digest-cherokee-0.5.2 b/www-servers/cherokee/files/digest-cherokee-0.5.2
new file mode 100644
index 000000000000..b0eac686a910
--- /dev/null
+++ b/www-servers/cherokee/files/digest-cherokee-0.5.2
@@ -0,0 +1 @@
+MD5 d7a2a590864b8ec27b9b116a2c8f1c6f cherokee-0.5.2.tar.gz 1547715