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