1 |
hoffie 10/02/09 23:18:26 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: lighttpd-1.4.26.ebuild |
5 |
Log: |
6 |
version bump per bug 304065 |
7 |
(Portage version: 2.1.7.16/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.224 www-servers/lighttpd/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/ChangeLog?rev=1.224&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/ChangeLog?rev=1.224&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/ChangeLog?r1=1.223&r2=1.224 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v |
19 |
retrieving revision 1.223 |
20 |
retrieving revision 1.224 |
21 |
diff -u -r1.223 -r1.224 |
22 |
--- ChangeLog 4 Feb 2010 00:06:02 -0000 1.223 |
23 |
+++ ChangeLog 9 Feb 2010 23:18:25 -0000 1.224 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for www-servers/lighttpd |
26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.223 2010/02/04 00:06:02 jer Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.224 2010/02/09 23:18:25 hoffie Exp $ |
29 |
+ |
30 |
+*lighttpd-1.4.26 (09 Feb 2010) |
31 |
+ |
32 |
+ 09 Feb 2010; Christian Hoffmann <hoffie@g.o> |
33 |
+ +lighttpd-1.4.26.ebuild: |
34 |
+ version bump per bug 304065 |
35 |
|
36 |
04 Feb 2010; Jeroen Roovers <jer@g.o> lighttpd-1.4.25-r1.ebuild: |
37 |
Stable for PPC (bug #303213). |
38 |
|
39 |
|
40 |
|
41 |
1.1 www-servers/lighttpd/lighttpd-1.4.26.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.26.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.26.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: lighttpd-1.4.26.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2010 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.26.ebuild,v 1.1 2010/02/09 23:18:25 hoffie Exp $ |
51 |
|
52 |
EAPI="2" |
53 |
|
54 |
inherit eutils autotools depend.php |
55 |
|
56 |
DESCRIPTION="Lightweight high-performance web server" |
57 |
HOMEPAGE="http://www.lighttpd.net/" |
58 |
SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.bz2" |
59 |
|
60 |
LICENSE="BSD" |
61 |
SLOT="0" |
62 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
63 |
IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr" |
64 |
|
65 |
RDEPEND=" |
66 |
>=sys-libs/zlib-1.1 |
67 |
bzip2? ( app-arch/bzip2 ) |
68 |
fam? ( virtual/fam ) |
69 |
gdbm? ( sys-libs/gdbm ) |
70 |
ldap? ( >=net-nds/openldap-2.1.26 ) |
71 |
lua? ( >=dev-lang/lua-5.1 ) |
72 |
memcache? ( dev-libs/libmemcache ) |
73 |
mysql? ( >=virtual/mysql-4.0 ) |
74 |
pcre? ( >=dev-libs/libpcre-3.1 ) |
75 |
php? ( virtual/httpd-php ) |
76 |
rrdtool? ( net-analyzer/rrdtool ) |
77 |
ssl? ( >=dev-libs/openssl-0.9.7 ) |
78 |
webdav? ( |
79 |
dev-libs/libxml2 |
80 |
>=dev-db/sqlite-3 |
81 |
sys-fs/e2fsprogs |
82 |
) |
83 |
xattr? ( kernel_linux? ( sys-apps/attr ) )" |
84 |
|
85 |
DEPEND="${RDEPEND} |
86 |
dev-util/pkgconfig |
87 |
doc? ( dev-python/docutils ) |
88 |
test? ( |
89 |
virtual/perl-Test-Harness |
90 |
dev-libs/fcgi |
91 |
)" |
92 |
|
93 |
# update certain parts of lighttpd.conf based on conditionals |
94 |
update_config() { |
95 |
local config="/etc/lighttpd/lighttpd.conf" |
96 |
|
97 |
# enable php/mod_fastcgi settings |
98 |
use php && \ |
99 |
dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} |
100 |
|
101 |
# enable stat() caching |
102 |
use fam && \ |
103 |
dosed 's|#\(.*stat-cache.*$\)|\1|' ${config} |
104 |
} |
105 |
|
106 |
# remove non-essential stuff (for USE=minimal) |
107 |
remove_non_essential() { |
108 |
local libdir="${D}/usr/$(get_libdir)/${PN}" |
109 |
|
110 |
# text docs |
111 |
use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt |
112 |
|
113 |
# non-essential modules |
114 |
rm -f \ |
115 |
${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* |
116 |
|
117 |
# allow users to keep some based on USE flags |
118 |
use pcre || rm -f ${libdir}/mod_{ssi,re{direct,write}}.* |
119 |
use webdav || rm -f ${libdir}/mod_webdav.* |
120 |
use mysql || rm -f ${libdir}/mod_mysql_vhost.* |
121 |
use lua || rm -f ${libdir}/mod_{cml,magnet}.* |
122 |
use rrdtool || rm -f ${libdir}/mod_rrdtool.* |
123 |
|
124 |
if ! use fastcgi ; then |
125 |
rm -f ${libdir}/mod_fastcgi.* |
126 |
fi |
127 |
} |
128 |
|
129 |
pkg_setup() { |
130 |
if ! use pcre ; then |
131 |
ewarn "It is highly recommended that you build ${PN}" |
132 |
ewarn "with perl regular expressions support via USE=pcre." |
133 |
ewarn "Otherwise you lose support for some core options such" |
134 |
ewarn "as conditionals and modules such as mod_re{write,direct}" |
135 |
ewarn "and mod_ssi." |
136 |
ebeep 5 |
137 |
fi |
138 |
|
139 |
use php && require_php_with_use cgi |
140 |
|
141 |
enewgroup lighttpd |
142 |
enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd |
143 |
} |
144 |
|
145 |
src_prepare() { |
146 |
# dev-python/docutils installs rst2html.py not rst2html |
147 |
sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.am || \ |
148 |
die "sed doc/Makefile.am failed" |
149 |
|
150 |
eautoreconf |
151 |
} |
152 |
|
153 |
src_configure() { |
154 |
econf --libdir=/usr/$(get_libdir)/${PN} \ |
155 |
--enable-lfs \ |
156 |
$(use_enable ipv6) \ |
157 |
$(use_with bzip2) \ |
158 |
$(use_with fam) \ |
159 |
$(use_with gdbm) \ |
160 |
$(use_with lua) \ |
161 |
$(use_with ldap) \ |
162 |
$(use_with memcache) \ |
163 |
$(use_with mysql) \ |
164 |
$(use_with pcre) \ |
165 |
$(use_with ssl openssl) \ |
166 |
$(use_with webdav webdav-props) \ |
167 |
$(use_with webdav webdav-locks) \ |
168 |
$(use_with xattr attr) |
169 |
} |
170 |
|
171 |
src_compile() { |
172 |
emake || die "emake failed" |
173 |
|
174 |
if use doc ; then |
175 |
einfo "Building HTML documentation" |
176 |
cd doc |
177 |
emake html || die "failed to build HTML documentation" |
178 |
fi |
179 |
} |
180 |
|
181 |
src_test() { |
182 |
if [[ ${EUID} -eq 0 ]]; then |
183 |
default_src_test |
184 |
else |
185 |
ewarn "test skipped, please re-run as root if you wish to test ${PN}" |
186 |
fi |
187 |
} |
188 |
|
189 |
src_install() { |
190 |
make DESTDIR="${D}" install || die "make install failed" |
191 |
|
192 |
# init script stuff |
193 |
newinitd "${FILESDIR}"/lighttpd.initd lighttpd || die |
194 |
newconfd "${FILESDIR}"/lighttpd.confd lighttpd || die |
195 |
use fam && has_version app-admin/fam && \ |
196 |
sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd |
197 |
|
198 |
# configs |
199 |
insinto /etc/lighttpd |
200 |
doins "${FILESDIR}"/conf/lighttpd.conf |
201 |
doins "${FILESDIR}"/conf/mime-types.conf |
202 |
doins "${FILESDIR}"/conf/mod_cgi.conf |
203 |
doins "${FILESDIR}"/conf/mod_fastcgi.conf |
204 |
# Secure directory for fastcgi sockets |
205 |
keepdir /var/run/lighttpd/ |
206 |
fperms 0750 /var/run/lighttpd/ |
207 |
fowners lighttpd:lighttpd /var/run/lighttpd/ |
208 |
|
209 |
# update lighttpd.conf directives based on conditionals |
210 |
update_config |
211 |
|
212 |
# docs |
213 |
dodoc AUTHORS README NEWS doc/*.sh |
214 |
newdoc doc/lighttpd.conf lighttpd.conf.distrib |
215 |
|
216 |
use doc && dohtml -r doc/* |
217 |
|
218 |
docinto txt |
219 |
dodoc doc/*.txt |
220 |
|
221 |
# logrotate |
222 |
insinto /etc/logrotate.d |
223 |
newins "${FILESDIR}"/lighttpd.logrotate lighttpd || die |
224 |
|
225 |
keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs |
226 |
fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd |
227 |
fperms 0750 /var/l{ib,og}/lighttpd |
228 |
|
229 |
#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi |
230 |
rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* |
231 |
|
232 |
use minimal && remove_non_essential |
233 |
} |
234 |
|
235 |
pkg_postinst () { |
236 |
echo |
237 |
if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then |
238 |
einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi." |
239 |
einfo "spawn-fcgi's init script configuration is now located" |
240 |
einfo "at /etc/conf.d/spawn-fcgi." |
241 |
echo |
242 |
fi |
243 |
|
244 |
if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then |
245 |
ewarn "Gentoo has a customized configuration," |
246 |
ewarn "which is now located in /etc/lighttpd. Please migrate your" |
247 |
ewarn "existing configuration." |
248 |
ebeep 5 |
249 |
fi |
250 |
|
251 |
if use fastcgi; then |
252 |
ewarn "As of lighttpd-1.4.22, spawn-fcgi is provided by the separate" |
253 |
ewarn "www-servers/spawn-fcgi package. Please install it manually, if" |
254 |
ewarn "you use spawn-fcgi." |
255 |
ewarn "It features a new, more featurefull init script - please migrate" |
256 |
ewarn "your configuration!" |
257 |
fi |
258 |
} |