From 400de3c50d4f1b20c853437a362c97ef4a205dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?agentzh=20=28=E7=AB=A0=E4=BA=A6=E6=98=A5=29?= Date: Fri, 13 May 2011 15:37:45 +0800 Subject: [PATCH] upgraded LuaJIT2.0, ngx_lua, ngx_headers_more, and ngx_srcache; also bumped the bundle version to 0.8.54.4rc3. --- t/sanity.t | 94 ++++++++++++++++++++++---------------------- util/fix-tests | 13 +++++- util/mirror-tarballs | 6 +-- util/ver | 2 +- 4 files changed, 63 insertions(+), 52 deletions(-) diff --git a/t/sanity.t b/t/sanity.t index 8a5a428..e7e4124 100644 --- a/t/sanity.t +++ b/t/sanity.t @@ -201,9 +201,9 @@ cd nginx-0.8.54 --add-module=../form-input-nginx-module-0.07rc4 \ --add-module=../encrypted-session-nginx-module-0.01 \ --add-module=../drizzle-nginx-module-0.0.15rc9 \ - --add-module=../ngx_lua-0.1.6rc4 \ + --add-module=../ngx_lua-0.1.6rc8 \ --add-module=../headers-more-nginx-module-0.15rc1 \ - --add-module=../srcache-nginx-module-0.12rc2 \ + --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ --add-module=../memc-nginx-module-0.12rc1 \ --add-module=../redis2-nginx-module-0.07rc1 \ @@ -261,9 +261,9 @@ cd nginx-0.8.54 --add-module=../form-input-nginx-module-0.07rc4 \ --add-module=../encrypted-session-nginx-module-0.01 \ --add-module=../drizzle-nginx-module-0.0.15rc9 \ - --add-module=../ngx_lua-0.1.6rc4 \ + --add-module=../ngx_lua-0.1.6rc8 \ --add-module=../headers-more-nginx-module-0.15rc1 \ - --add-module=../srcache-nginx-module-0.12rc2 \ + --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ --add-module=../memc-nginx-module-0.12rc1 \ --add-module=../redis2-nginx-module-0.07rc1 \ @@ -314,7 +314,7 @@ make install DESTDIR=$OPENRESTY_BUILD_DIR/libdrizzle-root export LIBDRIZZLE_LIB='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/lib' export LIBDRIZZLE_INC='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/include' cd .. -cd LuaJIT-2.0.0-beta6 +cd LuaJIT-2.0.0-beta7 make PREFIX=/usr/local/openresty/luajit make install PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib' @@ -330,9 +330,9 @@ cd nginx-0.8.54 --add-module=../form-input-nginx-module-0.07rc4 \ --add-module=../encrypted-session-nginx-module-0.01 \ --add-module=../drizzle-nginx-module-0.0.15rc9 \ - --add-module=../ngx_lua-0.1.6rc4 \ + --add-module=../ngx_lua-0.1.6rc8 \ --add-module=../headers-more-nginx-module-0.15rc1 \ - --add-module=../srcache-nginx-module-0.12rc2 \ + --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ --add-module=../memc-nginx-module-0.12rc1 \ --add-module=../redis2-nginx-module-0.07rc1 \ @@ -347,12 +347,12 @@ cd ../.. all: cd build/libdrizzle-0.8 && $(MAKE) - cd build/LuaJIT-2.0.0-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit + cd build/LuaJIT-2.0.0-beta7 && $(MAKE) PREFIX=/usr/local/openresty/luajit cd build/nginx-0.8.54 && $(MAKE) install: cd build/libdrizzle-0.8 && $(MAKE) install DESTDIR=$(DESTDIR) - cd build/LuaJIT-2.0.0-beta6 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) + cd build/LuaJIT-2.0.0-beta7 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR) clean: @@ -373,7 +373,7 @@ make install DESTDIR=$OPENRESTY_BUILD_DIR/libdrizzle-root export LIBDRIZZLE_LIB='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/lib' export LIBDRIZZLE_INC='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/include' cd .. -cd LuaJIT-2.0.0-beta6 +cd LuaJIT-2.0.0-beta7 make PREFIX=/usr/local/openresty/luajit make install PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib' @@ -389,9 +389,9 @@ cd nginx-0.8.54 --add-module=../form-input-nginx-module-0.07rc4 \ --add-module=../encrypted-session-nginx-module-0.01 \ --add-module=../drizzle-nginx-module-0.0.15rc9 \ - --add-module=../ngx_lua-0.1.6rc4 \ + --add-module=../ngx_lua-0.1.6rc8 \ --add-module=../headers-more-nginx-module-0.15rc1 \ - --add-module=../srcache-nginx-module-0.12rc2 \ + --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ --add-module=../memc-nginx-module-0.12rc1 \ --add-module=../redis2-nginx-module-0.07rc1 \ @@ -406,12 +406,12 @@ cd ../.. all: cd build/libdrizzle-0.8 && $(MAKE) - cd build/LuaJIT-2.0.0-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit + cd build/LuaJIT-2.0.0-beta7 && $(MAKE) PREFIX=/usr/local/openresty/luajit cd build/nginx-0.8.54 && $(MAKE) install: cd build/libdrizzle-0.8 && $(MAKE) install DESTDIR=$(DESTDIR) - cd build/LuaJIT-2.0.0-beta6 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) + cd build/LuaJIT-2.0.0-beta7 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR) clean: @@ -432,7 +432,7 @@ make install DESTDIR=$OPENRESTY_BUILD_DIR/libdrizzle-root export LIBDRIZZLE_LIB='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/lib' export LIBDRIZZLE_INC='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/include' cd .. -cd LuaJIT-2.0.0-beta6 +cd LuaJIT-2.0.0-beta7 make PREFIX=/usr/local/openresty/luajit make install PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib' @@ -448,9 +448,9 @@ cd nginx-0.8.54 --add-module=../form-input-nginx-module-0.07rc4 \ --add-module=../encrypted-session-nginx-module-0.01 \ --add-module=../drizzle-nginx-module-0.0.15rc9 \ - --add-module=../ngx_lua-0.1.6rc4 \ + --add-module=../ngx_lua-0.1.6rc8 \ --add-module=../headers-more-nginx-module-0.15rc1 \ - --add-module=../srcache-nginx-module-0.12rc2 \ + --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ --add-module=../memc-nginx-module-0.12rc1 \ --add-module=../redis2-nginx-module-0.07rc1 \ @@ -465,12 +465,12 @@ cd ../.. all: cd build/libdrizzle-0.8 && $(MAKE) - cd build/LuaJIT-2.0.0-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit + cd build/LuaJIT-2.0.0-beta7 && $(MAKE) PREFIX=/usr/local/openresty/luajit cd build/nginx-0.8.54 && $(MAKE) install: cd build/libdrizzle-0.8 && $(MAKE) install DESTDIR=$(DESTDIR) - cd build/LuaJIT-2.0.0-beta6 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) + cd build/LuaJIT-2.0.0-beta7 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR) clean: @@ -484,7 +484,7 @@ clean: platform: linux (linux) cp -r bundle/ build/ cd build -cd LuaJIT-2.0.0-beta6 +cd LuaJIT-2.0.0-beta7 make PREFIX=/usr/local/openresty/luajit make install PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib' @@ -499,9 +499,9 @@ cd nginx-0.8.54 --add-module=../set-misc-nginx-module-0.21 \ --add-module=../form-input-nginx-module-0.07rc4 \ --add-module=../encrypted-session-nginx-module-0.01 \ - --add-module=../ngx_lua-0.1.6rc4 \ + --add-module=../ngx_lua-0.1.6rc8 \ --add-module=../headers-more-nginx-module-0.15rc1 \ - --add-module=../srcache-nginx-module-0.12rc2 \ + --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ --add-module=../memc-nginx-module-0.12rc1 \ --add-module=../redis2-nginx-module-0.07rc1 \ @@ -515,11 +515,11 @@ cd ../.. .PHONY: all install all: - cd build/LuaJIT-2.0.0-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit + cd build/LuaJIT-2.0.0-beta7 && $(MAKE) PREFIX=/usr/local/openresty/luajit cd build/nginx-0.8.54 && $(MAKE) install: - cd build/LuaJIT-2.0.0-beta6 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) + cd build/LuaJIT-2.0.0-beta7 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR) clean: @@ -540,7 +540,7 @@ make install DESTDIR=$OPENRESTY_BUILD_DIR/libdrizzle-root export LIBDRIZZLE_LIB='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/lib' export LIBDRIZZLE_INC='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/include' cd .. -cd LuaJIT-2.0.0-beta6 +cd LuaJIT-2.0.0-beta7 make PREFIX=/usr/local/openresty/luajit make install PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib' @@ -557,7 +557,7 @@ cd nginx-0.8.54 --add-module=../encrypted-session-nginx-module-0.01 \ --add-module=../drizzle-nginx-module-0.0.15rc9 \ --add-module=../headers-more-nginx-module-0.15rc1 \ - --add-module=../srcache-nginx-module-0.12rc2 \ + --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ --add-module=../memc-nginx-module-0.12rc1 \ --add-module=../redis2-nginx-module-0.07rc1 \ @@ -572,12 +572,12 @@ cd ../.. all: cd build/libdrizzle-0.8 && $(MAKE) - cd build/LuaJIT-2.0.0-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit + cd build/LuaJIT-2.0.0-beta7 && $(MAKE) PREFIX=/usr/local/openresty/luajit cd build/nginx-0.8.54 && $(MAKE) install: cd build/libdrizzle-0.8 && $(MAKE) install DESTDIR=$(DESTDIR) - cd build/LuaJIT-2.0.0-beta6 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) + cd build/LuaJIT-2.0.0-beta7 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR) clean: @@ -609,7 +609,7 @@ cd nginx-0.8.54 --add-module=../encrypted-session-nginx-module-0.01 \ --add-module=../drizzle-nginx-module-0.0.15rc9 \ --add-module=../headers-more-nginx-module-0.15rc1 \ - --add-module=../srcache-nginx-module-0.12rc2 \ + --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ --add-module=../memc-nginx-module-0.12rc1 \ --add-module=../redis2-nginx-module-0.07rc1 \ @@ -641,7 +641,7 @@ clean: platform: linux (linux) cp -r bundle/ build/ cd build -cd LuaJIT-2.0.0-beta6 +cd LuaJIT-2.0.0-beta7 make PREFIX=/usr/local/openresty/luajit make install PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib' @@ -657,9 +657,9 @@ cd nginx-0.8.54 --add-module=../form-input-nginx-module-0.07rc4 \ --add-module=../encrypted-session-nginx-module-0.01 \ --add-module=../ngx_postgres-0.8 \ - --add-module=../ngx_lua-0.1.6rc4 \ + --add-module=../ngx_lua-0.1.6rc8 \ --add-module=../headers-more-nginx-module-0.15rc1 \ - --add-module=../srcache-nginx-module-0.12rc2 \ + --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ --add-module=../memc-nginx-module-0.12rc1 \ --add-module=../redis2-nginx-module-0.07rc1 \ @@ -673,11 +673,11 @@ cd ../.. .PHONY: all install all: - cd build/LuaJIT-2.0.0-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit + cd build/LuaJIT-2.0.0-beta7 && $(MAKE) PREFIX=/usr/local/openresty/luajit cd build/nginx-0.8.54 && $(MAKE) install: - cd build/LuaJIT-2.0.0-beta6 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) + cd build/LuaJIT-2.0.0-beta7 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR) clean: @@ -691,7 +691,7 @@ clean: platform: linux (linux) cp -r bundle/ build/ cd build -cd LuaJIT-2.0.0-beta6 +cd LuaJIT-2.0.0-beta7 make PREFIX=/usr/local/openresty/luajit make install PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib' @@ -707,9 +707,9 @@ cd nginx-0.8.54 --add-module=../set-misc-nginx-module-0.21 \ --add-module=../form-input-nginx-module-0.07rc4 \ --add-module=../encrypted-session-nginx-module-0.01 \ - --add-module=../ngx_lua-0.1.6rc4 \ + --add-module=../ngx_lua-0.1.6rc8 \ --add-module=../headers-more-nginx-module-0.15rc1 \ - --add-module=../srcache-nginx-module-0.12rc2 \ + --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ --add-module=../memc-nginx-module-0.12rc1 \ --add-module=../redis2-nginx-module-0.07rc1 \ @@ -723,11 +723,11 @@ cd ../.. .PHONY: all install all: - cd build/LuaJIT-2.0.0-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit + cd build/LuaJIT-2.0.0-beta7 && $(MAKE) PREFIX=/usr/local/openresty/luajit cd build/nginx-0.8.54 && $(MAKE) install: - cd build/LuaJIT-2.0.0-beta6 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) + cd build/LuaJIT-2.0.0-beta7 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR) cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR) clean: @@ -764,9 +764,9 @@ cd nginx-0.8.54 --add-module=../form-input-nginx-module-0.07rc4 \ --add-module=../encrypted-session-nginx-module-0.01 \ --add-module=../drizzle-nginx-module-0.0.15rc9 \ - --add-module=../ngx_lua-0.1.6rc4 \ + --add-module=../ngx_lua-0.1.6rc8 \ --add-module=../headers-more-nginx-module-0.15rc1 \ - --add-module=../srcache-nginx-module-0.12rc2 \ + --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ --add-module=../memc-nginx-module-0.12rc1 \ --add-module=../redis2-nginx-module-0.07rc1 \ @@ -977,9 +977,9 @@ cd nginx-0.8.54 --add-module=../set-misc-nginx-module-0.21 \ --add-module=../form-input-nginx-module-0.07rc4 \ --add-module=../encrypted-session-nginx-module-0.01 \ - --add-module=../ngx_lua-0.1.6rc4 \ + --add-module=../ngx_lua-0.1.6rc8 \ --add-module=../headers-more-nginx-module-0.15rc1 \ - --add-module=../srcache-nginx-module-0.12rc2 \ + --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ --add-module=../memc-nginx-module-0.12rc1 \ --add-module=../redis2-nginx-module-0.07rc1 \ @@ -1033,9 +1033,9 @@ cd nginx-0.8.54 --add-module=../form-input-nginx-module-0.07rc4 \ --add-module=../encrypted-session-nginx-module-0.01 \ --add-module=../drizzle-nginx-module-0.0.15rc9 \ - --add-module=../ngx_lua-0.1.6rc4 \ + --add-module=../ngx_lua-0.1.6rc8 \ --add-module=../headers-more-nginx-module-0.15rc1 \ - --add-module=../srcache-nginx-module-0.12rc2 \ + --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ --add-module=../memc-nginx-module-0.12rc1 \ --add-module=../redis2-nginx-module-0.07rc1 \ @@ -1092,9 +1092,9 @@ cd nginx-0.8.54 --add-module=../form-input-nginx-module-0.07rc4 \ --add-module=../encrypted-session-nginx-module-0.01 \ --add-module=../drizzle-nginx-module-0.0.15rc9 \ - --add-module=../ngx_lua-0.1.6rc4 \ + --add-module=../ngx_lua-0.1.6rc8 \ --add-module=../headers-more-nginx-module-0.15rc1 \ - --add-module=../srcache-nginx-module-0.12rc2 \ + --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ --add-module=../memc-nginx-module-0.12rc1 \ --add-module=../redis2-nginx-module-0.07rc1 \ diff --git a/util/fix-tests b/util/fix-tests index e476b91..0b3a13b 100755 --- a/util/fix-tests +++ b/util/fix-tests @@ -42,9 +42,20 @@ for my $t_file (@t_files) { if (s{\.\./$pat\S+}{../$dir}g && $orig ne $_) { $changed++; + warn "\n- $orig"; + warn "+ $_"; + } elsif (s{\bbuild/$pat\S+}{build/$dir}g && $orig ne $_) { + $changed++; + + warn "\n- $orig"; + warn "+ $_"; + } elsif (s{^cd $pat\S+}{cd $dir}g && $orig ne $_) { + $changed++; + warn "\n- $orig"; warn "+ $_"; } + } print $out $_; @@ -57,7 +68,7 @@ for my $t_file (@t_files) { close $in; } -print join "\n", map { " $_" } sort @dirs; +print join("\n", map { " $_" } sort @dirs), "\n"; sub cd ($) { my $dir = shift; diff --git a/util/mirror-tarballs b/util/mirror-tarballs index bdceb84..7978331 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -78,7 +78,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1 ################################# -ver=0.1.6rc4 +ver=0.1.6rc8 $root/util/get-tarball "http://github.com/chaoslawful/lua-nginx-module/tarball/v$ver" -O lua-nginx-module-$ver.tar.gz || exit 1 tar -xzf lua-nginx-module-$ver.tar.gz || exit 1 mv chaoslawful-lua-nginx-module-* ngx_lua-$ver || exit 1 @@ -99,7 +99,7 @@ mv agentzh-memc-nginx-module-* memc-nginx-module-$ver || exit 1 ################################# -ver=0.12rc2 +ver=0.12rc4 $root/util/get-tarball "http://github.com/agentzh/srcache-nginx-module/tarball/v$ver" -O srcache-nginx-module-$ver.tar.gz || exit 1 tar -xzf srcache-nginx-module-$ver.tar.gz || exit 1 mv agentzh-srcache-nginx-module-* srcache-nginx-module-$ver || exit 1 @@ -176,7 +176,7 @@ rm lua-makefile-fix.patch ################################# -ver=2.0.0-beta6 +ver=2.0.0-beta7 $root/util/get-tarball "http://luajit.org/download/LuaJIT-$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1 tar -xzf LuaJIT-$ver.tar.gz || exit 1 diff --git a/util/ver b/util/ver index 7eec5f3..89dba59 100755 --- a/util/ver +++ b/util/ver @@ -1,7 +1,7 @@ #!/bin/bash main_ver=0.8.54 -minor_ver=4rc2 +minor_ver=4rc3 version=$main_ver.$minor_ver echo $version