Fix debs for PHP 5.2 and PHP 5.3

devilbox · Mar 17, 2022 · 6fcb106 · 6fcb106
1 parent b937b99
commit 6fcb106
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 25 deletions.
diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2
@@ -37,6 +37,7 @@ RUN set -eux \
 		libssl-dev \
 		libtidy-dev \
 		libvpx-dev \
+		libwebp-dev \
 		libxml2-dev \
 		libxpm-dev \
 		libxslt-dev \
@@ -576,18 +577,19 @@ RUN set -eux \
 	libenchant1c2a \
 	libfbclient2 \
 	libfreetype6 \
-	libicu52 \
+	libicu57 \
 	libjpeg62-turbo \
+	libmariadbclient18 \
 	libmcrypt4 \
 	libmemcachedutil2 \
-	libmysqlclient18 \
-	libpng12-0 \
+	libpng16-16 \
 	libpq5 \
 	librabbitmq4 \
 	librecode0 \
 	libsybdb5 \
-	libtidy-0.99-0 \
-	libvpx1 \
+	libtidy5 \
+	libvpx4 \
+	libwebp6 \
 	libxpm4 \
 	libxslt1.1 \
 	snmp \

diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3
@@ -40,6 +40,7 @@ RUN set -eux \
 		libssl-dev \
 		libtidy-dev \
 		libvpx-dev \
+		libwebp-dev \
 		libxml2-dev \
 		libxpm-dev \
 		libxslt-dev \
@@ -691,20 +692,21 @@ RUN set -eux \
 	libenchant1c2a \
 	libfbclient2 \
 	libfreetype6 \
-	libicu52 \
+	libicu57 \
 	libjpeg62-turbo \
+	libmariadbclient18 \
 	libmcrypt4 \
 	libmemcachedutil2 \
-	libmysqlclient18 \
 	libnghttp2-5 \
-	libpng12-0 \
+	libpng16-16 \
 	libpq5 \
 	librabbitmq4 \
 	librdkafka1 \
 	librecode0 \
 	libsybdb5 \
-	libtidy-0.99-0 \
-	libvpx1 \
+	libtidy5 \
+	libvpx4 \
+	libwebp6 \
 	libxpm4 \
 	libxslt1.1 \
 	libyaml-0-2 \

diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4
@@ -319,8 +319,9 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: mysql --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         Built-in extension
+	# Installation
 	&& docker-php-ext-install mysql \
 	&& true
 

diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5
@@ -327,8 +327,9 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: mysql --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         Built-in extension
+	# Installation
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
 	&& true
 

diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6
@@ -343,9 +343,8 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: mysql --------------------
 RUN set -eux \
-	# Installation: Version specific
+	# Installation: Generic
 	# Type:         Built-in extension
-	# Installation
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
 	&& true
 

diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml
@@ -280,14 +280,12 @@ extensions_available:
         ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \
         ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \
       configure: --with-gd --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]
-      run_dep: [libpng12-0, libjpeg62-turbo, libxpm4, libvpx1, libfreetype6]
+      run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx4, libfreetype6, libwebp6]
     5.3:
       type: builtin
       pre: ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/
       configure: --with-gd --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]
-      run_dep: [libpng12-0, libjpeg62-turbo, libxpm4, libvpx1, libfreetype6]
+      run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx4, libfreetype6, libwebp6]
     5.4:
       type: builtin
       pre: ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/
@@ -419,10 +417,10 @@ extensions_available:
   intl:
     5.2:
       type: pecl
-      run_dep: [libicu52]
+      run_dep: [libicu57]
     5.3:
       type: builtin
-      run_dep: [libicu52]
+      run_dep: [libicu57]
     5.4:
       type: builtin
       run_dep: [libicu52]
@@ -648,12 +646,15 @@ extensions_available:
   mysql:
     already_avail: [5.2, 5.3]
     disabled: [7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] # Deprecated in newer versions
-    5.6:
+    5.4:
       type: builtin
-      run_dep: [libmariadbclient18]
-    all:
+      run_dep: [libmysqlclient18]
+    5.5:
       type: builtin
       run_dep: [libmysqlclient18]
+    all:
+      type: builtin
+      run_dep: [libmariadbclient18]
   mysqli:
     already_avail: [5.2]
     all:
@@ -1119,10 +1120,10 @@ extensions_available:
   tidy:
     5.2:
       type: builtin
-      run_dep: [libtidy-0.99-0]
+      run_dep: [libtidy5]
     5.3:
       type: builtin
-      run_dep: [libtidy-0.99-0]
+      run_dep: [libtidy5]
     5.4:
       type: builtin
       run_dep: [libtidy-0.99-0]