From 6271d106b48370390d55be951de21d3520eba829 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: Thu, 12 May 2011 18:06:02 +0800 Subject: [PATCH 01/10] added a note for starting the ngx_openresty server. --- README | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README b/README index c5fba5e..34acd38 100644 --- a/README +++ b/README @@ -71,6 +71,12 @@ in your PATH environment, and then follow the following steps: make install +Then you can start your server this way: + + /usr/local/openresty/nginx/sbin/nginx -p /path/to/your/server/root -c /path/to/your/nginx.conf + +assuming you're using the default "prefix", i.e., /usr/local/openresty, in Step 2. + For bundle maintainers: The bundle's source is at the following git repository: 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 02/10] 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 From f43134c1fd42ea5f41e6b71a4b8f05ef1365ceb5 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:56:51 +0800 Subject: [PATCH 03/10] release 0.8.54.4. --- README | 24 ++++++++++++++++-------- util/ver | 2 +- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/README b/README index 34acd38..ed6f074 100644 --- a/README +++ b/README @@ -34,11 +34,11 @@ in your PATH environment, and then follow the following steps: 1. download the latest ngx_openresty tarball can be downloaded from - http://agentzh.org/misc/nginx/ngx_openresty-0.8.54.3.tar.gz + http://agentzh.org/misc/nginx/ngx_openresty-0.8.54.4.tar.gz we will eventually migrate to the openresty.org domain. -2. and then enter the ngx_openresty-0.8.54.3/ directory, +2. and then enter the ngx_openresty-0.8.54.4/ directory, and type the following command to configure: ./configure @@ -89,31 +89,39 @@ For bundle maintainers: at the top of the bundle source tree. -The following packages are bundled in the 0.8.54.3 release: +The following packages are bundled in the 0.8.54.4 release: - LuaJIT-2.0.0-beta6 + LuaJIT-2.0.0-beta7 array-var-nginx-module-0.02 auth-request-nginx-module-0.2 drizzle-nginx-module-0.0.15rc9 echo-nginx-module-0.36rc2 encrypted-session-nginx-module-0.01 form-input-nginx-module-0.07rc4 - headers-more-nginx-module-0.14 + headers-more-nginx-module-0.15rc1 iconv-nginx-module-0.10rc3 libdrizzle-0.8 lua-5.1.4 memc-nginx-module-0.12rc1 nginx-0.8.54 ngx_devel_kit-0.2.17 - ngx_lua-0.1.6rc3 + ngx_lua-0.1.6rc8 ngx_postgres-0.8 rds-json-nginx-module-0.11rc2 - redis2-nginx-module-0.06 + redis2-nginx-module-0.07rc1 set-misc-nginx-module-0.21 - srcache-nginx-module-0.12rc2 + srcache-nginx-module-0.12rc4 upstream-keepalive-nginx-module-0.3 xss-nginx-module-0.03rc2 +REPORT BUGS + +You're very welcome to report issues on GitHub: + + https://github.com/agentzh/ngx_openresty/issues + +COPYRIGHT & LICENSE + The bundle itself is licensed under the 2-clause BSD license. Copyright (c) 2011, Taobao Inc., Alibaba Group ( diff --git a/util/ver b/util/ver index 89dba59..b94e6d1 100755 --- a/util/ver +++ b/util/ver @@ -1,7 +1,7 @@ #!/bin/bash main_ver=0.8.54 -minor_ver=4rc3 +minor_ver=4 version=$main_ver.$minor_ver echo $version From 777da53f2dcd235e85b0f471334c4b622f884a7f 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: Wed, 25 May 2011 14:37:33 +0800 Subject: [PATCH 04/10] upgraded ngx_lua to 0.1.6rc9 and ngx_echo to 0.36rc3; released ngx_openresty 0.8.54.5. --- README | 10 ++++----- t/sanity.t | 52 ++++++++++++++++++++++---------------------- util/mirror-tarballs | 4 ++-- util/ver | 2 +- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/README b/README index ed6f074..531bce9 100644 --- a/README +++ b/README @@ -34,11 +34,11 @@ in your PATH environment, and then follow the following steps: 1. download the latest ngx_openresty tarball can be downloaded from - http://agentzh.org/misc/nginx/ngx_openresty-0.8.54.4.tar.gz + http://agentzh.org/misc/nginx/ngx_openresty-0.8.54.5.tar.gz we will eventually migrate to the openresty.org domain. -2. and then enter the ngx_openresty-0.8.54.4/ directory, +2. and then enter the ngx_openresty-0.8.54.5/ directory, and type the following command to configure: ./configure @@ -89,13 +89,13 @@ For bundle maintainers: at the top of the bundle source tree. -The following packages are bundled in the 0.8.54.4 release: +The following packages are bundled in the 0.8.54.5 release: LuaJIT-2.0.0-beta7 array-var-nginx-module-0.02 auth-request-nginx-module-0.2 drizzle-nginx-module-0.0.15rc9 - echo-nginx-module-0.36rc2 + echo-nginx-module-0.36rc3 encrypted-session-nginx-module-0.01 form-input-nginx-module-0.07rc4 headers-more-nginx-module-0.15rc1 @@ -105,7 +105,7 @@ The following packages are bundled in the 0.8.54.4 release: memc-nginx-module-0.12rc1 nginx-0.8.54 ngx_devel_kit-0.2.17 - ngx_lua-0.1.6rc8 + ngx_lua-0.1.6rc9 ngx_postgres-0.8 rds-json-nginx-module-0.11rc2 redis2-nginx-module-0.07rc1 diff --git a/t/sanity.t b/t/sanity.t index e7e4124..2812386 100644 --- a/t/sanity.t +++ b/t/sanity.t @@ -194,14 +194,14 @@ cd .. cd nginx-0.8.54 ./configure --prefix=/usr/local/openresty/nginx \ --with-cc-opt='-O2' \ - --add-module=../echo-nginx-module-0.36rc2 \ + --add-module=../echo-nginx-module-0.36rc3 \ --add-module=../xss-nginx-module-0.03rc2 \ --add-module=../ngx_devel_kit-0.2.17 \ --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=../drizzle-nginx-module-0.0.15rc9 \ - --add-module=../ngx_lua-0.1.6rc8 \ + --add-module=../ngx_lua-0.1.6rc9 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -254,14 +254,14 @@ cd nginx-0.8.54 ./configure --prefix=/usr/local/openresty/nginx \ --with-debug \ --with-cc-opt='-O0' \ - --add-module=../echo-nginx-module-0.36rc2 \ + --add-module=../echo-nginx-module-0.36rc3 \ --add-module=../xss-nginx-module-0.03rc2 \ --add-module=../ngx_devel_kit-0.2.17 \ --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=../drizzle-nginx-module-0.0.15rc9 \ - --add-module=../ngx_lua-0.1.6rc8 \ + --add-module=../ngx_lua-0.1.6rc9 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -323,14 +323,14 @@ cd .. cd nginx-0.8.54 ./configure --prefix=/usr/local/openresty/nginx \ --with-cc-opt='-O2' \ - --add-module=../echo-nginx-module-0.36rc2 \ + --add-module=../echo-nginx-module-0.36rc3 \ --add-module=../xss-nginx-module-0.03rc2 \ --add-module=../ngx_devel_kit-0.2.17 \ --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=../drizzle-nginx-module-0.0.15rc9 \ - --add-module=../ngx_lua-0.1.6rc8 \ + --add-module=../ngx_lua-0.1.6rc9 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -382,14 +382,14 @@ cd .. cd nginx-0.8.54 ./configure --prefix=/usr/local/openresty/nginx \ --with-cc-opt='-O2 -O3' \ - --add-module=../echo-nginx-module-0.36rc2 \ + --add-module=../echo-nginx-module-0.36rc3 \ --add-module=../xss-nginx-module-0.03rc2 \ --add-module=../ngx_devel_kit-0.2.17 \ --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=../drizzle-nginx-module-0.0.15rc9 \ - --add-module=../ngx_lua-0.1.6rc8 \ + --add-module=../ngx_lua-0.1.6rc9 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -441,14 +441,14 @@ cd .. cd nginx-0.8.54 ./configure --prefix=/usr/local/openresty/nginx \ --with-cc-opt='-O2' \ - --add-module=../echo-nginx-module-0.36rc2 \ + --add-module=../echo-nginx-module-0.36rc3 \ --add-module=../xss-nginx-module-0.03rc2 \ --add-module=../ngx_devel_kit-0.2.17 \ --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=../drizzle-nginx-module-0.0.15rc9 \ - --add-module=../ngx_lua-0.1.6rc8 \ + --add-module=../ngx_lua-0.1.6rc9 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -493,13 +493,13 @@ cd .. cd nginx-0.8.54 ./configure --prefix=/usr/local/openresty/nginx \ --with-cc-opt='-O2' \ - --add-module=../echo-nginx-module-0.36rc2 \ + --add-module=../echo-nginx-module-0.36rc3 \ --add-module=../xss-nginx-module-0.03rc2 \ --add-module=../ngx_devel_kit-0.2.17 \ --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.6rc8 \ + --add-module=../ngx_lua-0.1.6rc9 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -549,7 +549,7 @@ cd .. cd nginx-0.8.54 ./configure --prefix=/usr/local/openresty/nginx \ --with-cc-opt='-O2' \ - --add-module=../echo-nginx-module-0.36rc2 \ + --add-module=../echo-nginx-module-0.36rc3 \ --add-module=../xss-nginx-module-0.03rc2 \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../set-misc-nginx-module-0.21 \ @@ -601,7 +601,7 @@ cd .. cd nginx-0.8.54 ./configure --prefix=/usr/local/openresty/nginx \ --with-cc-opt='-O2' \ - --add-module=../echo-nginx-module-0.36rc2 \ + --add-module=../echo-nginx-module-0.36rc3 \ --add-module=../xss-nginx-module-0.03rc2 \ --add-module=../ngx_devel_kit-0.2.17 \ --add-module=../set-misc-nginx-module-0.21 \ @@ -650,14 +650,14 @@ cd .. cd nginx-0.8.54 ./configure --prefix=/usr/local/openresty/nginx \ --with-cc-opt='-O2' \ - --add-module=../echo-nginx-module-0.36rc2 \ + --add-module=../echo-nginx-module-0.36rc3 \ --add-module=../xss-nginx-module-0.03rc2 \ --add-module=../ngx_devel_kit-0.2.17 \ --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_postgres-0.8 \ - --add-module=../ngx_lua-0.1.6rc8 \ + --add-module=../ngx_lua-0.1.6rc9 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -701,13 +701,13 @@ cd nginx-0.8.54 ./configure --prefix=/usr/local/openresty/nginx \ --with-cc-opt='-O2' \ --add-module=../iconv-nginx-module-0.10rc3 \ - --add-module=../echo-nginx-module-0.36rc2 \ + --add-module=../echo-nginx-module-0.36rc3 \ --add-module=../xss-nginx-module-0.03rc2 \ --add-module=../ngx_devel_kit-0.2.17 \ --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.6rc8 \ + --add-module=../ngx_lua-0.1.6rc9 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -757,14 +757,14 @@ cd .. cd nginx-0.8.54 ./configure --prefix=/opt/blah/nginx \ --with-cc-opt='-O2' \ - --add-module=../echo-nginx-module-0.36rc2 \ + --add-module=../echo-nginx-module-0.36rc3 \ --add-module=../xss-nginx-module-0.03rc2 \ --add-module=../ngx_devel_kit-0.2.17 \ --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=../drizzle-nginx-module-0.0.15rc9 \ - --add-module=../ngx_lua-0.1.6rc8 \ + --add-module=../ngx_lua-0.1.6rc9 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -971,13 +971,13 @@ cd .. cd nginx-0.8.54 ./configure --prefix=/usr/local/openresty/nginx \ --with-cc-opt='-O2' \ - --add-module=../echo-nginx-module-0.36rc2 \ + --add-module=../echo-nginx-module-0.36rc3 \ --add-module=../xss-nginx-module-0.03rc2 \ --add-module=../ngx_devel_kit-0.2.17 \ --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.6rc8 \ + --add-module=../ngx_lua-0.1.6rc9 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -1026,14 +1026,14 @@ cd .. cd nginx-0.8.54 ./configure --prefix=/usr/local/openresty/nginx \ --with-cc-opt='-O2' \ - --add-module=../echo-nginx-module-0.36rc2 \ + --add-module=../echo-nginx-module-0.36rc3 \ --add-module=../xss-nginx-module-0.03rc2 \ --add-module=../ngx_devel_kit-0.2.17 \ --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=../drizzle-nginx-module-0.0.15rc9 \ - --add-module=../ngx_lua-0.1.6rc8 \ + --add-module=../ngx_lua-0.1.6rc9 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -1085,14 +1085,14 @@ cd .. cd nginx-0.8.54 ./configure --prefix=/usr/local/openresty/nginx \ --with-cc-opt='-O2' \ - --add-module=../echo-nginx-module-0.36rc2 \ + --add-module=../echo-nginx-module-0.36rc3 \ --add-module=../xss-nginx-module-0.03rc2 \ --add-module=../ngx_devel_kit-0.2.17 \ --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=../drizzle-nginx-module-0.0.15rc9 \ - --add-module=../ngx_lua-0.1.6rc8 \ + --add-module=../ngx_lua-0.1.6rc9 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 7978331..5465205 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -39,7 +39,7 @@ rm -f *.patch || exit 1 cd .. || exit 1 -ver=0.36rc2 +ver=0.36rc3 $root/util/get-tarball "http://github.com/agentzh/echo-nginx-module/tarball/v$ver" -O echo-nginx-module-$ver.tar.gz || exit 1 tar -xzf echo-nginx-module-$ver.tar.gz mv agentzh-echo-nginx-module-* echo-nginx-module-$ver @@ -78,7 +78,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1 ################################# -ver=0.1.6rc8 +ver=0.1.6rc9 $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 diff --git a/util/ver b/util/ver index b94e6d1..ac2b3f9 100755 --- a/util/ver +++ b/util/ver @@ -1,7 +1,7 @@ #!/bin/bash main_ver=0.8.54 -minor_ver=4 +minor_ver=5 version=$main_ver.$minor_ver echo $version From 73f13092eb47801461233a470f9d46692a6aaaaf 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: Thu, 26 May 2011 14:43:11 +0800 Subject: [PATCH 05/10] broke lines that are too long in README. --- README | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README b/README index 531bce9..1f9548f 100644 --- a/README +++ b/README @@ -73,7 +73,8 @@ in your PATH environment, and then follow the following steps: Then you can start your server this way: - /usr/local/openresty/nginx/sbin/nginx -p /path/to/your/server/root -c /path/to/your/nginx.conf + /usr/local/openresty/nginx/sbin/nginx -p /path/to/your/server/root \ + -c /path/to/your/nginx.conf assuming you're using the default "prefix", i.e., /usr/local/openresty, in Step 2. From 4df2272a771b67d05f5d95b6df90fd5e036cb7c7 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: Thu, 26 May 2011 15:23:30 +0800 Subject: [PATCH 06/10] documented that for certain Debian systems, it is required to specify --with-ld-opt="-ldl" when luajit is enabled. --- README | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README b/README index 1f9548f..4493342 100644 --- a/README +++ b/README @@ -15,6 +15,9 @@ A quick note to Debian and Ubuntu users: apt-get install libreadline-dev libpcre3-dev libssl-dev perl + On some Debian systems, when --with-luajit is specified, it is required + to specify the option --with-ld-opt="-ldl" as well. + A quick note to Fedora/RedHat users: You're recommended to install the following packages using yum before installing this bundle: From 087ec653a5e56a989270af878b0a4e893e2a6586 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: Thu, 26 May 2011 15:26:27 +0800 Subject: [PATCH 07/10] documented the autoconf.err file for debugging ./configure issues. --- README | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README b/README index 4493342..c87c53d 100644 --- a/README +++ b/README @@ -15,9 +15,6 @@ A quick note to Debian and Ubuntu users: apt-get install libreadline-dev libpcre3-dev libssl-dev perl - On some Debian systems, when --with-luajit is specified, it is required - to specify the option --with-ld-opt="-ldl" as well. - A quick note to Fedora/RedHat users: You're recommended to install the following packages using yum before installing this bundle: @@ -61,6 +58,13 @@ in your PATH environment, and then follow the following steps: so when it complaints about OpenSSL and you have indeed already installed it, specify the --with-ld-opt='-L/lib' option. + At least on some Debian systems, when --with-luajit is specified, + it is required to specify the option --with-ld-opt="-ldl" as well. + + Errors in running the ./configure script can be found in this file: + + build/nginx-0.8.54/objs/autoconf.err + 3. build everything locally make From b644d3d531fa58915832145ab24c5eab7417991c 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: Thu, 26 May 2011 15:36:51 +0800 Subject: [PATCH 08/10] now we create symlinks to luajit library files. --- patches/LuaJIT-2.0.0-beta7-symlink_lib.patch | 17 +++++++++++++++++ util/mirror-tarballs | 2 ++ util/ver | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 patches/LuaJIT-2.0.0-beta7-symlink_lib.patch diff --git a/patches/LuaJIT-2.0.0-beta7-symlink_lib.patch b/patches/LuaJIT-2.0.0-beta7-symlink_lib.patch new file mode 100644 index 0000000..59701f2 --- /dev/null +++ b/patches/LuaJIT-2.0.0-beta7-symlink_lib.patch @@ -0,0 +1,17 @@ +--- LuaJIT-2.0.0-beta7/Makefile 2011-05-05 22:30:00.000000000 +0800 ++++ LuaJIT-2.0.0-beta7-patched/Makefile 2011-05-26 15:32:02.888893148 +0800 +@@ -113,13 +113,8 @@ + $(RM) $(FILE_PC).tmp + cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC) + cd lib && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB) ++ $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM) + @echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ====" +- @echo "" +- @echo "Note: the beta releases deliberately do NOT install a symlink for luajit" +- @echo "You can do this now by running this command (with sudo):" +- @echo "" +- @echo " $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)" +- @echo "" + + ############################################################################## + diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 5465205..87b1fbf 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -180,6 +180,8 @@ 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 +patch -p0 < $root/patches/LuaJIT-$ver-symlink_lib.patch || exit 1 + ################################# ver=0.8 diff --git a/util/ver b/util/ver index ac2b3f9..2725d6a 100755 --- a/util/ver +++ b/util/ver @@ -1,7 +1,7 @@ #!/bin/bash main_ver=0.8.54 -minor_ver=5 +minor_ver=6rc1 version=$main_ver.$minor_ver echo $version From 942411c114aa843c5e47dd641666f27463c77566 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: Thu, 26 May 2011 15:47:21 +0800 Subject: [PATCH 09/10] emphasized that you need to add the path of your "ldconfig" utility to your PATH env if you want to enable luajit. --- README | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/README b/README index c87c53d..21cc03d 100644 --- a/README +++ b/README @@ -15,6 +15,18 @@ A quick note to Debian and Ubuntu users: apt-get install libreadline-dev libpcre3-dev libssl-dev perl + If you want to enable LuaJIT, ensure that your system's "ldconfig" + utility is in your PATH environment. You can check out + the path of your "ldconfig" by using the "whereis" command: + + whereis ldconfig + + On Debian systems, it's usually /sbin, and you just need to add + it to your PATH this way: + + PATH=/sbin:$PATH + export PATH + A quick note to Fedora/RedHat users: You're recommended to install the following packages using yum before installing this bundle: @@ -58,9 +70,6 @@ in your PATH environment, and then follow the following steps: so when it complaints about OpenSSL and you have indeed already installed it, specify the --with-ld-opt='-L/lib' option. - At least on some Debian systems, when --with-luajit is specified, - it is required to specify the option --with-ld-opt="-ldl" as well. - Errors in running the ./configure script can be found in this file: build/nginx-0.8.54/objs/autoconf.err From 70d58760ef2c3ca5506845e523e6c77a1a3fe62b 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, 27 May 2011 17:03:59 +0800 Subject: [PATCH 10/10] upgraded ngx_lua to 0.1.6rc10; marked ngx_openresty 0.8.54.6rc2. --- t/sanity.t | 24 ++++++++++++------------ util/mirror-tarballs | 2 +- util/ver | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/t/sanity.t b/t/sanity.t index 2812386..58f0681 100644 --- a/t/sanity.t +++ b/t/sanity.t @@ -201,7 +201,7 @@ 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.6rc9 \ + --add-module=../ngx_lua-0.1.6rc10 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -261,7 +261,7 @@ 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.6rc9 \ + --add-module=../ngx_lua-0.1.6rc10 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -330,7 +330,7 @@ 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.6rc9 \ + --add-module=../ngx_lua-0.1.6rc10 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -389,7 +389,7 @@ 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.6rc9 \ + --add-module=../ngx_lua-0.1.6rc10 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -448,7 +448,7 @@ 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.6rc9 \ + --add-module=../ngx_lua-0.1.6rc10 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -499,7 +499,7 @@ 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.6rc9 \ + --add-module=../ngx_lua-0.1.6rc10 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -657,7 +657,7 @@ 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.6rc9 \ + --add-module=../ngx_lua-0.1.6rc10 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -707,7 +707,7 @@ 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.6rc9 \ + --add-module=../ngx_lua-0.1.6rc10 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -764,7 +764,7 @@ 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.6rc9 \ + --add-module=../ngx_lua-0.1.6rc10 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -977,7 +977,7 @@ 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.6rc9 \ + --add-module=../ngx_lua-0.1.6rc10 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -1033,7 +1033,7 @@ 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.6rc9 \ + --add-module=../ngx_lua-0.1.6rc10 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ @@ -1092,7 +1092,7 @@ 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.6rc9 \ + --add-module=../ngx_lua-0.1.6rc10 \ --add-module=../headers-more-nginx-module-0.15rc1 \ --add-module=../srcache-nginx-module-0.12rc4 \ --add-module=../array-var-nginx-module-0.02 \ diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 87b1fbf..b749622 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.6rc9 +ver=0.1.6rc10 $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 diff --git a/util/ver b/util/ver index 2725d6a..4852dc4 100755 --- a/util/ver +++ b/util/ver @@ -1,7 +1,7 @@ #!/bin/bash main_ver=0.8.54 -minor_ver=6rc1 +minor_ver=6rc2 version=$main_ver.$minor_ver echo $version