|
@@ -30,10 +30,10 @@ Summary: Robust, small and high performance http and reverse proxy server
|
|
Summary(ja): 堅牢・軽量・高性能な HTTP およびリバースプロキシサーバ
|
|
Summary(ja): 堅牢・軽量・高性能な HTTP およびリバースプロキシサーバ
|
|
Name: nginx
|
|
Name: nginx
|
|
Group: servers
|
|
Group: servers
|
|
-%global nginx_version 1.20.1
|
|
|
|
|
|
+%global nginx_version 1.20.2
|
|
Version: %{nginx_version}
|
|
Version: %{nginx_version}
|
|
# do not reset or decrease.
|
|
# do not reset or decrease.
|
|
-Release: 14%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
|
|
|
+Release: 15%{?_dist_release}%{?with_systemd:.systemd}
|
|
Vendor: Project Vine
|
|
Vendor: Project Vine
|
|
Distribution: Vine Linux
|
|
Distribution: Vine Linux
|
|
Packager: daisuke
|
|
Packager: daisuke
|
|
@@ -66,7 +66,7 @@ Source1000: ngx-fancyindex-%{ngx_fancyindex_version}.tar.gz
|
|
%define nginx_accept_language_module_version 2f69842
|
|
%define nginx_accept_language_module_version 2f69842
|
|
Source1010: giom-nginx_accept_language_module-%{nginx_accept_language_module_version}.tar.gz
|
|
Source1010: giom-nginx_accept_language_module-%{nginx_accept_language_module_version}.tar.gz
|
|
|
|
|
|
-%define passenger_version 6.0.8
|
|
|
|
|
|
+%define passenger_version 6.0.12
|
|
Source1020: https://github.com/phusion/passenger/releases/download/release-%{passenger_version}/passenger-%{passenger_version}.tar.gz
|
|
Source1020: https://github.com/phusion/passenger/releases/download/release-%{passenger_version}/passenger-%{passenger_version}.tar.gz
|
|
|
|
|
|
%define upstream_fair_version a18b409
|
|
%define upstream_fair_version a18b409
|
|
@@ -108,9 +108,6 @@ Patch100: boost-changeset_84950.diff
|
|
# to fix https://github.com/gnosek/nginx-upstream-fair/pull/23
|
|
# to fix https://github.com/gnosek/nginx-upstream-fair/pull/23
|
|
Patch101: gnosek-nginx-upstream-fair-pull-23.patch
|
|
Patch101: gnosek-nginx-upstream-fair-pull-23.patch
|
|
|
|
|
|
-# to reduce "unexpected eof while reading" error.
|
|
|
|
-Patch1000: https://github.com/nginx/nginx/commit/5155845ce4453a07d60e2ce43946c9181bc311fa.patch
|
|
|
|
-
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
|
%if "%{_dist_release}" > "vl6"
|
|
%if "%{_dist_release}" > "vl6"
|
|
@@ -341,7 +338,6 @@ This connector is required to use LibModSecurity with nginx.
|
|
%setup -q -a 1000 -a 1010 -a 1020 -a 1030 %{?with_wsgi:-a 2000} -a 2010 %{?with_naxsi:-a 2020} %{?with_geoip2:-a 2030} %{?with_modsecurity:-a 2040}
|
|
%setup -q -a 1000 -a 1010 -a 1020 -a 1030 %{?with_wsgi:-a 2000} -a 2010 %{?with_naxsi:-a 2020} %{?with_geoip2:-a 2030} %{?with_modsecurity:-a 2040}
|
|
|
|
|
|
%patch0 -p0
|
|
%patch0 -p0
|
|
-%patch1000 -p1
|
|
|
|
|
|
|
|
# pushd passenger-%{passenger_version}/ext/
|
|
# pushd passenger-%{passenger_version}/ext/
|
|
# %patch100 -p2
|
|
# %patch100 -p2
|
|
@@ -797,6 +793,11 @@ fi
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Wed Nov 17 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.2-15
|
|
|
|
+- updated to 1.20.2.
|
|
|
|
+- updated passenger to 6.0.12.
|
|
|
|
+- dropped Patch1000: fixed in upstream.
|
|
|
|
+
|
|
* Fri Nov 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.1-14
|
|
* Fri Nov 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.1-14
|
|
- fixed path to nginx.pid.
|
|
- fixed path to nginx.pid.
|
|
- fixed systemd-unit.
|
|
- fixed systemd-unit.
|