소스 검색

package/lighttpd: bump version to 1.4.63

- rebase (and change to git format) 0001-Fix-default-config-file.patch/
  0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch

For details see [1].

[1] https://www.lighttpd.net/2021/12/4/1.4.63/

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Peter Seiderer 3 년 전
부모
커밋
2a00246645
3개의 변경된 파일33개의 추가작업 그리고 20개의 파일을 삭제
  1. 30 17
      package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch
  2. 2 2
      package/lighttpd/lighttpd.hash
  3. 1 1
      package/lighttpd/lighttpd.mk

+ 30 - 17
package/lighttpd/0001-Fix-default-config-file.patch → package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch

@@ -1,4 +1,8 @@
-Modify the default lighttpd configuration file to have one a starting conf
+From d1de409b0aeb8dffd42673444043caf01437804e Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Mon, 13 Dec 2021 22:07:17 +0100
+Subject: [PATCH] Modify the default lighttpd configuration file to have one a
+ starting conf
 
   * Changed the log path to /var/log and logs filenames
   * Disable IPv6
@@ -9,11 +13,16 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
 Signed-off-by: Simon Dawson <spdawson@gmail.com>
 [Gustavo: update for 1.4.37]
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ doc/config/conf.d/access_log.conf |  2 +-
+ doc/config/lighttpd.conf          | 16 ++++++++--------
+ 2 files changed, 9 insertions(+), 9 deletions(-)
 
-diff -Nura lighttpd-1.4.37.orig/doc/config/conf.d/access_log.conf lighttpd-1.4.37/doc/config/conf.d/access_log.conf
---- lighttpd-1.4.37.orig/doc/config/conf.d/access_log.conf	2015-09-01 14:38:48.684673663 -0300
-+++ lighttpd-1.4.37/doc/config/conf.d/access_log.conf	2015-09-01 14:38:53.975855142 -0300
-@@ -9,7 +9,7 @@
+diff --git a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf
+index e685d43..92cff4f 100644
+--- a/doc/config/conf.d/access_log.conf
++++ b/doc/config/conf.d/access_log.conf
+@@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" )
  ##
  ## Default access log.
  ##
@@ -22,12 +31,13 @@ diff -Nura lighttpd-1.4.37.orig/doc/config/conf.d/access_log.conf lighttpd-1.4.3
  
  ##
  ## The default format produces CLF compatible output.
-diff -Nura lighttpd-1.4.37.orig/doc/config/lighttpd.conf lighttpd-1.4.37/doc/config/lighttpd.conf
---- lighttpd-1.4.37.orig/doc/config/lighttpd.conf	2015-09-01 14:38:48.684673663 -0300
-+++ lighttpd-1.4.37/doc/config/lighttpd.conf	2015-09-01 14:39:40.256442492 -0300
+diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf
+index 495d2a1..c3e1446 100644
+--- a/doc/config/lighttpd.conf
++++ b/doc/config/lighttpd.conf
 @@ -13,8 +13,8 @@
  ## if you add a variable here. Add the corresponding variable in the
- ## chroot example aswell.
+ ## chroot example as well.
  ##
 -var.log_root    = "/var/log/lighttpd"
 -var.server_root = "/srv/www"
@@ -36,7 +46,7 @@ diff -Nura lighttpd-1.4.37.orig/doc/config/lighttpd.conf lighttpd-1.4.37/doc/con
  var.state_dir   = "/run"
  var.home_dir    = "/var/lib/lighttpd"
  var.conf_dir    = "/etc/lighttpd"
-@@ -90,7 +90,7 @@
+@@ -90,7 +90,7 @@ server.port = 80
  ##
  ## Use IPv6?
  ##
@@ -45,7 +55,7 @@ diff -Nura lighttpd-1.4.37.orig/doc/config/lighttpd.conf lighttpd-1.4.37/doc/con
  
  ##
  ## bind to a specific IP
-@@ -101,8 +101,8 @@
+@@ -101,8 +101,8 @@ server.use-ipv6 = "enable"
  ## Run as a different username/groupname.
  ## This requires root permissions during startup. 
  ##
@@ -56,7 +66,7 @@ diff -Nura lighttpd-1.4.37.orig/doc/config/lighttpd.conf lighttpd-1.4.37/doc/con
  
  ##
  ## Enable lighttpd to serve requests on sockets received from systemd
-@@ -118,7 +118,7 @@
+@@ -118,7 +118,7 @@ server.groupname = "lighttpd"
  ##
  ## Document root
  ##
@@ -65,7 +75,7 @@ diff -Nura lighttpd-1.4.37.orig/doc/config/lighttpd.conf lighttpd-1.4.37/doc/con
  
  ##
  ## The value for the "Server:" response field.
-@@ -144,7 +144,7 @@
+@@ -144,7 +144,7 @@ server.pid-file = state_dir + "/lighttpd.pid"
  ##
  ## Path to the error log file
  ##
@@ -74,12 +84,15 @@ diff -Nura lighttpd-1.4.37.orig/doc/config/lighttpd.conf lighttpd-1.4.37/doc/con
  
  ##
  ## If you want to log to syslog you have to unset the 
-@@ -195,7 +195,7 @@
- ## sendfile       - is recommended for small files.
- ## writev         - is recommended for sending many large files
+@@ -192,7 +192,7 @@ include conf_dir + "/conf.d/debug.conf"
+ ## and write(). Every modern OS provides its own syscall to help network
+ ## servers transfer files as fast as possible 
  ##
--server.network-backend = "sendfile"
+-#server.network-backend = "sendfile"
 +server.network-backend = "writev"
  
  ##
  ## As lighttpd is a single-threaded server, its main resource limit is
+-- 
+2.34.1
+

+ 2 - 2
package/lighttpd/lighttpd.hash

@@ -1,4 +1,4 @@
-# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.61.sha256sum
-sha256  43f0d63d04a1b7c5b8aab07e0612e44ccad0afc0614bab784c5b019872363432  lighttpd-1.4.61.tar.xz
+# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.63.sha256sum
+sha256  2aef7f0102ebf54a1241a1c3ea8976892f8684bfb21697c9fffb8de0e2d6eab9  lighttpd-1.4.63.tar.xz
 # Locally calculated
 sha256  5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13  COPYING

+ 1 - 1
package/lighttpd/lighttpd.mk

@@ -5,7 +5,7 @@
 ################################################################################
 
 LIGHTTPD_VERSION_MAJOR = 1.4
-LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).61
+LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).63
 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz
 LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x
 LIGHTTPD_LICENSE = BSD-3-Clause