| 1 |
bass 10/02/08 08:35:28 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: cherokee-0.99.42.ebuild |
| 5 |
Removed: cherokee-0.99.22.ebuild cherokee-0.99.24.ebuild |
| 6 |
Log: |
| 7 |
Bump version. Cleanup. Fixed: #303753 #285858 #291633 |
| 8 |
(Portage version: 2.1.6.13/cvs/Linux i686) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.62 www-servers/cherokee/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/cherokee/ChangeLog?rev=1.62&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/cherokee/ChangeLog?rev=1.62&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/cherokee/ChangeLog?r1=1.61&r2=1.62 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v |
| 20 |
retrieving revision 1.61 |
| 21 |
retrieving revision 1.62 |
| 22 |
diff -u -r1.61 -r1.62 |
| 23 |
--- ChangeLog 30 Nov 2009 16:47:38 -0000 1.61 |
| 24 |
+++ ChangeLog 8 Feb 2010 08:35:27 -0000 1.62 |
| 25 |
@@ -1,6 +1,13 @@ |
| 26 |
# ChangeLog for www-servers/cherokee |
| 27 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.61 2009/11/30 16:47:38 bass Exp $ |
| 29 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.62 2010/02/08 08:35:27 bass Exp $ |
| 31 |
+ |
| 32 |
+*cherokee-0.99.42 (08 Feb 2010) |
| 33 |
+ |
| 34 |
+ 08 Feb 2010; J. Alberto Suárez López <bass@g.o> |
| 35 |
+ -files/cherokee-initd-0.11, -cherokee-0.99.22.ebuild, |
| 36 |
+ -cherokee-0.99.24.ebuild, +cherokee-0.99.42.ebuild: |
| 37 |
+ Bump version. Cleanup. Fixed: #303753 #285858 #291633 |
| 38 |
|
| 39 |
*cherokee-0.99.30 (30 Nov 2009) |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 www-servers/cherokee/cherokee-0.99.42.ebuild |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/cherokee/cherokee-0.99.42.ebuild?rev=1.1&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/cherokee/cherokee-0.99.42.ebuild?rev=1.1&content-type=text/plain |
| 48 |
|
| 49 |
Index: cherokee-0.99.42.ebuild |
| 50 |
=================================================================== |
| 51 |
# Copyright 1999-2010 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.99.42.ebuild,v 1.1 2010/02/08 08:35:27 bass Exp $ |
| 54 |
|
| 55 |
inherit eutils pam versionator libtool |
| 56 |
|
| 57 |
DESCRIPTION="An extremely fast and tiny web server." |
| 58 |
SRC_URI="http://www.cherokee-project.com/download/$(get_version_component_range 1-2)/${PV}/${P}.tar.gz" |
| 59 |
HOMEPAGE="http://www.cherokee-project.com/" |
| 60 |
|
| 61 |
LICENSE="GPL-2" |
| 62 |
SLOT="0" |
| 63 |
KEYWORDS="~x86 ~amd64" |
| 64 |
IUSE="ipv6 nls ssl static pam coverpage threads kernel_linux admin debug geoip ldap mysql ffmpeg fastcgi" |
| 65 |
|
| 66 |
RDEPEND=" |
| 67 |
>=sys-libs/zlib-1.1.4-r1 |
| 68 |
nls? ( sys-devel/gettext ) |
| 69 |
ssl? ( dev-libs/openssl ) |
| 70 |
pam? ( virtual/pam ) |
| 71 |
admin? ( dev-lang/python ) |
| 72 |
geoip? ( dev-libs/geoip ) |
| 73 |
ldap? ( net-nds/openldap ) |
| 74 |
mysql? ( virtual/mysql ) |
| 75 |
fastcgi? ( www-servers/spawn-fcgi ) |
| 76 |
ffmpeg? ( media-video/ffmpeg )" |
| 77 |
DEPEND="${RDEPEND}" |
| 78 |
|
| 79 |
src_compile() { |
| 80 |
local myconf |
| 81 |
|
| 82 |
if use static ; then |
| 83 |
myconf="${myconf} --enable-static --enable-static-module=all" |
| 84 |
else |
| 85 |
myconf="${myconf} --disable-static" |
| 86 |
fi |
| 87 |
|
| 88 |
if use debug ; then |
| 89 |
myconf="${myconf} --enable-trace" |
| 90 |
fi |
| 91 |
|
| 92 |
local os="Unknown" |
| 93 |
case "${CHOST}" in |
| 94 |
*-freebsd*) |
| 95 |
os="FreeBSD" ;; |
| 96 |
*-netbsd*) |
| 97 |
os="NetBSD" ;; |
| 98 |
*-openbsd*) |
| 99 |
os="OpenBSD" ;; |
| 100 |
*) |
| 101 |
os="Linux" ;; |
| 102 |
esac |
| 103 |
|
| 104 |
# No options to enable or disable ssl since Cherokee 0.11 |
| 105 |
econf \ |
| 106 |
${myconf} \ |
| 107 |
$(use_enable pam) \ |
| 108 |
$(use_enable ipv6) \ |
| 109 |
$(use_enable nls) \ |
| 110 |
$(use_enable threads pthread) \ |
| 111 |
$(use_enable kernel_linux epoll) \ |
| 112 |
$(use_with geoip) \ |
| 113 |
$(use_with ldap) \ |
| 114 |
$(use_with mysql) \ |
| 115 |
$(use_with ffmpeg) \ |
| 116 |
--disable-dependency-tracking \ |
| 117 |
--enable-os-string="Gentoo ${os}" \ |
| 118 |
--with-wwwroot=/var/www/localhost/htdocs \ |
| 119 |
--prefix=/usr \ |
| 120 |
--sysconfdir=/etc \ |
| 121 |
--localstatedir=/var \ |
| 122 |
|| die "configure failed" |
| 123 |
|
| 124 |
emake || die "emake failed" |
| 125 |
} |
| 126 |
|
| 127 |
src_install () { |
| 128 |
emake -j1 DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" install || die "make install failed" |
| 129 |
dodoc AUTHORS ChangeLog |
| 130 |
|
| 131 |
use pam && pamd_mimic system-auth cherokee auth account session |
| 132 |
newinitd "${FILESDIR}/${PN}-initd-0.99.23" ${PN} || die "newinitd failed" |
| 133 |
|
| 134 |
dodir /usr/share/doc/${PF}/contrib |
| 135 |
insinto /usr/share/${PF}/contrib |
| 136 |
doins contrib/07to08.py |
| 137 |
doins contrib/08to09.py |
| 138 |
doins contrib/09to010.py |
| 139 |
doins contrib/011to098.py |
| 140 |
doins contrib/098to099.py |
| 141 |
doins contrib/0999to09910.py |
| 142 |
doins contrib/make-cert.sh |
| 143 |
|
| 144 |
keepdir /etc/cherokee/mods-enabled /etc/cherokee/sites-enabled /var/www/localhost/htdocs |
| 145 |
|
| 146 |
use coverpage || rm -rf "${D}"/var/www/localhost/htdocs/{index.html,images} |
| 147 |
use admin || rm -rf "${D}"/usr/sbin/admin "${D}"/usr/share/cherokee/admin |
| 148 |
|
| 149 |
# Puts logs in /var/log/cherokee/ |
| 150 |
dosed "s:/var/log/cherokee\.:/var/log/cherokee/cherokee\.:g" /etc/cherokee/cherokee.conf |
| 151 |
|
| 152 |
} |
| 153 |
|
| 154 |
pkg_postinst() { |
| 155 |
enewgroup cherokee |
| 156 |
enewuser cherokee -1 -1 /var/www/localhost cherokee |
| 157 |
install -o cherokee -g cherokee -m0775 -d $ROOT/var/log/cherokee |
| 158 |
|
| 159 |
# check if user/group was defined if not add it |
| 160 |
gr="/bin/grep -q" |
| 161 |
ec="/bin/echo" |
| 162 |
$gr server\!user /etc/cherokee/cherokee.conf ; rtu=$? |
| 163 |
$gr server\!group /etc/cherokee/cherokee.conf ; rtg=$? |
| 164 |
|
| 165 |
[[ "x$rtu" == "x1" ]] && $ec server\!user = cherokee >> /etc/cherokee/cherokee.conf |
| 166 |
[[ "x$rtg" == "x1" ]] && $ec server\!group = cherokee >> /etc/cherokee/cherokee.conf |
| 167 |
|
| 168 |
if use admin ; then |
| 169 |
echo "" |
| 170 |
elog "Just run 'cherokee-admin' and go to: http://localhost:9090" |
| 171 |
echo "" |
| 172 |
else |
| 173 |
echo "" |
| 174 |
elog "Try USE=admin if you want an easy way to configure cherokee." |
| 175 |
echo "" |
| 176 |
fi |
| 177 |
|
| 178 |
echo "" |
| 179 |
elog "Config format can change in different versions. Check converter script in:" |
| 180 |
elog " /usr/share/cherokee-0.99.15/contrib/" |
| 181 |
elog "for example:" |
| 182 |
elog " PYTHONPATH="/usr/share/cherokee/admin/" python \\" |
| 183 |
elog " /usr/share/cherokee-0.99.15/contrib/0999to09910.py \\" |
| 184 |
elog " /etc/cherokee/cherokee.conf /etc/cherokee/cherokee.conf-0.99.15" |
| 185 |
|
| 186 |
} |
Archives