Merge branch 'master' of github.com:/quantcast/qfs

Author: mikeov

.github/workflows/build.yml

@@ -87,6 +87,18 @@ jobs:
             btype: release
             buser: qfsbuild
             runs_on: ubuntu-latest
+          - distro: debian
+            ver: 13
+            codecov: no
+            btype: release
+            buser: qfsbuild
+            runs_on: ubuntu-latest
+          - distro: debian
+            ver: 13
+            codecov: no
+            btype: release
+            buser: qfsbuild
+            runs_on: ubuntu-24.04-arm
           - distro: debian
             ver: 12
             codecov: no
@@ -123,6 +135,18 @@ jobs:
             btype: release
             buser: qfsbuild
             runs_on: ubuntu-latest
+          - distro: rockylinux/rockylinux
+            ver: 10
+            codecov: no
+            btype: release
+            buser: qfsbuild
+            runs_on: ubuntu-latest
+          - distro: rockylinux/rockylinux
+            ver: 10
+            codecov: no
+            btype: release
+            buser: qfsbuild
+            runs_on: ubuntu-24.04-arm
           - distro: rockylinux
             ver: 9
             codecov: no

src/cc/kfsio/SslFilter.cc

@@ -107,14 +107,22 @@ class SslFilter::Impl : private IOBuffer::Reader
         // implementation.
         CRYPTO_THREADID_get_callback();
 #endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
         CRYPTO_set_locking_callback(&LockingCB);
         OpenSSL_add_all_algorithms();
         SSL_load_error_strings();
         ERR_load_crypto_strings();
+#else
+        if (OPENSSL_init_ssl(0, NULL) == 0) {
+            return GetAndClearErr();
+        }
+#endif
 #if OPENSSL_VERSION_NUMBER < 0x30000000L
         ENGINE_load_builtin_engines();
 #endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
         SSL_library_init();
+#endif
         sOpenSslInitPtr->mAES256CbcCypherDebugPtr = EVP_aes_256_cbc();
         sOpenSslInitPtr->mExDataIdx =
             SSL_get_ex_new_index(0, (void*)"SslFilter::Impl", 0, 0, 0);
@@ -159,6 +167,7 @@ class SslFilter::Impl : private IOBuffer::Reader
         if (! sOpenSslInitPtr) {
             return 0;
         }
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
         ENGINE_cleanup();
         EVP_cleanup();
         CRYPTO_cleanup_all_ex_data();
@@ -167,6 +176,9 @@ class SslFilter::Impl : private IOBuffer::Reader
 #endif
         ERR_free_strings();
         CRYPTO_set_locking_callback(0);
+#else
+        OPENSSL_cleanup();
+#endif
         sOpenSslInitPtr = 0;
         return 0;
     }

travis/script.sh

@@ -39,10 +39,11 @@ DEPS_CENTOS5=$DEPS_CENTOS' cmake28 openssl101e openssl101e-devel'$DEPS_CENTOS_PR
 DEPS_CENTOS=$DEPS_CENTOS' openssl-devel cmake chrpath python3-devel'
 DEPS_CENTOS8=$DEPS_CENTOS' diffutils hostname'
 DEPS_CENTOS9=$DEPS_CENTOS8' zlib-devel fuse3-devel'
+DEPS_CENTOS10=$DEPS_CENTOS9
 # amazonlinux 2023 is based on centos 9
 DEPS_CENTOS2023=$DEPS_CENTOS9' tar java-17-amazon-corretto java-17-amazon-corretto-devel'
 DEPS_CENTOS2023=$DEPS_CENTOS2023' maven-amazon-corretto17 golang-go'
-for ver in '' 5 8 9; do
+for ver in '' 5 8 9 10; do
     eval DEPS_CENTOS"$ver"='$DEPS_CENTOS'"$ver' java-openjdk java-devel'"
 done
 DEPS_CENTOS=$DEPS_CENTOS$DEPS_CENTOS_PRIOR_TO_9
@@ -201,7 +202,8 @@ install_maven() {
 }
 
 build_ubuntu() {
-    if [ x"$1" = x'22.04' -o x"$1" = x'24.04' -o x"$1" = x'd12' ]; then
+    if [ x"$1" = x'22.04' -o x"$1" = x'24.04' -o x"$1" = x'd12' \
+        -o x"$1" = x'd13' ]; then
         MYDEPS=$DEPS_UBUNTU22
     elif [ x"$1" = x'14.04' -o x"$1" = x'16.04' ]; then
         MYDEPS=$DEPS_UBUNTU14_16
@@ -212,13 +214,16 @@ build_ubuntu() {
     $MYSUDO apt-get update
     $MYSUDO /bin/bash -c \
         "DEBIAN_FRONTEND='noninteractive' $APT_GET_CMD install -y gnupg"
-    $MYSUDO apt-key update
+    if which apt-key >/dev/null 2>&1; then
+        $MYSUDO apt-key update
+    fi
     $MYSUDO $APT_GET_CMD update
     $MYSUDO /bin/bash -c \
         "DEBIAN_FRONTEND='noninteractive' $APT_GET_CMD install -y $MYDEPS"
     if [ x"$1" = x'18.04' -o x"$1" = x'20.04' -o x"$1" = x'22.04' \
         -o x"$1" = x'24.04' \
-        -o x"$1" = x'd10' -o x"$1" = x'd11' -o x"$1" = x'd12' ]; then
+        -o x"$1" = x'd10' -o x"$1" = x'd11' -o x"$1" = x'd12' \
+        -o x"$1" = x'd13' ]; then
         QFSHADOOP_VERSIONS=$MYQFSHADOOP_VERSIONS_UBUNTU1804
     fi
     if [ x"$1" = x'14.04' ]; then