1 |
commit: e81802c8ef5cdee11b1105fef1a5541a04dd1b40 |
2 |
Author: Daniel Campbell <zlg <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 23 03:27:46 2017 +0000 |
4 |
Commit: Daniel Campbell <zlg <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 23 03:28:13 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e81802c8 |
7 |
|
8 |
www-servers/lighttpd: version bump |
9 |
|
10 |
Version 1.4.47 fixes known regressions in 1.4.46, hence 1.4.46's |
11 |
absence. |
12 |
|
13 |
Package-Manager: Portage-2.3.11, Repoman-2.3.3 |
14 |
|
15 |
www-servers/lighttpd/Manifest | 1 + |
16 |
www-servers/lighttpd/lighttpd-1.4.47.ebuild | 216 ++++++++++++++++++++++++++++ |
17 |
2 files changed, 217 insertions(+) |
18 |
|
19 |
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest |
20 |
index 9bb85fd0788..7c5975dd065 100644 |
21 |
--- a/www-servers/lighttpd/Manifest |
22 |
+++ b/www-servers/lighttpd/Manifest |
23 |
@@ -2,3 +2,4 @@ DIST lighttpd-1.4.42.tar.xz 652140 SHA256 b2c9069ed0bade9362c27b469a9b884641786a |
24 |
DIST lighttpd-1.4.43.tar.xz 656248 SHA256 fe0c4a06dd2408a83ee7a2bfedc45e09597f3313cbda82485507573ae8fa948a SHA512 131e1d96276a6b5ca597bae9ff78df20bfc9907e9c832b6fdea8b86d493764a5dce24cfc3bb2e931755af18a26b0e8c6fd21714fca7d6c6a402c85f7fe4a588a WHIRLPOOL 90110b2b06c3579c435cd5a0539371bba8f0b70f7c1ee344ed98b9a55d6dd07c38d11430589b11257385815183bf208aed3c115554c6822056a7cedf5047341c |
25 |
DIST lighttpd-1.4.44.tar.xz 660304 SHA256 adb66ca985651957feb209c91c55ebbf917d23630bfc3a216a2f70043c7b5422 SHA512 b7481482bc130c80f076002b2853e1b0ecb2af5d6c6f5428854ae7a60bda591cf96f23e9f3a24cfb36ada3ba97ebff449e102895f7eb4b0aa50ec275eb44725b WHIRLPOOL 69431f5626ca64a8bd4f4e3ada01a22cfa4516e54a11d3050943696aafcb01d0c62db71259054ca24378b1b21b4c33f0a1521e676bff6b37c7bdf661edad6a99 |
26 |
DIST lighttpd-1.4.45.tar.xz 660432 SHA256 1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760fc43a3f SHA512 d030674a8c55aab12d32ac75f8df2628ba2332a5263c8bd2dd4f39342530080edc6ba2a6fee749c1301d601ab766a265d3c630b04d38bb26bba3cf045935573d WHIRLPOOL 8bf52ab4a33a1ede77185d6bb1a420cc61333bff67cc641625efb5e5c101eeb55ce1a177a5bd273408c857675c7ed91aeccffe5bc2109be145430e32979052c8 |
27 |
+DIST lighttpd-1.4.47.tar.xz 703012 SHA256 e47e64a9cc2b824c45792a6b1a5542945956e77ede3454845f42548495946c1c SHA512 9fac3acc428d9faf69fca2768578dca619f778889e8a3779c429038eec7aff6b3dd497d5437152a070df850861fe2132042fa4418e31c1aab89df23a1c544f99 WHIRLPOOL 2ca894a091130b5c23e4a32a6178371aff050d2de90d18cef6535caa65e87095c91789a83ce5791f168f1951f0dcc10c2e17a506b374d9daad0fc1de1f94c943 |
28 |
|
29 |
diff --git a/www-servers/lighttpd/lighttpd-1.4.47.ebuild b/www-servers/lighttpd/lighttpd-1.4.47.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..69a3db322f6 |
32 |
--- /dev/null |
33 |
+++ b/www-servers/lighttpd/lighttpd-1.4.47.ebuild |
34 |
@@ -0,0 +1,216 @@ |
35 |
+# Copyright 1999-2017 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI="6" |
39 |
+inherit autotools eutils readme.gentoo-r1 user systemd |
40 |
+ |
41 |
+DESCRIPTION="Lightweight high-performance web server" |
42 |
+HOMEPAGE="http://www.lighttpd.net/" |
43 |
+SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz" |
44 |
+ |
45 |
+LICENSE="BSD GPL-2" |
46 |
+SLOT="0" |
47 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
48 |
+IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib" |
49 |
+ |
50 |
+REQUIRED_USE="kerberos? ( ssl !libressl )" |
51 |
+ |
52 |
+CDEPEND=" |
53 |
+ bzip2? ( app-arch/bzip2 ) |
54 |
+ fam? ( virtual/fam ) |
55 |
+ gdbm? ( sys-libs/gdbm ) |
56 |
+ ldap? ( >=net-nds/openldap-2.1.26 ) |
57 |
+ libev? ( >=dev-libs/libev-4.01 ) |
58 |
+ lua? ( >=dev-lang/lua-5.1:= ) |
59 |
+ memcached? ( dev-libs/libmemcache ) |
60 |
+ mysql? ( >=virtual/mysql-4.0 ) |
61 |
+ pcre? ( >=dev-libs/libpcre-3.1 ) |
62 |
+ php? ( dev-lang/php:*[cgi] ) |
63 |
+ rrdtool? ( net-analyzer/rrdtool ) |
64 |
+ ssl? ( |
65 |
+ !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) |
66 |
+ libressl? ( dev-libs/libressl:= ) |
67 |
+ ) |
68 |
+ webdav? ( |
69 |
+ dev-libs/libxml2 |
70 |
+ >=dev-db/sqlite-3 |
71 |
+ sys-fs/e2fsprogs |
72 |
+ ) |
73 |
+ xattr? ( kernel_linux? ( sys-apps/attr ) ) |
74 |
+ zlib? ( >=sys-libs/zlib-1.1 )" |
75 |
+ |
76 |
+DEPEND="${CDEPEND} |
77 |
+ virtual/pkgconfig |
78 |
+ doc? ( dev-python/docutils ) |
79 |
+ test? ( |
80 |
+ virtual/perl-Test-Harness |
81 |
+ dev-libs/fcgi |
82 |
+ )" |
83 |
+ |
84 |
+RDEPEND="${CDEPEND} |
85 |
+ selinux? ( sec-policy/selinux-apache ) |
86 |
+" |
87 |
+ |
88 |
+# update certain parts of lighttpd.conf based on conditionals |
89 |
+update_config() { |
90 |
+ local config="${D}/etc/lighttpd/lighttpd.conf" |
91 |
+ |
92 |
+ # enable php/mod_fastcgi settings |
93 |
+ use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; } |
94 |
+ |
95 |
+ # enable stat() caching |
96 |
+ use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; } |
97 |
+ |
98 |
+ # automatically listen on IPv6 if built with USE=ipv6. Bug #234987 |
99 |
+ use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; } |
100 |
+} |
101 |
+ |
102 |
+# remove non-essential stuff (for USE=minimal) |
103 |
+remove_non_essential() { |
104 |
+ local libdir="${D}/usr/$(get_libdir)/${PN}" |
105 |
+ |
106 |
+ # text docs |
107 |
+ use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt |
108 |
+ |
109 |
+ # non-essential modules |
110 |
+ rm -f \ |
111 |
+ ${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* |
112 |
+ |
113 |
+ # allow users to keep some based on USE flags |
114 |
+ use pcre || rm -f ${libdir}/mod_{ssi,re{direct,write}}.* |
115 |
+ use webdav || rm -f ${libdir}/mod_webdav.* |
116 |
+ use mysql || rm -f ${libdir}/mod_mysql_vhost.* |
117 |
+ use lua || rm -f ${libdir}/mod_{cml,magnet}.* |
118 |
+ use rrdtool || rm -f ${libdir}/mod_rrdtool.* |
119 |
+ use zlib || rm -f ${libdir}/mod_compress.* |
120 |
+} |
121 |
+ |
122 |
+pkg_setup() { |
123 |
+ if ! use pcre ; then |
124 |
+ ewarn "It is highly recommended that you build ${PN}" |
125 |
+ ewarn "with perl regular expressions support via USE=pcre." |
126 |
+ ewarn "Otherwise you lose support for some core options such" |
127 |
+ ewarn "as conditionals and modules such as mod_re{write,direct}" |
128 |
+ ewarn "and mod_ssi." |
129 |
+ fi |
130 |
+ if use mmap; then |
131 |
+ ewarn "You have enabled the mmap option. This option may allow" |
132 |
+ ewarn "local users to trigger SIGBUG crashes. Use this option" |
133 |
+ ewarn "with EXTRA care." |
134 |
+ fi |
135 |
+ enewgroup lighttpd |
136 |
+ enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd |
137 |
+ |
138 |
+ DOC_CONTENTS="IPv6 migration guide:\n |
139 |
+ http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config" |
140 |
+} |
141 |
+ |
142 |
+src_prepare() { |
143 |
+ default |
144 |
+ #dev-python/docutils installs rst2html.py not rst2html |
145 |
+ sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \ |
146 |
+ die "sed doc/Makefile.am failed" |
147 |
+ eautoreconf |
148 |
+} |
149 |
+ |
150 |
+src_configure() { |
151 |
+ econf --libdir=/usr/$(get_libdir)/${PN} \ |
152 |
+ --enable-lfs \ |
153 |
+ $(use_enable ipv6) \ |
154 |
+ $(use_enable mmap) \ |
155 |
+ $(use_with bzip2) \ |
156 |
+ $(use_with fam) \ |
157 |
+ $(use_with gdbm) \ |
158 |
+ $(use_with kerberos krb5) \ |
159 |
+ $(use_with ldap) \ |
160 |
+ $(use_with libev) \ |
161 |
+ $(use_with lua) \ |
162 |
+ $(use_with memcached) \ |
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 |
+ $(use_with zlib) |
170 |
+} |
171 |
+ |
172 |
+src_compile() { |
173 |
+ emake |
174 |
+ |
175 |
+ if use doc ; then |
176 |
+ einfo "Building HTML documentation" |
177 |
+ cd doc || die |
178 |
+ emake html |
179 |
+ fi |
180 |
+} |
181 |
+ |
182 |
+src_test() { |
183 |
+ if [[ ${EUID} -eq 0 ]]; then |
184 |
+ default_src_test |
185 |
+ else |
186 |
+ ewarn "test skipped, please re-run as root if you wish to test ${PN}" |
187 |
+ fi |
188 |
+} |
189 |
+ |
190 |
+src_install() { |
191 |
+ emake DESTDIR="${D}" install |
192 |
+ |
193 |
+ # init script stuff |
194 |
+ newinitd "${FILESDIR}"/lighttpd.initd lighttpd |
195 |
+ newconfd "${FILESDIR}"/lighttpd.confd lighttpd |
196 |
+ use fam && has_version app-admin/fam && \ |
197 |
+ { sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; } |
198 |
+ |
199 |
+ # configs |
200 |
+ insinto /etc/lighttpd |
201 |
+ doins "${FILESDIR}"/conf/lighttpd.conf |
202 |
+ doins "${FILESDIR}"/conf/mime-types.conf |
203 |
+ doins "${FILESDIR}"/conf/mod_cgi.conf |
204 |
+ doins "${FILESDIR}"/conf/mod_fastcgi.conf |
205 |
+ |
206 |
+ # update lighttpd.conf directives based on conditionals |
207 |
+ update_config |
208 |
+ |
209 |
+ # docs |
210 |
+ dodoc AUTHORS README NEWS doc/scripts/*.sh |
211 |
+ newdoc doc/config//lighttpd.conf lighttpd.conf.distrib |
212 |
+ use ipv6 && readme.gentoo_create_doc |
213 |
+ |
214 |
+ use doc && dohtml -r doc/* |
215 |
+ |
216 |
+ docinto txt |
217 |
+ dodoc doc/outdated/*.txt |
218 |
+ |
219 |
+ # logrotate |
220 |
+ insinto /etc/logrotate.d |
221 |
+ newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd |
222 |
+ |
223 |
+ keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs |
224 |
+ fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd |
225 |
+ fperms 0750 /var/l{ib,og}/lighttpd |
226 |
+ |
227 |
+ #spawn-fcgi may optionally be installed via www-servers/spawn-fcgi |
228 |
+ rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* |
229 |
+ |
230 |
+ use minimal && remove_non_essential |
231 |
+ |
232 |
+ systemd_dounit "${FILESDIR}/${PN}.service" |
233 |
+ systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf" |
234 |
+} |
235 |
+ |
236 |
+pkg_postinst () { |
237 |
+ use ipv6 && readme.gentoo_print_elog |
238 |
+ |
239 |
+ if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then |
240 |
+ einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi." |
241 |
+ einfo "spawn-fcgi's init script configuration is now located" |
242 |
+ einfo "at /etc/conf.d/spawn-fcgi." |
243 |
+ fi |
244 |
+ |
245 |
+ if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then |
246 |
+ elog "Gentoo has a customized configuration," |
247 |
+ elog "which is now located in /etc/lighttpd. Please migrate your" |
248 |
+ elog "existing configuration." |
249 |
+ fi |
250 |
+} |