From 69a2effd7b26671a391029c2e785de6337ddf0e8 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: Mon, 27 Jun 2011 20:00:19 +0800 Subject: [PATCH] upgraded LuaJIT to 2.0.0beta8, ngx_lua to 0.1.6rc15, and ngx_echo to 0.36rc4; also released ngx_openresty 0.8.54.7rc3. --- patches/LuaJIT-2.0.0-beta7-symlink_lib.patch | 17 -------------- patches/nginx-0.8.54-no_Werror.patch | 24 ++++++++++++++++++++ util/mirror-tarballs | 10 ++++---- util/ver | 2 +- 4 files changed, 31 insertions(+), 22 deletions(-) delete mode 100644 patches/LuaJIT-2.0.0-beta7-symlink_lib.patch create mode 100644 patches/nginx-0.8.54-no_Werror.patch diff --git a/patches/LuaJIT-2.0.0-beta7-symlink_lib.patch b/patches/LuaJIT-2.0.0-beta7-symlink_lib.patch deleted file mode 100644 index 59701f2..0000000 --- a/patches/LuaJIT-2.0.0-beta7-symlink_lib.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- 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/patches/nginx-0.8.54-no_Werror.patch b/patches/nginx-0.8.54-no_Werror.patch new file mode 100644 index 0000000..977024c --- /dev/null +++ b/patches/nginx-0.8.54-no_Werror.patch @@ -0,0 +1,24 @@ +diff -ur nginx-0.8.54/auto/cc/gcc nginx-0.8.54-patched/auto/cc/gcc +--- nginx-0.8.54/auto/cc/gcc 2011-06-27 19:53:00.205737804 +0800 ++++ nginx-0.8.54-patched/auto/cc/gcc 2011-06-27 19:53:13.837741087 +0800 +@@ -169,7 +169,7 @@ + + + # stop on warning +-CFLAGS="$CFLAGS -Werror" ++#CFLAGS="$CFLAGS -Werror" + + # debug + CFLAGS="$CFLAGS -g" +diff -ur nginx-0.8.54/auto/cc/icc nginx-0.8.54-patched/auto/cc/icc +--- nginx-0.8.54/auto/cc/icc 2011-06-27 19:52:56.370157068 +0800 ++++ nginx-0.8.54-patched/auto/cc/icc 2011-06-27 19:53:19.508916811 +0800 +@@ -139,7 +139,7 @@ + esac + + # stop on warning +-CFLAGS="$CFLAGS -Werror" ++#CFLAGS="$CFLAGS -Werror" + + # debug + CFLAGS="$CFLAGS -g" diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 45ab657..716fd1b 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -36,11 +36,13 @@ patch -p1 < $root/patches/nginx-$main_ver-redirect_memcpy_overlap.patch || exit patch -p1 < $root/patches/nginx-$main_ver-no_error_pages.patch || exit 1 +patch -p1 < $root/patches/nginx-$main_ver-no_Werror.patch || exit 1 + rm -f *.patch || exit 1 cd .. || exit 1 -ver=0.36rc3 +ver=0.36rc4 $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 @@ -79,7 +81,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1 ################################# -ver=0.1.6rc14 +ver=0.1.6rc15 $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 @@ -177,11 +179,11 @@ rm lua-makefile-fix.patch ################################# -ver=2.0.0-beta7 +ver=2.0.0-beta8 $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 +#patch -p0 < $root/patches/LuaJIT-$ver-symlink_lib.patch || exit 1 ################################# diff --git a/util/ver b/util/ver index 621a42f..c9aa98b 100755 --- a/util/ver +++ b/util/ver @@ -1,7 +1,7 @@ #!/bin/bash main_ver=0.8.54 -minor_ver=7rc2 +minor_ver=7rc3 version=$main_ver.$minor_ver echo $version