Update to 8.0.2

This applies the same workaround upstream applied in https://bugs.php.net/bug.php?id=80711#1612456954 for a minor publishing issue they're having. 😬
This commit is contained in:
Tianon Gravi 2021-02-04 10:15:53 -08:00
parent 1ad18817e5
commit 57143cba91
10 changed files with 34 additions and 28 deletions

View File

@ -58,9 +58,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
ENV PHP_VERSION 8.0.1
ENV PHP_URL="https://www.php.net/distributions/php-8.0.1.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.1.tar.xz.asc"
ENV PHP_SHA256="208b3330af881b44a6a8c6858d569c72db78dab97810332978cc65206b0ec2dc"
ENV PHP_VERSION 8.0.2
ENV PHP_URL="https://www.php.net/distributions/php-8.0.2.tar.xz?a=1" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.2.tar.xz.asc?a=1"
ENV PHP_SHA256="84dd6e36f48c3a71ff5dceba375c1f6b34b71d4fa9e06b720780127176468ccc"
RUN set -eux; \
\

View File

@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
ENV PHP_VERSION 8.0.1
ENV PHP_URL="https://www.php.net/distributions/php-8.0.1.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.1.tar.xz.asc"
ENV PHP_SHA256="208b3330af881b44a6a8c6858d569c72db78dab97810332978cc65206b0ec2dc"
ENV PHP_VERSION 8.0.2
ENV PHP_URL="https://www.php.net/distributions/php-8.0.2.tar.xz?a=1" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.2.tar.xz.asc?a=1"
ENV PHP_SHA256="84dd6e36f48c3a71ff5dceba375c1f6b34b71d4fa9e06b720780127176468ccc"
RUN set -eux; \
\

View File

@ -58,9 +58,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
ENV PHP_VERSION 8.0.1
ENV PHP_URL="https://www.php.net/distributions/php-8.0.1.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.1.tar.xz.asc"
ENV PHP_SHA256="208b3330af881b44a6a8c6858d569c72db78dab97810332978cc65206b0ec2dc"
ENV PHP_VERSION 8.0.2
ENV PHP_URL="https://www.php.net/distributions/php-8.0.2.tar.xz?a=1" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.2.tar.xz.asc?a=1"
ENV PHP_SHA256="84dd6e36f48c3a71ff5dceba375c1f6b34b71d4fa9e06b720780127176468ccc"
RUN set -eux; \
\

View File

@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
ENV PHP_VERSION 8.0.1
ENV PHP_URL="https://www.php.net/distributions/php-8.0.1.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.1.tar.xz.asc"
ENV PHP_SHA256="208b3330af881b44a6a8c6858d569c72db78dab97810332978cc65206b0ec2dc"
ENV PHP_VERSION 8.0.2
ENV PHP_URL="https://www.php.net/distributions/php-8.0.2.tar.xz?a=1" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.2.tar.xz.asc?a=1"
ENV PHP_SHA256="84dd6e36f48c3a71ff5dceba375c1f6b34b71d4fa9e06b720780127176468ccc"
RUN set -eux; \
\

View File

@ -121,9 +121,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
ENV PHP_VERSION 8.0.1
ENV PHP_URL="https://www.php.net/distributions/php-8.0.1.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.1.tar.xz.asc"
ENV PHP_SHA256="208b3330af881b44a6a8c6858d569c72db78dab97810332978cc65206b0ec2dc"
ENV PHP_VERSION 8.0.2
ENV PHP_URL="https://www.php.net/distributions/php-8.0.2.tar.xz?a=1" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.2.tar.xz.asc?a=1"
ENV PHP_SHA256="84dd6e36f48c3a71ff5dceba375c1f6b34b71d4fa9e06b720780127176468ccc"
RUN set -eux; \
\

View File

@ -63,9 +63,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
ENV PHP_VERSION 8.0.1
ENV PHP_URL="https://www.php.net/distributions/php-8.0.1.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.1.tar.xz.asc"
ENV PHP_SHA256="208b3330af881b44a6a8c6858d569c72db78dab97810332978cc65206b0ec2dc"
ENV PHP_VERSION 8.0.2
ENV PHP_URL="https://www.php.net/distributions/php-8.0.2.tar.xz?a=1" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.2.tar.xz.asc?a=1"
ENV PHP_SHA256="84dd6e36f48c3a71ff5dceba375c1f6b34b71d4fa9e06b720780127176468ccc"
RUN set -eux; \
\

View File

@ -62,9 +62,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
ENV PHP_VERSION 8.0.1
ENV PHP_URL="https://www.php.net/distributions/php-8.0.1.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.1.tar.xz.asc"
ENV PHP_SHA256="208b3330af881b44a6a8c6858d569c72db78dab97810332978cc65206b0ec2dc"
ENV PHP_VERSION 8.0.2
ENV PHP_URL="https://www.php.net/distributions/php-8.0.2.tar.xz?a=1" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.2.tar.xz.asc?a=1"
ENV PHP_SHA256="84dd6e36f48c3a71ff5dceba375c1f6b34b71d4fa9e06b720780127176468ccc"
RUN set -eux; \
\

View File

@ -62,9 +62,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
ENV PHP_VERSION 8.0.1
ENV PHP_URL="https://www.php.net/distributions/php-8.0.1.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.1.tar.xz.asc"
ENV PHP_SHA256="208b3330af881b44a6a8c6858d569c72db78dab97810332978cc65206b0ec2dc"
ENV PHP_VERSION 8.0.2
ENV PHP_URL="https://www.php.net/distributions/php-8.0.2.tar.xz?a=1" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.2.tar.xz.asc?a=1"
ENV PHP_SHA256="84dd6e36f48c3a71ff5dceba375c1f6b34b71d4fa9e06b720780127176468ccc"
RUN set -eux; \
\

View File

@ -42,10 +42,10 @@
"version": "7.4.15"
},
"8.0": {
"ascUrl": "https://www.php.net/distributions/php-8.0.1.tar.xz.asc",
"ascUrl": "https://www.php.net/distributions/php-8.0.2.tar.xz.asc?a=1",
"gpgKeys": "1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F",
"sha256": "208b3330af881b44a6a8c6858d569c72db78dab97810332978cc65206b0ec2dc",
"url": "https://www.php.net/distributions/php-8.0.1.tar.xz",
"sha256": "84dd6e36f48c3a71ff5dceba375c1f6b34b71d4fa9e06b720780127176468ccc",
"url": "https://www.php.net/distributions/php-8.0.2.tar.xz?a=1",
"variants": [
"buster/cli",
"buster/apache",
@ -56,6 +56,6 @@
"alpine3.12/cli",
"alpine3.12/fpm"
],
"version": "8.0.1"
"version": "8.0.2"
}
}

View File

@ -126,6 +126,12 @@ for version in "${versions[@]}"; do
echo "$version: $fullVersion"
if [ "$fullVersion" = '8.0.2' ]; then
# https://bugs.php.net/bug.php?id=80711#1612456954 😬
url+='?a=1'
ascUrl+='?a=1'
fi
export fullVersion url ascUrl sha256 gpgKey
json="$(
jq <<<"$json" -c \