- 1.4.50 breaks include_shell with our scriptlet, use glob include

diff --git a/lighttpd.conf b/lighttpd.conf
index 75079f7cfccae3a9b3f03e8e00fe4fd6fdf71155..08c66556da9f000d6666c116c587f4846cdba151 100644 (file)
--- 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 d6315901e318a07152e0e16341c0d7a818759cd4..583bc3c561cc7303b2a7ace92405b244a2b05604 100644 (file)
--- 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