Fix log dir perms (drobbins fix)

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 143 insertions, 2 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 7624005b0bc9..c41ccbeb7949 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.57 2009/06/24 07:08:45 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.58 2009/06/28 16:01:00 bass Exp $
+
+*cherokee-0.99.19-r1 (28 Jun 2009)
+
+  28 Jun 2009; J. Alberto Suárez López <bass@gentoo.org>
+  +cherokee-0.99.19-r1.ebuild:
+  Fix log dir perms (drobbins fix)
 
 *cherokee-0.99.19 (24 Jun 2009)
 
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index b7ee9c623ab8..3e90aae590a1 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -7,7 +7,8 @@ DIST cherokee-0.99.9.tar.gz 4278030 RMD160 09f9a76c84bc2ea3c3f5da4033505c4f5af60
 EBUILD cherokee-0.98.1.ebuild 2732 RMD160 89fe69769563b9868d85b2cc39bab0ab74f2a088 SHA1 f01141fa7b7de9be7c7b26c9703a608e408c8f52 SHA256 d3001b48750b5546e0c07c500c3c0b5c5fa8b18cd873cb4f2cf002f90600c149
 EBUILD cherokee-0.99.15.ebuild 3155 RMD160 dc07271aa6c88b7a4393838ea26bc4edfb349388 SHA1 d3cf821e128670b4089a6e1291e09dded48b933e SHA256 1bf9eab07882114b57dd3fad63f03fa3822ed76ee422167651ac8f387edaea86
 EBUILD cherokee-0.99.17.ebuild 3647 RMD160 cdd2d9ca8214bc25fc71737550418952f0cd3451 SHA1 28171c243701c890996d7469434f0da59219dc0a SHA256 f551ee31ff8f6820b9e98ce6754fd95ef0c908e77aa653779c6816d784e83548
+EBUILD cherokee-0.99.19-r1.ebuild 3842 RMD160 cccebeb9ebf070ca2fcbdb7113b4f442b040b9e1 SHA1 768c2bcb51c5fb55eeb4bfaf4d954ab9c0cea12a SHA256 e05d92b844f17e98709514ab56eed67b677d9df7442dd116899c9ff48237d266
 EBUILD cherokee-0.99.19.ebuild 3647 RMD160 b5e89fe3f2fbe33f8366feb29e9d90caecf9a8b8 SHA1 f66f5323d1ef6b4b838c2a9a4dedb4b7fc5085b5 SHA256 70ab60ba57728fa692e3ceff8ba950a11292aed46cc0a9557687a3d856c1d7cf
 EBUILD cherokee-0.99.9.ebuild 3156 RMD160 37ec726e59d1bcb495a8f5d7ba452fb766cc7258 SHA1 25d1635d39db9a45a4606c046db4a071c63cdeb0 SHA256 34964053f20a7cae2c4ca4ab55f8e25be82ec3c483bf1adf74f0e7570634c400
-MISC ChangeLog 15470 RMD160 28cf21131367c0f7940c80fdb3ca7558cd7d9f96 SHA1 8b7752a0f421fb7a892537a6099f2ffb8fc1e032 SHA256 104626b0df1f74feb04da213c8e3bdc30866f3fa69b8787263fd94c065ebe4c7
+MISC ChangeLog 15632 RMD160 8d983c1c30105a621d32b071d5a76df479be4448 SHA1 6f657e7b3204b22206dd1f7b7995fcb12b1e0338 SHA256 9c52722d153ff524b698d86451942de55937125d91b677d82783a11909c5b350
 MISC metadata.xml 434 RMD160 bac321b7879fe7793087b221f20554e4b44a5975 SHA1 d77a40137b169af1715d9827f463e2219485a931 SHA256 9cb0163ef5aadb0cafb83c75615bb3f393f5484016695abd15db7ff6d2680f8b
diff --git a/www-servers/cherokee/cherokee-0.99.19-r1.ebuild b/www-servers/cherokee/cherokee-0.99.19-r1.ebuild
new file mode 100644
index 000000000000..f09db38e7491
--- /dev/null
+++ b/www-servers/cherokee/cherokee-0.99.19-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.99.19-r1.ebuild,v 1.1 2009/06/28 16:01:00 bass Exp $
+
+inherit eutils pam versionator libtool
+
+DESCRIPTION="An extremely fast and tiny web server."
+SRC_URI="http://www.cherokee-project.com/download/$(get_version_component_range 1-2)/${PV}/${P}.tar.gz"
+HOMEPAGE="http://www.cherokee-project.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="ipv6 ssl static pam coverpage threads kernel_linux admin debug geoip ldap mysql ffmpeg fastcgi"
+
+RDEPEND="
+	>=sys-libs/zlib-1.1.4-r1
+	ssl? ( dev-libs/openssl )
+	pam? ( virtual/pam )
+	admin? ( dev-lang/python )
+	geoip? ( dev-libs/geoip )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	fastcgi? ( www-servers/spawn-fcgi )
+	ffmpeg? ( media-video/ffmpeg )"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	local myconf
+
+	if use static ; then
+		myconf="${myconf} --enable-static --enable-static-module=all"
+	else
+		myconf="${myconf} --disable-static"
+	fi
+
+	if use debug ; then
+		myconf="${myconf} --enable-trace"
+	fi
+
+	local os="Unknown"
+	case "${CHOST}" in
+		*-freebsd*)
+			os="FreeBSD" ;;
+		*-netbsd*)
+			os="NetBSD" ;;
+		*-openbsd*)
+			os="OpenBSD" ;;
+		*)
+			os="Linux" ;;
+	esac
+
+	# No options to enable or disable ssl since Cherokee 0.11
+	econf \
+		${myconf} \
+		$(use_enable pam) \
+		$(use_enable ipv6) \
+		$(use_enable threads pthread) \
+		$(use_enable kernel_linux epoll) \
+		$(use_with geoip) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_with ffmpeg) \
+		--disable-dependency-tracking \
+		--enable-os-string="Gentoo ${os}" \
+		--with-wwwroot=/var/www/localhost/htdocs \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		|| die "configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake -j1 DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" install || die "make install failed"
+	dodoc AUTHORS ChangeLog
+
+	use pam && pamd_mimic system-auth cherokee auth account session
+	newinitd "${FILESDIR}/${PN}-initd-0.11" ${PN} || die "newinitd failed"
+
+	dodir /usr/share/doc/${PF}/contrib
+	insinto /usr/share/${PF}/contrib
+	doins contrib/07to08.py
+	doins contrib/08to09.py
+	doins contrib/09to010.py
+	doins contrib/011to098.py
+	doins contrib/098to099.py
+	doins contrib/0999to09910.py
+	doins contrib/mk-cert.sh
+
+	keepdir /etc/cherokee/mods-enabled /etc/cherokee/sites-enabled /var/www/localhost/htdocs
+
+	use coverpage || rm -rf "${D}"/var/www/localhost/htdocs/{index.html,images}
+	use admin || rm -rf "${D}"/usr/sbin/admin "${D}"/usr/share/cherokee/admin
+
+	# Puts logs in /var/log/cherokee/
+	dosed "s:/var/log/cherokee\.:/var/log/cherokee/cherokee\.:g" /etc/cherokee/cherokee.conf
+
+}
+
+pkg_postinst() {
+	enewgroup cherokee
+	enewuser cherokee -1 -1 /var/www/localhost cherokee
+	install -o cherokee -g cherokee -m0775 -d $ROOT/var/log/cherokee
+
+	# check if user/group was defined if not add it
+	gr="/bin/grep -q"
+	ec="/bin/echo"
+	$gr server\!user /etc/cherokee/cherokee.conf ; rtu=$?
+	$gr server\!group /etc/cherokee/cherokee.conf ; rtg=$?
+
+	[[ "x$rtu" == "x1" ]] && $ec server\!user = cherokee >> /etc/cherokee/cherokee.conf
+	[[ "x$rtg" == "x1" ]] && $ec server\!group = cherokee >> /etc/cherokee/cherokee.conf
+
+	if use admin ; then
+		echo  ""
+		elog "Just run 'cherokee-admin' and go to: http://localhost:9090"
+		echo  ""
+	else
+		echo  ""
+		elog "Try USE=admin if you want an easy way to configure cherokee."
+		echo  ""
+	fi
+
+	echo ""
+	elog "Config format can change in different versions. Check converter script in:"
+	elog "	  /usr/share/cherokee-0.99.15/contrib/"
+	elog "for example:"
+	elog "	  PYTHONPATH="/usr/share/cherokee/admin/" python \\"
+	elog "	  /usr/share/cherokee-0.99.15/contrib/0999to09910.py \\"
+	elog "	  /etc/cherokee/cherokee.conf /etc/cherokee/cherokee.conf-0.99.15"
+
+}