Prechádzať zdrojové kódy

nginx:
- update to 1.5.6
- update passenger to 4.0.21

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7947 ec354946-7b23-47d6-9f5a-488ba84defc7

daisuke 11 rokov pred
rodič
commit
5877a6b876
1 zmenil súbory, kde vykonal 9 pridanie a 7 odobranie
  1. 9 7
      n/nginx/nginx-vl.spec

+ 9 - 7
n/nginx/nginx-vl.spec

@@ -25,8 +25,8 @@
 Summary:        Robust, small and high performance http and reverse proxy server
 Summary(ja):    堅牢・軽量・高性能な HTTP およびリバースプロキシサーバ
 Name:           nginx
-Version:        1.4.1
-Release:        2%{?_dist_release}
+Version:        1.5.6
+Release:        1%{?_dist_release}
 
 Group:          System Environment/Daemons   
 # BSD License (two clause)
@@ -52,7 +52,7 @@ Source104:  nginx-404.html
 Source1000: ngx-fancyindex-%{ngx_fancyindex_version}.tar.xz
 %define nginx_accept_language_module_version 02262ce
 Source1010: giom-nginx_accept_language_module-%{nginx_accept_language_module_version}.tar.gz
-%define passenger_version 3.0.19
+%define passenger_version 4.0.21
 Source1020: passenger-%{passenger_version}.tar.gz
 %define upstream_fair_version 2131c73
 Source1030: gnosek-nginx-upstream-fair-%{upstream_fair_version}.tar.gz
@@ -63,9 +63,6 @@ Source2000: lifeeth-mod_wsgi-%{mod_wsgi_version}.tar.bz2
 # 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
-# configuration patch to match all the Vine Linux paths for logs, pid files
-# etc.
-Patch1:     nginx-conf.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -145,7 +142,6 @@ Nginx [engine x/エンジンX] は Igor Sysoev により開発された以下の
 %setup -q -a 1000 -a 1010 -a 1020 -a 1030 %{?with_wsgi:-a 2000}
 
 %patch0 -p0
-%patch1 -p1
 
 %build
 # nginx does not utilize a standard configure script.  It has its own
@@ -183,6 +179,7 @@ CONFIGOPTS="\
     --with-http_flv_module \
     --with-http_mp4_module \
     --with-http_gzip_static_module \
+    --with-http_gunzip_module \
     --with-http_random_index_module \
     --with-http_secure_link_module \
     --with-http_degradation_module \
@@ -192,6 +189,7 @@ CONFIGOPTS="\
 %if %{with geoip}
     --with-http_geoip_module \
 %endif
+    --with-http_auth_request_module \
     --with-mail \
     --with-mail_ssl_module \
     --add-module=ngx-fancyindex-%{ngx_fancyindex_version} \
@@ -360,6 +358,10 @@ fi
 
 
 %changelog
+* Tue Oct 29 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 1.5.6-1
+- update to 1.5.6
+- update passenger to 4.0.21
+
 * Wed Oct 02 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.1-2
 - rebuilt with gd-2.1.0.