From 3a4896670a57b4d12927a3e9768cae8ed863ffb4 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Wed, 7 Apr 2021 05:57:06 +0000
Subject: [PATCH] 1.35.1-debian-10-r94 release

---
 bitnami/mediawiki/1/debian-10/Dockerfile      |  4 ++--
 .../opt/bitnami/.bitnami_components.json      |  4 ++--
 .../rootfs/opt/bitnami/scripts/libapache.sh   | 20 +++++++++++++++++++
 bitnami/mediawiki/README.md                   |  2 +-
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/bitnami/mediawiki/1/debian-10/Dockerfile b/bitnami/mediawiki/1/debian-10/Dockerfile
index f7dae190754d..004f98ee1089 100644
--- a/bitnami/mediawiki/1/debian-10/Dockerfile
+++ b/bitnami/mediawiki/1/debian-10/Dockerfile
@@ -10,7 +10,7 @@ COPY prebuildfs /
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl gzip libargon2-1 libaudit1 libbsd0 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi6 libfftw3-double3 libfontconfig1 libfreetype6 libgcc1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjemalloc2 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 libmcrypt4 libmemcached11 libmemcachedutil2 libncurses6 libnettle6 libnghttp2-14 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 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 locales procps tar zlib1g
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.3.27-8" --checksum 1fa2c93aca52170fb9a07976ac776bd906dda20ec1c22723ca5990636c704d3a
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.46-5" --checksum f6663ef2cd47d80d63af1da7ff319ed94afe8a825115b2f52894d799013b551c
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.46-6" --checksum fb5216cb32c47100d039af1b738b2e9d48f48aac194ca9b47ffb9ea42517a9ea
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.28-0" --checksum 9398376ca9e2033d5bc193232e8aa9b57d91d4ccf06fa67bfa0d30ef36e44c25
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.3.27-2" --checksum 136766df799e2acb375a4b2b46eb8b7e27899287f8dd22bfd8f205d6bea3c59d
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-3" --checksum 8179ad1371c9a7d897fe3b1bf53bbe763f94edafef19acad2498dd48b3674efe
@@ -33,7 +33,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="mediawiki" \
-    BITNAMI_IMAGE_VERSION="1.35.1-debian-10-r93" \
+    BITNAMI_IMAGE_VERSION="1.35.1-debian-10-r94" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/mediawiki/1/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mediawiki/1/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
index da0dcc7fb4b2..8406fc51e369 100644
--- a/bitnami/mediawiki/1/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/mediawiki/1/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,10 +1,10 @@
 {
     "apache": {
         "arch": "amd64",
-        "digest": "f6663ef2cd47d80d63af1da7ff319ed94afe8a825115b2f52894d799013b551c",
+        "digest": "fb5216cb32c47100d039af1b738b2e9d48f48aac194ca9b47ffb9ea42517a9ea",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "2.4.46-5"
+        "version": "2.4.46-6"
     },
     "gosu": {
         "arch": "amd64",
diff --git a/bitnami/mediawiki/1/debian-10/rootfs/opt/bitnami/scripts/libapache.sh b/bitnami/mediawiki/1/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
index ff262cb594a7..115d0f720e51 100644
--- a/bitnami/mediawiki/1/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
+++ b/bitnami/mediawiki/1/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
@@ -685,3 +685,23 @@ apache_update_app_configuration() {
         fi
     fi
 }
+
+########################
+# Create a password file for basic authentication and restrict its permissions
+# Globals:
+#   *
+# Arguments:
+#   $1 - file
+#   $2 - username
+#   $3 - password
+# Returns:
+#   true if the configuration was updated, false otherwise
+########################
+apache_create_password_file() {
+    local -r file="${1:?missing file}"
+    local -r username="${2:?missing username}"
+    local -r password="${3:?missing password}"
+
+    "${APACHE_BIN_DIR}/htpasswd" -bc "$file" "$username" "$password"
+    am_i_root && configure_permissions_ownership "$file" --file-mode "600" --user "$APACHE_DAEMON_USER" --group "$APACHE_DAEMON_GROUP"
+}
diff --git a/bitnami/mediawiki/README.md b/bitnami/mediawiki/README.md
index 21f610e7679c..1aed036aa8e5 100644
--- a/bitnami/mediawiki/README.md
+++ b/bitnami/mediawiki/README.md
@@ -41,7 +41,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/).
 
 
-* [`1`, `1-debian-10`, `1.35.1`, `1.35.1-debian-10-r93`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mediawiki/blob/1.35.1-debian-10-r93/1/debian-10/Dockerfile)
+* [`1`, `1-debian-10`, `1.35.1`, `1.35.1-debian-10-r94`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mediawiki/blob/1.35.1-debian-10-r94/1/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/mediawiki GitHub repo](https://github.com/bitnami/bitnami-docker-mediawiki).