|
@@ -25,7 +25,7 @@
|
|
Summary: Robust, small and high performance http and reverse proxy server
|
|
Summary: Robust, small and high performance http and reverse proxy server
|
|
Summary(ja): 堅牢・軽量・高性能な HTTP およびリバースプロキシサーバ
|
|
Summary(ja): 堅牢・軽量・高性能な HTTP およびリバースプロキシサーバ
|
|
Name: nginx
|
|
Name: nginx
|
|
-Version: 1.13.5
|
|
|
|
|
|
+Version: 1.13.9
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
|
|
|
|
Group: System Environment/Daemons
|
|
Group: System Environment/Daemons
|
|
@@ -48,20 +48,26 @@ Source101: poweredby-vine.png
|
|
Source102: nginx-logo.png
|
|
Source102: nginx-logo.png
|
|
Source103: nginx-50x.html
|
|
Source103: nginx-50x.html
|
|
Source104: nginx-404.html
|
|
Source104: nginx-404.html
|
|
-%define ngx_fancyindex_version 0.3.5
|
|
|
|
-Source1000: ngx-fancyindex-%{ngx_fancyindex_version}.tar.xz
|
|
|
|
-%define nginx_accept_language_module_version 02262ce
|
|
|
|
|
|
+
|
|
|
|
+%define ngx_fancyindex_version 0.4.2
|
|
|
|
+Source1000: ngx-fancyindex-%{ngx_fancyindex_version}.tar.gz
|
|
|
|
+
|
|
|
|
+%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
|
|
|
|
|
|
## https://github.com/phusion/passenger/archive/release-%{passenger_version}.tar.gz
|
|
## https://github.com/phusion/passenger/archive/release-%{passenger_version}.tar.gz
|
|
-%define passenger_version 5.1.8
|
|
|
|
|
|
+%define passenger_version 5.2.1
|
|
Source1020: passenger-%{passenger_version}.tar.gz
|
|
Source1020: passenger-%{passenger_version}.tar.gz
|
|
-%define upstream_fair_version 2131c73
|
|
|
|
|
|
+
|
|
|
|
+%define upstream_fair_version a18b409
|
|
Source1030: gnosek-nginx-upstream-fair-%{upstream_fair_version}.tar.gz
|
|
Source1030: gnosek-nginx-upstream-fair-%{upstream_fair_version}.tar.gz
|
|
|
|
|
|
%define mod_wsgi_version 6975f0ec7eeb
|
|
%define mod_wsgi_version 6975f0ec7eeb
|
|
Source2000: lifeeth-mod_wsgi-%{mod_wsgi_version}.tar.bz2
|
|
Source2000: lifeeth-mod_wsgi-%{mod_wsgi_version}.tar.bz2
|
|
|
|
|
|
|
|
+%define nginx_dav_ext_module_version 0.1.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
|
|
|
|
+
|
|
# removes -Werror in upstream build scripts. -Werror conflicts with
|
|
# removes -Werror in upstream build scripts. -Werror conflicts with
|
|
# -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
|
|
# -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
|
|
Patch0: nginx-auto-cc-gcc.patch
|
|
Patch0: nginx-auto-cc-gcc.patch
|
|
@@ -150,7 +156,7 @@ Nginx [engine x/エンジンX] は Igor Sysoev により開発された以下の
|
|
このパッケージには Passenger サポートを含んだ nginxサーバが入っています。
|
|
このパッケージには Passenger サポートを含んだ nginxサーバが入っています。
|
|
|
|
|
|
%prep
|
|
%prep
|
|
-%setup -q -a 1000 -a 1010 -a 1020 -a 1030 %{?with_wsgi:-a 2000}
|
|
|
|
|
|
+%setup -q -a 1000 -a 1010 -a 1020 -a 1030 %{?with_wsgi:-a 2000} -a 2010
|
|
|
|
|
|
%patch0 -p0
|
|
%patch0 -p0
|
|
|
|
|
|
@@ -216,12 +222,15 @@ CONFIGOPTS="\
|
|
--with-http_perl_module \
|
|
--with-http_perl_module \
|
|
--with-mail \
|
|
--with-mail \
|
|
--with-mail_ssl_module \
|
|
--with-mail_ssl_module \
|
|
|
|
+ --with-stream \
|
|
|
|
+ --with-stream_ssl_preread_module \
|
|
--add-module=ngx-fancyindex-%{ngx_fancyindex_version} \
|
|
--add-module=ngx-fancyindex-%{ngx_fancyindex_version} \
|
|
--add-module=giom-nginx_accept_language_module-%{nginx_accept_language_module_version} \
|
|
--add-module=giom-nginx_accept_language_module-%{nginx_accept_language_module_version} \
|
|
--add-module=gnosek-nginx-upstream-fair-%{upstream_fair_version} \
|
|
--add-module=gnosek-nginx-upstream-fair-%{upstream_fair_version} \
|
|
%if %{with wsgi}
|
|
%if %{with wsgi}
|
|
--add-module=lifeeth-mod_wsgi-%{mod_wsgi_version} \
|
|
--add-module=lifeeth-mod_wsgi-%{mod_wsgi_version} \
|
|
%endif
|
|
%endif
|
|
|
|
+ --add-module=nginx-dav-ext-module-%{nginx_dav_ext_module_version} \
|
|
%ifarch i686
|
|
%ifarch i686
|
|
--with-cpu-opt=pentiumpro \
|
|
--with-cpu-opt=pentiumpro \
|
|
--with-zlib-asm=pentiumpro \
|
|
--with-zlib-asm=pentiumpro \
|
|
@@ -289,6 +298,10 @@ cp -f lifeeth-mod_wsgi-%{mod_wsgi_version}/README README.mod_wsgi
|
|
# upstream fair module document
|
|
# upstream fair module document
|
|
cp -f gnosek-nginx-upstream-fair-%{upstream_fair_version}/README README.upstream_fair
|
|
cp -f gnosek-nginx-upstream-fair-%{upstream_fair_version}/README README.upstream_fair
|
|
|
|
|
|
|
|
+# document for nginx-dav-ext-module
|
|
|
|
+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
|
|
|
|
+
|
|
touch %{buildroot}%{nginx_confdir}/conf.d/virtual.conf
|
|
touch %{buildroot}%{nginx_confdir}/conf.d/virtual.conf
|
|
|
|
|
|
# convert to UTF-8 all files that give warnings.
|
|
# convert to UTF-8 all files that give warnings.
|
|
@@ -331,8 +344,9 @@ fi
|
|
|
|
|
|
%files
|
|
%files
|
|
%defattr(-,root,root,-)
|
|
%defattr(-,root,root,-)
|
|
-%doc LICENSE CHANGES README
|
|
|
|
|
|
+%doc LICENSE CHANGES README LICENSE.dav-ext-module
|
|
%doc README.upstream_fair
|
|
%doc README.upstream_fair
|
|
|
|
+%doc README.dav-ext-module.rst
|
|
%doc %{?with_wsgi:README.mod_wsgi}
|
|
%doc %{?with_wsgi:README.mod_wsgi}
|
|
%{nginx_datadir}/
|
|
%{nginx_datadir}/
|
|
%{_sbindir}/%{name}.normal
|
|
%{_sbindir}/%{name}.normal
|
|
@@ -383,6 +397,15 @@ fi
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Mon Mar 05 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.13.9-1
|
|
|
|
+- updated to 1.13.9.
|
|
|
|
+- updated ngx-fancyindex to 0.4.2.
|
|
|
|
+- updated nginx-accept_language_module to git HEAD.
|
|
|
|
+- updated nginx-upstream-fair to git HEAD.
|
|
|
|
+- updated passenger to 5.2.1.
|
|
|
|
+- added Source2010 (nginx-dav-ext-module).
|
|
|
|
+- enabled --with-stream and --with-stream_ssl_preread_module.
|
|
|
|
+
|
|
* Fri Sep 8 2017 Munehiro Yamamoto <munepi@vinelinux.org> 1.13.5-1
|
|
* Fri Sep 8 2017 Munehiro Yamamoto <munepi@vinelinux.org> 1.13.5-1
|
|
- updated to 1.13.5
|
|
- updated to 1.13.5
|
|
- updated passenger to 5.1.8
|
|
- updated passenger to 5.1.8
|