diff options
| -rw-r--r-- | www-servers/cherokee/ChangeLog | 9 | ||||
| -rw-r--r-- | www-servers/cherokee/Manifest | 4 | ||||
| -rw-r--r-- | www-servers/cherokee/cherokee-1.0.2.ebuild | 157 |
3 files changed, 168 insertions, 2 deletions
diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog index dd497547481e..715744f4326f 100644 --- a/www-servers/cherokee/ChangeLog +++ b/www-servers/cherokee/ChangeLog @@ -1,6 +1,13 @@ # 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.65 2010/05/17 09:18:19 bass Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.66 2010/06/16 07:51:59 bass Exp $ + +*cherokee-1.0.2 (16 Jun 2010) + + 16 Jun 2010; J. Alberto Suárez López <bass@gentoo.org> + +cherokee-1.0.2.ebuild: + version bump. Fixed #324203, #316981. Forced to use python 2, upstream + dont have plans for python 3. Forced to use -j1 *cherokee-1.0.0 (17 May 2010) diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest index c5e1c112d1dc..3a4de31da3e0 100644 --- a/www-servers/cherokee/Manifest +++ b/www-servers/cherokee/Manifest @@ -4,10 +4,12 @@ DIST cherokee-0.99.42.tar.gz 5244378 RMD160 1af716a88414ca8c9c38f432cf500989828b DIST cherokee-0.99.44.tar.gz 6369072 RMD160 cae555b42afee166231bff37e5f53c71e9b455bb SHA1 005b0c9781732cc325c58e61612bd1b97dcea2dc SHA256 1030951ff694d87b4ff22fac9e978bd82e085a5e0466abb881686be3eef87b70 DIST cherokee-0.99.48.tar.gz 4871636 RMD160 5d4c8b263515aff668668b0b685d0d7baf7ba6b5 SHA1 624e41926527ddafe9e753a9d39be74da69c0cfd SHA256 405c012e05207100ab1a6f18135da330972f17ffe6de5275d659601eab1503b6 DIST cherokee-1.0.0.tar.gz 5143468 RMD160 0f5c3975772379a6f495ceb0f6f3ed1f4feb6da7 SHA1 8ab1fa32b73d317345938eaa6c2dd88882d1f0c9 SHA256 c7d3d185aaeb3ed5811dba32dcc8a00ff64b4f0eec86461cf0911d0540efbaad +DIST cherokee-1.0.2.tar.gz 5309634 RMD160 e4dc2f8d43974646109f2c1c3f9ea5f542590171 SHA1 fd5c7cdc2fea84d622f5bc8b7a8f5094eca87f0f SHA256 c499c25afd4e6fffa3e126e60970bbb35aeea0611fc28a9c845768cc0a67e35e EBUILD cherokee-0.99.30.ebuild 3374 RMD160 056f4b9f797f3477a6a7edf84b02e3e74d33e9a6 SHA1 fbe87d224cb99c6d1ded3dcbfcbf88410f84ffc8 SHA256 61638788132ccc0743542c3a80a493a0028cf96f57ebcdc7d220941066b2481e EBUILD cherokee-0.99.42.ebuild 3898 RMD160 94aae50a66f9405afa2f9d605f5f155c343d056a SHA1 d09f2ac977e57a2caaab7df2f69a98112df87810 SHA256 4c6eb36445327e7168953d1cb62ff5a56396a9be3bf2cc80e4767bea9afe83d2 EBUILD cherokee-0.99.44.ebuild 3898 RMD160 3ae910e22670f339543369eae9fff16310c70212 SHA1 f046f83e606de05538e9e1e302e11025e9a84d95 SHA256 4cd902166e4fcca9f77c8ce500fab32ae7c94a72995c33ef49ef6bdf446c531a EBUILD cherokee-0.99.48.ebuild 3897 RMD160 f5097665c8414cfcedf07a909e1fd41d0012a958 SHA1 841fd81a42044e0eb603392afc8a4fdbc25dd192 SHA256 dd343d39ec389af8dfe34df8ae3b4970db28e0af4aca7db0403a33c3efd3944b EBUILD cherokee-1.0.0.ebuild 4002 RMD160 bc2b9c1ad6ab7c2526cdb69ba1eab94a0788442a SHA1 6bc90168786c333c9c38eab0203d326a1b8af24e SHA256 38dfd6bc3129d292c76a0ace9a912d26fe894d76bbb02ffcb63bd2c98a93271b -MISC ChangeLog 16779 RMD160 1494e457791e570ba106b73c4419c2190f26e7d8 SHA1 8a2966e04505d4b7f7e70b4758848f904595d860 SHA256 1935cdf0f275bc5f26f838b441a13b40232ac2b359be5030fe1e649aea09d19b +EBUILD cherokee-1.0.2.ebuild 4253 RMD160 3a9061810093604fd9544fd55312f58d4166d39a SHA1 1e1bcc5494b4472853713beac168ce976fe7816a SHA256 497abbb83a148fcc1bc781acb19801178336667aaa0ee4c6ab67ff7fea65db71 +MISC ChangeLog 17019 RMD160 ca4800aeef96be0783803b9fbadb74269d1a51a4 SHA1 080f74ddb6141e25fa43b03ee01c77c61d860803 SHA256 3377d2a41f95f62408d57511923376ba470e3f10b9455b6c8e6ab8d859d3329a MISC metadata.xml 434 RMD160 bac321b7879fe7793087b221f20554e4b44a5975 SHA1 d77a40137b169af1715d9827f463e2219485a931 SHA256 9cb0163ef5aadb0cafb83c75615bb3f393f5484016695abd15db7ff6d2680f8b diff --git a/www-servers/cherokee/cherokee-1.0.2.ebuild b/www-servers/cherokee/cherokee-1.0.2.ebuild new file mode 100644 index 000000000000..12175353fec8 --- /dev/null +++ b/www-servers/cherokee/cherokee-1.0.2.ebuild @@ -0,0 +1,157 @@ +# 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.2.ebuild,v 1.1 2010/06/16 07:51:59 bass Exp $ + +PYTHON_DEPEND="2" + +inherit python 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_prepare() { + python_convert_shebangs -r 2 . +} + +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 -j1 || 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 + + # Force shebang to use python2 + dosed "s:\#\!/usr/bin/env\ python:\#\!/usr/bin/python2:g" /usr/share/cherokee/admin/server.py + + +} + +pkg_setup() { + python_set_active_version 2 +} + +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" + +} |