diff --git a/.requirements b/.requirements index 52c3c6e731a3..3625afb2c7b0 100644 --- a/.requirements +++ b/.requirements @@ -12,8 +12,7 @@ KONG_BUILD_TOOLS_VERSION=4.40.1 KONG_NGINX_MODULE_BRANCH=0.2.1 PCRE=8.45 -OPENSSL=1.1.1w -LIBEXPAT=2.5.0 +OPENSSL=1.1.1o OPENRESTY=1.19.9.1 -LUAROCKS=3.9.2 -LUA_KONG_NGINX_MODULE=f52a34c17af4543245ff79e3227b9d514b8cfa5c # 0.2.2 +LUAROCKS=3.8.0 +LUA_KONG_NGINX_MODULE=6b2fa308e091e2daed2407dc38d54fbcd8fae768 # 0.2.1-sr1 diff --git a/build/luarocks/luarocks_repositories.bzl b/build/luarocks/luarocks_repositories.bzl index de37ea9ee072..87ad74f85155 100644 --- a/build/luarocks/luarocks_repositories.bzl +++ b/build/luarocks/luarocks_repositories.bzl @@ -12,7 +12,7 @@ def luarocks_repositories(): name = "luarocks", build_file = "//build/luarocks:BUILD.luarocks.bazel", strip_prefix = "luarocks-" + version, - sha256 = "bca6e4ecc02c203e070acdb5f586045d45c078896f6236eb46aa33ccd9b94edb", + sha256 = "56ab9b90f5acbc42eb7a94cf482e6c058a63e8a1effdf572b8b2a6323a06d923", urls = [ "https://luarocks.org/releases/luarocks-" + version + ".tar.gz", ], diff --git a/build/openresty/openssl/openssl_repositories.bzl b/build/openresty/openssl/openssl_repositories.bzl index 2bc32bdce0c7..c549b59fb1be 100644 --- a/build/openresty/openssl/openssl_repositories.bzl +++ b/build/openresty/openssl/openssl_repositories.bzl @@ -12,7 +12,7 @@ def openssl_repositories(): http_archive, name = "openssl", build_file = "//build/openresty/openssl:BUILD.bazel", - sha256 = "cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8", + sha256 = "9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f", strip_prefix = "openssl-" + version, urls = [ "https://www.openssl.org/source/openssl-" + version + ".tar.gz", diff --git a/build/openresty/patches/LuaJIT-2.1-20210510_04_pass_cc_env.patch b/build/openresty/patches/LuaJIT-2.1-20210510_04_pass_cc_env.patch new file mode 100644 index 000000000000..afe165ab78a1 --- /dev/null +++ b/build/openresty/patches/LuaJIT-2.1-20210510_04_pass_cc_env.patch @@ -0,0 +1,40 @@ +diff --git a/bundle/LuaJIT-2.1-20210510/src/Makefile b/bundle/LuaJIT-2.1-20210510/src/Makefile +index 47a21c9..c60b94e 100644 +--- a/bundle/LuaJIT-2.1-20210510/src/Makefile ++++ b/bundle/LuaJIT-2.1-20210510/src/Makefile +@@ -27,7 +27,8 @@ NODOTABIVER= 51 + DEFAULT_CC = gcc + # + # LuaJIT builds as a native 32 or 64 bit binary by default. +-CC= $(DEFAULT_CC) ++CC?= $(DEFAULT_CC) ++AR?= ar + # + # Use this if you want to force a 32 bit build on a 64 bit multilib OS. + #CC= $(DEFAULT_CC) -m32 +@@ -211,7 +212,7 @@ TARGET_CC= $(STATIC_CC) + TARGET_STCC= $(STATIC_CC) + TARGET_DYNCC= $(DYNAMIC_CC) + TARGET_LD= $(CROSS)$(CC) +-TARGET_AR= $(CROSS)ar rcus 2>/dev/null ++TARGET_AR= $(CROSS)$(AR) rcus 2>/dev/null + TARGET_STRIP= $(CROSS)strip + + TARGET_LIBPATH= $(or $(PREFIX),/usr/local)/$(or $(MULTILIB),lib) +@@ -291,11 +292,11 @@ TARGET_XCFLAGS+= $(CCOPT_$(TARGET_LJARCH)) + TARGET_ARCH+= $(patsubst %,-DLUAJIT_TARGET=LUAJIT_ARCH_%,$(TARGET_LJARCH)) + + ifneq (,$(PREFIX)) +-ifneq (/usr/local,$(PREFIX)) +- TARGET_XCFLAGS+= -DLUA_ROOT=\"$(PREFIX)\" +- ifneq (/usr,$(PREFIX)) +- TARGET_DYNXLDOPTS= -Wl,-rpath,$(TARGET_LIBPATH) +- endif ++ifneq (/usr/local,$(LUA_ROOT)) ++ TARGET_XCFLAGS+= -DLUA_ROOT=\"$(LUA_ROOT)\" ++endif ++ifneq (/usr,$(PREFIX)) ++ TARGET_DYNXLDOPTS= -Wl,-rpath,$(TARGET_LIBPATH) + endif + endif + ifneq (,$(MULTILIB)) \ No newline at end of file diff --git a/build/openresty/patches/nginx-cross-endianness-fix.patch b/build/openresty/patches/nginx-cross-endianness-fix.patch new file mode 100644 index 000000000000..da3d67457055 --- /dev/null +++ b/build/openresty/patches/nginx-cross-endianness-fix.patch @@ -0,0 +1,79 @@ +# http://cgit.openembedded.org/meta-openembedded/tree/meta-webserver/recipes-httpd/nginx/files/0001-Allow-the-overriding-of-the-endianness-via-the-confi.patch +From be9970aa16c5142ef814531d74a07990a8e9eb14 Mon Sep 17 00:00:00 2001 +From: Derek Straka +Date: Fri, 1 Dec 2017 10:32:29 -0500 +Subject: [PATCH] Allow the overriding of the endianness via the configure flag + --with-endian + +The existing configure options contain the --with-endian; however, the command +line flag does not actually function. It does not set the endianness and it +appears to do nothing. + +Upstream-Status: Pending + +Signed-off-by: Derek Straka + +diff --git a/auto/endianness b/auto/endianness +index 1b552b6..be84487 100644 +--- a/bundle/nginx-1.19.9/endianness ++++ b/bundle/nginx-1.19.9/auto/endianness +@@ -13,7 +13,13 @@ checking for system byte ordering + END + + +-cat << END > $NGX_AUTOTEST.c ++if [ ".$NGX_WITH_ENDIAN" = ".little" ]; then ++ echo " little endian" ++ have=NGX_HAVE_LITTLE_ENDIAN . auto/have ++elif [ ".$NGX_WITH_ENDIAN" = ".big" ]; then ++ echo " big endian" ++else ++ cat << END > $NGX_AUTOTEST.c + + int main(void) { + int i = 0x11223344; +@@ -26,25 +32,26 @@ int main(void) { + + END + +-ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ +- -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" ++ ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ ++ -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" + +-eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" ++ eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" + +-if [ -x $NGX_AUTOTEST ]; then +- if $NGX_AUTOTEST >/dev/null 2>&1; then +- echo " little endian" +- have=NGX_HAVE_LITTLE_ENDIAN . auto/have +- else +- echo " big endian" +- fi ++ if [ -x $NGX_AUTOTEST ]; then ++ if $NGX_AUTOTEST >/dev/null 2>&1; then ++ echo " little endian" ++ have=NGX_HAVE_LITTLE_ENDIAN . auto/have ++ else ++ echo " big endian" ++ fi + +- rm -rf $NGX_AUTOTEST* ++ rm -rf $NGX_AUTOTEST* + +-else +- rm -rf $NGX_AUTOTEST* ++ else ++ rm -rf $NGX_AUTOTEST* + +- echo +- echo "$0: error: cannot detect system byte ordering" +- exit 1 ++ echo ++ echo "$0: error: cannot detect system byte ordering" ++ exit 1 ++ fi + fi +-- +2.7.4 \ No newline at end of file diff --git a/build/openresty/patches/nginx-cross.patch b/build/openresty/patches/nginx-cross.patch new file mode 100644 index 000000000000..f83c19d05260 --- /dev/null +++ b/build/openresty/patches/nginx-cross.patch @@ -0,0 +1,214 @@ +Rebased from http://cgit.openembedded.org/meta-openembedded/tree/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch + + +=================================================================== +diff --git a/bundle/nginx-1.19.9/auto/feature b/bundle/nginx-1.19.9/auto/feature +index 3561f59..d6a2889 100644 +--- a/bundle/nginx-1.19.9/auto/feature ++++ b/bundle/nginx-1.19.9/auto/feature +@@ -49,12 +49,20 @@ eval "/bin/sh -c \"$ngx_test\" >> $NGX_AUTOCONF_ERR 2>&1" + + if [ -x $NGX_AUTOTEST ]; then + ++ if [ ".$NGX_CROSS_COMPILE" = ".yes" ]; then ++ NGX_AUTOTEST_EXEC="true" ++ NGX_FOUND_MSG=" (not tested, cross compiling)" ++ else ++ NGX_AUTOTEST_EXEC="$NGX_AUTOTEST" ++ NGX_FOUND_MSG="" ++ fi ++ + case "$ngx_feature_run" in + + yes) + # /bin/sh is used to intercept "Killed" or "Abort trap" messages +- if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then +- echo " found" ++ if /bin/sh -c $NGX_AUTOTEST_EXEC >> $NGX_AUTOCONF_ERR 2>&1; then ++ echo " found$NGX_FOUND_MSG" + ngx_found=yes + + if test -n "$ngx_feature_name"; then +@@ -68,17 +76,27 @@ if [ -x $NGX_AUTOTEST ]; then + + value) + # /bin/sh is used to intercept "Killed" or "Abort trap" messages +- if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then +- echo " found" ++ if /bin/sh -c $NGX_AUTOTEST_EXEC >> $NGX_AUTOCONF_ERR 2>&1; then ++ echo " found$NGX_FOUND_MSG" + ngx_found=yes + +- cat << END >> $NGX_AUTO_CONFIG_H ++ if [ ".$NGX_CROSS_COMPILE" = ".yes" ]; then ++ cat << END >> $NGX_AUTO_CONFIG_H + + #ifndef $ngx_feature_name +-#define $ngx_feature_name `$NGX_AUTOTEST` ++#define $ngx_feature_name $(eval "echo \$NGX_WITH_${ngx_feature_name}") + #endif + + END ++ else ++ cat << END >> $NGX_AUTO_CONFIG_H ++ ++#ifndef $ngx_feature_name ++#define $ngx_feature_name `$NGX_AUTOTEST_EXEC` ++#endif ++ ++END ++ fi + else + echo " found but is not working" + fi +@@ -86,7 +104,7 @@ END + + bug) + # /bin/sh is used to intercept "Killed" or "Abort trap" messages +- if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then ++ if /bin/sh -c $NGX_AUTOTEST_EXEC >> $NGX_AUTOCONF_ERR 2>&1; then + echo " not found" + + else +diff --git a/bundle/nginx-1.19.9/auto/options b/bundle/nginx-1.19.9/auto/options +index 182c799..e9eb7b8 100644 +--- a/bundle/nginx-1.19.9/auto/options ++++ b/bundle/nginx-1.19.9/auto/options +@@ -400,6 +400,18 @@ $0: warning: the \"--with-sha1-asm\" option is deprecated" + --test-build-epoll) NGX_TEST_BUILD_EPOLL=YES ;; + --test-build-solaris-sendfilev) NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;; + ++ # cross compile support ++ --with-int=*) NGX_WITH_INT="$value" ;; ++ --with-long=*) NGX_WITH_LONG="$value" ;; ++ --with-long-long=*) NGX_WITH_LONG_LONG="$value" ;; ++ --with-ptr-size=*) NGX_WITH_PTR_SIZE="$value" ;; ++ --with-sig-atomic-t=*) NGX_WITH_SIG_ATOMIC_T="$value" ;; ++ --with-size-t=*) NGX_WITH_SIZE_T="$value" ;; ++ --with-off-t=*) NGX_WITH_OFF_T="$value" ;; ++ --with-time-t=*) NGX_WITH_TIME_T="$value" ;; ++ --with-sys-nerr=*) NGX_WITH_NGX_SYS_NERR="$value" ;; ++ --with-endian=*) NGX_WITH_ENDIAN="$value" ;; ++ + *) + echo "$0: error: invalid option \"$option\"" + exit 1 +@@ -590,6 +602,17 @@ cat << END + + --with-debug enable debug logging + ++ --with-int=VALUE force int size ++ --with-long=VALUE force long size ++ --with-long-long=VALUE force long long size ++ --with-ptr-size=VALUE force pointer size ++ --with-sig-atomic-t=VALUE force sig_atomic_t size ++ --with-size-t=VALUE force size_t size ++ --with-off-t=VALUE force off_t size ++ --with-time-t=VALUE force time_t size ++ --with-sys-nerr=VALUE force sys_nerr value ++ --with-endian=VALUE force system endianess ++ + END + + exit 1 +@@ -598,6 +621,8 @@ fi + + if [ ".$NGX_PLATFORM" = ".win32" ]; then + NGX_WINE=$WINE ++elif [ ! -z "$NGX_PLATFORM" ]; then ++ NGX_CROSS_COMPILE="yes" + fi + + +diff --git a/bundle/nginx-1.19.9/auto/types/sizeof b/bundle/nginx-1.19.9/auto/types/sizeof +index 480d8cf..23c5171 100644 +--- a/bundle/nginx-1.19.9/auto/types/sizeof ++++ b/bundle/nginx-1.19.9/auto/types/sizeof +@@ -12,9 +12,12 @@ checking for $ngx_type size + + END + +-ngx_size= ++ngx_size=$(eval "echo \$NGX_WITH_${ngx_param}") + +-cat << END > $NGX_AUTOTEST.c ++if [ ".$ngx_size" != "." ]; then ++ echo " $ngx_size bytes" ++else ++ cat << END > $NGX_AUTOTEST.c + + #include + #include +@@ -33,15 +36,16 @@ int main(void) { + END + + +-ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ +- -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" ++ ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ ++ -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" + +-eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" ++ eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" + + +-if [ -x $NGX_AUTOTEST ]; then +- ngx_size=`$NGX_AUTOTEST` +- echo " $ngx_size bytes" ++ if [ -x $NGX_AUTOTEST ]; then ++ ngx_size=`$NGX_AUTOTEST` ++ echo " $ngx_size bytes" ++ fi + fi + + +diff --git a/bundle/nginx-1.19.9/auto/unix b/bundle/nginx-1.19.9/auto/unix +index b41c70f..febbf3c 100644 +--- a/bundle/nginx-1.19.9/auto/unix ++++ b/bundle/nginx-1.19.9/auto/unix +@@ -592,13 +592,13 @@ ngx_feature_libs= + + # C types + +-ngx_type="int"; . auto/types/sizeof ++ngx_type="int"; ngx_param="INT"; . auto/types/sizeof + +-ngx_type="long"; . auto/types/sizeof ++ngx_type="long"; ngx_param="LONG"; . auto/types/sizeof + +-ngx_type="long long"; . auto/types/sizeof ++ngx_type="long long"; ngx_param="LONG_LONG"; . auto/types/sizeof + +-ngx_type="void *"; . auto/types/sizeof; ngx_ptr_size=$ngx_size ++ngx_type="void *"; ngx_param="PTR_SIZE"; . auto/types/sizeof; ngx_ptr_size=$ngx_size + ngx_param=NGX_PTR_SIZE; ngx_value=$ngx_size; . auto/types/value + + +@@ -609,7 +609,7 @@ NGX_INCLUDE_AUTO_CONFIG_H="#include \"ngx_auto_config.h\"" + ngx_type="uint32_t"; ngx_types="u_int32_t"; . auto/types/typedef + ngx_type="uint64_t"; ngx_types="u_int64_t"; . auto/types/typedef + +-ngx_type="sig_atomic_t"; ngx_types="int"; . auto/types/typedef ++ngx_type="sig_atomic_t"; ngx_param="SIG_ATOMIC_T"; ngx_types="int"; . auto/types/typedef + . auto/types/sizeof + ngx_param=NGX_SIG_ATOMIC_T_SIZE; ngx_value=$ngx_size; . auto/types/value + +@@ -625,15 +625,15 @@ ngx_type="rlim_t"; ngx_types="int"; . auto/types/typedef + + . auto/endianness + +-ngx_type="size_t"; . auto/types/sizeof ++ngx_type="size_t"; ngx_param="SIZE_T"; . auto/types/sizeof + ngx_param=NGX_MAX_SIZE_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value + ngx_param=NGX_SIZE_T_LEN; ngx_value=$ngx_max_len; . auto/types/value + +-ngx_type="off_t"; . auto/types/sizeof ++ngx_type="off_t"; ngx_param="OFF_T"; . auto/types/sizeof + ngx_param=NGX_MAX_OFF_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value + ngx_param=NGX_OFF_T_LEN; ngx_value=$ngx_max_len; . auto/types/value + +-ngx_type="time_t"; . auto/types/sizeof ++ngx_type="time_t"; ngx_param="TIME_T"; . auto/types/sizeof + ngx_param=NGX_TIME_T_SIZE; ngx_value=$ngx_size; . auto/types/value + ngx_param=NGX_TIME_T_LEN; ngx_value=$ngx_max_len; . auto/types/value + ngx_param=NGX_MAX_TIME_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value diff --git a/scripts/explain_manifest/fixtures/alpine-amd64.txt b/scripts/explain_manifest/fixtures/alpine-amd64.txt index 52d22d0e4a73..148e352515f2 100644 --- a/scripts/explain_manifest/fixtures/alpine-amd64.txt +++ b/scripts/explain_manifest/fixtures/alpine-amd64.txt @@ -35,59 +35,48 @@ - Path : /usr/local/lib/lua/5.1/lfs.so Needed : - libc.so - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lpeg.so Needed : - libc.so - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lsyslog.so Needed : - libc.so - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lua_pack.so Needed : - libc.so - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lua_system_constants.so Needed : - libc.so - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/mime/core.so Needed : - libc.so - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/pb.so Needed : - libc.so - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/core.so Needed : - libc.so - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/serial.so Needed : - libc.so - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/unix.so Needed : - libc.so - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/ssl.so Needed : - libssl.so.1.1 - libcrypto.so.1.1 - libc.so - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/yaml.so Needed : @@ -121,7 +110,7 @@ Modules : - lua-kong-nginx-module - lua-kong-nginx-module/stream - OpenSSL : OpenSSL 1.1.1w 11 Sep 2023 + OpenSSL : OpenSSL 1.1.1o 3 May 2022 DWARF : True DWARF - ngx_http_request_t related DWARF DIEs: True diff --git a/scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt b/scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt index ca282c5e38b0..cb5d0045ac2c 100644 --- a/scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt +++ b/scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt @@ -50,59 +50,48 @@ - Path : /usr/local/lib/lua/5.1/lfs.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lpeg.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lsyslog.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lua_pack.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lua_system_constants.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/mime/core.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/pb.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/core.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/serial.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/unix.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/ssl.so Needed : - libssl.so.1.1 - libcrypto.so.1.1 - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/yaml.so Needed : @@ -140,7 +129,7 @@ Modules : - lua-kong-nginx-module - lua-kong-nginx-module/stream - OpenSSL : OpenSSL 1.1.1w 11 Sep 2023 + OpenSSL : OpenSSL 1.1.1o 3 May 2022 DWARF : True DWARF - ngx_http_request_t related DWARF DIEs: True diff --git a/scripts/explain_manifest/fixtures/amazonlinux-2023-amd64.txt b/scripts/explain_manifest/fixtures/amazonlinux-2023-amd64.txt index a4f5e87087ad..01328af3a9ac 100644 --- a/scripts/explain_manifest/fixtures/amazonlinux-2023-amd64.txt +++ b/scripts/explain_manifest/fixtures/amazonlinux-2023-amd64.txt @@ -45,59 +45,48 @@ - Path : /usr/local/lib/lua/5.1/lfs.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lpeg.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lsyslog.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lua_pack.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lua_system_constants.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/mime/core.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/pb.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/core.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/serial.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/unix.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/ssl.so Needed : - libssl.so.1.1 - libcrypto.so.1.1 - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/yaml.so Needed : @@ -133,7 +122,7 @@ Modules : - lua-kong-nginx-module - lua-kong-nginx-module/stream - OpenSSL : OpenSSL 1.1.1w 11 Sep 2023 + OpenSSL : OpenSSL 1.1.1o 3 May 2022 DWARF : True DWARF - ngx_http_request_t related DWARF DIEs: True diff --git a/scripts/explain_manifest/fixtures/debian-10-amd64.txt b/scripts/explain_manifest/fixtures/debian-10-amd64.txt index 860a16c40450..174773be772b 100644 --- a/scripts/explain_manifest/fixtures/debian-10-amd64.txt +++ b/scripts/explain_manifest/fixtures/debian-10-amd64.txt @@ -50,59 +50,48 @@ - Path : /usr/local/lib/lua/5.1/lfs.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lpeg.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lsyslog.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lua_pack.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lua_system_constants.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/mime/core.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/pb.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/core.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/serial.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/unix.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/ssl.so Needed : - libssl.so.1.1 - libcrypto.so.1.1 - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/yaml.so Needed : @@ -140,7 +129,7 @@ Modules : - lua-kong-nginx-module - lua-kong-nginx-module/stream - OpenSSL : OpenSSL 1.1.1w 11 Sep 2023 + OpenSSL : OpenSSL 1.1.1o 3 May 2022 DWARF : True DWARF - ngx_http_request_t related DWARF DIEs: True diff --git a/scripts/explain_manifest/fixtures/debian-11-amd64.txt b/scripts/explain_manifest/fixtures/debian-11-amd64.txt index e6393f58af37..9b20fbb595b6 100644 --- a/scripts/explain_manifest/fixtures/debian-11-amd64.txt +++ b/scripts/explain_manifest/fixtures/debian-11-amd64.txt @@ -50,55 +50,44 @@ - Path : /usr/local/lib/lua/5.1/lfs.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lpeg.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lsyslog.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lua_pack.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lua_system_constants.so - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/mime/core.so - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/pb.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/core.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/serial.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/unix.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/ssl.so Needed : - libssl.so.1.1 - libcrypto.so.1.1 - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/yaml.so Needed : @@ -131,7 +120,7 @@ Modules : - lua-kong-nginx-module - lua-kong-nginx-module/stream - OpenSSL : OpenSSL 1.1.1w 11 Sep 2023 + OpenSSL : OpenSSL 1.1.1o 3 May 2022 DWARF : True DWARF - ngx_http_request_t related DWARF DIEs: True diff --git a/scripts/explain_manifest/fixtures/el7-amd64.txt b/scripts/explain_manifest/fixtures/el7-amd64.txt index ca282c5e38b0..cb5d0045ac2c 100644 --- a/scripts/explain_manifest/fixtures/el7-amd64.txt +++ b/scripts/explain_manifest/fixtures/el7-amd64.txt @@ -50,59 +50,48 @@ - Path : /usr/local/lib/lua/5.1/lfs.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lpeg.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lsyslog.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lua_pack.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lua_system_constants.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/mime/core.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/pb.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/core.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/serial.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/unix.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/ssl.so Needed : - libssl.so.1.1 - libcrypto.so.1.1 - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/yaml.so Needed : @@ -140,7 +129,7 @@ Modules : - lua-kong-nginx-module - lua-kong-nginx-module/stream - OpenSSL : OpenSSL 1.1.1w 11 Sep 2023 + OpenSSL : OpenSSL 1.1.1o 3 May 2022 DWARF : True DWARF - ngx_http_request_t related DWARF DIEs: True diff --git a/scripts/explain_manifest/fixtures/el8-amd64.txt b/scripts/explain_manifest/fixtures/el8-amd64.txt index ca282c5e38b0..cb5d0045ac2c 100644 --- a/scripts/explain_manifest/fixtures/el8-amd64.txt +++ b/scripts/explain_manifest/fixtures/el8-amd64.txt @@ -50,59 +50,48 @@ - Path : /usr/local/lib/lua/5.1/lfs.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lpeg.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lsyslog.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lua_pack.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lua_system_constants.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/mime/core.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/pb.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/core.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/serial.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/unix.so Needed : - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/ssl.so Needed : - libssl.so.1.1 - libcrypto.so.1.1 - libc.so.6 - Rpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/yaml.so Needed : @@ -140,7 +129,7 @@ Modules : - lua-kong-nginx-module - lua-kong-nginx-module/stream - OpenSSL : OpenSSL 1.1.1w 11 Sep 2023 + OpenSSL : OpenSSL 1.1.1o 3 May 2022 DWARF : True DWARF - ngx_http_request_t related DWARF DIEs: True diff --git a/scripts/explain_manifest/fixtures/ubuntu-20.04-amd64.txt b/scripts/explain_manifest/fixtures/ubuntu-20.04-amd64.txt index 3f0729d62c9b..4c29e30d3970 100644 --- a/scripts/explain_manifest/fixtures/ubuntu-20.04-amd64.txt +++ b/scripts/explain_manifest/fixtures/ubuntu-20.04-amd64.txt @@ -50,57 +50,46 @@ - Path : /usr/local/lib/lua/5.1/lfs.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lpeg.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lsyslog.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lua_pack.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lua_system_constants.so - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/mime/core.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/pb.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/core.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/serial.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/unix.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/ssl.so Needed : - libssl.so.1.1 - libcrypto.so.1.1 - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/yaml.so Needed : @@ -135,7 +124,7 @@ Modules : - lua-kong-nginx-module - lua-kong-nginx-module/stream - OpenSSL : OpenSSL 1.1.1w 11 Sep 2023 + OpenSSL : OpenSSL 1.1.1o 3 May 2022 DWARF : True DWARF - ngx_http_request_t related DWARF DIEs: True diff --git a/scripts/explain_manifest/fixtures/ubuntu-22.04-amd64.txt b/scripts/explain_manifest/fixtures/ubuntu-22.04-amd64.txt index db71f90ad5b3..e736498f2710 100644 --- a/scripts/explain_manifest/fixtures/ubuntu-22.04-amd64.txt +++ b/scripts/explain_manifest/fixtures/ubuntu-22.04-amd64.txt @@ -45,57 +45,46 @@ - Path : /usr/local/lib/lua/5.1/lfs.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lpeg.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lsyslog.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lua_pack.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/lua_system_constants.so - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/mime/core.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/pb.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/core.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/serial.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/socket/unix.so Needed : - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/ssl.so Needed : - libssl.so.1.1 - libcrypto.so.1.1 - libc.so.6 - Runpath : /usr/local/kong/lib - Path : /usr/local/lib/lua/5.1/yaml.so Needed : @@ -128,7 +117,7 @@ Modules : - lua-kong-nginx-module - lua-kong-nginx-module/stream - OpenSSL : OpenSSL 1.1.1w 11 Sep 2023 + OpenSSL : OpenSSL 1.1.1o 3 May 2022 DWARF : True DWARF - ngx_http_request_t related DWARF DIEs: True