Changes - j0ke.net Open Build Service

Changes of Revision 67

[-] [+]	Changed	nginx.spec
@@ -85,7 +85,7 @@ Patch0: nginx-auto-cc-gcc.patch Patch1: nginx-conf-0.7.x.patch Patch2: check_1.7.5+.patch -Patch5: openssl-rc4tilt.patch +Patch3: openssl-rc4tilt.patch %description Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3 @@ -99,6 +99,7 @@ %patch0 -p0 %patch1 -p0 %patch2 -p1 +%patch3 -p0 %{__tar} zxvf %{SOURCE5} %{__tar} zxvf %{SOURCE9} %{__tar} zxvf %{SOURCE10} @@ -106,7 +107,6 @@ %{__tar} zxvf %{SOURCE12} %{__tar} zxvf %{SOURCE13} -#%patch5 -p0 %if 0%{?rhel_version} == 700 \|\| 0%{?centos_version} == 700 @@ -127,22 +127,6 @@ %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} \ @@ -178,19 +162,8 @@ --with-debug \ --with-ipv6 \ --with-cc-opt="%{optflags} $(pcre-config --cflags)" \ -# --with-openssl=%{_builddir}/nginx-%{version}/openssl-%{openssl_version} \ -# --add-module=%{_builddir}/nginx-%{version}/nginx-upstream-fair \ -# --add-module=%{_builddir}/nginx-%{version}/nginx_upstream_check_module \ -#%if 0%{with_rtmp_ext} -# --add-module=%{_builddir}/nginx-%{version}/%{rtmp} \ -#%endif -# --add-module=%{_builddir}/nginx-%{version}/Nginx-limit-traffic-rate-module \ -#%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 \ + --with-openssl=%{_builddir}/nginx-%{version}/openssl-%{openssl_version} \ + --with-file-aio \ --without-mail_pop3_module \ --without-mail_imap_module \ --without-mail_smtp_module