From 5fd1a15da26747d79461e9cfdbffd78acd8b29ea 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, 22 Dec 2011 11:39:27 +0800 Subject: [PATCH] upgraded luajit to 2.0.0 beta9 and also applied the patch nginx-1.0.10-gzip_ok_invalid_read_fix.patch. --- util/mirror-tarballs | 16 +++++++++------- util/ver | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 07a664b..e1ee5f4 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -54,6 +54,8 @@ patch -p1 < $root/patches/nginx-$main_ver-allow_request_body_updating.patch || e patch -p1 < $root/patches/nginx-$main_ver-log_escape_non_ascii.patch || exit 1 +patch -p1 < $root/patches/nginx-$main_ver-gzip_ok_invalid_read_fix.patch || exit 1 + rm -f *.patch || exit 1 cd .. || exit 1 @@ -205,16 +207,16 @@ rm lua-makefile-fix.patch || exit 1 ################################# -ver=2.0.0-beta8 +ver=2.0.0-beta9 $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 -cd LuaJIT-$ver || exit 1; -$root/util/get-tarball http://luajit.org/download/beta8_hotfix1.patch -O beta8_hotfix1.patch -patch -p1 < beta8_hotfix1.patch || exit 1 -rm beta8_hotfix1.patch || exit 1 -cp $root/misc/unwind-generic.h ./unwind.h || exit 1 -cd .. +#cd LuaJIT-$ver || exit 1; +#$root/util/get-tarball http://luajit.org/download/beta8_hotfix1.patch -O beta8_hotfix1.patch +#patch -p1 < beta8_hotfix1.patch || exit 1 +#rm beta8_hotfix1.patch || exit 1 +#cp $root/misc/unwind-generic.h ./unwind.h || exit 1 +#cd .. ################################# diff --git a/util/ver b/util/ver index 4d1e541..0a248a3 100755 --- a/util/ver +++ b/util/ver @@ -1,7 +1,7 @@ #!/bin/bash main_ver=1.0.10 -minor_ver=29 +minor_ver=31 version=$main_ver.$minor_ver echo $version