From cadef0d22065dcc09a98fa16daf0ddf89ec00324 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sun, 15 Jan 2023 12:53:29 +0100
Subject: [PATCH] Friendica Hotfix 2023.01

---
 {2022.12 => 2023.01}/apache/Dockerfile                    | 8 ++++----
 {2022.12 => 2023.01}/apache/config/00apcu.config.php      | 0
 {2022.12 => 2023.01}/apache/config/01redis.config.php     | 0
 {2022.12 => 2023.01}/apache/config/zz-docker.config.php   | 0
 {2022.12 => 2023.01}/apache/cron.sh                       | 0
 {2022.12 => 2023.01}/apache/entrypoint.sh                 | 0
 {2022.12 => 2023.01}/apache/setup_msmtp.sh                | 0
 {2022.12 => 2023.01}/apache/upgrade.exclude               | 0
 {2022.12 => 2023.01}/fpm-alpine/Dockerfile                | 8 ++++----
 {2022.12 => 2023.01}/fpm-alpine/config/00apcu.config.php  | 0
 {2022.12 => 2023.01}/fpm-alpine/config/01redis.config.php | 0
 .../fpm-alpine/config/zz-docker.config.php                | 0
 {2022.12 => 2023.01}/fpm-alpine/cron.sh                   | 0
 {2022.12 => 2023.01}/fpm-alpine/entrypoint.sh             | 0
 {2022.12 => 2023.01}/fpm-alpine/setup_msmtp.sh            | 0
 {2022.12 => 2023.01}/fpm-alpine/upgrade.exclude           | 0
 {2022.12 => 2023.01}/fpm/Dockerfile                       | 8 ++++----
 {2022.12 => 2023.01}/fpm/config/00apcu.config.php         | 0
 {2022.12 => 2023.01}/fpm/config/01redis.config.php        | 0
 {2022.12 => 2023.01}/fpm/config/zz-docker.config.php      | 0
 {2022.12 => 2023.01}/fpm/cron.sh                          | 0
 {2022.12 => 2023.01}/fpm/entrypoint.sh                    | 0
 {2022.12 => 2023.01}/fpm/setup_msmtp.sh                   | 0
 {2022.12 => 2023.01}/fpm/upgrade.exclude                  | 0
 latest.txt                                                | 2 +-
 update.sh                                                 | 2 +-
 26 files changed, 14 insertions(+), 14 deletions(-)
 rename {2022.12 => 2023.01}/apache/Dockerfile (96%)
 rename {2022.12 => 2023.01}/apache/config/00apcu.config.php (100%)
 rename {2022.12 => 2023.01}/apache/config/01redis.config.php (100%)
 rename {2022.12 => 2023.01}/apache/config/zz-docker.config.php (100%)
 rename {2022.12 => 2023.01}/apache/cron.sh (100%)
 rename {2022.12 => 2023.01}/apache/entrypoint.sh (100%)
 rename {2022.12 => 2023.01}/apache/setup_msmtp.sh (100%)
 rename {2022.12 => 2023.01}/apache/upgrade.exclude (100%)
 rename {2022.12 => 2023.01}/fpm-alpine/Dockerfile (95%)
 rename {2022.12 => 2023.01}/fpm-alpine/config/00apcu.config.php (100%)
 rename {2022.12 => 2023.01}/fpm-alpine/config/01redis.config.php (100%)
 rename {2022.12 => 2023.01}/fpm-alpine/config/zz-docker.config.php (100%)
 rename {2022.12 => 2023.01}/fpm-alpine/cron.sh (100%)
 rename {2022.12 => 2023.01}/fpm-alpine/entrypoint.sh (100%)
 rename {2022.12 => 2023.01}/fpm-alpine/setup_msmtp.sh (100%)
 rename {2022.12 => 2023.01}/fpm-alpine/upgrade.exclude (100%)
 rename {2022.12 => 2023.01}/fpm/Dockerfile (96%)
 rename {2022.12 => 2023.01}/fpm/config/00apcu.config.php (100%)
 rename {2022.12 => 2023.01}/fpm/config/01redis.config.php (100%)
 rename {2022.12 => 2023.01}/fpm/config/zz-docker.config.php (100%)
 rename {2022.12 => 2023.01}/fpm/cron.sh (100%)
 rename {2022.12 => 2023.01}/fpm/entrypoint.sh (100%)
 rename {2022.12 => 2023.01}/fpm/setup_msmtp.sh (100%)
 rename {2022.12 => 2023.01}/fpm/upgrade.exclude (100%)

diff --git a/2022.12/apache/Dockerfile b/2023.01/apache/Dockerfile
similarity index 96%
rename from 2022.12/apache/Dockerfile
rename to 2023.01/apache/Dockerfile
index a8a612a..cad7ee3 100644
--- a/2022.12/apache/Dockerfile
+++ b/2023.01/apache/Dockerfile
@@ -165,10 +165,10 @@ RUN set -ex;\
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS 39
-ENV FRIENDICA_VERSION "2022.12"
-ENV FRIENDICA_ADDONS "2022.12"
-ENV FRIENDICA_DOWNLOAD_SHA256 "05c6b8152314dc45fd2e574994b531e7f1e1509a70dc56cd78bf1e3c07227092"
-ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "feff1548f01431bd3822372a6c228c872d70e2831c0877b248aae66e1ded8315"
+ENV FRIENDICA_VERSION "2023.01"
+ENV FRIENDICA_ADDONS "2023.01"
+ENV FRIENDICA_DOWNLOAD_SHA256 "4496990805142d20051a5273904a47809ae12f1cadd74de305d5ae167b7cdf6e"
+ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "48117926a6ffeb58aaf81795cfbd5ad24acf76693744e92817593e310acc5262"
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/2022.12/apache/config/00apcu.config.php b/2023.01/apache/config/00apcu.config.php
similarity index 100%
rename from 2022.12/apache/config/00apcu.config.php
rename to 2023.01/apache/config/00apcu.config.php
diff --git a/2022.12/apache/config/01redis.config.php b/2023.01/apache/config/01redis.config.php
similarity index 100%
rename from 2022.12/apache/config/01redis.config.php
rename to 2023.01/apache/config/01redis.config.php
diff --git a/2022.12/apache/config/zz-docker.config.php b/2023.01/apache/config/zz-docker.config.php
similarity index 100%
rename from 2022.12/apache/config/zz-docker.config.php
rename to 2023.01/apache/config/zz-docker.config.php
diff --git a/2022.12/apache/cron.sh b/2023.01/apache/cron.sh
similarity index 100%
rename from 2022.12/apache/cron.sh
rename to 2023.01/apache/cron.sh
diff --git a/2022.12/apache/entrypoint.sh b/2023.01/apache/entrypoint.sh
similarity index 100%
rename from 2022.12/apache/entrypoint.sh
rename to 2023.01/apache/entrypoint.sh
diff --git a/2022.12/apache/setup_msmtp.sh b/2023.01/apache/setup_msmtp.sh
similarity index 100%
rename from 2022.12/apache/setup_msmtp.sh
rename to 2023.01/apache/setup_msmtp.sh
diff --git a/2022.12/apache/upgrade.exclude b/2023.01/apache/upgrade.exclude
similarity index 100%
rename from 2022.12/apache/upgrade.exclude
rename to 2023.01/apache/upgrade.exclude
diff --git a/2022.12/fpm-alpine/Dockerfile b/2023.01/fpm-alpine/Dockerfile
similarity index 95%
rename from 2022.12/fpm-alpine/Dockerfile
rename to 2023.01/fpm-alpine/Dockerfile
index dacce31..6f416b1 100644
--- a/2022.12/fpm-alpine/Dockerfile
+++ b/2023.01/fpm-alpine/Dockerfile
@@ -137,10 +137,10 @@ VOLUME /var/www/html
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS 39
-ENV FRIENDICA_VERSION "2022.12"
-ENV FRIENDICA_ADDONS "2022.12"
-ENV FRIENDICA_DOWNLOAD_SHA256 "05c6b8152314dc45fd2e574994b531e7f1e1509a70dc56cd78bf1e3c07227092"
-ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "feff1548f01431bd3822372a6c228c872d70e2831c0877b248aae66e1ded8315"
+ENV FRIENDICA_VERSION "2023.01"
+ENV FRIENDICA_ADDONS "2023.01"
+ENV FRIENDICA_DOWNLOAD_SHA256 "4496990805142d20051a5273904a47809ae12f1cadd74de305d5ae167b7cdf6e"
+ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "48117926a6ffeb58aaf81795cfbd5ad24acf76693744e92817593e310acc5262"
 
 RUN set -ex; \
      apk add --no-cache --virtual .fetch-deps \
diff --git a/2022.12/fpm-alpine/config/00apcu.config.php b/2023.01/fpm-alpine/config/00apcu.config.php
similarity index 100%
rename from 2022.12/fpm-alpine/config/00apcu.config.php
rename to 2023.01/fpm-alpine/config/00apcu.config.php
diff --git a/2022.12/fpm-alpine/config/01redis.config.php b/2023.01/fpm-alpine/config/01redis.config.php
similarity index 100%
rename from 2022.12/fpm-alpine/config/01redis.config.php
rename to 2023.01/fpm-alpine/config/01redis.config.php
diff --git a/2022.12/fpm-alpine/config/zz-docker.config.php b/2023.01/fpm-alpine/config/zz-docker.config.php
similarity index 100%
rename from 2022.12/fpm-alpine/config/zz-docker.config.php
rename to 2023.01/fpm-alpine/config/zz-docker.config.php
diff --git a/2022.12/fpm-alpine/cron.sh b/2023.01/fpm-alpine/cron.sh
similarity index 100%
rename from 2022.12/fpm-alpine/cron.sh
rename to 2023.01/fpm-alpine/cron.sh
diff --git a/2022.12/fpm-alpine/entrypoint.sh b/2023.01/fpm-alpine/entrypoint.sh
similarity index 100%
rename from 2022.12/fpm-alpine/entrypoint.sh
rename to 2023.01/fpm-alpine/entrypoint.sh
diff --git a/2022.12/fpm-alpine/setup_msmtp.sh b/2023.01/fpm-alpine/setup_msmtp.sh
similarity index 100%
rename from 2022.12/fpm-alpine/setup_msmtp.sh
rename to 2023.01/fpm-alpine/setup_msmtp.sh
diff --git a/2022.12/fpm-alpine/upgrade.exclude b/2023.01/fpm-alpine/upgrade.exclude
similarity index 100%
rename from 2022.12/fpm-alpine/upgrade.exclude
rename to 2023.01/fpm-alpine/upgrade.exclude
diff --git a/2022.12/fpm/Dockerfile b/2023.01/fpm/Dockerfile
similarity index 96%
rename from 2022.12/fpm/Dockerfile
rename to 2023.01/fpm/Dockerfile
index c86e989..19b1835 100644
--- a/2022.12/fpm/Dockerfile
+++ b/2023.01/fpm/Dockerfile
@@ -156,10 +156,10 @@ VOLUME /var/www/html
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS 39
-ENV FRIENDICA_VERSION "2022.12"
-ENV FRIENDICA_ADDONS "2022.12"
-ENV FRIENDICA_DOWNLOAD_SHA256 "05c6b8152314dc45fd2e574994b531e7f1e1509a70dc56cd78bf1e3c07227092"
-ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "feff1548f01431bd3822372a6c228c872d70e2831c0877b248aae66e1ded8315"
+ENV FRIENDICA_VERSION "2023.01"
+ENV FRIENDICA_ADDONS "2023.01"
+ENV FRIENDICA_DOWNLOAD_SHA256 "4496990805142d20051a5273904a47809ae12f1cadd74de305d5ae167b7cdf6e"
+ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "48117926a6ffeb58aaf81795cfbd5ad24acf76693744e92817593e310acc5262"
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/2022.12/fpm/config/00apcu.config.php b/2023.01/fpm/config/00apcu.config.php
similarity index 100%
rename from 2022.12/fpm/config/00apcu.config.php
rename to 2023.01/fpm/config/00apcu.config.php
diff --git a/2022.12/fpm/config/01redis.config.php b/2023.01/fpm/config/01redis.config.php
similarity index 100%
rename from 2022.12/fpm/config/01redis.config.php
rename to 2023.01/fpm/config/01redis.config.php
diff --git a/2022.12/fpm/config/zz-docker.config.php b/2023.01/fpm/config/zz-docker.config.php
similarity index 100%
rename from 2022.12/fpm/config/zz-docker.config.php
rename to 2023.01/fpm/config/zz-docker.config.php
diff --git a/2022.12/fpm/cron.sh b/2023.01/fpm/cron.sh
similarity index 100%
rename from 2022.12/fpm/cron.sh
rename to 2023.01/fpm/cron.sh
diff --git a/2022.12/fpm/entrypoint.sh b/2023.01/fpm/entrypoint.sh
similarity index 100%
rename from 2022.12/fpm/entrypoint.sh
rename to 2023.01/fpm/entrypoint.sh
diff --git a/2022.12/fpm/setup_msmtp.sh b/2023.01/fpm/setup_msmtp.sh
similarity index 100%
rename from 2022.12/fpm/setup_msmtp.sh
rename to 2023.01/fpm/setup_msmtp.sh
diff --git a/2022.12/fpm/upgrade.exclude b/2023.01/fpm/upgrade.exclude
similarity index 100%
rename from 2022.12/fpm/upgrade.exclude
rename to 2023.01/fpm/upgrade.exclude
diff --git a/latest.txt b/latest.txt
index b66c15a..15efd80 100644
--- a/latest.txt
+++ b/latest.txt
@@ -1 +1 @@
-2022.12
+2023.01
diff --git a/update.sh b/update.sh
index 20bb72c..92abe8c 100755
--- a/update.sh
+++ b/update.sh
@@ -94,7 +94,7 @@ variants=(
   fpm-alpine
 )
 
-min_version='2022.12'
+min_version='2023.01'
 
 # version_greater_or_equal A B returns whether A >= B
 function version_greater_or_equal() {