|
|
@@ -8,6 +8,7 @@
|
|
|
%bcond_with geoip
|
|
|
%endif
|
|
|
|
|
|
+
|
|
|
%if "%{_dist_release}" > "vl6"
|
|
|
%define nginx_user www-data
|
|
|
%else
|
|
|
@@ -26,7 +27,7 @@ Summary: Robust, small and high performance http and reverse proxy server
|
|
|
Summary(ja): 堅牢・軽量・高性能な HTTP およびリバースプロキシサーバ
|
|
|
Name: nginx
|
|
|
Version: 1.16.0
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Release: 3%{?_dist_release}
|
|
|
|
|
|
Group: System Environment/Daemons
|
|
|
# BSD License (two clause)
|
|
|
@@ -68,6 +69,10 @@ Source2000: lifeeth-mod_wsgi-%{mod_wsgi_version}.tar.bz2
|
|
|
%define nginx_dav_ext_module_version 3.0.0
|
|
|
Source2010: https://github.com/arut/nginx-dav-ext-module/archive/v%{nginx_dav_ext_module_version}.tar.gz#/nginx-dav-ext-module-%{nginx_dav_ext_module_version}.tar.gz
|
|
|
|
|
|
+%global naxsi_version untagged-afabfc163946baa8036f
|
|
|
+Source2020: https://github.com/nbs-system/naxsi/archive/untagged-afabfc163946baa8036f.tar.gz#/naxsi-%{naxsi_version}.tar.gz
|
|
|
+Source2021: naxsi_params
|
|
|
+
|
|
|
# removes -Werror in upstream build scripts. -Werror conflicts with
|
|
|
# -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
|
|
|
Patch0: nginx-auto-cc-gcc.patch
|
|
|
@@ -157,7 +162,7 @@ Nginx [engine x/エンジンX] は Igor Sysoev により開発された以下の
|
|
|
このパッケージには Passenger サポートを含んだ nginxサーバが入っています。
|
|
|
|
|
|
%prep
|
|
|
-%setup -q -a 1000 -a 1010 -a 1020 -a 1030 %{?with_wsgi:-a 2000} -a 2010
|
|
|
+%setup -q -a 1000 -a 1010 -a 1020 -a 1030 %{?with_wsgi:-a 2000} -a 2010 -a 2020
|
|
|
|
|
|
%patch0 -p0
|
|
|
|
|
|
@@ -232,6 +237,7 @@ CONFIGOPTS="\
|
|
|
--add-module=lifeeth-mod_wsgi-%{mod_wsgi_version} \
|
|
|
%endif
|
|
|
--add-module=nginx-dav-ext-module-%{nginx_dav_ext_module_version} \
|
|
|
+ --add-module=naxsi-%{naxsi_version}/naxsi_src \
|
|
|
%ifarch i686
|
|
|
--with-cpu-opt=pentiumpro \
|
|
|
--with-zlib-asm=pentiumpro \
|
|
|
@@ -303,6 +309,12 @@ cp -f gnosek-nginx-upstream-fair-%{upstream_fair_version}/README README.upstream
|
|
|
cp -f nginx-dav-ext-module-%{nginx_dav_ext_module_version}/LICENSE LICENSE.dav-ext-module
|
|
|
cp -f nginx-dav-ext-module-%{nginx_dav_ext_module_version}/README.rst README.dav-ext-module.rst
|
|
|
|
|
|
+# NAXSI module
|
|
|
+cp -f naxsi-%{naxsi_version}/LICENSE LICENSE.naxsi
|
|
|
+cp -f naxsi-%{naxsi_version}/README.md README.naxsi.md
|
|
|
+install -p -m0644 naxsi-%{naxsi_version}/naxsi_config/naxsi_core.rules %{buildroot}%{nginx_confdir}/
|
|
|
+install -p -m0644 %{SOURCE2021} %{buildroot}%{nginx_confdir}/naxsi_params
|
|
|
+
|
|
|
touch %{buildroot}%{nginx_confdir}/conf.d/virtual.conf
|
|
|
|
|
|
# convert to UTF-8 all files that give warnings.
|
|
|
@@ -345,9 +357,10 @@ fi
|
|
|
|
|
|
%files
|
|
|
%defattr(-,root,root,-)
|
|
|
-%doc LICENSE CHANGES README LICENSE.dav-ext-module
|
|
|
+%doc LICENSE CHANGES README LICENSE.dav-ext-module LICENSE.naxsi
|
|
|
%doc README.upstream_fair
|
|
|
%doc README.dav-ext-module.rst
|
|
|
+%doc README.naxsi.md
|
|
|
%doc %{?with_wsgi:README.mod_wsgi}
|
|
|
%{nginx_datadir}/
|
|
|
%{_sbindir}/%{name}.normal
|
|
|
@@ -376,6 +389,8 @@ fi
|
|
|
%if %{with wsgi}
|
|
|
%config(noreplace) %{nginx_confdir}/wsgi_vars
|
|
|
%endif
|
|
|
+%config(noreplace) %{nginx_confdir}/naxsi_params
|
|
|
+%config(noreplace) %{nginx_confdir}/naxsi_core.rules
|
|
|
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
|
|
|
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
|
|
|
%dir %{perl_vendorarch}/auto/%{name}
|
|
|
@@ -398,6 +413,9 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Aug 07 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.0-3
|
|
|
+- added NAXSI module.
|
|
|
+
|
|
|
* Sun May 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.0-2
|
|
|
- rebuilt with perl-5.26.
|
|
|
|
