From 22aded1d81324976a715afc1a42696632c7bf226 Mon Sep 17 00:00:00 2001 From: drdr xp Date: Thu, 19 Jan 2017 22:47:40 +0800 Subject: [PATCH 1/2] use baishancloud/luajit2:v2.1-20170822 with high small string hash collision fixed --- util/mirror-tarballs | 4 ++-- util/ver | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 31527df..fd25f90 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -599,8 +599,8 @@ mv openresty-opm-* opm-$ver || exit 1 ################################# -ver=2.1-20170808 -$root/util/get-tarball "https://github.com/openresty/luajit2/archive/v$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1 +ver=2.1-20170822 +$root/util/get-tarball "https://github.com/baishancloud/luajit2/archive/v$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1 tar -xzf LuaJIT-$ver.tar.gz || exit 1 mv luajit2-* LuaJIT-$ver || exit 1 diff --git a/util/ver b/util/ver index f55df4b..baf085b 100755 --- a/util/ver +++ b/util/ver @@ -1,7 +1,7 @@ #!/bin/bash main_ver=1.11.2 -minor_ver=5 +minor_ver=6 version=$main_ver.$minor_ver echo $version From 9108d5f3041e0ce40f1ccd9258375a94206f9dbc Mon Sep 17 00:00:00 2001 From: renzhi Date: Wed, 8 Mar 2017 21:40:42 +0800 Subject: [PATCH 2/2] add openssl-1.0.2h pathed with openssl-1.0.2h-sess_set_get_cb_yield.patch --- util/mirror-tarballs | 10 ++++++++++ util/ver | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/util/mirror-tarballs b/util/mirror-tarballs index fd25f90..a5949e1 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -799,6 +799,16 @@ cd .. ################################# +ver=OpenSSL_1_0_2h +$root/util/get-tarball "https://github.com/openssl/openssl/tarball/$ver" -O "openssl-$ver.tar.gz" || exit 1 +tar -xzf openssl-$ver.tar.gz || exit 1 +mv openssl-openssl-* openssl-$ver || exit 1 +cd openssl-$ver || exit 1 +patch -p1 < $root/patches/openssl-1.0.2h-sess_set_get_cb_yield.patch || exit 1 +cd .. + +################################# + rm *.tar.gz cd .. diff --git a/util/ver b/util/ver index baf085b..33d01ed 100755 --- a/util/ver +++ b/util/ver @@ -1,7 +1,7 @@ #!/bin/bash main_ver=1.11.2 -minor_ver=6 +minor_ver=7 version=$main_ver.$minor_ver echo $version