X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=nginx.spec;h=e878939c058942ec514070b4d728d6f8f467d84d;hb=924400caa957d83ab7d2899775b761d54567c86d;hp=f1beea8b7a229e902b755fb70586b98f4e7c8d4c;hpb=10f92d736edd0f3ad409a54e2e529e49bb852302;p=packages%2Fnginx.git

diff --git a/nginx.spec b/nginx.spec
index f1beea8..e878939 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -27,6 +27,7 @@
 %bcond_with	http_browser	# http browser module (header "User-agent" parser)
 %bcond_with	modsecurity	# modsecurity module
 %bcond_with	rtmp		# rtmp support
+%bcond_without	vts		# virtual host traffic status module
 
 %ifarch x32
 %undefine	with_rtsig
@@ -34,6 +35,7 @@
 
 %define		ssl_version	1.0.2
 %define		rtmp_version	1.2.1
+%define		vts_version	0.1.18
 %define		modsecurity_version	2.9.2
 Summary:	High perfomance HTTP and reverse proxy server
 Summary(pl.UTF-8):	Serwer HTTP i odwrotne proxy o wysokiej wydajności
@@ -41,12 +43,12 @@ Summary(pl.UTF-8):	Serwer HTTP i odwrotne proxy o wysokiej wydajności
 # - stable: production quality with stable API
 # - mainline: production quality but API can change
 Name:		nginx
-Version:	1.15.8
-Release:	4
+Version:	1.15.9
+Release:	3
 License:	BSD-like
 Group:		Networking/Daemons/HTTP
 Source0:	http://nginx.org/download/%{name}-%{version}.tar.gz
-# Source0-md5:	49eecc51a45bdcc8cc147f6747ef8a4c
+# Source0-md5:	00dde20d4d2cc65bdaf8950a5bd3e14b
 Source1:	http://nginx.net/favicon.ico
 # Source1-md5:	2aaf2115c752cbdbfb8a2f0b3c3189ab
 Source2:	proxy.conf
@@ -61,6 +63,8 @@ Source22:	http://www.modsecurity.org/tarball/%{modsecurity_version}/modsecurity-
 # Source22-md5:	4d9454efb19269c4288ae408ea438b76
 Source101:	https://github.com/arut/nginx-rtmp-module/archive/v%{rtmp_version}/%{name}-rtmp-module-%{rtmp_version}.tar.gz
 # Source101-md5:	639ac2b78103adaccbcfe484a92acf44
+Source102:	https://github.com/vozlt/nginx-module-vts/archive/v%{vts_version}.tar.gz
+# Source102-md5:	409a10dbd85e0b807cc77eecec29a3b5
 Patch0:		%{name}-no-Werror.patch
 Patch1:		%{name}-modsecurity-xheaders.patch
 URL:		http://nginx.org/
@@ -253,7 +257,7 @@ monitrc file for monitoring nginx webserver.
 Plik monitrc do monitorowania serwera WWW nginx.
 
 %prep
-%setup -q %{?with_rtmp:-a101} %{?with_modsecurity:-a22}
+%setup -q %{?with_rtmp:-a101} %{?with_modsecurity:-a22} %{?with_vts:-a102}
 %patch0 -p0
 %{?with_modsecurity:%patch1 -p0}
 
@@ -261,6 +265,10 @@ Plik monitrc do monitorowania serwera WWW nginx.
 mv nginx-rtmp-module-%{rtmp_version} nginx-rtmp-module
 %endif
 
+%if %{with vts}
+mv nginx-module-vts-%{vts_version} nginx-vts-module
+%endif
+
 # build mime.types.conf
 #sh %{SOURCE17} /etc/mime.types
 
@@ -313,6 +321,7 @@ cp -f configure auto/
 	%{?with_ssl:--with-http_ssl_module} \
 	%{!?with_http_browser:--without-http_browser_module} \
 	%{?with_rtmp:--add-module=./nginx-rtmp-module} \
+	%{?with_vts:--add-module=./nginx-vts-module} \
 	%{?with_auth_request:--with-http_auth_request_module} \
 	%{?with_threads:--with-threads} \
 	%{?with_http2:--with-http_v2_module} \
@@ -342,6 +351,7 @@ install -d $RPM_BUILD_ROOT/etc/rc.d/init.d \
 	$RPM_BUILD_ROOT%{_localstatedir}/cache/%{name} \
 	$RPM_BUILD_ROOT%{_localstatedir}/lock/subsys/%{name} \
 	$RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/{conf,modules,vhosts,webapps}.d} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/snippets \
 	$RPM_BUILD_ROOT/etc/{logrotate.d,monit} \
 	$RPM_BUILD_ROOT{%{systemdunitdir},/etc/systemd/system}
 
@@ -447,6 +457,7 @@ fi
 %dir %attr(750,root,nginx) %{_sysconfdir}
 %dir %{_sysconfdir}/conf.d
 %dir %{_sysconfdir}/modules.d
+%dir %{_sysconfdir}/snippets
 %dir %{_sysconfdir}/vhosts.d
 %dir %{_sysconfdir}/webapps.d
 %attr(640,root,root) %{_sysconfdir}/mime.types