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