From c6745b660a8fa189ca60cbd39c6b47f6e142c7fd Mon Sep 17 00:00:00 2001
From: tyranron <tyranron@gmail.com>
Date: Fri, 1 Dec 2023 13:09:40 +0100
Subject: [PATCH] Update Alpine to 3.18.5 version to fix CVE-2023-5678

---
 CHANGELOG.md | 24 ++++++++++++++++++++++++
 Makefile     |  8 ++++----
 README.md    |  8 ++++----
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 270e20e..d3b3d35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,30 @@ All user visible changes to this project will be documented in this file. This p
 
 
 
+## [1.6.5-r4] · 2023-12-01
+[1.6.5-r4]: /../../tree/1.6.5-r4
+
+[Diff](/../../compare/1.6.5-r3...1.6.5-r4)
+
+### Security updated
+
+- [Alpine Linux] 3.18.5: <https://github.com/docker-library/official-images/commit/7e13453ce3b47c537e4ffe79127d4900825e9d03>
+
+
+
+
+## [1.5.6-r4] · 2023-12-01
+[1.5.6-r4]: /../../tree/1.5.6-r4
+
+[Diff](/../../compare/1.5.6-r3...1.5.6-r4)
+
+### Security updated
+
+- [Alpine Linux] 3.18.5: <https://github.com/docker-library/official-images/commit/7e13453ce3b47c537e4ffe79127d4900825e9d03>
+
+
+
+
 ## [1.6.5-r3] · 2023-11-21
 [1.6.5-r3]: /../../tree/1.6.5-r3
 
diff --git a/Makefile b/Makefile
index ea613fd..3fe7524 100644
--- a/Makefile
+++ b/Makefile
@@ -23,10 +23,10 @@ REGISTRIES := $(strip $(subst $(comma), ,\
 	$(shell grep -m1 'registry: \["' .github/workflows/ci.yml \
 	        | cut -d':' -f2 | tr -d '"][')))
 ALL_IMAGES := \
-	1.6/apache:1.6.5-r3-apache,1.6.5-apache,1.6-apache,1-apache,apache,latest \
-	1.6/fpm:1.6.5-r3-fpm,1.6.5-fpm,1.6-fpm,1-fpm,fpm \
-	1.5/apache:1.5.6-r3-apache,1.5.6-apache,1.5-apache \
-	1.5/fpm:1.5.6-r3-fpm,1.5.6-fpm,1.5-fpm \
+	1.6/apache:1.6.5-r4-apache,1.6.5-apache,1.6-apache,1-apache,apache,latest \
+	1.6/fpm:1.6.5-r4-fpm,1.6.5-fpm,1.6-fpm,1-fpm,fpm \
+	1.5/apache:1.5.6-r4-apache,1.5.6-apache,1.5-apache \
+	1.5/fpm:1.5.6-r4-fpm,1.5.6-fpm,1.5-fpm \
 	1.4/apache:1.4.15-r3-apache,1.4.15-apache,1.4-apache \
 	1.4/fpm:1.4.15-r3-fpm,1.4.15-fpm,1.4-fpm
 #	<Dockerfile>:<version>,<tag1>,<tag2>,...
diff --git a/README.md b/README.md
index c074a14..e4a4199 100644
--- a/README.md
+++ b/README.md
@@ -17,10 +17,10 @@ Roundcube Webmail Docker image
 
 ## Supported tags and respective `Dockerfile` links
 
-- [`1.6.5-r3-apache`, `1.6.5-apache`, `1.6-apache`, `1-apache`, `apache`, `latest`][101]
-- [`1.6.5-r3-fpm`, `1.6.5-fpm`, `1.6-fpm`, `1-fpm`, `fpm`][102]
-- [`1.5.6-r3-apache`, `1.5.6-apache`, `1.5-apache`][103]
-- [`1.5.6-r3-fpm`, `1.5.6-fpm`, `1.5-fpm`][104]
+- [`1.6.5-r4-apache`, `1.6.5-apache`, `1.6-apache`, `1-apache`, `apache`, `latest`][101]
+- [`1.6.5-r4-fpm`, `1.6.5-fpm`, `1.6-fpm`, `1-fpm`, `fpm`][102]
+- [`1.5.6-r4-apache`, `1.5.6-apache`, `1.5-apache`][103]
+- [`1.5.6-r4-fpm`, `1.5.6-fpm`, `1.5-fpm`][104]
 - [`1.4.15-r3-apache`, `1.4.15-apache`, `1.4-apache`][105]
 - [`1.4.15-r3-fpm`, `1.4.15-fpm`, `1.4-fpm`][106]