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