From 3d007ac30c40c8262fa259bcc8e8a1cabba1d9ef Mon Sep 17 00:00:00 2001
From: Patrick Canterino <patrick@patrick-canterino.de>
Date: Sun, 1 Dec 2024 15:25:51 +0100
Subject: [PATCH 01/16] Jirafeau 4.6.1 is ready

---
 CHANGELOG.md     | 2 +-
 lib/settings.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31b9ec0..8a63821 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
 5. Follow the installation wizard, it should propose you the same data folder or even update automatically
 6. Check your `/lib/config.local.php` and compare it with the `/lib/config.original.php` to see if new configuration items are available. If a new item is missing in your `config.local.php`, this may trigger some errors as Jirafeau may expect to have them.
 
-## Version 4.6.1 (not yet released)
+## Version 4.6.1
 
 - Removed the download button and the corresponding link for encrypted files from the admin interface
 - Fixed an issue with sending the wrong filesize after decrypting an encrypted file
diff --git a/lib/settings.php b/lib/settings.php
index cbdfaff..f0f193e 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -43,7 +43,7 @@ if ($cfg['debug'] === true) {
 
 /* Jirafeau package */
 define('JIRAFEAU_PACKAGE', 'Jirafeau');
-define('JIRAFEAU_VERSION', '4.6.x-dev');
+define('JIRAFEAU_VERSION', '4.6.1');
 
 define('JIRAFEAU_WEBSITE', 'https://gitlab.com/jirafeau/Jirafeau');
 
-- 
2.43.0


From 233f1f25a00926f0a74650856fd431357690ed2b Mon Sep 17 00:00:00 2001
From: Patrick Canterino <patrick@patrick-canterino.de>
Date: Sun, 1 Dec 2024 15:27:35 +0100
Subject: [PATCH 02/16] Updated CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a63821..13564df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - Lots of code refactoring and cleanup
 - Few more little fixes
 - Typo and spelling mistakes
+- Upgrade from 4.6.0: in-place upgrade
 
 New configuration items:
 - `one_time_download_preselected` for preselecting the checkbox for deleting the file after the first download
@@ -35,6 +36,7 @@ New configuration items:
 - Removed usage of deprecated `strftime()` function
 - Few more little fixes
 - Typo and spelling mistakes
+- Upgrade from 4.5.0: in-place upgrade
 
 New configuration items:
 - `download_password_requirement`, `download_password_gen_len`, `download_password_gen_chars`, `download_password_policy` and `download_password_policy_regex` for configuring file download passwords
-- 
2.43.0


From ef82d9482cca75efe13a50198677073be9e91d5f Mon Sep 17 00:00:00 2001
From: Patrick Canterino <patrick@patrick-canterino.de>
Date: Sun, 1 Dec 2024 15:33:14 +0100
Subject: [PATCH 03/16] Begin a new release cycle

---
 CHANGELOG.md     | 4 ++++
 lib/settings.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13564df..2ab4d40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@
 5. Follow the installation wizard, it should propose you the same data folder or even update automatically
 6. Check your `/lib/config.local.php` and compare it with the `/lib/config.original.php` to see if new configuration items are available. If a new item is missing in your `config.local.php`, this may trigger some errors as Jirafeau may expect to have them.
 
+## Version 4.6.x (not yet released)
+
+- ...
+
 ## Version 4.6.1
 
 - Removed the download button and the corresponding link for encrypted files from the admin interface
diff --git a/lib/settings.php b/lib/settings.php
index f0f193e..cbdfaff 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -43,7 +43,7 @@ if ($cfg['debug'] === true) {
 
 /* Jirafeau package */
 define('JIRAFEAU_PACKAGE', 'Jirafeau');
-define('JIRAFEAU_VERSION', '4.6.1');
+define('JIRAFEAU_VERSION', '4.6.x-dev');
 
 define('JIRAFEAU_WEBSITE', 'https://gitlab.com/jirafeau/Jirafeau');
 
-- 
2.43.0


From 8e36d013510ddedf9bb830b547f2de7664815bd0 Mon Sep 17 00:00:00 2001
From: Blackstareye <>
Date: Sat, 18 Jan 2025 18:15:14 +0100
Subject: [PATCH 04/16] fix for issue #21 and a docker_compose.yaml for testing

---
 Dockerfile          |  4 ++--
 docker-compose.yaml | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 docker-compose.yaml

diff --git a/Dockerfile b/Dockerfile
index d4854a8..823c1dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,8 +21,8 @@ RUN --mount=type=bind,source=.,target=/mnt \
     cp -r /mnt/* /www/ && \
     rm -rf /www/docker && \
     touch /www/lib/config.local.php && \
-    chown -R $(id -u lighttpd).$(id -g www-data) /www && \
+    chown -R $(id -u lighttpd):$(id -g www-data) /www && \
     chmod 770 /www
 
 CMD ["/run.sh"]
-EXPOSE 80
\ No newline at end of file
+EXPOSE 80
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 0000000..6b9c57b
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,12 @@
+services:
+  web:
+    build:
+      context: . # or ../Dockerfile if we put it in the ./docker folder
+    volumes:
+      - ./jirafeau_data:/data
+    environment:
+      - ADMIN_PASSWORD='p4ssw0rd'
+    
+    ports:
+      - 8080:80
+
-- 
2.43.0


From 19ceaa3cd29c4c94b2407c900455de78c31a567b Mon Sep 17 00:00:00 2001
From: Blackstareye <>
Date: Fri, 24 Jan 2025 20:25:15 +0100
Subject: [PATCH 05/16] example docker compose with availabilities (defaulted
 according to config)

---
 Dockerfile          |  3 ++-
 docker-compose.yaml | 19 +++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 823c1dd..6bf9788 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
 FROM php:8.1-fpm-alpine
 LABEL org.opencontainers.image.authors="jerome@jutteau.fr"
+ARG INI="php"
 
 # base install
 RUN apk update && \
@@ -11,7 +12,7 @@ RUN apk update && \
 COPY --chmod=550 docker/cleanup.sh docker/run.sh  /
 COPY --chmod=640 docker/docker_config.php /docker_config.php
 
-COPY docker/php.ini /usr/local/etc/php/php.ini
+COPY docker/${INI}.ini /usr/local/etc/php/php.ini
 COPY docker/lighttpd.conf /etc/lighttpd/lighttpd.conf
 
 # Install Jirafeau
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 6b9c57b..69fe665 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,12 +1,27 @@
 services:
   web:
     build:
+      no_cache: true
+      args:
+        # INI: php_debug #change the ini
       context: . # or ../Dockerfile if we put it in the ./docker folder
     volumes:
       - ./jirafeau_data:/data
     environment:
-      - ADMIN_PASSWORD='p4ssw0rd'
-    
+      ADMIN_PASSWORD: p4ssw0rd
+      #LANG: en
+      AVAILABILITIES: |
+        {
+          "minute": true,
+          "hour": true,
+          "day": true,
+          "week": true,
+          "fortnight": true,
+          "month": true,
+          "quarter": false,
+          "year": false,
+          "none": false
+        }
     ports:
       - 8080:80
 
-- 
2.43.0


From b33335fdd70b6d414a7d609e2f62a499b50c872f Mon Sep 17 00:00:00 2001
From: Blackstareye <>
Date: Fri, 24 Jan 2025 20:26:29 +0100
Subject: [PATCH 06/16] fix for #20, added also lang to env variables; added
 function for associative arrays (e.g. json in env)

---
 docker/README.md         |  2 ++
 docker/docker_config.php | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/docker/README.md b/docker/README.md
index 10ee322..0ee1a96 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -38,6 +38,8 @@ More details about options in `lib/config.original.php`.
 Available options:
 - `ADMIN_PASSWORD`: setup a specific admin password. If not set, a random password will be generated.
 - `ADMIN_IP`: set one or more ip allowed to access admin interface (separated by comma).
+- `LANG`: choose the language for jirafeau (default auto).
+- `AVAILABILITIES`: change the array for availablibilities that the user can select (see `docker-compose.yaml` for an example how to do that). Availability is the time the file should be available before it can be deleted.
 - `WEB_ROOT`: setup a specific domain to point at when generating links (e.g. 'jirafeau.mydomain.com/').
 - `VAR_ROOT`: setup a specific path where to place files. default: '/data'.
 - `FILE_HASH`: can be set to `md5`, `partial_md5` or `random` (default).
diff --git a/docker/docker_config.php b/docker/docker_config.php
index 75c6fb8..140149e 100644
--- a/docker/docker_config.php
+++ b/docker/docker_config.php
@@ -91,6 +91,28 @@ function env_2_cfg_string_array(&$cfg, $config_name)
     return true;
 }
 
+function env_2_cfg_string_array_key_value(&$cfg, $config_name)
+{
+    $env_name = strtoupper($config_name);
+    $env_string = getenv($env_name);
+    if ($env_string === false) {
+        return;
+    }
+    $result = json_decode($env_string, true);
+    if (json_last_error() === JSON_ERROR_NONE) {
+        // JSON is valid
+        $c = count($result);
+        echo ("setting $config_name array with $c value(s)n\n");
+    } else {
+        echo ("ERROR - invalid json for environment key $config_name \n");
+    } 
+    
+    $cfg[$config_name] = $result;
+    return true;
+}
+
+
+
 function setup_admin_password(&$cfg)
 {
     if (strlen($cfg['admin_password']) > 0) {
@@ -165,6 +187,7 @@ function run_setup(&$cfg)
     env_2_cfg_bool($cfg, 'preview');
     env_2_cfg_string($cfg, 'title', false);
     env_2_cfg_string($cfg, 'organisation');
+    env_2_cfg_string($cfg, 'lang');
     env_2_cfg_string($cfg, 'contactperson');
     env_2_cfg_string($cfg, 'style');
     env_2_cfg_string($cfg, 'availability_default');
@@ -179,6 +202,8 @@ function run_setup(&$cfg)
     env_2_cfg_string_array($cfg, 'admin_ip');
     env_2_cfg_string_array($cfg, 'upload_ip_nopassword');
     env_2_cfg_string_array($cfg, 'proxy_ip');
+    // this is a key value based value
+    env_2_cfg_string_array_key_value($cfg, 'availabilities');
     env_2_cfg_bool($cfg, 'store_uploader_ip');
     env_2_cfg_string($cfg, 'download_password_requirement');
     env_2_cfg_int($cfg, 'download_password_gen_len');
-- 
2.43.0


From 2a53c230e95041839309adc0c93a99be73794b0e Mon Sep 17 00:00:00 2001
From: Blackstareye <>
Date: Fri, 24 Jan 2025 20:38:58 +0100
Subject: [PATCH 07/16] fixed format

---
 docker/docker_config.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/docker/docker_config.php b/docker/docker_config.php
index 140149e..b33cf85 100644
--- a/docker/docker_config.php
+++ b/docker/docker_config.php
@@ -102,17 +102,15 @@ function env_2_cfg_string_array_key_value(&$cfg, $config_name)
     if (json_last_error() === JSON_ERROR_NONE) {
         // JSON is valid
         $c = count($result);
-        echo ("setting $config_name array with $c value(s)n\n");
+        echo("setting $config_name array with $c value(s)n\n");
     } else {
-        echo ("ERROR - invalid json for environment key $config_name \n");
-    } 
-    
+        echo("ERROR - invalid json for environment key $config_name \n");
+    }
+
     $cfg[$config_name] = $result;
     return true;
 }
 
-
-
 function setup_admin_password(&$cfg)
 {
     if (strlen($cfg['admin_password']) > 0) {
-- 
2.43.0


From b269224a37d80a40ef609bf5a8e4ed2e8ab2838d Mon Sep 17 00:00:00 2001
From: Blackstareye <>
Date: Mon, 17 Feb 2025 16:39:00 +0100
Subject: [PATCH 08/16] changed method name and added doc for docker compose

---
 docker/README.md         | 36 ++++++++++++++++++++++++++++++++++++
 docker/docker_config.php |  4 ++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/docker/README.md b/docker/README.md
index 0ee1a96..cf70ec8 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -20,6 +20,41 @@ cd Jirafeau
 docker build -t your/jirafeau:latest .
 ```
 
+## Docker Compose
+
+You can use the `docker-compose.yaml` from [here](../docker-compose.yaml)
+
+### Custom Theme
+
+1. copy the theme data from the running container
+
+    ```sh
+    docker compose cp web:/www/media jirafeau_media
+    ```
+
+2. mount the theme data
+
+    ```yaml
+    #....
+    volumes:
+        - ./jirafeau_media/your_theme:/www/media/your_theme
+    ```
+
+3. set the environment variable
+
+    ```yaml
+    # ....
+    environment:
+    STYLE: 'your_theme'
+    DARK_STYLE: 'your_theme'
+    ```
+
+4. run the compose file
+
+    ```sh
+    docker compose up -d
+    ```
+
 ## Security
 
 You may be interested in running Jirafeau on port 80:
@@ -36,6 +71,7 @@ Jirafeau's docker image accepts some options through environment variables to ea
 More details about options in `lib/config.original.php`.
 
 Available options:
+
 - `ADMIN_PASSWORD`: setup a specific admin password. If not set, a random password will be generated.
 - `ADMIN_IP`: set one or more ip allowed to access admin interface (separated by comma).
 - `LANG`: choose the language for jirafeau (default auto).
diff --git a/docker/docker_config.php b/docker/docker_config.php
index b33cf85..6037ec6 100644
--- a/docker/docker_config.php
+++ b/docker/docker_config.php
@@ -91,7 +91,7 @@ function env_2_cfg_string_array(&$cfg, $config_name)
     return true;
 }
 
-function env_2_cfg_string_array_key_value(&$cfg, $config_name)
+function env_2_cfg_array_from_json(&$cfg, $config_name)
 {
     $env_name = strtoupper($config_name);
     $env_string = getenv($env_name);
@@ -201,7 +201,7 @@ function run_setup(&$cfg)
     env_2_cfg_string_array($cfg, 'upload_ip_nopassword');
     env_2_cfg_string_array($cfg, 'proxy_ip');
     // this is a key value based value
-    env_2_cfg_string_array_key_value($cfg, 'availabilities');
+    env_2_cfg_array_from_json($cfg, 'availabilities');
     env_2_cfg_bool($cfg, 'store_uploader_ip');
     env_2_cfg_string($cfg, 'download_password_requirement');
     env_2_cfg_int($cfg, 'download_password_gen_len');
-- 
2.43.0


From 37dbebf0b50446b1beb0ca59f6384fc67a7993c4 Mon Sep 17 00:00:00 2001
From: Blackstareye <gitlab@blackeyeprojects.de>
Date: Mon, 17 Feb 2025 16:42:27 +0100
Subject: [PATCH 09/16] added run container section

---
 docker/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docker/README.md b/docker/README.md
index cf70ec8..d170d70 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -24,6 +24,12 @@ docker build -t your/jirafeau:latest .
 
 You can use the `docker-compose.yaml` from [here](../docker-compose.yaml)
 
+### Run Container
+
+```sh
+docker compose up -d
+```
+
 ### Custom Theme
 
 1. copy the theme data from the running container
-- 
2.43.0


From ea13091f7075f12c6c59ceee8ca8991641a5d139 Mon Sep 17 00:00:00 2001
From: Blackstareye <gitlab@blackeyeprojects.de>
Date: Mon, 17 Feb 2025 16:46:11 +0100
Subject: [PATCH 10/16] fixed typo

---
 docker-compose.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 69fe665..9fcb635 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,7 +2,7 @@ services:
   web:
     build:
       no_cache: true
-      args:
+      #args:
         # INI: php_debug #change the ini
       context: . # or ../Dockerfile if we put it in the ./docker folder
     volumes:
@@ -10,6 +10,9 @@ services:
     environment:
       ADMIN_PASSWORD: p4ssw0rd
       #LANG: en
+      #WEB_ROOT: 'my.domain.de'
+      #STYLE: 'my_jirafeau_theme'
+      #DARK_STYLE: 'my_jirafeau_theme'
       AVAILABILITIES: |
         {
           "minute": true,
-- 
2.43.0


From 3fb73e41b539df62f75cbcf740488cfc15fa8b79 Mon Sep 17 00:00:00 2001
From: Blackstareye <gitlab@blackeyeprojects.de>
Date: Mon, 17 Feb 2025 18:13:46 +0100
Subject: [PATCH 11/16] fixed script upload - missing return statement

---
 lib/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/functions.php b/lib/functions.php
index 0372507..7ac4c9e 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -446,7 +446,7 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l
                  'link' => '',
                  'delete_link' => ''));
     }
-    jirafeau_add_file($file, $one_time_download, $key, $time, $ip, $crypt, $link_name_length, $file_hash_method);
+    return jirafeau_add_file($file, $one_time_download, $key, $time, $ip, $crypt, $link_name_length, $file_hash_method);
 }
 
 /**
-- 
2.43.0


From 72218d29b4f2efa7ab076216a0c1aefb1e5a3c1d Mon Sep 17 00:00:00 2001
From: Blackstareye <gitlab@blackeyeprojects.de>
Date: Mon, 17 Feb 2025 18:13:46 +0100
Subject: [PATCH 12/16] fixed script upload - missing return statement

---
 lib/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/functions.php b/lib/functions.php
index 0372507..7ac4c9e 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -446,7 +446,7 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l
                  'link' => '',
                  'delete_link' => ''));
     }
-    jirafeau_add_file($file, $one_time_download, $key, $time, $ip, $crypt, $link_name_length, $file_hash_method);
+    return jirafeau_add_file($file, $one_time_download, $key, $time, $ip, $crypt, $link_name_length, $file_hash_method);
 }
 
 /**
-- 
2.43.0


From 6a8b8688540cc7eb5aa89a4ceed6bd25589dbf4c Mon Sep 17 00:00:00 2001
From: Blackstareye <>
Date: Sat, 18 Jan 2025 18:15:14 +0100
Subject: [PATCH 13/16] fix for issue #21 and a docker_compose.yaml for testing

---
 Dockerfile          |  4 ++--
 docker-compose.yaml | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 docker-compose.yaml

diff --git a/Dockerfile b/Dockerfile
index d4854a8..823c1dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,8 +21,8 @@ RUN --mount=type=bind,source=.,target=/mnt \
     cp -r /mnt/* /www/ && \
     rm -rf /www/docker && \
     touch /www/lib/config.local.php && \
-    chown -R $(id -u lighttpd).$(id -g www-data) /www && \
+    chown -R $(id -u lighttpd):$(id -g www-data) /www && \
     chmod 770 /www
 
 CMD ["/run.sh"]
-EXPOSE 80
\ No newline at end of file
+EXPOSE 80
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 0000000..6b9c57b
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,12 @@
+services:
+  web:
+    build:
+      context: . # or ../Dockerfile if we put it in the ./docker folder
+    volumes:
+      - ./jirafeau_data:/data
+    environment:
+      - ADMIN_PASSWORD='p4ssw0rd'
+    
+    ports:
+      - 8080:80
+
-- 
2.43.0


From 4bdfd257f20813c80943f08016014f3762c8694c Mon Sep 17 00:00:00 2001
From: Patrick Canterino <patrick@patrick-canterino.de>
Date: Fri, 28 Feb 2025 13:57:19 +0100
Subject: [PATCH 14/16] Updated CHANGELOG

---
 CHANGELOG.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ab4d40..40cdc5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,15 +12,19 @@
 5. Follow the installation wizard, it should propose you the same data folder or even update automatically
 6. Check your `/lib/config.local.php` and compare it with the `/lib/config.original.php` to see if new configuration items are available. If a new item is missing in your `config.local.php`, this may trigger some errors as Jirafeau may expect to have them.
 
-## Version 4.6.x (not yet released)
+## Version 4.6.2 (not yet released)
 
-- ...
+- Allow to configure the language and the availabilities for files for a Docker container (issue [#20](https://gitlab.com/jirafeau/Jirafeau/-/issues/20))
+- Added an example `docker-compose.yaml` file for configuring the Docker container
+- Fixed an error occuring on some systems while building the Docker image (issue [#24](https://gitlab.com/jirafeau/Jirafeau/-/issues/24))
+- Script upload was broken due to a missing `return` statement (issue [#23](https://gitlab.com/jirafeau/Jirafeau/-/issues/23))
+- Upgrade from 4.6.1: in-place upgrade
 
 ## Version 4.6.1
 
 - Removed the download button and the corresponding link for encrypted files from the admin interface
 - Fixed an issue with sending the wrong filesize after decrypting an encrypted file
-- Fixed the possibility to bypass the check for CVE-2022-30110 (prevent preview of SVG images) by sending a manipulated HTTP request with a MIME type like "image/svg+XML".
+- Fixed the possibility to bypass the check for [CVE-2022-30110](https://www.cve.org/CVERecord?id=CVE-2022-30110) (prevent preview of SVG images) by sending a manipulated HTTP request with a MIME type like "image/svg+XML". This issue has subsequently been reported as [CVE-2024-12326](https://www.cve.org/CVERecord?id=CVE-2024-12326).
 - We now provide Docker images for AMD64 and ARM64 systems
 - Lots of code refactoring and cleanup
 - Few more little fixes
-- 
2.43.0


From b15d9743d761b176c8d522f3259017c093c5f382 Mon Sep 17 00:00:00 2001
From: Patrick Canterino <patrick@patrick-canterino.de>
Date: Tue, 4 Mar 2025 15:31:23 +0100
Subject: [PATCH 15/16] Jirafeau 4.6.2 is ready

---
 CHANGELOG.md     | 2 +-
 lib/settings.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40cdc5a..944d835 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
 5. Follow the installation wizard, it should propose you the same data folder or even update automatically
 6. Check your `/lib/config.local.php` and compare it with the `/lib/config.original.php` to see if new configuration items are available. If a new item is missing in your `config.local.php`, this may trigger some errors as Jirafeau may expect to have them.
 
-## Version 4.6.2 (not yet released)
+## Version 4.6.2
 
 - Allow to configure the language and the availabilities for files for a Docker container (issue [#20](https://gitlab.com/jirafeau/Jirafeau/-/issues/20))
 - Added an example `docker-compose.yaml` file for configuring the Docker container
diff --git a/lib/settings.php b/lib/settings.php
index cbdfaff..791404e 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -43,7 +43,7 @@ if ($cfg['debug'] === true) {
 
 /* Jirafeau package */
 define('JIRAFEAU_PACKAGE', 'Jirafeau');
-define('JIRAFEAU_VERSION', '4.6.x-dev');
+define('JIRAFEAU_VERSION', '4.6.2');
 
 define('JIRAFEAU_WEBSITE', 'https://gitlab.com/jirafeau/Jirafeau');
 
-- 
2.43.0


From 8d502b13db867970e99498f9276691442b642ff0 Mon Sep 17 00:00:00 2001
From: Patrick Canterino <patrick@patrick-canterino.de>
Date: Tue, 4 Mar 2025 15:39:23 +0100
Subject: [PATCH 16/16] Begin a new release cycle

---
 CHANGELOG.md     | 4 ++++
 lib/settings.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 944d835..c3e5aba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@
 5. Follow the installation wizard, it should propose you the same data folder or even update automatically
 6. Check your `/lib/config.local.php` and compare it with the `/lib/config.original.php` to see if new configuration items are available. If a new item is missing in your `config.local.php`, this may trigger some errors as Jirafeau may expect to have them.
 
+## Version 4.6.x (not yet released)
+
+- ...
+
 ## Version 4.6.2
 
 - Allow to configure the language and the availabilities for files for a Docker container (issue [#20](https://gitlab.com/jirafeau/Jirafeau/-/issues/20))
diff --git a/lib/settings.php b/lib/settings.php
index 791404e..cbdfaff 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -43,7 +43,7 @@ if ($cfg['debug'] === true) {
 
 /* Jirafeau package */
 define('JIRAFEAU_PACKAGE', 'Jirafeau');
-define('JIRAFEAU_VERSION', '4.6.2');
+define('JIRAFEAU_VERSION', '4.6.x-dev');
 
 define('JIRAFEAU_WEBSITE', 'https://gitlab.com/jirafeau/Jirafeau');
 
-- 
2.43.0