1 |
commit: c38a32ae672f32fc1e8d305d9f8204cc40be75a5 |
2 |
Author: Daniel Campbell <zlg <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 30 13:09:43 2017 +0000 |
4 |
Commit: Daniel Campbell <zlg <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 30 13:10:03 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c38a32ae |
7 |
|
8 |
www-servers/lighttpd: Cleanup old <1.4.42 |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
www-servers/lighttpd/Manifest | 3 - |
13 |
.../lighttpd/files/conf/mod_fastcgi.conf-1.4.13-r2 | 17 - |
14 |
.../files/lighttpd-1.4.29-mod_uploadprogress.patch | 738 --------------------- |
15 |
.../files/lighttpd-1.4.31-automake-1.12.patch | 21 - |
16 |
.../files/lighttpd-1.4.33-fix-ipv6-build.patch | 21 - |
17 |
www-servers/lighttpd/lighttpd-1.4.35-r1.ebuild | 227 ------- |
18 |
www-servers/lighttpd/lighttpd-1.4.35-r2.ebuild | 227 ------- |
19 |
www-servers/lighttpd/lighttpd-1.4.35.ebuild | 227 ------- |
20 |
www-servers/lighttpd/lighttpd-1.4.37-r1.ebuild | 217 ------ |
21 |
www-servers/lighttpd/lighttpd-1.4.37.ebuild | 214 ------ |
22 |
www-servers/lighttpd/lighttpd-1.4.39.ebuild | 217 ------ |
23 |
www-servers/lighttpd/metadata.xml | 3 - |
24 |
12 files changed, 2132 deletions(-) |
25 |
|
26 |
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest |
27 |
index 441b0ff..9bb85fd 100644 |
28 |
--- a/www-servers/lighttpd/Manifest |
29 |
+++ b/www-servers/lighttpd/Manifest |
30 |
@@ -1,6 +1,3 @@ |
31 |
-DIST lighttpd-1.4.35.tar.bz2 665955 SHA256 4a71c1f6d8af41ed894b507720c4c17184dc320590013881d5170ca7f15c5bf7 SHA512 13f8562fb735964fe7ef1b127a15c43907f34be70b6bd2dd4ba61b59275d7c2a8d9a7947ff1a4d7cc5fd7efd309fc66b7de6d954b59424f814ea2eb98fd876b9 WHIRLPOOL edbeb94ae29475be398e9281135fc43f915be68c5836ae3da302f7c94c3af19eeca601cedc9bfe59d552f45c6248a945b2de725613de395087e4e195efe9a62e |
32 |
-DIST lighttpd-1.4.37.tar.xz 574020 SHA256 804e6f60567ca1da2b3927f92b7e9332b93aca9560f282ca135b86b7558979bd SHA512 60870149c78a44ae1cf29bd2ba8737ba18019178f9fd3868523255121d85cdc923c2315b572a2a0fcecc3d6451a501ad030189b78bfc7f25807a05b0300063b3 WHIRLPOOL 08c3d79fa5a65eea999d257a9c8e10ed75d0043a00160f6b69c868c6ef4c1fbf81cf90dd037506e24ecbfd4a9cba15801b4bb0f16af0a400afa885f863ec64ae |
33 |
-DIST lighttpd-1.4.39.tar.xz 579180 SHA256 7eb9a1853c3d6dd5851682b0733a729ba4158d6bdff80974d5ef5f1f6887365b SHA512 69bf56afe2bec381566defdc20961554e405e5e7f77b0067e1a29a04e65167b9283cf08655b8dae1c2b6fdddde31245253b5506a532a83f363dce066811b61b3 WHIRLPOOL 5f0fe57afd11a555d5aac76c6abb8b78e34d7f56b0b2921a318297efde420b4762048045274a51e4e030279cbd6d14ee0a344d2c91c18755a0a9d5f83f4bafb8 |
34 |
DIST lighttpd-1.4.42.tar.xz 652140 SHA256 b2c9069ed0bade9362c27b469a9b884641786aea1c3d686f9fd9f01d15e2a15f SHA512 eb43a53f1fe7a115d0cf60ed8b79a22472a4fef939937401a475bdfd7244e53efa3aae1f66cd709989e77064aadd40004455b167ea3c4efc07ced261c18bd773 WHIRLPOOL 2886d02c477ffe4a36a4d33656c69c34df65b563e6ee81dad7be957ab472197fb91087e1e494b23f4e83a35939f102494140d34737fd280692503e54b3676fe7 |
35 |
DIST lighttpd-1.4.43.tar.xz 656248 SHA256 fe0c4a06dd2408a83ee7a2bfedc45e09597f3313cbda82485507573ae8fa948a SHA512 131e1d96276a6b5ca597bae9ff78df20bfc9907e9c832b6fdea8b86d493764a5dce24cfc3bb2e931755af18a26b0e8c6fd21714fca7d6c6a402c85f7fe4a588a WHIRLPOOL 90110b2b06c3579c435cd5a0539371bba8f0b70f7c1ee344ed98b9a55d6dd07c38d11430589b11257385815183bf208aed3c115554c6822056a7cedf5047341c |
36 |
DIST lighttpd-1.4.44.tar.xz 660304 SHA256 adb66ca985651957feb209c91c55ebbf917d23630bfc3a216a2f70043c7b5422 SHA512 b7481482bc130c80f076002b2853e1b0ecb2af5d6c6f5428854ae7a60bda591cf96f23e9f3a24cfb36ada3ba97ebff449e102895f7eb4b0aa50ec275eb44725b WHIRLPOOL 69431f5626ca64a8bd4f4e3ada01a22cfa4516e54a11d3050943696aafcb01d0c62db71259054ca24378b1b21b4c33f0a1521e676bff6b37c7bdf661edad6a99 |
37 |
|
38 |
diff --git a/www-servers/lighttpd/files/conf/mod_fastcgi.conf-1.4.13-r2 b/www-servers/lighttpd/files/conf/mod_fastcgi.conf-1.4.13-r2 |
39 |
deleted file mode 100644 |
40 |
index fe1c84f..00000000 |
41 |
--- a/www-servers/lighttpd/files/conf/mod_fastcgi.conf-1.4.13-r2 |
42 |
+++ /dev/null |
43 |
@@ -1,17 +0,0 @@ |
44 |
-############################################################################### |
45 |
-# mod_fastcgi.conf |
46 |
-# include'd by lighttpd.conf. |
47 |
-# $Id$ |
48 |
-############################################################################### |
49 |
- |
50 |
-server.modules += ("mod_fastcgi") |
51 |
-fastcgi.server = ( ".php" => |
52 |
- ( "localhost" => |
53 |
- ( |
54 |
- "socket" => "/var/run/lighttpd/lighttpd-fastcgi-php-" + PID + ".socket", |
55 |
- "bin-path" => "/usr/bin/php-cgi" |
56 |
- ) |
57 |
- ) |
58 |
- ) |
59 |
- |
60 |
-# vim: set ft=conf foldmethod=marker et : |
61 |
|
62 |
diff --git a/www-servers/lighttpd/files/lighttpd-1.4.29-mod_uploadprogress.patch b/www-servers/lighttpd/files/lighttpd-1.4.29-mod_uploadprogress.patch |
63 |
deleted file mode 100644 |
64 |
index c99886a..00000000 |
65 |
--- a/www-servers/lighttpd/files/lighttpd-1.4.29-mod_uploadprogress.patch |
66 |
+++ /dev/null |
67 |
@@ -1,738 +0,0 @@ |
68 |
-diff -Nru lighttpd-1.4.22.orig/src/connections.c lighttpd-1.4.22/src/connections.c |
69 |
---- lighttpd-1.4.22.orig/src/connections.c 2009-02-19 14:15:14.000000000 +0100 |
70 |
-+++ lighttpd-1.4.28/src/connections.c 2009-04-22 17:45:20.000000000 +0200 |
71 |
-@@ -1401,11 +1401,15 @@ |
72 |
- if (http_request_parse(srv, con)) { |
73 |
- /* we have to read some data from the POST request */ |
74 |
- |
75 |
-+ plugins_call_handle_request_end(srv, con); |
76 |
-+ |
77 |
- connection_set_state(srv, con, CON_STATE_READ_POST); |
78 |
- |
79 |
- break; |
80 |
- } |
81 |
- |
82 |
-+ plugins_call_handle_request_end(srv, con); |
83 |
-+ |
84 |
- connection_set_state(srv, con, CON_STATE_HANDLE_REQUEST); |
85 |
- |
86 |
- break; |
87 |
-diff -Nru lighttpd-1.4.22.orig/src/Makefile.am lighttpd-1.4.22/src/Makefile.am |
88 |
---- lighttpd-1.4.22.orig/src/Makefile.am 2009-02-19 14:15:14.000000000 +0100 |
89 |
-+++ lighttpd-1.4.28/src/Makefile.am 2009-04-22 17:46:34.000000000 +0200 |
90 |
-@@ -246,6 +246,11 @@ |
91 |
- mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined |
92 |
- mod_accesslog_la_LIBADD = $(common_libadd) |
93 |
- |
94 |
-+lib_LTLIBRARIES += mod_uploadprogress.la |
95 |
-+mod_uploadprogress_la_SOURCES = mod_uploadprogress.c |
96 |
-+mod_uploadprogress_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined |
97 |
-+mod_uploadprogress_la_LIBADD = $(common_libadd) |
98 |
-+ |
99 |
- |
100 |
- hdr = server.h buffer.h network.h log.h keyvalue.h \ |
101 |
- response.h request.h fastcgi.h chunk.h \ |
102 |
-diff -Nru lighttpd-1.4.22.orig/src/plugin.c lighttpd-1.4.22/src/plugin.c |
103 |
---- lighttpd-1.4.22.orig/src/plugin.c 2009-02-19 14:15:14.000000000 +0100 |
104 |
-+++ lighttpd-1.4.28/src/plugin.c 2009-04-22 17:45:20.000000000 +0200 |
105 |
-@@ -34,6 +34,7 @@ |
106 |
- PLUGIN_FUNC_UNSET, |
107 |
- PLUGIN_FUNC_HANDLE_URI_CLEAN, |
108 |
- PLUGIN_FUNC_HANDLE_URI_RAW, |
109 |
-+ PLUGIN_FUNC_HANDLE_REQUEST_END, |
110 |
- PLUGIN_FUNC_HANDLE_REQUEST_DONE, |
111 |
- PLUGIN_FUNC_HANDLE_CONNECTION_CLOSE, |
112 |
- PLUGIN_FUNC_HANDLE_TRIGGER, |
113 |
-@@ -262,6 +263,7 @@ |
114 |
- |
115 |
- PLUGIN_TO_SLOT(PLUGIN_FUNC_HANDLE_URI_CLEAN, handle_uri_clean) |
116 |
- PLUGIN_TO_SLOT(PLUGIN_FUNC_HANDLE_URI_RAW, handle_uri_raw) |
117 |
-+PLUGIN_TO_SLOT(PLUGIN_FUNC_HANDLE_REQUEST_END, handle_request_end) |
118 |
- PLUGIN_TO_SLOT(PLUGIN_FUNC_HANDLE_REQUEST_DONE, handle_request_done) |
119 |
- PLUGIN_TO_SLOT(PLUGIN_FUNC_HANDLE_CONNECTION_CLOSE, handle_connection_close) |
120 |
- PLUGIN_TO_SLOT(PLUGIN_FUNC_HANDLE_SUBREQUEST, handle_subrequest) |
121 |
-@@ -389,6 +391,7 @@ |
122 |
- |
123 |
- PLUGIN_TO_SLOT(PLUGIN_FUNC_HANDLE_URI_CLEAN, handle_uri_clean); |
124 |
- PLUGIN_TO_SLOT(PLUGIN_FUNC_HANDLE_URI_RAW, handle_uri_raw); |
125 |
-+ PLUGIN_TO_SLOT(PLUGIN_FUNC_HANDLE_REQUEST_END, handle_request_end); |
126 |
- PLUGIN_TO_SLOT(PLUGIN_FUNC_HANDLE_REQUEST_DONE, handle_request_done); |
127 |
- PLUGIN_TO_SLOT(PLUGIN_FUNC_HANDLE_CONNECTION_CLOSE, handle_connection_close); |
128 |
- PLUGIN_TO_SLOT(PLUGIN_FUNC_HANDLE_TRIGGER, handle_trigger); |
129 |
-diff -Nru lighttpd-1.4.22.orig/src/plugin.h lighttpd-1.4.22/src/plugin.h |
130 |
---- lighttpd-1.4.22.orig/src/plugin.h 2009-02-19 14:15:14.000000000 +0100 |
131 |
-+++ lighttpd-1.4.28/src/plugin.h 2009-04-22 17:45:20.000000000 +0200 |
132 |
-@@ -42,12 +42,12 @@ |
133 |
- handler_t (* handle_uri_clean) (server *srv, connection *con, void *p_d); /* after uri is set */ |
134 |
- handler_t (* handle_docroot) (server *srv, connection *con, void *p_d); /* getting the document-root */ |
135 |
- handler_t (* handle_physical) (server *srv, connection *con, void *p_d); /* mapping url to physical path */ |
136 |
-+ handler_t (* handle_request_end) (server *srv, connection *con, void *p_d); /* a handler for the request content */ |
137 |
- handler_t (* handle_request_done) (server *srv, connection *con, void *p_d); /* at the end of a request */ |
138 |
- handler_t (* handle_connection_close)(server *srv, connection *con, void *p_d); /* at the end of a connection */ |
139 |
- handler_t (* handle_joblist) (server *srv, connection *con, void *p_d); /* after all events are handled */ |
140 |
- |
141 |
- |
142 |
-- |
143 |
- handler_t (* handle_subrequest_start)(server *srv, connection *con, void *p_d); |
144 |
- |
145 |
- /* when a handler for the request |
146 |
-@@ -68,6 +68,7 @@ |
147 |
- handler_t plugins_call_handle_uri_clean(server *srv, connection *con); |
148 |
- handler_t plugins_call_handle_subrequest_start(server *srv, connection *con); |
149 |
- handler_t plugins_call_handle_subrequest(server *srv, connection *con); |
150 |
-+handler_t plugins_call_handle_request_end(server *srv, connection *con); |
151 |
- handler_t plugins_call_handle_request_done(server *srv, connection *con); |
152 |
- handler_t plugins_call_handle_docroot(server *srv, connection *con); |
153 |
- handler_t plugins_call_handle_physical(server *srv, connection *con); |
154 |
-diff -Nru lighttpd-1.4.22.orig/src/mod_uploadprogress.c lighttpd-1.4.22/src/mod_uploadprogress.c |
155 |
---- lighttpd-1.4.22.orig/src/mod_uploadprogress.c 1970-01-01 01:00:00.000000000 +0100 |
156 |
-+++ lighttpd-1.4.28/src/mod_uploadprogress.c 2009-04-22 17:32:38.000000000 +0200 |
157 |
-@@ -0,0 +1,648 @@ |
158 |
-+#include <ctype.h> |
159 |
-+#include <stdlib.h> |
160 |
-+#include <string.h> |
161 |
-+ |
162 |
-+#include "base.h" |
163 |
-+#include "log.h" |
164 |
-+#include "buffer.h" |
165 |
-+ |
166 |
-+#include "plugin.h" |
167 |
-+ |
168 |
-+#include "response.h" |
169 |
-+#include "stat_cache.h" |
170 |
-+ |
171 |
-+#define CONFIG_UPLOAD_PROGRESS_URL "upload-progress.progress-url" |
172 |
-+#define CONFIG_UPLOAD_PROGRESS_TIMEOUT "upload-progress.remove-timeout" |
173 |
-+#define CONFIG_UPLOAD_PROGRESS_DEBUG "upload-progress.debug" |
174 |
-+ |
175 |
-+#define SAFE_BUF_STR(x) x && x->ptr ? x->ptr : "(null)" |
176 |
-+ |
177 |
-+/** |
178 |
-+ * uploadprogress for lighttpd |
179 |
-+ * |
180 |
-+ * Initial: Jan Kneschke <jan@××××××××.de> |
181 |
-+ * Timeout+Status addon: Bjoern Kalkbrenner <terminar@×××××××××××.org> [20070112] |
182 |
-+ * |
183 |
-+ * Ported to Lighttpd 1.4.22 by Radek Senfeld <rush@×××××.cz> |
184 |
-+ * |
185 |
-+ * Backport based on revision 2369 |
186 |
-+ * http://redmine.lighttpd.net/projects/lighttpd/repository/changes/trunk/src/mod_uploadprogress.c |
187 |
-+ * |
188 |
-+ * the timeout is used to keep in the status information intact even if the parent |
189 |
-+ * connection is gone already |
190 |
-+ * |
191 |
-+ */ |
192 |
-+ |
193 |
-+typedef struct { |
194 |
-+ buffer *tracking_id; |
195 |
-+ connection *con; |
196 |
-+ |
197 |
-+ time_t timeout; |
198 |
-+ int status; |
199 |
-+ off_t size; |
200 |
-+} connection_map_entry; |
201 |
-+ |
202 |
-+typedef struct { |
203 |
-+ connection_map_entry **ptr; |
204 |
-+ |
205 |
-+ size_t used; |
206 |
-+ size_t size; |
207 |
-+} connection_map; |
208 |
-+ |
209 |
-+/* plugin config for all request/connections */ |
210 |
-+ |
211 |
-+typedef struct { |
212 |
-+ buffer *progress_url; |
213 |
-+ unsigned short debug; |
214 |
-+ unsigned short remove_timeout; |
215 |
-+} plugin_config; |
216 |
-+ |
217 |
-+typedef struct { |
218 |
-+ PLUGIN_DATA; |
219 |
-+ |
220 |
-+ connection_map *con_map; |
221 |
-+ |
222 |
-+ buffer *tmp_buf; /** used as temporary buffer for extracting the tracking id */ |
223 |
-+ |
224 |
-+ plugin_config **config_storage; |
225 |
-+ |
226 |
-+ plugin_config conf; |
227 |
-+} plugin_data; |
228 |
-+ |
229 |
-+/** |
230 |
-+ * |
231 |
-+ * connection maps |
232 |
-+ * |
233 |
-+ */ |
234 |
-+ |
235 |
-+/* init the plugin data */ |
236 |
-+static connection_map *connection_map_init() { |
237 |
-+ connection_map *cm; |
238 |
-+ |
239 |
-+ cm = calloc(1, sizeof(*cm)); |
240 |
-+ |
241 |
-+ return cm; |
242 |
-+} |
243 |
-+ |
244 |
-+static void connection_map_free(connection_map *cm) { |
245 |
-+ size_t i; |
246 |
-+ for (i = 0; i < cm->size; i++) { |
247 |
-+ connection_map_entry *cme = cm->ptr[i]; |
248 |
-+ |
249 |
-+ if (!cme) break; |
250 |
-+ |
251 |
-+ if (cme->tracking_id) { |
252 |
-+ buffer_free(cme->tracking_id); |
253 |
-+ } |
254 |
-+ free(cme); |
255 |
-+ } |
256 |
-+ |
257 |
-+ free(cm); |
258 |
-+} |
259 |
-+ |
260 |
-+static connection_map_entry *connection_map_insert(connection_map *cm, buffer *tracking_id, connection *con) { |
261 |
-+ connection_map_entry *cme; |
262 |
-+ size_t i; |
263 |
-+ |
264 |
-+ if (cm->size == 0) { |
265 |
-+ cm->size = 16; |
266 |
-+ cm->ptr = malloc(cm->size * sizeof(*(cm->ptr))); |
267 |
-+ for (i = 0; i < cm->size; i++) { |
268 |
-+ cm->ptr[i] = NULL; |
269 |
-+ } |
270 |
-+ } else if (cm->used == cm->size) { |
271 |
-+ cm->size += 16; |
272 |
-+ cm->ptr = realloc(cm->ptr, cm->size * sizeof(*(cm->ptr))); |
273 |
-+ for (i = cm->used; i < cm->size; i++) { |
274 |
-+ cm->ptr[i] = NULL; |
275 |
-+ } |
276 |
-+ } |
277 |
-+ |
278 |
-+ if (cm->ptr[cm->used]) { |
279 |
-+ /* is already alloced, just reuse it */ |
280 |
-+ cme = cm->ptr[cm->used]; |
281 |
-+ } else { |
282 |
-+ cme = malloc(sizeof(*cme)); |
283 |
-+ cme->tracking_id = buffer_init(); |
284 |
-+ } |
285 |
-+ cme->timeout = 0; |
286 |
-+ cme->status = 0; |
287 |
-+ buffer_copy_string_buffer(cme->tracking_id, tracking_id); |
288 |
-+ cme->con = con; |
289 |
-+ |
290 |
-+ cm->ptr[cm->used++] = cme; |
291 |
-+ |
292 |
-+ return cme; |
293 |
-+} |
294 |
-+ |
295 |
-+static connection_map_entry *connection_map_get_connection_entry(connection_map *cm, buffer *tracking_id) { |
296 |
-+ size_t i; |
297 |
-+ |
298 |
-+ for (i = 0; i < cm->used; i++) { |
299 |
-+ connection_map_entry *cme = cm->ptr[i]; |
300 |
-+ |
301 |
-+ if (buffer_is_equal(cme->tracking_id, tracking_id)) { |
302 |
-+ /* found connection */ |
303 |
-+ return cme; |
304 |
-+ } |
305 |
-+ } |
306 |
-+ return NULL; |
307 |
-+} |
308 |
-+ |
309 |
-+static void connection_map_remove_connection(connection_map *cm, size_t i) { |
310 |
-+ connection_map_entry *cme = cm->ptr[i]; |
311 |
-+ |
312 |
-+ buffer_reset(cme->tracking_id); |
313 |
-+ cme->timeout=0; |
314 |
-+ cme->status=0; |
315 |
-+ |
316 |
-+ cm->used--; |
317 |
-+ |
318 |
-+ /* swap positions with the last entry */ |
319 |
-+ if (cm->used) { |
320 |
-+ cm->ptr[i] = cm->ptr[cm->used]; |
321 |
-+ cm->ptr[cm->used] = cme; |
322 |
-+ } |
323 |
-+} |
324 |
-+ |
325 |
-+/** |
326 |
-+ * remove dead tracking IDs |
327 |
-+ * |
328 |
-+ * uploadprogress.remove-timeout sets a grace-period in which the |
329 |
-+ * connection status is still known even of the connection is already |
330 |
-+ * being removed |
331 |
-+ * |
332 |
-+ */ |
333 |
-+static void connection_map_clear_timeout_connections(connection_map *cm) { |
334 |
-+ size_t i; |
335 |
-+ time_t now_t = time(NULL); |
336 |
-+ |
337 |
-+ for (i = 0; i < cm->used; i++) { |
338 |
-+ connection_map_entry *cme = cm->ptr[i]; |
339 |
-+ |
340 |
-+ if (cme->timeout != 0 && cme->timeout < now_t) { |
341 |
-+ /* found connection */ |
342 |
-+ connection_map_remove_connection(cm, i); |
343 |
-+ } |
344 |
-+ } |
345 |
-+} |
346 |
-+ |
347 |
-+/** |
348 |
-+ * extract the tracking-id from the parameters |
349 |
-+ * |
350 |
-+ * for POST requests it is part of the request headers |
351 |
-+ * for GET requests ... too |
352 |
-+ */ |
353 |
-+static buffer *get_tracking_id(plugin_data *p, server *srv, connection *con) { |
354 |
-+ data_string *ds; |
355 |
-+ buffer *b = NULL; |
356 |
-+ char *qstr=NULL; |
357 |
-+ size_t i; |
358 |
-+ |
359 |
-+ /* the request has to contain a 32byte ID */ |
360 |
-+ if (NULL == (ds = (data_string *)array_get_element(con->request.headers, "X-Progress-ID"))) { |
361 |
-+ char *amp = NULL; |
362 |
-+ |
363 |
-+ /* perhaps the POST request is using the querystring to pass the X-Progress-ID */ |
364 |
-+ if (buffer_is_empty(con->uri.query)) { |
365 |
-+ /* |
366 |
-+ * con->uri.query will not be parsed out if a 413 error happens |
367 |
-+ */ |
368 |
-+ if (NULL != (qstr = strchr(con->request.uri->ptr, '?'))) { |
369 |
-+ /** extract query string from request.uri */ |
370 |
-+ buffer_copy_string(con->uri.query, qstr + 1); |
371 |
-+ } else { |
372 |
-+ return NULL; |
373 |
-+ } |
374 |
-+ } |
375 |
-+ |
376 |
-+ /** split the query-string and extract the X-Progress-ID */ |
377 |
-+ do { |
378 |
-+ char *eq = NULL; |
379 |
-+ char *start = amp ? amp + 1 : con->uri.query->ptr; |
380 |
-+ |
381 |
-+ amp = strchr(start, '&'); |
382 |
-+ |
383 |
-+ /* check the string between start and amp for = */ |
384 |
-+ |
385 |
-+ if (amp) { |
386 |
-+ buffer_copy_string_len(p->tmp_buf, start, amp - start); |
387 |
-+ } else { |
388 |
-+ buffer_copy_string(p->tmp_buf, start); |
389 |
-+ } |
390 |
-+ |
391 |
-+ eq = strchr(p->tmp_buf->ptr, '='); |
392 |
-+ |
393 |
-+ if (eq) { |
394 |
-+ *eq = '\0'; |
395 |
-+ |
396 |
-+ if (0 == strcmp(p->tmp_buf->ptr, "X-Progress-ID")) { |
397 |
-+ size_t key_len = sizeof("X-Progress-ID") - 1; |
398 |
-+ size_t var_len = p->tmp_buf->used - 1; |
399 |
-+ /* found */ |
400 |
-+ |
401 |
-+ buffer_copy_string_len(p->tmp_buf, start + key_len + 1, var_len - key_len - 1); |
402 |
-+ |
403 |
-+ b = p->tmp_buf; |
404 |
-+ |
405 |
-+ break; |
406 |
-+ } |
407 |
-+ } |
408 |
-+ } while (amp); |
409 |
-+ |
410 |
-+ if (!b) return NULL; |
411 |
-+ } else { |
412 |
-+ /* request header was found, use it */ |
413 |
-+ b = ds->value; |
414 |
-+ } |
415 |
-+ |
416 |
-+ if (b->used != 32 + 1) { |
417 |
-+ if (p->conf.debug) log_error_write(srv, __FILE__, __LINE__, "sds", "the Progress-ID has to be 32 characters long, got", b->used - 1, "characters"); |
418 |
-+ return NULL; |
419 |
-+ } |
420 |
-+ |
421 |
-+ for (i = 0; i < b->used - 1; i++) { |
422 |
-+ char c = b->ptr[i]; |
423 |
-+ |
424 |
-+ if (!light_isxdigit(c)) { |
425 |
-+ if (p->conf.debug) log_error_write(srv, __FILE__, __LINE__, "sds", "only hex-digits are allowed (0-9 + a-f): (ascii:", c, ")"); |
426 |
-+ return NULL; |
427 |
-+ } |
428 |
-+ } |
429 |
-+ |
430 |
-+ return b; |
431 |
-+} |
432 |
-+ |
433 |
-+/* init the plugin data */ |
434 |
-+INIT_FUNC(mod_uploadprogress_init) { |
435 |
-+ plugin_data *p; |
436 |
-+ |
437 |
-+ p = calloc(1, sizeof(*p)); |
438 |
-+ |
439 |
-+ p->con_map = connection_map_init(); |
440 |
-+ p->tmp_buf = buffer_init(); |
441 |
-+ |
442 |
-+ return p; |
443 |
-+} |
444 |
-+ |
445 |
-+/* detroy the plugin data */ |
446 |
-+FREE_FUNC(mod_uploadprogress_free) { |
447 |
-+ plugin_data *p = p_d; |
448 |
-+ |
449 |
-+ UNUSED(srv); |
450 |
-+ |
451 |
-+ if (!p) return HANDLER_GO_ON; |
452 |
-+ |
453 |
-+ if (p->config_storage) { |
454 |
-+ size_t i; |
455 |
-+ for (i = 0; i < srv->config_context->used; i++) { |
456 |
-+ plugin_config *s = p->config_storage[i]; |
457 |
-+ |
458 |
-+ buffer_free(s->progress_url); |
459 |
-+ s->remove_timeout=0; |
460 |
-+ |
461 |
-+ free(s); |
462 |
-+ } |
463 |
-+ free(p->config_storage); |
464 |
-+ } |
465 |
-+ |
466 |
-+ connection_map_free(p->con_map); |
467 |
-+ buffer_free(p->tmp_buf); |
468 |
-+ |
469 |
-+ free(p); |
470 |
-+ |
471 |
-+ return HANDLER_GO_ON; |
472 |
-+} |
473 |
-+ |
474 |
-+/* handle plugin config and check values */ |
475 |
-+ |
476 |
-+SETDEFAULTS_FUNC(mod_uploadprogress_set_defaults) { |
477 |
-+ plugin_data *p = p_d; |
478 |
-+ size_t i = 0; |
479 |
-+ |
480 |
-+ config_values_t cv[] = { |
481 |
-+ { CONFIG_UPLOAD_PROGRESS_URL, NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 0 */ |
482 |
-+ { CONFIG_UPLOAD_PROGRESS_TIMEOUT, NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 1 */ |
483 |
-+ { CONFIG_UPLOAD_PROGRESS_DEBUG, NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 2 */ |
484 |
-+ { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET } |
485 |
-+ }; |
486 |
-+ |
487 |
-+ if (!p) return HANDLER_ERROR; |
488 |
-+ |
489 |
-+ p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); |
490 |
-+ |
491 |
-+ for (i = 0; i < srv->config_context->used; i++) { |
492 |
-+ plugin_config *s; |
493 |
-+ |
494 |
-+ s = calloc(1, sizeof(plugin_config)); |
495 |
-+ s->progress_url = buffer_init(); |
496 |
-+ s->remove_timeout = 60; |
497 |
-+ s->debug = 0; |
498 |
-+ |
499 |
-+ cv[0].destination = s->progress_url; |
500 |
-+ cv[1].destination = &(s->remove_timeout); |
501 |
-+ cv[2].destination = &(s->debug); |
502 |
-+ |
503 |
-+ p->config_storage[i] = s; |
504 |
-+ |
505 |
-+ if (0 != config_insert_values_global(srv, ((data_config *)srv->config_context->data[i])->value, cv)) { |
506 |
-+ return HANDLER_ERROR; |
507 |
-+ } |
508 |
-+ } |
509 |
-+ |
510 |
-+ return HANDLER_GO_ON; |
511 |
-+} |
512 |
-+ |
513 |
-+#define PATCH_OPTION(x) \ |
514 |
-+ p->conf.x = s->x; |
515 |
-+static int mod_uploadprogress_patch_connection(server *srv, connection *con, plugin_data *p) { |
516 |
-+ size_t i, j; |
517 |
-+ plugin_config *s = p->config_storage[0]; |
518 |
-+ |
519 |
-+ PATCH_OPTION(progress_url); |
520 |
-+ PATCH_OPTION(remove_timeout); |
521 |
-+ PATCH_OPTION(debug); |
522 |
-+ |
523 |
-+ /* skip the first, the global context */ |
524 |
-+ for (i = 1; i < srv->config_context->used; i++) { |
525 |
-+ data_config *dc = (data_config *)srv->config_context->data[i]; |
526 |
-+ s = p->config_storage[i]; |
527 |
-+ |
528 |
-+ /* condition didn't match */ |
529 |
-+ if (!config_check_cond(srv, con, dc)) continue; |
530 |
-+ |
531 |
-+ /* merge config */ |
532 |
-+ for (j = 0; j < dc->value->used; j++) { |
533 |
-+ data_unset *du = dc->value->data[j]; |
534 |
-+ |
535 |
-+ if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_UPLOAD_PROGRESS_URL))) { |
536 |
-+ PATCH_OPTION(progress_url); |
537 |
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_UPLOAD_PROGRESS_TIMEOUT))) { |
538 |
-+ PATCH_OPTION(remove_timeout); |
539 |
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_UPLOAD_PROGRESS_DEBUG))) { |
540 |
-+ PATCH_OPTION(debug); |
541 |
-+ } |
542 |
-+ } |
543 |
-+ } |
544 |
-+ |
545 |
-+ return 0; |
546 |
-+} |
547 |
-+ |
548 |
-+/** |
549 |
-+ * |
550 |
-+ * the idea: |
551 |
-+ * |
552 |
-+ * for the first request we check if it is a post-request |
553 |
-+ * |
554 |
-+ * if no, move out, don't care about them |
555 |
-+ * |
556 |
-+ * if yes, take the connection structure and register it locally |
557 |
-+ * in the progress-struct together with an session-id (md5 ... ) |
558 |
-+ * |
559 |
-+ * if the connections closes, cleanup the entry in the progress-struct |
560 |
-+ * |
561 |
-+ * a second request can now get the info about the size of the upload, |
562 |
-+ * the received bytes |
563 |
-+ * |
564 |
-+ */ |
565 |
-+ |
566 |
-+URIHANDLER_FUNC(mod_uploadprogress_uri_handler) { |
567 |
-+ plugin_data *p = p_d; |
568 |
-+ buffer *tracking_id; |
569 |
-+ buffer *b; |
570 |
-+ connection_map_entry *post_con_entry = NULL; |
571 |
-+ connection_map_entry *map_con_entry = NULL; |
572 |
-+ |
573 |
-+ if (buffer_is_empty(con->uri.path)) return HANDLER_GO_ON; |
574 |
-+ |
575 |
-+ /* no progress URL set, ignore request */ |
576 |
-+ if (buffer_is_empty(p->conf.progress_url)) return HANDLER_GO_ON; |
577 |
-+ |
578 |
-+ switch(con->request.http_method) { |
579 |
-+ case HTTP_METHOD_POST: |
580 |
-+ /** |
581 |
-+ * a POST request is the UPLOAD itself |
582 |
-+ * |
583 |
-+ * get the unique tracker id |
584 |
-+ */ |
585 |
-+ if (NULL == (tracking_id = get_tracking_id(p, srv, con))) { |
586 |
-+ return HANDLER_GO_ON; |
587 |
-+ } |
588 |
-+ |
589 |
-+ if (NULL == (map_con_entry = connection_map_get_connection_entry(p->con_map, tracking_id))) { |
590 |
-+ connection_map_insert(p->con_map, tracking_id, con); |
591 |
-+ |
592 |
-+ if (p->conf.debug) log_error_write(srv, __FILE__, __LINE__, "ss", "POST: connection is new, registered:", SAFE_BUF_STR(tracking_id)); |
593 |
-+ } else { |
594 |
-+ map_con_entry->timeout = 0; |
595 |
-+ map_con_entry->status = 0; |
596 |
-+ |
597 |
-+ if (p->conf.debug) log_error_write(srv, __FILE__, __LINE__, "ss", "POST: connection is known, id:", SAFE_BUF_STR(tracking_id)); |
598 |
-+ } |
599 |
-+ |
600 |
-+ return HANDLER_GO_ON; |
601 |
-+ case HTTP_METHOD_GET: |
602 |
-+ /** |
603 |
-+ * the status request for the current connection |
604 |
-+ */ |
605 |
-+ if (p->conf.debug) log_error_write(srv, __FILE__, __LINE__, "ssss", "(uploadprogress) urls", SAFE_BUF_STR(con->uri.path), "==", SAFE_BUF_STR(p->conf.progress_url)); |
606 |
-+ |
607 |
-+ if (!buffer_is_equal(con->uri.path, p->conf.progress_url)) { |
608 |
-+ return HANDLER_GO_ON; |
609 |
-+ } |
610 |
-+ |
611 |
-+ /* get the tracker id */ |
612 |
-+ if (NULL == (tracking_id = get_tracking_id(p, srv, con))) { |
613 |
-+ return HANDLER_GO_ON; |
614 |
-+ } |
615 |
-+ |
616 |
-+ buffer_reset(con->physical.path); |
617 |
-+ |
618 |
-+ con->file_started = 1; |
619 |
-+ con->http_status = 200; |
620 |
-+ con->file_finished = 1; |
621 |
-+ |
622 |
-+ /* send JSON content */ |
623 |
-+ |
624 |
-+ response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_STR_LEN("text/javascript")); |
625 |
-+ |
626 |
-+ /* just an attempt the force the IE/proxies to NOT cache the request */ |
627 |
-+ response_header_overwrite(srv, con, CONST_STR_LEN("Pragma"), CONST_STR_LEN("no-cache")); |
628 |
-+ response_header_overwrite(srv, con, CONST_STR_LEN("Expires"), CONST_STR_LEN("Thu, 19 Nov 1981 08:52:00 GMT")); |
629 |
-+ response_header_overwrite(srv, con, CONST_STR_LEN("Cache-Control"), |
630 |
-+ CONST_STR_LEN("no-store, no-cache, must-revalidate, post-check=0, pre-check=0")); |
631 |
-+ |
632 |
-+ b = chunkqueue_get_append_buffer(con->write_queue); |
633 |
-+ |
634 |
-+ /* get the connection */ |
635 |
-+ if (NULL == (post_con_entry = connection_map_get_connection_entry(p->con_map, tracking_id))) { |
636 |
-+ /** |
637 |
-+ * looks like we don't know the tracking id yet, GET and POST out of sync ? */ |
638 |
-+ buffer_append_string_len(b, CONST_STR_LEN("{ \"state\" : \"unknown\" }\r\n")); |
639 |
-+ con->response.content_length += b->used - 1; |
640 |
-+ |
641 |
-+ if (p->conf.debug) log_error_write(srv, __FILE__, __LINE__, "ssss", "connection unknown:", SAFE_BUF_STR(tracking_id), ", sending:", SAFE_BUF_STR(b)); |
642 |
-+ |
643 |
-+ return HANDLER_FINISHED; |
644 |
-+ } |
645 |
-+ |
646 |
-+ buffer_copy_string_len(b, CONST_STR_LEN("{ \"state\" : ")); |
647 |
-+ |
648 |
-+ if (post_con_entry->status == 413) { |
649 |
-+ /* the upload was too large */ |
650 |
-+ buffer_append_string_len(b, CONST_STR_LEN("\"error\", \"status\" : 413")); |
651 |
-+ } else if (post_con_entry->con == NULL) { |
652 |
-+ /* the connection is already gone */ |
653 |
-+ buffer_append_string_len(b, CONST_STR_LEN("\"done\", \"size\" : ")); |
654 |
-+ buffer_append_off_t(b, post_con_entry->size); |
655 |
-+ } else { |
656 |
-+ /* the upload is already done, but the connection might be still open */ |
657 |
-+ buffer_append_string(b, post_con_entry->con->state == CON_STATE_READ_POST ? "\"uploading\"" : "\"done\""); |
658 |
-+ buffer_append_string_len(b, CONST_STR_LEN(", \"received\" : ")); |
659 |
-+ buffer_append_off_t(b, post_con_entry->con->bytes_read); |
660 |
-+ buffer_append_string_len(b, CONST_STR_LEN(", \"size\" : ")); |
661 |
-+ buffer_append_off_t(b, post_con_entry->con->request.content_length); |
662 |
-+ } |
663 |
-+ buffer_append_string_len(b, CONST_STR_LEN("}\r\n")); |
664 |
-+ con->response.content_length += b->used - 1; |
665 |
-+ |
666 |
-+ if (p->conf.debug) log_error_write(srv, __FILE__, __LINE__, "ssss", "connection is known:", SAFE_BUF_STR(tracking_id), ", sending:", SAFE_BUF_STR(b)); |
667 |
-+ |
668 |
-+ return HANDLER_FINISHED; |
669 |
-+ default: |
670 |
-+ break; |
671 |
-+ } |
672 |
-+ |
673 |
-+ return HANDLER_GO_ON; |
674 |
-+} |
675 |
-+ |
676 |
-+/** |
677 |
-+ * check for POST request |
678 |
-+ */ |
679 |
-+CONNECTION_FUNC(mod_uploadprogress_request_end) { |
680 |
-+ plugin_data *p = p_d; |
681 |
-+ |
682 |
-+ buffer *tracking_id; |
683 |
-+ connection_map_entry *map_con_entry = NULL; |
684 |
-+ |
685 |
-+ UNUSED(srv); |
686 |
-+ |
687 |
-+ /* no request URL, ignore request */ |
688 |
-+ if (buffer_is_empty(con->request.uri)) return HANDLER_GO_ON; |
689 |
-+ |
690 |
-+ mod_uploadprogress_patch_connection(srv, con, p); |
691 |
-+ |
692 |
-+ /* |
693 |
-+ * we only want to process the upload (POST request) |
694 |
-+ */ |
695 |
-+ if (con->request.http_method != HTTP_METHOD_POST) { |
696 |
-+ return HANDLER_GO_ON; |
697 |
-+ } |
698 |
-+ |
699 |
-+ if (p->conf.debug) { |
700 |
-+ log_error_write(srv, __FILE__, __LINE__, "sxsdsd", "request_end: con=", (void *) con, ", http_method=", con->request.http_method, ", http_status=", con->http_status); |
701 |
-+ } |
702 |
-+ |
703 |
-+ /* get the tracker id */ |
704 |
-+ if (NULL == (tracking_id = get_tracking_id(p, srv, con))) { |
705 |
-+ return HANDLER_GO_ON; |
706 |
-+ } |
707 |
-+ |
708 |
-+ if (NULL == (map_con_entry = connection_map_get_connection_entry(p->con_map, tracking_id))) { |
709 |
-+ /** |
710 |
-+ * in case the request parser meant the request was too large the URI handler won't |
711 |
-+ * get called. Insert the connection mapping here |
712 |
-+ */ |
713 |
-+ if (NULL == (map_con_entry = connection_map_insert(p->con_map, tracking_id, con))) { |
714 |
-+ return HANDLER_GO_ON; |
715 |
-+ } |
716 |
-+ } |
717 |
-+ |
718 |
-+ /* ok, found our entries, setting status */ |
719 |
-+ map_con_entry->status = con->http_status; |
720 |
-+ |
721 |
-+ return HANDLER_GO_ON; |
722 |
-+} |
723 |
-+ |
724 |
-+/** |
725 |
-+ * remove the parent connection from the connection mapping |
726 |
-+ * when it got closed |
727 |
-+ * |
728 |
-+ * keep the mapping active for a while to send a valid final status |
729 |
-+ */ |
730 |
-+CONNECTION_FUNC(mod_uploadprogress_request_done) { |
731 |
-+ plugin_data *p = p_d; |
732 |
-+ buffer *tracking_id; |
733 |
-+ connection_map_entry *cm = NULL; |
734 |
-+ |
735 |
-+ UNUSED(srv); |
736 |
-+ |
737 |
-+ if (buffer_is_empty(con->request.uri)) return HANDLER_GO_ON; |
738 |
-+ |
739 |
-+ /* |
740 |
-+ * only need to handle the upload request. |
741 |
-+ */ |
742 |
-+ if (con->request.http_method != HTTP_METHOD_POST) { |
743 |
-+ return HANDLER_GO_ON; |
744 |
-+ } |
745 |
-+ |
746 |
-+ if (NULL == (tracking_id = get_tracking_id(p, srv, con))) { |
747 |
-+ return HANDLER_GO_ON; |
748 |
-+ } |
749 |
-+ |
750 |
-+ if (p->conf.debug) { |
751 |
-+ log_error_write(srv, __FILE__, __LINE__, "sssd", "upload is done, moving tracking-id to backlog: tracking-id=", SAFE_BUF_STR(tracking_id), ", http_status=", con->http_status); |
752 |
-+ } |
753 |
-+ |
754 |
-+ /* |
755 |
-+ * set timeout on the upload's connection_map_entry. |
756 |
-+ */ |
757 |
-+ if (NULL == (cm = connection_map_get_connection_entry(p->con_map, tracking_id))) { |
758 |
-+ if (p->conf.debug) { |
759 |
-+ log_error_write(srv, __FILE__, __LINE__, "sss", "tracking ID", SAFE_BUF_STR(tracking_id), "not found, can't set timeout"); |
760 |
-+ } |
761 |
-+ return HANDLER_GO_ON; |
762 |
-+ } |
763 |
-+ |
764 |
-+ /* save request size to be able to report it even when cm->con == NULL */ |
765 |
-+ cm->size = con->request.content_length; |
766 |
-+ |
767 |
-+ cm->timeout = time(NULL) + p->conf.remove_timeout; |
768 |
-+ cm->con = NULL; /* con becomes invalid very soon */ |
769 |
-+ |
770 |
-+ return HANDLER_GO_ON; |
771 |
-+} |
772 |
-+ |
773 |
-+/** |
774 |
-+ * remove dead connections once in while |
775 |
-+ */ |
776 |
-+TRIGGER_FUNC(mod_uploadprogress_trigger) { |
777 |
-+ plugin_data *p = p_d; |
778 |
-+ |
779 |
-+ if ((srv->cur_ts % 10) != 0) return HANDLER_GO_ON; |
780 |
-+ |
781 |
-+ connection_map_clear_timeout_connections(p->con_map); |
782 |
-+ |
783 |
-+ return HANDLER_GO_ON; |
784 |
-+} |
785 |
-+ |
786 |
-+ |
787 |
-+/* this function is called at dlopen() time and inits the callbacks */ |
788 |
-+ |
789 |
-+int mod_uploadprogress_plugin_init(plugin *p) { |
790 |
-+ p->version = LIGHTTPD_VERSION_ID; |
791 |
-+ p->name = buffer_init_string("uploadprogress"); |
792 |
-+ |
793 |
-+ p->init = mod_uploadprogress_init; |
794 |
-+ p->handle_uri_clean = mod_uploadprogress_uri_handler; |
795 |
-+ p->handle_request_end = mod_uploadprogress_request_end; |
796 |
-+ p->handle_request_done = mod_uploadprogress_request_done; |
797 |
-+// p->connection_reset = mod_uploadprogress_request_done; |
798 |
-+ p->set_defaults = mod_uploadprogress_set_defaults; |
799 |
-+ p->cleanup = mod_uploadprogress_free; |
800 |
-+ p->handle_trigger = mod_uploadprogress_trigger; |
801 |
-+ |
802 |
-+ p->data = NULL; |
803 |
-+ |
804 |
-+ return 0; |
805 |
-+} |
806 |
|
807 |
diff --git a/www-servers/lighttpd/files/lighttpd-1.4.31-automake-1.12.patch b/www-servers/lighttpd/files/lighttpd-1.4.31-automake-1.12.patch |
808 |
deleted file mode 100644 |
809 |
index eb3119f..00000000 |
810 |
--- a/www-servers/lighttpd/files/lighttpd-1.4.31-automake-1.12.patch |
811 |
+++ /dev/null |
812 |
@@ -1,21 +0,0 @@ |
813 |
-http://bugs.gentoo.org/420599 |
814 |
- |
815 |
---- configure.ac |
816 |
-+++ configure.ac |
817 |
-@@ -14,6 +14,8 @@ |
818 |
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) |
819 |
- |
820 |
- dnl Checks for programs. |
821 |
-+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) |
822 |
-+ |
823 |
- AC_PROG_CC |
824 |
- AM_PROG_CC_C_O |
825 |
- AC_PROG_LD |
826 |
-@@ -39,7 +41,6 @@ |
827 |
- AC_EXEEXT |
828 |
- |
829 |
- dnl more automake stuff |
830 |
--AM_C_PROTOTYPES |
831 |
- |
832 |
- dnl libtool |
833 |
- AC_DISABLE_STATIC |
834 |
|
835 |
diff --git a/www-servers/lighttpd/files/lighttpd-1.4.33-fix-ipv6-build.patch b/www-servers/lighttpd/files/lighttpd-1.4.33-fix-ipv6-build.patch |
836 |
deleted file mode 100644 |
837 |
index 24acc81..00000000 |
838 |
--- a/www-servers/lighttpd/files/lighttpd-1.4.33-fix-ipv6-build.patch |
839 |
+++ /dev/null |
840 |
@@ -1,21 +0,0 @@ |
841 |
-Gentoo bug: |
842 |
-https://bugs.gentoo.org/show_bug.cgi?id=486426 |
843 |
- |
844 |
-Upstream bug: |
845 |
-http://redmine.lighttpd.net/issues/2515 |
846 |
- |
847 |
-Upstream Commit: |
848 |
-http://redmine.lighttpd.net/projects/lighttpd/repository/revisions/2911 |
849 |
- |
850 |
-Index: src/mod_extforward.c |
851 |
-=================================================================== |
852 |
---- src/mod_extforward.c (revision 2909) |
853 |
-+++ src/mod_extforward.c (working copy) |
854 |
-@@ -439,7 +439,6 @@ |
855 |
- #ifdef HAVE_IPV6 |
856 |
- ipstr_to_sockaddr(srv, real_remote_addr, &sock); |
857 |
- #else |
858 |
-- UNUSED(addrs_left); |
859 |
- sock.ipv4.sin_addr.s_addr = inet_addr(real_remote_addr); |
860 |
- sock.plain.sa_family = (sock.ipv4.sin_addr.s_addr == 0xFFFFFFFF) ? AF_UNSPEC : AF_INET; |
861 |
- #endif |
862 |
|
863 |
diff --git a/www-servers/lighttpd/lighttpd-1.4.35-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.35-r1.ebuild |
864 |
deleted file mode 100644 |
865 |
index 94815a8..00000000 |
866 |
--- a/www-servers/lighttpd/lighttpd-1.4.35-r1.ebuild |
867 |
+++ /dev/null |
868 |
@@ -1,227 +0,0 @@ |
869 |
-# Copyright 1999-2016 Gentoo Foundation |
870 |
-# Distributed under the terms of the GNU General Public License v2 |
871 |
-# $Id$ |
872 |
- |
873 |
-EAPI="5" |
874 |
-inherit base autotools eutils readme.gentoo user systemd |
875 |
- |
876 |
-DESCRIPTION="Lightweight high-performance web server" |
877 |
-HOMEPAGE="http://www.lighttpd.net/" |
878 |
-SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.bz2" |
879 |
- |
880 |
-LICENSE="BSD GPL-2" |
881 |
-SLOT="0" |
882 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd" |
883 |
-IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev lua minimal mmap memcache mysql pcre php rrdtool selinux ssl test uploadprogress webdav xattr zlib" |
884 |
- |
885 |
-REQUIRED_USE="kerberos? ( ssl )" |
886 |
- |
887 |
-CDEPEND=" |
888 |
- bzip2? ( app-arch/bzip2 ) |
889 |
- fam? ( virtual/fam ) |
890 |
- gdbm? ( sys-libs/gdbm ) |
891 |
- ldap? ( >=net-nds/openldap-2.1.26 ) |
892 |
- libev? ( >=dev-libs/libev-4.01 ) |
893 |
- lua? ( >=dev-lang/lua-5.1 ) |
894 |
- memcache? ( dev-libs/libmemcache ) |
895 |
- mysql? ( >=virtual/mysql-4.0 ) |
896 |
- pcre? ( >=dev-libs/libpcre-3.1 ) |
897 |
- php? ( dev-lang/php[cgi] ) |
898 |
- rrdtool? ( net-analyzer/rrdtool ) |
899 |
- ssl? ( >=dev-libs/openssl-0.9.7[kerberos?] ) |
900 |
- webdav? ( |
901 |
- dev-libs/libxml2 |
902 |
- >=dev-db/sqlite-3 |
903 |
- sys-fs/e2fsprogs |
904 |
- ) |
905 |
- xattr? ( kernel_linux? ( sys-apps/attr ) ) |
906 |
- zlib? ( >=sys-libs/zlib-1.1 )" |
907 |
- |
908 |
-DEPEND="${CDEPEND} |
909 |
- virtual/pkgconfig |
910 |
- doc? ( dev-python/docutils ) |
911 |
- test? ( |
912 |
- virtual/perl-Test-Harness |
913 |
- dev-libs/fcgi |
914 |
- )" |
915 |
- |
916 |
-RDEPEND="${CDEPEND} |
917 |
- selinux? ( sec-policy/selinux-apache ) |
918 |
-" |
919 |
- |
920 |
-# update certain parts of lighttpd.conf based on conditionals |
921 |
-update_config() { |
922 |
- local config="${D}/etc/lighttpd/lighttpd.conf" |
923 |
- |
924 |
- # enable php/mod_fastcgi settings |
925 |
- use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; } |
926 |
- |
927 |
- # enable stat() caching |
928 |
- use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; } |
929 |
- |
930 |
- # automatically listen on IPv6 if built with USE=ipv6. Bug #234987 |
931 |
- use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; } |
932 |
-} |
933 |
- |
934 |
-# remove non-essential stuff (for USE=minimal) |
935 |
-remove_non_essential() { |
936 |
- local libdir="${D}/usr/$(get_libdir)/${PN}" |
937 |
- |
938 |
- # text docs |
939 |
- use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt |
940 |
- |
941 |
- # non-essential modules |
942 |
- rm -f \ |
943 |
- ${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* |
944 |
- |
945 |
- # allow users to keep some based on USE flags |
946 |
- use pcre || rm -f ${libdir}/mod_{ssi,re{direct,write}}.* |
947 |
- use webdav || rm -f ${libdir}/mod_webdav.* |
948 |
- use mysql || rm -f ${libdir}/mod_mysql_vhost.* |
949 |
- use lua || rm -f ${libdir}/mod_{cml,magnet}.* |
950 |
- use rrdtool || rm -f ${libdir}/mod_rrdtool.* |
951 |
- use zlib || rm -f ${libdir}/mod_compress.* |
952 |
-} |
953 |
- |
954 |
-pkg_setup() { |
955 |
- if ! use pcre ; then |
956 |
- ewarn "It is highly recommended that you build ${PN}" |
957 |
- ewarn "with perl regular expressions support via USE=pcre." |
958 |
- ewarn "Otherwise you lose support for some core options such" |
959 |
- ewarn "as conditionals and modules such as mod_re{write,direct}" |
960 |
- ewarn "and mod_ssi." |
961 |
- fi |
962 |
- if use mmap; then |
963 |
- ewarn "You have enabled the mmap option. This option may allow" |
964 |
- ewarn "local users to trigger SIGBUG crashes. Use this option" |
965 |
- ewarn "with EXTRA care." |
966 |
- fi |
967 |
- enewgroup lighttpd |
968 |
- enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd |
969 |
- |
970 |
- DOC_CONTENTS="IPv6 migration guide:\n |
971 |
- http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config" |
972 |
-} |
973 |
- |
974 |
-src_prepare() { |
975 |
- base_src_prepare |
976 |
- #dev-python/docutils installs rst2html.py not rst2html |
977 |
- sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \ |
978 |
- die "sed doc/Makefile.am failed" |
979 |
- # Experimental patch for progress bar. Bug #380093 |
980 |
- if use uploadprogress; then |
981 |
- epatch "${FILESDIR}"/${PN}-1.4.29-mod_uploadprogress.patch |
982 |
- fi |
983 |
- eautoreconf |
984 |
-} |
985 |
- |
986 |
-src_configure() { |
987 |
- econf --libdir=/usr/$(get_libdir)/${PN} \ |
988 |
- --enable-lfs \ |
989 |
- $(use_enable ipv6) \ |
990 |
- $(use_enable mmap) \ |
991 |
- $(use_with bzip2) \ |
992 |
- $(use_with fam) \ |
993 |
- $(use_with gdbm) \ |
994 |
- $(use_with kerberos kerberos5) \ |
995 |
- $(use_with ldap) \ |
996 |
- $(use_with libev) \ |
997 |
- $(use_with lua) \ |
998 |
- $(use_with memcache) \ |
999 |
- $(use_with mysql) \ |
1000 |
- $(use_with pcre) \ |
1001 |
- $(use_with ssl openssl) \ |
1002 |
- $(use_with webdav webdav-props) \ |
1003 |
- $(use_with webdav webdav-locks) \ |
1004 |
- $(use_with xattr attr) \ |
1005 |
- $(use_with zlib) |
1006 |
-} |
1007 |
- |
1008 |
-src_compile() { |
1009 |
- emake |
1010 |
- |
1011 |
- if use doc ; then |
1012 |
- einfo "Building HTML documentation" |
1013 |
- cd doc || die |
1014 |
- emake html |
1015 |
- fi |
1016 |
-} |
1017 |
- |
1018 |
-src_test() { |
1019 |
- if [[ ${EUID} -eq 0 ]]; then |
1020 |
- default_src_test |
1021 |
- else |
1022 |
- ewarn "test skipped, please re-run as root if you wish to test ${PN}" |
1023 |
- fi |
1024 |
-} |
1025 |
- |
1026 |
-src_install() { |
1027 |
- emake DESTDIR="${D}" install |
1028 |
- |
1029 |
- # init script stuff |
1030 |
- newinitd "${FILESDIR}"/lighttpd.initd lighttpd |
1031 |
- newconfd "${FILESDIR}"/lighttpd.confd lighttpd |
1032 |
- use fam && has_version app-admin/fam && \ |
1033 |
- { sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; } |
1034 |
- |
1035 |
- # configs |
1036 |
- insinto /etc/lighttpd |
1037 |
- doins "${FILESDIR}"/conf/lighttpd.conf |
1038 |
- doins "${FILESDIR}"/conf/mime-types.conf |
1039 |
- doins "${FILESDIR}"/conf/mod_cgi.conf |
1040 |
- doins "${FILESDIR}"/conf/mod_fastcgi.conf |
1041 |
- |
1042 |
- # update lighttpd.conf directives based on conditionals |
1043 |
- update_config |
1044 |
- |
1045 |
- # docs |
1046 |
- dodoc AUTHORS README NEWS doc/scripts/*.sh |
1047 |
- newdoc doc/config//lighttpd.conf lighttpd.conf.distrib |
1048 |
- use ipv6 && readme.gentoo_create_doc |
1049 |
- |
1050 |
- use doc && dohtml -r doc/* |
1051 |
- |
1052 |
- docinto txt |
1053 |
- dodoc doc/outdated/*.txt |
1054 |
- |
1055 |
- # logrotate |
1056 |
- insinto /etc/logrotate.d |
1057 |
- newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd |
1058 |
- |
1059 |
- keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs |
1060 |
- fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd |
1061 |
- fperms 0750 /var/l{ib,og}/lighttpd |
1062 |
- |
1063 |
- #spawn-fcgi may optionally be installed via www-servers/spawn-fcgi |
1064 |
- rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* |
1065 |
- |
1066 |
- use minimal && remove_non_essential |
1067 |
- |
1068 |
- systemd_dounit "${FILESDIR}/${PN}.service" |
1069 |
- systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf" |
1070 |
-} |
1071 |
- |
1072 |
-pkg_postinst () { |
1073 |
- use ipv6 && readme.gentoo_print_elog |
1074 |
- |
1075 |
- if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then |
1076 |
- einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi." |
1077 |
- einfo "spawn-fcgi's init script configuration is now located" |
1078 |
- einfo "at /etc/conf.d/spawn-fcgi." |
1079 |
- fi |
1080 |
- |
1081 |
- if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then |
1082 |
- elog "Gentoo has a customized configuration," |
1083 |
- elog "which is now located in /etc/lighttpd. Please migrate your" |
1084 |
- elog "existing configuration." |
1085 |
- fi |
1086 |
- |
1087 |
- if use uploadprogress; then |
1088 |
- elog "WARNING! mod_uploadprogress is a backported module from the" |
1089 |
- elog "1.5x-branch, which is not considered stable yet. Please go to" |
1090 |
- elog "http://redmine.lighttpd.net/wiki/1/Docs:ModUploadProgress" |
1091 |
- elog "for more information. This configuration also is NOT supported" |
1092 |
- elog "by upstream, so please refrain from reporting bugs. You have" |
1093 |
- elog "been warned!" |
1094 |
- fi |
1095 |
-} |
1096 |
|
1097 |
diff --git a/www-servers/lighttpd/lighttpd-1.4.35-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.35-r2.ebuild |
1098 |
deleted file mode 100644 |
1099 |
index 8edb58c..00000000 |
1100 |
--- a/www-servers/lighttpd/lighttpd-1.4.35-r2.ebuild |
1101 |
+++ /dev/null |
1102 |
@@ -1,227 +0,0 @@ |
1103 |
-# Copyright 1999-2016 Gentoo Foundation |
1104 |
-# Distributed under the terms of the GNU General Public License v2 |
1105 |
-# $Id$ |
1106 |
- |
1107 |
-EAPI="5" |
1108 |
-inherit base autotools eutils readme.gentoo user systemd |
1109 |
- |
1110 |
-DESCRIPTION="Lightweight high-performance web server" |
1111 |
-HOMEPAGE="http://www.lighttpd.net/" |
1112 |
-SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.bz2" |
1113 |
- |
1114 |
-LICENSE="BSD GPL-2" |
1115 |
-SLOT="0" |
1116 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
1117 |
-IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev lua minimal mmap memcache mysql pcre php rrdtool selinux ssl test uploadprogress webdav xattr zlib" |
1118 |
- |
1119 |
-REQUIRED_USE="kerberos? ( ssl )" |
1120 |
- |
1121 |
-CDEPEND=" |
1122 |
- bzip2? ( app-arch/bzip2 ) |
1123 |
- fam? ( virtual/fam ) |
1124 |
- gdbm? ( sys-libs/gdbm ) |
1125 |
- ldap? ( >=net-nds/openldap-2.1.26 ) |
1126 |
- libev? ( >=dev-libs/libev-4.01 ) |
1127 |
- lua? ( >=dev-lang/lua-5.1:= ) |
1128 |
- memcache? ( dev-libs/libmemcache ) |
1129 |
- mysql? ( >=virtual/mysql-4.0 ) |
1130 |
- pcre? ( >=dev-libs/libpcre-3.1 ) |
1131 |
- php? ( dev-lang/php:*[cgi] ) |
1132 |
- rrdtool? ( net-analyzer/rrdtool ) |
1133 |
- ssl? ( >=dev-libs/openssl-0.9.7:=[kerberos?] ) |
1134 |
- webdav? ( |
1135 |
- dev-libs/libxml2 |
1136 |
- >=dev-db/sqlite-3 |
1137 |
- sys-fs/e2fsprogs |
1138 |
- ) |
1139 |
- xattr? ( kernel_linux? ( sys-apps/attr ) ) |
1140 |
- zlib? ( >=sys-libs/zlib-1.1 )" |
1141 |
- |
1142 |
-DEPEND="${CDEPEND} |
1143 |
- virtual/pkgconfig |
1144 |
- doc? ( dev-python/docutils ) |
1145 |
- test? ( |
1146 |
- virtual/perl-Test-Harness |
1147 |
- dev-libs/fcgi |
1148 |
- )" |
1149 |
- |
1150 |
-RDEPEND="${CDEPEND} |
1151 |
- selinux? ( sec-policy/selinux-apache ) |
1152 |
-" |
1153 |
- |
1154 |
-# update certain parts of lighttpd.conf based on conditionals |
1155 |
-update_config() { |
1156 |
- local config="${D}/etc/lighttpd/lighttpd.conf" |
1157 |
- |
1158 |
- # enable php/mod_fastcgi settings |
1159 |
- use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; } |
1160 |
- |
1161 |
- # enable stat() caching |
1162 |
- use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; } |
1163 |
- |
1164 |
- # automatically listen on IPv6 if built with USE=ipv6. Bug #234987 |
1165 |
- use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; } |
1166 |
-} |
1167 |
- |
1168 |
-# remove non-essential stuff (for USE=minimal) |
1169 |
-remove_non_essential() { |
1170 |
- local libdir="${D}/usr/$(get_libdir)/${PN}" |
1171 |
- |
1172 |
- # text docs |
1173 |
- use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt |
1174 |
- |
1175 |
- # non-essential modules |
1176 |
- rm -f \ |
1177 |
- ${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* |
1178 |
- |
1179 |
- # allow users to keep some based on USE flags |
1180 |
- use pcre || rm -f ${libdir}/mod_{ssi,re{direct,write}}.* |
1181 |
- use webdav || rm -f ${libdir}/mod_webdav.* |
1182 |
- use mysql || rm -f ${libdir}/mod_mysql_vhost.* |
1183 |
- use lua || rm -f ${libdir}/mod_{cml,magnet}.* |
1184 |
- use rrdtool || rm -f ${libdir}/mod_rrdtool.* |
1185 |
- use zlib || rm -f ${libdir}/mod_compress.* |
1186 |
-} |
1187 |
- |
1188 |
-pkg_setup() { |
1189 |
- if ! use pcre ; then |
1190 |
- ewarn "It is highly recommended that you build ${PN}" |
1191 |
- ewarn "with perl regular expressions support via USE=pcre." |
1192 |
- ewarn "Otherwise you lose support for some core options such" |
1193 |
- ewarn "as conditionals and modules such as mod_re{write,direct}" |
1194 |
- ewarn "and mod_ssi." |
1195 |
- fi |
1196 |
- if use mmap; then |
1197 |
- ewarn "You have enabled the mmap option. This option may allow" |
1198 |
- ewarn "local users to trigger SIGBUG crashes. Use this option" |
1199 |
- ewarn "with EXTRA care." |
1200 |
- fi |
1201 |
- enewgroup lighttpd |
1202 |
- enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd |
1203 |
- |
1204 |
- DOC_CONTENTS="IPv6 migration guide:\n |
1205 |
- http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config" |
1206 |
-} |
1207 |
- |
1208 |
-src_prepare() { |
1209 |
- base_src_prepare |
1210 |
- #dev-python/docutils installs rst2html.py not rst2html |
1211 |
- sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \ |
1212 |
- die "sed doc/Makefile.am failed" |
1213 |
- # Experimental patch for progress bar. Bug #380093 |
1214 |
- if use uploadprogress; then |
1215 |
- epatch "${FILESDIR}"/${PN}-1.4.29-mod_uploadprogress.patch |
1216 |
- fi |
1217 |
- eautoreconf |
1218 |
-} |
1219 |
- |
1220 |
-src_configure() { |
1221 |
- econf --libdir=/usr/$(get_libdir)/${PN} \ |
1222 |
- --enable-lfs \ |
1223 |
- $(use_enable ipv6) \ |
1224 |
- $(use_enable mmap) \ |
1225 |
- $(use_with bzip2) \ |
1226 |
- $(use_with fam) \ |
1227 |
- $(use_with gdbm) \ |
1228 |
- $(use_with kerberos kerberos5) \ |
1229 |
- $(use_with ldap) \ |
1230 |
- $(use_with libev) \ |
1231 |
- $(use_with lua) \ |
1232 |
- $(use_with memcache) \ |
1233 |
- $(use_with mysql) \ |
1234 |
- $(use_with pcre) \ |
1235 |
- $(use_with ssl openssl) \ |
1236 |
- $(use_with webdav webdav-props) \ |
1237 |
- $(use_with webdav webdav-locks) \ |
1238 |
- $(use_with xattr attr) \ |
1239 |
- $(use_with zlib) |
1240 |
-} |
1241 |
- |
1242 |
-src_compile() { |
1243 |
- emake |
1244 |
- |
1245 |
- if use doc ; then |
1246 |
- einfo "Building HTML documentation" |
1247 |
- cd doc || die |
1248 |
- emake html |
1249 |
- fi |
1250 |
-} |
1251 |
- |
1252 |
-src_test() { |
1253 |
- if [[ ${EUID} -eq 0 ]]; then |
1254 |
- default_src_test |
1255 |
- else |
1256 |
- ewarn "test skipped, please re-run as root if you wish to test ${PN}" |
1257 |
- fi |
1258 |
-} |
1259 |
- |
1260 |
-src_install() { |
1261 |
- emake DESTDIR="${D}" install |
1262 |
- |
1263 |
- # init script stuff |
1264 |
- newinitd "${FILESDIR}"/lighttpd.initd lighttpd |
1265 |
- newconfd "${FILESDIR}"/lighttpd.confd lighttpd |
1266 |
- use fam && has_version app-admin/fam && \ |
1267 |
- { sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; } |
1268 |
- |
1269 |
- # configs |
1270 |
- insinto /etc/lighttpd |
1271 |
- doins "${FILESDIR}"/conf/lighttpd.conf |
1272 |
- doins "${FILESDIR}"/conf/mime-types.conf |
1273 |
- doins "${FILESDIR}"/conf/mod_cgi.conf |
1274 |
- doins "${FILESDIR}"/conf/mod_fastcgi.conf |
1275 |
- |
1276 |
- # update lighttpd.conf directives based on conditionals |
1277 |
- update_config |
1278 |
- |
1279 |
- # docs |
1280 |
- dodoc AUTHORS README NEWS doc/scripts/*.sh |
1281 |
- newdoc doc/config//lighttpd.conf lighttpd.conf.distrib |
1282 |
- use ipv6 && readme.gentoo_create_doc |
1283 |
- |
1284 |
- use doc && dohtml -r doc/* |
1285 |
- |
1286 |
- docinto txt |
1287 |
- dodoc doc/outdated/*.txt |
1288 |
- |
1289 |
- # logrotate |
1290 |
- insinto /etc/logrotate.d |
1291 |
- newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd |
1292 |
- |
1293 |
- keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs |
1294 |
- fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd |
1295 |
- fperms 0750 /var/l{ib,og}/lighttpd |
1296 |
- |
1297 |
- #spawn-fcgi may optionally be installed via www-servers/spawn-fcgi |
1298 |
- rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* |
1299 |
- |
1300 |
- use minimal && remove_non_essential |
1301 |
- |
1302 |
- systemd_dounit "${FILESDIR}/${PN}.service" |
1303 |
- systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf" |
1304 |
-} |
1305 |
- |
1306 |
-pkg_postinst () { |
1307 |
- use ipv6 && readme.gentoo_print_elog |
1308 |
- |
1309 |
- if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then |
1310 |
- einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi." |
1311 |
- einfo "spawn-fcgi's init script configuration is now located" |
1312 |
- einfo "at /etc/conf.d/spawn-fcgi." |
1313 |
- fi |
1314 |
- |
1315 |
- if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then |
1316 |
- elog "Gentoo has a customized configuration," |
1317 |
- elog "which is now located in /etc/lighttpd. Please migrate your" |
1318 |
- elog "existing configuration." |
1319 |
- fi |
1320 |
- |
1321 |
- if use uploadprogress; then |
1322 |
- elog "WARNING! mod_uploadprogress is a backported module from the" |
1323 |
- elog "1.5x-branch, which is not considered stable yet. Please go to" |
1324 |
- elog "http://redmine.lighttpd.net/wiki/1/Docs:ModUploadProgress" |
1325 |
- elog "for more information. This configuration also is NOT supported" |
1326 |
- elog "by upstream, so please refrain from reporting bugs. You have" |
1327 |
- elog "been warned!" |
1328 |
- fi |
1329 |
-} |
1330 |
|
1331 |
diff --git a/www-servers/lighttpd/lighttpd-1.4.35.ebuild b/www-servers/lighttpd/lighttpd-1.4.35.ebuild |
1332 |
deleted file mode 100644 |
1333 |
index 1fc04e8..00000000 |
1334 |
--- a/www-servers/lighttpd/lighttpd-1.4.35.ebuild |
1335 |
+++ /dev/null |
1336 |
@@ -1,227 +0,0 @@ |
1337 |
-# Copyright 1999-2016 Gentoo Foundation |
1338 |
-# Distributed under the terms of the GNU General Public License v2 |
1339 |
-# $Id$ |
1340 |
- |
1341 |
-EAPI="4" |
1342 |
-inherit base autotools eutils readme.gentoo user systemd |
1343 |
- |
1344 |
-DESCRIPTION="Lightweight high-performance web server" |
1345 |
-HOMEPAGE="http://www.lighttpd.net/" |
1346 |
-SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.bz2" |
1347 |
- |
1348 |
-LICENSE="BSD GPL-2" |
1349 |
-SLOT="0" |
1350 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd" |
1351 |
-IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev lua minimal mmap memcache mysql pcre php rrdtool selinux ssl test uploadprogress webdav xattr zlib" |
1352 |
- |
1353 |
-REQUIRED_USE="kerberos? ( ssl )" |
1354 |
- |
1355 |
-CDEPEND=" |
1356 |
- bzip2? ( app-arch/bzip2 ) |
1357 |
- fam? ( virtual/fam ) |
1358 |
- gdbm? ( sys-libs/gdbm ) |
1359 |
- ldap? ( >=net-nds/openldap-2.1.26 ) |
1360 |
- libev? ( >=dev-libs/libev-4.01 ) |
1361 |
- lua? ( >=dev-lang/lua-5.1 ) |
1362 |
- memcache? ( dev-libs/libmemcache ) |
1363 |
- mysql? ( >=virtual/mysql-4.0 ) |
1364 |
- pcre? ( >=dev-libs/libpcre-3.1 ) |
1365 |
- php? ( dev-lang/php[cgi] ) |
1366 |
- rrdtool? ( net-analyzer/rrdtool ) |
1367 |
- ssl? ( >=dev-libs/openssl-0.9.7[kerberos?] ) |
1368 |
- webdav? ( |
1369 |
- dev-libs/libxml2 |
1370 |
- >=dev-db/sqlite-3 |
1371 |
- sys-fs/e2fsprogs |
1372 |
- ) |
1373 |
- xattr? ( kernel_linux? ( sys-apps/attr ) ) |
1374 |
- zlib? ( >=sys-libs/zlib-1.1 )" |
1375 |
- |
1376 |
-DEPEND="${CDEPEND} |
1377 |
- virtual/pkgconfig |
1378 |
- doc? ( dev-python/docutils ) |
1379 |
- test? ( |
1380 |
- virtual/perl-Test-Harness |
1381 |
- dev-libs/fcgi |
1382 |
- )" |
1383 |
- |
1384 |
-RDEPEND="${CDEPEND} |
1385 |
- selinux? ( sec-policy/selinux-apache ) |
1386 |
-" |
1387 |
- |
1388 |
-# update certain parts of lighttpd.conf based on conditionals |
1389 |
-update_config() { |
1390 |
- local config="${D}/etc/lighttpd/lighttpd.conf" |
1391 |
- |
1392 |
- # enable php/mod_fastcgi settings |
1393 |
- use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; } |
1394 |
- |
1395 |
- # enable stat() caching |
1396 |
- use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; } |
1397 |
- |
1398 |
- # automatically listen on IPv6 if built with USE=ipv6. Bug #234987 |
1399 |
- use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; } |
1400 |
-} |
1401 |
- |
1402 |
-# remove non-essential stuff (for USE=minimal) |
1403 |
-remove_non_essential() { |
1404 |
- local libdir="${D}/usr/$(get_libdir)/${PN}" |
1405 |
- |
1406 |
- # text docs |
1407 |
- use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt |
1408 |
- |
1409 |
- # non-essential modules |
1410 |
- rm -f \ |
1411 |
- ${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* |
1412 |
- |
1413 |
- # allow users to keep some based on USE flags |
1414 |
- use pcre || rm -f ${libdir}/mod_{ssi,re{direct,write}}.* |
1415 |
- use webdav || rm -f ${libdir}/mod_webdav.* |
1416 |
- use mysql || rm -f ${libdir}/mod_mysql_vhost.* |
1417 |
- use lua || rm -f ${libdir}/mod_{cml,magnet}.* |
1418 |
- use rrdtool || rm -f ${libdir}/mod_rrdtool.* |
1419 |
- use zlib || rm -f ${libdir}/mod_compress.* |
1420 |
-} |
1421 |
- |
1422 |
-pkg_setup() { |
1423 |
- if ! use pcre ; then |
1424 |
- ewarn "It is highly recommended that you build ${PN}" |
1425 |
- ewarn "with perl regular expressions support via USE=pcre." |
1426 |
- ewarn "Otherwise you lose support for some core options such" |
1427 |
- ewarn "as conditionals and modules such as mod_re{write,direct}" |
1428 |
- ewarn "and mod_ssi." |
1429 |
- fi |
1430 |
- if use mmap; then |
1431 |
- ewarn "You have enabled the mmap option. This option may allow" |
1432 |
- ewarn "local users to trigger SIGBUG crashes. Use this option" |
1433 |
- ewarn "with EXTRA care." |
1434 |
- fi |
1435 |
- enewgroup lighttpd |
1436 |
- enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd |
1437 |
- |
1438 |
- DOC_CONTENTS="IPv6 migration guide:\n |
1439 |
- http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config" |
1440 |
-} |
1441 |
- |
1442 |
-src_prepare() { |
1443 |
- base_src_prepare |
1444 |
- #dev-python/docutils installs rst2html.py not rst2html |
1445 |
- sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \ |
1446 |
- die "sed doc/Makefile.am failed" |
1447 |
- # Experimental patch for progress bar. Bug #380093 |
1448 |
- if use uploadprogress; then |
1449 |
- epatch "${FILESDIR}"/${PN}-1.4.29-mod_uploadprogress.patch |
1450 |
- fi |
1451 |
- eautoreconf |
1452 |
-} |
1453 |
- |
1454 |
-src_configure() { |
1455 |
- econf --libdir=/usr/$(get_libdir)/${PN} \ |
1456 |
- --enable-lfs \ |
1457 |
- $(use_enable ipv6) \ |
1458 |
- $(use_enable mmap) \ |
1459 |
- $(use_with bzip2) \ |
1460 |
- $(use_with fam) \ |
1461 |
- $(use_with gdbm) \ |
1462 |
- $(use_with kerberos kerberos5) \ |
1463 |
- $(use_with ldap) \ |
1464 |
- $(use_with libev) \ |
1465 |
- $(use_with lua) \ |
1466 |
- $(use_with memcache) \ |
1467 |
- $(use_with mysql) \ |
1468 |
- $(use_with pcre) \ |
1469 |
- $(use_with ssl openssl) \ |
1470 |
- $(use_with webdav webdav-props) \ |
1471 |
- $(use_with webdav webdav-locks) \ |
1472 |
- $(use_with xattr attr) \ |
1473 |
- $(use_with zlib) |
1474 |
-} |
1475 |
- |
1476 |
-src_compile() { |
1477 |
- emake |
1478 |
- |
1479 |
- if use doc ; then |
1480 |
- einfo "Building HTML documentation" |
1481 |
- cd doc || die |
1482 |
- emake html |
1483 |
- fi |
1484 |
-} |
1485 |
- |
1486 |
-src_test() { |
1487 |
- if [[ ${EUID} -eq 0 ]]; then |
1488 |
- default_src_test |
1489 |
- else |
1490 |
- ewarn "test skipped, please re-run as root if you wish to test ${PN}" |
1491 |
- fi |
1492 |
-} |
1493 |
- |
1494 |
-src_install() { |
1495 |
- emake DESTDIR="${D}" install |
1496 |
- |
1497 |
- # init script stuff |
1498 |
- newinitd "${FILESDIR}"/lighttpd.initd lighttpd |
1499 |
- newconfd "${FILESDIR}"/lighttpd.confd lighttpd |
1500 |
- use fam && has_version app-admin/fam && \ |
1501 |
- { sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; } |
1502 |
- |
1503 |
- # configs |
1504 |
- insinto /etc/lighttpd |
1505 |
- doins "${FILESDIR}"/conf/lighttpd.conf |
1506 |
- doins "${FILESDIR}"/conf/mime-types.conf |
1507 |
- doins "${FILESDIR}"/conf/mod_cgi.conf |
1508 |
- doins "${FILESDIR}"/conf/mod_fastcgi.conf |
1509 |
- |
1510 |
- # update lighttpd.conf directives based on conditionals |
1511 |
- update_config |
1512 |
- |
1513 |
- # docs |
1514 |
- dodoc AUTHORS README NEWS doc/scripts/*.sh |
1515 |
- newdoc doc/config//lighttpd.conf lighttpd.conf.distrib |
1516 |
- use ipv6 && readme.gentoo_create_doc |
1517 |
- |
1518 |
- use doc && dohtml -r doc/* |
1519 |
- |
1520 |
- docinto txt |
1521 |
- dodoc doc/outdated/*.txt |
1522 |
- |
1523 |
- # logrotate |
1524 |
- insinto /etc/logrotate.d |
1525 |
- newins "${FILESDIR}"/lighttpd.logrotate lighttpd |
1526 |
- |
1527 |
- keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs |
1528 |
- fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd |
1529 |
- fperms 0750 /var/l{ib,og}/lighttpd |
1530 |
- |
1531 |
- #spawn-fcgi may optionally be installed via www-servers/spawn-fcgi |
1532 |
- rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* |
1533 |
- |
1534 |
- use minimal && remove_non_essential |
1535 |
- |
1536 |
- systemd_dounit "${FILESDIR}/${PN}.service" |
1537 |
- systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf" |
1538 |
-} |
1539 |
- |
1540 |
-pkg_postinst () { |
1541 |
- use ipv6 && readme.gentoo_print_elog |
1542 |
- |
1543 |
- if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then |
1544 |
- einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi." |
1545 |
- einfo "spawn-fcgi's init script configuration is now located" |
1546 |
- einfo "at /etc/conf.d/spawn-fcgi." |
1547 |
- fi |
1548 |
- |
1549 |
- if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then |
1550 |
- elog "Gentoo has a customized configuration," |
1551 |
- elog "which is now located in /etc/lighttpd. Please migrate your" |
1552 |
- elog "existing configuration." |
1553 |
- fi |
1554 |
- |
1555 |
- if use uploadprogress; then |
1556 |
- elog "WARNING! mod_uploadprogress is a backported module from the" |
1557 |
- elog "1.5x-branch, which is not considered stable yet. Please go to" |
1558 |
- elog "http://redmine.lighttpd.net/wiki/1/Docs:ModUploadProgress" |
1559 |
- elog "for more information. This configuration also is NOT supported" |
1560 |
- elog "by upstream, so please refrain from reporting bugs. You have" |
1561 |
- elog "been warned!" |
1562 |
- fi |
1563 |
-} |
1564 |
|
1565 |
diff --git a/www-servers/lighttpd/lighttpd-1.4.37-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.37-r1.ebuild |
1566 |
deleted file mode 100644 |
1567 |
index 2c3832e..00000000 |
1568 |
--- a/www-servers/lighttpd/lighttpd-1.4.37-r1.ebuild |
1569 |
+++ /dev/null |
1570 |
@@ -1,217 +0,0 @@ |
1571 |
-# Copyright 1999-2016 Gentoo Foundation |
1572 |
-# Distributed under the terms of the GNU General Public License v2 |
1573 |
-# $Id$ |
1574 |
- |
1575 |
-EAPI="5" |
1576 |
-inherit base autotools eutils readme.gentoo user systemd |
1577 |
- |
1578 |
-DESCRIPTION="Lightweight high-performance web server" |
1579 |
-HOMEPAGE="http://www.lighttpd.net/" |
1580 |
-SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz" |
1581 |
- |
1582 |
-LICENSE="BSD GPL-2" |
1583 |
-SLOT="0" |
1584 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
1585 |
-IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcache mysql pcre php rrdtool selinux ssl test webdav xattr zlib" |
1586 |
- |
1587 |
-REQUIRED_USE="kerberos? ( ssl !libressl )" |
1588 |
- |
1589 |
-CDEPEND=" |
1590 |
- bzip2? ( app-arch/bzip2 ) |
1591 |
- fam? ( virtual/fam ) |
1592 |
- gdbm? ( sys-libs/gdbm ) |
1593 |
- ldap? ( >=net-nds/openldap-2.1.26 ) |
1594 |
- libev? ( >=dev-libs/libev-4.01 ) |
1595 |
- lua? ( >=dev-lang/lua-5.1:= ) |
1596 |
- memcache? ( dev-libs/libmemcache ) |
1597 |
- mysql? ( >=virtual/mysql-4.0 ) |
1598 |
- pcre? ( >=dev-libs/libpcre-3.1 ) |
1599 |
- php? ( dev-lang/php:*[cgi] ) |
1600 |
- rrdtool? ( net-analyzer/rrdtool ) |
1601 |
- ssl? ( |
1602 |
- !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) |
1603 |
- libressl? ( dev-libs/libressl:= ) |
1604 |
- ) |
1605 |
- webdav? ( |
1606 |
- dev-libs/libxml2 |
1607 |
- >=dev-db/sqlite-3 |
1608 |
- sys-fs/e2fsprogs |
1609 |
- ) |
1610 |
- xattr? ( kernel_linux? ( sys-apps/attr ) ) |
1611 |
- zlib? ( >=sys-libs/zlib-1.1 )" |
1612 |
- |
1613 |
-DEPEND="${CDEPEND} |
1614 |
- virtual/pkgconfig |
1615 |
- doc? ( dev-python/docutils ) |
1616 |
- test? ( |
1617 |
- virtual/perl-Test-Harness |
1618 |
- dev-libs/fcgi |
1619 |
- )" |
1620 |
- |
1621 |
-RDEPEND="${CDEPEND} |
1622 |
- selinux? ( sec-policy/selinux-apache ) |
1623 |
-" |
1624 |
- |
1625 |
-# update certain parts of lighttpd.conf based on conditionals |
1626 |
-update_config() { |
1627 |
- local config="${D}/etc/lighttpd/lighttpd.conf" |
1628 |
- |
1629 |
- # enable php/mod_fastcgi settings |
1630 |
- use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; } |
1631 |
- |
1632 |
- # enable stat() caching |
1633 |
- use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; } |
1634 |
- |
1635 |
- # automatically listen on IPv6 if built with USE=ipv6. Bug #234987 |
1636 |
- use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; } |
1637 |
-} |
1638 |
- |
1639 |
-# remove non-essential stuff (for USE=minimal) |
1640 |
-remove_non_essential() { |
1641 |
- local libdir="${D}/usr/$(get_libdir)/${PN}" |
1642 |
- |
1643 |
- # text docs |
1644 |
- use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt |
1645 |
- |
1646 |
- # non-essential modules |
1647 |
- rm -f \ |
1648 |
- ${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* |
1649 |
- |
1650 |
- # allow users to keep some based on USE flags |
1651 |
- use pcre || rm -f ${libdir}/mod_{ssi,re{direct,write}}.* |
1652 |
- use webdav || rm -f ${libdir}/mod_webdav.* |
1653 |
- use mysql || rm -f ${libdir}/mod_mysql_vhost.* |
1654 |
- use lua || rm -f ${libdir}/mod_{cml,magnet}.* |
1655 |
- use rrdtool || rm -f ${libdir}/mod_rrdtool.* |
1656 |
- use zlib || rm -f ${libdir}/mod_compress.* |
1657 |
-} |
1658 |
- |
1659 |
-pkg_setup() { |
1660 |
- if ! use pcre ; then |
1661 |
- ewarn "It is highly recommended that you build ${PN}" |
1662 |
- ewarn "with perl regular expressions support via USE=pcre." |
1663 |
- ewarn "Otherwise you lose support for some core options such" |
1664 |
- ewarn "as conditionals and modules such as mod_re{write,direct}" |
1665 |
- ewarn "and mod_ssi." |
1666 |
- fi |
1667 |
- if use mmap; then |
1668 |
- ewarn "You have enabled the mmap option. This option may allow" |
1669 |
- ewarn "local users to trigger SIGBUG crashes. Use this option" |
1670 |
- ewarn "with EXTRA care." |
1671 |
- fi |
1672 |
- enewgroup lighttpd |
1673 |
- enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd |
1674 |
- |
1675 |
- DOC_CONTENTS="IPv6 migration guide:\n |
1676 |
- http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config" |
1677 |
-} |
1678 |
- |
1679 |
-src_prepare() { |
1680 |
- base_src_prepare |
1681 |
- #dev-python/docutils installs rst2html.py not rst2html |
1682 |
- sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \ |
1683 |
- die "sed doc/Makefile.am failed" |
1684 |
- eautoreconf |
1685 |
-} |
1686 |
- |
1687 |
-src_configure() { |
1688 |
- econf --libdir=/usr/$(get_libdir)/${PN} \ |
1689 |
- --enable-lfs \ |
1690 |
- $(use_enable ipv6) \ |
1691 |
- $(use_enable mmap) \ |
1692 |
- $(use_with bzip2) \ |
1693 |
- $(use_with fam) \ |
1694 |
- $(use_with gdbm) \ |
1695 |
- $(use_with kerberos kerberos5) \ |
1696 |
- $(use_with ldap) \ |
1697 |
- $(use_with libev) \ |
1698 |
- $(use_with lua) \ |
1699 |
- $(use_with memcache) \ |
1700 |
- $(use_with mysql) \ |
1701 |
- $(use_with pcre) \ |
1702 |
- $(use_with ssl openssl) \ |
1703 |
- $(use_with webdav webdav-props) \ |
1704 |
- $(use_with webdav webdav-locks) \ |
1705 |
- $(use_with xattr attr) \ |
1706 |
- $(use_with zlib) |
1707 |
-} |
1708 |
- |
1709 |
-src_compile() { |
1710 |
- emake |
1711 |
- |
1712 |
- if use doc ; then |
1713 |
- einfo "Building HTML documentation" |
1714 |
- cd doc || die |
1715 |
- emake html |
1716 |
- fi |
1717 |
-} |
1718 |
- |
1719 |
-src_test() { |
1720 |
- if [[ ${EUID} -eq 0 ]]; then |
1721 |
- default_src_test |
1722 |
- else |
1723 |
- ewarn "test skipped, please re-run as root if you wish to test ${PN}" |
1724 |
- fi |
1725 |
-} |
1726 |
- |
1727 |
-src_install() { |
1728 |
- emake DESTDIR="${D}" install |
1729 |
- |
1730 |
- # init script stuff |
1731 |
- newinitd "${FILESDIR}"/lighttpd.initd lighttpd |
1732 |
- newconfd "${FILESDIR}"/lighttpd.confd lighttpd |
1733 |
- use fam && has_version app-admin/fam && \ |
1734 |
- { sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; } |
1735 |
- |
1736 |
- # configs |
1737 |
- insinto /etc/lighttpd |
1738 |
- doins "${FILESDIR}"/conf/lighttpd.conf |
1739 |
- doins "${FILESDIR}"/conf/mime-types.conf |
1740 |
- doins "${FILESDIR}"/conf/mod_cgi.conf |
1741 |
- doins "${FILESDIR}"/conf/mod_fastcgi.conf |
1742 |
- |
1743 |
- # update lighttpd.conf directives based on conditionals |
1744 |
- update_config |
1745 |
- |
1746 |
- # docs |
1747 |
- dodoc AUTHORS README NEWS doc/scripts/*.sh |
1748 |
- newdoc doc/config//lighttpd.conf lighttpd.conf.distrib |
1749 |
- use ipv6 && readme.gentoo_create_doc |
1750 |
- |
1751 |
- use doc && dohtml -r doc/* |
1752 |
- |
1753 |
- docinto txt |
1754 |
- dodoc doc/outdated/*.txt |
1755 |
- |
1756 |
- # logrotate |
1757 |
- insinto /etc/logrotate.d |
1758 |
- newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd |
1759 |
- |
1760 |
- keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs |
1761 |
- fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd |
1762 |
- fperms 0750 /var/l{ib,og}/lighttpd |
1763 |
- |
1764 |
- #spawn-fcgi may optionally be installed via www-servers/spawn-fcgi |
1765 |
- rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* |
1766 |
- |
1767 |
- use minimal && remove_non_essential |
1768 |
- |
1769 |
- systemd_dounit "${FILESDIR}/${PN}.service" |
1770 |
- systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf" |
1771 |
-} |
1772 |
- |
1773 |
-pkg_postinst () { |
1774 |
- use ipv6 && readme.gentoo_print_elog |
1775 |
- |
1776 |
- if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then |
1777 |
- einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi." |
1778 |
- einfo "spawn-fcgi's init script configuration is now located" |
1779 |
- einfo "at /etc/conf.d/spawn-fcgi." |
1780 |
- fi |
1781 |
- |
1782 |
- if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then |
1783 |
- elog "Gentoo has a customized configuration," |
1784 |
- elog "which is now located in /etc/lighttpd. Please migrate your" |
1785 |
- elog "existing configuration." |
1786 |
- fi |
1787 |
-} |
1788 |
|
1789 |
diff --git a/www-servers/lighttpd/lighttpd-1.4.37.ebuild b/www-servers/lighttpd/lighttpd-1.4.37.ebuild |
1790 |
deleted file mode 100644 |
1791 |
index 027ec47..00000000 |
1792 |
--- a/www-servers/lighttpd/lighttpd-1.4.37.ebuild |
1793 |
+++ /dev/null |
1794 |
@@ -1,214 +0,0 @@ |
1795 |
-# Copyright 1999-2016 Gentoo Foundation |
1796 |
-# Distributed under the terms of the GNU General Public License v2 |
1797 |
-# $Id$ |
1798 |
- |
1799 |
-EAPI="5" |
1800 |
-inherit base autotools eutils readme.gentoo user systemd |
1801 |
- |
1802 |
-DESCRIPTION="Lightweight high-performance web server" |
1803 |
-HOMEPAGE="http://www.lighttpd.net/" |
1804 |
-SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz" |
1805 |
- |
1806 |
-LICENSE="BSD GPL-2" |
1807 |
-SLOT="0" |
1808 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
1809 |
-IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev lua minimal mmap memcache mysql pcre php rrdtool selinux ssl test webdav xattr zlib" |
1810 |
- |
1811 |
-REQUIRED_USE="kerberos? ( ssl )" |
1812 |
- |
1813 |
-CDEPEND=" |
1814 |
- bzip2? ( app-arch/bzip2 ) |
1815 |
- fam? ( virtual/fam ) |
1816 |
- gdbm? ( sys-libs/gdbm ) |
1817 |
- ldap? ( >=net-nds/openldap-2.1.26 ) |
1818 |
- libev? ( >=dev-libs/libev-4.01 ) |
1819 |
- lua? ( >=dev-lang/lua-5.1:= ) |
1820 |
- memcache? ( dev-libs/libmemcache ) |
1821 |
- mysql? ( >=virtual/mysql-4.0 ) |
1822 |
- pcre? ( >=dev-libs/libpcre-3.1 ) |
1823 |
- php? ( dev-lang/php:*[cgi] ) |
1824 |
- rrdtool? ( net-analyzer/rrdtool ) |
1825 |
- ssl? ( >=dev-libs/openssl-0.9.7:=[kerberos?] ) |
1826 |
- webdav? ( |
1827 |
- dev-libs/libxml2 |
1828 |
- >=dev-db/sqlite-3 |
1829 |
- sys-fs/e2fsprogs |
1830 |
- ) |
1831 |
- xattr? ( kernel_linux? ( sys-apps/attr ) ) |
1832 |
- zlib? ( >=sys-libs/zlib-1.1 )" |
1833 |
- |
1834 |
-DEPEND="${CDEPEND} |
1835 |
- virtual/pkgconfig |
1836 |
- doc? ( dev-python/docutils ) |
1837 |
- test? ( |
1838 |
- virtual/perl-Test-Harness |
1839 |
- dev-libs/fcgi |
1840 |
- )" |
1841 |
- |
1842 |
-RDEPEND="${CDEPEND} |
1843 |
- selinux? ( sec-policy/selinux-apache ) |
1844 |
-" |
1845 |
- |
1846 |
-# update certain parts of lighttpd.conf based on conditionals |
1847 |
-update_config() { |
1848 |
- local config="${D}/etc/lighttpd/lighttpd.conf" |
1849 |
- |
1850 |
- # enable php/mod_fastcgi settings |
1851 |
- use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; } |
1852 |
- |
1853 |
- # enable stat() caching |
1854 |
- use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; } |
1855 |
- |
1856 |
- # automatically listen on IPv6 if built with USE=ipv6. Bug #234987 |
1857 |
- use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; } |
1858 |
-} |
1859 |
- |
1860 |
-# remove non-essential stuff (for USE=minimal) |
1861 |
-remove_non_essential() { |
1862 |
- local libdir="${D}/usr/$(get_libdir)/${PN}" |
1863 |
- |
1864 |
- # text docs |
1865 |
- use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt |
1866 |
- |
1867 |
- # non-essential modules |
1868 |
- rm -f \ |
1869 |
- ${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* |
1870 |
- |
1871 |
- # allow users to keep some based on USE flags |
1872 |
- use pcre || rm -f ${libdir}/mod_{ssi,re{direct,write}}.* |
1873 |
- use webdav || rm -f ${libdir}/mod_webdav.* |
1874 |
- use mysql || rm -f ${libdir}/mod_mysql_vhost.* |
1875 |
- use lua || rm -f ${libdir}/mod_{cml,magnet}.* |
1876 |
- use rrdtool || rm -f ${libdir}/mod_rrdtool.* |
1877 |
- use zlib || rm -f ${libdir}/mod_compress.* |
1878 |
-} |
1879 |
- |
1880 |
-pkg_setup() { |
1881 |
- if ! use pcre ; then |
1882 |
- ewarn "It is highly recommended that you build ${PN}" |
1883 |
- ewarn "with perl regular expressions support via USE=pcre." |
1884 |
- ewarn "Otherwise you lose support for some core options such" |
1885 |
- ewarn "as conditionals and modules such as mod_re{write,direct}" |
1886 |
- ewarn "and mod_ssi." |
1887 |
- fi |
1888 |
- if use mmap; then |
1889 |
- ewarn "You have enabled the mmap option. This option may allow" |
1890 |
- ewarn "local users to trigger SIGBUG crashes. Use this option" |
1891 |
- ewarn "with EXTRA care." |
1892 |
- fi |
1893 |
- enewgroup lighttpd |
1894 |
- enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd |
1895 |
- |
1896 |
- DOC_CONTENTS="IPv6 migration guide:\n |
1897 |
- http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config" |
1898 |
-} |
1899 |
- |
1900 |
-src_prepare() { |
1901 |
- base_src_prepare |
1902 |
- #dev-python/docutils installs rst2html.py not rst2html |
1903 |
- sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \ |
1904 |
- die "sed doc/Makefile.am failed" |
1905 |
- eautoreconf |
1906 |
-} |
1907 |
- |
1908 |
-src_configure() { |
1909 |
- econf --libdir=/usr/$(get_libdir)/${PN} \ |
1910 |
- --enable-lfs \ |
1911 |
- $(use_enable ipv6) \ |
1912 |
- $(use_enable mmap) \ |
1913 |
- $(use_with bzip2) \ |
1914 |
- $(use_with fam) \ |
1915 |
- $(use_with gdbm) \ |
1916 |
- $(use_with kerberos kerberos5) \ |
1917 |
- $(use_with ldap) \ |
1918 |
- $(use_with libev) \ |
1919 |
- $(use_with lua) \ |
1920 |
- $(use_with memcache) \ |
1921 |
- $(use_with mysql) \ |
1922 |
- $(use_with pcre) \ |
1923 |
- $(use_with ssl openssl) \ |
1924 |
- $(use_with webdav webdav-props) \ |
1925 |
- $(use_with webdav webdav-locks) \ |
1926 |
- $(use_with xattr attr) \ |
1927 |
- $(use_with zlib) |
1928 |
-} |
1929 |
- |
1930 |
-src_compile() { |
1931 |
- emake |
1932 |
- |
1933 |
- if use doc ; then |
1934 |
- einfo "Building HTML documentation" |
1935 |
- cd doc || die |
1936 |
- emake html |
1937 |
- fi |
1938 |
-} |
1939 |
- |
1940 |
-src_test() { |
1941 |
- if [[ ${EUID} -eq 0 ]]; then |
1942 |
- default_src_test |
1943 |
- else |
1944 |
- ewarn "test skipped, please re-run as root if you wish to test ${PN}" |
1945 |
- fi |
1946 |
-} |
1947 |
- |
1948 |
-src_install() { |
1949 |
- emake DESTDIR="${D}" install |
1950 |
- |
1951 |
- # init script stuff |
1952 |
- newinitd "${FILESDIR}"/lighttpd.initd lighttpd |
1953 |
- newconfd "${FILESDIR}"/lighttpd.confd lighttpd |
1954 |
- use fam && has_version app-admin/fam && \ |
1955 |
- { sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; } |
1956 |
- |
1957 |
- # configs |
1958 |
- insinto /etc/lighttpd |
1959 |
- doins "${FILESDIR}"/conf/lighttpd.conf |
1960 |
- doins "${FILESDIR}"/conf/mime-types.conf |
1961 |
- doins "${FILESDIR}"/conf/mod_cgi.conf |
1962 |
- doins "${FILESDIR}"/conf/mod_fastcgi.conf |
1963 |
- |
1964 |
- # update lighttpd.conf directives based on conditionals |
1965 |
- update_config |
1966 |
- |
1967 |
- # docs |
1968 |
- dodoc AUTHORS README NEWS doc/scripts/*.sh |
1969 |
- newdoc doc/config//lighttpd.conf lighttpd.conf.distrib |
1970 |
- use ipv6 && readme.gentoo_create_doc |
1971 |
- |
1972 |
- use doc && dohtml -r doc/* |
1973 |
- |
1974 |
- docinto txt |
1975 |
- dodoc doc/outdated/*.txt |
1976 |
- |
1977 |
- # logrotate |
1978 |
- insinto /etc/logrotate.d |
1979 |
- newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd |
1980 |
- |
1981 |
- keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs |
1982 |
- fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd |
1983 |
- fperms 0750 /var/l{ib,og}/lighttpd |
1984 |
- |
1985 |
- #spawn-fcgi may optionally be installed via www-servers/spawn-fcgi |
1986 |
- rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* |
1987 |
- |
1988 |
- use minimal && remove_non_essential |
1989 |
- |
1990 |
- systemd_dounit "${FILESDIR}/${PN}.service" |
1991 |
- systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf" |
1992 |
-} |
1993 |
- |
1994 |
-pkg_postinst () { |
1995 |
- use ipv6 && readme.gentoo_print_elog |
1996 |
- |
1997 |
- if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then |
1998 |
- einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi." |
1999 |
- einfo "spawn-fcgi's init script configuration is now located" |
2000 |
- einfo "at /etc/conf.d/spawn-fcgi." |
2001 |
- fi |
2002 |
- |
2003 |
- if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then |
2004 |
- elog "Gentoo has a customized configuration," |
2005 |
- elog "which is now located in /etc/lighttpd. Please migrate your" |
2006 |
- elog "existing configuration." |
2007 |
- fi |
2008 |
-} |
2009 |
|
2010 |
diff --git a/www-servers/lighttpd/lighttpd-1.4.39.ebuild b/www-servers/lighttpd/lighttpd-1.4.39.ebuild |
2011 |
deleted file mode 100644 |
2012 |
index 2c3832e..00000000 |
2013 |
--- a/www-servers/lighttpd/lighttpd-1.4.39.ebuild |
2014 |
+++ /dev/null |
2015 |
@@ -1,217 +0,0 @@ |
2016 |
-# Copyright 1999-2016 Gentoo Foundation |
2017 |
-# Distributed under the terms of the GNU General Public License v2 |
2018 |
-# $Id$ |
2019 |
- |
2020 |
-EAPI="5" |
2021 |
-inherit base autotools eutils readme.gentoo user systemd |
2022 |
- |
2023 |
-DESCRIPTION="Lightweight high-performance web server" |
2024 |
-HOMEPAGE="http://www.lighttpd.net/" |
2025 |
-SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz" |
2026 |
- |
2027 |
-LICENSE="BSD GPL-2" |
2028 |
-SLOT="0" |
2029 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
2030 |
-IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcache mysql pcre php rrdtool selinux ssl test webdav xattr zlib" |
2031 |
- |
2032 |
-REQUIRED_USE="kerberos? ( ssl !libressl )" |
2033 |
- |
2034 |
-CDEPEND=" |
2035 |
- bzip2? ( app-arch/bzip2 ) |
2036 |
- fam? ( virtual/fam ) |
2037 |
- gdbm? ( sys-libs/gdbm ) |
2038 |
- ldap? ( >=net-nds/openldap-2.1.26 ) |
2039 |
- libev? ( >=dev-libs/libev-4.01 ) |
2040 |
- lua? ( >=dev-lang/lua-5.1:= ) |
2041 |
- memcache? ( dev-libs/libmemcache ) |
2042 |
- mysql? ( >=virtual/mysql-4.0 ) |
2043 |
- pcre? ( >=dev-libs/libpcre-3.1 ) |
2044 |
- php? ( dev-lang/php:*[cgi] ) |
2045 |
- rrdtool? ( net-analyzer/rrdtool ) |
2046 |
- ssl? ( |
2047 |
- !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) |
2048 |
- libressl? ( dev-libs/libressl:= ) |
2049 |
- ) |
2050 |
- webdav? ( |
2051 |
- dev-libs/libxml2 |
2052 |
- >=dev-db/sqlite-3 |
2053 |
- sys-fs/e2fsprogs |
2054 |
- ) |
2055 |
- xattr? ( kernel_linux? ( sys-apps/attr ) ) |
2056 |
- zlib? ( >=sys-libs/zlib-1.1 )" |
2057 |
- |
2058 |
-DEPEND="${CDEPEND} |
2059 |
- virtual/pkgconfig |
2060 |
- doc? ( dev-python/docutils ) |
2061 |
- test? ( |
2062 |
- virtual/perl-Test-Harness |
2063 |
- dev-libs/fcgi |
2064 |
- )" |
2065 |
- |
2066 |
-RDEPEND="${CDEPEND} |
2067 |
- selinux? ( sec-policy/selinux-apache ) |
2068 |
-" |
2069 |
- |
2070 |
-# update certain parts of lighttpd.conf based on conditionals |
2071 |
-update_config() { |
2072 |
- local config="${D}/etc/lighttpd/lighttpd.conf" |
2073 |
- |
2074 |
- # enable php/mod_fastcgi settings |
2075 |
- use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; } |
2076 |
- |
2077 |
- # enable stat() caching |
2078 |
- use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; } |
2079 |
- |
2080 |
- # automatically listen on IPv6 if built with USE=ipv6. Bug #234987 |
2081 |
- use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; } |
2082 |
-} |
2083 |
- |
2084 |
-# remove non-essential stuff (for USE=minimal) |
2085 |
-remove_non_essential() { |
2086 |
- local libdir="${D}/usr/$(get_libdir)/${PN}" |
2087 |
- |
2088 |
- # text docs |
2089 |
- use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt |
2090 |
- |
2091 |
- # non-essential modules |
2092 |
- rm -f \ |
2093 |
- ${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* |
2094 |
- |
2095 |
- # allow users to keep some based on USE flags |
2096 |
- use pcre || rm -f ${libdir}/mod_{ssi,re{direct,write}}.* |
2097 |
- use webdav || rm -f ${libdir}/mod_webdav.* |
2098 |
- use mysql || rm -f ${libdir}/mod_mysql_vhost.* |
2099 |
- use lua || rm -f ${libdir}/mod_{cml,magnet}.* |
2100 |
- use rrdtool || rm -f ${libdir}/mod_rrdtool.* |
2101 |
- use zlib || rm -f ${libdir}/mod_compress.* |
2102 |
-} |
2103 |
- |
2104 |
-pkg_setup() { |
2105 |
- if ! use pcre ; then |
2106 |
- ewarn "It is highly recommended that you build ${PN}" |
2107 |
- ewarn "with perl regular expressions support via USE=pcre." |
2108 |
- ewarn "Otherwise you lose support for some core options such" |
2109 |
- ewarn "as conditionals and modules such as mod_re{write,direct}" |
2110 |
- ewarn "and mod_ssi." |
2111 |
- fi |
2112 |
- if use mmap; then |
2113 |
- ewarn "You have enabled the mmap option. This option may allow" |
2114 |
- ewarn "local users to trigger SIGBUG crashes. Use this option" |
2115 |
- ewarn "with EXTRA care." |
2116 |
- fi |
2117 |
- enewgroup lighttpd |
2118 |
- enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd |
2119 |
- |
2120 |
- DOC_CONTENTS="IPv6 migration guide:\n |
2121 |
- http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config" |
2122 |
-} |
2123 |
- |
2124 |
-src_prepare() { |
2125 |
- base_src_prepare |
2126 |
- #dev-python/docutils installs rst2html.py not rst2html |
2127 |
- sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \ |
2128 |
- die "sed doc/Makefile.am failed" |
2129 |
- eautoreconf |
2130 |
-} |
2131 |
- |
2132 |
-src_configure() { |
2133 |
- econf --libdir=/usr/$(get_libdir)/${PN} \ |
2134 |
- --enable-lfs \ |
2135 |
- $(use_enable ipv6) \ |
2136 |
- $(use_enable mmap) \ |
2137 |
- $(use_with bzip2) \ |
2138 |
- $(use_with fam) \ |
2139 |
- $(use_with gdbm) \ |
2140 |
- $(use_with kerberos kerberos5) \ |
2141 |
- $(use_with ldap) \ |
2142 |
- $(use_with libev) \ |
2143 |
- $(use_with lua) \ |
2144 |
- $(use_with memcache) \ |
2145 |
- $(use_with mysql) \ |
2146 |
- $(use_with pcre) \ |
2147 |
- $(use_with ssl openssl) \ |
2148 |
- $(use_with webdav webdav-props) \ |
2149 |
- $(use_with webdav webdav-locks) \ |
2150 |
- $(use_with xattr attr) \ |
2151 |
- $(use_with zlib) |
2152 |
-} |
2153 |
- |
2154 |
-src_compile() { |
2155 |
- emake |
2156 |
- |
2157 |
- if use doc ; then |
2158 |
- einfo "Building HTML documentation" |
2159 |
- cd doc || die |
2160 |
- emake html |
2161 |
- fi |
2162 |
-} |
2163 |
- |
2164 |
-src_test() { |
2165 |
- if [[ ${EUID} -eq 0 ]]; then |
2166 |
- default_src_test |
2167 |
- else |
2168 |
- ewarn "test skipped, please re-run as root if you wish to test ${PN}" |
2169 |
- fi |
2170 |
-} |
2171 |
- |
2172 |
-src_install() { |
2173 |
- emake DESTDIR="${D}" install |
2174 |
- |
2175 |
- # init script stuff |
2176 |
- newinitd "${FILESDIR}"/lighttpd.initd lighttpd |
2177 |
- newconfd "${FILESDIR}"/lighttpd.confd lighttpd |
2178 |
- use fam && has_version app-admin/fam && \ |
2179 |
- { sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; } |
2180 |
- |
2181 |
- # configs |
2182 |
- insinto /etc/lighttpd |
2183 |
- doins "${FILESDIR}"/conf/lighttpd.conf |
2184 |
- doins "${FILESDIR}"/conf/mime-types.conf |
2185 |
- doins "${FILESDIR}"/conf/mod_cgi.conf |
2186 |
- doins "${FILESDIR}"/conf/mod_fastcgi.conf |
2187 |
- |
2188 |
- # update lighttpd.conf directives based on conditionals |
2189 |
- update_config |
2190 |
- |
2191 |
- # docs |
2192 |
- dodoc AUTHORS README NEWS doc/scripts/*.sh |
2193 |
- newdoc doc/config//lighttpd.conf lighttpd.conf.distrib |
2194 |
- use ipv6 && readme.gentoo_create_doc |
2195 |
- |
2196 |
- use doc && dohtml -r doc/* |
2197 |
- |
2198 |
- docinto txt |
2199 |
- dodoc doc/outdated/*.txt |
2200 |
- |
2201 |
- # logrotate |
2202 |
- insinto /etc/logrotate.d |
2203 |
- newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd |
2204 |
- |
2205 |
- keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs |
2206 |
- fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd |
2207 |
- fperms 0750 /var/l{ib,og}/lighttpd |
2208 |
- |
2209 |
- #spawn-fcgi may optionally be installed via www-servers/spawn-fcgi |
2210 |
- rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* |
2211 |
- |
2212 |
- use minimal && remove_non_essential |
2213 |
- |
2214 |
- systemd_dounit "${FILESDIR}/${PN}.service" |
2215 |
- systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf" |
2216 |
-} |
2217 |
- |
2218 |
-pkg_postinst () { |
2219 |
- use ipv6 && readme.gentoo_print_elog |
2220 |
- |
2221 |
- if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then |
2222 |
- einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi." |
2223 |
- einfo "spawn-fcgi's init script configuration is now located" |
2224 |
- einfo "at /etc/conf.d/spawn-fcgi." |
2225 |
- fi |
2226 |
- |
2227 |
- if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then |
2228 |
- elog "Gentoo has a customized configuration," |
2229 |
- elog "which is now located in /etc/lighttpd. Please migrate your" |
2230 |
- elog "existing configuration." |
2231 |
- fi |
2232 |
-} |
2233 |
|
2234 |
diff --git a/www-servers/lighttpd/metadata.xml b/www-servers/lighttpd/metadata.xml |
2235 |
index db4320b..02985d4 100644 |
2236 |
--- a/www-servers/lighttpd/metadata.xml |
2237 |
+++ b/www-servers/lighttpd/metadata.xml |
2238 |
@@ -19,11 +19,8 @@ |
2239 |
</longdescription> |
2240 |
<use> |
2241 |
<flag name="libev">Enable fdevent handler</flag> |
2242 |
- <flag name="memcache">Enable memcache support for mod_cml and |
2243 |
- mod_trigger_b4_dl</flag> |
2244 |
<flag name="mmap">Use mmap with files owned by lighttpd. This is a dangerous option as it may allow local users to trigger SIGBUS crashes.</flag> |
2245 |
<flag name="rrdtool">Enable rrdtool support via mod_rrdtool</flag> |
2246 |
- <flag name="uploadprogress">Apply experimental patch for upload progress module</flag> |
2247 |
<flag name="webdav">Enable webdav properties</flag> |
2248 |
</use> |
2249 |
</pkgmetadata> |