[pkg-lighttpd] r362 - in lighttpd/trunk: debian src
eloy at alioth.debian.org
eloy at alioth.debian.org
Wed Mar 18 11:19:12 UTC 2009
Author: eloy
Date: 2009-03-18 11:19:11 +0000 (Wed, 18 Mar 2009)
New Revision: 362
Modified:
lighttpd/trunk/debian/changelog
lighttpd/trunk/debian/compat
lighttpd/trunk/debian/control
lighttpd/trunk/src/configparser.c
lighttpd/trunk/src/mod_ssi_exprparser.c
Log:
standards-version and debhelper7
Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog 2009-03-18 11:14:00 UTC (rev 361)
+++ lighttpd/trunk/debian/changelog 2009-03-18 11:19:11 UTC (rev 362)
@@ -1,6 +1,8 @@
lighttpd (1.4.22-1) UNRELEASED; urgency=low
* (NOT RELEASED YET) New upstream release
+ * debian/control: Update to Standards-Version 3.8.1 (no changes so far),
+ debhelper dependency updated to 7
* Remove patches:
+ fastcgi_detach.patch replaced in upstream with openDevNull function
+ ssl-connection-errors.patch fixed in upstream
Modified: lighttpd/trunk/debian/compat
===================================================================
--- lighttpd/trunk/debian/compat 2009-03-18 11:14:00 UTC (rev 361)
+++ lighttpd/trunk/debian/compat 2009-03-18 11:19:11 UTC (rev 362)
@@ -1 +1 @@
-5
+7
Modified: lighttpd/trunk/debian/control
===================================================================
--- lighttpd/trunk/debian/control 2009-03-18 11:14:00 UTC (rev 361)
+++ lighttpd/trunk/debian/control 2009-03-18 11:19:11 UTC (rev 362)
@@ -6,13 +6,13 @@
Torsten Marek <shlomme at debian.org>, Franz Pletz <fpletz at franz-pletz.org>,
Pierre Habouzit <madcoder at debian.org>
Homepage: http://www.lighttpd.net
-Build-Depends: debhelper (>= 5.0.0), cdbs, mime-support, libssl-dev,
+Build-Depends: debhelper (>= 7), cdbs, mime-support, libssl-dev,
zlib1g-dev, libbz2-dev, libattr1-dev, libpcre3-dev, libmysqlclient15-dev,
libfam-dev, libldap2-dev, libfcgi-dev, libgdbm-dev, libmemcache-dev,
liblua5.1-0-dev, quilt, patchutils, pkg-config, uuid-dev, libsqlite3-dev,
libxml2-dev, libkrb5-dev, perl
XS-Vcs-Svn: svn://svn.debian.org/pkg-lighttpd/lighttpd/trunk
-Standards-Version: 3.7.3
+Standards-Version: 3.8.1
Package: lighttpd
Homepage: http://www.lighttpd.net
Modified: lighttpd/trunk/src/configparser.c
===================================================================
--- lighttpd/trunk/src/configparser.c 2009-03-18 11:14:00 UTC (rev 361)
+++ lighttpd/trunk/src/configparser.c 2009-03-18 11:19:11 UTC (rev 362)
@@ -4,7 +4,7 @@
/* First off, code is include which follows the "include" declaration
** in the input file. */
#include <stdio.h>
-#line 5 "../../src/configparser.y"
+#line 5 "./configparser.y"
#include <assert.h>
#include <stdio.h>
@@ -520,42 +520,42 @@
case 23:
case 24:
case 25:
-#line 146 "../../src/configparser.y"
+#line 146 "./configparser.y"
{ buffer_free((yypminor->yy0)); }
#line 525 "configparser.c"
break;
case 35:
-#line 137 "../../src/configparser.y"
+#line 137 "./configparser.y"
{ (yypminor->yy41)->free((yypminor->yy41)); }
#line 530 "configparser.c"
break;
case 36:
-#line 138 "../../src/configparser.y"
+#line 138 "./configparser.y"
{ (yypminor->yy41)->free((yypminor->yy41)); }
#line 535 "configparser.c"
break;
case 37:
-#line 139 "../../src/configparser.y"
+#line 139 "./configparser.y"
{ (yypminor->yy41)->free((yypminor->yy41)); }
#line 540 "configparser.c"
break;
case 39:
-#line 140 "../../src/configparser.y"
+#line 140 "./configparser.y"
{ array_free((yypminor->yy40)); }
#line 545 "configparser.c"
break;
case 40:
-#line 141 "../../src/configparser.y"
+#line 141 "./configparser.y"
{ array_free((yypminor->yy40)); }
#line 550 "configparser.c"
break;
case 41:
-#line 142 "../../src/configparser.y"
+#line 142 "./configparser.y"
{ buffer_free((yypminor->yy43)); }
#line 555 "configparser.c"
break;
case 42:
-#line 143 "../../src/configparser.y"
+#line 143 "./configparser.y"
{ buffer_free((yypminor->yy43)); }
#line 560 "configparser.c"
break;
@@ -825,7 +825,7 @@
/* No destructor defined for global */
break;
case 5:
-#line 119 "../../src/configparser.y"
+#line 119 "./configparser.y"
{ yymsp[-1].minor.yy78 = NULL; }
#line 830 "configparser.c"
yy_destructor(1,&yymsp[0].minor);
@@ -840,7 +840,7 @@
yy_destructor(1,&yymsp[0].minor);
break;
case 9:
-#line 148 "../../src/configparser.y"
+#line 148 "./configparser.y"
{
if (ctx->ok) {
buffer_copy_string_buffer(yymsp[0].minor.yy41->key, yymsp[-2].minor.yy43);
@@ -868,7 +868,7 @@
yy_destructor(2,&yymsp[-1].minor);
break;
case 10:
-#line 172 "../../src/configparser.y"
+#line 172 "./configparser.y"
{
array *vars = ctx->current->value;
data_unset *du;
@@ -912,7 +912,7 @@
yy_destructor(3,&yymsp[-1].minor);
break;
case 11:
-#line 212 "../../src/configparser.y"
+#line 212 "./configparser.y"
{
if (strchr(yymsp[0].minor.yy0->ptr, '.') == NULL) {
yygotominor.yy43 = buffer_init_string("var.");
@@ -927,7 +927,7 @@
#line 927 "configparser.c"
break;
case 12:
-#line 224 "../../src/configparser.y"
+#line 224 "./configparser.y"
{
yygotominor.yy41 = configparser_merge_data(yymsp[-2].minor.yy41, yymsp[0].minor.yy41);
if (NULL == yygotominor.yy41) {
@@ -941,7 +941,7 @@
yy_destructor(5,&yymsp[-1].minor);
break;
case 13:
-#line 234 "../../src/configparser.y"
+#line 234 "./configparser.y"
{
yygotominor.yy41 = yymsp[0].minor.yy41;
yymsp[0].minor.yy41 = NULL;
@@ -949,7 +949,7 @@
#line 949 "configparser.c"
break;
case 14:
-#line 239 "../../src/configparser.y"
+#line 239 "./configparser.y"
{
yygotominor.yy41 = NULL;
if (strncmp(yymsp[0].minor.yy43->ptr, "env.", sizeof("env.") - 1) == 0) {
@@ -979,7 +979,7 @@
#line 979 "configparser.c"
break;
case 15:
-#line 266 "../../src/configparser.y"
+#line 266 "./configparser.y"
{
yygotominor.yy41 = (data_unset *)data_string_init();
buffer_copy_string_buffer(((data_string *)(yygotominor.yy41))->value, yymsp[0].minor.yy0);
@@ -989,7 +989,7 @@
#line 989 "configparser.c"
break;
case 16:
-#line 273 "../../src/configparser.y"
+#line 273 "./configparser.y"
{
yygotominor.yy41 = (data_unset *)data_integer_init();
((data_integer *)(yygotominor.yy41))->value = strtol(yymsp[0].minor.yy0->ptr, NULL, 10);
@@ -999,7 +999,7 @@
#line 999 "configparser.c"
break;
case 17:
-#line 279 "../../src/configparser.y"
+#line 279 "./configparser.y"
{
yygotominor.yy41 = (data_unset *)data_array_init();
array_free(((data_array *)(yygotominor.yy41))->value);
@@ -1009,7 +1009,7 @@
#line 1009 "configparser.c"
break;
case 18:
-#line 285 "../../src/configparser.y"
+#line 285 "./configparser.y"
{
yygotominor.yy40 = array_init();
}
@@ -1018,7 +1018,7 @@
yy_destructor(9,&yymsp[0].minor);
break;
case 19:
-#line 288 "../../src/configparser.y"
+#line 288 "./configparser.y"
{
yygotominor.yy40 = yymsp[-1].minor.yy40;
yymsp[-1].minor.yy40 = NULL;
@@ -1028,7 +1028,7 @@
yy_destructor(9,&yymsp[0].minor);
break;
case 20:
-#line 293 "../../src/configparser.y"
+#line 293 "./configparser.y"
{
if (buffer_is_empty(yymsp[0].minor.yy41->key) ||
NULL == array_get_element(yymsp[-2].minor.yy40, yymsp[0].minor.yy41->key->ptr)) {
@@ -1049,7 +1049,7 @@
yy_destructor(10,&yymsp[-1].minor);
break;
case 21:
-#line 310 "../../src/configparser.y"
+#line 310 "./configparser.y"
{
yygotominor.yy40 = yymsp[-1].minor.yy40;
yymsp[-1].minor.yy40 = NULL;
@@ -1058,7 +1058,7 @@
yy_destructor(10,&yymsp[0].minor);
break;
case 22:
-#line 315 "../../src/configparser.y"
+#line 315 "./configparser.y"
{
yygotominor.yy40 = array_init();
array_insert_unique(yygotominor.yy40, yymsp[0].minor.yy41);
@@ -1067,7 +1067,7 @@
#line 1067 "configparser.c"
break;
case 23:
-#line 321 "../../src/configparser.y"
+#line 321 "./configparser.y"
{
yygotominor.yy41 = yymsp[0].minor.yy41;
yymsp[0].minor.yy41 = NULL;
@@ -1075,7 +1075,7 @@
#line 1075 "configparser.c"
break;
case 24:
-#line 325 "../../src/configparser.y"
+#line 325 "./configparser.y"
{
buffer_copy_string_buffer(yymsp[0].minor.yy41->key, yymsp[-2].minor.yy43);
buffer_free(yymsp[-2].minor.yy43);
@@ -1093,7 +1093,7 @@
case 26:
break;
case 27:
-#line 337 "../../src/configparser.y"
+#line 337 "./configparser.y"
{
data_config *dc;
dc = (data_config *)array_get_element(ctx->srv->config_context, "global");
@@ -1104,7 +1104,7 @@
yy_destructor(12,&yymsp[0].minor);
break;
case 28:
-#line 344 "../../src/configparser.y"
+#line 344 "./configparser.y"
{
data_config *cur;
@@ -1122,7 +1122,7 @@
yy_destructor(14,&yymsp[0].minor);
break;
case 29:
-#line 355 "../../src/configparser.y"
+#line 355 "./configparser.y"
{
assert(yymsp[-3].minor.yy78->context_ndx < yymsp[0].minor.yy78->context_ndx);
yymsp[0].minor.yy78->prev = yymsp[-3].minor.yy78;
@@ -1136,7 +1136,7 @@
yy_destructor(15,&yymsp[-1].minor);
break;
case 30:
-#line 364 "../../src/configparser.y"
+#line 364 "./configparser.y"
{
yygotominor.yy78 = yymsp[0].minor.yy78;
yymsp[0].minor.yy78 = NULL;
@@ -1144,7 +1144,7 @@
#line 1144 "configparser.c"
break;
case 31:
-#line 369 "../../src/configparser.y"
+#line 369 "./configparser.y"
{
data_config *cur;
@@ -1162,7 +1162,7 @@
yy_destructor(14,&yymsp[0].minor);
break;
case 32:
-#line 380 "../../src/configparser.y"
+#line 380 "./configparser.y"
{
data_config *dc;
buffer *b, *rvalue, *op;
@@ -1310,7 +1310,7 @@
yy_destructor(19,&yymsp[-2].minor);
break;
case 33:
-#line 521 "../../src/configparser.y"
+#line 521 "./configparser.y"
{
yygotominor.yy27 = CONFIG_COND_EQ;
}
@@ -1318,7 +1318,7 @@
yy_destructor(20,&yymsp[0].minor);
break;
case 34:
-#line 524 "../../src/configparser.y"
+#line 524 "./configparser.y"
{
yygotominor.yy27 = CONFIG_COND_MATCH;
}
@@ -1326,7 +1326,7 @@
yy_destructor(21,&yymsp[0].minor);
break;
case 35:
-#line 527 "../../src/configparser.y"
+#line 527 "./configparser.y"
{
yygotominor.yy27 = CONFIG_COND_NE;
}
@@ -1334,7 +1334,7 @@
yy_destructor(22,&yymsp[0].minor);
break;
case 36:
-#line 530 "../../src/configparser.y"
+#line 530 "./configparser.y"
{
yygotominor.yy27 = CONFIG_COND_NOMATCH;
}
@@ -1342,7 +1342,7 @@
yy_destructor(23,&yymsp[0].minor);
break;
case 37:
-#line 534 "../../src/configparser.y"
+#line 534 "./configparser.y"
{
yygotominor.yy43 = NULL;
if (ctx->ok) {
@@ -1362,7 +1362,7 @@
#line 1362 "configparser.c"
break;
case 38:
-#line 551 "../../src/configparser.y"
+#line 551 "./configparser.y"
{
if (ctx->ok) {
if (0 != config_parse_file(ctx->srv, ctx, yymsp[0].minor.yy43->ptr)) {
@@ -1376,7 +1376,7 @@
yy_destructor(24,&yymsp[-1].minor);
break;
case 39:
-#line 561 "../../src/configparser.y"
+#line 561 "./configparser.y"
{
if (ctx->ok) {
if (0 != config_parse_cmd(ctx->srv, ctx, yymsp[0].minor.yy43->ptr)) {
@@ -1416,7 +1416,7 @@
while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser);
/* Here code is inserted which will be executed whenever the
** parser fails */
-#line 110 "../../src/configparser.y"
+#line 110 "./configparser.y"
ctx->ok = 0;
Modified: lighttpd/trunk/src/mod_ssi_exprparser.c
===================================================================
--- lighttpd/trunk/src/mod_ssi_exprparser.c 2009-03-18 11:14:00 UTC (rev 361)
+++ lighttpd/trunk/src/mod_ssi_exprparser.c 2009-03-18 11:19:11 UTC (rev 362)
@@ -4,7 +4,7 @@
/* First off, code is include which follows the "include" declaration
** in the input file. */
#include <stdio.h>
-#line 6 "../../src/mod_ssi_exprparser.y"
+#line 6 "./mod_ssi_exprparser.y"
#include <assert.h>
#include <string.h>
@@ -349,7 +349,7 @@
case 10:
case 11:
case 12:
-#line 24 "../../src/mod_ssi_exprparser.y"
+#line 24 "./mod_ssi_exprparser.y"
{ buffer_free((yypminor->yy0)); }
#line 354 "mod_ssi_exprparser.c"
break;
@@ -580,7 +580,7 @@
** break;
*/
case 0:
-#line 31 "../../src/mod_ssi_exprparser.y"
+#line 31 "./mod_ssi_exprparser.y"
{
ctx->val.bo = ssi_val_tobool(yymsp[0].minor.yy29);
ctx->val.type = SSI_TYPE_BOOL;
@@ -590,7 +590,7 @@
#line 590 "mod_ssi_exprparser.c"
break;
case 1:
-#line 38 "../../src/mod_ssi_exprparser.y"
+#line 38 "./mod_ssi_exprparser.y"
{
int cmp;
@@ -619,14 +619,14 @@
#line 619 "mod_ssi_exprparser.c"
break;
case 2:
-#line 63 "../../src/mod_ssi_exprparser.y"
+#line 63 "./mod_ssi_exprparser.y"
{
yygotominor.yy29 = yymsp[0].minor.yy29;
}
#line 626 "mod_ssi_exprparser.c"
break;
case 3:
-#line 66 "../../src/mod_ssi_exprparser.y"
+#line 66 "./mod_ssi_exprparser.y"
{
int e;
@@ -641,7 +641,7 @@
yy_destructor(1,&yymsp[-1].minor);
break;
case 4:
-#line 77 "../../src/mod_ssi_exprparser.y"
+#line 77 "./mod_ssi_exprparser.y"
{
int e;
@@ -656,7 +656,7 @@
yy_destructor(2,&yymsp[-1].minor);
break;
case 5:
-#line 88 "../../src/mod_ssi_exprparser.y"
+#line 88 "./mod_ssi_exprparser.y"
{
int e;
@@ -670,7 +670,7 @@
yy_destructor(9,&yymsp[-1].minor);
break;
case 6:
-#line 97 "../../src/mod_ssi_exprparser.y"
+#line 97 "./mod_ssi_exprparser.y"
{
yygotominor.yy29 = yymsp[-1].minor.yy29;
}
@@ -679,7 +679,7 @@
yy_destructor(11,&yymsp[0].minor);
break;
case 7:
-#line 101 "../../src/mod_ssi_exprparser.y"
+#line 101 "./mod_ssi_exprparser.y"
{
yygotominor.yy29 = ssi_val_init();
yygotominor.yy29->str = yymsp[0].minor.yy19;
@@ -688,14 +688,14 @@
#line 688 "mod_ssi_exprparser.c"
break;
case 8:
-#line 107 "../../src/mod_ssi_exprparser.y"
+#line 107 "./mod_ssi_exprparser.y"
{
yygotominor.yy19 = yymsp[0].minor.yy0;
}
#line 695 "mod_ssi_exprparser.c"
break;
case 9:
-#line 111 "../../src/mod_ssi_exprparser.y"
+#line 111 "./mod_ssi_exprparser.y"
{
yygotominor.yy19 = yymsp[-1].minor.yy19;
buffer_append_string_buffer(yygotominor.yy19, yymsp[0].minor.yy0);
@@ -704,37 +704,37 @@
#line 704 "mod_ssi_exprparser.c"
break;
case 10:
-#line 117 "../../src/mod_ssi_exprparser.y"
+#line 117 "./mod_ssi_exprparser.y"
{ yygotominor.yy8 = SSI_COND_EQ; }
#line 709 "mod_ssi_exprparser.c"
yy_destructor(3,&yymsp[0].minor);
break;
case 11:
-#line 118 "../../src/mod_ssi_exprparser.y"
+#line 118 "./mod_ssi_exprparser.y"
{ yygotominor.yy8 = SSI_COND_NE; }
#line 715 "mod_ssi_exprparser.c"
yy_destructor(4,&yymsp[0].minor);
break;
case 12:
-#line 119 "../../src/mod_ssi_exprparser.y"
+#line 119 "./mod_ssi_exprparser.y"
{ yygotominor.yy8 = SSI_COND_LE; }
#line 721 "mod_ssi_exprparser.c"
yy_destructor(8,&yymsp[0].minor);
break;
case 13:
-#line 120 "../../src/mod_ssi_exprparser.y"
+#line 120 "./mod_ssi_exprparser.y"
{ yygotominor.yy8 = SSI_COND_GE; }
#line 727 "mod_ssi_exprparser.c"
yy_destructor(6,&yymsp[0].minor);
break;
case 14:
-#line 121 "../../src/mod_ssi_exprparser.y"
+#line 121 "./mod_ssi_exprparser.y"
{ yygotominor.yy8 = SSI_COND_LT; }
#line 733 "mod_ssi_exprparser.c"
yy_destructor(7,&yymsp[0].minor);
break;
case 15:
-#line 122 "../../src/mod_ssi_exprparser.y"
+#line 122 "./mod_ssi_exprparser.y"
{ yygotominor.yy8 = SSI_COND_GT; }
#line 739 "mod_ssi_exprparser.c"
yy_destructor(5,&yymsp[0].minor);
@@ -766,7 +766,7 @@
while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser);
/* Here code is inserted which will be executed whenever the
** parser fails */
-#line 16 "../../src/mod_ssi_exprparser.y"
+#line 16 "./mod_ssi_exprparser.y"
ctx->ok = 0;
More information about the pkg-lighttpd-maintainers
mailing list