- merged 1.4.50 from PLD

diff --git a/lighttpd-bug-2876.patch b/lighttpd-bug-2876.patch
deleted file mode 100644 (file)
index b1c03e1..0000000
--- a/lighttpd-bug-2876.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e21906b3b41cda3cefebcc8b96ae6ad08549e504 Mon Sep 17 00:00:00 2001
-From: Glenn Strauss <gstrauss@gluelogic.com>
-Date: Thu, 15 Mar 2018 23:21:37 -0400
-Subject: [PATCH] [core] fix crash if 'host' empty in config (fixes #2876)
-
-x-ref:
- "segfault with fastcgi app"
-  https://redmine.lighttpd.net/issues/2876
----
- src/gw_backend.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/gw_backend.c b/src/gw_backend.c
-index dbef6328..7b5ef190 100644
---- a/src/gw_backend.c
-+++ b/src/gw_backend.c
-@@ -1399,8 +1399,12 @@ int gw_set_defaults_backend(server *srv, gw_plugin_data *p, data_unset *du, size
-                     host->port = 80;
-                 }
- 
--                host->family = (!buffer_string_is_empty(host->host)
--                                && NULL != strchr(host->host->ptr, ':'))
-+                if (buffer_string_is_empty(host->host)) {
-+                    buffer_copy_string_len(host->host,
-+                                           CONST_STR_LEN("127.0.0.1"));
-+                }
-+
-+                host->family = (NULL != strchr(host->host->ptr, ':'))
-                   ? AF_INET6
-                   : AF_INET;
-             }

diff --git a/lighttpd-use_bin_sh.patch b/lighttpd-use_bin_sh.patch
deleted file mode 100644 (file)
index de08dd3..0000000
--- a/lighttpd-use_bin_sh.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-## Use /bin/sh to execute external programs instead of getting
-## the shell from $SHELL (See ticket #388)
-#
-# http://trac.lighttpd.net/trac/ticket/388
-
---- lighttpd-1.4.12/src/proc_open.c~   2006-09-19 15:49:41.846531074 +0300
-+++ lighttpd-1.4.12/src/proc_open.c    2006-09-19 15:51:13.658593480 +0300
-@@ -219,11 +219,7 @@
- /* {{{ proc_open */
- int proc_open(proc_handler_t *proc, const char *command) {
-       pid_t child;
--      const char *shell;
--
--      if (NULL == (shell = getenv(SHELLENV))) {
--              shell = "/bin/sh";
--      }
-+      const char *shell = "/bin/sh";
- 
-       if (proc_open_pipes(proc) != 0) {
-               return -1;

diff --git a/lighttpd.init b/lighttpd.init
index 69d169b3ec553deadc750cac631c47809e7a8511..026a23048dbb93659d539e9ebc70dd958f7956e5 100755 (executable)
--- a/lighttpd.init
+++ b/lighttpd.init
@@ -38,7 +38,7 @@ configtest() {
        if [ -n "$out" ]; then
                # make it unique, format nicely
                out=$(echo "$out" | sort -u | xargs | sed -e 's/ /, /g')
        if [ -n "$out" ]; then
                # make it unique, format nicely
                out=$(echo "$out" | sort -u | xargs | sed -e 's/ /, /g')

-               echo >&2 "WARNING: found deprecated '$out', convert to 'url.rewrite-final' recommented, See http://redmine.lighttpd.net/issues/2379"
+               echo >&2 "WARNING: found deprecated '$out', convert to 'url.rewrite-final' recommended, See http://redmine.lighttpd.net/issues/2379"

        fi
 
        env SHELL=/bin/sh $DAEMON -t -f $CONFIGFILE $HTTPD_OPTS
        fi
 
        env SHELL=/bin/sh $DAEMON -t -f $CONFIGFILE $HTTPD_OPTS

diff --git a/lighttpd.spec b/lighttpd.spec
index 03b0add3c04bacf47bd60634e8ce9a47d5bf28dc..d6315901e318a07152e0e16341c0d7a818759cd4 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -4,6 +4,8 @@
 # - patch with mod_websocket: https://github.com/Juniper/lighttpd-for-juise
 # - lighttpd-mod_fd_transfer: https://redmine.lighttpd.net/boards/3/topics/4992
 # - add db specific mod_vhostdb_* sub-packages
 # - patch with mod_websocket: https://github.com/Juniper/lighttpd-for-juise
 # - lighttpd-mod_fd_transfer: https://redmine.lighttpd.net/boards/3/topics/4992
 # - add db specific mod_vhostdb_* sub-packages

+# - package mod_sockproxy
+#   https://github.com/lighttpd/lighttpd1.4/commit/c4d743bb4d0cc045d41322169a4e36a151e247f1

 #
 # Conditional build:
 %bcond_with            tests           # build with tests
 #
 # Conditional build:
 %bcond_with            tests           # build with tests


@@ -39,12 +41,12 @@
 Summary:       Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd
 Summary:       Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd

-Version:       1.4.49
-Release:       2
+Version:       1.4.50
+Release:       1

 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       https://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.xz
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       https://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.xz

-# Source0-md5: aaf8165379351c3766e5ad1e5c9dbe8b
+# Source0-md5: 0547831efda8492648b7f0c652865dfd

 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.user
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.user


@@ -109,13 +111,11 @@ Source145:        mod_authn_mysql.conf
 # use branch.sh script to create branch.diff
 #Patch100:     %{name}-branch.diff
 ## Patch100-md5:       7bd09235304c8bcb16f34d49d480c0fb
 # use branch.sh script to create branch.diff
 #Patch100:     %{name}-branch.diff
 ## Patch100-md5:       7bd09235304c8bcb16f34d49d480c0fb

-Patch0:                %{name}-use_bin_sh.patch

 Patch1:                %{name}-mod_evasive-status_code.patch
 Patch2:                %{name}-mod_h264_streaming.patch
 Patch3:                %{name}-branding.patch
 Patch6:                test-port-setup.patch
 Patch7:                env-documentroot.patch
 Patch1:                %{name}-mod_evasive-status_code.patch
 Patch2:                %{name}-mod_h264_streaming.patch
 Patch3:                %{name}-branding.patch
 Patch6:                test-port-setup.patch
 Patch7:                env-documentroot.patch

-Patch8:                lighttpd-bug-2876.patch

 URL:           https://www.lighttpd.net/
 %{?with_geoip:BuildRequires:   GeoIP-devel}
 %{?with_xattr:BuildRequires:   attr-devel}
 URL:           https://www.lighttpd.net/
 %{?with_geoip:BuildRequires:   GeoIP-devel}
 %{?with_xattr:BuildRequires:   attr-devel}


@@ -938,13 +938,11 @@ Plik monitrc do monitorowania serwera www lighttpd.
 %prep
 %setup -q
 #%patch100 -p1
 %prep
 %setup -q
 #%patch100 -p1

-%patch0 -p1

 #%patch1 -p1 UPDATE (and submit upstream!) if you need this
 %{?with_h264_streaming:%patch2 -p1}
 %patch3 -p1
 %patch6 -p1
 #%patch7 -p1 probably fixed upstream
 #%patch1 -p1 UPDATE (and submit upstream!) if you need this
 %{?with_h264_streaming:%patch2 -p1}
 %patch3 -p1
 %patch6 -p1
 #%patch7 -p1 probably fixed upstream

-%patch8 -p1

 
 rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead
 
 
 rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead