Skip to content

Commit 529117f

Browse files
committed
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: php/web-php#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
1 parent 04a920d commit 529117f

File tree

7 files changed

+19
-13
lines changed

7 files changed

+19
-13
lines changed

Mk/bsd.sites.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,9 +970,12 @@ MASTER_SITE_PGSQL+= \
970970
https://ftp.postgresql.org/pub/%SUBDIR%/
971971
.endif
972972

973+
# Currently MyraCloud is blocking fetch. Hence add php Github distributions
974+
# untill it is fixed.
973975
.if !defined(IGNORE_MASTER_SITE_PHP)
974976
MASTER_SITE_PHP+= \
975-
https://www.php.net/%SUBDIR%/
977+
https://www.php.net/distributions/ \
978+
https://raw.githubusercontent.com/php/web-php-distributions/master/
976979
.endif
977980

978981
.if !defined(IGNORE_MASTER_SITE_PYTHON)

lang/php73/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ PORTNAME= php73
22
DISTVERSION= 7.3.33
33
PORTREVISION?= 0
44
CATEGORIES?= lang devel www
5-
MASTER_SITES= PHP/distributions
5+
MASTER_SITES= PHP
66
DISTNAME= php-${DISTVERSION}
7+
DIST_SUBDIR= php
78

89
MAINTAINER= tz@FreeBSD.org
910
COMMENT= PHP Scripting Language

lang/php73/distinfo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
TIMESTAMP = 1637348769
2-
SHA256 (php-7.3.33.tar.xz) = 166eaccde933381da9516a2b70ad0f447d7cec4b603d07b9a916032b215b90cc
3-
SIZE (php-7.3.33.tar.xz) = 12143820
1+
TIMESTAMP = 1640541366
2+
SHA256 (php/php-7.3.33.tar.xz) = 166eaccde933381da9516a2b70ad0f447d7cec4b603d07b9a916032b215b90cc
3+
SIZE (php/php-7.3.33.tar.xz) = 12143820

lang/php74/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ PORTNAME= php74
22
DISTVERSION= 7.4.27
33
PORTREVISION?= 0
44
CATEGORIES?= lang devel www
5-
MASTER_SITES= PHP/distributions
5+
MASTER_SITES= PHP
66
DISTNAME= php-${DISTVERSION}
7+
DIST_SUBDIR= php
78

89
MAINTAINER= tz@FreeBSD.org
910
COMMENT= PHP Scripting Language

lang/php74/distinfo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
TIMESTAMP = 1640242507
2-
SHA256 (php-7.4.27.tar.xz) = 3f8b937310f155822752229c2c2feb8cc2621e25a728e7b94d0d74c128c43d0c
3-
SIZE (php-7.4.27.tar.xz) = 10419380
1+
TIMESTAMP = 1640541720
2+
SHA256 (php/php-7.4.27.tar.xz) = 3f8b937310f155822752229c2c2feb8cc2621e25a728e7b94d0d74c128c43d0c
3+
SIZE (php/php-7.4.27.tar.xz) = 10419380

lang/php80/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ PORTNAME= php80
22
DISTVERSION= 8.0.13
33
PORTREVISION?= 0
44
CATEGORIES?= lang devel www
5-
MASTER_SITES= PHP/distributions
5+
MASTER_SITES= PHP
66
DISTNAME= php-${DISTVERSION}
7+
DIST_SUBDIR= php
78

89
MAINTAINER= tz@FreeBSD.org
910
COMMENT= PHP Scripting Language

lang/php80/distinfo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
TIMESTAMP = 1637349092
2-
SHA256 (php-8.0.13.tar.xz) = cd976805ec2e9198417651027dfe16854ba2c2c388151ab9d4d268513d52ed52
3-
SIZE (php-8.0.13.tar.xz) = 10854284
1+
TIMESTAMP = 1640541762
2+
SHA256 (php/php-8.0.13.tar.xz) = cd976805ec2e9198417651027dfe16854ba2c2c388151ab9d4d268513d52ed52
3+
SIZE (php/php-8.0.13.tar.xz) = 10854284

0 commit comments

Comments
 (0)