Changes - j0ke.net Open Build Service

Changes of Revision 62

[-] [+]	Changed	nginx.spec
@@ -11,11 +11,11 @@ %define rtmp_ext_version 1.1.5 %define rtmp %{rtmp_ext}-%{rtmp_ext_version} %define rtmp_nover %{rtmp_ext} -%define with_rtmp_ext 1 +%define with_rtmp_ext 0 %define nps_version 1.9.32.2 %define slowfs_version 1.5 - +%define waf_version 2.8.0 %define openssl_version 1.0.1j Name: nginx @@ -71,6 +71,8 @@ Source13: nginx-munin.tar.gz Source14: release-%{nps_version}-beta.zip Source15: %{nps_version}.tar.gz +Source16: modsecurity-%{waf_version}.tar.gz + Source100: index.html Source101: poweredby.png @@ -96,7 +98,7 @@ %prep %setup -q -%patch0 -p0 +#%patch0 -p0 %patch1 -p0 %patch2 -p1 %{__tar} zxvf %{SOURCE5} @@ -106,7 +108,7 @@ %{__tar} zxvf %{SOURCE12} %{__tar} zxvf %{SOURCE13} -%patch5 -p0 +#%patch5 -p0 %if 0%{?rhel_version} == 700 \|\| 0%{?centos_version} == 700 @@ -127,6 +129,22 @@ %build + +pushd modsecurity-%{waf_version} build mod_security library first + +%configure \ +%if 0%{?rhel} < 6 + --with-libxml=%{libxml2_build_path} \ +%endif + --enable-standalone-module --enable-pcre-match-limit=no --enable-pcre-match-limit-recursion=no + +make \|\| : +cd standalone +make install-exec-hook \|\| : +popd + + + export DESTDIR=%{buildroot} ./configure \ --user=%{nginx_user} \ @@ -172,6 +190,7 @@ %if 0%{?rhel_version} == 700 \|\| 0%{?centos_version} == 700 --add-module=%{_builddir}/nginx-%{version}/ngx_pagespeed-release-%{nps_version}-beta \ %endif + --add-module=%{_builddir}/nginx-%{version}/modsecurity-%{waf_version}/nginx/modsecurity \ --with-file-aio \ --with-poll_module \ --without-mail_pop3_module \