danog/php
1
0
Fork 0
mirror of https://github.com/danog/php.git synced 2024-11-26 20:04:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Also remove "update.sh" bits for ARGON2 hack removal

Browse Source
This commit is contained in:
Tianon Gravi 2019-06-25 15:05:03 -07:00
parent 894ee591c5
commit 820403dc96
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
update.sh
View File

@ -162,10 +162,8 @@ for version in "${versions[@]}"; do
fi
if [ "$majorVersion" = '7' -a "$minorVersion" -lt '4' ]; then
# oniguruma is part of mbstring in php 7.4+
# ARGON2 is a hack only required for alpha1: https://github.com/docker-library/php/pull/840#pullrequestreview-249660894
sed -ri \
-e '/oniguruma-dev|libonig-dev/d' \
-e '/ARGON2/d' \
"$version/$suite/$variant/Dockerfile"
else
# 7.4 and above no longer include pecl/pear: https://github.com/php/php-src/pull/3781