nginx-1.20.1-14

n/nginx/nginx-vl.spec

@@ -33,7 +33,7 @@ Group:          servers
 %global nginx_version 1.20.1
 Version:        %{nginx_version}
 # do not reset or decrease.
-Release:        13%{?_dist_release}%{?with_systemd:.systemd}
+Release:        14%{?_dist_release}%{?with_systemd:.systemd}
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Packager:       daisuke
@@ -108,8 +108,8 @@ Patch100:       boost-changeset_84950.diff
 # to fix https://github.com/gnosek/nginx-upstream-fair/pull/23
 Patch101:       gnosek-nginx-upstream-fair-pull-23.patch
 
-# to fix compile error with C++11.
-Patch1000:      passenger-5.0.28-boost.patch
+# to reduce "unexpected eof while reading" error.
+Patch1000:      https://github.com/nginx/nginx/commit/5155845ce4453a07d60e2ce43946c9181bc311fa.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -330,10 +330,18 @@ This connector is required to use LibModSecurity with nginx.
 %debug_package
 
 
+%if %{with systemd}
+%define rundir /run
+%else
+%define rundir %{_localstatedir}/run
+%endif
+
+
 %prep
 %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
+%patch1000 -p1
 
 # pushd passenger-%{passenger_version}/ext/
 # %patch100 -p2
@@ -344,7 +352,7 @@ pushd gnosek-nginx-upstream-fair-%{upstream_fair_version}
 popd
 
 pushd passenger-%{passenger_version}
-#% patch1000 -p1
+#patch1000 -p1
 popd
 
 %if %{with modsecurity}
@@ -372,11 +380,7 @@ CONFIGOPTS="\
     --http-client-body-temp-path=%{nginx_home_tmp}/client_body \
     --http-proxy-temp-path=%{nginx_home_tmp}/proxy \
     --http-fastcgi-temp-path=%{nginx_home_tmp}/fastcgi \
-%if %{with systemd}
-    --pid-path=/run/nginx.pid \
-%else
-    --pid-path=%{_localstatedir}/run/%{name}.pid \
-%endif
+    --pid-path=%{rundir}/%{name}.pid \
     --lock-path=%{_localstatedir}/lock/subsys/%{name} \
     --with-file-aio \
     --with-ipv6 \
@@ -451,8 +455,6 @@ chmod 0755 %{buildroot}%{_sbindir}/nginx
 install -p -d -m 0755 %{buildroot}%{_unitdir}
 install -p -D -m 0644 %{SOURCE21} \
     %{buildroot}%{_unitdir}/nginx.service
-sed -i -e 's#KillMode=.*#KillMode=process#g' \
-    %{buildroot}%{_unitdir}/nginx.service
 install -p -D -m 0755 %{SOURCE22} %{buildroot}%{_bindir}/nginx-upgrade
 install -p -D -m 0644 %{SOURCE23} %{buildroot}%{_mandir}/man8/nginx-upgrade.8
 %else
@@ -460,6 +462,8 @@ install -p -D -m 0644 %{SOURCE23} %{buildroot}%{_mandir}/man8/nginx-upgrade.8
 %endif
 
 %{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+sed -i -e 's|@rundir@|%{rundir}|g' %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+
 %{__install} -p -D -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_confdir}/conf.d
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_confdir}/sites.d
@@ -793,6 +797,12 @@ fi
 
 
 %changelog
+* Fri Nov 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.1-14
+- fixed path to nginx.pid.
+- fixed systemd-unit.
+- dropped Patch1000.
+- imported Patch1000 from upstream.
+
 * Thu Oct 07 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.1-13
 - rebuilt with openssl-3.0.0.