[feat] Update

include/get_ipaddr_state.py

@@ -10,16 +10,16 @@ else:
 try:
   socket.setdefaulttimeout(5)
   if len(sys.argv) == 1:
-      apiurl = "http://ip.geo.iqiyi.com/cityjson?format=json"
+      apiurl = "http://ip-api.com/json"
   elif len(sys.argv) == 2:
-      apiurl = "http://ip.geo.iqiyi.com/cityjson?format=json&ip=%s" % sys.argv[1]
+      apiurl = "http://ip-api.com/json/%s" % sys.argv[1]
   content = request.urlopen(apiurl).read().decode('utf-8')
   content = json.JSONDecoder().decode(content)
   #print(content)
-  if content['code'] == 'A00000':
-    if content['data']['country_id'] == 48:
+  if content['status'] == 'success':
+    if content['country'] == 'China':
       print("CN")
     else:
-      print(content['data']['country'])
+      print(content['country'])
 except:
   print("Usage:%s IP" % sys.argv[0])

include/ngx_lua_waf.sh

@@ -21,22 +21,21 @@ Nginx_lua_waf() {
     popd > /dev/null
     rm -rf luajit2-${luajit2_ver}
   fi
-  if [ ! -e "/usr/local/lib/lua/resty/core.lua" ]; then
-    src_url=http://mirrors.linuxeye.com/oneinstack/src/lua-resty-core-${lua_resty_core_ver}.tar.gz && Download_src
-    tar xzf lua-resty-core-${lua_resty_core_ver}.tar.gz
-    pushd lua-resty-core-${lua_resty_core_ver}
-    make install
-    popd > /dev/null
-    rm -rf lua-resty-core-${lua_resty_core_ver}
-  fi
-  if [ ! -e "/usr/local/lib/lua/resty/lrucache.lua" ]; then
-    src_url=http://mirrors.linuxeye.com/oneinstack/src/lua-resty-lrucache-${lua_resty_lrucache_ver}.tar.gz && Download_src
-    tar xzf lua-resty-lrucache-${lua_resty_lrucache_ver}.tar.gz
-    pushd lua-resty-lrucache-${lua_resty_lrucache_ver}
-    make install
-    popd > /dev/null
-    rm -rf lua-resty-lrucache-${lua_resty_lrucache_ver}
-  fi
+
+  src_url=http://mirrors.linuxeye.com/oneinstack/src/lua-resty-core-${lua_resty_core_ver}.tar.gz && Download_src
+  tar xzf lua-resty-core-${lua_resty_core_ver}.tar.gz
+  pushd lua-resty-core-${lua_resty_core_ver}
+  make install
+  popd > /dev/null
+  rm -rf lua-resty-core-${lua_resty_core_ver}
+
+  src_url=http://mirrors.linuxeye.com/oneinstack/src/lua-resty-lrucache-${lua_resty_lrucache_ver}.tar.gz && Download_src
+  tar xzf lua-resty-lrucache-${lua_resty_lrucache_ver}.tar.gz
+  pushd lua-resty-lrucache-${lua_resty_lrucache_ver}
+  make install
+  popd > /dev/null
+  rm -rf lua-resty-lrucache-${lua_resty_lrucache_ver}
+
   [ ! -h "/usr/local/share/lua/5.1" ] && { rm -rf /usr/local/share/lua/5.1 ; ln -s /usr/local/lib/lua /usr/local/share/lua/5.1; }
   if [ ! -e "/usr/local/lib/lua/5.1/cjson.so" ]; then
     src_url=http://mirrors.linuxeye.com/oneinstack/src/lua-cjson-${lua_cjson_ver}.tar.gz && Download_src

include/phpmyadmin.sh

@@ -13,7 +13,7 @@ Install_phpMyAdmin() {
     pushd ${oneinstack_dir}/src > /dev/null
     PHP_detail_ver=`${php_install_dir}/bin/php-config --version`
     PHP_main_ver=${PHP_detail_ver%.*}
-    if [[ "${PHP_main_ver}" =~ ^5.[3-6]$|^7.0$ ]]; then
+    if [[ "${PHP_main_ver}" =~ ^5.[3-6]$|^7.[0-1]$ ]]; then
       tar xzf phpMyAdmin-${phpmyadmin_oldver}-all-languages.tar.gz
       /bin/mv phpMyAdmin-${phpmyadmin_oldver}-all-languages ${wwwroot_dir}/default/phpMyAdmin
     else

versions.txt

@@ -1,25 +1,25 @@
 # newest software version
 # Web
-nginx_ver=1.20.2
+nginx_ver=1.22.0
 tengine_ver=2.3.3
-openresty_ver=1.19.9.1
-openssl11_ver=1.1.1m
+openresty_ver=1.21.4.1
+openssl11_ver=1.1.1o
 openssl_ver=1.0.2u
 
-tomcat10_ver=10.0.17
-tomcat9_ver=9.0.59
-tomcat8_ver=8.5.76
+tomcat10_ver=10.0.21
+tomcat9_ver=9.0.63
+tomcat8_ver=8.5.79
 tomcat7_ver=7.0.109
 
-apache_ver=2.4.52
+apache_ver=2.4.53
 pcre_ver=8.45
 apr_ver=1.7.0
 apr_util_ver=1.6.1
 nghttp2_ver=1.42.0
 
 # DB
-mysql80_ver=8.0.28
-mysql57_ver=5.7.37
+mysql80_ver=8.0.29
+mysql57_ver=5.7.38
 mysql56_ver=5.6.50
 mysql55_ver=5.5.62
 
@@ -28,8 +28,8 @@ mariadb105_ver=10.5.15
 mariadb104_ver=10.4.24
 mariadb55_ver=5.5.68
 
-percona80_ver=8.0.27-18
-percona57_ver=5.7.36-39
+percona80_ver=8.0.28-19
+percona57_ver=5.7.37-40
 percona56_ver=5.6.51-91.0
 percona55_ver=5.5.62-38.14
 
@@ -46,15 +46,15 @@ php70_ver=7.0.33
 php71_ver=7.1.33
 php72_ver=7.2.34
 php73_ver=7.3.33
-php74_ver=7.4.28
-php80_ver=8.0.17
-php81_ver=8.1.4
+php74_ver=7.4.29
+php80_ver=8.0.19
+php81_ver=8.1.6
 
 # Nodejs
 nodejs_ver=16.14.2
 
 libiconv_ver=1.16
-curl_ver=7.82.0
+curl_ver=7.83.1
 libmcrypt_ver=2.5.8
 mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
@@ -63,7 +63,7 @@ icu4c_ver=63_1
 libsodium_ver=1.0.18
 libzip_ver=1.2.0
 argon2_ver=20171227
-imagemagick_ver=7.1.0-29
+imagemagick_ver=7.1.0-35
 imagick_ver=3.5.1
 imagick_oldver=3.4.4
 graphicsmagick_ver=1.3.36
@@ -87,13 +87,13 @@ xdebug_oldver=2.9.8
 pureftpd_ver=1.0.49
 
 # Redis
-redis_ver=6.2.6
+redis_ver=6.2.7
 redis_oldver=5.0.14
 pecl_redis_ver=5.3.7
 pecl_redis_oldver=4.3.0
 
 # Memcached
-memcached_ver=1.6.14
+memcached_ver=1.6.15
 libmemcached_ver=1.0.18
 pecl_memcached_ver=3.1.5
 pecl_memcached_oldver=2.2.0
@@ -106,23 +106,23 @@ pecl_mongodb_oldver=1.9.2
 pecl_mongo_ver=1.6.16
 
 # phpMyadmin
-phpmyadmin_ver=5.1.3
+phpmyadmin_ver=5.2.0
 phpmyadmin_oldver=4.4.15.10
 
 # jemalloc
 jemalloc_ver=5.2.1
 
 # boost
-boost_ver=1.73.0
+boost_ver=1.77.0
 boost_percona_ver=1.73.0
 boost_oldver=1.59.0
 
 # Others
-lua_nginx_module_ver=0.10.20
-luajit2_ver=2.1-20220111
-lua_resty_core_ver=0.1.22
+lua_nginx_module_ver=0.10.21
+luajit2_ver=2.1-20220411
+lua_resty_core_ver=0.1.23
 lua_resty_lrucache_ver=0.11
-lua_cjson_ver=2.1.0.8
+lua_cjson_ver=2.1.0.10
 python_ver=3.6.15
 setuptools_ver=61.2.0
 pip_ver=22.0.4