From b15a66f5357b54df3623aaae76b89ee3351b8be3 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 23 Aug 2018 10:32:07 +0000 Subject: [PATCH] - 1.4.50 breaks include_shell with our scriptlet, use glob include --- lighttpd.conf | 4 ++-- lighttpd.spec | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lighttpd.conf b/lighttpd.conf index 75079f7..08c6655 100644 --- a/lighttpd.conf +++ b/lighttpd.conf @@ -181,7 +181,7 @@ server.groupname = "lighttpd" #connection.kbytes-per-second = 32 # webapps configs -include_shell "for f in webapps.d/*.conf ; do [ -f \"$f\" ] && echo \"include \\"$f\\"\" ; done" +include "webapps.d/*.conf" # vhosts config -include_shell "for f in vhosts.d/*.conf ; do [ -f \"$f\" ] && echo \"include \\"$f\\"\" ; done" +include "vhosts.d/*.conf" diff --git a/lighttpd.spec b/lighttpd.spec index d631590..583bc3c 100644 --- a/lighttpd.spec +++ b/lighttpd.spec @@ -42,7 +42,7 @@ Summary: Fast and light HTTP server Summary(pl.UTF-8): Szybki i lekki serwer HTTP Name: lighttpd Version: 1.4.50 -Release: 1 +Release: 2 License: BSD Group: Networking/Daemons/HTTP Source0: https://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.xz @@ -111,6 +111,7 @@ 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 @@ -938,6 +939,7 @@ 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 -- 2.46.0