Changes - j0ke.net Open Build Service

Changes of Revision 5

[-] [+]	Changed	nginx-1.2.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun Jul 29 19:07:51 UTC 2012 - cs@linux-administrator.com + +- build with modsecurity 2.7rc2 + +------------------------------------------------------------------- Thu Jul 5 14:33:04 UTC 2012 - cs@linux-administrator.com - upstream update 1.2.2
[-] [+]	Changed	nginx-1.2.spec ^
@@ -43,6 +43,9 @@ %define with_passenger 1 %define with_libatomic 1 %endif + +%define with_modsec 1 + # Group: Productivity/Networking/Web/Proxy License: BSD-2-Clause @@ -68,6 +71,11 @@ BuildRequires: rubygem-passenger-devel-static Recommends: packageand(rubygem-passenger:rubygem-passenger-nginx) %endif +%if 0%{?with_modsec} +BuildRequires: apache2-devel apache2-prefork openldap2-devel +BuildRequires: libxml2-devel libtool curl-devel +BuildRequires: curl +%endif PreReq: %fillup_prereq PreReq: %insserv_prereq PreReq: pwdutils @@ -79,6 +87,7 @@ Url: http://nginx.org/ Source: http://nginx.org/download/nginx-%{version}.tar.bz2 Source1: nginx.init +Source2: 2.7-iis-nginx.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 @@ -88,6 +97,8 @@ # PATCH-FIX-UPSTREAM nginx-1.0.4_default_config.patch Patch4: nginx-1.0.4_default_config.patch # + +Patch10: modsec-config.patch Summary: A HTTP server and IMAP/POP3 proxy server %description nginx [engine x] is a HTTP server and IMAP/POP3 proxy server written by Igor Sysoev. @@ -98,14 +109,27 @@ Igor Sysoev %prep -%setup -n %{pkg_name}-%{version} +%setup -n %{pkg_name}-%{version} -a 2 %patch %patch3 %patch4 %patch2 +%if 0%{?with_modsec} +cd 2.7-iis-nginx +%patch10 +cd .. +%endif + perl -pi -e 's\|\r\n\|\n\|g' contrib/geo2nginx.pl %build +%if 0%{?with_modsec} +cd 2.7-iis-nginx +./autogen.sh +%configure --disable-pcre-match-limit --disable-pcre-match-limit-recursion +%__make +cd .. +%endif %if 0%{?with_passenger} ln -s %{_libdir}/ruby/gems/%{rb_ver}/gems/passenger-* passenger %endif @@ -156,6 +180,9 @@ %if 0%{?with_passenger} --add-module=passenger/ext/nginx \ %endif + %if 0%{?with_modsec} + --add-module=2.7-iis-nginx/nginx/modsecurity \ + %endif %if 0%{?with_google_perftools} --with-google_perftools_module \ %endif
[-] [+]	Added	modsec-config.patch ^
@@ -0,0 +1,8 @@ +--- nginx/modsecurity/config.orig 2012-07-29 20:57:41.679793670 +0200 ++++ nginx/modsecurity/config 2012-07-29 20:57:58.331797258 +0200 +@@ -3,4 +3,4 @@ + NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_modsecurity_module.c" + NGX_ADDON_DEPS="$NGX_ADDON_DEPS" + CORE_LIBS="$CORE_LIBS $ngx_addon_dir/../../standalone/.libs/standalone.a -lapr-1 -laprutil-1 -lxml2 -lm" +-CORE_INCS="$CORE_INCS /usr/include/apache2 /usr/include/apr-1.0 $ngx_addon_dir/../../standalone $ngx_addon_dir/../../apache2 /usr/include/libxml2" ++CORE_INCS="$CORE_INCS /usr/include/apache2 /usr/include/apr-1 $ngx_addon_dir/../../standalone $ngx_addon_dir/../../apache2 /usr/include/libxml2"
	Added	2.7-iis-nginx.tar.bz2 ^