Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	nginx.spec
@@ -14,7 +14,7 @@ %define sticky_module_version 1.1 Name: nginx -Version: 1.4.3 +Version: 1.4.4 Release: 1 Summary: Robust, small and high performance http and reverse proxy server Group: System Environment/Daemons @@ -31,10 +31,7 @@ Requires(preun): chkconfig, initscripts Requires(postun): initscripts -Provides: webserver - Source0: http://sysoev.ru/nginx/nginx-%{version}.tar.gz - Source1: %{name}.init Source2: %{name}.logrotate Source3: virtual.conf @@ -47,9 +44,6 @@ Source10: %{rtmp}.tar.bz2 Source11: nginx_upstream_check_module-master.tar.gz Source12: nginx-sticky-module-%{sticky_module_version}.tar.gz -#Source13: ngx_pagespeed.tar.gz -#Source14: 1.6.29.5.tar.gz -Source13: release-1.6.29.5-beta.zip Source100: index.html Source101: poweredby.png Source102: nginx-logo.png @@ -64,7 +58,6 @@ # 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 @@ -83,18 +76,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} xzvf %{SOURCE13} -#%{__tar} -zxf %{SOURCE14} -C ngx_pagespeed -unzip %{SOURCE13} -#%patch3 -p1 - - %build export DESTDIR=%{buildroot} ./configure \ @@ -125,17 +114,16 @@ --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} \ %if 0%{with_rtmp_ext} --add-module=%{_builddir}/nginx-%{version}/%{rtmp} \ %endif - --add-module=%{_builddir}/nginx-%{version}/Nginx-limit-traffic-rate-module \ + --add-module=%{_builddir}/nginx-%{version}/Nginx-limit-traffic-rate-module +%if 0%{?fedora_version} > 10 --with-file-aio +%endif make %{?_smp_mflags} @@ -224,6 +212,9 @@ %changelog +* Wed Nov 20 2013 Juergen Gotteswinter <jg@internetx.com> - 1.4.4-1 +- https://bugzilla.redhat.com/show_bug.cgi?id=1032266 + * Tue Oct 08 2013 Carsten Schoene <cs@linux-administrator.com> - 1.4.3-1 - update nginx to 1.4.3 - update rtmp module to 1.0.5
[-] [+]	Deleted	nginx-memset_zero.patch ^
@@ -1,15 +0,0 @@ -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
	Deleted	1.6.29.5.tar.gz ^
	Deleted	nginx-1.4.3.tar.gz ^
	Changed	nginx-1.4.4.tar.gz ^
	Deleted	ngx_pagespeed.tar.gz ^
	Deleted	release-1.6.29.5-beta.zip ^