source: pkg/security/vinnie/main/lighttpd/trunk/debian/patches/debian-changes-1.4.26-2 @ 7285

Revision 7285, 16.6 KB checked in by alanbach-guest, 2 years ago (diff)
  • Added lighttpd to Vinnie security
Line 
1Description: Upstream changes introduced in version 1.4.26-2
2 This patch has been created by dpkg-source during the package build.
3 Here's the last changelog entry, hopefully it gives details on why
4 those changes were made:
5 .
6 lighttpd (1.4.26-2) unstable; urgency=low
7 .
8   [ Krzysztof KrzyÅŒaniak (eloy) ]
9   * Switch to dpkg-source 3.0 (quilt) format
10   * debian/control:
11    + removed Franz Pletz from Uploaders, he's MIA (closes: #579366)
12    + change dependency from libmysqlclient15-dev to more general
13      libmysqlclient-dev
14 .
15   [ Olaf van der Spek ]
16   * take conf dir as an optional parameter (closes: 489854)
17   * don't try to make /var/run/lighttpd when invoked with status
18     (closes: 538662)
19   * split FastCGI PHP conf from FastCGI conf (closes: 515699)
20   * reduce max-procs from 2 to 1 (closes: 456200)
21   * move debian doc handling into it's own file
22   * set default vhost dir to /srv/<host>/htdocs (closes: 471054)
23   * use delaycompress instead of copytruncate for logrotate (closes: 563626)
24   * don't wait for old process to stop before starting new one for reload
25     (closes: 504315)
26   * use reopen-logs for logrotate (closes: 504319)
27   * add no-www.conf (for use with evhost and simple-vhost, closes: 471055)
28   * move evhost conf into it's own file
29 .
30 The person named in the Author field signed this changelog entry.
31Author: Krzysztof KrzyÅŒaniak (eloy) <eloy@debian.org>
32Bug-Debian: http://bugs.debian.org/456200
33Bug-Debian: http://bugs.debian.org/471054
34Bug-Debian: http://bugs.debian.org/471055
35Bug-Debian: http://bugs.debian.org/489854
36Bug-Debian: http://bugs.debian.org/504315
37Bug-Debian: http://bugs.debian.org/504319
38Bug-Debian: http://bugs.debian.org/515699
39Bug-Debian: http://bugs.debian.org/538662
40Bug-Debian: http://bugs.debian.org/563626
41Bug-Debian: http://bugs.debian.org/579366
42
43---
44The information above should follow the Patch Tagging Guidelines, please
45checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
46are templates for supplementary fields that you might want to add:
47
48Origin: <vendor|upstream|other>, <url of original patch>
49Bug: <url in upstream bugtracker>
50Bug-Debian: http://bugs.debian.org/<bugnumber>
51Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
52Forwarded: <no|not-needed|url proving that it has been forwarded>
53Reviewed-By: <name and email of someone who approved the patch>
54Last-Update: <YYYY-MM-DD>
55
56--- lighttpd-1.4.26.orig/src/configparser.c
57+++ lighttpd-1.4.26/src/configparser.c
58@@ -4,7 +4,7 @@
59 /* First off, code is include which follows the "include" declaration
60 ** in the input file. */
61 #include <stdio.h>
62-#line 5 "../../src/configparser.y"
63+#line 5 "./configparser.y"
64 
65 #include "configfile.h"
66 #include "buffer.h"
67@@ -518,42 +518,42 @@ static void yy_destructor(YYCODETYPE yym
68     case 23:
69     case 24:
70     case 25:
71-#line 144 "../../src/configparser.y"
72+#line 144 "./configparser.y"
73 { buffer_free((yypminor->yy0)); }
74 #line 523 "configparser.c"
75       break;
76     case 35:
77-#line 135 "../../src/configparser.y"
78+#line 135 "./configparser.y"
79 { (yypminor->yy41)->free((yypminor->yy41)); }
80 #line 528 "configparser.c"
81       break;
82     case 36:
83-#line 136 "../../src/configparser.y"
84+#line 136 "./configparser.y"
85 { (yypminor->yy41)->free((yypminor->yy41)); }
86 #line 533 "configparser.c"
87       break;
88     case 37:
89-#line 137 "../../src/configparser.y"
90+#line 137 "./configparser.y"
91 { (yypminor->yy41)->free((yypminor->yy41)); }
92 #line 538 "configparser.c"
93       break;
94     case 39:
95-#line 138 "../../src/configparser.y"
96+#line 138 "./configparser.y"
97 { array_free((yypminor->yy40)); }
98 #line 543 "configparser.c"
99       break;
100     case 40:
101-#line 139 "../../src/configparser.y"
102+#line 139 "./configparser.y"
103 { array_free((yypminor->yy40)); }
104 #line 548 "configparser.c"
105       break;
106     case 41:
107-#line 140 "../../src/configparser.y"
108+#line 140 "./configparser.y"
109 { buffer_free((yypminor->yy43)); }
110 #line 553 "configparser.c"
111       break;
112     case 42:
113-#line 141 "../../src/configparser.y"
114+#line 141 "./configparser.y"
115 { buffer_free((yypminor->yy43)); }
116 #line 558 "configparser.c"
117       break;
118@@ -823,7 +823,7 @@ static void yy_reduce(
119         /* No destructor defined for global */
120         break;
121       case 5:
122-#line 117 "../../src/configparser.y"
123+#line 117 "./configparser.y"
124 { yymsp[-1].minor.yy78 = NULL; }
125 #line 828 "configparser.c"
126   yy_destructor(1,&yymsp[0].minor);
127@@ -838,7 +838,7 @@ static void yy_reduce(
128   yy_destructor(1,&yymsp[0].minor);
129         break;
130       case 9:
131-#line 146 "../../src/configparser.y"
132+#line 146 "./configparser.y"
133 {
134   if (ctx->ok) {
135     buffer_copy_string_buffer(yymsp[0].minor.yy41->key, yymsp[-2].minor.yy43);
136@@ -866,7 +866,7 @@ static void yy_reduce(
137   yy_destructor(2,&yymsp[-1].minor);
138         break;
139       case 10:
140-#line 170 "../../src/configparser.y"
141+#line 170 "./configparser.y"
142 {
143   array *vars = ctx->current->value;
144   data_unset *du;
145@@ -909,7 +909,7 @@ static void yy_reduce(
146   yy_destructor(3,&yymsp[-1].minor);
147         break;
148       case 11:
149-#line 209 "../../src/configparser.y"
150+#line 209 "./configparser.y"
151 {
152   if (strchr(yymsp[0].minor.yy0->ptr, '.') == NULL) {
153     yygotominor.yy43 = buffer_init_string("var.");
154@@ -924,7 +924,7 @@ static void yy_reduce(
155 #line 924 "configparser.c"
156         break;
157       case 12:
158-#line 221 "../../src/configparser.y"
159+#line 221 "./configparser.y"
160 {
161   yygotominor.yy41 = configparser_merge_data(yymsp[-2].minor.yy41, yymsp[0].minor.yy41);
162   if (NULL == yygotominor.yy41) {
163@@ -938,7 +938,7 @@ static void yy_reduce(
164   yy_destructor(5,&yymsp[-1].minor);
165         break;
166       case 13:
167-#line 231 "../../src/configparser.y"
168+#line 231 "./configparser.y"
169 {
170   yygotominor.yy41 = yymsp[0].minor.yy41;
171   yymsp[0].minor.yy41 = NULL;
172@@ -946,7 +946,7 @@ static void yy_reduce(
173 #line 946 "configparser.c"
174         break;
175       case 14:
176-#line 236 "../../src/configparser.y"
177+#line 236 "./configparser.y"
178 {
179   yygotominor.yy41 = NULL;
180   if (strncmp(yymsp[0].minor.yy43->ptr, "env.", sizeof("env.") - 1) == 0) {
181@@ -976,7 +976,7 @@ static void yy_reduce(
182 #line 976 "configparser.c"
183         break;
184       case 15:
185-#line 263 "../../src/configparser.y"
186+#line 263 "./configparser.y"
187 {
188   yygotominor.yy41 = (data_unset *)data_string_init();
189   buffer_copy_string_buffer(((data_string *)(yygotominor.yy41))->value, yymsp[0].minor.yy0);
190@@ -986,7 +986,7 @@ static void yy_reduce(
191 #line 986 "configparser.c"
192         break;
193       case 16:
194-#line 270 "../../src/configparser.y"
195+#line 270 "./configparser.y"
196 {
197   yygotominor.yy41 = (data_unset *)data_integer_init();
198   ((data_integer *)(yygotominor.yy41))->value = strtol(yymsp[0].minor.yy0->ptr, NULL, 10);
199@@ -996,7 +996,7 @@ static void yy_reduce(
200 #line 996 "configparser.c"
201         break;
202       case 17:
203-#line 276 "../../src/configparser.y"
204+#line 276 "./configparser.y"
205 {
206   yygotominor.yy41 = (data_unset *)data_array_init();
207   array_free(((data_array *)(yygotominor.yy41))->value);
208@@ -1006,7 +1006,7 @@ static void yy_reduce(
209 #line 1006 "configparser.c"
210         break;
211       case 18:
212-#line 282 "../../src/configparser.y"
213+#line 282 "./configparser.y"
214 {
215   yygotominor.yy40 = array_init();
216 }
217@@ -1015,7 +1015,7 @@ static void yy_reduce(
218   yy_destructor(9,&yymsp[0].minor);
219         break;
220       case 19:
221-#line 285 "../../src/configparser.y"
222+#line 285 "./configparser.y"
223 {
224   yygotominor.yy40 = yymsp[-1].minor.yy40;
225   yymsp[-1].minor.yy40 = NULL;
226@@ -1025,7 +1025,7 @@ static void yy_reduce(
227   yy_destructor(9,&yymsp[0].minor);
228         break;
229       case 20:
230-#line 290 "../../src/configparser.y"
231+#line 290 "./configparser.y"
232 {
233   if (buffer_is_empty(yymsp[0].minor.yy41->key) ||
234       NULL == array_get_element(yymsp[-2].minor.yy40, yymsp[0].minor.yy41->key->ptr)) {
235@@ -1046,7 +1046,7 @@ static void yy_reduce(
236   yy_destructor(10,&yymsp[-1].minor);
237         break;
238       case 21:
239-#line 307 "../../src/configparser.y"
240+#line 307 "./configparser.y"
241 {
242   yygotominor.yy40 = yymsp[-1].minor.yy40;
243   yymsp[-1].minor.yy40 = NULL;
244@@ -1055,7 +1055,7 @@ static void yy_reduce(
245   yy_destructor(10,&yymsp[0].minor);
246         break;
247       case 22:
248-#line 312 "../../src/configparser.y"
249+#line 312 "./configparser.y"
250 {
251   yygotominor.yy40 = array_init();
252   array_insert_unique(yygotominor.yy40, yymsp[0].minor.yy41);
253@@ -1064,7 +1064,7 @@ static void yy_reduce(
254 #line 1064 "configparser.c"
255         break;
256       case 23:
257-#line 318 "../../src/configparser.y"
258+#line 318 "./configparser.y"
259 {
260   yygotominor.yy41 = yymsp[0].minor.yy41;
261   yymsp[0].minor.yy41 = NULL;
262@@ -1072,7 +1072,7 @@ static void yy_reduce(
263 #line 1072 "configparser.c"
264         break;
265       case 24:
266-#line 322 "../../src/configparser.y"
267+#line 322 "./configparser.y"
268 {
269   buffer_copy_string_buffer(yymsp[0].minor.yy41->key, yymsp[-2].minor.yy43);
270   buffer_free(yymsp[-2].minor.yy43);
271@@ -1090,7 +1090,7 @@ static void yy_reduce(
272       case 26:
273         break;
274       case 27:
275-#line 334 "../../src/configparser.y"
276+#line 334 "./configparser.y"
277 {
278   data_config *dc;
279   dc = (data_config *)array_get_element(ctx->srv->config_context, "global");
280@@ -1101,7 +1101,7 @@ static void yy_reduce(
281   yy_destructor(12,&yymsp[0].minor);
282         break;
283       case 28:
284-#line 341 "../../src/configparser.y"
285+#line 341 "./configparser.y"
286 {
287   data_config *cur;
288 
289@@ -1119,7 +1119,7 @@ static void yy_reduce(
290   yy_destructor(14,&yymsp[0].minor);
291         break;
292       case 29:
293-#line 352 "../../src/configparser.y"
294+#line 352 "./configparser.y"
295 {
296   if (yymsp[-3].minor.yy78->context_ndx >= yymsp[0].minor.yy78->context_ndx) {
297     fprintf(stderr, "unreachable else condition\n");
298@@ -1136,7 +1136,7 @@ static void yy_reduce(
299   yy_destructor(15,&yymsp[-1].minor);
300         break;
301       case 30:
302-#line 364 "../../src/configparser.y"
303+#line 364 "./configparser.y"
304 {
305   yygotominor.yy78 = yymsp[0].minor.yy78;
306   yymsp[0].minor.yy78 = NULL;
307@@ -1144,7 +1144,7 @@ static void yy_reduce(
308 #line 1144 "configparser.c"
309         break;
310       case 31:
311-#line 369 "../../src/configparser.y"
312+#line 369 "./configparser.y"
313 {
314   data_config *cur;
315 
316@@ -1162,7 +1162,7 @@ static void yy_reduce(
317   yy_destructor(14,&yymsp[0].minor);
318         break;
319       case 32:
320-#line 380 "../../src/configparser.y"
321+#line 380 "./configparser.y"
322 {
323   data_config *dc;
324   buffer *b, *rvalue, *op;
325@@ -1318,7 +1318,7 @@ static void yy_reduce(
326   yy_destructor(19,&yymsp[-2].minor);
327         break;
328       case 33:
329-#line 529 "../../src/configparser.y"
330+#line 529 "./configparser.y"
331 {
332   yygotominor.yy27 = CONFIG_COND_EQ;
333 }
334@@ -1326,7 +1326,7 @@ static void yy_reduce(
335   yy_destructor(20,&yymsp[0].minor);
336         break;
337       case 34:
338-#line 532 "../../src/configparser.y"
339+#line 532 "./configparser.y"
340 {
341   yygotominor.yy27 = CONFIG_COND_MATCH;
342 }
343@@ -1334,7 +1334,7 @@ static void yy_reduce(
344   yy_destructor(21,&yymsp[0].minor);
345         break;
346       case 35:
347-#line 535 "../../src/configparser.y"
348+#line 535 "./configparser.y"
349 {
350   yygotominor.yy27 = CONFIG_COND_NE;
351 }
352@@ -1342,7 +1342,7 @@ static void yy_reduce(
353   yy_destructor(22,&yymsp[0].minor);
354         break;
355       case 36:
356-#line 538 "../../src/configparser.y"
357+#line 538 "./configparser.y"
358 {
359   yygotominor.yy27 = CONFIG_COND_NOMATCH;
360 }
361@@ -1350,7 +1350,7 @@ static void yy_reduce(
362   yy_destructor(23,&yymsp[0].minor);
363         break;
364       case 37:
365-#line 542 "../../src/configparser.y"
366+#line 542 "./configparser.y"
367 {
368   yygotominor.yy43 = NULL;
369   if (ctx->ok) {
370@@ -1370,7 +1370,7 @@ static void yy_reduce(
371 #line 1370 "configparser.c"
372         break;
373       case 38:
374-#line 559 "../../src/configparser.y"
375+#line 559 "./configparser.y"
376 {
377   if (ctx->ok) {
378     if (0 != config_parse_file(ctx->srv, ctx, yymsp[0].minor.yy43->ptr)) {
379@@ -1384,7 +1384,7 @@ static void yy_reduce(
380   yy_destructor(24,&yymsp[-1].minor);
381         break;
382       case 39:
383-#line 569 "../../src/configparser.y"
384+#line 569 "./configparser.y"
385 {
386   if (ctx->ok) {
387     if (0 != config_parse_cmd(ctx->srv, ctx, yymsp[0].minor.yy43->ptr)) {
388@@ -1424,7 +1424,7 @@ static void yy_parse_failed(
389   while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser);
390   /* Here code is inserted which will be executed whenever the
391   ** parser fails */
392-#line 108 "../../src/configparser.y"
393+#line 108 "./configparser.y"
394 
395   ctx->ok = 0;
396 
397--- lighttpd-1.4.26.orig/src/mod_ssi_exprparser.c
398+++ lighttpd-1.4.26/src/mod_ssi_exprparser.c
399@@ -4,7 +4,7 @@
400 /* First off, code is include which follows the "include" declaration
401 ** in the input file. */
402 #include <stdio.h>
403-#line 6 "../../src/mod_ssi_exprparser.y"
404+#line 6 "./mod_ssi_exprparser.y"
405 
406 #include "mod_ssi_expr.h"
407 #include "buffer.h"
408@@ -347,7 +347,7 @@ static void yy_destructor(YYCODETYPE yym
409     case 10:
410     case 11:
411     case 12:
412-#line 22 "../../src/mod_ssi_exprparser.y"
413+#line 22 "./mod_ssi_exprparser.y"
414 { buffer_free((yypminor->yy0)); }
415 #line 352 "mod_ssi_exprparser.c"
416       break;
417@@ -578,7 +578,7 @@ static void yy_reduce(
418   **     break;
419   */
420       case 0:
421-#line 29 "../../src/mod_ssi_exprparser.y"
422+#line 29 "./mod_ssi_exprparser.y"
423 {
424   ctx->val.bo = ssi_val_tobool(yymsp[0].minor.yy29);
425   ctx->val.type = SSI_TYPE_BOOL;
426@@ -588,7 +588,7 @@ static void yy_reduce(
427 #line 588 "mod_ssi_exprparser.c"
428         break;
429       case 1:
430-#line 36 "../../src/mod_ssi_exprparser.y"
431+#line 36 "./mod_ssi_exprparser.y"
432 {
433   int cmp;
434 
435@@ -617,14 +617,14 @@ static void yy_reduce(
436 #line 617 "mod_ssi_exprparser.c"
437         break;
438       case 2:
439-#line 61 "../../src/mod_ssi_exprparser.y"
440+#line 61 "./mod_ssi_exprparser.y"
441 {
442   yygotominor.yy29 = yymsp[0].minor.yy29;
443 }
444 #line 624 "mod_ssi_exprparser.c"
445         break;
446       case 3:
447-#line 64 "../../src/mod_ssi_exprparser.y"
448+#line 64 "./mod_ssi_exprparser.y"
449 {
450   int e;
451 
452@@ -639,7 +639,7 @@ static void yy_reduce(
453   yy_destructor(1,&yymsp[-1].minor);
454         break;
455       case 4:
456-#line 75 "../../src/mod_ssi_exprparser.y"
457+#line 75 "./mod_ssi_exprparser.y"
458 {
459   int e;
460 
461@@ -654,7 +654,7 @@ static void yy_reduce(
462   yy_destructor(2,&yymsp[-1].minor);
463         break;
464       case 5:
465-#line 86 "../../src/mod_ssi_exprparser.y"
466+#line 86 "./mod_ssi_exprparser.y"
467 {
468   int e;
469 
470@@ -668,7 +668,7 @@ static void yy_reduce(
471   yy_destructor(9,&yymsp[-1].minor);
472         break;
473       case 6:
474-#line 95 "../../src/mod_ssi_exprparser.y"
475+#line 95 "./mod_ssi_exprparser.y"
476 {
477   yygotominor.yy29 = yymsp[-1].minor.yy29;
478 }
479@@ -677,7 +677,7 @@ static void yy_reduce(
480   yy_destructor(11,&yymsp[0].minor);
481         break;
482       case 7:
483-#line 99 "../../src/mod_ssi_exprparser.y"
484+#line 99 "./mod_ssi_exprparser.y"
485 {
486   yygotominor.yy29 = ssi_val_init();
487   yygotominor.yy29->str = yymsp[0].minor.yy19;
488@@ -686,14 +686,14 @@ static void yy_reduce(
489 #line 686 "mod_ssi_exprparser.c"
490         break;
491       case 8:
492-#line 105 "../../src/mod_ssi_exprparser.y"
493+#line 105 "./mod_ssi_exprparser.y"
494 {
495   yygotominor.yy19 = yymsp[0].minor.yy0;
496 }
497 #line 693 "mod_ssi_exprparser.c"
498         break;
499       case 9:
500-#line 109 "../../src/mod_ssi_exprparser.y"
501+#line 109 "./mod_ssi_exprparser.y"
502 {
503   yygotominor.yy19 = yymsp[-1].minor.yy19;
504   buffer_append_string_buffer(yygotominor.yy19, yymsp[0].minor.yy0);
505@@ -702,37 +702,37 @@ static void yy_reduce(
506 #line 702 "mod_ssi_exprparser.c"
507         break;
508       case 10:
509-#line 115 "../../src/mod_ssi_exprparser.y"
510+#line 115 "./mod_ssi_exprparser.y"
511 { yygotominor.yy8 = SSI_COND_EQ; }
512 #line 707 "mod_ssi_exprparser.c"
513   yy_destructor(3,&yymsp[0].minor);
514         break;
515       case 11:
516-#line 116 "../../src/mod_ssi_exprparser.y"
517+#line 116 "./mod_ssi_exprparser.y"
518 { yygotominor.yy8 = SSI_COND_NE; }
519 #line 713 "mod_ssi_exprparser.c"
520   yy_destructor(4,&yymsp[0].minor);
521         break;
522       case 12:
523-#line 117 "../../src/mod_ssi_exprparser.y"
524+#line 117 "./mod_ssi_exprparser.y"
525 { yygotominor.yy8 = SSI_COND_LE; }
526 #line 719 "mod_ssi_exprparser.c"
527   yy_destructor(8,&yymsp[0].minor);
528         break;
529       case 13:
530-#line 118 "../../src/mod_ssi_exprparser.y"
531+#line 118 "./mod_ssi_exprparser.y"
532 { yygotominor.yy8 = SSI_COND_GE; }
533 #line 725 "mod_ssi_exprparser.c"
534   yy_destructor(6,&yymsp[0].minor);
535         break;
536       case 14:
537-#line 119 "../../src/mod_ssi_exprparser.y"
538+#line 119 "./mod_ssi_exprparser.y"
539 { yygotominor.yy8 = SSI_COND_LT; }
540 #line 731 "mod_ssi_exprparser.c"
541   yy_destructor(7,&yymsp[0].minor);
542         break;
543       case 15:
544-#line 120 "../../src/mod_ssi_exprparser.y"
545+#line 120 "./mod_ssi_exprparser.y"
546 { yygotominor.yy8 = SSI_COND_GT; }
547 #line 737 "mod_ssi_exprparser.c"
548   yy_destructor(5,&yymsp[0].minor);
549@@ -764,7 +764,7 @@ static void yy_parse_failed(
550   while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser);
551   /* Here code is inserted which will be executed whenever the
552   ** parser fails */
553-#line 14 "../../src/mod_ssi_exprparser.y"
554+#line 14 "./mod_ssi_exprparser.y"
555 
556   ctx->ok = 0;
557 
Note: See TracBrowser for help on using the repository browser.