summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Alberto Suarez Lopez <bass@gentoo.org>2010-05-17 09:18:19 +0000
committerJose Alberto Suarez Lopez <bass@gentoo.org>2010-05-17 09:18:19 +0000
commit70549b2c4f9bdb20ddd23206a1b17e9df010ee3b (patch)
tree3c5134943d7385d05b178f404304f2932dbd7991 /www-servers
parentx86 stable wrt bug #318313 (diff)
downloadgentoo-2-70549b2c4f9bdb20ddd23206a1b17e9df010ee3b.tar.gz
gentoo-2-70549b2c4f9bdb20ddd23206a1b17e9df010ee3b.tar.bz2
gentoo-2-70549b2c4f9bdb20ddd23206a1b17e9df010ee3b.zip
version bump, solves #319915 #319543 #318663
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/cherokee/ChangeLog8
-rw-r--r--www-servers/cherokee/cherokee-1.0.0.ebuild144
2 files changed, 151 insertions, 1 deletions
diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 3f572580722b..dd497547481e 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-servers/cherokee
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.64 2010/04/30 09:41:45 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.65 2010/05/17 09:18:19 bass Exp $
+
+*cherokee-1.0.0 (17 May 2010)
+
+ 17 May 2010; J. Alberto Suárez López <bass@gentoo.org>
+ +cherokee-1.0.0.ebuild:
+ version bump, solves #319915 #319543 #318663
*cherokee-0.99.48 (30 Apr 2010)
diff --git a/www-servers/cherokee/cherokee-1.0.0.ebuild b/www-servers/cherokee/cherokee-1.0.0.ebuild
new file mode 100644
index 000000000000..33bfaab2872c
--- /dev/null
+++ b/www-servers/cherokee/cherokee-1.0.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.0.0.ebuild,v 1.1 2010/05/17 09:18:19 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 nls ssl static pam coverpage threads kernel_linux admin debug geoip ldap mysql ffmpeg fastcgi"
+
+RDEPEND="
+ >=sys-libs/zlib-1.1.4-r1
+ net-analyzer/rrdtool
+ nls? ( sys-devel/gettext )
+ 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 nls) \
+ $(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 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.99.23" ${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/make-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}
+ if use admin ; then
+ exeinto /usr/share/cherokee/admin
+ doexe admin/server.py
+ else
+ rm -rf "${D}"/usr/sbin/admin "${D}"/usr/share/cherokee/admin
+ fi
+
+ # 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"
+
+}