Merge branch 'v2.x' into v2.x

.github/workflows/CI-3p-django-framework.yml

@@ -0,0 +1,30 @@
+name: CI-3p-django-framework
+
+on:
+  push:
+    branches: [ "v2.x" ]
+    paths-ignore:
+    - '.github/**'
+    - '**.md'
+  pull_request:
+    branches: [ "v2.x" ]
+    paths-ignore:
+    - '.github/**'
+    - '**.md'
+#  schedule:
+#    - cron: '15 13 * * 3'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+
+jobs:
+  cache:
+    uses: sysown/proxysql/.github/workflows/ci-builds.yml@GH-Actions
+    secrets: inherit
+
+  run:
+    needs: [ "cache" ]
+    uses: sysown/proxysql/.github/workflows/ci-3p-django-framework.yml@GH-Actions
+    secrets: inherit
+

.github/workflows/CI-3p-laravel-framework.yml

@@ -0,0 +1,30 @@
+name: CI-3p-laravel-framework
+
+on:
+  push:
+    branches: [ "v2.x" ]
+    paths-ignore:
+    - '.github/**'
+    - '**.md'
+  pull_request:
+    branches: [ "v2.x" ]
+    paths-ignore:
+    - '.github/**'
+    - '**.md'
+#  schedule:
+#    - cron: '15 13 * * 3'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+
+jobs:
+  cache:
+    uses: sysown/proxysql/.github/workflows/ci-builds.yml@GH-Actions
+    secrets: inherit
+
+  run:
+    needs: [ "cache" ]
+    uses: sysown/proxysql/.github/workflows/ci-3p-laravel-framework.yml@GH-Actions
+    secrets: inherit
+

.github/workflows/CI-taptests-asan.yml

@@ -0,0 +1,30 @@
+name: CI-taptests-asan
+
+on:
+  push:
+    branches: [ "v2.x" ]
+    paths-ignore:
+    - '.github/**'
+    - '**.md'
+  pull_request:
+    branches: [ "v2.x" ]
+    paths-ignore:
+    - '.github/**'
+    - '**.md'
+#  schedule:
+#    - cron: '15 13 * * 3'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+
+jobs:
+  cache:
+    uses: sysown/proxysql/.github/workflows/ci-builds.yml@GH-Actions
+    secrets: inherit
+
+  run:
+    needs: [ "cache" ]
+    uses: sysown/proxysql/.github/workflows/ci-taptests-asan.yml@GH-Actions
+    secrets: inherit
+

Makefile

@@ -311,7 +311,7 @@ amd64-ubuntu: ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clan
 
 arm64-packages: arm64-centos arm64-debian arm64-ubuntu arm64-fedora arm64-opensuse arm64-almalinux
 arm64-almalinux: almalinux8 almalinux9
-arm64-centos: centos7 centos8
+arm64-centos: centos7 centos8 centos9
 arm64-debian: debian10 debian11 debian12
 arm64-fedora: fedora38 fedora39
 arm64-opensuse: opensuse15
@@ -341,8 +341,9 @@ build-%:
 
 .NOTPARALLEL: binaries/proxysql%
 binaries/proxysql%:
-	@docker-compose -p $(IMG_NAME) down -v --remove-orphans
-	@docker-compose -p $(IMG_NAME) up $(IMG_NAME)$(IMG_TYPE)$(IMG_COMP)_build
+	@docker-compose -p proxysql down -v --remove-orphans
+	@docker-compose -p proxysql up $(IMG_NAME)$(IMG_TYPE)$(IMG_COMP)_build
+	@docker-compose -p proxysql down -v --remove-orphans
 
 
 ### clean targets

deps/libssl/openssl

@@ -1 +1 @@
-openssl-3.1.4
+openssl-3.2.1

deps/libssl/verify-bio_st-match.sh

@@ -17,9 +17,15 @@ echo "extracting 'struct bio_st' from 'lib/mysql_data_stream.cpp'"
 LIBBIOST=$(cd ../../; cat ./lib/mysql_data_stream.cpp | sed '/^\/\*/,/*\//d' | sed -n '/^struct bio_st {/,/}/p')
 
 echo -n "Comparing ... "
-if [[ "$LIBBIOST" == "$DEPBIOST" ]]; then
-	echo "PASS - bio_st is a match!";
+if [[ "$LIBBIOST" =~ "$DEPBIOST" ]]; then
+	echo "PASS - bio_st is a match!"
 else
-	echo "FAIL - bio_st does not match!";
+	echo "FAIL - bio_st does not match!"
+	echo
+	echo ">>> lib/mysql_data_stream.cpp"
+	echo "$LIBBIOST"
+	echo "==="
+	echo "$DEPBIOST"
+	echo "<<< deps/libssl/openssl/crypto/bio/bio_local.h"
 	exit 1
 fi