[packages/lighttpd] update md5 to actual release tarball
glen
glen at pld-linux.org
Mon Aug 13 17:44:11 CEST 2018
commit 7faeca4c7fff424bced573e51952b2d2564167e7
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Mon Aug 13 18:33:12 2018 +0300
update md5 to actual release tarball
bug-2882.patch | 34 ----------------------------------
lighttpd-use_bin_sh.patch | 20 --------------------
lighttpd.spec | 6 +-----
3 files changed, 1 insertion(+), 59 deletions(-)
---
diff --git a/lighttpd.spec b/lighttpd.spec
index ff21b92..ce60963 100644
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -44,7 +44,7 @@ Release: 1
License: BSD
Group: Networking/Daemons/HTTP
Source0: https://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.xz
-# Source0-md5: cc23eba4e8eef1100aad0bbd36c4699a
+# Source0-md5: 0547831efda8492648b7f0c652865dfd
Source1: %{name}.init
Source2: %{name}.conf
Source3: %{name}.user
@@ -113,14 +113,12 @@ Source145: mod_authn_mysql.conf
# 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
Patch4: systemd.patch
Patch6: test-port-setup.patch
Patch7: env-documentroot.patch
-Patch9: bug-2882.patch
URL: https://www.lighttpd.net/
%{?with_geoip:BuildRequires: GeoIP-devel}
%{?with_xattr:BuildRequires: attr-devel}
@@ -948,14 +946,12 @@ Plik monitrc do monitorowania serwera www lighttpd.
%prep
%setup -q
#%patch100 -p1
-%patch0 -p1
#%patch1 -p1 UPDATE (and submit upstream!) if you need this
%{?with_h264_streaming:%patch2 -p1}
%patch3 -p1
%patch4 -p1
%patch6 -p1
#%patch7 -p1 probably fixed upstream
-%patch9 -p1
rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead
diff --git a/bug-2882.patch b/bug-2882.patch
deleted file mode 100644
index 2f5d7e3..0000000
--- a/bug-2882.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 24886e58e141ff51b5efc3cdc2e8293e54c31037 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen at pld-linux.org>
-Date: Fri, 20 Apr 2018 15:01:19 +0300
-Subject: [PATCH] fcgi: process fastcgi.balance option
-
-refs: https://redmine.lighttpd.net/issues/2882
----
- src/mod_fastcgi.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/mod_fastcgi.c b/src/mod_fastcgi.c
-index b442214e..988a2e50 100644
---- a/src/mod_fastcgi.c
-+++ b/src/mod_fastcgi.c
-@@ -463,6 +463,7 @@ static int fcgi_patch_connection(server *srv, connection *con, plugin_data *p) {
- PATCH(exts_auth);
- PATCH(exts_resp);
- PATCH(debug);
-+ PATCH(balance);
- PATCH(ext_mapping);
-
- /* skip the first, the global context */
-@@ -483,6 +484,8 @@ static int fcgi_patch_connection(server *srv, connection *con, plugin_data *p) {
- PATCH(exts_resp);
- } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("fastcgi.debug"))) {
- PATCH(debug);
-+ } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("fastcgi.balance"))) {
-+ PATCH(balance);
- } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("fastcgi.map-extensions"))) {
- PATCH(ext_mapping);
- }
---
-2.16.2
-
diff --git a/lighttpd-use_bin_sh.patch b/lighttpd-use_bin_sh.patch
deleted file mode 100644
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;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lighttpd.git/commitdiff/7faeca4c7fff424bced573e51952b2d2564167e7
More information about the pld-cvs-commit
mailing list