Changes - j0ke.net Open Build Service

Changes of Revision 80

[-] [+]	Changed	nginx.spec
@@ -67,6 +67,12 @@ Source103: 50x.html Source104: 404.html +Source107: ngx_cache_purge-2.1.tar.gz +Source108: modsecurity-apache_2.7.5.tar.gz +Source109: ngx_pagespeed-release-1.6.29.5-beta.tar.gz + + + # 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 @@ -107,6 +113,8 @@ %prep %setup -q +%setup -T -D -a 107 -a 108 -a 109 + %patch0 -p0 %patch1 -p0 %patch2 -p1 @@ -127,6 +135,21 @@ %patch7 -p0 %build + +pushd modsecurity-apache_2.7.5 +# build mod_security library first +%configure \ +%if 0%{?el5} + --with-libxml=/var/mod_security/usr/ \ +%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} \ @@ -169,6 +192,8 @@ --add-module=%{_builddir}/nginx-%{version}/mod_zip-master \ --add-module=%{_builddir}/nginx-%{version}/nginx-upload-module-2.2 \ --add-module=%{_builddir}/nginx-%{version}/ngx_http_auth_pam_module-1.2 \ + --add-module=%{_builddir}/nginx-%{version}/modsecurity-apache_2.7.5/nginx/modsecurity \ + --add-module=%{_builddir}/nginx-%{version}/ngx_cache_purge-2.1 \ --with-file-aio make %{?_smp_mflags} @@ -212,6 +237,12 @@ %{__install} -p -d -m 0755 %{buildroot}%{nginx_webroot} %{__install} -p -m 0644 %{SOURCE100} %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE104} %{buildroot}%{nginx_webroot} +mv ngx_cache_purge-2.1/CHANGES ngx_cache_purge-2.1/CHANGES.ngx_cache_purge +mv ngx_cache_purge-2.1/README.md ngx_cache_purge-2.1/README.ngx_cache_purge +mv ngx_cache_purge-2.1/LICENSE ngx_cache_purge-2.1/LICENSE.ngx_cache_purge + + + # convert to UTF-8 all files that give warnings. for textfile in CHANGES do @@ -256,6 +287,7 @@ %{nginx_datadir}/ %{_sbindir}/%{name} # %{_mandir}/man3/%{name}.3pm.gz +%doc LICENSE CHANGES README ngx_cache_purge-2.1/CHANGES.ngx_cache_purge ngx_cache_purge-2.1/README.ngx_cache_purge ngx_cache_purge-2.1/LICENSE.ngx_cache_purge %{_initrddir}/%{name} %dir %{nginx_confdir} %dir %{nginx_confdir}/conf.d
	Added	modsecurity-apache_2.7.5.tar.gz ^
	Added	ngx_cache_purge-2.1.tar.gz ^
	Added	ngx_pagespeed-release-1.6.29.5-beta.tar.gz ^