Changes - j0ke.net Open Build Service

Changes of Revision 11

[-] [+]	Changed	nginx-1.2.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Oct 1 09:50:22 UTC 2012 - cs@linux-administrator.com + +- added nginx_ajp_module + +------------------------------------------------------------------- Mon Sep 24 20:19:21 UTC 2012 - cs@linux-administrator.com - added modsecurity-ngx_http_preaccess_phase.patch
[-] [+]	Changed	nginx-1.2.spec ^
@@ -17,6 +17,14 @@ %define modsec_name modsecurity-apache %define modsec_version 2.7.0-rc3 %define modsec %{modsec_name}_%{modsec_version} + +%define ajp_name yaoweibin-nginx_ajp_module +%define ajp_version v0.2.5-19 +%define ajp_verhash df34c09 +%define ajp %{ajp_name}-%{ajp_version}-g%{ajp_verhash} +%define ajp_nover %{ajp_name}-%{ajp_verhash} +%define with_ajp 1 + Name: nginx-1.2 Version: 1.2.3 Release: 0 @@ -93,6 +101,7 @@ Source: http://nginx.org/download/nginx-%{version}.tar.bz2 Source1: nginx.init Source2: %{modsec}.tar.bz2 +Source3: %{ajp}.tar.bz2 # PATCH-FIX-UPSTREAM nginx-0.4.0-no_Werror.patch Patch: nginx-0.4.0-no_Werror.patch # PATCH-FIX-UPSTREAM nginx-0.6.38-html.patch @@ -115,7 +124,7 @@ Igor Sysoev %prep -%setup -n %{pkg_name}-%{version} -a 2 +%setup -n %{pkg_name}-%{version} -a 2 -a 3 %patch %patch3 %patch4 @@ -126,6 +135,9 @@ %patch11 cd .. %endif +%if 0%{?with_ajp} +%__patch -p1 < %{ajp_nover}/ajp.patch +%endif perl -pi -e 's\|\r\n\|\n\|g' contrib/geo2nginx.pl @@ -190,6 +202,9 @@ %if 0%{?with_modsec} --add-module=%{modsec}/nginx/modsecurity \ %endif + %if 0%{?with_ajp} + --add-module=%{ajp_nover} \ + %endif %if 0%{?with_google_perftools} --with-google_perftools_module \ %endif
	Added	yaoweibin-nginx_ajp_module-v0.2.5-19-gdf34c09.tar.bz2 ^