X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=lighttpd.spec;h=2f26afa4cd47e440aa1fe15826b3394f43756518;hb=fc6d9212765e910a655eee61397087f2e1a0c2bd;hp=03b0add3c04bacf47bd60634e8ce9a47d5bf28dc;hpb=223786b81027a6b9383af70d71f478fec2b2429a;p=packages%2Flighttpd.git

diff --git a/lighttpd.spec b/lighttpd.spec
index 03b0add..2f26afa 100644
--- 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
+Version:	1.4.52
 Release:	2
 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:	34f5c79137325ba31484bed1e54e66e6
 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
-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
-Patch8:		lighttpd-bug-2876.patch
 URL:		https://www.lighttpd.net/
 %{?with_geoip:BuildRequires:	GeoIP-devel}
 %{?with_xattr:BuildRequires:	attr-devel}
@@ -643,6 +643,18 @@ webserver BEFORE they are handled.
 Ten moduł pozwala na przepisywanie zbioru URL-i wewnętrznie w serwerze
 WWW _przed_ ich obsługą.
 
+%package mod_sockproxy
+Summary:	lighttpd module for socket forwarding
+Summary(pl.UTF-8):	Moduł lighttpd przekazywania gniazdek
+Group:		Networking/Daemons/HTTP
+Requires:	%{name} = %{version}-%{release}
+
+%description mod_sockproxy
+Sock proxy module for socket forwarding.
+
+%description mod_sockproxy -l pl.UTF-8
+Moduł proxy do przekazywania gniazdek.
+
 %package mod_rrdtool
 Summary:	lighttpd module for monitoring traffic and server load
 Summary(pl.UTF-8):	Moduł lighttpd do monitorowania ruchu i obciążenia serwera
@@ -938,13 +950,11 @@ 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
 %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
 
@@ -1185,6 +1195,7 @@ fi
 %module_scripts mod_proxy
 %module_scripts mod_redirect
 %module_scripts mod_rewrite
+%module_scripts mod_sockproxy
 %module_scripts mod_scgi
 %module_scripts mod_secdownload
 %module_scripts mod_setenv
@@ -1419,6 +1430,10 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_rewrite.conf
 %attr(755,root,root) %{pkglibdir}/mod_rewrite.so
 
+%files mod_sockproxy
+%defattr(644,root,root,755)
+%attr(755,root,root) %{pkglibdir}/mod_sockproxy.so
+
 %files mod_rrdtool
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_rrdtool.conf