use blob include for conf.d as well

[packages/lighttpd.git] / lighttpd.spec

diff --git a/lighttpd.spec b/lighttpd.spec
index 01d0554cf8940cc97c699f2c6a636f4ba073f28a..fb659bd64bf361146a284cd7d755ce74040fee02 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
+# - package mod_sockproxy
+#   https://github.com/lighttpd/lighttpd1.4/commit/c4d743bb4d0cc045d41322169a4e36a151e247f1
 #
 # 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
-Version:       1.4.49
-Release:       4
+Version:       1.4.50
+Release:       5
 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
@@ -113,15 +115,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
-Patch8:                lighttpd-bug-2876.patch
-Patch9:                bug-2882.patch
+Patch5:                test-port-setup.patch
+Patch6:                a9e131..df8e4f.patch
 URL:           https://www.lighttpd.net/
 %{?with_geoip:BuildRequires:   GeoIP-devel}
 %{?with_xattr:BuildRequires:   attr-devel}
@@ -949,15 +948,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
+%patch5 -p1
 %patch6 -p1
-#%patch7 -p1 probably fixed upstream
-%patch8 -p1
-%patch9 -p1
 
 rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead