diff options
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/cherokee/ChangeLog | 8 | ||||
| -rw-r--r-- | www-servers/cherokee/Manifest | 8 | ||||
| -rw-r--r-- | www-servers/cherokee/cherokee-1.2.0.ebuild | 6 | ||||
| -rw-r--r-- | www-servers/cherokee/cherokee-1.2.1.ebuild | 157 | ||||
| -rw-r--r-- | www-servers/cherokee/files/cherokee-initd-1.2.0 | 4 |
5 files changed, 174 insertions, 9 deletions
diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog index 447de7ee333a..d6fcca7f1f4e 100644 --- a/www-servers/cherokee/ChangeLog +++ b/www-servers/cherokee/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-servers/cherokee # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.81 2011/02/22 21:43:58 bass Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.82 2011/03/02 12:29:33 bass Exp $ + +*cherokee-1.2.1 (02 Mar 2011) + + 02 Mar 2011; <bass@gentoo.org> files/cherokee-initd-1.2.0, + cherokee-1.2.0.ebuild, +cherokee-1.2.1.ebuild: + bump version 22 Feb 2011; <bass@gentoo.org> +files/cherokee-initd-1.2.0, cherokee-1.2.0.ebuild: diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest index b95d70fac968..978cd8970091 100644 --- a/www-servers/cherokee/Manifest +++ b/www-servers/cherokee/Manifest @@ -1,8 +1,10 @@ AUX cherokee-initd-0.99.23 542 RMD160 e0ee20b7bb781797c3a53d0e2804e8b0fe985beb SHA1 4a8b43509aa4b9bf1079e0e74ca9d61428672522 SHA256 9e58ed7b3050a17fed08cc682e30dfa14e09eb804084b6cc9b213ccd0843300f -AUX cherokee-initd-1.2.0 719 RMD160 5864fde0b186a143e1c13b386bbf1c3beb316d42 SHA1 d12f27657a0e118a4bcad7dd6b94f6d846f30a89 SHA256 c0f631566b7c0e8dc3b3f31f44258ce4410248f08b728d5e2578837d783e98b6 +AUX cherokee-initd-1.2.0 717 RMD160 79d5e72dabc0183ae7e8d6453d83b1e549cac736 SHA1 04efcc25ab326a695944b45e12a1057a3574181e SHA256 c6cd9b7ab782aa5f3242bbdfcefabf4fff05ea253e7af1175df5eb2da7e6255d DIST cherokee-1.0.12.tar.gz 5710898 RMD160 21022ac54c32324d3d738e7afb104aa76c96374f SHA1 6a514ea6816252400c777cca4d91658575f49091 SHA256 37fbece8df5af26773710100f85008a9d65e3f363885ce7228f32e882b21fc75 DIST cherokee-1.2.0.tar.gz 5898536 RMD160 e0b9f7af51cf21c94130b3ad3b106821cd35c3b9 SHA1 af8e4ee0e3dce59db86855a59aa0724ca0cfb331 SHA256 835df63bc97324d9a27d9bf3980de25cddae3edc55a2c72b01dc721ac604076a +DIST cherokee-1.2.1.tar.gz 6041090 RMD160 d6285e8dd157b689eb1b2cd2369daf2bf812ba59 SHA1 982bc99e966218661abd562d604aea32923bfde9 SHA256 8ce6f35f521b8b0a45b5c95587b3653a137f9d8eed5ee7ffd3e8fa6cb922a668 EBUILD cherokee-1.0.12.ebuild 4156 RMD160 475282d32ea58f162b0f1be3a3f2d2fbc0095e9e SHA1 3fc8153a4bae50ededd663efe2c4f83b7e992bdb SHA256 c339938504c78a2ef35abc4eca5045a69f9ef9ab989ada8b5fb3e0c2896f26e3 -EBUILD cherokee-1.2.0.ebuild 4173 RMD160 919ea4b9c7afd3631a23b327facc1053c8b49758 SHA1 223caedc867b59bfe10bb2aeaf5ec1b132f9c4a2 SHA256 2eb701739465bebc900aae4b4b181fb37f05088ce921c61bd49fa88b13bf9461 -MISC ChangeLog 19256 RMD160 c321fd074f571ff91520980065c0b94e48689230 SHA1 467659f584fdf0a5be6976187176433b07d2004e SHA256 f636aa2a4611192592776a6f5ec284bf905afd3c2825c060a24209e0e4bf8c4f +EBUILD cherokee-1.2.0.ebuild 4151 RMD160 4d0c21d160a0e5c2743a2cc5ada865feda4ab7b6 SHA1 04ee24e8c0cae0e1c5aabbf423a2a970b550a796 SHA256 5c1725838310dcbae4c9634f56a65f915f3da48b78d54105d09ac8bfa4f0ec01 +EBUILD cherokee-1.2.1.ebuild 4151 RMD160 3bfbe8c1f3ab5c896335368d7a591ba1b3374666 SHA1 85a115c6084c0ad389a95fbf516ee3c92955dd5f SHA256 a69867c5225d8f2969e89a30ab227d60a4328b80c9663c751dc189e239edc185 +MISC ChangeLog 19413 RMD160 40745ccb9e76ed324f684ca7287f2fe1f5ea2869 SHA1 0450d573257ea63cb3e4559a771cdf1660ce3682 SHA256 b82e72ee63d02de534cfa7f2a0dd250a63268c54849175d077deb58217654ab6 MISC metadata.xml 488 RMD160 6689708f9508ed17b4f67284e8fef3512161b432 SHA1 c7a8168a8e6b119bee60b536552f378cf670130b SHA256 4ee7f5937c157209c4d78429188bcfc36b9c063252760215ce2e70da1ff95496 diff --git a/www-servers/cherokee/cherokee-1.2.0.ebuild b/www-servers/cherokee/cherokee-1.2.0.ebuild index 39425ebed77b..59d2199b1658 100644 --- a/www-servers/cherokee/cherokee-1.2.0.ebuild +++ b/www-servers/cherokee/cherokee-1.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.0.ebuild,v 1.2 2011/02/22 21:43:58 bass Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.0.ebuild,v 1.3 2011/03/02 12:29:33 bass Exp $ EAPI=2 PYTHON_DEPEND="admin? 2" @@ -148,10 +148,10 @@ pkg_postinst() { echo "" elog "Config format can change in different versions. Check converter script in:" - elog " /usr/share/cherokee-0.99.15/contrib/" + elog " /usr/share/${PF}/contrib/" elog "for example:" elog " PYTHONPATH="/usr/share/cherokee/admin/" python \\" - elog " /usr/share/cherokee-0.99.15/contrib/0999to09910.py \\" + elog " /usr/share/${PF}/contrib/0999to09910.py \\" elog " /etc/cherokee/cherokee.conf /etc/cherokee/cherokee.conf-0.99.15" } diff --git a/www-servers/cherokee/cherokee-1.2.1.ebuild b/www-servers/cherokee/cherokee-1.2.1.ebuild new file mode 100644 index 000000000000..5c7488eaa73e --- /dev/null +++ b/www-servers/cherokee/cherokee-1.2.1.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.1.ebuild,v 1.1 2011/03/02 12:29:33 bass Exp $ + +EAPI=2 +PYTHON_DEPEND="admin? 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 kernel_linux admin debug geoip ldap mysql ffmpeg fastcgi rrdtool" + +RDEPEND=" + >=sys-libs/zlib-1.1.4-r1 + rrdtool? ( net-analyzer/rrdtool ) + nls? ( sys-devel/gettext ) + ssl? ( dev-libs/openssl ) + pam? ( virtual/pam ) + 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_configure() { + 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 + + # This make cherokee 1.2 sad + # $(use_enable threads pthread) \ + econf \ + ${myconf} \ + $(use_enable pam) \ + $(use_enable ipv6) \ + $(use_enable nls) \ + $(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" +} + +src_compile() { + 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-1.2.0" ${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_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/${PF}/contrib/" + elog "for example:" + elog " PYTHONPATH="/usr/share/cherokee/admin/" python \\" + elog " /usr/share/${PF}/contrib/0999to09910.py \\" + elog " /etc/cherokee/cherokee.conf /etc/cherokee/cherokee.conf-0.99.15" + +} diff --git a/www-servers/cherokee/files/cherokee-initd-1.2.0 b/www-servers/cherokee/files/cherokee-initd-1.2.0 index e99d0c1ee169..046ef70cacea 100644 --- a/www-servers/cherokee/files/cherokee-initd-1.2.0 +++ b/www-servers/cherokee/files/cherokee-initd-1.2.0 @@ -2,7 +2,7 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -opts="gracefull reload" +opts="graceful reload" depend() { need net @@ -22,7 +22,7 @@ stop() { eend $? } -gracefull() { +graceful() { ebegin "Gracefully restarting Cherokee Web Server" start-stop-daemon \ --exec /usr/sbin/cherokee \ |