update to 0.6.32
This commit is contained in:
jjh
parent
ef629b9f1d
commit
65cc97abd9
|
|
@ -1 +1 @@
|
|||
nginx-0.6.31.tar.gz
|
||||
nginx-0.6.32.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,73 +0,0 @@
|
|||
--- auto/install.orig 2008-05-11 15:02:01.000000000 -0600
|
||||
+++ auto/install 2008-05-11 15:03:54.000000000 -0600
|
||||
@@ -19,45 +19,45 @@
|
||||
|
||||
install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
|
||||
$NGX_INSTALL_PERL_MODULES
|
||||
- test -d '$NGX_PREFIX' || mkdir -p '$NGX_PREFIX'
|
||||
+ test -d '$NGX_DEST_DIR$NGX_PREFIX' || mkdir -p '$NGX_DEST_DIR$NGX_PREFIX'
|
||||
|
||||
- test -d '`dirname "$NGX_SBIN_PATH"`' \
|
||||
- || mkdir -p '`dirname "$NGX_SBIN_PATH"`'
|
||||
- test ! -f '$NGX_SBIN_PATH' || mv '$NGX_SBIN_PATH' '$NGX_SBIN_PATH.old'
|
||||
- cp $NGX_OBJS/nginx '$NGX_SBIN_PATH'
|
||||
+ test -d '`dirname "$NGX_DEST_DIR$NGX_SBIN_PATH"`' \
|
||||
+ || mkdir -p '`dirname "$NGX_DEST_DIR$NGX_SBIN_PATH"`'
|
||||
+ test ! -f '$NGX_DEST_DIR$NGX_SBIN_PATH' || mv '$NGX_DEST_DIR$NGX_SBIN_PATH' '$NGX_DEST_DIR$NGX_SBIN_PATH.old'
|
||||
+ cp $NGX_OBJS/nginx '$NGX_DEST_DIR$NGX_SBIN_PATH'
|
||||
|
||||
- test -d '$NGX_CONF_PREFIX' || mkdir -p '$NGX_CONF_PREFIX'
|
||||
+ test -d '$NGX_DEST_DIR$NGX_CONF_PREFIX' || mkdir -p '$NGX_DEST_DIR$NGX_CONF_PREFIX'
|
||||
|
||||
- cp conf/koi-win '$NGX_CONF_PREFIX'
|
||||
- cp conf/koi-utf '$NGX_CONF_PREFIX'
|
||||
- cp conf/win-utf '$NGX_CONF_PREFIX'
|
||||
+ cp conf/koi-win '$NGX_DEST_DIR$NGX_CONF_PREFIX'
|
||||
+ cp conf/koi-utf '$NGX_DEST_DIR$NGX_CONF_PREFIX'
|
||||
+ cp conf/win-utf '$NGX_DEST_DIR$NGX_CONF_PREFIX'
|
||||
|
||||
- test -f '$NGX_CONF_PREFIX/mime.types' \
|
||||
- || cp conf/mime.types '$NGX_CONF_PREFIX'
|
||||
- cp conf/mime.types '$NGX_CONF_PREFIX/mime.types.default'
|
||||
+ test -f '$NGX_DEST_DIR$NGX_CONF_PREFIX/mime.types' \
|
||||
+ || cp conf/mime.types '$NGX_DEST_DIR$NGX_CONF_PREFIX'
|
||||
+ cp conf/mime.types '$NGX_DEST_DIR$NGX_CONF_PREFIX/mime.types.default'
|
||||
|
||||
- test -f '$NGX_CONF_PREFIX/fastcgi_params' \
|
||||
- || cp conf/fastcgi_params '$NGX_CONF_PREFIX'
|
||||
- cp conf/fastcgi_params '$NGX_CONF_PREFIX/fastcgi_params.default'
|
||||
+ test -f '$NGX_DEST_DIR$NGX_CONF_PREFIX/fastcgi_params' \
|
||||
+ || cp conf/fastcgi_params '$NGX_DEST_DIR$NGX_CONF_PREFIX'
|
||||
+ cp conf/fastcgi_params '$NGX_DEST_DIR$NGX_CONF_PREFIX/fastcgi_params.default'
|
||||
|
||||
- test -f '$NGX_CONF_PATH' || cp conf/nginx.conf '$NGX_CONF_PREFIX'
|
||||
- cp conf/nginx.conf '$NGX_CONF_PREFIX/nginx.conf.default'
|
||||
+ test -f '$NGX_DEST_DIR$NGX_CONF_PATH' || cp conf/nginx.conf '$NGX_DEST_DIR$NGX_CONF_PREFIX'
|
||||
+ cp conf/nginx.conf '$NGX_DEST_DIR$NGX_CONF_PREFIX/nginx.conf.default'
|
||||
|
||||
- test -d '`dirname "$NGX_PID_PATH"`' \
|
||||
- || mkdir -p '`dirname "$NGX_PID_PATH"`'
|
||||
+ test -d '`dirname "$NGX_DEST_DIR$NGX_PID_PATH"`' \
|
||||
+ || mkdir -p '`dirname "$NGX_DEST_DIR$NGX_PID_PATH"`'
|
||||
|
||||
- test -d '`dirname "$NGX_HTTP_LOG_PATH"`' || \
|
||||
- mkdir -p '`dirname "$NGX_HTTP_LOG_PATH"`'
|
||||
+ test -d '`dirname "$NGX_DEST_DIR$NGX_HTTP_LOG_PATH"`' || \
|
||||
+ mkdir -p '`dirname "$NGX_DEST_DIR$NGX_HTTP_LOG_PATH"`'
|
||||
|
||||
- test -d '$NGX_PREFIX/html' || cp -r html '$NGX_PREFIX'
|
||||
+ test -d '$NGX_DEST_DIR$NGX_PREFIX/html' || cp -r html '$NGX_DEST_DIR$NGX_PREFIX'
|
||||
END
|
||||
|
||||
|
||||
-if test -n "$NGX_ERROR_LOG_PATH"; then
|
||||
+if test -n "$NGX_DEST_DIR$NGX_ERROR_LOG_PATH"; then
|
||||
cat << END >> $NGX_MAKEFILE
|
||||
|
||||
- test -d '`dirname "$NGX_ERROR_LOG_PATH"`' || \
|
||||
- mkdir -p '`dirname "$NGX_ERROR_LOG_PATH"`'
|
||||
+ test -d '`dirname "$NGX_DEST_DIR$NGX_ERROR_LOG_PATH"`' || \
|
||||
+ mkdir -p '`dirname "$NGX_DEST_DIR$NGX_ERROR_LOG_PATH"`'
|
||||
END
|
||||
|
||||
fi
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- auto/options.orig 2007-03-22 09:34:58.000000000 -0600
|
||||
+++ auto/options 2007-03-22 09:35:33.000000000 -0600
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
help=no
|
||||
|
||||
+NGX_DEST_DIR=${DESTDIR:-}
|
||||
NGX_PREFIX=
|
||||
NGX_SBIN_PATH=
|
||||
NGX_CONF_PATH=
|
||||
23
nginx.spec
23
nginx.spec
|
|
@ -8,8 +8,8 @@
|
|||
%define nginx_webroot %{nginx_datadir}/html
|
||||
|
||||
Name: nginx
|
||||
Version: 0.6.31
|
||||
Release: 2%{?dist}
|
||||
Version: 0.6.32
|
||||
Release: 1%{?dist}
|
||||
Summary: Robust, small and high performance http and reverse proxy server
|
||||
Group: System Environment/Daemons
|
||||
|
||||
|
|
@ -47,14 +47,9 @@ Source104: 404.html
|
|||
# -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
|
||||
Patch0: nginx-auto-cc-gcc.patch
|
||||
|
||||
# nginx has its own configure/build scripts. These patches allow nginx
|
||||
# to install into a buildroot.
|
||||
Patch1: nginx-auto-options.patch
|
||||
Patch2: nginx-auto-install.patch
|
||||
|
||||
# configuration patch to match all the Fedora paths for logs, pid files
|
||||
# etc.
|
||||
Patch3: nginx-conf.patch
|
||||
Patch1: nginx-conf.patch
|
||||
|
||||
%description
|
||||
Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
|
||||
|
|
@ -68,8 +63,6 @@ One third party module, nginx-upstream-fair, is added
|
|||
|
||||
%patch0 -p0
|
||||
%patch1 -p0
|
||||
%patch2 -p0
|
||||
%patch3 -p0
|
||||
%{__tar} zxvf %{SOURCE5}
|
||||
|
||||
%build
|
||||
|
|
@ -190,14 +183,18 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon May 26 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.31-2
|
||||
* Tue Jul 22 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.32-1
|
||||
- update to 0.6.32
|
||||
- nginx now supports DESTDIR so removed the patches that enabled it
|
||||
|
||||
* Mon May 26 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.31-3
|
||||
- init script fixes
|
||||
- resolve 'listen 80 default' [#447873]
|
||||
|
||||
* Mon May 12 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.31-1
|
||||
* Mon May 12 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.31-2
|
||||
- update to 0.6.31
|
||||
|
||||
* Sun May 11 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.30-1
|
||||
* Sun May 11 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.30-2
|
||||
- upate to new upstream stable branch 0.6
|
||||
- added 3rd party module nginx-upstream-fair
|
||||
- added default webpages
|
||||
|
|
|
|||
Loading…
Reference in New Issue