From 7a2710ffc5203a97971b483ac2aad291ccfc4fd7 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sun, 23 Jan 2022 18:10:17 +0100
Subject: [PATCH] Fix apt package versions

---
 Dockerfiles/mods/Dockerfile-7.1       |  3 ++-
 Dockerfiles/mods/Dockerfile-7.2       |  3 ++-
 Dockerfiles/mods/Dockerfile-7.3       |  4 ++--
 Dockerfiles/mods/Dockerfile-7.4       |  4 ++--
 Dockerfiles/mods/Dockerfile-8.0       |  6 +++---
 Dockerfiles/mods/Dockerfile-8.1       |  6 +++---
 build/ansible/group_vars/all/mods.yml | 12 ++++++++++--
 7 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1
index 850d5d4..c6836f9 100644
--- a/Dockerfiles/mods/Dockerfile-7.1
+++ b/Dockerfiles/mods/Dockerfile-7.1
@@ -275,8 +275,9 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: intl --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         Built-in extension
+	# Installation
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \
 	&& true
 
diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2
index 357ac35..caad08e 100644
--- a/Dockerfiles/mods/Dockerfile-7.2
+++ b/Dockerfiles/mods/Dockerfile-7.2
@@ -275,8 +275,9 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: intl --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         Built-in extension
+	# Installation
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \
 	&& true
 
diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3
index b544bc3..9116686 100644
--- a/Dockerfiles/mods/Dockerfile-7.3
+++ b/Dockerfiles/mods/Dockerfile-7.3
@@ -857,7 +857,7 @@ RUN set -eux \
 	libfreetype6 \
 	libgif7 \
 	libglib2.0-0 \
-	libicu63 \
+	libicu67 \
 	libimagequant0 \
 	libjpeg62-turbo \
 	libmagick++-6.q16-8 \
@@ -879,7 +879,7 @@ RUN set -eux \
 	libssh2-1 \
 	libsybdb5 \
 	libtidy5deb1 \
-	libvpx5 \
+	libvpx6 \
 	libwebp-dev \
 	libwebp6 \
 	libwebpdemux2 \
diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4
index 9d04327..3d459b6 100644
--- a/Dockerfiles/mods/Dockerfile-7.4
+++ b/Dockerfiles/mods/Dockerfile-7.4
@@ -853,7 +853,7 @@ RUN set -eux \
 	libfreetype6 \
 	libgif7 \
 	libglib2.0-0 \
-	libicu63 \
+	libicu67 \
 	libimagequant0 \
 	libjpeg62-turbo \
 	libmagick++-6.q16-8 \
@@ -874,7 +874,7 @@ RUN set -eux \
 	libssh2-1 \
 	libsybdb5 \
 	libtidy5deb1 \
-	libvpx5 \
+	libvpx6 \
 	libwebp-dev \
 	libwebp6 \
 	libwebpdemux2 \
diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0
index b953a72..479eae1 100644
--- a/Dockerfiles/mods/Dockerfile-8.0
+++ b/Dockerfiles/mods/Dockerfile-8.0
@@ -699,9 +699,9 @@ RUN set -eux \
 	libc-client2007e \
 	libenchant-2-2 \
 	libfbclient2 \
-	libffi6 \
+	libffi7 \
 	libfreetype6 \
-	libicu63 \
+	libicu67 \
 	libjpeg62-turbo \
 	libmcrypt4 \
 	libmemcachedutil2 \
@@ -710,7 +710,7 @@ RUN set -eux \
 	libpq5 \
 	libsybdb5 \
 	libtidy5deb1 \
-	libvpx5 \
+	libvpx6 \
 	libwebp6 \
 	libxpm4 \
 	libxslt1.1 \
diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1
index 32a165c..ee5a3c9 100644
--- a/Dockerfiles/mods/Dockerfile-8.1
+++ b/Dockerfiles/mods/Dockerfile-8.1
@@ -628,15 +628,15 @@ RUN set -eux \
 	libc-client2007e \
 	libenchant-2-2 \
 	libfbclient2 \
-	libffi6 \
+	libffi7 \
 	libfreetype6 \
-	libicu63 \
+	libicu67 \
 	libjpeg62-turbo \
 	libmemcachedutil2 \
 	libpng16-16 \
 	libpq5 \
 	libtidy5deb1 \
-	libvpx5 \
+	libvpx6 \
 	libwebp6 \
 	libxpm4 \
 	libxslt1.1 \
diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml
index caad7af..aedd1ae 100644
--- a/build/ansible/group_vars/all/mods.yml
+++ b/build/ansible/group_vars/all/mods.yml
@@ -321,9 +321,11 @@ extensions_available:
     7.1:
       type: builtin
       configure: --with-gd --with-webp-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-native-ttf
+      run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx5, libfreetype6, libwebp6]
     7.2:
       type: builtin
       configure: --with-gd --with-webp-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr
+      run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx5, libfreetype6, libwebp6]
     7.3:
       type: builtin
       configure: --with-gd --with-webp-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr
@@ -341,7 +343,7 @@ extensions_available:
       pre: ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/
       configure: --with-gd --with-vpx-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-native-ttf
       build_dep: [libpng-dev, libjpeg-dev, libxpm-dev, libvpx-dev, zlib1g-dev, libfreetype6-dev, libwebp-dev]
-      run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx5, libfreetype6, libwebp6]
+      run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx6, libfreetype6, libwebp6]
   gettext:
     all:
       type: builtin
@@ -435,10 +437,16 @@ extensions_available:
     7.0:
       type: builtin
       run_dep: [libicu57]
+    7.1:
+      type: builtin
+      run_dep: [libicu63]
+    7.2:
+      type: builtin
+      run_dep: [libicu63]
     all:
       type: builtin
       build_dep: [libicu-dev]
-      run_dep: [libicu63]
+      run_dep: [libicu67]
   ioncube:
     disabled: [8.0, 8.1]
     all: