From 3043e28c11ef219185904009c3e2b0d0d59bcbbd Mon Sep 17 00:00:00 2001 From: Ed Morley <501702+edmorley@users.noreply.github.com> Date: Tue, 7 May 2024 16:45:35 +0100 Subject: [PATCH] Heroku-24: Remove libmcrypt4 / libmcrypt-dev (#298) Since they were added in #149 only for the PHP buildpack's benefit, however, are no longer used by PHP as of PHP 7.2+: https://github.com/heroku/heroku-buildpack-php/commit/0ce0fc5567770a3a7a8a81fd6b27fb055a2034d2#diff-a8ff7bd14bd2bddfbf6e7c733a14badb0e7a4d566abbfd4d20948dfc998b6a87L59 The few bindings I could find for other langs are all (a) not popular, (b) in a state of disrepair, eg: https://github.com/tugrul/node-mcrypt (last commit 5 years ago) https://github.com/kingpong/ruby-mcrypt (last commit 7 years ago) (Which is not surprising given much better alternatives exist, such as Sodium, which is already in the base image.) GUS-W-15159536. --- heroku-24-build/installed-packages-amd64.txt | 2 -- heroku-24-build/installed-packages-arm64.txt | 2 -- heroku-24-build/setup.sh | 1 - heroku-24/installed-packages-amd64.txt | 1 - heroku-24/installed-packages-arm64.txt | 1 - heroku-24/setup.sh | 1 - 6 files changed, 8 deletions(-) diff --git a/heroku-24-build/installed-packages-amd64.txt b/heroku-24-build/installed-packages-amd64.txt index f62d3fdb..c3ae7257 100644 --- a/heroku-24-build/installed-packages-amd64.txt +++ b/heroku-24-build/installed-packages-amd64.txt @@ -300,8 +300,6 @@ libmagickwand-6.q16-dev libmagickwand-dev libmatio11 libmaxminddb0 -libmcrypt-dev -libmcrypt4 libmd-dev libmd0 libmemcached-dev diff --git a/heroku-24-build/installed-packages-arm64.txt b/heroku-24-build/installed-packages-arm64.txt index be525658..dc8f8367 100644 --- a/heroku-24-build/installed-packages-arm64.txt +++ b/heroku-24-build/installed-packages-arm64.txt @@ -293,8 +293,6 @@ libmagickwand-6.q16-dev libmagickwand-dev libmatio11 libmaxminddb0 -libmcrypt-dev -libmcrypt4 libmd-dev libmd0 libmemcached-dev diff --git a/heroku-24-build/setup.sh b/heroku-24-build/setup.sh index 9bcd6976..3c596542 100755 --- a/heroku-24-build/setup.sh +++ b/heroku-24-build/setup.sh @@ -39,7 +39,6 @@ packages=( liblzf-dev libmagic-dev libmagickwand-dev - libmcrypt-dev libmemcached-dev libmysqlclient-dev libnetpbm10-dev diff --git a/heroku-24/installed-packages-amd64.txt b/heroku-24/installed-packages-amd64.txt index 7830049c..316500a3 100644 --- a/heroku-24/installed-packages-amd64.txt +++ b/heroku-24/installed-packages-amd64.txt @@ -163,7 +163,6 @@ libmagickcore-6.q16-7t64 libmagickwand-6.q16-7t64 libmatio11 libmaxminddb0 -libmcrypt4 libmd0 libmemcached11t64 libmnl0 diff --git a/heroku-24/installed-packages-arm64.txt b/heroku-24/installed-packages-arm64.txt index 7830049c..316500a3 100644 --- a/heroku-24/installed-packages-arm64.txt +++ b/heroku-24/installed-packages-arm64.txt @@ -163,7 +163,6 @@ libmagickcore-6.q16-7t64 libmagickwand-6.q16-7t64 libmatio11 libmaxminddb0 -libmcrypt4 libmd0 libmemcached11t64 libmnl0 diff --git a/heroku-24/setup.sh b/heroku-24/setup.sh index fc921884..29e98544 100755 --- a/heroku-24/setup.sh +++ b/heroku-24/setup.sh @@ -68,7 +68,6 @@ packages=( libharfbuzz-icu0 # Used by FFmpeg in heroku-buildpack-activestorage-preview. liblzf1 # Used by the PHP Redis extension. libmagickcore-6.q16-7-extra # Used by the PHP Imagick extension (using the `-extra` package for SVG support). - libmcrypt4 libmemcached11 # Used by the PHP Memcached extension. libmp3lame0 # Used by FFmpeg in heroku-buildpack-activestorage-preview. libmysqlclient21