Skip to content

Commit 12d1054

Browse files
BjarneDMBjarneDM
committed
php85: new subport branch 8.5.0
On branch php84 Changes to be committed: Core 8.5.0 modified: _resources/port1.0/group/php-1.1.tcl modified: lang/php/Portfile new file: lang/php/files/patch-php85-atomic.diff new file: lang/php/files/patch-php85-iODBC.diff new file: lang/php/files/patch-php85-sapi-fpm-php-fpm.conf.in.diff new file: lang/php/files/patch-php85-scripts-php-config.in.diff new file: lang/php/files/patch-php85-unixODBC.diff new file: lang/php/files/patch-php85-zend_string_equal_val.diff new file: lang/php/files/patch-php85-mysqlnd-connection.c.diff new file: lang/php/files/php85 find php -name Portfile \ | xargs -n 1 sed -i '' -E -e 's/^(php.branches .*8.4)$/\1 8.5/' remicollet/remirepo#307 Extensions that have been patched: php-memcache : patches for zend_smart_string php-jsmin : patch for zend_smart_string php-imagick : patch for zend_smart_string php-gmagick : patched for php >= 8.5 php-igbinary : patched for php >= 8.5 php-gearman : patched for php >= 8.5 php-amqp : patched for php >= 8.5 php-openswoole : patched for php >= 8.5 php-svm : patched for php >= 8.5 php-stomp : patched for php >= 8.5 Extensions that presently fail to install: modified: php/php-swoole/Portfile swoole/swoole-src#5898 modified: php/php-rar/Portfile modified: php/php-rrd/Portfile modified: php/php-solr/Portfile Extensioan that presently install modified: devel/xapian-core/Portfile modified: php/php-APCu/Portfile modified: php/php-dbase/Portfile modified: php/php-event/Portfile modified: php/php-geoip/Portfile modified: php/php-imap/Portfile modified: php/php-lzf/Portfile modified: php/php-mailparse/Portfile modified: php/php-maxminddb/Portfile modified: php/php-mcrypt/Portfile modified: php/php-meminfo/Portfile modified: php/php-memcached/Portfile modified: php/php-mongodb/Portfile modified: php/php-mysql_xdevapi/Portfile modified: php/php-oauth/Portfile modified: php/php-pcov/Portfile modified: php/php-pspell/Portfile modified: php/php-psr/Portfile modified: php/php-raphf/Portfile modified: php/php-redis/Portfile modified: php/php-scrypt/Portfile modified: php/php-sqlsrv/Portfile modified: php/php-ssh2/Portfile modified: php/php-timezonedb/Portfile modified: php/php-uploadprogress/Portfile modified: php/php-uuid/Portfile modified: php/php-vld/Portfile modified: php/php-xdebug/Portfile - 8.5.0alpha3 for now modified: php/php-xhprof/Portfile modified: php/php-xmlrpc/Portfile modified: php/php-yaf/Portfile modified: php/php-yaz/Portfile modified: php/php-yaml/Portfile modified: php/php-zip/Portfile modified: php/php-zstd/Portfile
1 parent 8efa080 commit 12d1054

File tree

53 files changed

+370
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+370
-93
lines changed

‎_resources/port1.0/group/php-1.1.tcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ categories php lang
1111
# built. For unified extension ports (name begins with "php-") setting
1212
# php.branches is mandatory; there is no default. Example:
1313
#
14-
# php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
14+
# php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5
1515
#
1616
# For unified ports, setting php.branches will create the subports.
1717
#
@@ -103,7 +103,7 @@ proc php._set_name {option action args} {
103103
# when the php port is updated.
104104

105105
options php.latest_stable_branch
106-
default php.latest_stable_branch 8.4
106+
default php.latest_stable_branch 8.5
107107

108108

109109
# php.default_branch: the branch of PHP for which the port should be installed

‎devel/xapian-core/Portfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ foreach v {5.28 5.30 5.32 5.34 5.36 5.38} {
149149
}
150150

151151
# PHP
152-
foreach v {8.0 8.1 8.2 8.3 8.4} {
152+
foreach v {8.0 8.1 8.2 8.3 8.4 8.5} {
153153
set v_no_dot [string map {. {}} ${v}]
154154
set php php${v_no_dot}
155155
subport ${php}-xapian "

‎lang/php/Portfile‎

Lines changed: 45 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -202,27 +202,19 @@ switch ${subport_branch} {
202202
size 13652564
203203
}
204204
8.5 {
205-
# When this becomes a stable version, remove the overrides for homepage,
206-
# master_sites and livecheck, and update php.latest_stable_branch in the
207-
# php-1.1 portgroup.
208-
epoch 0
209-
version 8.5.0RC5
210-
homepage https://qa.php.net/
211-
master_sites https://downloads.php.net/~daniels/
205+
epoch 2
206+
version 8.5.0
212207
use_xz yes
213-
checksums rmd160 5f073aa7112c483ffdfd295f7f5e44fec178f606 \
214-
sha256 4964cdbaf2447afba100c4199ec9c59c41ca4cc23db8d1e38ac7e57aab028954 \
215-
size 14311848
216-
217-
livecheck.url ${homepage}
218-
livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
208+
checksums rmd160 ed3b423aff7f5d4ca1a51b35d866b243e6f55812 \
209+
sha256 39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e \
210+
size 14314552
219211
}
220212
}
221213
# 8.6 {
222214
# # When this becomes a stable version, remove the overrides for homepage,
223215
# # master_sites and livecheck, and update php.latest_stable_branch in the
224216
# # php-1.1 portgroup.
225-
# epoch 1
217+
# epoch 0
226218
# version 8.6.0RC1
227219
# homepage https://qa.php.net/
228220
# master_sites https://downloads.php.net/~saki/
@@ -519,7 +511,7 @@ subport ${php} {
519511
8.2.29 {revision 0}
520512
8.3.28 {revision 0}
521513
8.4.15 {revision 0}
522-
8.5.0RC5 {revision 0}
514+
8.5.0 {revision 0}
523515
}
524516

525517
depends_run port:php_select
@@ -685,7 +677,7 @@ subport ${php}-apache2handler {
685677
8.2.29 {revision 0}
686678
8.3.28 {revision 0}
687679
8.4.15 {revision 0}
688-
8.5.0RC5 {revision 0}
680+
8.5.0 {revision 0}
689681
}
690682

691683
description ${php} Apache 2 Handler SAPI
@@ -751,7 +743,7 @@ subport ${php}-cgi {
751743
8.2.29 {revision 0}
752744
8.3.28 {revision 0}
753745
8.4.15 {revision 0}
754-
8.5.0RC5 {revision 0}
746+
8.5.0 {revision 0}
755747
}
756748

757749
description ${php} CGI SAPI
@@ -797,7 +789,7 @@ subport ${php}-fpm {
797789
8.2.29 {revision 0}
798790
8.3.28 {revision 0}
799791
8.4.15 {revision 0}
800-
8.5.0RC5 {revision 0}
792+
8.5.0 {revision 0}
801793
}
802794

803795
description ${php} FPM SAPI
@@ -872,7 +864,7 @@ subport ${php}-calendar {
872864
8.2.29 {revision 0}
873865
8.3.28 {revision 0}
874866
8.4.15 {revision 0}
875-
8.5.0RC5 {revision 0}
867+
8.5.0 {revision 0}
876868
}
877869

878870
description a PHP extension for converting between different \
@@ -898,7 +890,7 @@ subport ${php}-curl {
898890
8.2.29 {revision 0}
899891
8.3.28 {revision 0}
900892
8.4.15 {revision 0}
901-
8.5.0RC5 {revision 0}
893+
8.5.0 {revision 0}
902894
}
903895

904896
categories-append net www
@@ -940,7 +932,7 @@ subport ${php}-dba {
940932
8.2.29 {revision 0}
941933
8.3.28 {revision 0}
942934
8.4.15 {revision 0}
943-
8.5.0RC5 {revision 0}
935+
8.5.0 {revision 0}
944936
}
945937

946938
categories-append databases
@@ -978,7 +970,7 @@ subport ${php}-enchant {
978970
8.2.29 {revision 0}
979971
8.3.28 {revision 0}
980972
8.4.15 {revision 0}
981-
8.5.0RC5 {revision 0}
973+
8.5.0 {revision 0}
982974
}
983975

984976
categories-append textproc devel
@@ -1035,7 +1027,7 @@ subport ${php}-exif {
10351027
8.2.29 {revision 0}
10361028
8.3.28 {revision 0}
10371029
8.4.15 {revision 0}
1038-
8.5.0RC5 {revision 0}
1030+
8.5.0 {revision 0}
10391031
}
10401032

10411033
categories-append graphics
@@ -1054,7 +1046,7 @@ subport ${php}-ffi {
10541046
8.2.29 {revision 0}
10551047
8.3.28 {revision 0}
10561048
8.4.15 {revision 0}
1057-
8.5.0RC5 {revision 0}
1049+
8.5.0 {revision 0}
10581050
}
10591051

10601052
categories-append devel
@@ -1088,7 +1080,7 @@ subport ${php}-ftp {
10881080
8.2.29 {revision 0}
10891081
8.3.28 {revision 0}
10901082
8.4.15 {revision 0}
1091-
8.5.0RC5 {revision 0}
1083+
8.5.0 {revision 0}
10921084
}
10931085

10941086
categories-append net
@@ -1128,7 +1120,7 @@ subport ${php}-gd {
11281120
8.2.29 {revision 0}
11291121
8.3.28 {revision 0}
11301122
8.4.15 {revision 0}
1131-
8.5.0RC5 {revision 0}
1123+
8.5.0 {revision 0}
11321124
}
11331125

11341126
categories-append graphics
@@ -1204,7 +1196,7 @@ subport ${php}-gettext {
12041196
8.2.29 {revision 0}
12051197
8.3.28 {revision 0}
12061198
8.4.15 {revision 0}
1207-
8.5.0RC5 {revision 0}
1199+
8.5.0 {revision 0}
12081200
}
12091201

12101202
categories-append devel
@@ -1236,7 +1228,7 @@ subport ${php}-gmp {
12361228
8.2.29 {revision 0}
12371229
8.3.28 {revision 0}
12381230
8.4.15 {revision 0}
1239-
8.5.0RC5 {revision 0}
1231+
8.5.0 {revision 0}
12401232
}
12411233

12421234
categories-append devel math
@@ -1274,7 +1266,7 @@ subport ${php}-iconv {
12741266
8.3.28 {revision 0}
12751267
8.4.15 {revision 0}
12761268
8.4.13 {revision 0}
1277-
8.5.0RC5 {revision 0}
1269+
8.5.0 {revision 0}
12781270
}
12791271

12801272
categories-append textproc
@@ -1350,7 +1342,7 @@ subport ${php}-intl {
13501342
8.2.29 {revision 0}
13511343
8.3.28 {revision 0}
13521344
8.4.15 {revision 0}
1353-
8.5.0RC5 {revision 0}
1345+
8.5.0 {revision 0}
13541346
}
13551347

13561348
categories-append devel
@@ -1422,7 +1414,7 @@ subport ${php}-ipc {
14221414
8.2.29 {revision 0}
14231415
8.3.28 {revision 0}
14241416
8.4.15 {revision 0}
1425-
8.5.0RC5 {revision 0}
1417+
8.5.0 {revision 0}
14261418
}
14271419

14281420
php.extensions shmop sysvmsg sysvsem sysvshm
@@ -1450,7 +1442,7 @@ subport ${php}-ldap {
14501442
8.2.29 {revision 0}
14511443
8.3.28 {revision 0}
14521444
8.4.15 {revision 0}
1453-
8.5.0RC5 {revision 0}
1445+
8.5.0 {revision 0}
14541446
}
14551447

14561448
categories-append databases
@@ -1492,7 +1484,7 @@ subport ${php}-mbstring {
14921484
8.2.29 {revision 0}
14931485
8.3.28 {revision 0}
14941486
8.4.15 {revision 0}
1495-
8.5.0RC5 {revision 0}
1487+
8.5.0 {revision 0}
14961488
}
14971489

14981490
categories-append textproc
@@ -1585,7 +1577,7 @@ subport ${php}-mysql {
15851577
8.2.29 {revision 0}
15861578
8.3.28 {revision 0}
15871579
8.4.15 {revision 0}
1588-
8.5.0RC5 {revision 0}
1580+
8.5.0 {revision 0}
15891581
}
15901582

15911583
php.extensions mysqli pdo_mysql
@@ -1609,6 +1601,11 @@ subport ${php}-mysql {
16091601

16101602
if {[vercmp ${branch} >= 5.3]} {
16111603
variant mysqlnd conflicts mysql51 mysql55 mysql56 mysql57 mysql8 mariadb10 mariadb11 percona description {Use MySQL Native Driver} {
1604+
if {[vercmp ${branch} >= 8.5]} {
1605+
patchfiles-append \
1606+
patch-${php}-mysqlnd-connection.c.diff
1607+
}
1608+
16121609
configure.args-append --with-pdo-mysql=mysqlnd
16131610

16141611
if {[vercmp ${branch} < 7.0]} {
@@ -1848,7 +1845,7 @@ subport ${php}-odbc {
18481845
8.2.29 {revision 0}
18491846
8.3.28 {revision 0}
18501847
8.4.15 {revision 0}
1851-
8.5.0RC5 {revision 0}
1848+
8.5.0 {revision 0}
18521849
}
18531850

18541851
php.extensions odbc pdo_odbc
@@ -1901,7 +1898,7 @@ subport ${php}-odbc {
19011898

19021899
# OPcache is integrated in php >= 8.5
19031900
# https://wiki.php.net/rfc/make_opcache_required
1904-
if {[vercmp ${branch} >= 5.5]} {
1901+
if {[vercmp ${branch} >= 5.5] && [vercmp ${branch} < 8.5]} {
19051902
subport ${php}-opcache {
19061903
switch -- ${version} {
19071904
5.5.38 {revision 1}
@@ -1977,7 +1974,7 @@ subport ${php}-openssl {
19771974
8.2.29 {revision 0}
19781975
8.3.28 {revision 0}
19791976
8.4.15 {revision 0}
1980-
8.5.0RC5 {revision 0}
1977+
8.5.0 {revision 0}
19811978
}
19821979

19831980
categories-append devel security
@@ -2035,7 +2032,7 @@ subport ${php}-oracle {
20352032
8.2.29 {revision 0}
20362033
8.3.28 {revision 0}
20372034
8.4.15 {revision 0}
2038-
8.5.0RC5 {revision 0}
2035+
8.5.0 {revision 0}
20392036
}
20402037

20412038
php.extensions oci8 pdo_oci
@@ -2080,7 +2077,7 @@ subport ${php}-pcntl {
20802077
8.2.29 {revision 0}
20812078
8.3.28 {revision 0}
20822079
8.4.15 {revision 0}
2083-
8.5.0RC5 {revision 0}
2080+
8.5.0 {revision 0}
20842081
}
20852082

20862083
categories-append sysutils
@@ -2115,7 +2112,7 @@ subport ${php}-posix {
21152112
8.2.29 {revision 0}
21162113
8.3.28 {revision 0}
21172114
8.4.15 {revision 0}
2118-
8.5.0RC5 {revision 0}
2115+
8.5.0 {revision 0}
21192116
}
21202117

21212118
categories-append sysutils
@@ -2144,7 +2141,7 @@ subport ${php}-postgresql {
21442141
8.2.29 {revision 0}
21452142
8.3.28 {revision 0}
21462143
8.4.15 {revision 0}
2147-
8.5.0RC5 {revision 0}
2144+
8.5.0 {revision 0}
21482145
}
21492146

21502147
php.extensions pgsql pdo_pgsql
@@ -2249,7 +2246,7 @@ subport ${php}-snmp {
22492246
8.2.29 {revision 0}
22502247
8.3.28 {revision 0}
22512248
8.4.15 {revision 0}
2252-
8.5.0RC5 {revision 0}
2249+
8.5.0 {revision 0}
22532250
}
22542251

22552252
categories-append sysutils
@@ -2281,7 +2278,7 @@ subport ${php}-soap {
22812278
8.2.29 {revision 0}
22822279
8.3.28 {revision 0}
22832280
8.4.15 {revision 0}
2284-
8.5.0RC5 {revision 0}
2281+
8.5.0 {revision 0}
22852282
}
22862283

22872284
categories-append net
@@ -2321,7 +2318,7 @@ subport ${php}-sockets {
23212318
8.2.29 {revision 0}
23222319
8.3.28 {revision 0}
23232320
8.4.15 {revision 0}
2324-
8.5.0RC5 {revision 0}
2321+
8.5.0 {revision 0}
23252322
}
23262323

23272324
categories-append net
@@ -2343,7 +2340,7 @@ subport ${php}-sodium {
23432340
8.2.29 {revision 0}
23442341
8.3.28 {revision 0}
23452342
8.4.15 {revision 0}
2346-
8.5.0RC5 {revision 0}
2343+
8.5.0 {revision 0}
23472344
}
23482345

23492346
php.extensions sodium
@@ -2384,7 +2381,7 @@ subport ${php}-sqlite {
23842381
8.2.29 {revision 0}
23852382
8.3.28 {revision 0}
23862383
8.4.15 {revision 0}
2387-
8.5.0RC5 {revision 0}
2384+
8.5.0 {revision 0}
23882385
}
23892386

23902387
php.extensions sqlite sqlite3 pdo_sqlite
@@ -2438,7 +2435,7 @@ subport ${php}-tidy {
24382435
8.2.29 {revision 0}
24392436
8.3.28 {revision 0}
24402437
8.4.15 {revision 0}
2441-
8.5.0RC5 {revision 0}
2438+
8.5.0 {revision 0}
24422439
}
24432440

24442441
categories-append www
@@ -2545,7 +2542,7 @@ subport ${php}-xsl {
25452542
8.2.29 {revision 0}
25462543
8.3.28 {revision 0}
25472544
8.4.15 {revision 0}
2548-
8.5.0RC5 {revision 0}
2545+
8.5.0 {revision 0}
25492546
}
25502547

25512548
categories-append textproc

‎lang/php/files/patch-php85-atomic.diff‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Fix:
2+
3+
error: address argument to atomic operation must be a pointer to non-const _Atomic type ('const _Atomic(bool) *' invalid)
4+
5+
https://github.com/php/php-src/issues/8881
6+
https://github.com/php/php-src/pull/11931
7+
--- a/Zend/zend_atomic.h.orig 2024-02-13 09:41:14.000000000 -0600
8+
+++ b/Zend/zend_atomic.h 2024-03-03 17:16:17.000000000 -0600
9+
@@ -23,7 +23,7 @@
10+
((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || (__GNUC__ > (x)))
11+
12+
/* Builtins are used to avoid library linkage */
13+
-#if __has_feature(c_atomic) && defined(__clang__)
14+
+#if __has_feature(c_atomic) && defined(__clang__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201710L
15+
#define HAVE_C11_ATOMICS 1
16+
#elif ZEND_GCC_PREREQ(4, 7)
17+
#define HAVE_GNUC_ATOMICS 1

0 commit comments

Comments
 (0)