From 0c9fbffafb6fd8b858951aba48e7f0234c6cd065 Mon Sep 17 00:00:00 2001 From: Water-Melon Date: Wed, 25 Oct 2023 08:17:06 +0000 Subject: [PATCH] chore(deps): Bump OpenSSL version to 3.1.4 KAG-2883 --- .github/workflows/release.yml | 11 +++++++---- .requirements | 2 +- build/openresty/openssl/openssl_repositories.bzl | 2 +- changelog/unreleased/kong/bump_openssl_3.1.4.yml | 2 ++ .../explain_manifest/fixtures/amazonlinux-2-amd64.txt | 3 ++- .../fixtures/amazonlinux-2023-amd64.txt | 3 ++- .../fixtures/amazonlinux-2023-arm64.txt | 3 ++- scripts/explain_manifest/fixtures/debian-10-amd64.txt | 3 ++- scripts/explain_manifest/fixtures/debian-11-amd64.txt | 3 ++- scripts/explain_manifest/fixtures/el7-amd64.txt | 3 ++- scripts/explain_manifest/fixtures/el8-amd64.txt | 3 ++- scripts/explain_manifest/fixtures/el9-amd64.txt | 3 ++- scripts/explain_manifest/fixtures/el9-arm64.txt | 3 ++- .../explain_manifest/fixtures/ubuntu-20.04-amd64.txt | 2 +- .../explain_manifest/fixtures/ubuntu-22.04-amd64.txt | 3 ++- .../explain_manifest/fixtures/ubuntu-22.04-arm64.txt | 3 ++- 16 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 changelog/unreleased/kong/bump_openssl_3.1.4.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6aaae1c33bf0..64d03425bc52 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,9 @@ name: Package & Release # The workflow to build and release official Kong packages and images. +# +# TODO: +# Do not bump the version of actions/checkout to v4 before dropping rhel7 and amazonlinux2. on: # yamllint disable-line rule:truthy pull_request: @@ -56,7 +59,7 @@ jobs: arch: ${{ steps.build-info.outputs.arch }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Build Info id: build-info run: | @@ -173,7 +176,7 @@ jobs: apt install -y wget libz-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev sudo - name: Checkout Kong source code - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Swap git with https run: git config --global url."https://github".insteadOf git://github @@ -284,7 +287,7 @@ jobs: include: "${{ fromJSON(needs.metadata.outputs.matrix)['build-packages'] }}" steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Download artifact uses: actions/download-artifact@v3 @@ -316,7 +319,7 @@ jobs: include: "${{ fromJSON(needs.metadata.outputs.matrix)['build-images'] }}" steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Download artifact uses: actions/download-artifact@v3 diff --git a/.requirements b/.requirements index 7c6d9812e057..29282e1b8aa6 100644 --- a/.requirements +++ b/.requirements @@ -2,7 +2,7 @@ KONG_PACKAGE_NAME=kong OPENRESTY=1.21.4.2 LUAROCKS=3.9.2 -OPENSSL=3.1.2 +OPENSSL=3.1.4 PCRE=8.45 LIBEXPAT=2.5.0 diff --git a/build/openresty/openssl/openssl_repositories.bzl b/build/openresty/openssl/openssl_repositories.bzl index 896863a21999..cab43702d1dd 100644 --- a/build/openresty/openssl/openssl_repositories.bzl +++ b/build/openresty/openssl/openssl_repositories.bzl @@ -11,7 +11,7 @@ def openssl_repositories(): http_archive, name = "openssl", build_file = "//build/openresty/openssl:BUILD.bazel", - sha256 = "a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539", + sha256 = "840af5366ab9b522bde525826be3ef0fb0af81c6a9ebd84caa600fea1731eee3", strip_prefix = "openssl-" + version, urls = [ "https://www.openssl.org/source/openssl-" + version + ".tar.gz", diff --git a/changelog/unreleased/kong/bump_openssl_3.1.4.yml b/changelog/unreleased/kong/bump_openssl_3.1.4.yml new file mode 100644 index 000000000000..a615fc42ba99 --- /dev/null +++ b/changelog/unreleased/kong/bump_openssl_3.1.4.yml @@ -0,0 +1,2 @@ +message: bump OpenSSL to 3.1.4 +type: dependency diff --git a/scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt b/scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt index c8cbf3e5bd32..d3bda3284080 100644 --- a/scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt +++ b/scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt @@ -202,6 +202,7 @@ - lua-resty-events - lua-resty-lmdb - ngx_wasm_module - OpenSSL : OpenSSL 3.1.2 1 Aug 2023 + OpenSSL : OpenSSL 3.1.4 24 Oct 2023 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 95eb40ea4ba9..e85d7e578527 100644 --- a/scripts/explain_manifest/fixtures/amazonlinux-2023-amd64.txt +++ b/scripts/explain_manifest/fixtures/amazonlinux-2023-amd64.txt @@ -188,6 +188,7 @@ - lua-resty-events - lua-resty-lmdb - ngx_wasm_module - OpenSSL : OpenSSL 3.1.2 1 Aug 2023 + OpenSSL : OpenSSL 3.1.4 24 Oct 2023 DWARF : True DWARF - ngx_http_request_t related DWARF DIEs: True + diff --git a/scripts/explain_manifest/fixtures/amazonlinux-2023-arm64.txt b/scripts/explain_manifest/fixtures/amazonlinux-2023-arm64.txt index e352ddf9485a..0db6e70743c3 100644 --- a/scripts/explain_manifest/fixtures/amazonlinux-2023-arm64.txt +++ b/scripts/explain_manifest/fixtures/amazonlinux-2023-arm64.txt @@ -170,6 +170,7 @@ - lua-resty-events - lua-resty-lmdb - ngx_wasm_module - OpenSSL : OpenSSL 3.1.2 1 Aug 2023 + OpenSSL : OpenSSL 3.1.4 24 Oct 2023 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 95d532bef36b..013e8586181c 100644 --- a/scripts/explain_manifest/fixtures/debian-10-amd64.txt +++ b/scripts/explain_manifest/fixtures/debian-10-amd64.txt @@ -202,6 +202,7 @@ - lua-resty-events - lua-resty-lmdb - ngx_wasm_module - OpenSSL : OpenSSL 3.1.2 1 Aug 2023 + OpenSSL : OpenSSL 3.1.4 24 Oct 2023 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 253e43cd2a53..fe586a0c0912 100644 --- a/scripts/explain_manifest/fixtures/debian-11-amd64.txt +++ b/scripts/explain_manifest/fixtures/debian-11-amd64.txt @@ -190,6 +190,7 @@ - lua-resty-events - lua-resty-lmdb - ngx_wasm_module - OpenSSL : OpenSSL 3.1.2 1 Aug 2023 + OpenSSL : OpenSSL 3.1.4 24 Oct 2023 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 c8cbf3e5bd32..d3bda3284080 100644 --- a/scripts/explain_manifest/fixtures/el7-amd64.txt +++ b/scripts/explain_manifest/fixtures/el7-amd64.txt @@ -202,6 +202,7 @@ - lua-resty-events - lua-resty-lmdb - ngx_wasm_module - OpenSSL : OpenSSL 3.1.2 1 Aug 2023 + OpenSSL : OpenSSL 3.1.4 24 Oct 2023 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 7bbdad456097..c7933610e0a3 100644 --- a/scripts/explain_manifest/fixtures/el8-amd64.txt +++ b/scripts/explain_manifest/fixtures/el8-amd64.txt @@ -201,6 +201,7 @@ - lua-resty-events - lua-resty-lmdb - ngx_wasm_module - OpenSSL : OpenSSL 3.1.2 1 Aug 2023 + OpenSSL : OpenSSL 3.1.4 24 Oct 2023 DWARF : True DWARF - ngx_http_request_t related DWARF DIEs: True + diff --git a/scripts/explain_manifest/fixtures/el9-amd64.txt b/scripts/explain_manifest/fixtures/el9-amd64.txt index eca28e4a403f..e4dbbaa65379 100644 --- a/scripts/explain_manifest/fixtures/el9-amd64.txt +++ b/scripts/explain_manifest/fixtures/el9-amd64.txt @@ -188,6 +188,7 @@ - lua-resty-events - lua-resty-lmdb - ngx_wasm_module - OpenSSL : OpenSSL 3.1.2 1 Aug 2023 + OpenSSL : OpenSSL 3.1.4 24 Oct 2023 DWARF : True DWARF - ngx_http_request_t related DWARF DIEs: True + diff --git a/scripts/explain_manifest/fixtures/el9-arm64.txt b/scripts/explain_manifest/fixtures/el9-arm64.txt index e352ddf9485a..0db6e70743c3 100644 --- a/scripts/explain_manifest/fixtures/el9-arm64.txt +++ b/scripts/explain_manifest/fixtures/el9-arm64.txt @@ -170,6 +170,7 @@ - lua-resty-events - lua-resty-lmdb - ngx_wasm_module - OpenSSL : OpenSSL 3.1.2 1 Aug 2023 + OpenSSL : OpenSSL 3.1.4 24 Oct 2023 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 a7184560750f..e4b2a5396464 100644 --- a/scripts/explain_manifest/fixtures/ubuntu-20.04-amd64.txt +++ b/scripts/explain_manifest/fixtures/ubuntu-20.04-amd64.txt @@ -194,6 +194,6 @@ - lua-resty-events - lua-resty-lmdb - ngx_wasm_module - OpenSSL : OpenSSL 3.1.2 1 Aug 2023 + OpenSSL : OpenSSL 3.1.4 24 Oct 2023 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 68de4cc4203f..6d22a3f711b0 100644 --- a/scripts/explain_manifest/fixtures/ubuntu-22.04-amd64.txt +++ b/scripts/explain_manifest/fixtures/ubuntu-22.04-amd64.txt @@ -181,6 +181,7 @@ - lua-resty-events - lua-resty-lmdb - ngx_wasm_module - OpenSSL : OpenSSL 3.1.2 1 Aug 2023 + OpenSSL : OpenSSL 3.1.4 24 Oct 2023 DWARF : True DWARF - ngx_http_request_t related DWARF DIEs: True + diff --git a/scripts/explain_manifest/fixtures/ubuntu-22.04-arm64.txt b/scripts/explain_manifest/fixtures/ubuntu-22.04-arm64.txt index b66889974bd0..8dc1f94a1b9a 100644 --- a/scripts/explain_manifest/fixtures/ubuntu-22.04-arm64.txt +++ b/scripts/explain_manifest/fixtures/ubuntu-22.04-arm64.txt @@ -179,6 +179,7 @@ - lua-resty-events - lua-resty-lmdb - ngx_wasm_module - OpenSSL : OpenSSL 3.1.2 1 Aug 2023 + OpenSSL : OpenSSL 3.1.4 24 Oct 2023 DWARF : True DWARF - ngx_http_request_t related DWARF DIEs: True +