Gentoo Archives: gentoo-commits

From: "Peter Weller (welp)" <welp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-servers/lighttpd: ChangeLog lighttpd-1.4.18.ebuild
Date: Sun, 09 Sep 2007 22:26:25
Message-Id: E1IUV7p-0003Ti-My@stork.gentoo.org
1 welp 07/09/09 22:19:29
2
3 Modified: ChangeLog
4 Added: lighttpd-1.4.18.ebuild
5 Log:
6 Security bump wrt bug 191912 - straight to stable on amd64 and x86 by request of angelos and jokey, respectively
7 (Portage version: 2.1.3_rc8)
8
9 Revision Changes Path
10 1.143 www-servers/lighttpd/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/ChangeLog?rev=1.143&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/ChangeLog?rev=1.143&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/ChangeLog?r1=1.142&r2=1.143
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v
19 retrieving revision 1.142
20 retrieving revision 1.143
21 diff -u -r1.142 -r1.143
22 --- ChangeLog 26 Aug 2007 16:25:26 -0000 1.142
23 +++ ChangeLog 9 Sep 2007 22:19:29 -0000 1.143
24 @@ -1,6 +1,15 @@
25 # ChangeLog for www-servers/lighttpd
26 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.142 2007/08/26 16:25:26 bangert Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.143 2007/09/09 22:19:29 welp Exp $
29 +
30 +*lighttpd-1.4.18 (09 Sep 2007)
31 +
32 + 09 Sep 2007; Peter Weller <welp@g.o>
33 + +files/1.4.18/03_all_lighttpd-1.4.11-errorlog-pipe.diff,
34 + +files/1.4.18/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff,
35 + +lighttpd-1.4.18.ebuild:
36 + Security bump wrt bug 191912 - straight to stable on amd64 and x86 by
37 + request of angelos and jokey, respectively
38
39 26 Aug 2007; Thilo Bangert <bangert@g.o> files/lighttpd.confd:
40 fix note about export SHELL, which is only used by include_shell config option
41
42
43
44 1.1 www-servers/lighttpd/lighttpd-1.4.18.ebuild
45
46 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.18.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.18.ebuild?rev=1.1&content-type=text/plain
48
49 Index: lighttpd-1.4.18.ebuild
50 ===================================================================
51 # Copyright 1999-2007 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.18.ebuild,v 1.1 2007/09/09 22:19:29 welp Exp $
54
55 WANT_AUTOCONF=latest
56 WANT_AUTOMAKE=latest
57 inherit eutils autotools depend.php
58
59 DESCRIPTION="Lightweight high-performance web server"
60 HOMEPAGE="http://www.lighttpd.net/"
61 SRC_URI="http://www.lighttpd.net/download/${P}.tar.bz2"
62
63 LICENSE="BSD"
64 SLOT="0"
65 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd x86 ~x86-fbsd"
66 IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
67
68 RDEPEND=">=sys-libs/zlib-1.1
69 bzip2? ( app-arch/bzip2 )
70 fam? ( virtual/fam )
71 gdbm? ( sys-libs/gdbm )
72 ldap? ( >=net-nds/openldap-2.1.26 )
73 lua? ( >=dev-lang/lua-5.1 )
74 memcache? ( dev-libs/libmemcache )
75 mysql? ( >=virtual/mysql-4.0 )
76 pcre? ( >=dev-libs/libpcre-3.1 )
77 php? ( virtual/httpd-php )
78 rrdtool? ( net-analyzer/rrdtool )
79 ssl? ( >=dev-libs/openssl-0.9.7 )
80 webdav? (
81 dev-libs/libxml2
82 >=dev-db/sqlite-3
83 sys-fs/e2fsprogs
84 )
85 xattr? ( kernel_linux? ( sys-apps/attr ) )"
86
87 DEPEND="${RDEPEND}
88 doc? ( dev-python/docutils )
89 test? (
90 virtual/perl-Test-Harness
91 dev-libs/fcgi
92 )"
93
94 # update certain parts of lighttpd.conf based on conditionals
95 update_config() {
96 local config="/etc/lighttpd/lighttpd.conf"
97
98 # enable php/mod_fastcgi settings
99 use php && \
100 dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
101
102 # enable stat() caching
103 use fam && \
104 dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
105 }
106
107 # remove non-essential stuff (for USE=minimal)
108 remove_non_essential() {
109 local libdir="${D}/usr/$(get_libdir)/${PN}"
110
111 # text docs
112 use doc || rm -fr ${D}/usr/share/doc/${PF}/txt
113
114 # non-essential modules
115 rm -f \
116 ${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
117
118 # allow users to keep some based on USE flags
119 use pcre || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
120 use webdav || rm -f ${libdir}/mod_webdav.*
121 use mysql || rm -f ${libdir}/mod_mysql_vhost.*
122 use lua || rm -f ${libdir}/mod_{cml,magnet}.*
123 use rrdtool || rm -f ${libdir}/mod_rrdtool.*
124
125 if ! use fastcgi ; then
126 rm -f ${libdir}/mod_fastcgi.* ${D}/usr/bin/spawn-fcgi \
127 ${D}/usr/share/man/man1/spawn-fcgi.*
128 fi
129 }
130
131 pkg_setup() {
132 if ! use pcre ; then
133 ewarn "It is highly recommended that you build ${PN}"
134 ewarn "with perl regular expressions support via USE=pcre."
135 ewarn "Otherwise you lose support for some core options such"
136 ewarn "as conditionals and modules such as mod_re{write,direct}"
137 ewarn "and mod_ssi."
138 ebeep 5
139 fi
140
141 use php && require_php_with_use cgi
142
143 enewgroup lighttpd
144 enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
145 }
146
147 src_unpack() {
148 unpack ${A}
149 cd ${S}
150
151 EPATCH_SUFFIX="diff" EPATCH_OPTS="-l" epatch ${FILESDIR}/${PVR} || die "Patching failed!"
152
153 eautoreconf || die
154
155 # dev-python/docutils installs rst2html.py not rst2html
156 sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.in || \
157 die "sed doc/Makefile.in failed"
158
159 # fix typo
160 sed -i -e 's|\(output_content\)_\(type\)|\1\2|' doc/cml.txt || \
161 die "sed doc/cml.txt failed"
162 }
163
164 src_compile() {
165 econf --libdir=/usr/$(get_libdir)/${PN} \
166 --enable-lfs \
167 $(use_enable ipv6) \
168 $(use_with bzip2) \
169 $(use_with fam) \
170 $(use_with gdbm) \
171 $(use_with lua) \
172 $(use_with ldap) \
173 $(use_with memcache) \
174 $(use_with mysql) \
175 $(use_with pcre) \
176 $(use_with ssl openssl) \
177 $(use_with webdav webdav-props) \
178 $(use_with webdav webdav-locks) \
179 $(use_with xattr attr) \
180 || die "econf failed"
181
182 emake || die "emake failed"
183
184 if use doc ; then
185 einfo "Building HTML documentation"
186 cd doc
187 emake html || die "failed to build HTML documentation"
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-1.4.13-r3 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 if use php || use fastcgi ; then
201 newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi || die
202 newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi || die
203 fi
204
205 # configs
206 insinto /etc/lighttpd
207 doins ${FILESDIR}/conf/lighttpd.conf
208 doins ${FILESDIR}/conf/mime-types.conf
209 doins ${FILESDIR}/conf/mod_cgi.conf
210 newins ${FILESDIR}/conf/mod_fastcgi.conf-1.4.13-r2 mod_fastcgi.conf
211 # Secure directory for fastcgi sockets
212 keepdir /var/run/lighttpd/
213 fperms 0750 /var/run/lighttpd/
214 fowners lighttpd:lighttpd /var/run/lighttpd/
215
216 # update lighttpd.conf directives based on conditionals
217 update_config
218
219 # docs
220 dodoc AUTHORS README NEWS ChangeLog doc/*.sh
221 newdoc doc/lighttpd.conf lighttpd.conf.distrib
222
223 use doc && dohtml -r doc/*
224
225 docinto txt
226 dodoc doc/*.txt
227
228 # logrotate
229 insinto /etc/logrotate.d
230 newins ${FILESDIR}/lighttpd.logrotate lighttpd || die
231
232 keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
233 fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
234 fperms 0750 /var/l{ib,og}/lighttpd
235
236 use minimal && remove_non_essential
237 }
238
239 pkg_postinst () {
240 echo
241 if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
242 einfo "spawn-fcgi is now included with lighttpd"
243 einfo "spawn-fcgi's init script configuration is now located"
244 einfo "at /etc/conf.d/spawn-fcgi."
245 echo
246 fi
247
248 if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
249 ewarn "As of lighttpd-1.4.1, Gentoo has a customized configuration,"
250 ewarn "which is now located in /etc/lighttpd. Please migrate your"
251 ewarn "existing configuration."
252 ebeep 5
253 fi
254
255 if use fam ; then
256 einfo "Remember to re-emerge lighttpd should you switch from"
257 einfo "app-admin/famd to app-admin/gamin or vice versa."
258 fi
259 echo
260 }
261
262
263
264 --
265 gentoo-commits@g.o mailing list