mirror of
https://github.com/openresty/openresty.git
synced 2024-10-13 00:29:41 +00:00
Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
4ae742cb70 | |||
77f94345d1 | |||
85b7fca736 | |||
969d1d14ed | |||
efbc3cc213 | |||
5b91b67796 | |||
ebed2ed1c2 |
14
patches/lua-5.1.5-disable_lua50_compat.patch
Normal file
14
patches/lua-5.1.5-disable_lua50_compat.patch
Normal file
@ -0,0 +1,14 @@
|
||||
--- lua-5.1.5/src/luaconf.h 2008-02-11 08:25:08.000000000 -0800
|
||||
+++ lua-5.1.5-patched/src/luaconf.h 2012-07-04 18:36:05.700067698 -0700
|
||||
@@ -757,6 +757,11 @@
|
||||
** without modifying the main part of the file.
|
||||
*/
|
||||
|
||||
+#undef LUA_COMPAT_VARARG
|
||||
+#undef LUA_COMPAT_MOD
|
||||
+#undef LUA_COMPAT_LSTR
|
||||
+#undef LUA_COMPAT_GFIND
|
||||
+#undef LUA_COMPAT_OPENLIB
|
||||
|
||||
|
||||
#endif
|
23
patches/lua-5.1.5-makefile_install_fix.patch
Normal file
23
patches/lua-5.1.5-makefile_install_fix.patch
Normal file
@ -0,0 +1,23 @@
|
||||
--- lua-5.1.5/Makefile 2008-08-12 08:40:48.000000000 +0800
|
||||
+++ lua-5.1.5-patched/Makefile 2011-03-09 20:56:47.603422483 +0800
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
# How to install. If your install program does not support "-p", then you
|
||||
# may have to run ranlib on the installed liblua.a (do "make ranlib").
|
||||
-INSTALL= install -p
|
||||
-INSTALL_EXEC= $(INSTALL) -m 0755
|
||||
-INSTALL_DATA= $(INSTALL) -m 0644
|
||||
+#INSTALL= install -p
|
||||
+#INSTALL_EXEC= $(INSTALL) -m 0755
|
||||
+#INSTALL_DATA= $(INSTALL) -m 0644
|
||||
#
|
||||
# If you don't have install you can use cp instead.
|
||||
-# INSTALL= cp -p
|
||||
-# INSTALL_EXEC= $(INSTALL)
|
||||
-# INSTALL_DATA= $(INSTALL)
|
||||
+INSTALL= cp -p
|
||||
+INSTALL_EXEC= $(INSTALL)
|
||||
+INSTALL_DATA= $(INSTALL)
|
||||
|
||||
# Utilities.
|
||||
MKDIR= mkdir -p
|
@ -19,6 +19,8 @@ if [ ! -d $work ]; then
|
||||
mkdir $work || exit 1
|
||||
fi
|
||||
|
||||
#################################
|
||||
|
||||
ver="$main_ver"
|
||||
$root/util/get-tarball "http://nginx.org/download/nginx-$ver.tar.gz" -O nginx-$ver.tar.gz || exit 1
|
||||
tar -xzf nginx-$ver.tar.gz || exit 1
|
||||
@ -99,37 +101,51 @@ sed $"s/NGINX_VERSION \".unknown/NGINX_VERSION \".$minor_ver/" \
|
||||
|| exit 1
|
||||
rm -rf no-pool-nginx-$ver
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.40
|
||||
$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 || exit 1
|
||||
mv agentzh-echo-nginx-module-* echo-nginx-module-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.03rc9
|
||||
$root/util/get-tarball "http://github.com/agentzh/xss-nginx-module/tarball/v$ver" -O xss-nginx-module-$ver.tar.gz || exit 1
|
||||
tar -xzf xss-nginx-module-$ver.tar.gz || exit 1
|
||||
mv agentzh-xss-nginx-module-* xss-nginx-module-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.2.17
|
||||
$root/util/get-tarball "http://github.com/simpl/ngx_devel_kit/tarball/v$ver" -O ngx_devel_kit-$ver.tar.gz
|
||||
tar -xzf ngx_devel_kit-$ver.tar.gz || exit 1
|
||||
mv simpl-ngx_devel_kit-* ngx_devel_kit-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.22rc8
|
||||
$root/util/get-tarball "http://github.com/agentzh/set-misc-nginx-module/tarball/v$ver" -O set-misc-nginx-module-$ver.tar.gz || exit 1
|
||||
tar -xzf set-misc-nginx-module-$ver.tar.gz || exit 1
|
||||
mv agentzh-set-misc-nginx-module-* set-misc-nginx-module-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.12rc10
|
||||
$root/util/get-tarball "http://github.com/agentzh/rds-json-nginx-module/tarball/v$ver" -O rds-json-nginx-module-$ver.tar.gz || exit 1
|
||||
tar -xzf rds-json-nginx-module-$ver.tar.gz || exit 1
|
||||
mv agentzh-rds-json-nginx-module-* rds-json-nginx-module-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.05rc2
|
||||
$root/util/get-tarball "http://github.com/agentzh/rds-csv-nginx-module/tarball/v$ver" -O rds-csv-nginx-module-$ver.tar.gz || exit 1
|
||||
tar -xzf rds-csv-nginx-module-$ver.tar.gz || exit 1
|
||||
mv agentzh-rds-csv-nginx-module-* rds-csv-nginx-module-$ver || exit 1
|
||||
|
||||
ver=0.17rc1
|
||||
#################################
|
||||
|
||||
ver=0.17
|
||||
$root/util/get-tarball "http://github.com/agentzh/headers-more-nginx-module/tarball/v$ver" -O headers-more-nginx-module-$ver.tar.gz || exit 1
|
||||
tar -xzf headers-more-nginx-module-$ver.tar.gz || exit 1
|
||||
mv agentzh-headers-more-nginx-module-* headers-more-nginx-module-$ver || exit 1
|
||||
@ -143,7 +159,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.5.5
|
||||
ver=0.5.7
|
||||
$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
|
||||
@ -235,23 +251,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
|
||||
|
||||
#################################
|
||||
|
||||
@ -299,14 +312,14 @@ mv agentzh-lua-resty-memcached-* lua-resty-memcached-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.10
|
||||
ver=0.11
|
||||
$root/util/get-tarball "http://github.com/agentzh/lua-resty-redis/tarball/v$ver" -O "lua-resty-redis-$ver.tar.gz" || exit 1
|
||||
tar -xzf lua-resty-redis-$ver.tar.gz || exit 1
|
||||
mv agentzh-lua-resty-redis-* lua-resty-redis-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.07
|
||||
ver=0.09
|
||||
$root/util/get-tarball "http://github.com/agentzh/lua-resty-mysql/tarball/v$ver" -O "lua-resty-mysql-$ver.tar.gz" || exit 1
|
||||
tar -xzf lua-resty-mysql-$ver.tar.gz || exit 1
|
||||
mv agentzh-lua-resty-mysql-* lua-resty-mysql-$ver || exit 1
|
||||
|
Reference in New Issue
Block a user