From 5e5dbbad7d1a4a2afc7e23630e3be0fe82c477bd Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 8 Jun 2012 05:30:45 +0000 Subject: lighttpd: bump to version 1.4.31 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../lighttpd-1.4.30-Fix-default-config-file.patch | 92 ---------------------- .../lighttpd-Fix-default-config-file.patch | 92 ++++++++++++++++++++++ package/lighttpd/lighttpd.mk | 2 +- 3 files changed, 93 insertions(+), 93 deletions(-) delete mode 100644 package/lighttpd/lighttpd-1.4.30-Fix-default-config-file.patch create mode 100644 package/lighttpd/lighttpd-Fix-default-config-file.patch diff --git a/package/lighttpd/lighttpd-1.4.30-Fix-default-config-file.patch b/package/lighttpd/lighttpd-1.4.30-Fix-default-config-file.patch deleted file mode 100644 index 59ce90775..000000000 --- a/package/lighttpd/lighttpd-1.4.30-Fix-default-config-file.patch +++ /dev/null @@ -1,92 +0,0 @@ -Modify the default lighttpd configuration file to have one a starting conf - - * Changed the log path to /var/log and logs filenames - * Disable IPv6 - * Do not setuid to a user that doesn't exist on the system - * Disable pdf ranges fix for Adobe Reader since it uses regex and we - don't always have pcre support - * Change the network backend to writev since linux-sendfile fails on buildroot - -Signed-off-by: Maxime Ripard ---- - doc/config/conf.d/access_log.conf | 2 +- - doc/config/lighttpd.conf | 18 +++++++++--------- - 2 files changed, 10 insertions(+), 10 deletions(-) - -Index: lighttpd-1.4.30/doc/config/lighttpd.conf -=================================================================== ---- lighttpd-1.4.30.orig/doc/config/lighttpd.conf -+++ lighttpd-1.4.30/doc/config/lighttpd.conf -@@ -13,7 +13,7 @@ - ## if you add a variable here. Add the corresponding variable in the - ## chroot example aswell. - ## --var.log_root = "/var/log/lighttpd" -+var.log_root = "/var/log" - var.server_root = "/srv/www" - var.state_dir = "/var/run" - var.home_dir = "/var/lib/lighttpd" -@@ -90,7 +90,7 @@ - ## - ## Use IPv6? - ## --server.use-ipv6 = "enable" -+# server.use-ipv6 = "enable" - - ## - ## bind to a specific IP -@@ -101,8 +101,8 @@ - ## Run as a different username/groupname. - ## This requires root permissions during startup. - ## --server.username = "lighttpd" --server.groupname = "lighttpd" -+# server.username = "lighttpd" -+# server.groupname = "lighttpd" - - ## - ## enable core files. -@@ -138,7 +138,7 @@ - ## - ## Path to the error log file - ## --server.errorlog = log_root + "/error.log" -+server.errorlog = log_root + "/lighttpd-error.log" - - ## - ## If you want to log to syslog you have to unset the -@@ -188,7 +188,7 @@ - ## linux-sendfile - is recommended for small files. - ## writev - is recommended for sending many large files - ## --server.network-backend = "linux-sendfile" -+server.network-backend = "writev" - - ## - ## As lighttpd is a single-threaded server, its main resource limit is -@@ -311,9 +311,9 @@ - ## disable range requests for pdf files - ## workaround for a bug in the Acrobat Reader plugin. - ## --$HTTP["url"] =~ "\.pdf$" { -- server.range-requests = "disable" --} -+# $HTTP["url"] =~ "\.pdf$" { -+# server.range-requests = "disable" -+# } - - ## - ## url handling modules (rewrite, redirect) -Index: lighttpd-1.4.30/doc/config/conf.d/access_log.conf -=================================================================== ---- lighttpd-1.4.30.orig/doc/config/conf.d/access_log.conf -+++ lighttpd-1.4.30/doc/config/conf.d/access_log.conf -@@ -9,7 +9,7 @@ - ## - ## Default access log. - ## --accesslog.filename = log_root + "/access.log" -+accesslog.filename = log_root + "/lighttpd-access.log" - - ## - ## The default format produces CLF compatible output. diff --git a/package/lighttpd/lighttpd-Fix-default-config-file.patch b/package/lighttpd/lighttpd-Fix-default-config-file.patch new file mode 100644 index 000000000..59ce90775 --- /dev/null +++ b/package/lighttpd/lighttpd-Fix-default-config-file.patch @@ -0,0 +1,92 @@ +Modify the default lighttpd configuration file to have one a starting conf + + * Changed the log path to /var/log and logs filenames + * Disable IPv6 + * Do not setuid to a user that doesn't exist on the system + * Disable pdf ranges fix for Adobe Reader since it uses regex and we + don't always have pcre support + * Change the network backend to writev since linux-sendfile fails on buildroot + +Signed-off-by: Maxime Ripard +--- + doc/config/conf.d/access_log.conf | 2 +- + doc/config/lighttpd.conf | 18 +++++++++--------- + 2 files changed, 10 insertions(+), 10 deletions(-) + +Index: lighttpd-1.4.30/doc/config/lighttpd.conf +=================================================================== +--- lighttpd-1.4.30.orig/doc/config/lighttpd.conf ++++ lighttpd-1.4.30/doc/config/lighttpd.conf +@@ -13,7 +13,7 @@ + ## if you add a variable here. Add the corresponding variable in the + ## chroot example aswell. + ## +-var.log_root = "/var/log/lighttpd" ++var.log_root = "/var/log" + var.server_root = "/srv/www" + var.state_dir = "/var/run" + var.home_dir = "/var/lib/lighttpd" +@@ -90,7 +90,7 @@ + ## + ## Use IPv6? + ## +-server.use-ipv6 = "enable" ++# server.use-ipv6 = "enable" + + ## + ## bind to a specific IP +@@ -101,8 +101,8 @@ + ## Run as a different username/groupname. + ## This requires root permissions during startup. + ## +-server.username = "lighttpd" +-server.groupname = "lighttpd" ++# server.username = "lighttpd" ++# server.groupname = "lighttpd" + + ## + ## enable core files. +@@ -138,7 +138,7 @@ + ## + ## Path to the error log file + ## +-server.errorlog = log_root + "/error.log" ++server.errorlog = log_root + "/lighttpd-error.log" + + ## + ## If you want to log to syslog you have to unset the +@@ -188,7 +188,7 @@ + ## linux-sendfile - is recommended for small files. + ## writev - is recommended for sending many large files + ## +-server.network-backend = "linux-sendfile" ++server.network-backend = "writev" + + ## + ## As lighttpd is a single-threaded server, its main resource limit is +@@ -311,9 +311,9 @@ + ## disable range requests for pdf files + ## workaround for a bug in the Acrobat Reader plugin. + ## +-$HTTP["url"] =~ "\.pdf$" { +- server.range-requests = "disable" +-} ++# $HTTP["url"] =~ "\.pdf$" { ++# server.range-requests = "disable" ++# } + + ## + ## url handling modules (rewrite, redirect) +Index: lighttpd-1.4.30/doc/config/conf.d/access_log.conf +=================================================================== +--- lighttpd-1.4.30.orig/doc/config/conf.d/access_log.conf ++++ lighttpd-1.4.30/doc/config/conf.d/access_log.conf +@@ -9,7 +9,7 @@ + ## + ## Default access log. + ## +-accesslog.filename = log_root + "/access.log" ++accesslog.filename = log_root + "/lighttpd-access.log" + + ## + ## The default format produces CLF compatible output. diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 8d1f212e1..c7fae3241 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -4,7 +4,7 @@ # ############################################################# -LIGHTTPD_VERSION = 1.4.30 +LIGHTTPD_VERSION = 1.4.31 LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-1.4.x LIGHTTPD_DEPENDENCIES = host-pkg-config LIGHTTPD_CONF_OPT = \ -- cgit v1.2.3-55-g7522