From 57143cba9161c913cae8ba0a985bc30ba35130d2 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 4 Feb 2021 10:15:53 -0800 Subject: [PATCH] Update to 8.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. 😬 --- 8.0/alpine3.12/cli/Dockerfile | 6 +++--- 8.0/alpine3.12/fpm/Dockerfile | 6 +++--- 8.0/alpine3.13/cli/Dockerfile | 6 +++--- 8.0/alpine3.13/fpm/Dockerfile | 6 +++--- 8.0/buster/apache/Dockerfile | 6 +++--- 8.0/buster/cli/Dockerfile | 6 +++--- 8.0/buster/fpm/Dockerfile | 6 +++--- 8.0/buster/zts/Dockerfile | 6 +++--- versions.json | 8 ++++---- versions.sh | 6 ++++++ 10 files changed, 34 insertions(+), 28 deletions(-) diff --git a/8.0/alpine3.12/cli/Dockerfile b/8.0/alpine3.12/cli/Dockerfile index d64fb376..760eb154 100644 --- a/8.0/alpine3.12/cli/Dockerfile +++ b/8.0/alpine3.12/cli/Dockerfile @@ -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; \ \ diff --git a/8.0/alpine3.12/fpm/Dockerfile b/8.0/alpine3.12/fpm/Dockerfile index 0eb73bd8..9b4cf2b2 100644 --- a/8.0/alpine3.12/fpm/Dockerfile +++ b/8.0/alpine3.12/fpm/Dockerfile @@ -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; \ \ diff --git a/8.0/alpine3.13/cli/Dockerfile b/8.0/alpine3.13/cli/Dockerfile index 6740fe0f..c998dc56 100644 --- a/8.0/alpine3.13/cli/Dockerfile +++ b/8.0/alpine3.13/cli/Dockerfile @@ -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; \ \ diff --git a/8.0/alpine3.13/fpm/Dockerfile b/8.0/alpine3.13/fpm/Dockerfile index 614cb933..c9e9a26a 100644 --- a/8.0/alpine3.13/fpm/Dockerfile +++ b/8.0/alpine3.13/fpm/Dockerfile @@ -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; \ \ diff --git a/8.0/buster/apache/Dockerfile b/8.0/buster/apache/Dockerfile index 47e9e253..ab7ef09e 100644 --- a/8.0/buster/apache/Dockerfile +++ b/8.0/buster/apache/Dockerfile @@ -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; \ \ diff --git a/8.0/buster/cli/Dockerfile b/8.0/buster/cli/Dockerfile index 6ea62f18..1a1ee4c7 100644 --- a/8.0/buster/cli/Dockerfile +++ b/8.0/buster/cli/Dockerfile @@ -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; \ \ diff --git a/8.0/buster/fpm/Dockerfile b/8.0/buster/fpm/Dockerfile index 0ac04162..cc954cb0 100644 --- a/8.0/buster/fpm/Dockerfile +++ b/8.0/buster/fpm/Dockerfile @@ -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; \ \ diff --git a/8.0/buster/zts/Dockerfile b/8.0/buster/zts/Dockerfile index 825c4ffb..48f71595 100644 --- a/8.0/buster/zts/Dockerfile +++ b/8.0/buster/zts/Dockerfile @@ -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; \ \ diff --git a/versions.json b/versions.json index 63811a20..4ffa6d01 100644 --- a/versions.json +++ b/versions.json @@ -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" } } diff --git a/versions.sh b/versions.sh index 626885a0..62e7adc5 100755 --- a/versions.sh +++ b/versions.sh @@ -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 \