diff --git a/util/mirror-tarballs b/util/mirror-tarballs index c43dfe5..03f1d09 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -235,23 +235,20 @@ mv agentzh-redis2-nginx-module-* redis2-nginx-module-$ver || exit 1 ################################# -ver=5.1.4 +ver=5.1.5 $root/util/get-tarball "http://www.lua.org/ftp/lua-$ver.tar.gz" -O "lua-$ver.tar.gz" || exit 1 tar -xzf lua-$ver.tar.gz || exit 1 -$root/util/get-tarball "http://agentzh.org/misc/nginx/patch-lua-$ver-4" -O "patch-lua-$ver-4" || exit 1 +#$root/util/get-tarball "http://agentzh.org/misc/nginx/patch-lua-$ver-4" -O "patch-lua-$ver-4" || exit 1 -cd lua-$ver/src || exit 1 -patch -p0 < ../../patch-lua-$ver-4 || exit 1 -cd ../.. || exit 1 +#cd lua-$ver/src || exit 1 +#patch -p0 < ../../patch-lua-$ver-4 || exit 1 +#cd ../.. || exit 1 -rm "patch-lua-$ver-4" || exit 1 +#rm "patch-lua-$ver-4" || exit 1 -cp $root/patches/lua-$ver-makefile_install_fix.patch lua-makefile-fix.patch || exit 1 - -patch -p0 < lua-makefile-fix.patch || exit 1 - -rm lua-makefile-fix.patch || exit 1 +patch -p0 < $root/patches/lua-$ver-makefile_install_fix.patch || exit 1 +patch -p0 < $root/patches/lua-$ver-disable_lua50_compat.patch || exit 1 ################################# diff --git a/util/ver b/util/ver index a1189c5..0939be7 100755 --- a/util/ver +++ b/util/ver @@ -1,7 +1,7 @@ #!/bin/bash main_ver=1.2.1 -minor_ver=5 +minor_ver=7rc1 version=$main_ver.$minor_ver echo $version