Changes - j0ke.net Open Build Service

Changes of Revision 9

[-] [+]	Changed	nginx.spec
@@ -62,6 +62,7 @@ # etc. Patch1: nginx-conf-0.7.x.patch Patch2: check_1.2.6+.patch +Patch3: nginx-memset_zero.patch # syslog patch, use syslog instead of nginx logfiles #Patch2: nginx-syslog.patch @@ -80,14 +81,14 @@ %patch0 -p0 %patch1 -p0 %patch2 -p1 -# %patch3 -p1 -#%patch4 -p1 %{__tar} zxvf %{SOURCE5} %{__tar} zxvf %{SOURCE9} %{__tar} jxvf %{SOURCE10} %{__tar} zxvf %{SOURCE11} %{__tar} xxvf %{SOURCE12} -%{__tar} xvzf %{SOURCE13} + +%{__tar} -zxf %{SOURCE14} -C {SOURCE13} +%patch -p1 %build @@ -120,6 +121,9 @@ --with-ipv6 \ --with-http_spdy_module \ --with-cc-opt="%{optflags} $(pcre-config --cflags)" \ + --with-ld-opt="-Wl,--as-needed -Wl,--strip-all" \ + --with-pcre \ + --with-pcre-jit \ --add-module=%{_builddir}/nginx-%{version}/nginx-upstream-fair \ --add-module=%{_builddir}/nginx-%{version}/nginx_upstream_check_module-master \ --add-module=%{_builddir}/nginx-%{version}/nginx-sticky-module-%{sticky_module_version} \
[-] [+]	Added	nginx-memset_zero.patch ^
@@ -0,0 +1,15 @@ +diff -ur nginx-1.2.5.orig/src/core/ngx_string.h nginx-1.2.5/src/core/ngx_string.h +--- nginx-1.2.5.orig/src/core/ngx_string.h 2012-09-24 22:34:04.000000000 +0400 ++++ nginx-1.2.5/src/core/ngx_string.h 2012-11-14 11:36:25.226866540 +0400 +@@ -83,8 +83,8 @@ + * while ZeroMemory() and bzero() are the calls. + * icc7 may also inline several mov's of a zeroed register for small blocks. + */ +-#define ngx_memzero(buf, n) (void) memset(buf, 0, n) +-#define ngx_memset(buf, c, n) (void) memset(buf, c, n) ++#define ngx_memzero(buf, n) (void) ( n ? memset(buf, 0, n) : buf ) ++#define ngx_memset(buf, c, n) (void) ( n ? memset(buf, c, n) : buf ) + + + #if (NGX_MEMCPY_LIMIT) + \ No newline at end of file