From eab48400c9bcf3e8374b929b43cab2f222bc0de4 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 17 Dec 2021 05:41:19 +0000
Subject: [PATCH] 3.2.0-debian-10-r48 release

---
 bitnami/spark/3/debian-10/Dockerfile             |  2 +-
 .../prebuildfs/opt/bitnami/scripts/libos.sh      | 16 ++++++++++++++++
 .../opt/bitnami/scripts/libwebserver.sh          |  4 ++++
 bitnami/spark/README.md                          |  2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/bitnami/spark/3/debian-10/Dockerfile b/bitnami/spark/3/debian-10/Dockerfile
index 34bd56fe6f96..a13c8b74f08a 100644
--- a/bitnami/spark/3/debian-10/Dockerfile
+++ b/bitnami/spark/3/debian-10/Dockerfile
@@ -22,7 +22,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/spark/postunpack.sh
 RUN /opt/bitnami/scripts/java/postunpack.sh
 ENV BITNAMI_APP_NAME="spark" \
-    BITNAMI_IMAGE_VERSION="3.2.0-debian-10-r47" \
+    BITNAMI_IMAGE_VERSION="3.2.0-debian-10-r48" \
     JAVA_HOME="/opt/bitnami/java" \
     LD_LIBRARY_PATH="/opt/bitnami/python/lib/:/opt/bitnami/spark/venv/lib/python3.8/site-packages/numpy.libs/:$LD_LIBRARY_PATH" \
     LIBNSS_WRAPPER_PATH="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/spark/3/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/spark/3/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
index 6bd564773acb..0a1a92a747f9 100644
--- a/bitnami/spark/3/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/spark/3/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -446,3 +446,19 @@ generate_sha_hash() {
     echo -n "$str" | "sha${algorithm}sum" | awk '{print $1}'
 }
 
+########################
+# Converts a string to its hexadecimal representation
+# Arguments:
+#   $1 - string
+# Returns:
+#   hexadecimal representation of the string
+#########################
+convert_to_hex() {
+    local -r str=${1:?missing input string}
+    local -i iterator
+    local char
+    for ((iterator=0; iterator<${#str}; iterator++)); do
+        char=${str:iterator:1}
+        printf '%x' "'${char}"
+    done
+}
diff --git a/bitnami/spark/3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/spark/3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 459f99c7d1cd..503650210583 100644
--- a/bitnami/spark/3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/spark/3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -177,6 +177,8 @@ web_server_reload() {
 #   --document-root - Path to document root directory
 # Apache-specific flags:
 #   --apache-additional-configuration - Additional vhost configuration (no default)
+#   --apache-additional-http-configuration - Additional HTTP vhost configuration (no default)
+#   --apache-additional-https-configuration - Additional HTTPS vhost configuration (no default)
 #   --apache-before-vhost-configuration - Configuration to add before the <VirtualHost> directive (no default)
 #   --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no' and type is not defined)
 #   --apache-extra-directory-configuration - Extra configuration for the document root directory
@@ -224,6 +226,8 @@ ensure_web_server_app_configuration_exists() {
 
             # Specific Apache flags
             --apache-additional-configuration \
+            | --apache-additional-http-configuration \
+            | --apache-additional-https-configuration \
             | --apache-before-vhost-configuration \
             | --apache-allow-override \
             | --apache-extra-directory-configuration \
diff --git a/bitnami/spark/README.md b/bitnami/spark/README.md
index 63ab061e9486..e8a88c3eb291 100644
--- a/bitnami/spark/README.md
+++ b/bitnami/spark/README.md
@@ -45,7 +45,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`3`, `3-debian-10`, `3.2.0`, `3.2.0-debian-10-r47`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spark/blob/3.2.0-debian-10-r47/3/debian-10/Dockerfile)
+* [`3`, `3-debian-10`, `3.2.0`, `3.2.0-debian-10-r48`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spark/blob/3.2.0-debian-10-r48/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/spark GitHub repo](https://github.com/bitnami/bitnami-docker-spark).