You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudberry.apache.org by ch...@apache.org on 2026/05/04 03:39:02 UTC

(cloudberry) 23/26: Fix copy for rocky linux

This is an automated email from the ASF dual-hosted git repository.

oppenheimer01 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git

commit a949703eb67a0b88e1dd6397f4edfc809111bcce
Author: Leonid Borchuk <xi...@qavm-f9b691f5.qemu>
AuthorDate: Thu Apr 23 10:03:57 2026 +0000

    Fix copy for rocky linux
---
 devops/build/automation/cloudberry/scripts/configure-cloudberry.sh | 2 +-
 src/interfaces/libpq/fe-secure-openssl.c                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh b/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh
index 80575309092..cc9e7376239 100755
--- a/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh
+++ b/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh
@@ -121,7 +121,7 @@ log_section "Initial Setup"
 execute_cmd sudo rm -rf ${BUILD_DESTINATION} || exit 2
 execute_cmd sudo chmod a+w /usr/local || exit 2
 execute_cmd sudo mkdir -p ${BUILD_DESTINATION}/lib || exit 2
-if [[ "$OS_ID" == "rocky" && "$OS_VERSION" =~ ^(8|9) ]]; then
+if [[ "$OS_ID" == "rocky" && "$OS_VERSION" =~ ^(8|9|10) ]]; then
     execute_cmd sudo cp /usr/local/xerces-c/lib/libxerces-c.so \
                 /usr/local/xerces-c/lib/libxerces-c-3.3.so \
                 ${BUILD_DESTINATION}/lib || exit 3
diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c
index eebd91e1029..c59e878cdc8 100644
--- a/src/interfaces/libpq/fe-secure-openssl.c
+++ b/src/interfaces/libpq/fe-secure-openssl.c
@@ -1271,7 +1271,7 @@ initialize_SSL(PGconn *conn)
 			/* Colon, but not in second character, treat as engine:key */
 			char	   *engine_str = strdup(conn->sslkey);
 			char	   *engine_colon;
-			EVP_PKEY   *pkey;
+			EVP_PKEY   *pkey = NULL;
 
 			if (engine_str == NULL)
 			{


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org