From 38447ff187b33760606f2d2c7a626a508000dd3d Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 31 Mar 2022 10:10:12 +0200 Subject: [PATCH 1/5] chore(appup): fix update-appup.sh git reset before clean --- scripts/update-appup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/update-appup.sh b/scripts/update-appup.sh index d5f3b5407..d62faee74 100755 --- a/scripts/update-appup.sh +++ b/scripts/update-appup.sh @@ -93,6 +93,7 @@ if [ "$NEW_COPY" = 'no' ]; then REMOTE="$(git remote -v | grep "${GIT_REPO}" | head -1 | awk '{print $1}')" git fetch "$REMOTE" fi +git reset --hard git clean -fdx git checkout "${PREV_TAG}" make "$PROFILE" From 9cd63c87fc4e9f6e0293bcd49944c9cd5ba04aa2 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 31 Mar 2022 10:25:57 +0200 Subject: [PATCH 2/5] docs: Update CHANGES-4.3.md to cover changes made in build env --- CHANGES-4.3.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES-4.3.md b/CHANGES-4.3.md index 146f29e23..fe2988c77 100644 --- a/CHANGES-4.3.md +++ b/CHANGES-4.3.md @@ -16,6 +16,11 @@ File format: * For docker image, /opt/emqx/etc has been removed from the VOLUME list, this made it easier for the users to rebuild image on top with changed configs. +* CentOS 7 Erlang runtime is rebuilt on OpenSSL-1.1.1n (previously on 1.0), + Prior to v4.3.13, EMQX pick certain cipher suites proposed by the clients, + but then fail to handshake resulting in a `malformed_handshake_data` exception. +* CentOS 8 Erlang runtime is rebuilt on RockyLinux 8. + 'centos8' will remain in the package name to keep it backward compatible. ### Enhancements From b9c02bff1e02712a85350fc279d4fb6e195715ca Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 31 Mar 2022 10:39:30 +0200 Subject: [PATCH 3/5] ci: delete yum install openssl11 in test --- .ci/build_packages/tests.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.ci/build_packages/tests.sh b/.ci/build_packages/tests.sh index 01fdc07dc..b74d61ff2 100755 --- a/.ci/build_packages/tests.sh +++ b/.ci/build_packages/tests.sh @@ -89,11 +89,6 @@ emqx_test(){ "rpm") packagename=$(basename "${PACKAGE_PATH}/${EMQX_NAME}"-*.rpm) - if [[ "${ARCH}" == "amd64" && $(rpm -E '%{rhel}') == 7 ]] ; then - # EMQX OTP requires openssl11 to have TLS1.3 support - yum install -y openssl11 - fi - rpm -ivh "${PACKAGE_PATH}/${packagename}" if ! rpm -q emqx | grep -q emqx; then echo "package install error" From c037c2cf6cb081f9118d1947d31b334db732cae2 Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Thu, 31 Mar 2022 17:54:20 +0800 Subject: [PATCH 4/5] chore: release 4.3.13-rc.3 --- include/emqx_release.hrl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/emqx_release.hrl b/include/emqx_release.hrl index 682072ae9..60501474d 100644 --- a/include/emqx_release.hrl +++ b/include/emqx_release.hrl @@ -29,7 +29,7 @@ -ifndef(EMQX_ENTERPRISE). --define(EMQX_RELEASE, {opensource, "4.3.13-rc.2"}). +-define(EMQX_RELEASE, {opensource, "4.3.13-rc.3"}). -else. From 5fa30b2d516f4405470ff0fc8e56cf39355a64d4 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Thu, 31 Mar 2022 21:55:57 +0800 Subject: [PATCH 5/5] chore: bump vsn to 4.4.2-rc.2 --- include/emqx_release.hrl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/emqx_release.hrl b/include/emqx_release.hrl index a000946e3..128237310 100644 --- a/include/emqx_release.hrl +++ b/include/emqx_release.hrl @@ -29,7 +29,7 @@ -ifndef(EMQX_ENTERPRISE). --define(EMQX_RELEASE, {opensource, "4.4.2-rc.1"}). +-define(EMQX_RELEASE, {opensource, "4.4.2-rc.2"}). -else.