Changes - j0ke.net Open Build Service

Changes of Revision 51

[-] [+]	Changed	nginx.spec
@@ -1,11 +1,13 @@ -%define nginx_user nginx -%define nginx_group %{nginx_user} -%define nginx_home %{_localstatedir}/lib/nginx -%define nginx_home_tmp %{nginx_home}/tmp -%define nginx_logdir %{_localstatedir}/log/nginx -%define nginx_confdir %{_sysconfdir}/nginx -%define nginx_datadir %{_datadir}/nginx -%define nginx_webroot %{nginx_datadir}/html +%define nginx_user nginx +%define nginx_group %{nginx_user} +%define nginx_home %{_localstatedir}/lib/nginx +%define nginx_home_tmp %{nginx_home}/tmp +%define nginx_logdir %{_localstatedir}/log/nginx +%define nginx_confdir %{_sysconfdir}/nginx +%define nginx_datadir %{_datadir}/nginx +%define nginx_webroot %{nginx_datadir}/html + + %define rtmp_ext nginx-rtmp-module %define rtmp_ext_version 1.0.8 %define rtmp %{rtmp_ext}-%{rtmp_ext_version} @@ -13,60 +15,70 @@ %define with_rtmp_ext 1 %define sticky_module_version 1.1 -Name: nginx -Version: 1.5.8 -Release: 1spdy3 -Summary: Robust, small and high performance http and reverse proxy server -Group: System Environment/Daemons - -License: BSD -URL: http://nginx.net/ -BuildRoot: %{_tmppath}/%{name}-%{version}-root - -BuildRequires: pcre-devel,zlib-devel,openssl-devel,perl(ExtUtils::Embed) -Requires: pcre,zlib,openssl -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires(pre): shadow-utils -Requires(post): chkconfig -Requires(preun): chkconfig, initscripts -Requires(postun): initscripts +Name: nginx +Version: 1.5.8 +Release: 1ixdev +Summary: Robust, small and high performance http and reverse proxy server - heavy modded version +Group: System Environment/Daemons + +License: BSD +URL: http://nginx.net/ +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +BuildRequires: pcre-devel zlib-devel openssl-devel perl(ExtUtils::Embed) +BuildRequires: GeoIP-devel libaio-devel + +Requires: pcre,zlib,openssl +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires(pre): shadow-utils +Requires(post): chkconfig +Requires(preun): chkconfig, initscripts +Requires(postun): initscripts Provides: webserver -Source0: http://sysoev.ru/nginx/nginx-%{version}.tar.gz +Source0: http://sysoev.ru/nginx/nginx-%{version}.tar.gz -Source1: %{name}.init -Source2: %{name}.logrotate -Source3: virtual.conf -Source4: ssl.conf -Source5: nginx-upstream-fair.tgz -Source6: upstream-fair.conf -Source7: %{name}.sysconfig -Source8: ngx_slowfs_cache-1.5.tar.gz -Source9: Nginx-limit-traffic-rate-module.tar.gz -Source10: %{rtmp}.tar.gz -Source11: nginx_upstream_check_module-master.tar.gz -Source12: nginx_tcp_proxy_module.tar.gz -Source13: nginx-upstream-carp-read-only.tar.gz -Source14: proxy.conf -Source100: index.html -Source101: poweredby.png -Source102: nginx-logo.png -Source103: 50x.html -Source104: 404.html +Source1: %{name}.init +Source2: %{name}.logrotate +Source3: virtual.conf +Source4: ssl.conf +Source5: nginx-upstream-fair.tgz +Source6: upstream-fair.conf +Source7: %{name}.sysconfig +Source8: ngx_slowfs_cache-1.5.tar.gz +Source9: Nginx-limit-traffic-rate-module.tar.gz +Source10: proxy.conf +Source11: nginx_upstream_check_module-master.tar.gz +Source12: nginx_tcp_proxy_module.tar.gz +Source13: nginx-upstream-carp-read-only.tar.gz +Source14: %{rtmp}.tar.gz +Source15: nginx-upload-module-2.2.zip +Source16: nginx-mod_zip.zip +Source17: nginx-upload-progress-module-0.9.0.zip +Source18: ngx_http_auth_pam_module-1.2.tar.gz +Source19: nginx-rtmp-module-master.zip +Source20: GeoIPCountryCSV.zip + +Source100: index.html +Source101: poweredby.png +Source102: nginx-logo.png +Source103: 50x.html +Source104: 404.html # 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 +Patch0: nginx-auto-cc-gcc.patch # configuration patch to match all the Fedora paths for logs, pid files # etc. -Patch1: nginx-conf-0.7.x.patch -Patch2: check_1.2.6+.patch -Patch3: nginx-memset_zero.patch -Patch4: tcp-proxymod.patch -Patch5: SPDY_v3.patch -Patch6: nginx-1.5.x_proxy_protocol_patch_v2.patch +Patch1: nginx-conf-0.7.x.patch +Patch2: check_1.2.6+.patch +Patch3: nginx-memset_zero.patch +Patch4: tcp-proxymod.patch +Patch5: SPDY_v3.patch +#Patch6: nginx-1.5.x_proxy_protocol_patch_v2.patch +Patch7: nginx-1.3.9-upload.patch # syslog patch, use syslog instead of nginx logfiles #Patch2: nginx-syslog.patch @@ -77,30 +89,46 @@ Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3 proxy server written by Igor Sysoev. -One third party module, nginx-upstream-fair, has been added. - -SPDY v3 patched +Following third party modules added: +* nginx-upstream-fair +* mod_zip +* ngx_http_auth_pam_module +* nginx-upload-progress-module +* nginx-upload-module +* nginx-rtmp-module +* nginx-upstream-check +* nginx-tcp-proxy +* nginx-slowfs-cache +* nginx-limit-traffic-rate +* nginx-upstream-carp-read-only %prep %setup -q -%patch6 -p1 %patch0 -p0 %patch1 -p0 %patch2 -p1 %patch4 -p1 %patch5 -p1 +%patch7 -p0 %{__tar} zxvf %{SOURCE5} %{__tar} zxvf %{SOURCE9} -%{__tar} zxvf %{SOURCE10} %{__tar} zxvf %{SOURCE11} %{__tar} zxvf %{SOURCE12} %{__tar} zxvf %{SOURCE13} +%{__tar} zxvf %{SOURCE14} +%{__tar} zxvf %{SOURCE15} +%{__tar} zxvf %{SOURCE16} +%{__tar} zxvf %{SOURCE17} +%{__tar} zxvf %{SOURCE18} +%{__tar} zxvf %{SOURCE19} +%{__tar} zxvf %{SOURCE20} %build +perl contrib/geo2nginx.pl < GeoIPCountryWhois.csv > geo.data export DESTDIR=%{buildroot} ./configure \ --user=%{nginx_user} \ @@ -115,6 +143,8 @@ --http-fastcgi-temp-path=%{nginx_home_tmp}/fastcgi \ --pid-path=%{_localstatedir}/run/%{name}.pid \ --lock-path=%{_localstatedir}/lock/subsys/%{name} \ + --with-http_secure_link_module \ + --with-http_random_index_module \ --with-http_ssl_module \ --with-http_realip_module \ --with-http_addition_module \ @@ -122,11 +152,9 @@ --with-http_dav_module \