From nobody Sun Dec 26 18:26:30 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7A26A190DB69; Sun, 26 Dec 2021 18:26:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JMTlW0rCGz3Pq8; Sun, 26 Dec 2021 18:26:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F24A0735A; Sun, 26 Dec 2021 18:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BQIQU9q048764; Sun, 26 Dec 2021 18:26:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BQIQURW048763; Sun, 26 Dec 2021 18:26:30 GMT (envelope-from git) Date: Sun, 26 Dec 2021 18:26:30 GMT Message-Id: <202112261826.1BQIQURW048763@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 529117f533a5 - main - Fix fetch for php* List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 529117f533a514559415cae1128f90c4c8f131c4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640543191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WR+8MtFVR97vkF3ADAltt7Q7rDlK3Z/6RY44TEGBMHo=; b=vt9GNToJmMS1NUuEdSpNZ5scbrhB2NDpeXnnj44GXHIzU1GAIakfmcbc/duN4DRNsBjKhC 2n4dLKdGaLedG5B2W69Flv064y1zz1obahcjlA/qPP1d2ZUiWFzNGpHX/udHfRWcvwdD3e qm/SbXWvYhQJO0NLfAjcgtdrbztDfHcDvklZybmtIRHXHBIjmtLvSH6w0c9NtAxtsBPIdl PQKhmOTbml5gsUiHvDkDJnWbCwTdwIDCwuwhpg6hHV7hDpjCAIjrdeuG452gNwimQfohD4 uUoVnKt/4uo4UMGr+LfPW5Fgl/DPzJqjiQ59xtTna+6EefRo2McLwJqQn6Ggfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640543191; a=rsa-sha256; cv=none; b=q3H4F/jlYIiiPb4t+n1kq1Dv6DelcnASz7PeDg5bT4TP2N+P8tDG+MD7LxIKMgVqCgW5T5 vPRFfNw7zMjbxZyEOAxSDrmGAi9CAeP4y+71RR4rhW7p/5YmMFl9BvpvOxR06Xf++k7YAN Mt34jodTtQdX8l8/slxIOwHI7D97nQVstvnwwepa0p0VHIL/xW7ueACSx/5fT1HPQTP5Mz euIC4XY/OHSn1loB6eKQoSoDv2A8NNbYJL7/Z3EXyqQQCxQgIJGayJR586MtkmfhYioY0M rYdjtNrkt5/X4LZpaVYCnz6/0EW+xUW8p5IVVLVPWlPxsSY5EUkTNn07klKyiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=529117f533a514559415cae1128f90c4c8f131c4 commit 529117f533a514559415cae1128f90c4c8f131c4 Author: Muhammad Moinur Rahman AuthorDate: 2021-12-26 18:08:49 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2021-12-26 18:23:22 +0000 Fix fetch for php* - Primary hosting provider of php has introduced some sort of checking which is blocking fetch although curl/wget works perfectly. fetch with other --user-agent is also not working at the moment. An issue has been opened with the upstream which can be found at: https://github.com/php/web-php/issues/483 - Untill this is fixed add php Github distributions URL to MASTER_SITES - Modify MASTER_SITES for php[73|74|80] and remove SUBDIR as it affects DIST_SUBDIR - Add DIST_SUBDIR as Github is IPv4 only which affects IPv6 only builders. In case someone is running IPv6 only builders distcache will pickup and serve. - Although distinfo has been updated as we have added DIST_SUBDIR but SHA256 and SIZE are unchanged. In case someone needs to verify those are available from https://www.php.net/downloads - We might have done some drastic changes but we are on the brink of quarterly build and we do not want to start a new year and a new quarter with BROKEN php and thousands of other ports. PR: 260699 Reported by: chris@cretaforce.gr Approved by: portmgr (blanket infrastructure) Sponsored by: Bounce Experts --- Mk/bsd.sites.mk | 5 ++++- lang/php73/Makefile | 3 ++- lang/php73/distinfo | 6 +++--- lang/php74/Makefile | 3 ++- lang/php74/distinfo | 6 +++--- lang/php80/Makefile | 3 ++- lang/php80/distinfo | 6 +++--- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index ac66be4d02e8..f77e304b71c7 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -970,9 +970,12 @@ MASTER_SITE_PGSQL+= \ https://ftp.postgresql.org/pub/%SUBDIR%/ .endif +# Currently MyraCloud is blocking fetch. Hence add php Github distributions +# untill it is fixed. .if !defined(IGNORE_MASTER_SITE_PHP) MASTER_SITE_PHP+= \ - https://www.php.net/%SUBDIR%/ + https://www.php.net/distributions/ \ + https://raw.githubusercontent.com/php/web-php-distributions/master/ .endif .if !defined(IGNORE_MASTER_SITE_PYTHON) diff --git a/lang/php73/Makefile b/lang/php73/Makefile index 283e36d84053..7e4d414f12cb 100644 --- a/lang/php73/Makefile +++ b/lang/php73/Makefile @@ -2,8 +2,9 @@ PORTNAME= php73 DISTVERSION= 7.3.33 PORTREVISION?= 0 CATEGORIES?= lang devel www -MASTER_SITES= PHP/distributions +MASTER_SITES= PHP DISTNAME= php-${DISTVERSION} +DIST_SUBDIR= php MAINTAINER= tz@FreeBSD.org COMMENT= PHP Scripting Language diff --git a/lang/php73/distinfo b/lang/php73/distinfo index ef5674b888d5..4bc3efd9082a 100644 --- a/lang/php73/distinfo +++ b/lang/php73/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1637348769 -SHA256 (php-7.3.33.tar.xz) = 166eaccde933381da9516a2b70ad0f447d7cec4b603d07b9a916032b215b90cc -SIZE (php-7.3.33.tar.xz) = 12143820 +TIMESTAMP = 1640541366 +SHA256 (php/php-7.3.33.tar.xz) = 166eaccde933381da9516a2b70ad0f447d7cec4b603d07b9a916032b215b90cc +SIZE (php/php-7.3.33.tar.xz) = 12143820 diff --git a/lang/php74/Makefile b/lang/php74/Makefile index 6ea41959830e..998034541d9c 100644 --- a/lang/php74/Makefile +++ b/lang/php74/Makefile @@ -2,8 +2,9 @@ PORTNAME= php74 DISTVERSION= 7.4.27 PORTREVISION?= 0 CATEGORIES?= lang devel www -MASTER_SITES= PHP/distributions +MASTER_SITES= PHP DISTNAME= php-${DISTVERSION} +DIST_SUBDIR= php MAINTAINER= tz@FreeBSD.org COMMENT= PHP Scripting Language diff --git a/lang/php74/distinfo b/lang/php74/distinfo index be3754334520..4d66194d8b5c 100644 --- a/lang/php74/distinfo +++ b/lang/php74/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640242507 -SHA256 (php-7.4.27.tar.xz) = 3f8b937310f155822752229c2c2feb8cc2621e25a728e7b94d0d74c128c43d0c -SIZE (php-7.4.27.tar.xz) = 10419380 +TIMESTAMP = 1640541720 +SHA256 (php/php-7.4.27.tar.xz) = 3f8b937310f155822752229c2c2feb8cc2621e25a728e7b94d0d74c128c43d0c +SIZE (php/php-7.4.27.tar.xz) = 10419380 diff --git a/lang/php80/Makefile b/lang/php80/Makefile index 00088f9682c7..5991c9b1339d 100644 --- a/lang/php80/Makefile +++ b/lang/php80/Makefile @@ -2,8 +2,9 @@ PORTNAME= php80 DISTVERSION= 8.0.13 PORTREVISION?= 0 CATEGORIES?= lang devel www -MASTER_SITES= PHP/distributions +MASTER_SITES= PHP DISTNAME= php-${DISTVERSION} +DIST_SUBDIR= php MAINTAINER= tz@FreeBSD.org COMMENT= PHP Scripting Language diff --git a/lang/php80/distinfo b/lang/php80/distinfo index 8754c07f4489..82e50ea21c8f 100644 --- a/lang/php80/distinfo +++ b/lang/php80/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1637349092 -SHA256 (php-8.0.13.tar.xz) = cd976805ec2e9198417651027dfe16854ba2c2c388151ab9d4d268513d52ed52 -SIZE (php-8.0.13.tar.xz) = 10854284 +TIMESTAMP = 1640541762 +SHA256 (php/php-8.0.13.tar.xz) = cd976805ec2e9198417651027dfe16854ba2c2c388151ab9d4d268513d52ed52 +SIZE (php/php-8.0.13.tar.xz) = 10854284