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