From 02cf8673870bc7527e2678d9265d84e90cbbd8e9 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Fri, 21 Jul 2023 10:09:38 +0200
Subject: [PATCH] [bitnami/phpbb] Release 3.3.10-debian-11-r49 (#41735)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/phpbb/3/debian-11/Dockerfile          |  9 +++--
 .../opt/bitnami/.bitnami_components.json      |  2 +-
 .../opt/bitnami/scripts/libvalidations.sh     | 40 ++++++++++++++++++-
 3 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/bitnami/phpbb/3/debian-11/Dockerfile b/bitnami/phpbb/3/debian-11/Dockerfile
index ec5d4180b245..e422c02290bb 100644
--- a/bitnami/phpbb/3/debian-11/Dockerfile
+++ b/bitnami/phpbb/3/debian-11/Dockerfile
@@ -5,11 +5,12 @@ FROM docker.io/bitnami/minideb:bullseye
 
 ARG TARGETARCH
 
-LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-07-14T09:44:50Z" \
+LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
+      org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
+      org.opencontainers.image.created="2023-07-19T20:30:02Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.3.10-debian-11-r46" \
+      org.opencontainers.image.ref.name="3.3.10-debian-11-r49" \
       org.opencontainers.image.title="phpbb" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.3.10"
@@ -25,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages acl ca-certificates curl jq libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "php-8.2.8-1-linux-${OS_ARCH}-debian-11" \
+      "php-8.2.8-2-linux-${OS_ARCH}-debian-11" \
       "apache-2.4.57-8-linux-${OS_ARCH}-debian-11" \
       "mysql-client-10.11.4-0-linux-${OS_ARCH}-debian-11" \
       "libphp-8.2.8-1-linux-${OS_ARCH}-debian-11" \
diff --git a/bitnami/phpbb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/phpbb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index c0c02e79cda3..f560ba601f05 100644
--- a/bitnami/phpbb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/phpbb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -21,7 +21,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.2.8-1"
+        "version": "8.2.8-2"
     },
     "phpbb": {
         "arch": "amd64",
diff --git a/bitnami/phpbb/3/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/phpbb/3/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index 3c6a4109c2c5..54987abca42a 100644
--- a/bitnami/phpbb/3/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/phpbb/3/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
@@ -187,6 +187,25 @@ validate_port() {
     fi
 }
 
+########################
+# Validate if the provided argument is a valid IPv6 address
+# Arguments:
+#   $1 - IP to validate
+# Returns:
+#   Boolean
+#########################
+validate_ipv6() {
+    local ip="${1:?ip is missing}"
+    local stat=1
+    local full_address_regex='^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$'
+    local short_address_regex='^((([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6}::(([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6})$'
+
+    if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then
+        stat=0
+    fi
+    return "$stat"
+}
+
 ########################
 # Validate if the provided argument is a valid IPv4 address
 # Arguments:
@@ -204,7 +223,26 @@ validate_ipv4() {
             && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]]
         stat=$?
     fi
-    return $stat
+    return "$stat"
+}
+
+########################
+# Validate if the provided argument is a valid IPv4 or IPv6 address
+# Arguments:
+#   $1 - IP to validate
+# Returns:
+#   Boolean
+#########################
+validate_ip() {
+    local ip="${1:?ip is missing}"
+    local stat=1
+
+    if validate_ipv4 "$ip"; then
+        stat=0
+    else
+        stat=$(validate_ipv6 "$ip")
+    fi
+    return "$stat"
 }
 
 ########################