diff options
| -rw-r--r-- | www-servers/cherokee/ChangeLog | 9 | ||||
| -rw-r--r-- | www-servers/cherokee/cherokee-0.9.0.ebuild | 106 | ||||
| -rw-r--r-- | www-servers/cherokee/cherokee-0.99.8.ebuild (renamed from www-servers/cherokee/cherokee-0.8.1.ebuild) | 65 | ||||
| -rw-r--r-- | www-servers/cherokee/files/cherokee-initd-0.5.6 | 24 |
4 files changed, 49 insertions, 155 deletions
diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog index 1d95b8803519..2e9d49d2691b 100644 --- a/www-servers/cherokee/ChangeLog +++ b/www-servers/cherokee/ChangeLog @@ -1,6 +1,13 @@ # 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.47 2009/02/03 12:45:46 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.48 2009/04/01 12:50:05 bass Exp $ + +*cherokee-0.99.8 (01 Apr 2009) + + 01 Apr 2009; J. Alberto Suárez López <bass@gentoo.org> + -files/cherokee-initd-0.5.6, -cherokee-0.8.1.ebuild, + -cherokee-0.9.0.ebuild, +cherokee-0.99.8.ebuild: + New version and new USE flags. 03 Feb 2009; Petteri Räty <betelgeuse@gentoo.org> cherokee-0.98.1.ebuild: Block lighttpd until spawn-fcgi collision is fixed. See bug #224781. diff --git a/www-servers/cherokee/cherokee-0.9.0.ebuild b/www-servers/cherokee/cherokee-0.9.0.ebuild deleted file mode 100644 index 94aaa4d563e3..000000000000 --- a/www-servers/cherokee/cherokee-0.9.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.9.0.ebuild,v 1.1 2008/09/28 17:16:23 bass Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit eutils pam versionator libtool autotools - -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="~amd64 ~ppc ~sparc ~x86" -IUSE="ipv6 ssl gnutls static pam coverpage threads kernel_linux admin" - -RDEPEND=">=sys-libs/zlib-1.1.4-r1 - ssl? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( dev-libs/openssl ) - ) - pam? ( virtual/pam ) - admin? ( dev-lang/python )" -DEPEND="${RDEPEND}" - -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 - - local os="Unknown" - case "${CHOST}" in - *-freebsd*) - os="FreeBSD" ;; - *-netbsd*) - os="NetBSD" ;; - *-openbsd*) - os="OpenBSD" ;; - *) - os="Linux" ;; - esac - - econf \ - ${myconf} \ - $(use_enable pam) \ - $(use_enable ipv6) \ - $(use_enable threads pthread) \ - $(use_enable kernel_linux epoll) \ - --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 TODO - - newpamd pam.d_cherokee ${PN} || die "newpamd failed" - newinitd "${FILESDIR}/${PN}-initd-0.6" ${PN} || die "newinitd failed" - - dodir /usr/share/doc/${PF}/contrib - insinto /usr/share/${PF}/contrib - doins contrib/05to06.py - doins contrib/06to07.py - - 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 - -} - -pkg_postinst() { - enewgroup cherokee - enewuser cherokee -1 -1 /var/www/localhost cherokee - - 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 a easy way to configure cherokee." - echo "" - fi -} diff --git a/www-servers/cherokee/cherokee-0.8.1.ebuild b/www-servers/cherokee/cherokee-0.99.8.ebuild index a6677a16e873..7d6787e0c5ba 100644 --- a/www-servers/cherokee/cherokee-0.8.1.ebuild +++ b/www-servers/cherokee/cherokee-0.99.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# 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.8.1.ebuild,v 1.1 2008/09/02 19:58:52 bass Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.99.8.ebuild,v 1.1 2009/04/01 12:50:05 bass Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -13,35 +13,36 @@ HOMEPAGE="http://www.cherokee-project.com/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="ipv6 ssl gnutls static pam coverpage threads kernel_linux admin" - -RDEPEND=">=sys-libs/zlib-1.1.4-r1 - ssl? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( dev-libs/openssl ) - ) +KEYWORDS="~x86" +IUSE="ipv6 ssl static pam coverpage threads kernel_linux admin debug geoip ldap mysql ffmpeg" + +# lighttpd block should be resolved properly +# http://bugs.gentoo.org/show_bug.cgi?id=224781 +RDEPEND=" + !www-servers/lighttpd + >=sys-libs/zlib-1.1.4-r1 + ssl? ( dev-libs/openssl ) pam? ( virtual/pam ) - admin? ( dev-lang/python )" + admin? ( dev-lang/python ) + geoip? ( dev-libs/geoip ) + ldap? ( net-nds/openldap ) + mysql? ( virtual/mysql ) + ffmpeg? ( media-video/ffmpeg )" DEPEND="${RDEPEND}" 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 debug ; then + myconf="${myconf} --enable-trace" + fi + local os="Unknown" case "${CHOST}" in *-freebsd*) @@ -54,12 +55,17 @@ src_compile() { 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 \ @@ -73,15 +79,17 @@ src_compile() { src_install () { emake -j1 DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" install || die "make install failed" - dodoc AUTHORS ChangeLog TODO + dodoc AUTHORS ChangeLog - newpamd pam.d_cherokee ${PN} || die "newpamd failed" - newinitd "${FILESDIR}/${PN}-initd-0.6" ${PN} || die "newinitd failed" + 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/05to06.py - doins contrib/06to07.py + doins contrib/07to08.py + doins contrib/08to09.py + doins contrib/09to010.py + doins contrib/011to098.py keepdir /etc/cherokee/mods-enabled /etc/cherokee/sites-enabled /var/www/localhost/htdocs @@ -94,6 +102,15 @@ pkg_postinst() { enewgroup cherokee enewuser cherokee -1 -1 /var/www/localhost 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" diff --git a/www-servers/cherokee/files/cherokee-initd-0.5.6 b/www-servers/cherokee/files/cherokee-initd-0.5.6 deleted file mode 100644 index 9e7b325c9338..000000000000 --- a/www-servers/cherokee/files/cherokee-initd-0.5.6 +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/files/cherokee-initd-0.5.6,v 1.1 2006/12/27 02:37:08 flameeyes Exp $ - -PIDFILE=/var/run/cherokee.pid - -depend() { - need net -} - -start() { - ebegin "Starting Cherokee Web Server" - start-stop-daemon --start --pidfile ${PIDFILE} \ - --exec /usr/sbin/cherokee -- -b - eend $? -} - -stop() { - ebegin "Stopping Cherokee Web Server" - start-stop-daemon --stop --pidfile ${PIDFILE} \ - --exec /usr/sbin/cherokee - eend $? -} |