* [PR PATCH] PHP updates and virtual package support
@ 2023-08-08 14:33 TinfoilSubmarine
2023-08-08 20:21 ` [PR REVIEW] " classabbyamp
` (12 more replies)
0 siblings, 13 replies; 14+ messages in thread
From: TinfoilSubmarine @ 2023-08-08 14:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1438 bytes --]
There is a new pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php-updates
https://github.com/void-linux/void-packages/pull/45493
PHP updates and virtual package support
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
Supersedes https://github.com/void-linux/void-packages/pull/44946
I need some help testing this as I don't use ampache or phpMyAdmin.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-updates-45493.patch --]
[-- Type: text/x-diff, Size: 12675 bytes --]
From 5ed472c443993e651ddbf1cc07e157c1aabd5754 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:32 -0400
Subject: [PATCH 1/9] php8.2: provide php-runtime vpkg.
---
etc/defaults.virtual | 1 +
srcpkgs/php8.2/template | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index f399b12998405..d99b416b041f5 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -28,6 +28,7 @@ nodejs-runtime nodejs
ntp-daemon chrony
phonon-backend phonon-backend-gstreamer
phonon-qt5-backend phonon-qt5-backend-gstreamer
+php-runtime php8.2
pipewire-session-manager pipewire-session-manager-bootstrap
rkt-stage1 rkt-stage1-coreos
smtp-server opensmtpd
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 4efa06f503cac..5361112f81c10 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.8
-revision=1
+revision=2
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -18,6 +18,7 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
# at https://www.php.net/distributions/
distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
checksum=6419b74e9b675c8d5a1afd2788c4d7996a19bbe2be409716ccb2067897af9df1
+provides="php-runtime-${version}_1"
conf_files="/etc/php${_php_version}/php.ini"
From 65391a0516031a10f5d93461a37a59a753b83e43 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:26 -0400
Subject: [PATCH 2/9] php8.0: update to 8.0.30, provide php-runtime vpkg.
---
srcpkgs/php8.0/patches/php-cross-config.patch | 8 ++++----
srcpkgs/php8.0/patches/php-opcache-cross.patch | 16 ++++++++--------
srcpkgs/php8.0/template | 5 +++--
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/php8.0/patches/php-cross-config.patch b/srcpkgs/php8.0/patches/php-cross-config.patch
index 24de8c58cbddb..10a6527ec3985 100644
--- a/srcpkgs/php8.0/patches/php-cross-config.patch
+++ b/srcpkgs/php8.0/patches/php-cross-config.patch
@@ -27,8 +27,8 @@
- if test -n "$PG_CONFIG"; then
+ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
- $as_echo "$PG_CONFIG" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ printf "%s\n" "$PG_CONFIG" >&6; }
PGSQL_INCLUDE=`$PG_CONFIG --includedir`
@@ -58821,7 +58824,7 @@ $as_echo_n "checking for pg_config... "
fi
@@ -36,6 +36,6 @@
- if test -n "$PG_CONFIG"; then
+ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
- $as_echo "$PG_CONFIG" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ printf "%s\n" "$PG_CONFIG" >&6; }
PGSQL_INCLUDE=`$PG_CONFIG --includedir`
diff --git a/srcpkgs/php8.0/patches/php-opcache-cross.patch b/srcpkgs/php8.0/patches/php-opcache-cross.patch
index 5d8a8c5ceed51..37ae0cab3d90c 100644
--- a/srcpkgs/php8.0/patches/php-opcache-cross.patch
+++ b/srcpkgs/php8.0/patches/php-opcache-cross.patch
@@ -1,14 +1,14 @@
-diff --git a/configure b/configure.new
-index 1159224b4c..29f763aa05 100755
+diff --git a/configure b/configure
+index 7bfa593..a213fb2 100755
--- a/configure
-+++ b/configure.new
-@@ -51689,7 +51689,8 @@ $as_echo "$have_shm_ipc" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mmap() using MAP_ANON shared memory support" >&5
- $as_echo_n "checking for mmap() using MAP_ANON shared memory support... " >&6; }
- if test "$cross_compiling" = yes; then :
++++ b/configure
+@@ -54086,7 +54086,8 @@ printf "%s\n" "$have_shm_ipc" >&6; }
+ printf %s "checking for mmap() using MAP_ANON shared memory support... " >&6; }
+ if test "$cross_compiling" = yes
+ then :
- have_shm_mmap_anon=no
+$as_echo "#define HAVE_SHM_MMAP_ANON 1" >>confdefs.h
+ have_shm_mmap_anon=yes
- else
+ else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index c8c0045252290..f5ac76ab56694 100644
--- a/srcpkgs/php8.0/template
+++ b/srcpkgs/php8.0/template
@@ -1,6 +1,6 @@
# Template file for 'php8.0'
pkgname=php8.0
-version=8.0.29
+version=8.0.30
revision=1
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
@@ -17,7 +17,8 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
# this is the source where the www.php.net code pulls the tarballs it serves
# at https://www.php.net/distributions/
distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=db6ee08df5706365f624cde1cffb20ad6de1effe59d7e886337213a09f2e2684
+checksum=449d2048fcb20a314d8c218097c6d1047a9f1c5bb72aa54d5d3eba0a27a4c80c
+provides="php-runtime-${version}_1"
conf_files="/etc/php${_php_version}/php.ini"
From 702fe2b9053b2200fc2f1aac3abb1fba010eb4fb Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:29 -0400
Subject: [PATCH 3/9] php8.1: update to 8.1.22, provide php-runtime vpkg.
---
srcpkgs/php8.1/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index ccd5ead2dcafd..e01937ed7b434 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,6 +1,6 @@
# Template file for 'php8.1'
pkgname=php8.1
-version=8.1.21
+version=8.1.22
revision=1
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
@@ -17,7 +17,8 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
# this is the source where the www.php.net code pulls the tarballs it serves
# at https://www.php.net/distributions/
distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=a95f8d35924aa5705ad07a70dc994bf41b5d45126ecdec7aaad6edfbe5e1c37f
+checksum=f5140e94b139b4adec4b29c337537b7b6f1ef023197eb32be909e724e3da157a
+provides="php-runtime-${version}_1"
conf_files="/etc/php${_php_version}/php.ini"
From 623a82e161787922d1854626fcd1f7bc0586fa13 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:38 -0400
Subject: [PATCH 4/9] xdebug8.0: update to 3.2.2.
---
srcpkgs/xdebug8.0/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xdebug8.0/template b/srcpkgs/xdebug8.0/template
index 3f985f3ab75a6..500d05ee9869c 100644
--- a/srcpkgs/xdebug8.0/template
+++ b/srcpkgs/xdebug8.0/template
@@ -1,6 +1,6 @@
# Template file for 'xdebug8.0'
pkgname=xdebug8.0
-version=3.2.1
+version=3.2.2
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.0"
@@ -12,7 +12,7 @@ license="PHP-3.0"
homepage="http://xdebug.org"
changelog="https://xdebug.org/updates"
distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
-checksum=ef4cb3c228192798874e4530cccceee76840cc80821909740088a1e1a8f00445
+checksum=f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157
pre_configure() {
phpize8.0
From 95bd8f43eabeae9d97d37b7fd89ac003d4ee6990 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:39 -0400
Subject: [PATCH 5/9] xdebug8.1: update to 3.2.2.
---
srcpkgs/xdebug8.1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xdebug8.1/template b/srcpkgs/xdebug8.1/template
index 5534a776ad6b0..ce32b6048d231 100644
--- a/srcpkgs/xdebug8.1/template
+++ b/srcpkgs/xdebug8.1/template
@@ -1,6 +1,6 @@
# Template file for 'xdebug8.1'
pkgname=xdebug8.1
-version=3.2.1
+version=3.2.2
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
@@ -12,7 +12,7 @@ license="PHP-3.0"
homepage="http://xdebug.org"
changelog="https://xdebug.org/updates"
distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
-checksum=ef4cb3c228192798874e4530cccceee76840cc80821909740088a1e1a8f00445
+checksum=f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157
pre_configure() {
phpize8.1
From 61e8315ea7b63543239f2a9722b39ce0db687d52 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:41 -0400
Subject: [PATCH 6/9] xdebug8.2: update to 3.2.2.
---
srcpkgs/xdebug8.2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xdebug8.2/template b/srcpkgs/xdebug8.2/template
index ce8bb81e83ca6..987802cbfa782 100644
--- a/srcpkgs/xdebug8.2/template
+++ b/srcpkgs/xdebug8.2/template
@@ -1,6 +1,6 @@
# Template file for 'xdebug8.2'
pkgname=xdebug8.2
-version=3.2.1
+version=3.2.2
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.2"
@@ -12,7 +12,7 @@ license="PHP-3.0"
homepage="http://xdebug.org"
changelog="https://xdebug.org/updates"
distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
-checksum=ef4cb3c228192798874e4530cccceee76840cc80821909740088a1e1a8f00445
+checksum=f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157
pre_configure() {
phpize8.2
From ec97089a121ee7b0a60d1d06ade341746f86c425 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:50 -0400
Subject: [PATCH 7/9] phpMyAdmin: update to 5.2.1, depend on php-runtime
virtual package.
---
srcpkgs/phpMyAdmin/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/phpMyAdmin/template b/srcpkgs/phpMyAdmin/template
index 7f0b5f024df54..dc9f179f89451 100644
--- a/srcpkgs/phpMyAdmin/template
+++ b/srcpkgs/phpMyAdmin/template
@@ -1,15 +1,15 @@
# Template file for 'phpMyAdmin'
pkgname=phpMyAdmin
-version=5.2.0
-revision=2
+version=5.2.1
+revision=1
conf_files="/etc/webapps/phpMyAdmin/config.inc.php"
-depends="php8.1 mariadb"
+depends="virtual?php-runtime"
short_desc="Web interface for MySQL and MariaDB"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="GPL-2.0-only"
homepage="https://www.phpmyadmin.net"
distfiles="https://files.phpmyadmin.net/phpMyAdmin/${version}/phpMyAdmin-${version}-all-languages.tar.xz"
-checksum=66da31ca295f06182ac3f2e6e96057dc824c459baedf4b29de6ed0d3be039230
+checksum=373f9599dfbd96d6fe75316d5dad189e68c305f297edf42377db9dd6b41b2557
do_install() {
vmkdir usr/share/webapps/
From a04ea5124dfe82b65a0db69f974092829a6f974b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:55 -0400
Subject: [PATCH 8/9] phoronix-test-suite: depend on php-runtime virtual
package.
---
srcpkgs/phoronix-test-suite/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/phoronix-test-suite/template b/srcpkgs/phoronix-test-suite/template
index 16b4034bec27b..341d406258426 100644
--- a/srcpkgs/phoronix-test-suite/template
+++ b/srcpkgs/phoronix-test-suite/template
@@ -1,8 +1,8 @@
# Template file for 'phoronix-test-suite'
pkgname=phoronix-test-suite
version=10.8.4
-revision=2
-depends="php8.1"
+revision=3
+depends="virtual?php-runtime"
short_desc="Comprehensive testing and benchmarking platform for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
From f1d480c91e47be49a634076d503864a6ff9f5754 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:59 -0400
Subject: [PATCH 9/9] ampache: update to 5.6.2, depend on php-runtime virtual
package.
---
srcpkgs/ampache/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ampache/template b/srcpkgs/ampache/template
index d820e758f355e..2587dc4ec6adf 100644
--- a/srcpkgs/ampache/template
+++ b/srcpkgs/ampache/template
@@ -1,16 +1,16 @@
# Template file for 'ampache'
pkgname=ampache
-version=5.5.1
+version=5.6.2
revision=1
create_wrksrc=yes
hostmakedepends="unzip"
-depends="php8.1 mariadb"
+depends="virtual?php-runtime"
short_desc="Web-based tool for managing your audio/video files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="AGPL-3.0-or-later"
homepage="https://ampache.org"
distfiles="https://github.com/ampache/ampache/releases/download/${version}/${pkgname}-${version}_all.zip"
-checksum=3e37839058c263be990915759eecab9b5da3ec324638a7ff7d8094516f56a85c
+checksum=e406ff9de1537c3854ed9fad2ffdf854e193908617f8f409fa5de9036fed0927
python_version=3
do_install() {
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] PHP updates and virtual package support
2023-08-08 14:33 [PR PATCH] PHP updates and virtual package support TinfoilSubmarine
@ 2023-08-08 20:21 ` classabbyamp
2023-08-08 20:29 ` TinfoilSubmarine
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: classabbyamp @ 2023-08-08 20:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/45493#discussion_r1287648806
Comment:
what about mariadb?
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] PHP updates and virtual package support
2023-08-08 14:33 [PR PATCH] PHP updates and virtual package support TinfoilSubmarine
2023-08-08 20:21 ` [PR REVIEW] " classabbyamp
@ 2023-08-08 20:29 ` TinfoilSubmarine
2023-08-11 19:45 ` TinfoilSubmarine
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: TinfoilSubmarine @ 2023-08-08 20:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 380 bytes --]
New review comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/45493#discussion_r1287658154
Comment:
As far as I know ampache doesn't require the database to be on the same machine as ampache as it can be configured with [`database_hostname`](https://github.com/ampache/ampache/blob/develop/config/ampache.cfg.php.dist#L78).
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: PHP updates and virtual package support
2023-08-08 14:33 [PR PATCH] PHP updates and virtual package support TinfoilSubmarine
2023-08-08 20:21 ` [PR REVIEW] " classabbyamp
2023-08-08 20:29 ` TinfoilSubmarine
@ 2023-08-11 19:45 ` TinfoilSubmarine
2023-08-11 21:02 ` MeganerdNL
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: TinfoilSubmarine @ 2023-08-11 19:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/45493#issuecomment-1675286770
Comment:
I was able to get test instances of ampache and phpMyAdmin both working.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: PHP updates and virtual package support
2023-08-08 14:33 [PR PATCH] PHP updates and virtual package support TinfoilSubmarine
` (2 preceding siblings ...)
2023-08-11 19:45 ` TinfoilSubmarine
@ 2023-08-11 21:02 ` MeganerdNL
2023-09-27 14:49 ` [PR PATCH] [Updated] " TinfoilSubmarine
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: MeganerdNL @ 2023-08-11 21:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 188 bytes --]
New comment by MeganerdNL on void-packages repository
https://github.com/void-linux/void-packages/pull/45493#issuecomment-1675399247
Comment:
Tested phpMyAdmin and working fine. Thanks.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] PHP updates and virtual package support
2023-08-08 14:33 [PR PATCH] PHP updates and virtual package support TinfoilSubmarine
` (3 preceding siblings ...)
2023-08-11 21:02 ` MeganerdNL
@ 2023-09-27 14:49 ` TinfoilSubmarine
2023-09-27 15:01 ` TinfoilSubmarine
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: TinfoilSubmarine @ 2023-09-27 14:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1424 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php-updates
https://github.com/void-linux/void-packages/pull/45493
PHP updates and virtual package support
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Supersedes https://github.com/void-linux/void-packages/pull/44946
I need some help testing this as I don't use ampache or phpMyAdmin.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-updates-45493.patch --]
[-- Type: text/x-diff, Size: 8338 bytes --]
From a6e276c648fdc04e01ac662edb2eb8e20597fee3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:32 -0400
Subject: [PATCH 1/7] php8.2: update to 8.2.10, provide php-runtime vpkg.
---
etc/defaults.virtual | 1 +
srcpkgs/php8.2/template | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index f399b12998405..d99b416b041f5 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -28,6 +28,7 @@ nodejs-runtime nodejs
ntp-daemon chrony
phonon-backend phonon-backend-gstreamer
phonon-qt5-backend phonon-qt5-backend-gstreamer
+php-runtime php8.2
pipewire-session-manager pipewire-session-manager-bootstrap
rkt-stage1 rkt-stage1-coreos
smtp-server opensmtpd
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index add04b4d3d562..16450e0a27362 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
-version=8.2.8
-revision=3
+version=8.2.10
+revision=1
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -17,7 +17,8 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
# this is the source where the www.php.net code pulls the tarballs it serves
# at https://www.php.net/distributions/
distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=6419b74e9b675c8d5a1afd2788c4d7996a19bbe2be409716ccb2067897af9df1
+checksum=7e3e277d6eab652616f90bc7c75991179c0512953933ceba27496fb5514f7e78
+provides="php-runtime-${version}_1"
conf_files="/etc/php${_php_version}/php.ini"
From 09474e3c34689c01d31bb2e11643fd1afe1e307b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:29 -0400
Subject: [PATCH 2/7] php8.1: update to 8.1.23, provide php-runtime vpkg.
---
srcpkgs/php8.1/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 9e4cbfef1d4b9..1518ec7275668 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1'
pkgname=php8.1
-version=8.1.21
-revision=3
+version=8.1.23
+revision=1
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -17,7 +17,8 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
# this is the source where the www.php.net code pulls the tarballs it serves
# at https://www.php.net/distributions/
distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=a95f8d35924aa5705ad07a70dc994bf41b5d45126ecdec7aaad6edfbe5e1c37f
+checksum=ec5330b3978edc8fe2f78830720505bf69d12542622b5cddccee63ae3a0e5b58
+provides="php-runtime-${version}_1"
conf_files="/etc/php${_php_version}/php.ini"
From 6ea715cd059a8538864c8ae831c29c697e45fd65 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:39 -0400
Subject: [PATCH 3/7] xdebug8.1: update to 3.2.2.
---
srcpkgs/xdebug8.1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xdebug8.1/template b/srcpkgs/xdebug8.1/template
index 31e615b5ccb5b..d8d13c0349040 100644
--- a/srcpkgs/xdebug8.1/template
+++ b/srcpkgs/xdebug8.1/template
@@ -1,6 +1,6 @@
# Template file for 'xdebug8.1'
pkgname=xdebug8.1
-version=3.2.1
+version=3.2.2
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
@@ -12,7 +12,7 @@ license="PHP-3.0"
homepage="http://xdebug.org"
changelog="https://xdebug.org/updates"
distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
-checksum=ef4cb3c228192798874e4530cccceee76840cc80821909740088a1e1a8f00445
+checksum=f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157
pre_configure() {
phpize8.1
From 6053599e24e10a8a5a080d2edb8260508d7086a0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:41 -0400
Subject: [PATCH 4/7] xdebug8.2: update to 3.2.2.
---
srcpkgs/xdebug8.2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xdebug8.2/template b/srcpkgs/xdebug8.2/template
index c8c480b0317a6..94d61346db1eb 100644
--- a/srcpkgs/xdebug8.2/template
+++ b/srcpkgs/xdebug8.2/template
@@ -1,6 +1,6 @@
# Template file for 'xdebug8.2'
pkgname=xdebug8.2
-version=3.2.1
+version=3.2.2
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.2"
@@ -12,7 +12,7 @@ license="PHP-3.0"
homepage="http://xdebug.org"
changelog="https://xdebug.org/updates"
distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
-checksum=ef4cb3c228192798874e4530cccceee76840cc80821909740088a1e1a8f00445
+checksum=f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157
pre_configure() {
phpize8.2
From c5cec6da3bcb51abc85d56b9174ba58607770290 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:50 -0400
Subject: [PATCH 5/7] phpMyAdmin: update to 5.2.1, depend on php-runtime
virtual package.
---
srcpkgs/phpMyAdmin/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/phpMyAdmin/template b/srcpkgs/phpMyAdmin/template
index 7f0b5f024df54..dc9f179f89451 100644
--- a/srcpkgs/phpMyAdmin/template
+++ b/srcpkgs/phpMyAdmin/template
@@ -1,15 +1,15 @@
# Template file for 'phpMyAdmin'
pkgname=phpMyAdmin
-version=5.2.0
-revision=2
+version=5.2.1
+revision=1
conf_files="/etc/webapps/phpMyAdmin/config.inc.php"
-depends="php8.1 mariadb"
+depends="virtual?php-runtime"
short_desc="Web interface for MySQL and MariaDB"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="GPL-2.0-only"
homepage="https://www.phpmyadmin.net"
distfiles="https://files.phpmyadmin.net/phpMyAdmin/${version}/phpMyAdmin-${version}-all-languages.tar.xz"
-checksum=66da31ca295f06182ac3f2e6e96057dc824c459baedf4b29de6ed0d3be039230
+checksum=373f9599dfbd96d6fe75316d5dad189e68c305f297edf42377db9dd6b41b2557
do_install() {
vmkdir usr/share/webapps/
From a3fc3140dba680cd3656c565f195adafb299f633 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:55 -0400
Subject: [PATCH 6/7] phoronix-test-suite: depend on php-runtime virtual
package.
---
srcpkgs/phoronix-test-suite/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/phoronix-test-suite/template b/srcpkgs/phoronix-test-suite/template
index 16b4034bec27b..341d406258426 100644
--- a/srcpkgs/phoronix-test-suite/template
+++ b/srcpkgs/phoronix-test-suite/template
@@ -1,8 +1,8 @@
# Template file for 'phoronix-test-suite'
pkgname=phoronix-test-suite
version=10.8.4
-revision=2
-depends="php8.1"
+revision=3
+depends="virtual?php-runtime"
short_desc="Comprehensive testing and benchmarking platform for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
From ad446880f9c9dbc5a551b8f342ac15d7ada1773e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:59 -0400
Subject: [PATCH 7/7] ampache: update to 5.6.2, depend on php-runtime virtual
package.
---
srcpkgs/ampache/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ampache/template b/srcpkgs/ampache/template
index d820e758f355e..2587dc4ec6adf 100644
--- a/srcpkgs/ampache/template
+++ b/srcpkgs/ampache/template
@@ -1,16 +1,16 @@
# Template file for 'ampache'
pkgname=ampache
-version=5.5.1
+version=5.6.2
revision=1
create_wrksrc=yes
hostmakedepends="unzip"
-depends="php8.1 mariadb"
+depends="virtual?php-runtime"
short_desc="Web-based tool for managing your audio/video files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="AGPL-3.0-or-later"
homepage="https://ampache.org"
distfiles="https://github.com/ampache/ampache/releases/download/${version}/${pkgname}-${version}_all.zip"
-checksum=3e37839058c263be990915759eecab9b5da3ec324638a7ff7d8094516f56a85c
+checksum=e406ff9de1537c3854ed9fad2ffdf854e193908617f8f409fa5de9036fed0927
python_version=3
do_install() {
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] PHP updates and virtual package support
2023-08-08 14:33 [PR PATCH] PHP updates and virtual package support TinfoilSubmarine
` (4 preceding siblings ...)
2023-09-27 14:49 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2023-09-27 15:01 ` TinfoilSubmarine
2023-11-28 17:18 ` TinfoilSubmarine
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: TinfoilSubmarine @ 2023-09-27 15:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1424 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php-updates
https://github.com/void-linux/void-packages/pull/45493
PHP updates and virtual package support
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Supersedes https://github.com/void-linux/void-packages/pull/44946
I need some help testing this as I don't use ampache or phpMyAdmin.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-updates-45493.patch --]
[-- Type: text/x-diff, Size: 9916 bytes --]
From 51edb9083a6eb5328c1b34f347ac45041eb734af Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:32 -0400
Subject: [PATCH 1/7] php8.2: update to 8.2.10, provide php-runtime vpkg.
---
etc/defaults.virtual | 1 +
srcpkgs/php8.2/patches/php-cross-config.patch | 14 +++++++-------
srcpkgs/php8.2/template | 7 ++++---
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index f399b12998405..d99b416b041f5 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -28,6 +28,7 @@ nodejs-runtime nodejs
ntp-daemon chrony
phonon-backend phonon-backend-gstreamer
phonon-qt5-backend phonon-qt5-backend-gstreamer
+php-runtime php8.2
pipewire-session-manager pipewire-session-manager-bootstrap
rkt-stage1 rkt-stage1-coreos
smtp-server opensmtpd
diff --git a/srcpkgs/php8.2/patches/php-cross-config.patch b/srcpkgs/php8.2/patches/php-cross-config.patch
index 169c43f1df932..50d2cbba245cd 100644
--- a/srcpkgs/php8.2/patches/php-cross-config.patch
+++ b/srcpkgs/php8.2/patches/php-cross-config.patch
@@ -1,22 +1,22 @@
diff --git a/configure b/configure
-index e4b82d1..1a8678f 100755
+index 3263d08..e5bdc2b 100755
--- a/configure
+++ b/configure
-@@ -62424,7 +62424,7 @@ printf %s "checking for pg_config... " >&6; }
+@@ -61090,7 +61090,7 @@ $as_echo_n "checking for pg_config... " >&6; }
fi
done
- if test -n "$PG_CONFIG"; then
+ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
- printf "%s\n" "$PG_CONFIG" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ $as_echo "$PG_CONFIG" >&6; }
PGSQL_INCLUDE=`$PG_CONFIG --includedir`
-@@ -63948,7 +63948,7 @@ printf %s "checking for pg_config... " >&6; }
+@@ -62616,7 +62616,7 @@ $as_echo_n "checking for pg_config... " >&6; }
fi
done
- if test -n "$PG_CONFIG"; then
+ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
- printf "%s\n" "$PG_CONFIG" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ $as_echo "$PG_CONFIG" >&6; }
PGSQL_INCLUDE=`$PG_CONFIG --includedir`
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index add04b4d3d562..16450e0a27362 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
-version=8.2.8
-revision=3
+version=8.2.10
+revision=1
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -17,7 +17,8 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
# this is the source where the www.php.net code pulls the tarballs it serves
# at https://www.php.net/distributions/
distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=6419b74e9b675c8d5a1afd2788c4d7996a19bbe2be409716ccb2067897af9df1
+checksum=7e3e277d6eab652616f90bc7c75991179c0512953933ceba27496fb5514f7e78
+provides="php-runtime-${version}_1"
conf_files="/etc/php${_php_version}/php.ini"
From 3af474197144b05a3b3d0953ace6b7ca20c08423 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:29 -0400
Subject: [PATCH 2/7] php8.1: update to 8.1.23, provide php-runtime vpkg.
---
srcpkgs/php8.1/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 9e4cbfef1d4b9..1518ec7275668 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1'
pkgname=php8.1
-version=8.1.21
-revision=3
+version=8.1.23
+revision=1
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -17,7 +17,8 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
# this is the source where the www.php.net code pulls the tarballs it serves
# at https://www.php.net/distributions/
distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=a95f8d35924aa5705ad07a70dc994bf41b5d45126ecdec7aaad6edfbe5e1c37f
+checksum=ec5330b3978edc8fe2f78830720505bf69d12542622b5cddccee63ae3a0e5b58
+provides="php-runtime-${version}_1"
conf_files="/etc/php${_php_version}/php.ini"
From c79d1d5f495234e1401a550e979ec2ebeaa7920b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:39 -0400
Subject: [PATCH 3/7] xdebug8.1: update to 3.2.2.
---
srcpkgs/xdebug8.1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xdebug8.1/template b/srcpkgs/xdebug8.1/template
index 31e615b5ccb5b..d8d13c0349040 100644
--- a/srcpkgs/xdebug8.1/template
+++ b/srcpkgs/xdebug8.1/template
@@ -1,6 +1,6 @@
# Template file for 'xdebug8.1'
pkgname=xdebug8.1
-version=3.2.1
+version=3.2.2
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
@@ -12,7 +12,7 @@ license="PHP-3.0"
homepage="http://xdebug.org"
changelog="https://xdebug.org/updates"
distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
-checksum=ef4cb3c228192798874e4530cccceee76840cc80821909740088a1e1a8f00445
+checksum=f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157
pre_configure() {
phpize8.1
From 493bb84431d4e4d4fab872fc2cf49772aae66e2f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:41 -0400
Subject: [PATCH 4/7] xdebug8.2: update to 3.2.2.
---
srcpkgs/xdebug8.2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xdebug8.2/template b/srcpkgs/xdebug8.2/template
index c8c480b0317a6..94d61346db1eb 100644
--- a/srcpkgs/xdebug8.2/template
+++ b/srcpkgs/xdebug8.2/template
@@ -1,6 +1,6 @@
# Template file for 'xdebug8.2'
pkgname=xdebug8.2
-version=3.2.1
+version=3.2.2
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.2"
@@ -12,7 +12,7 @@ license="PHP-3.0"
homepage="http://xdebug.org"
changelog="https://xdebug.org/updates"
distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
-checksum=ef4cb3c228192798874e4530cccceee76840cc80821909740088a1e1a8f00445
+checksum=f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157
pre_configure() {
phpize8.2
From dd98a812dec68f8cd27c891e820b9c7f9d91c5ca Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:50 -0400
Subject: [PATCH 5/7] phpMyAdmin: update to 5.2.1, depend on php-runtime
virtual package.
---
srcpkgs/phpMyAdmin/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/phpMyAdmin/template b/srcpkgs/phpMyAdmin/template
index 7f0b5f024df54..dc9f179f89451 100644
--- a/srcpkgs/phpMyAdmin/template
+++ b/srcpkgs/phpMyAdmin/template
@@ -1,15 +1,15 @@
# Template file for 'phpMyAdmin'
pkgname=phpMyAdmin
-version=5.2.0
-revision=2
+version=5.2.1
+revision=1
conf_files="/etc/webapps/phpMyAdmin/config.inc.php"
-depends="php8.1 mariadb"
+depends="virtual?php-runtime"
short_desc="Web interface for MySQL and MariaDB"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="GPL-2.0-only"
homepage="https://www.phpmyadmin.net"
distfiles="https://files.phpmyadmin.net/phpMyAdmin/${version}/phpMyAdmin-${version}-all-languages.tar.xz"
-checksum=66da31ca295f06182ac3f2e6e96057dc824c459baedf4b29de6ed0d3be039230
+checksum=373f9599dfbd96d6fe75316d5dad189e68c305f297edf42377db9dd6b41b2557
do_install() {
vmkdir usr/share/webapps/
From 463ae8968c810e3a75555328030067ac12cb652e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:55 -0400
Subject: [PATCH 6/7] phoronix-test-suite: depend on php-runtime virtual
package.
---
srcpkgs/phoronix-test-suite/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/phoronix-test-suite/template b/srcpkgs/phoronix-test-suite/template
index 16b4034bec27b..341d406258426 100644
--- a/srcpkgs/phoronix-test-suite/template
+++ b/srcpkgs/phoronix-test-suite/template
@@ -1,8 +1,8 @@
# Template file for 'phoronix-test-suite'
pkgname=phoronix-test-suite
version=10.8.4
-revision=2
-depends="php8.1"
+revision=3
+depends="virtual?php-runtime"
short_desc="Comprehensive testing and benchmarking platform for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
From 56994993ea196c5ab77fae78e218f5be67a452d2 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:59 -0400
Subject: [PATCH 7/7] ampache: update to 5.6.2, depend on php-runtime virtual
package.
---
srcpkgs/ampache/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ampache/template b/srcpkgs/ampache/template
index d820e758f355e..2587dc4ec6adf 100644
--- a/srcpkgs/ampache/template
+++ b/srcpkgs/ampache/template
@@ -1,16 +1,16 @@
# Template file for 'ampache'
pkgname=ampache
-version=5.5.1
+version=5.6.2
revision=1
create_wrksrc=yes
hostmakedepends="unzip"
-depends="php8.1 mariadb"
+depends="virtual?php-runtime"
short_desc="Web-based tool for managing your audio/video files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="AGPL-3.0-or-later"
homepage="https://ampache.org"
distfiles="https://github.com/ampache/ampache/releases/download/${version}/${pkgname}-${version}_all.zip"
-checksum=3e37839058c263be990915759eecab9b5da3ec324638a7ff7d8094516f56a85c
+checksum=e406ff9de1537c3854ed9fad2ffdf854e193908617f8f409fa5de9036fed0927
python_version=3
do_install() {
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] PHP updates and virtual package support
2023-08-08 14:33 [PR PATCH] PHP updates and virtual package support TinfoilSubmarine
` (5 preceding siblings ...)
2023-09-27 15:01 ` TinfoilSubmarine
@ 2023-11-28 17:18 ` TinfoilSubmarine
2023-11-28 17:33 ` TinfoilSubmarine
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: TinfoilSubmarine @ 2023-11-28 17:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1424 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php-updates
https://github.com/void-linux/void-packages/pull/45493
PHP updates and virtual package support
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Supersedes https://github.com/void-linux/void-packages/pull/44946
I need some help testing this as I don't use ampache or phpMyAdmin.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-updates-45493.patch --]
[-- Type: text/x-diff, Size: 60353 bytes --]
From a3bf0441d0f556d2368ce05f13b2f4e565ac31f3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:32 -0400
Subject: [PATCH 01/20] php8.2: update to 8.2.13, provide php-runtime vpkg.
---
etc/defaults.virtual | 1 +
srcpkgs/php8.2/patches/php-cross-config.patch | 14 +++++++-------
srcpkgs/php8.2/template | 7 ++++---
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index 9af8895a8492c..9cd7c626f9a34 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -29,6 +29,7 @@ nodejs-runtime nodejs
ntp-daemon chrony
phonon-backend phonon-backend-gstreamer
phonon-qt5-backend phonon-qt5-backend-gstreamer
+php-runtime php8.2
pipewire-session-manager base-chroot-cyclic-solver
rkt-stage1 rkt-stage1-coreos
smtp-server opensmtpd
diff --git a/srcpkgs/php8.2/patches/php-cross-config.patch b/srcpkgs/php8.2/patches/php-cross-config.patch
index 169c43f1df932..50d2cbba245cd 100644
--- a/srcpkgs/php8.2/patches/php-cross-config.patch
+++ b/srcpkgs/php8.2/patches/php-cross-config.patch
@@ -1,22 +1,22 @@
diff --git a/configure b/configure
-index e4b82d1..1a8678f 100755
+index 3263d08..e5bdc2b 100755
--- a/configure
+++ b/configure
-@@ -62424,7 +62424,7 @@ printf %s "checking for pg_config... " >&6; }
+@@ -61090,7 +61090,7 @@ $as_echo_n "checking for pg_config... " >&6; }
fi
done
- if test -n "$PG_CONFIG"; then
+ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
- printf "%s\n" "$PG_CONFIG" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ $as_echo "$PG_CONFIG" >&6; }
PGSQL_INCLUDE=`$PG_CONFIG --includedir`
-@@ -63948,7 +63948,7 @@ printf %s "checking for pg_config... " >&6; }
+@@ -62616,7 +62616,7 @@ $as_echo_n "checking for pg_config... " >&6; }
fi
done
- if test -n "$PG_CONFIG"; then
+ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
- printf "%s\n" "$PG_CONFIG" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ $as_echo "$PG_CONFIG" >&6; }
PGSQL_INCLUDE=`$PG_CONFIG --includedir`
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index add04b4d3d562..e7fb74102db49 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
-version=8.2.8
-revision=3
+version=8.2.13
+revision=1
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -17,7 +17,8 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
# this is the source where the www.php.net code pulls the tarballs it serves
# at https://www.php.net/distributions/
distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=6419b74e9b675c8d5a1afd2788c4d7996a19bbe2be409716ccb2067897af9df1
+checksum=6a194038f5a9e46d8f70a9d59c072c3b08d6edbdd8e304096e24ccf2225bcf1b
+provides="php-runtime-${version}_1"
conf_files="/etc/php${_php_version}/php.ini"
From e4f5055c3f7510c0547e440f628eacd5106ede48 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:29 -0400
Subject: [PATCH 02/20] php8.1: update to 8.1.26, provide php-runtime vpkg.
---
srcpkgs/php8.1/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 9e4cbfef1d4b9..2894f2bddbc3e 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1'
pkgname=php8.1
-version=8.1.21
-revision=3
+version=8.1.26
+revision=1
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -17,7 +17,8 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
# this is the source where the www.php.net code pulls the tarballs it serves
# at https://www.php.net/distributions/
distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=a95f8d35924aa5705ad07a70dc994bf41b5d45126ecdec7aaad6edfbe5e1c37f
+checksum=d954cecfc3d294c2fccbe2b1a6bef784ce0d6c5d44a9e28f8a527e092825f2cb
+provides="php-runtime-${version}_1"
conf_files="/etc/php${_php_version}/php.ini"
From 98c1424841eac993d4a73d299a74fe169582969c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:07 -0500
Subject: [PATCH 03/20] php8.1-apcu: update to 5.1.23.
---
srcpkgs/php8.1-apcu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.1-apcu/template b/srcpkgs/php8.1-apcu/template
index 421ae51b09c89..9c9b8a72be969 100644
--- a/srcpkgs/php8.1-apcu/template
+++ b/srcpkgs/php8.1-apcu/template
@@ -1,6 +1,6 @@
# Template file for 'php8.1-apcu'
pkgname=php8.1-apcu
-version=5.1.22
+version=5.1.23
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="PHP-3.01"
homepage="https://pecl.php.net/package/APCu"
distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
-checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
+checksum=67ee7464ccad2335c3fa4aeb0b8edbcf6d8344feea7922620c6a13015d604482
pre_configure() {
phpize8.1
From 8ef2664a57caaf616a41c65854463590d824093a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:24 -0500
Subject: [PATCH 04/20] php8.1-ast: update to 1.1.1.
---
srcpkgs/php8.1-ast/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.1-ast/template b/srcpkgs/php8.1-ast/template
index 119401d3316cf..b1306a30c210c 100644
--- a/srcpkgs/php8.1-ast/template
+++ b/srcpkgs/php8.1-ast/template
@@ -1,6 +1,6 @@
# Template file for 'php8.1-ast'
pkgname=php8.1-ast
-version=1.1.0
+version=1.1.1
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
@@ -14,7 +14,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="BSD-3-Clause"
homepage="https://github.com/nikic/php-ast"
distfiles="https://pecl.php.net/get/ast-${version}.tgz"
-checksum=ee3d4f67e24d82e4d340806a24052012e4954d223122949377665427443e6d13
+checksum=0c55e09a4da43b9cc1da72ecb4ae892941f73e157b73d46326bc6a5ed7fc44b1
make_check_pre="env NO_INTERACTION=1"
pre_configure() {
From 9fd30dab5beea62368b155d50b7e6e1978d1ee40 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:38 -0500
Subject: [PATCH 05/20] php8.1-mongodb: update to 1.17.0.
---
srcpkgs/php8.1-mongodb/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/php8.1-mongodb/template b/srcpkgs/php8.1-mongodb/template
index 5913b3e420393..a92d0a2a0fb85 100644
--- a/srcpkgs/php8.1-mongodb/template
+++ b/srcpkgs/php8.1-mongodb/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1-mongodb'
pkgname=php8.1-mongodb
-version=1.16.1
-revision=2
+version=1.17.0
+revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
hostmakedepends="php8.1-devel autoconf pkg-config"
@@ -13,7 +13,7 @@ license="Apache-2.0"
homepage="https://pecl.php.net/package/mongodb"
changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
-checksum=2c5b7c7ccf6ca26d25af8487f4028390f0a7dc49efb2eb360a65840e1d6f566e
+checksum=5e7db95103d73212ed0edf8887d92184baa5643476045cb899efbcf439847148
pre_configure() {
phpize8.1
From a11e356b741cc1c6b591d0969c121ac6faa3a80d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:39 -0400
Subject: [PATCH 06/20] xdebug8.1: update to 3.2.2.
---
srcpkgs/xdebug8.1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xdebug8.1/template b/srcpkgs/xdebug8.1/template
index 31e615b5ccb5b..d8d13c0349040 100644
--- a/srcpkgs/xdebug8.1/template
+++ b/srcpkgs/xdebug8.1/template
@@ -1,6 +1,6 @@
# Template file for 'xdebug8.1'
pkgname=xdebug8.1
-version=3.2.1
+version=3.2.2
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
@@ -12,7 +12,7 @@ license="PHP-3.0"
homepage="http://xdebug.org"
changelog="https://xdebug.org/updates"
distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
-checksum=ef4cb3c228192798874e4530cccceee76840cc80821909740088a1e1a8f00445
+checksum=f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157
pre_configure() {
phpize8.1
From 3eb389a0f88a80fdc6176917b3a569d46e9ece22 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:50 -0400
Subject: [PATCH 07/20] phpMyAdmin: update to 5.2.1, depend on php-runtime
virtual package.
---
srcpkgs/phpMyAdmin/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/phpMyAdmin/template b/srcpkgs/phpMyAdmin/template
index 7f0b5f024df54..dc9f179f89451 100644
--- a/srcpkgs/phpMyAdmin/template
+++ b/srcpkgs/phpMyAdmin/template
@@ -1,15 +1,15 @@
# Template file for 'phpMyAdmin'
pkgname=phpMyAdmin
-version=5.2.0
-revision=2
+version=5.2.1
+revision=1
conf_files="/etc/webapps/phpMyAdmin/config.inc.php"
-depends="php8.1 mariadb"
+depends="virtual?php-runtime"
short_desc="Web interface for MySQL and MariaDB"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="GPL-2.0-only"
homepage="https://www.phpmyadmin.net"
distfiles="https://files.phpmyadmin.net/phpMyAdmin/${version}/phpMyAdmin-${version}-all-languages.tar.xz"
-checksum=66da31ca295f06182ac3f2e6e96057dc824c459baedf4b29de6ed0d3be039230
+checksum=373f9599dfbd96d6fe75316d5dad189e68c305f297edf42377db9dd6b41b2557
do_install() {
vmkdir usr/share/webapps/
From cd4e63c62848c3e47d8e83ca24b27072d00b08d4 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:55 -0400
Subject: [PATCH 08/20] phoronix-test-suite: depend on php-runtime virtual
package.
---
srcpkgs/phoronix-test-suite/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/phoronix-test-suite/template b/srcpkgs/phoronix-test-suite/template
index 16b4034bec27b..341d406258426 100644
--- a/srcpkgs/phoronix-test-suite/template
+++ b/srcpkgs/phoronix-test-suite/template
@@ -1,8 +1,8 @@
# Template file for 'phoronix-test-suite'
pkgname=phoronix-test-suite
version=10.8.4
-revision=2
-depends="php8.1"
+revision=3
+depends="virtual?php-runtime"
short_desc="Comprehensive testing and benchmarking platform for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
From 44210579b8def389d6a1062eb15041a5d75ee841 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:59 -0400
Subject: [PATCH 09/20] ampache: update to 5.6.2, depend on php-runtime virtual
package.
---
srcpkgs/ampache/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ampache/template b/srcpkgs/ampache/template
index d820e758f355e..2587dc4ec6adf 100644
--- a/srcpkgs/ampache/template
+++ b/srcpkgs/ampache/template
@@ -1,16 +1,16 @@
# Template file for 'ampache'
pkgname=ampache
-version=5.5.1
+version=5.6.2
revision=1
create_wrksrc=yes
hostmakedepends="unzip"
-depends="php8.1 mariadb"
+depends="virtual?php-runtime"
short_desc="Web-based tool for managing your audio/video files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="AGPL-3.0-or-later"
homepage="https://ampache.org"
distfiles="https://github.com/ampache/ampache/releases/download/${version}/${pkgname}-${version}_all.zip"
-checksum=3e37839058c263be990915759eecab9b5da3ec324638a7ff7d8094516f56a85c
+checksum=e406ff9de1537c3854ed9fad2ffdf854e193908617f8f409fa5de9036fed0927
python_version=3
do_install() {
From b94927e1a283c0a9b7dcb9217169bdefff5007cd Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 11:42:27 -0500
Subject: [PATCH 10/20] php8.2: update to 8.2.13.
---
srcpkgs/php8.2/patches/php-cross-config.patch | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/php8.2/patches/php-cross-config.patch b/srcpkgs/php8.2/patches/php-cross-config.patch
index 50d2cbba245cd..fe5b631bf5ecc 100644
--- a/srcpkgs/php8.2/patches/php-cross-config.patch
+++ b/srcpkgs/php8.2/patches/php-cross-config.patch
@@ -1,22 +1,22 @@
diff --git a/configure b/configure
-index 3263d08..e5bdc2b 100755
+index 1f5489d..b6c4aef 100755
--- a/configure
+++ b/configure
-@@ -61090,7 +61090,7 @@ $as_echo_n "checking for pg_config... " >&6; }
+@@ -63653,7 +63653,7 @@ printf %s "checking for pg_config... " >&6; }
fi
done
- if test -n "$PG_CONFIG"; then
+ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
- $as_echo "$PG_CONFIG" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ printf "%s\n" "$PG_CONFIG" >&6; }
PGSQL_INCLUDE=`$PG_CONFIG --includedir`
-@@ -62616,7 +62616,7 @@ $as_echo_n "checking for pg_config... " >&6; }
+@@ -65177,7 +65177,7 @@ printf %s "checking for pg_config... " >&6; }
fi
done
- if test -n "$PG_CONFIG"; then
+ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
- $as_echo "$PG_CONFIG" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ printf "%s\n" "$PG_CONFIG" >&6; }
PGSQL_INCLUDE=`$PG_CONFIG --includedir`
From 9e04988cfa2a48512ff157e11998534b1fb3df38 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:11 -0500
Subject: [PATCH 11/20] php8.2-apcu: update to 5.1.23.
---
srcpkgs/php8.2-apcu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.2-apcu/template b/srcpkgs/php8.2-apcu/template
index 182d4cda02d54..9ea5841c94929 100644
--- a/srcpkgs/php8.2-apcu/template
+++ b/srcpkgs/php8.2-apcu/template
@@ -1,6 +1,6 @@
# Template file for 'php8.2-apcu'
pkgname=php8.2-apcu
-version=5.1.22
+version=5.1.23
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.2"
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="PHP-3.01"
homepage="https://pecl.php.net/package/APCu"
distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
-checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
+checksum=67ee7464ccad2335c3fa4aeb0b8edbcf6d8344feea7922620c6a13015d604482
pre_configure() {
phpize8.2
From 668cc1b5e7e8873bc1838de6618d1fa1fed0a84b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:27 -0500
Subject: [PATCH 12/20] php8.2-ast: update to 1.1.1.
---
srcpkgs/php8.2-ast/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.2-ast/template b/srcpkgs/php8.2-ast/template
index 2d61ff7665f82..fccc6bc98ad09 100644
--- a/srcpkgs/php8.2-ast/template
+++ b/srcpkgs/php8.2-ast/template
@@ -1,6 +1,6 @@
# Template file for 'php8.2-ast'
pkgname=php8.2-ast
-version=1.1.0
+version=1.1.1
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.2"
@@ -14,7 +14,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="BSD-3-Clause"
homepage="https://github.com/nikic/php-ast"
distfiles="https://pecl.php.net/get/ast-${version}.tgz"
-checksum=ee3d4f67e24d82e4d340806a24052012e4954d223122949377665427443e6d13
+checksum=0c55e09a4da43b9cc1da72ecb4ae892941f73e157b73d46326bc6a5ed7fc44b1
make_check_pre="env NO_INTERACTION=1"
pre_configure() {
From b510aa14a1a594d476ce487d6aca0390f1e63d1d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:43 -0500
Subject: [PATCH 13/20] php8.2-mongodb: update to 1.17.0.
---
srcpkgs/php8.2-mongodb/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/php8.2-mongodb/template b/srcpkgs/php8.2-mongodb/template
index 7278a83c1017a..7269686cd915a 100644
--- a/srcpkgs/php8.2-mongodb/template
+++ b/srcpkgs/php8.2-mongodb/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2-mongodb'
pkgname=php8.2-mongodb
-version=1.16.1
-revision=2
+version=1.17.0
+revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.2"
hostmakedepends="php8.2-devel autoconf pkg-config"
@@ -13,7 +13,7 @@ license="Apache-2.0"
homepage="https://pecl.php.net/package/mongodb"
changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
-checksum=2c5b7c7ccf6ca26d25af8487f4028390f0a7dc49efb2eb360a65840e1d6f566e
+checksum=5e7db95103d73212ed0edf8887d92184baa5643476045cb899efbcf439847148
pre_configure() {
phpize8.2
From 19cbbbb2b05b8580270bde28ad27e6169180dd80 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:41 -0400
Subject: [PATCH 14/20] xdebug8.2: update to 3.2.2.
---
srcpkgs/xdebug8.2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xdebug8.2/template b/srcpkgs/xdebug8.2/template
index c8c480b0317a6..94d61346db1eb 100644
--- a/srcpkgs/xdebug8.2/template
+++ b/srcpkgs/xdebug8.2/template
@@ -1,6 +1,6 @@
# Template file for 'xdebug8.2'
pkgname=xdebug8.2
-version=3.2.1
+version=3.2.2
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.2"
@@ -12,7 +12,7 @@ license="PHP-3.0"
homepage="http://xdebug.org"
changelog="https://xdebug.org/updates"
distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
-checksum=ef4cb3c228192798874e4530cccceee76840cc80821909740088a1e1a8f00445
+checksum=f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157
pre_configure() {
phpize8.2
From d54558c4e2b1603749bfc6789ec279798907169b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:01 -0500
Subject: [PATCH 15/20] New package: php8.3-8.3.0
- provide php-runtime vpkg
---
etc/defaults.virtual | 2 +-
srcpkgs/php8.3-apache | 1 +
srcpkgs/php8.3-cgi | 1 +
srcpkgs/php8.3-devel | 1 +
srcpkgs/php8.3-embed | 1 +
srcpkgs/php8.3-enchant | 1 +
srcpkgs/php8.3-ffi | 1 +
srcpkgs/php8.3-fpm | 1 +
srcpkgs/php8.3-gd | 1 +
srcpkgs/php8.3-intl | 1 +
srcpkgs/php8.3-ldap | 1 +
srcpkgs/php8.3-mysql | 1 +
srcpkgs/php8.3-odbc | 1 +
srcpkgs/php8.3-pear | 1 +
srcpkgs/php8.3-pgsql | 1 +
srcpkgs/php8.3-phpdbg | 1 +
srcpkgs/php8.3-snmp | 1 +
srcpkgs/php8.3-sodium | 1 +
srcpkgs/php8.3-sqlite | 1 +
srcpkgs/php8.3-tidy | 1 +
srcpkgs/php8.3-xsl | 1 +
srcpkgs/php8.3/files/apache.conf | 13 +
srcpkgs/php8.3/files/php-fpm8.3/run | 3 +
srcpkgs/php8.3/patches/fix-manpages.patch | 25 ++
srcpkgs/php8.3/patches/php-706-crypt.patch | 15 +
srcpkgs/php8.3/patches/php-cross-config.patch | 22 ++
srcpkgs/php8.3/patches/php-fpm.patch | 13 +
.../patches/php-ltmain-sysroot-support.patch | 39 ++
srcpkgs/php8.3/patches/php-pear-cross.patch | 23 ++
srcpkgs/php8.3/patches/php-phar-cross.patch | 29 ++
.../patches/php-phpize-sysroot-support.patch | 28 ++
srcpkgs/php8.3/patches/php.ini.patch | 24 ++
srcpkgs/php8.3/template | 367 ++++++++++++++++++
srcpkgs/php8.3/update | 3 +
34 files changed, 625 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/php8.3-apache
create mode 120000 srcpkgs/php8.3-cgi
create mode 120000 srcpkgs/php8.3-devel
create mode 120000 srcpkgs/php8.3-embed
create mode 120000 srcpkgs/php8.3-enchant
create mode 120000 srcpkgs/php8.3-ffi
create mode 120000 srcpkgs/php8.3-fpm
create mode 120000 srcpkgs/php8.3-gd
create mode 120000 srcpkgs/php8.3-intl
create mode 120000 srcpkgs/php8.3-ldap
create mode 120000 srcpkgs/php8.3-mysql
create mode 120000 srcpkgs/php8.3-odbc
create mode 120000 srcpkgs/php8.3-pear
create mode 120000 srcpkgs/php8.3-pgsql
create mode 120000 srcpkgs/php8.3-phpdbg
create mode 120000 srcpkgs/php8.3-snmp
create mode 120000 srcpkgs/php8.3-sodium
create mode 120000 srcpkgs/php8.3-sqlite
create mode 120000 srcpkgs/php8.3-tidy
create mode 120000 srcpkgs/php8.3-xsl
create mode 100644 srcpkgs/php8.3/files/apache.conf
create mode 100755 srcpkgs/php8.3/files/php-fpm8.3/run
create mode 100644 srcpkgs/php8.3/patches/fix-manpages.patch
create mode 100644 srcpkgs/php8.3/patches/php-706-crypt.patch
create mode 100644 srcpkgs/php8.3/patches/php-cross-config.patch
create mode 100644 srcpkgs/php8.3/patches/php-fpm.patch
create mode 100644 srcpkgs/php8.3/patches/php-ltmain-sysroot-support.patch
create mode 100644 srcpkgs/php8.3/patches/php-pear-cross.patch
create mode 100644 srcpkgs/php8.3/patches/php-phar-cross.patch
create mode 100644 srcpkgs/php8.3/patches/php-phpize-sysroot-support.patch
create mode 100644 srcpkgs/php8.3/patches/php.ini.patch
create mode 100644 srcpkgs/php8.3/template
create mode 100644 srcpkgs/php8.3/update
diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index 9cd7c626f9a34..4e6ace1856a93 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -29,7 +29,7 @@ nodejs-runtime nodejs
ntp-daemon chrony
phonon-backend phonon-backend-gstreamer
phonon-qt5-backend phonon-qt5-backend-gstreamer
-php-runtime php8.2
+php-runtime php8.3
pipewire-session-manager base-chroot-cyclic-solver
rkt-stage1 rkt-stage1-coreos
smtp-server opensmtpd
diff --git a/srcpkgs/php8.3-apache b/srcpkgs/php8.3-apache
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-apache
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-cgi b/srcpkgs/php8.3-cgi
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-cgi
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-devel b/srcpkgs/php8.3-devel
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-devel
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-embed b/srcpkgs/php8.3-embed
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-embed
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-enchant b/srcpkgs/php8.3-enchant
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-enchant
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-ffi b/srcpkgs/php8.3-ffi
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-ffi
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-fpm b/srcpkgs/php8.3-fpm
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-fpm
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-gd b/srcpkgs/php8.3-gd
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-gd
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-intl b/srcpkgs/php8.3-intl
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-intl
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-ldap b/srcpkgs/php8.3-ldap
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-ldap
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-mysql b/srcpkgs/php8.3-mysql
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-mysql
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-odbc b/srcpkgs/php8.3-odbc
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-odbc
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-pear b/srcpkgs/php8.3-pear
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-pear
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-pgsql b/srcpkgs/php8.3-pgsql
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-pgsql
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-phpdbg b/srcpkgs/php8.3-phpdbg
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-phpdbg
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-snmp b/srcpkgs/php8.3-snmp
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-snmp
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-sodium b/srcpkgs/php8.3-sodium
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-sodium
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-sqlite b/srcpkgs/php8.3-sqlite
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-sqlite
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-tidy b/srcpkgs/php8.3-tidy
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-tidy
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-xsl b/srcpkgs/php8.3-xsl
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-xsl
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3/files/apache.conf b/srcpkgs/php8.3/files/apache.conf
new file mode 100644
index 0000000000000..e22ea2014a152
--- /dev/null
+++ b/srcpkgs/php8.3/files/apache.conf
@@ -0,0 +1,13 @@
+# Required modules: dir_module, php8.3_module
+
+<IfModule dir_module>
+ <IfModule php8.3_module>
+ DirectoryIndex index.php index.html
+ <FilesMatch "\.php$">
+ SetHandler application/x-httpd-php
+ </FilesMatch>
+ <FilesMatch "\.phps$">
+ SetHandler application/x-httpd-php-source
+ </FilesMatch>
+ </IfModule>
+</IfModule>
diff --git a/srcpkgs/php8.3/files/php-fpm8.3/run b/srcpkgs/php8.3/files/php-fpm8.3/run
new file mode 100755
index 0000000000000..bcaa543ceafae
--- /dev/null
+++ b/srcpkgs/php8.3/files/php-fpm8.3/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec php-fpm8.3 --nodaemonize ${OPTS}
diff --git a/srcpkgs/php8.3/patches/fix-manpages.patch b/srcpkgs/php8.3/patches/fix-manpages.patch
new file mode 100644
index 0000000000000..7193bad72f90b
--- /dev/null
+++ b/srcpkgs/php8.3/patches/fix-manpages.patch
@@ -0,0 +1,25 @@
+This patch fixes .so links in man pages.
+It's needed because of the configure option -
+
+ --program-suffix=${_php_version}
+
+The changes made by this patch should be the same as the changes made by this
+block of code -
+
+ _regexp='^[[:space:]]*\.so[[:space:]]'
+ for file in $(grep -l -e "$_regexp" -R .); do
+ vsed -i "$file" -e "/$_regexp/"'s=^[[:space:]]*\.[^.]*=&'${_php_version}=
+ done
+
+Where _php_version is defined in the template file.
+
+--- a/ext/phar/phar.phar.1.in
++++ b/ext/phar/phar.phar.1.in
+@@ -1 +1 @@
+-.so man1/phar.1
++.so man1/phar8.2.1
+--- a/sapi/cgi/php-cgi.1.in
++++ b/sapi/cgi/php-cgi.1.in
+@@ -1 +1 @@
+-.so man1/php.1
++.so man1/php8.2.1
diff --git a/srcpkgs/php8.3/patches/php-706-crypt.patch b/srcpkgs/php8.3/patches/php-706-crypt.patch
new file mode 100644
index 0000000000000..254f1d2187c24
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-706-crypt.patch
@@ -0,0 +1,15 @@
+--- a/ext/standard/crypt.c 2016-04-28 14:13:00.000000000 -0400
++++ b/ext/standard/crypt.c 2016-04-28 21:45:24.340955313 -0400
+@@ -267,6 +267,12 @@
+ }
+ # elif defined(HAVE_CRYPT)
+ crypt_res = crypt(password, salt);
++ if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) {
++ return NULL;
++ } else {
++ result = zend_string_init(crypt_res, strlen(crypt_res), 0);
++ return result;
++ }
+ # else
+ # error No crypt() implementation
+ # endif
diff --git a/srcpkgs/php8.3/patches/php-cross-config.patch b/srcpkgs/php8.3/patches/php-cross-config.patch
new file mode 100644
index 0000000000000..141c3f0a0e66d
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-cross-config.patch
@@ -0,0 +1,22 @@
+diff --git a/configure b/configure
+index d317fd7..5560d75 100755
+--- a/configure
++++ b/configure
+@@ -60896,7 +60896,7 @@ $as_echo_n "checking for pg_config... " >&6; }
+ fi
+ done
+
+- if test -n "$PG_CONFIG"; then
++ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ $as_echo "$PG_CONFIG" >&6; }
+ PGSQL_INCLUDE=`$PG_CONFIG --includedir`
+@@ -62422,7 +62422,7 @@ $as_echo_n "checking for pg_config... " >&6; }
+ fi
+ done
+
+- if test -n "$PG_CONFIG"; then
++ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ $as_echo "$PG_CONFIG" >&6; }
+ PGSQL_INCLUDE=`$PG_CONFIG --includedir`
diff --git a/srcpkgs/php8.3/patches/php-fpm.patch b/srcpkgs/php8.3/patches/php-fpm.patch
new file mode 100644
index 0000000000000..5e55e179f8a4a
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-fpm.patch
@@ -0,0 +1,13 @@
+--- a/sapi/fpm/Makefile.frag 2017-04-15 23:58:56.965737425 +0200
++++ b/sapi/fpm/Makefile.frag 2017-04-16 00:00:57.814831649 +0200
+@@ -15,8 +15,8 @@ install-fpm: $(SAPI_FPM_PATH)
+ else \
+ echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \
+ $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
+- $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
+- $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
++ $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
++ $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \
+ fi
+
+ @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
diff --git a/srcpkgs/php8.3/patches/php-ltmain-sysroot-support.patch b/srcpkgs/php8.3/patches/php-ltmain-sysroot-support.patch
new file mode 100644
index 0000000000000..bbe0a514a9e8a
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-ltmain-sysroot-support.patch
@@ -0,0 +1,39 @@
+--- a/build/ltmain.sh 2021-09-09 15:19:14.822208365 +0200
++++ b/build/ltmain.sh 2021-09-09 15:47:55.397011151 +0200
+@@ -2375,6 +2375,13 @@ EOF
+ *) . ./$lib ;;
+ esac
+
++ newdependency_libs=
++ for deplib in $dependency_libs; do
++ deplib=$(echo "$deplib" | sed "s#^=\(.*\)#$(${CC} --print-sysroot)\1#")
++ newdependency_libs="$newdependency_libs $deplib"
++ done
++ dependency_libs=${newdependency_libs}
++
+ if test "$linkmode,$pass" = "lib,link" ||
+ test "$linkmode,$pass" = "prog,scan" ||
+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+@@ -5750,6 +5757,13 @@ fi\
+ case $host,$output,$installed,$module,$dlname in
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ esac
++
++ newdependency_libs=
++ for deplib in $dependency_libs; do
++ deplib=$(echo "$deplib" | sed "s#^$(${CC} --print-sysroot)#=#")
++ newdependency_libs="$newdependency_libs $deplib"
++ done
++
+ $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+@@ -5767,7 +5781,7 @@ library_names='$library_names'
+ old_library='$old_library'
+
+ # Libraries that this one depends upon.
+-dependency_libs='$dependency_libs'
++dependency_libs='$newdependency_libs'
+
+ # Version information for $libname.
+ current=$current
diff --git a/srcpkgs/php8.3/patches/php-pear-cross.patch b/srcpkgs/php8.3/patches/php-pear-cross.patch
new file mode 100644
index 0000000000000..f9191a50a0b58
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-pear-cross.patch
@@ -0,0 +1,23 @@
+--- a/pear/Makefile.frag 2020-03-17 11:40:21.000000000 +0100
++++ b/pear/Makefile.frag 2020-04-12 22:29:31.846943414 +0200
+@@ -8,9 +8,10 @@ FETCH = `which fetch 2>/dev/null`
+ PEAR_PREFIX = -dp a${program_prefix}
+ PEAR_SUFFIX = -ds a$(program_suffix)
+ PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
++PEAR_PHP ?= $(top_builddir)/sapi/cli/php
+
+ install-pear-installer: $(SAPI_CLI_PATH)
+- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
++ @$(PEAR_PHP) $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
+
+ install-pear:
+ @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/"
+@@ -23,7 +24,7 @@ install-pear:
+ elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
+ "$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \
+ else \
+- $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
++ $(PEAR_PHP) -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
+ fi \
+ fi \
+ fi
diff --git a/srcpkgs/php8.3/patches/php-phar-cross.patch b/srcpkgs/php8.3/patches/php-phar-cross.patch
new file mode 100644
index 0000000000000..1e4e627ec65b9
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-phar-cross.patch
@@ -0,0 +1,29 @@
+--- a/ext/phar/Makefile.frag 2020-04-13 12:18:23.998801926 +0200
++++ b/ext/phar/Makefile.frag 2020-04-13 12:20:58.031795293 +0200
+@@ -8,12 +8,14 @@ $(srcdir)/phar_path_check.c: $(srcdir)/p
+
+ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
+
++PHAR_PHP ?= $(top_builddir)/$(SAPI_CLI_PATH)
++PHAR_PHP_MODULES ?= $(top_builddir)/modules
+ PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0
+ PHP_PHARCMD_EXECUTABLE = ` \
+- if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
+- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
++ if test -x "$(PHAR_PHP)"; then \
++ $(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP) -n"; \
+ if test "x$(PHP_MODULES)" != "x"; then \
+- $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
++ $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(PHAR_PHP_MODULES)"; \
+ for i in bz2 zlib phar; do \
+ if test -f "$(top_builddir)/modules/$$i.la"; then \
+ . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
+@@ -21,7 +23,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
+ done; \
+ fi; \
+ else \
+- $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
++ $(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP)"; \
+ fi;`
+ PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
+
diff --git a/srcpkgs/php8.3/patches/php-phpize-sysroot-support.patch b/srcpkgs/php8.3/patches/php-phpize-sysroot-support.patch
new file mode 100644
index 0000000000000..76cff3f816641
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-phpize-sysroot-support.patch
@@ -0,0 +1,28 @@
+--- a/scripts/phpize.m4 2020-03-17 11:40:21.000000000 +0100
++++ b/scripts/phpize.m4 2020-04-15 12:27:36.400466387 +0200
+@@ -44,6 +44,12 @@ PHP_ARG_WITH([libdir],
+ [lib],
+ [no])
+
++PHP_ARG_WITH([sysroot],,
++ [AS_HELP_STRING([--with-sysroot=NAME],
++ [System sysroot])],
++ [no],
++ [no])
++
+ PHP_RUNPATH_SWITCH
+ PHP_SHLIB_SUFFIX_NAMES
+
+@@ -58,7 +64,11 @@ dnl For BC.
+ PHP_CONFIG=$PHP_PHP_CONFIG
+ prefix=`$PHP_CONFIG --prefix 2>/dev/null`
+ phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null`
+-INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
++if test "x$PHP_SYSROOT" = xno; then :
++ INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
++else
++ INCLUDES=`$PHP_CONFIG --includes 2>/dev/null | sed "s#-I#-I$PHP_SYSROOT#g"`
++fi
+ EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null`
+ PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`
+
diff --git a/srcpkgs/php8.3/patches/php.ini.patch b/srcpkgs/php8.3/patches/php.ini.patch
new file mode 100644
index 0000000000000..7277c8fe51722
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php.ini.patch
@@ -0,0 +1,24 @@
+diff --git a/php.ini-production b/php.ini-production
+index b39a960..68f14a6 100644
+--- a/php.ini-production
++++ b/php.ini-production
+@@ -737,7 +737,7 @@ default_charset = "UTF-8"
+ ;;;;;;;;;;;;;;;;;;;;;;;;;
+
+ ; UNIX: "/path1:/path2"
+-;include_path = ".:/php/includes"
++include_path = ".:/usr/share/pear8.2"
+ ;
+ ; Windows: "\path1;\path2"
+ ;include_path = ".;c:\php\includes"
+@@ -760,9 +760,7 @@ user_dir =
+
+ ; Directory in which the loadable extensions (modules) reside.
+ ; https://php.net/extension-dir
+-;extension_dir = "./"
+-; On windows:
+-;extension_dir = "ext"
++extension_dir = "/usr/lib/php8.2/modules/"
+
+ ; Directory where the temporary files should be placed.
+ ; Defaults to the system default (see sys_get_temp_dir)
diff --git a/srcpkgs/php8.3/template b/srcpkgs/php8.3/template
new file mode 100644
index 0000000000000..fd20d1458f9f6
--- /dev/null
+++ b/srcpkgs/php8.3/template
@@ -0,0 +1,367 @@
+# Template file for 'php8.3'
+pkgname=php8.3
+version=8.3.0
+revision=1
+_php_version=8.3
+hostmakedepends="bison pkg-config apache-devel"
+makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
+ gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
+ libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
+ postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
+ libffi-devel oniguruma-devel gd-devel"
+short_desc="HTML-embedded scripting language"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://www.php.net"
+changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
+# this is the source where the www.php.net code pulls the tarballs it serves
+# at https://www.php.net/distributions/
+distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
+checksum=557ae14650f1d1984d3213e3fcd8d93a5f11418b3f8026d3a2d5022251163951
+provides="php-runtime-${version}_1"
+
+conf_files="/etc/php${_php_version}/php.ini"
+
+lib32disabled=yes
+
+if [ -n "$CROSS_BUILD" ]; then
+ # phar and pear need php to build
+ hostmakedepends+=" php${_php_version}"
+ CFLAGS+=" -DHAVE_LIBDL
+ -DHAVE_DLOPEN
+ -DHAVE_DLSYM
+ -DHAVE_SHM_IPC
+ -DHAVE_SHM_MMAP_ANON
+ -DHAVE_SHM_MMAP_ZERO
+ -DHAVE_SHM_MMAP_POSIX
+ -DHAVE_SHM_MMAP_FILE"
+fi
+
+alternatives="
+ php:phar.phar:/usr/bin/phar${_php_version}.phar
+ php:php:/usr/bin/php${_php_version}
+ php:phar:/usr/bin/phar${_php_version}
+ php:phar.1:/usr/share/man/man1/phar${_php_version}.1
+ php:phar.phar.1:/usr/share/man/man1/phar${_php_version}.phar.1
+ php:php.1:/usr/share/man/man1/php${_php_version}.1"
+
+do_build() {
+ local _phpconfig="--srcdir=.. \
+ --config-cache \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc/php${_php_version} \
+ --localstatedir=/var \
+ --with-layout=GNU \
+ --with-config-file-path=/etc/php${_php_version} \
+ --with-config-file-scan-dir=/etc/php${_php_version}/conf.d \
+ --disable-rpath \
+ --mandir=/usr/share/man \
+ --libdir=/usr/lib/php${_php_version} \
+ --datarootdir=/usr/share/php${_php_version} \
+ --datadir=/usr/share/php${_php_version} \
+ --program-suffix=${_php_version} \
+ --includedir=/usr/include/php${_php_version} \
+ "
+
+ local _phpextensions="--enable-bcmath=shared \
+ --enable-calendar=shared \
+ --enable-exif=shared \
+ --enable-ftp=shared \
+ --enable-intl=shared \
+ --enable-mbstring \
+ --enable-opcache \
+ --enable-pcntl \
+ --enable-phar=shared \
+ --enable-posix=shared \
+ --enable-shmop=shared \
+ --enable-soap=shared \
+ --enable-sockets=shared \
+ --enable-sysvmsg=shared \
+ --enable-sysvsem=shared \
+ --enable-sysvshm=shared \
+ --enable-mysqlnd \
+ --enable-gd=shared \
+ --with-external-gd \
+ --with-ffi=shared \
+ --with-bz2=shared,$XBPS_CROSS_BASE/usr/ \
+ --with-curl=shared \
+ --with-db4=$XBPS_CROSS_BASE/usr \
+ --with-enchant=shared,$XBPS_CROSS_BASE/usr \
+ --with-gdbm=$XBPS_CROSS_BASE/usr \
+ --with-gettext=shared \
+ --with-gmp=shared \
+ --with-iconv=shared \
+ --with-ldap=shared,$XBPS_CROSS_BASE/usr \
+ --with-ldap-sasl \
+ --with-sodium=shared \
+ --with-mhash \
+ --with-mysql-sock=/run/mysqld/mysqld.sock \
+ --with-mysqli=shared,mysqlnd \
+ --with-openssl=shared \
+ --with-external-pcre \
+ --with-pear=/usr/share/pear${_php_version} \
+ --with-pdo-mysql=shared,mysqlnd \
+ --with-pdo-odbc=shared,unixODBC,$XBPS_CROSS_BASE/usr \
+ --with-pdo-pgsql=shared,$XBPS_CROSS_BASE/usr \
+ --with-pdo-sqlite=shared,$XBPS_CROSS_BASE/usr \
+ --with-pgsql=shared,$XBPS_CROSS_BASE/usr \
+ --with-readline=$XBPS_CROSS_BASE/usr \
+ --with-snmp=shared,$XBPS_CROSS_BASE/usr \
+ --with-sqlite3=shared,$XBPS_CROSS_BASE/usr \
+ --with-unixODBC=shared,$XBPS_CROSS_BASE/usr \
+ --with-xsl=shared,$XBPS_CROSS_BASE/usr \
+ --with-tidy=shared,$XBPS_CROSS_BASE/usr \
+ --with-zip=shared \
+ --with-zlib \
+ ${configure_args} \
+ "
+ if [ -n "$CROSS_BUILD" ]; then
+ local _make_env="PHAR_PHP=/usr/bin/php${_php_version} PHAR_PHP_MODULES=/usr/lib/php${_php_version}/modules"
+ fi
+
+ EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
+ export EXTENSION_DIR
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
+ export PEAR_INSTALLDIR
+ EXTRA_LIBS="-ldl"
+ export EXTRA_LIBS
+
+ # cgi,cli,embed,fcgi,fpm
+ mkdir -p build
+ cd build
+ ln -s ${wrksrc}/configure
+ ./configure ${_phpconfig} \
+ --host=${XBPS_CROSS_TRIPLET} \
+ --enable-cgi \
+ --enable-fpm \
+ --with-fpm-user=http \
+ --with-fpm-group=http \
+ --enable-embed=shared \
+ ${_phpextensions}
+ make ${makejobs} ${_make_env}
+
+ # apache
+ # reuse the previous run; this will save us a lot of time
+ cp -a ${wrksrc}/build ${wrksrc}/build-apache
+ cd ${wrksrc}/build-apache
+ ./configure ${_phpconfig} \
+ --host=${XBPS_CROSS_TRIPLET} \
+ --with-apxs2 \
+ ${_phpextensions}
+ make ${makejobs} ${_make_env}
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ local _env="INSTALL_ROOT=${DESTDIR}"
+ if [ -n "$CROSS_BUILD" ]; then
+ _env+=" PHAR_PHP=/usr/bin/php${_php_version}"
+ fi
+ make ${_env} install-{modules,cli,build,headers,programs,pharcmd}
+
+ # install php.ini
+ vinstall ${wrksrc}/php.ini-production 644 "etc/php${_php_version}" php.ini
+ # remove static modules
+ rm -f "${DESTDIR}/usr/lib/php${_php_version}/modules/*.a"
+}
+
+php8.3-devel_package() {
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/php${_php_version}/build"
+ vmove "usr/bin/php-config${_php_version}"
+ vmove "usr/bin/phpize${_php_version}"
+ vmove "usr/share/man/man1/phpize${_php_version}.1"
+ vmove "usr/share/man/man1/php-config${_php_version}.1"
+ }
+}
+
+php8.3-phpdbg_package() {
+ short_desc+=" - interactive debugger"
+ depends="php${_php_version}>=${version}_${revision}"
+ pkg_install() {
+ cd ${wrksrc}/build
+ make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg
+ }
+}
+
+php8.3-cgi_package() {
+ short_desc+=' - CGI and FCGI SAPI'
+ depends="php${_php_version}>=${version}_${revision}"
+ pkg_install() {
+ cd ${wrksrc}/build
+ make INSTALL_ROOT=${PKGDESTDIR} install-cgi
+ }
+}
+
+php8.3-apache_package() {
+ short_desc+=' - Apache SAPI'
+ depends="php${_php_version}>=${version}_${revision}"
+ conf_files="/etc/apache/extra/php${_php_version}_module.conf"
+ pkg_install() {
+ vinstall ${wrksrc}/build-apache/libs/libphp.so 755 usr/libexec/httpd/modules "libphp${_php_version}.so"
+ vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra "php${_php_version}_module.conf"
+ }
+}
+
+php8.3-fpm_package() {
+ short_desc+=' - FastCGI Process Manager'
+ depends="php${_php_version}>=${version}_${revision}"
+ conf_files="/etc/php${_php_version}/php-fpm.conf /etc/php${_php_version}/php-fpm.d/*"
+ pkg_install() {
+ cd ${wrksrc}/build
+ make INSTALL_ROOT=${PKGDESTDIR} install-fpm
+ vsv "php-fpm${_php_version}"
+ }
+}
+
+php8.3-embed_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - Embed SAPI'
+ pkg_install() {
+ cd ${wrksrc}/build
+ make INSTALL_ROOT=${PKGDESTDIR} PHP_SAPI=embed install-sapi
+ mv ${PKGDESTDIR}/usr/lib/libphp.so ${PKGDESTDIR}/usr/lib/libphp${_php_version}.so
+ }
+}
+
+php8.3-pear_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}
+ php${_php_version}>=devel-${version}_${revision} autoconf"
+ short_desc+=' - PHP Extension and Application Repository'
+ conf_files="/etc/php${_php_version}/pear.conf"
+ pkg_install() {
+ cd ${wrksrc}/build
+ local _env="INSTALL_ROOT=${PKGDESTDIR} PHP_PEAR_PHP_BIN=php${_php_version}"
+ if [ -n "$CROSS_BUILD" ]; then
+ _env+=" PEAR_PHP=/usr/bin/php${_php_version}"
+ fi
+ make install-pear ${_env}
+ rm -rf ${PKGDESTDIR}/.{channels,depdb,depdblock,filemap,lock,registry}
+ rm -rf ${PKGDESTDIR}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
+ mv ${PKGDESTDIR}/usr/bin/pear{,${_php_version}}
+ mv ${PKGDESTDIR}/usr/bin/peardev{,${_php_version}}
+ mv ${PKGDESTDIR}/usr/bin/pecl{,${_php_version}}
+ }
+}
+
+php8.3-enchant_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - enchant module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/enchant.so"
+ }
+}
+
+php8.3-gd_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - gd module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/gd.so"
+ }
+}
+
+php8.3-intl_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - Internationalization module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/intl.so"
+ }
+}
+
+php8.3-ldap_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - LDAP module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/ldap.so"
+ }
+}
+
+php8.3-mysql_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - MySQL modules'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/*mysql*.so"
+ }
+}
+
+php8.3-odbc_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - ODBC modules'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/*odbc.so"
+ }
+}
+
+php8.3-pgsql_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - PostgreSQL modules'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/*pgsql.so"
+ }
+}
+
+php8.3-snmp_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - snmp module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/snmp.so"
+ }
+}
+
+php8.3-sqlite_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - sqlite module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/*sqlite*.so"
+ }
+}
+
+php8.3-tidy_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - tidy HTML module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/*tidy*.so"
+ }
+}
+
+php8.3-xsl_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - XSL module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/xsl.so"
+ }
+}
+
+php8.3-sodium_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - sodium module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/sodium.so"
+ }
+}
+
+php8.3-ffi_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - FFI module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/ffi.so"
+ }
+}
diff --git a/srcpkgs/php8.3/update b/srcpkgs/php8.3/update
new file mode 100644
index 0000000000000..82751690d96b5
--- /dev/null
+++ b/srcpkgs/php8.3/update
@@ -0,0 +1,3 @@
+pkgname=php
+ignore="8.[3-9].*"
+site="https://www.php.net/distributions/"
From ea34110427d93fb17f843e22bfa9471097c1ff9f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:14 -0500
Subject: [PATCH 16/20] New package: php8.3-apcu-5.1.23
---
srcpkgs/php8.3-apcu/files/README.voidlinux | 3 +++
srcpkgs/php8.3-apcu/template | 29 ++++++++++++++++++++++
srcpkgs/php8.3-apcu/update | 2 ++
3 files changed, 34 insertions(+)
create mode 100644 srcpkgs/php8.3-apcu/files/README.voidlinux
create mode 100644 srcpkgs/php8.3-apcu/template
create mode 100644 srcpkgs/php8.3-apcu/update
diff --git a/srcpkgs/php8.3-apcu/files/README.voidlinux b/srcpkgs/php8.3-apcu/files/README.voidlinux
new file mode 100644
index 0000000000000..9da8a70ccc2ba
--- /dev/null
+++ b/srcpkgs/php8.3-apcu/files/README.voidlinux
@@ -0,0 +1,3 @@
+To enable APCu add the following line to your php.ini:
+
+ extension=apcu.so
diff --git a/srcpkgs/php8.3-apcu/template b/srcpkgs/php8.3-apcu/template
new file mode 100644
index 0000000000000..3867ccf2bb405
--- /dev/null
+++ b/srcpkgs/php8.3-apcu/template
@@ -0,0 +1,29 @@
+# Template file for 'php8.3-apcu'
+pkgname=php8.3-apcu
+version=5.1.23
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.3"
+make_check_target=test
+hostmakedepends="autoconf php8.3-devel"
+makedepends="php8.3-devel pcre2-devel"
+depends="php8.3"
+short_desc="In-memory key-value store for PHP"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://pecl.php.net/package/APCu"
+distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
+checksum=67ee7464ccad2335c3fa4aeb0b8edbcf6d8344feea7922620c6a13015d604482
+
+pre_configure() {
+ phpize8.3
+}
+
+pre_install() {
+ make_install_args="INSTALL_ROOT=$DESTDIR"
+}
+
+post_install() {
+ rm -r $DESTDIR/usr/include
+ vdoc "${FILESDIR}/README.voidlinux"
+}
diff --git a/srcpkgs/php8.3-apcu/update b/srcpkgs/php8.3-apcu/update
new file mode 100644
index 0000000000000..ad899519e3138
--- /dev/null
+++ b/srcpkgs/php8.3-apcu/update
@@ -0,0 +1,2 @@
+site="https://pecl.php.net/package/APCu"
+pattern="apcu-\K[\d\.]*(?=\.tgz)"
From 29b14e19ebb34977f455ca8b44ee5330cd77fae5 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:33 -0500
Subject: [PATCH 17/20] New package: php8.3-ast-1.1.1
---
srcpkgs/php8.3-ast/files/README.voidlinux | 2 ++
srcpkgs/php8.3-ast/template | 28 +++++++++++++++++++++++
2 files changed, 30 insertions(+)
create mode 100644 srcpkgs/php8.3-ast/files/README.voidlinux
create mode 100644 srcpkgs/php8.3-ast/template
diff --git a/srcpkgs/php8.3-ast/files/README.voidlinux b/srcpkgs/php8.3-ast/files/README.voidlinux
new file mode 100644
index 0000000000000..0dd0b5df2d961
--- /dev/null
+++ b/srcpkgs/php8.3-ast/files/README.voidlinux
@@ -0,0 +1,2 @@
+To enable the ast extension please add the following to php.ini:
+ extension=ast.so
diff --git a/srcpkgs/php8.3-ast/template b/srcpkgs/php8.3-ast/template
new file mode 100644
index 0000000000000..c2764714bb268
--- /dev/null
+++ b/srcpkgs/php8.3-ast/template
@@ -0,0 +1,28 @@
+# Template file for 'php8.3-ast'
+pkgname=php8.3-ast
+version=1.1.1
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.3"
+make_check_target="test"
+hostmakedepends="php8.3-devel autoconf"
+makedepends="php8.3-devel"
+depends="php8.3"
+checkdepends="${depends}"
+short_desc="Exposes the abstract syntax tree generated by PHP"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/nikic/php-ast"
+distfiles="https://pecl.php.net/get/ast-${version}.tgz"
+checksum=0c55e09a4da43b9cc1da72ecb4ae892941f73e157b73d46326bc6a5ed7fc44b1
+make_check_pre="env NO_INTERACTION=1"
+
+pre_configure() {
+ phpize8.3
+}
+
+do_install() {
+ make INSTALL_ROOT=${DESTDIR} install
+ vlicense LICENSE
+ vdoc "${FILESDIR}/README.voidlinux"
+}
From f74f975ccf6425b6a0f0ffbad7adf4412c5deb1e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:46 -0500
Subject: [PATCH 18/20] New package: php8.3-mongodb-1.17.0
---
srcpkgs/php8.3-mongodb/INSTALL.msg | 3 +++
srcpkgs/php8.3-mongodb/template | 24 ++++++++++++++++++++++++
srcpkgs/php8.3-mongodb/update | 1 +
3 files changed, 28 insertions(+)
create mode 100644 srcpkgs/php8.3-mongodb/INSTALL.msg
create mode 100644 srcpkgs/php8.3-mongodb/template
create mode 100644 srcpkgs/php8.3-mongodb/update
diff --git a/srcpkgs/php8.3-mongodb/INSTALL.msg b/srcpkgs/php8.3-mongodb/INSTALL.msg
new file mode 100644
index 0000000000000..173fab80af8df
--- /dev/null
+++ b/srcpkgs/php8.3-mongodb/INSTALL.msg
@@ -0,0 +1,3 @@
+To enable the MongoDB extension add the following line to your php.ini:
+
+ extension=mongodb
diff --git a/srcpkgs/php8.3-mongodb/template b/srcpkgs/php8.3-mongodb/template
new file mode 100644
index 0000000000000..b26ed2b328602
--- /dev/null
+++ b/srcpkgs/php8.3-mongodb/template
@@ -0,0 +1,24 @@
+# Template file for 'php8.3-mongodb'
+pkgname=php8.3-mongodb
+version=1.17.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.3"
+hostmakedepends="php8.3-devel autoconf pkg-config"
+makedepends="php8.3-devel pcre2-devel openssl-devel"
+depends="php8.3"
+short_desc="Official MongoDB PHP driver"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://pecl.php.net/package/mongodb"
+changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
+distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
+checksum=5e7db95103d73212ed0edf8887d92184baa5643476045cb899efbcf439847148
+
+pre_configure() {
+ phpize8.3
+}
+
+pre_install() {
+ make_install_args="INSTALL_ROOT=$DESTDIR"
+}
diff --git a/srcpkgs/php8.3-mongodb/update b/srcpkgs/php8.3-mongodb/update
new file mode 100644
index 0000000000000..fb47044a964d5
--- /dev/null
+++ b/srcpkgs/php8.3-mongodb/update
@@ -0,0 +1 @@
+pattern='<th.*Release \K[\d.]+(?=:</th>)'
From ede1beda8ae7d53a101bd21f4ee7996900215653 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:52 -0500
Subject: [PATCH 19/20] New package: php8.3-igbinary-3.2.14
---
srcpkgs/php8.3-igbinary/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/php8.3-igbinary/template
diff --git a/srcpkgs/php8.3-igbinary/template b/srcpkgs/php8.3-igbinary/template
new file mode 100644
index 0000000000000..0604502c4c8d7
--- /dev/null
+++ b/srcpkgs/php8.3-igbinary/template
@@ -0,0 +1,24 @@
+# Template file for 'php8.3-igbinary'
+pkgname=php8.3-igbinary
+version=3.2.14
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.3"
+hostmakedepends="autoconf php8.3-devel"
+makedepends="php8.3-devel"
+depends="php8.3"
+short_desc="Igbinary is a drop in replacement for the standard php serializer"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/igbinary/igbinary/"
+distfiles="https://pecl.php.net/get/igbinary-${version}.tgz"
+checksum=6337147a4fb888072566674837bda9928ee06ee7f0114b4338b86c816232925d
+
+pre_configure() {
+ phpize8.3
+}
+
+do_install() {
+ make INSTALL_ROOT="${DESTDIR}" install
+ vlicense COPYING
+}
From edeb9a3b28c5d0d30052a1b50c87c3316e122212 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:55 -0500
Subject: [PATCH 20/20] New package: php8.3-imagick-3.7.0
---
srcpkgs/php8.3-imagick/files/README.voidlinux | 3 ++
...le-libmagick-header-file-search-path.patch | 17 +++++++++++
srcpkgs/php8.3-imagick/template | 29 +++++++++++++++++++
srcpkgs/php8.3-imagick/update | 1 +
4 files changed, 50 insertions(+)
create mode 100644 srcpkgs/php8.3-imagick/files/README.voidlinux
create mode 100644 srcpkgs/php8.3-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
create mode 100644 srcpkgs/php8.3-imagick/template
create mode 100644 srcpkgs/php8.3-imagick/update
diff --git a/srcpkgs/php8.3-imagick/files/README.voidlinux b/srcpkgs/php8.3-imagick/files/README.voidlinux
new file mode 100644
index 0000000000000..00497519fcee5
--- /dev/null
+++ b/srcpkgs/php8.3-imagick/files/README.voidlinux
@@ -0,0 +1,3 @@
+To enable the Imagick extension add the following line to your php.ini:
+
+ extension=imagick.so
diff --git a/srcpkgs/php8.3-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch b/srcpkgs/php8.3-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
new file mode 100644
index 0000000000000..16b8aaa573715
--- /dev/null
+++ b/srcpkgs/php8.3-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
@@ -0,0 +1,17 @@
+--- a/imagemagick.m4 2021-09-09 10:53:42.287881616 +0200
++++ b/imagemagick.m4 2021-09-09 11:14:47.662312430 +0200
+@@ -167,6 +167,14 @@ AC_DEFUN([IM_FIND_IMAGEMAGICK],[
+
+ AC_MSG_RESULT([user location ${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/wand/MagickWand.h])
+
++ elif test -r "${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
++
++ IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
++ IM_HEADER_STYLE="SEVEN"
++ AC_DEFINE([IM_MAGICKWAND_HEADER_STYLE_SEVEN], [1], [ImageMagick 7.x style header])
++
++ AC_MSG_RESULT([${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h])
++
+ elif test -r "${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
+
+ IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
diff --git a/srcpkgs/php8.3-imagick/template b/srcpkgs/php8.3-imagick/template
new file mode 100644
index 0000000000000..a2c8ab21a8fc6
--- /dev/null
+++ b/srcpkgs/php8.3-imagick/template
@@ -0,0 +1,29 @@
+# Template file for 'php8.3-imagick'
+pkgname=php8.3-imagick
+version=3.7.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
+ --with-php-config=/usr/bin/php-config8.3"
+hostmakedepends="php8.3-devel autoconf pkg-config"
+makedepends="php8.3-devel pcre2-devel libmagick-devel"
+depends="php8.3"
+short_desc="Provides a PHP wrapper to the ImageMagick library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://pecl.php.net/package/imagick"
+distfiles="https://pecl.php.net/get/imagick-$version.tgz"
+checksum=5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e
+
+pre_configure() {
+ phpize8.3
+}
+
+pre_install() {
+ make_install_args="INSTALL_ROOT=$DESTDIR"
+}
+
+post_install() {
+ rm -r $DESTDIR/usr/include
+ vdoc "${FILESDIR}/README.voidlinux"
+}
diff --git a/srcpkgs/php8.3-imagick/update b/srcpkgs/php8.3-imagick/update
new file mode 100644
index 0000000000000..fb47044a964d5
--- /dev/null
+++ b/srcpkgs/php8.3-imagick/update
@@ -0,0 +1 @@
+pattern='<th.*Release \K[\d.]+(?=:</th>)'
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] PHP updates and virtual package support
2023-08-08 14:33 [PR PATCH] PHP updates and virtual package support TinfoilSubmarine
` (6 preceding siblings ...)
2023-11-28 17:18 ` TinfoilSubmarine
@ 2023-11-28 17:33 ` TinfoilSubmarine
2023-11-28 18:35 ` TinfoilSubmarine
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: TinfoilSubmarine @ 2023-11-28 17:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1424 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php-updates
https://github.com/void-linux/void-packages/pull/45493
PHP updates and virtual package support
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Supersedes https://github.com/void-linux/void-packages/pull/44946
I need some help testing this as I don't use ampache or phpMyAdmin.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-updates-45493.patch --]
[-- Type: text/x-diff, Size: 59522 bytes --]
From ef306cfb32b93ad70da66774ab753a378c5cac06 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:01 -0500
Subject: [PATCH 01/20] New package: php8.3-8.3.0
- provide php-runtime vpkg
---
etc/defaults.virtual | 1 +
srcpkgs/php8.3-apache | 1 +
srcpkgs/php8.3-cgi | 1 +
srcpkgs/php8.3-devel | 1 +
srcpkgs/php8.3-embed | 1 +
srcpkgs/php8.3-enchant | 1 +
srcpkgs/php8.3-ffi | 1 +
srcpkgs/php8.3-fpm | 1 +
srcpkgs/php8.3-gd | 1 +
srcpkgs/php8.3-intl | 1 +
srcpkgs/php8.3-ldap | 1 +
srcpkgs/php8.3-mysql | 1 +
srcpkgs/php8.3-odbc | 1 +
srcpkgs/php8.3-pear | 1 +
srcpkgs/php8.3-pgsql | 1 +
srcpkgs/php8.3-phpdbg | 1 +
srcpkgs/php8.3-snmp | 1 +
srcpkgs/php8.3-sodium | 1 +
srcpkgs/php8.3-sqlite | 1 +
srcpkgs/php8.3-tidy | 1 +
srcpkgs/php8.3-xsl | 1 +
srcpkgs/php8.3/files/apache.conf | 13 +
srcpkgs/php8.3/files/php-fpm8.3/run | 3 +
srcpkgs/php8.3/patches/fix-manpages.patch | 25 ++
srcpkgs/php8.3/patches/php-706-crypt.patch | 15 +
srcpkgs/php8.3/patches/php-cross-config.patch | 22 ++
srcpkgs/php8.3/patches/php-fpm.patch | 13 +
.../patches/php-ltmain-sysroot-support.patch | 39 ++
srcpkgs/php8.3/patches/php-pear-cross.patch | 23 ++
srcpkgs/php8.3/patches/php-phar-cross.patch | 29 ++
.../patches/php-phpize-sysroot-support.patch | 28 ++
srcpkgs/php8.3/patches/php.ini.patch | 24 ++
srcpkgs/php8.3/template | 367 ++++++++++++++++++
srcpkgs/php8.3/update | 3 +
34 files changed, 625 insertions(+)
create mode 120000 srcpkgs/php8.3-apache
create mode 120000 srcpkgs/php8.3-cgi
create mode 120000 srcpkgs/php8.3-devel
create mode 120000 srcpkgs/php8.3-embed
create mode 120000 srcpkgs/php8.3-enchant
create mode 120000 srcpkgs/php8.3-ffi
create mode 120000 srcpkgs/php8.3-fpm
create mode 120000 srcpkgs/php8.3-gd
create mode 120000 srcpkgs/php8.3-intl
create mode 120000 srcpkgs/php8.3-ldap
create mode 120000 srcpkgs/php8.3-mysql
create mode 120000 srcpkgs/php8.3-odbc
create mode 120000 srcpkgs/php8.3-pear
create mode 120000 srcpkgs/php8.3-pgsql
create mode 120000 srcpkgs/php8.3-phpdbg
create mode 120000 srcpkgs/php8.3-snmp
create mode 120000 srcpkgs/php8.3-sodium
create mode 120000 srcpkgs/php8.3-sqlite
create mode 120000 srcpkgs/php8.3-tidy
create mode 120000 srcpkgs/php8.3-xsl
create mode 100644 srcpkgs/php8.3/files/apache.conf
create mode 100755 srcpkgs/php8.3/files/php-fpm8.3/run
create mode 100644 srcpkgs/php8.3/patches/fix-manpages.patch
create mode 100644 srcpkgs/php8.3/patches/php-706-crypt.patch
create mode 100644 srcpkgs/php8.3/patches/php-cross-config.patch
create mode 100644 srcpkgs/php8.3/patches/php-fpm.patch
create mode 100644 srcpkgs/php8.3/patches/php-ltmain-sysroot-support.patch
create mode 100644 srcpkgs/php8.3/patches/php-pear-cross.patch
create mode 100644 srcpkgs/php8.3/patches/php-phar-cross.patch
create mode 100644 srcpkgs/php8.3/patches/php-phpize-sysroot-support.patch
create mode 100644 srcpkgs/php8.3/patches/php.ini.patch
create mode 100644 srcpkgs/php8.3/template
create mode 100644 srcpkgs/php8.3/update
diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index 9af8895a8492c..4e6ace1856a93 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -29,6 +29,7 @@ nodejs-runtime nodejs
ntp-daemon chrony
phonon-backend phonon-backend-gstreamer
phonon-qt5-backend phonon-qt5-backend-gstreamer
+php-runtime php8.3
pipewire-session-manager base-chroot-cyclic-solver
rkt-stage1 rkt-stage1-coreos
smtp-server opensmtpd
diff --git a/srcpkgs/php8.3-apache b/srcpkgs/php8.3-apache
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-apache
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-cgi b/srcpkgs/php8.3-cgi
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-cgi
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-devel b/srcpkgs/php8.3-devel
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-devel
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-embed b/srcpkgs/php8.3-embed
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-embed
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-enchant b/srcpkgs/php8.3-enchant
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-enchant
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-ffi b/srcpkgs/php8.3-ffi
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-ffi
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-fpm b/srcpkgs/php8.3-fpm
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-fpm
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-gd b/srcpkgs/php8.3-gd
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-gd
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-intl b/srcpkgs/php8.3-intl
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-intl
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-ldap b/srcpkgs/php8.3-ldap
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-ldap
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-mysql b/srcpkgs/php8.3-mysql
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-mysql
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-odbc b/srcpkgs/php8.3-odbc
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-odbc
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-pear b/srcpkgs/php8.3-pear
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-pear
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-pgsql b/srcpkgs/php8.3-pgsql
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-pgsql
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-phpdbg b/srcpkgs/php8.3-phpdbg
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-phpdbg
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-snmp b/srcpkgs/php8.3-snmp
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-snmp
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-sodium b/srcpkgs/php8.3-sodium
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-sodium
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-sqlite b/srcpkgs/php8.3-sqlite
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-sqlite
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-tidy b/srcpkgs/php8.3-tidy
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-tidy
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-xsl b/srcpkgs/php8.3-xsl
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-xsl
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3/files/apache.conf b/srcpkgs/php8.3/files/apache.conf
new file mode 100644
index 0000000000000..e22ea2014a152
--- /dev/null
+++ b/srcpkgs/php8.3/files/apache.conf
@@ -0,0 +1,13 @@
+# Required modules: dir_module, php8.3_module
+
+<IfModule dir_module>
+ <IfModule php8.3_module>
+ DirectoryIndex index.php index.html
+ <FilesMatch "\.php$">
+ SetHandler application/x-httpd-php
+ </FilesMatch>
+ <FilesMatch "\.phps$">
+ SetHandler application/x-httpd-php-source
+ </FilesMatch>
+ </IfModule>
+</IfModule>
diff --git a/srcpkgs/php8.3/files/php-fpm8.3/run b/srcpkgs/php8.3/files/php-fpm8.3/run
new file mode 100755
index 0000000000000..bcaa543ceafae
--- /dev/null
+++ b/srcpkgs/php8.3/files/php-fpm8.3/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec php-fpm8.3 --nodaemonize ${OPTS}
diff --git a/srcpkgs/php8.3/patches/fix-manpages.patch b/srcpkgs/php8.3/patches/fix-manpages.patch
new file mode 100644
index 0000000000000..2a87691048772
--- /dev/null
+++ b/srcpkgs/php8.3/patches/fix-manpages.patch
@@ -0,0 +1,25 @@
+This patch fixes .so links in man pages.
+It's needed because of the configure option -
+
+ --program-suffix=${_php_version}
+
+The changes made by this patch should be the same as the changes made by this
+block of code -
+
+ _regexp='^[[:space:]]*\.so[[:space:]]'
+ for file in $(grep -l -e "$_regexp" -R .); do
+ vsed -i "$file" -e "/$_regexp/"'s=^[[:space:]]*\.[^.]*=&'${_php_version}=
+ done
+
+Where _php_version is defined in the template file.
+
+--- a/ext/phar/phar.phar.1.in
++++ b/ext/phar/phar.phar.1.in
+@@ -1 +1 @@
+-.so man1/phar.1
++.so man1/phar8.3.1
+--- a/sapi/cgi/php-cgi.1.in
++++ b/sapi/cgi/php-cgi.1.in
+@@ -1 +1 @@
+-.so man1/php.1
++.so man1/php8.3.1
diff --git a/srcpkgs/php8.3/patches/php-706-crypt.patch b/srcpkgs/php8.3/patches/php-706-crypt.patch
new file mode 100644
index 0000000000000..254f1d2187c24
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-706-crypt.patch
@@ -0,0 +1,15 @@
+--- a/ext/standard/crypt.c 2016-04-28 14:13:00.000000000 -0400
++++ b/ext/standard/crypt.c 2016-04-28 21:45:24.340955313 -0400
+@@ -267,6 +267,12 @@
+ }
+ # elif defined(HAVE_CRYPT)
+ crypt_res = crypt(password, salt);
++ if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) {
++ return NULL;
++ } else {
++ result = zend_string_init(crypt_res, strlen(crypt_res), 0);
++ return result;
++ }
+ # else
+ # error No crypt() implementation
+ # endif
diff --git a/srcpkgs/php8.3/patches/php-cross-config.patch b/srcpkgs/php8.3/patches/php-cross-config.patch
new file mode 100644
index 0000000000000..141c3f0a0e66d
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-cross-config.patch
@@ -0,0 +1,22 @@
+diff --git a/configure b/configure
+index d317fd7..5560d75 100755
+--- a/configure
++++ b/configure
+@@ -60896,7 +60896,7 @@ $as_echo_n "checking for pg_config... " >&6; }
+ fi
+ done
+
+- if test -n "$PG_CONFIG"; then
++ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ $as_echo "$PG_CONFIG" >&6; }
+ PGSQL_INCLUDE=`$PG_CONFIG --includedir`
+@@ -62422,7 +62422,7 @@ $as_echo_n "checking for pg_config... " >&6; }
+ fi
+ done
+
+- if test -n "$PG_CONFIG"; then
++ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ $as_echo "$PG_CONFIG" >&6; }
+ PGSQL_INCLUDE=`$PG_CONFIG --includedir`
diff --git a/srcpkgs/php8.3/patches/php-fpm.patch b/srcpkgs/php8.3/patches/php-fpm.patch
new file mode 100644
index 0000000000000..5e55e179f8a4a
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-fpm.patch
@@ -0,0 +1,13 @@
+--- a/sapi/fpm/Makefile.frag 2017-04-15 23:58:56.965737425 +0200
++++ b/sapi/fpm/Makefile.frag 2017-04-16 00:00:57.814831649 +0200
+@@ -15,8 +15,8 @@ install-fpm: $(SAPI_FPM_PATH)
+ else \
+ echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \
+ $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
+- $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
+- $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
++ $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
++ $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \
+ fi
+
+ @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
diff --git a/srcpkgs/php8.3/patches/php-ltmain-sysroot-support.patch b/srcpkgs/php8.3/patches/php-ltmain-sysroot-support.patch
new file mode 100644
index 0000000000000..bbe0a514a9e8a
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-ltmain-sysroot-support.patch
@@ -0,0 +1,39 @@
+--- a/build/ltmain.sh 2021-09-09 15:19:14.822208365 +0200
++++ b/build/ltmain.sh 2021-09-09 15:47:55.397011151 +0200
+@@ -2375,6 +2375,13 @@ EOF
+ *) . ./$lib ;;
+ esac
+
++ newdependency_libs=
++ for deplib in $dependency_libs; do
++ deplib=$(echo "$deplib" | sed "s#^=\(.*\)#$(${CC} --print-sysroot)\1#")
++ newdependency_libs="$newdependency_libs $deplib"
++ done
++ dependency_libs=${newdependency_libs}
++
+ if test "$linkmode,$pass" = "lib,link" ||
+ test "$linkmode,$pass" = "prog,scan" ||
+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+@@ -5750,6 +5757,13 @@ fi\
+ case $host,$output,$installed,$module,$dlname in
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ esac
++
++ newdependency_libs=
++ for deplib in $dependency_libs; do
++ deplib=$(echo "$deplib" | sed "s#^$(${CC} --print-sysroot)#=#")
++ newdependency_libs="$newdependency_libs $deplib"
++ done
++
+ $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+@@ -5767,7 +5781,7 @@ library_names='$library_names'
+ old_library='$old_library'
+
+ # Libraries that this one depends upon.
+-dependency_libs='$dependency_libs'
++dependency_libs='$newdependency_libs'
+
+ # Version information for $libname.
+ current=$current
diff --git a/srcpkgs/php8.3/patches/php-pear-cross.patch b/srcpkgs/php8.3/patches/php-pear-cross.patch
new file mode 100644
index 0000000000000..f9191a50a0b58
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-pear-cross.patch
@@ -0,0 +1,23 @@
+--- a/pear/Makefile.frag 2020-03-17 11:40:21.000000000 +0100
++++ b/pear/Makefile.frag 2020-04-12 22:29:31.846943414 +0200
+@@ -8,9 +8,10 @@ FETCH = `which fetch 2>/dev/null`
+ PEAR_PREFIX = -dp a${program_prefix}
+ PEAR_SUFFIX = -ds a$(program_suffix)
+ PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
++PEAR_PHP ?= $(top_builddir)/sapi/cli/php
+
+ install-pear-installer: $(SAPI_CLI_PATH)
+- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
++ @$(PEAR_PHP) $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
+
+ install-pear:
+ @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/"
+@@ -23,7 +24,7 @@ install-pear:
+ elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
+ "$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \
+ else \
+- $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
++ $(PEAR_PHP) -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
+ fi \
+ fi \
+ fi
diff --git a/srcpkgs/php8.3/patches/php-phar-cross.patch b/srcpkgs/php8.3/patches/php-phar-cross.patch
new file mode 100644
index 0000000000000..1e4e627ec65b9
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-phar-cross.patch
@@ -0,0 +1,29 @@
+--- a/ext/phar/Makefile.frag 2020-04-13 12:18:23.998801926 +0200
++++ b/ext/phar/Makefile.frag 2020-04-13 12:20:58.031795293 +0200
+@@ -8,12 +8,14 @@ $(srcdir)/phar_path_check.c: $(srcdir)/p
+
+ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
+
++PHAR_PHP ?= $(top_builddir)/$(SAPI_CLI_PATH)
++PHAR_PHP_MODULES ?= $(top_builddir)/modules
+ PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0
+ PHP_PHARCMD_EXECUTABLE = ` \
+- if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
+- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
++ if test -x "$(PHAR_PHP)"; then \
++ $(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP) -n"; \
+ if test "x$(PHP_MODULES)" != "x"; then \
+- $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
++ $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(PHAR_PHP_MODULES)"; \
+ for i in bz2 zlib phar; do \
+ if test -f "$(top_builddir)/modules/$$i.la"; then \
+ . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
+@@ -21,7 +23,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
+ done; \
+ fi; \
+ else \
+- $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
++ $(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP)"; \
+ fi;`
+ PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
+
diff --git a/srcpkgs/php8.3/patches/php-phpize-sysroot-support.patch b/srcpkgs/php8.3/patches/php-phpize-sysroot-support.patch
new file mode 100644
index 0000000000000..76cff3f816641
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-phpize-sysroot-support.patch
@@ -0,0 +1,28 @@
+--- a/scripts/phpize.m4 2020-03-17 11:40:21.000000000 +0100
++++ b/scripts/phpize.m4 2020-04-15 12:27:36.400466387 +0200
+@@ -44,6 +44,12 @@ PHP_ARG_WITH([libdir],
+ [lib],
+ [no])
+
++PHP_ARG_WITH([sysroot],,
++ [AS_HELP_STRING([--with-sysroot=NAME],
++ [System sysroot])],
++ [no],
++ [no])
++
+ PHP_RUNPATH_SWITCH
+ PHP_SHLIB_SUFFIX_NAMES
+
+@@ -58,7 +64,11 @@ dnl For BC.
+ PHP_CONFIG=$PHP_PHP_CONFIG
+ prefix=`$PHP_CONFIG --prefix 2>/dev/null`
+ phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null`
+-INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
++if test "x$PHP_SYSROOT" = xno; then :
++ INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
++else
++ INCLUDES=`$PHP_CONFIG --includes 2>/dev/null | sed "s#-I#-I$PHP_SYSROOT#g"`
++fi
+ EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null`
+ PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`
+
diff --git a/srcpkgs/php8.3/patches/php.ini.patch b/srcpkgs/php8.3/patches/php.ini.patch
new file mode 100644
index 0000000000000..9e8ae4e15a7b8
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php.ini.patch
@@ -0,0 +1,24 @@
+diff --git a/php.ini-production b/php.ini-production
+index b39a960..68f14a6 100644
+--- a/php.ini-production
++++ b/php.ini-production
+@@ -737,7 +737,7 @@ default_charset = "UTF-8"
+ ;;;;;;;;;;;;;;;;;;;;;;;;;
+
+ ; UNIX: "/path1:/path2"
+-;include_path = ".:/php/includes"
++include_path = ".:/usr/share/pear8.3"
+ ;
+ ; Windows: "\path1;\path2"
+ ;include_path = ".;c:\php\includes"
+@@ -760,9 +760,7 @@ user_dir =
+
+ ; Directory in which the loadable extensions (modules) reside.
+ ; https://php.net/extension-dir
+-;extension_dir = "./"
+-; On windows:
+-;extension_dir = "ext"
++extension_dir = "/usr/lib/php8.3/modules/"
+
+ ; Directory where the temporary files should be placed.
+ ; Defaults to the system default (see sys_get_temp_dir)
diff --git a/srcpkgs/php8.3/template b/srcpkgs/php8.3/template
new file mode 100644
index 0000000000000..fd20d1458f9f6
--- /dev/null
+++ b/srcpkgs/php8.3/template
@@ -0,0 +1,367 @@
+# Template file for 'php8.3'
+pkgname=php8.3
+version=8.3.0
+revision=1
+_php_version=8.3
+hostmakedepends="bison pkg-config apache-devel"
+makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
+ gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
+ libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
+ postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
+ libffi-devel oniguruma-devel gd-devel"
+short_desc="HTML-embedded scripting language"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://www.php.net"
+changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
+# this is the source where the www.php.net code pulls the tarballs it serves
+# at https://www.php.net/distributions/
+distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
+checksum=557ae14650f1d1984d3213e3fcd8d93a5f11418b3f8026d3a2d5022251163951
+provides="php-runtime-${version}_1"
+
+conf_files="/etc/php${_php_version}/php.ini"
+
+lib32disabled=yes
+
+if [ -n "$CROSS_BUILD" ]; then
+ # phar and pear need php to build
+ hostmakedepends+=" php${_php_version}"
+ CFLAGS+=" -DHAVE_LIBDL
+ -DHAVE_DLOPEN
+ -DHAVE_DLSYM
+ -DHAVE_SHM_IPC
+ -DHAVE_SHM_MMAP_ANON
+ -DHAVE_SHM_MMAP_ZERO
+ -DHAVE_SHM_MMAP_POSIX
+ -DHAVE_SHM_MMAP_FILE"
+fi
+
+alternatives="
+ php:phar.phar:/usr/bin/phar${_php_version}.phar
+ php:php:/usr/bin/php${_php_version}
+ php:phar:/usr/bin/phar${_php_version}
+ php:phar.1:/usr/share/man/man1/phar${_php_version}.1
+ php:phar.phar.1:/usr/share/man/man1/phar${_php_version}.phar.1
+ php:php.1:/usr/share/man/man1/php${_php_version}.1"
+
+do_build() {
+ local _phpconfig="--srcdir=.. \
+ --config-cache \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc/php${_php_version} \
+ --localstatedir=/var \
+ --with-layout=GNU \
+ --with-config-file-path=/etc/php${_php_version} \
+ --with-config-file-scan-dir=/etc/php${_php_version}/conf.d \
+ --disable-rpath \
+ --mandir=/usr/share/man \
+ --libdir=/usr/lib/php${_php_version} \
+ --datarootdir=/usr/share/php${_php_version} \
+ --datadir=/usr/share/php${_php_version} \
+ --program-suffix=${_php_version} \
+ --includedir=/usr/include/php${_php_version} \
+ "
+
+ local _phpextensions="--enable-bcmath=shared \
+ --enable-calendar=shared \
+ --enable-exif=shared \
+ --enable-ftp=shared \
+ --enable-intl=shared \
+ --enable-mbstring \
+ --enable-opcache \
+ --enable-pcntl \
+ --enable-phar=shared \
+ --enable-posix=shared \
+ --enable-shmop=shared \
+ --enable-soap=shared \
+ --enable-sockets=shared \
+ --enable-sysvmsg=shared \
+ --enable-sysvsem=shared \
+ --enable-sysvshm=shared \
+ --enable-mysqlnd \
+ --enable-gd=shared \
+ --with-external-gd \
+ --with-ffi=shared \
+ --with-bz2=shared,$XBPS_CROSS_BASE/usr/ \
+ --with-curl=shared \
+ --with-db4=$XBPS_CROSS_BASE/usr \
+ --with-enchant=shared,$XBPS_CROSS_BASE/usr \
+ --with-gdbm=$XBPS_CROSS_BASE/usr \
+ --with-gettext=shared \
+ --with-gmp=shared \
+ --with-iconv=shared \
+ --with-ldap=shared,$XBPS_CROSS_BASE/usr \
+ --with-ldap-sasl \
+ --with-sodium=shared \
+ --with-mhash \
+ --with-mysql-sock=/run/mysqld/mysqld.sock \
+ --with-mysqli=shared,mysqlnd \
+ --with-openssl=shared \
+ --with-external-pcre \
+ --with-pear=/usr/share/pear${_php_version} \
+ --with-pdo-mysql=shared,mysqlnd \
+ --with-pdo-odbc=shared,unixODBC,$XBPS_CROSS_BASE/usr \
+ --with-pdo-pgsql=shared,$XBPS_CROSS_BASE/usr \
+ --with-pdo-sqlite=shared,$XBPS_CROSS_BASE/usr \
+ --with-pgsql=shared,$XBPS_CROSS_BASE/usr \
+ --with-readline=$XBPS_CROSS_BASE/usr \
+ --with-snmp=shared,$XBPS_CROSS_BASE/usr \
+ --with-sqlite3=shared,$XBPS_CROSS_BASE/usr \
+ --with-unixODBC=shared,$XBPS_CROSS_BASE/usr \
+ --with-xsl=shared,$XBPS_CROSS_BASE/usr \
+ --with-tidy=shared,$XBPS_CROSS_BASE/usr \
+ --with-zip=shared \
+ --with-zlib \
+ ${configure_args} \
+ "
+ if [ -n "$CROSS_BUILD" ]; then
+ local _make_env="PHAR_PHP=/usr/bin/php${_php_version} PHAR_PHP_MODULES=/usr/lib/php${_php_version}/modules"
+ fi
+
+ EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
+ export EXTENSION_DIR
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
+ export PEAR_INSTALLDIR
+ EXTRA_LIBS="-ldl"
+ export EXTRA_LIBS
+
+ # cgi,cli,embed,fcgi,fpm
+ mkdir -p build
+ cd build
+ ln -s ${wrksrc}/configure
+ ./configure ${_phpconfig} \
+ --host=${XBPS_CROSS_TRIPLET} \
+ --enable-cgi \
+ --enable-fpm \
+ --with-fpm-user=http \
+ --with-fpm-group=http \
+ --enable-embed=shared \
+ ${_phpextensions}
+ make ${makejobs} ${_make_env}
+
+ # apache
+ # reuse the previous run; this will save us a lot of time
+ cp -a ${wrksrc}/build ${wrksrc}/build-apache
+ cd ${wrksrc}/build-apache
+ ./configure ${_phpconfig} \
+ --host=${XBPS_CROSS_TRIPLET} \
+ --with-apxs2 \
+ ${_phpextensions}
+ make ${makejobs} ${_make_env}
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ local _env="INSTALL_ROOT=${DESTDIR}"
+ if [ -n "$CROSS_BUILD" ]; then
+ _env+=" PHAR_PHP=/usr/bin/php${_php_version}"
+ fi
+ make ${_env} install-{modules,cli,build,headers,programs,pharcmd}
+
+ # install php.ini
+ vinstall ${wrksrc}/php.ini-production 644 "etc/php${_php_version}" php.ini
+ # remove static modules
+ rm -f "${DESTDIR}/usr/lib/php${_php_version}/modules/*.a"
+}
+
+php8.3-devel_package() {
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/php${_php_version}/build"
+ vmove "usr/bin/php-config${_php_version}"
+ vmove "usr/bin/phpize${_php_version}"
+ vmove "usr/share/man/man1/phpize${_php_version}.1"
+ vmove "usr/share/man/man1/php-config${_php_version}.1"
+ }
+}
+
+php8.3-phpdbg_package() {
+ short_desc+=" - interactive debugger"
+ depends="php${_php_version}>=${version}_${revision}"
+ pkg_install() {
+ cd ${wrksrc}/build
+ make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg
+ }
+}
+
+php8.3-cgi_package() {
+ short_desc+=' - CGI and FCGI SAPI'
+ depends="php${_php_version}>=${version}_${revision}"
+ pkg_install() {
+ cd ${wrksrc}/build
+ make INSTALL_ROOT=${PKGDESTDIR} install-cgi
+ }
+}
+
+php8.3-apache_package() {
+ short_desc+=' - Apache SAPI'
+ depends="php${_php_version}>=${version}_${revision}"
+ conf_files="/etc/apache/extra/php${_php_version}_module.conf"
+ pkg_install() {
+ vinstall ${wrksrc}/build-apache/libs/libphp.so 755 usr/libexec/httpd/modules "libphp${_php_version}.so"
+ vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra "php${_php_version}_module.conf"
+ }
+}
+
+php8.3-fpm_package() {
+ short_desc+=' - FastCGI Process Manager'
+ depends="php${_php_version}>=${version}_${revision}"
+ conf_files="/etc/php${_php_version}/php-fpm.conf /etc/php${_php_version}/php-fpm.d/*"
+ pkg_install() {
+ cd ${wrksrc}/build
+ make INSTALL_ROOT=${PKGDESTDIR} install-fpm
+ vsv "php-fpm${_php_version}"
+ }
+}
+
+php8.3-embed_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - Embed SAPI'
+ pkg_install() {
+ cd ${wrksrc}/build
+ make INSTALL_ROOT=${PKGDESTDIR} PHP_SAPI=embed install-sapi
+ mv ${PKGDESTDIR}/usr/lib/libphp.so ${PKGDESTDIR}/usr/lib/libphp${_php_version}.so
+ }
+}
+
+php8.3-pear_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}
+ php${_php_version}>=devel-${version}_${revision} autoconf"
+ short_desc+=' - PHP Extension and Application Repository'
+ conf_files="/etc/php${_php_version}/pear.conf"
+ pkg_install() {
+ cd ${wrksrc}/build
+ local _env="INSTALL_ROOT=${PKGDESTDIR} PHP_PEAR_PHP_BIN=php${_php_version}"
+ if [ -n "$CROSS_BUILD" ]; then
+ _env+=" PEAR_PHP=/usr/bin/php${_php_version}"
+ fi
+ make install-pear ${_env}
+ rm -rf ${PKGDESTDIR}/.{channels,depdb,depdblock,filemap,lock,registry}
+ rm -rf ${PKGDESTDIR}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
+ mv ${PKGDESTDIR}/usr/bin/pear{,${_php_version}}
+ mv ${PKGDESTDIR}/usr/bin/peardev{,${_php_version}}
+ mv ${PKGDESTDIR}/usr/bin/pecl{,${_php_version}}
+ }
+}
+
+php8.3-enchant_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - enchant module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/enchant.so"
+ }
+}
+
+php8.3-gd_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - gd module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/gd.so"
+ }
+}
+
+php8.3-intl_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - Internationalization module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/intl.so"
+ }
+}
+
+php8.3-ldap_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - LDAP module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/ldap.so"
+ }
+}
+
+php8.3-mysql_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - MySQL modules'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/*mysql*.so"
+ }
+}
+
+php8.3-odbc_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - ODBC modules'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/*odbc.so"
+ }
+}
+
+php8.3-pgsql_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - PostgreSQL modules'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/*pgsql.so"
+ }
+}
+
+php8.3-snmp_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - snmp module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/snmp.so"
+ }
+}
+
+php8.3-sqlite_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - sqlite module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/*sqlite*.so"
+ }
+}
+
+php8.3-tidy_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - tidy HTML module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/*tidy*.so"
+ }
+}
+
+php8.3-xsl_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - XSL module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/xsl.so"
+ }
+}
+
+php8.3-sodium_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - sodium module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/sodium.so"
+ }
+}
+
+php8.3-ffi_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - FFI module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/ffi.so"
+ }
+}
diff --git a/srcpkgs/php8.3/update b/srcpkgs/php8.3/update
new file mode 100644
index 0000000000000..60d5e612b273e
--- /dev/null
+++ b/srcpkgs/php8.3/update
@@ -0,0 +1,3 @@
+pkgname=php
+ignore="8.[4-9].*"
+site="https://www.php.net/distributions/"
From ee1e649f9b8b3a50a7d316ba839fd3c2aa2d75f3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:14 -0500
Subject: [PATCH 02/20] New package: php8.3-apcu-5.1.23
---
srcpkgs/php8.3-apcu/files/README.voidlinux | 3 +++
srcpkgs/php8.3-apcu/template | 29 ++++++++++++++++++++++
srcpkgs/php8.3-apcu/update | 2 ++
3 files changed, 34 insertions(+)
create mode 100644 srcpkgs/php8.3-apcu/files/README.voidlinux
create mode 100644 srcpkgs/php8.3-apcu/template
create mode 100644 srcpkgs/php8.3-apcu/update
diff --git a/srcpkgs/php8.3-apcu/files/README.voidlinux b/srcpkgs/php8.3-apcu/files/README.voidlinux
new file mode 100644
index 0000000000000..9da8a70ccc2ba
--- /dev/null
+++ b/srcpkgs/php8.3-apcu/files/README.voidlinux
@@ -0,0 +1,3 @@
+To enable APCu add the following line to your php.ini:
+
+ extension=apcu.so
diff --git a/srcpkgs/php8.3-apcu/template b/srcpkgs/php8.3-apcu/template
new file mode 100644
index 0000000000000..3867ccf2bb405
--- /dev/null
+++ b/srcpkgs/php8.3-apcu/template
@@ -0,0 +1,29 @@
+# Template file for 'php8.3-apcu'
+pkgname=php8.3-apcu
+version=5.1.23
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.3"
+make_check_target=test
+hostmakedepends="autoconf php8.3-devel"
+makedepends="php8.3-devel pcre2-devel"
+depends="php8.3"
+short_desc="In-memory key-value store for PHP"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://pecl.php.net/package/APCu"
+distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
+checksum=67ee7464ccad2335c3fa4aeb0b8edbcf6d8344feea7922620c6a13015d604482
+
+pre_configure() {
+ phpize8.3
+}
+
+pre_install() {
+ make_install_args="INSTALL_ROOT=$DESTDIR"
+}
+
+post_install() {
+ rm -r $DESTDIR/usr/include
+ vdoc "${FILESDIR}/README.voidlinux"
+}
diff --git a/srcpkgs/php8.3-apcu/update b/srcpkgs/php8.3-apcu/update
new file mode 100644
index 0000000000000..ad899519e3138
--- /dev/null
+++ b/srcpkgs/php8.3-apcu/update
@@ -0,0 +1,2 @@
+site="https://pecl.php.net/package/APCu"
+pattern="apcu-\K[\d\.]*(?=\.tgz)"
From 5887ff9613aae4cfd3276b1e1b2fd730a1d516a6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:33 -0500
Subject: [PATCH 03/20] New package: php8.3-ast-1.1.1
---
srcpkgs/php8.3-ast/files/README.voidlinux | 2 ++
srcpkgs/php8.3-ast/template | 28 +++++++++++++++++++++++
2 files changed, 30 insertions(+)
create mode 100644 srcpkgs/php8.3-ast/files/README.voidlinux
create mode 100644 srcpkgs/php8.3-ast/template
diff --git a/srcpkgs/php8.3-ast/files/README.voidlinux b/srcpkgs/php8.3-ast/files/README.voidlinux
new file mode 100644
index 0000000000000..0dd0b5df2d961
--- /dev/null
+++ b/srcpkgs/php8.3-ast/files/README.voidlinux
@@ -0,0 +1,2 @@
+To enable the ast extension please add the following to php.ini:
+ extension=ast.so
diff --git a/srcpkgs/php8.3-ast/template b/srcpkgs/php8.3-ast/template
new file mode 100644
index 0000000000000..c2764714bb268
--- /dev/null
+++ b/srcpkgs/php8.3-ast/template
@@ -0,0 +1,28 @@
+# Template file for 'php8.3-ast'
+pkgname=php8.3-ast
+version=1.1.1
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.3"
+make_check_target="test"
+hostmakedepends="php8.3-devel autoconf"
+makedepends="php8.3-devel"
+depends="php8.3"
+checkdepends="${depends}"
+short_desc="Exposes the abstract syntax tree generated by PHP"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/nikic/php-ast"
+distfiles="https://pecl.php.net/get/ast-${version}.tgz"
+checksum=0c55e09a4da43b9cc1da72ecb4ae892941f73e157b73d46326bc6a5ed7fc44b1
+make_check_pre="env NO_INTERACTION=1"
+
+pre_configure() {
+ phpize8.3
+}
+
+do_install() {
+ make INSTALL_ROOT=${DESTDIR} install
+ vlicense LICENSE
+ vdoc "${FILESDIR}/README.voidlinux"
+}
From 8dd502ce7edcdcbc008f69b07dbcc0cd5a934d87 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:46 -0500
Subject: [PATCH 04/20] New package: php8.3-mongodb-1.17.0
---
srcpkgs/php8.3-mongodb/INSTALL.msg | 3 +++
srcpkgs/php8.3-mongodb/template | 24 ++++++++++++++++++++++++
srcpkgs/php8.3-mongodb/update | 1 +
3 files changed, 28 insertions(+)
create mode 100644 srcpkgs/php8.3-mongodb/INSTALL.msg
create mode 100644 srcpkgs/php8.3-mongodb/template
create mode 100644 srcpkgs/php8.3-mongodb/update
diff --git a/srcpkgs/php8.3-mongodb/INSTALL.msg b/srcpkgs/php8.3-mongodb/INSTALL.msg
new file mode 100644
index 0000000000000..173fab80af8df
--- /dev/null
+++ b/srcpkgs/php8.3-mongodb/INSTALL.msg
@@ -0,0 +1,3 @@
+To enable the MongoDB extension add the following line to your php.ini:
+
+ extension=mongodb
diff --git a/srcpkgs/php8.3-mongodb/template b/srcpkgs/php8.3-mongodb/template
new file mode 100644
index 0000000000000..b26ed2b328602
--- /dev/null
+++ b/srcpkgs/php8.3-mongodb/template
@@ -0,0 +1,24 @@
+# Template file for 'php8.3-mongodb'
+pkgname=php8.3-mongodb
+version=1.17.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.3"
+hostmakedepends="php8.3-devel autoconf pkg-config"
+makedepends="php8.3-devel pcre2-devel openssl-devel"
+depends="php8.3"
+short_desc="Official MongoDB PHP driver"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://pecl.php.net/package/mongodb"
+changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
+distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
+checksum=5e7db95103d73212ed0edf8887d92184baa5643476045cb899efbcf439847148
+
+pre_configure() {
+ phpize8.3
+}
+
+pre_install() {
+ make_install_args="INSTALL_ROOT=$DESTDIR"
+}
diff --git a/srcpkgs/php8.3-mongodb/update b/srcpkgs/php8.3-mongodb/update
new file mode 100644
index 0000000000000..fb47044a964d5
--- /dev/null
+++ b/srcpkgs/php8.3-mongodb/update
@@ -0,0 +1 @@
+pattern='<th.*Release \K[\d.]+(?=:</th>)'
From 89cfc8555f757cf8345f19927892bbcf329a58d9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:52 -0500
Subject: [PATCH 05/20] New package: php8.3-igbinary-3.2.14
---
srcpkgs/php8.3-igbinary/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/php8.3-igbinary/template
diff --git a/srcpkgs/php8.3-igbinary/template b/srcpkgs/php8.3-igbinary/template
new file mode 100644
index 0000000000000..0604502c4c8d7
--- /dev/null
+++ b/srcpkgs/php8.3-igbinary/template
@@ -0,0 +1,24 @@
+# Template file for 'php8.3-igbinary'
+pkgname=php8.3-igbinary
+version=3.2.14
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.3"
+hostmakedepends="autoconf php8.3-devel"
+makedepends="php8.3-devel"
+depends="php8.3"
+short_desc="Igbinary is a drop in replacement for the standard php serializer"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/igbinary/igbinary/"
+distfiles="https://pecl.php.net/get/igbinary-${version}.tgz"
+checksum=6337147a4fb888072566674837bda9928ee06ee7f0114b4338b86c816232925d
+
+pre_configure() {
+ phpize8.3
+}
+
+do_install() {
+ make INSTALL_ROOT="${DESTDIR}" install
+ vlicense COPYING
+}
From 795b67df39455e262105af5511075a943cb02275 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:55 -0500
Subject: [PATCH 06/20] New package: php8.3-imagick-3.7.0
---
srcpkgs/php8.3-imagick/files/README.voidlinux | 3 ++
...le-libmagick-header-file-search-path.patch | 17 +++++++++++
srcpkgs/php8.3-imagick/template | 29 +++++++++++++++++++
srcpkgs/php8.3-imagick/update | 1 +
4 files changed, 50 insertions(+)
create mode 100644 srcpkgs/php8.3-imagick/files/README.voidlinux
create mode 100644 srcpkgs/php8.3-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
create mode 100644 srcpkgs/php8.3-imagick/template
create mode 100644 srcpkgs/php8.3-imagick/update
diff --git a/srcpkgs/php8.3-imagick/files/README.voidlinux b/srcpkgs/php8.3-imagick/files/README.voidlinux
new file mode 100644
index 0000000000000..00497519fcee5
--- /dev/null
+++ b/srcpkgs/php8.3-imagick/files/README.voidlinux
@@ -0,0 +1,3 @@
+To enable the Imagick extension add the following line to your php.ini:
+
+ extension=imagick.so
diff --git a/srcpkgs/php8.3-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch b/srcpkgs/php8.3-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
new file mode 100644
index 0000000000000..16b8aaa573715
--- /dev/null
+++ b/srcpkgs/php8.3-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
@@ -0,0 +1,17 @@
+--- a/imagemagick.m4 2021-09-09 10:53:42.287881616 +0200
++++ b/imagemagick.m4 2021-09-09 11:14:47.662312430 +0200
+@@ -167,6 +167,14 @@ AC_DEFUN([IM_FIND_IMAGEMAGICK],[
+
+ AC_MSG_RESULT([user location ${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/wand/MagickWand.h])
+
++ elif test -r "${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
++
++ IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
++ IM_HEADER_STYLE="SEVEN"
++ AC_DEFINE([IM_MAGICKWAND_HEADER_STYLE_SEVEN], [1], [ImageMagick 7.x style header])
++
++ AC_MSG_RESULT([${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h])
++
+ elif test -r "${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
+
+ IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
diff --git a/srcpkgs/php8.3-imagick/template b/srcpkgs/php8.3-imagick/template
new file mode 100644
index 0000000000000..a2c8ab21a8fc6
--- /dev/null
+++ b/srcpkgs/php8.3-imagick/template
@@ -0,0 +1,29 @@
+# Template file for 'php8.3-imagick'
+pkgname=php8.3-imagick
+version=3.7.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
+ --with-php-config=/usr/bin/php-config8.3"
+hostmakedepends="php8.3-devel autoconf pkg-config"
+makedepends="php8.3-devel pcre2-devel libmagick-devel"
+depends="php8.3"
+short_desc="Provides a PHP wrapper to the ImageMagick library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://pecl.php.net/package/imagick"
+distfiles="https://pecl.php.net/get/imagick-$version.tgz"
+checksum=5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e
+
+pre_configure() {
+ phpize8.3
+}
+
+pre_install() {
+ make_install_args="INSTALL_ROOT=$DESTDIR"
+}
+
+post_install() {
+ rm -r $DESTDIR/usr/include
+ vdoc "${FILESDIR}/README.voidlinux"
+}
diff --git a/srcpkgs/php8.3-imagick/update b/srcpkgs/php8.3-imagick/update
new file mode 100644
index 0000000000000..fb47044a964d5
--- /dev/null
+++ b/srcpkgs/php8.3-imagick/update
@@ -0,0 +1 @@
+pattern='<th.*Release \K[\d.]+(?=:</th>)'
From a5b72014b0c7ca87a240f282d3a4ed4aa35fd85e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:20:57 -0500
Subject: [PATCH 07/20] New package: xdebug8.3-3.2.2
---
srcpkgs/xdebug8.3/files/README.voidlinux | 1 +
srcpkgs/xdebug8.3/template | 25 ++++++++++++++++++++++++
srcpkgs/xdebug8.3/update | 2 ++
3 files changed, 28 insertions(+)
create mode 100644 srcpkgs/xdebug8.3/files/README.voidlinux
create mode 100644 srcpkgs/xdebug8.3/template
create mode 100644 srcpkgs/xdebug8.3/update
diff --git a/srcpkgs/xdebug8.3/files/README.voidlinux b/srcpkgs/xdebug8.3/files/README.voidlinux
new file mode 100644
index 0000000000000..04e3343216f7f
--- /dev/null
+++ b/srcpkgs/xdebug8.3/files/README.voidlinux
@@ -0,0 +1 @@
+You should add 'zend_extension="xdebug.so"' to php.ini
diff --git a/srcpkgs/xdebug8.3/template b/srcpkgs/xdebug8.3/template
new file mode 100644
index 0000000000000..34b4459ec9a62
--- /dev/null
+++ b/srcpkgs/xdebug8.3/template
@@ -0,0 +1,25 @@
+# Template file for 'xdebug8.3'
+pkgname=xdebug8.3
+version=3.2.2
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.3"
+hostmakedepends="autoconf php8.3-devel"
+makedepends="php8.3-devel"
+short_desc="PHP debugging extension"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.0"
+homepage="http://xdebug.org"
+changelog="https://xdebug.org/updates"
+distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
+checksum=f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157
+
+pre_configure() {
+ phpize8.3
+}
+
+do_install() {
+ make INSTALL_ROOT=${DESTDIR} install
+ vlicense LICENSE
+ vdoc "${FILESDIR}/README.voidlinux"
+}
diff --git a/srcpkgs/xdebug8.3/update b/srcpkgs/xdebug8.3/update
new file mode 100644
index 0000000000000..280b0bc7e3ac9
--- /dev/null
+++ b/srcpkgs/xdebug8.3/update
@@ -0,0 +1,2 @@
+site="https://xdebug.org/updates"
+pattern='<dt><a name=.*></a>.*Xdebug \K[\d.]+(?=</dt>)'
From 8fd209bd37bd0e551edaf7cb558cbaba98d4ce37 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:29 -0400
Subject: [PATCH 08/20] php8.1: update to 8.1.26, provide php-runtime vpkg.
---
srcpkgs/php8.1/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 9e4cbfef1d4b9..2894f2bddbc3e 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1'
pkgname=php8.1
-version=8.1.21
-revision=3
+version=8.1.26
+revision=1
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -17,7 +17,8 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
# this is the source where the www.php.net code pulls the tarballs it serves
# at https://www.php.net/distributions/
distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=a95f8d35924aa5705ad07a70dc994bf41b5d45126ecdec7aaad6edfbe5e1c37f
+checksum=d954cecfc3d294c2fccbe2b1a6bef784ce0d6c5d44a9e28f8a527e092825f2cb
+provides="php-runtime-${version}_1"
conf_files="/etc/php${_php_version}/php.ini"
From 4da4d79022984fa209d70c9e588fe82b1e1a06ff Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:07 -0500
Subject: [PATCH 09/20] php8.1-apcu: update to 5.1.23.
---
srcpkgs/php8.1-apcu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.1-apcu/template b/srcpkgs/php8.1-apcu/template
index 421ae51b09c89..9c9b8a72be969 100644
--- a/srcpkgs/php8.1-apcu/template
+++ b/srcpkgs/php8.1-apcu/template
@@ -1,6 +1,6 @@
# Template file for 'php8.1-apcu'
pkgname=php8.1-apcu
-version=5.1.22
+version=5.1.23
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="PHP-3.01"
homepage="https://pecl.php.net/package/APCu"
distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
-checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
+checksum=67ee7464ccad2335c3fa4aeb0b8edbcf6d8344feea7922620c6a13015d604482
pre_configure() {
phpize8.1
From 89de693bb9cad0be61a1a35dd5b23b9b122ec3a8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:24 -0500
Subject: [PATCH 10/20] php8.1-ast: update to 1.1.1.
---
srcpkgs/php8.1-ast/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.1-ast/template b/srcpkgs/php8.1-ast/template
index 119401d3316cf..b1306a30c210c 100644
--- a/srcpkgs/php8.1-ast/template
+++ b/srcpkgs/php8.1-ast/template
@@ -1,6 +1,6 @@
# Template file for 'php8.1-ast'
pkgname=php8.1-ast
-version=1.1.0
+version=1.1.1
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
@@ -14,7 +14,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="BSD-3-Clause"
homepage="https://github.com/nikic/php-ast"
distfiles="https://pecl.php.net/get/ast-${version}.tgz"
-checksum=ee3d4f67e24d82e4d340806a24052012e4954d223122949377665427443e6d13
+checksum=0c55e09a4da43b9cc1da72ecb4ae892941f73e157b73d46326bc6a5ed7fc44b1
make_check_pre="env NO_INTERACTION=1"
pre_configure() {
From 5ddfb35f454a373c9fc12a094c235e424d7747ae Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:38 -0500
Subject: [PATCH 11/20] php8.1-mongodb: update to 1.17.0.
---
srcpkgs/php8.1-mongodb/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/php8.1-mongodb/template b/srcpkgs/php8.1-mongodb/template
index 5913b3e420393..a92d0a2a0fb85 100644
--- a/srcpkgs/php8.1-mongodb/template
+++ b/srcpkgs/php8.1-mongodb/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1-mongodb'
pkgname=php8.1-mongodb
-version=1.16.1
-revision=2
+version=1.17.0
+revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
hostmakedepends="php8.1-devel autoconf pkg-config"
@@ -13,7 +13,7 @@ license="Apache-2.0"
homepage="https://pecl.php.net/package/mongodb"
changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
-checksum=2c5b7c7ccf6ca26d25af8487f4028390f0a7dc49efb2eb360a65840e1d6f566e
+checksum=5e7db95103d73212ed0edf8887d92184baa5643476045cb899efbcf439847148
pre_configure() {
phpize8.1
From 9ee7183e7f755e0d6638bc65118da6c1923dc8d2 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:39 -0400
Subject: [PATCH 12/20] xdebug8.1: update to 3.2.2.
---
srcpkgs/xdebug8.1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xdebug8.1/template b/srcpkgs/xdebug8.1/template
index 31e615b5ccb5b..d8d13c0349040 100644
--- a/srcpkgs/xdebug8.1/template
+++ b/srcpkgs/xdebug8.1/template
@@ -1,6 +1,6 @@
# Template file for 'xdebug8.1'
pkgname=xdebug8.1
-version=3.2.1
+version=3.2.2
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
@@ -12,7 +12,7 @@ license="PHP-3.0"
homepage="http://xdebug.org"
changelog="https://xdebug.org/updates"
distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
-checksum=ef4cb3c228192798874e4530cccceee76840cc80821909740088a1e1a8f00445
+checksum=f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157
pre_configure() {
phpize8.1
From fd010dfd7369966b7d6b789c80cc7551f0d67caf Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:50 -0400
Subject: [PATCH 13/20] phpMyAdmin: update to 5.2.1, depend on php-runtime
virtual package.
---
srcpkgs/phpMyAdmin/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/phpMyAdmin/template b/srcpkgs/phpMyAdmin/template
index 7f0b5f024df54..dc9f179f89451 100644
--- a/srcpkgs/phpMyAdmin/template
+++ b/srcpkgs/phpMyAdmin/template
@@ -1,15 +1,15 @@
# Template file for 'phpMyAdmin'
pkgname=phpMyAdmin
-version=5.2.0
-revision=2
+version=5.2.1
+revision=1
conf_files="/etc/webapps/phpMyAdmin/config.inc.php"
-depends="php8.1 mariadb"
+depends="virtual?php-runtime"
short_desc="Web interface for MySQL and MariaDB"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="GPL-2.0-only"
homepage="https://www.phpmyadmin.net"
distfiles="https://files.phpmyadmin.net/phpMyAdmin/${version}/phpMyAdmin-${version}-all-languages.tar.xz"
-checksum=66da31ca295f06182ac3f2e6e96057dc824c459baedf4b29de6ed0d3be039230
+checksum=373f9599dfbd96d6fe75316d5dad189e68c305f297edf42377db9dd6b41b2557
do_install() {
vmkdir usr/share/webapps/
From 5675f81fb6e1fe3cdc48cd101f44ece52e3d179b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:55 -0400
Subject: [PATCH 14/20] phoronix-test-suite: depend on php-runtime virtual
package.
---
srcpkgs/phoronix-test-suite/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/phoronix-test-suite/template b/srcpkgs/phoronix-test-suite/template
index 16b4034bec27b..341d406258426 100644
--- a/srcpkgs/phoronix-test-suite/template
+++ b/srcpkgs/phoronix-test-suite/template
@@ -1,8 +1,8 @@
# Template file for 'phoronix-test-suite'
pkgname=phoronix-test-suite
version=10.8.4
-revision=2
-depends="php8.1"
+revision=3
+depends="virtual?php-runtime"
short_desc="Comprehensive testing and benchmarking platform for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
From f13a6a6a4689cc25a3c89c9ce86df2b69a3f22f8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:59 -0400
Subject: [PATCH 15/20] ampache: update to 5.6.2, depend on php-runtime virtual
package.
---
srcpkgs/ampache/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ampache/template b/srcpkgs/ampache/template
index d820e758f355e..2587dc4ec6adf 100644
--- a/srcpkgs/ampache/template
+++ b/srcpkgs/ampache/template
@@ -1,16 +1,16 @@
# Template file for 'ampache'
pkgname=ampache
-version=5.5.1
+version=5.6.2
revision=1
create_wrksrc=yes
hostmakedepends="unzip"
-depends="php8.1 mariadb"
+depends="virtual?php-runtime"
short_desc="Web-based tool for managing your audio/video files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="AGPL-3.0-or-later"
homepage="https://ampache.org"
distfiles="https://github.com/ampache/ampache/releases/download/${version}/${pkgname}-${version}_all.zip"
-checksum=3e37839058c263be990915759eecab9b5da3ec324638a7ff7d8094516f56a85c
+checksum=e406ff9de1537c3854ed9fad2ffdf854e193908617f8f409fa5de9036fed0927
python_version=3
do_install() {
From 508da56da79e59a113568b5f099cc26da4f554e4 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 11:42:27 -0500
Subject: [PATCH 16/20] php8.2: update to 8.2.13, provide php-runtime vpkg.
---
srcpkgs/php8.2/patches/php-cross-config.patch | 6 +++---
srcpkgs/php8.2/template | 7 ++++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/php8.2/patches/php-cross-config.patch b/srcpkgs/php8.2/patches/php-cross-config.patch
index 169c43f1df932..1956e6690abe2 100644
--- a/srcpkgs/php8.2/patches/php-cross-config.patch
+++ b/srcpkgs/php8.2/patches/php-cross-config.patch
@@ -1,8 +1,8 @@
diff --git a/configure b/configure
-index e4b82d1..1a8678f 100755
+index 1f5489d..a7e9276 100755
--- a/configure
+++ b/configure
-@@ -62424,7 +62424,7 @@ printf %s "checking for pg_config... " >&6; }
+@@ -63653,7 +63653,7 @@ printf %s "checking for pg_config... " >&6; }
fi
done
@@ -11,7 +11,7 @@ index e4b82d1..1a8678f 100755
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
printf "%s\n" "$PG_CONFIG" >&6; }
PGSQL_INCLUDE=`$PG_CONFIG --includedir`
-@@ -63948,7 +63948,7 @@ printf %s "checking for pg_config... " >&6; }
+@@ -65177,7 +65177,7 @@ printf %s "checking for pg_config... " >&6; }
fi
done
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index add04b4d3d562..e7fb74102db49 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
-version=8.2.8
-revision=3
+version=8.2.13
+revision=1
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -17,7 +17,8 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
# this is the source where the www.php.net code pulls the tarballs it serves
# at https://www.php.net/distributions/
distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=6419b74e9b675c8d5a1afd2788c4d7996a19bbe2be409716ccb2067897af9df1
+checksum=6a194038f5a9e46d8f70a9d59c072c3b08d6edbdd8e304096e24ccf2225bcf1b
+provides="php-runtime-${version}_1"
conf_files="/etc/php${_php_version}/php.ini"
From 7ca6791c55967e6ab99b20dc11af62f7ee512446 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:11 -0500
Subject: [PATCH 17/20] php8.2-apcu: update to 5.1.23.
---
srcpkgs/php8.2-apcu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.2-apcu/template b/srcpkgs/php8.2-apcu/template
index 182d4cda02d54..9ea5841c94929 100644
--- a/srcpkgs/php8.2-apcu/template
+++ b/srcpkgs/php8.2-apcu/template
@@ -1,6 +1,6 @@
# Template file for 'php8.2-apcu'
pkgname=php8.2-apcu
-version=5.1.22
+version=5.1.23
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.2"
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="PHP-3.01"
homepage="https://pecl.php.net/package/APCu"
distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
-checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
+checksum=67ee7464ccad2335c3fa4aeb0b8edbcf6d8344feea7922620c6a13015d604482
pre_configure() {
phpize8.2
From dcb05344edcd9e10bc0f304184f10eaa8fcef392 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:27 -0500
Subject: [PATCH 18/20] php8.2-ast: update to 1.1.1.
---
srcpkgs/php8.2-ast/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.2-ast/template b/srcpkgs/php8.2-ast/template
index 2d61ff7665f82..fccc6bc98ad09 100644
--- a/srcpkgs/php8.2-ast/template
+++ b/srcpkgs/php8.2-ast/template
@@ -1,6 +1,6 @@
# Template file for 'php8.2-ast'
pkgname=php8.2-ast
-version=1.1.0
+version=1.1.1
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.2"
@@ -14,7 +14,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="BSD-3-Clause"
homepage="https://github.com/nikic/php-ast"
distfiles="https://pecl.php.net/get/ast-${version}.tgz"
-checksum=ee3d4f67e24d82e4d340806a24052012e4954d223122949377665427443e6d13
+checksum=0c55e09a4da43b9cc1da72ecb4ae892941f73e157b73d46326bc6a5ed7fc44b1
make_check_pre="env NO_INTERACTION=1"
pre_configure() {
From bea4c4402e74ebad7df6d9cfb92416dd2e38aaae Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:43 -0500
Subject: [PATCH 19/20] php8.2-mongodb: update to 1.17.0.
---
srcpkgs/php8.2-mongodb/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/php8.2-mongodb/template b/srcpkgs/php8.2-mongodb/template
index 7278a83c1017a..7269686cd915a 100644
--- a/srcpkgs/php8.2-mongodb/template
+++ b/srcpkgs/php8.2-mongodb/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2-mongodb'
pkgname=php8.2-mongodb
-version=1.16.1
-revision=2
+version=1.17.0
+revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.2"
hostmakedepends="php8.2-devel autoconf pkg-config"
@@ -13,7 +13,7 @@ license="Apache-2.0"
homepage="https://pecl.php.net/package/mongodb"
changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
-checksum=2c5b7c7ccf6ca26d25af8487f4028390f0a7dc49efb2eb360a65840e1d6f566e
+checksum=5e7db95103d73212ed0edf8887d92184baa5643476045cb899efbcf439847148
pre_configure() {
phpize8.2
From f196de971a693b7a44d6d80eac7a19ec87ac678c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:41 -0400
Subject: [PATCH 20/20] xdebug8.2: update to 3.2.2.
---
srcpkgs/xdebug8.2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xdebug8.2/template b/srcpkgs/xdebug8.2/template
index c8c480b0317a6..94d61346db1eb 100644
--- a/srcpkgs/xdebug8.2/template
+++ b/srcpkgs/xdebug8.2/template
@@ -1,6 +1,6 @@
# Template file for 'xdebug8.2'
pkgname=xdebug8.2
-version=3.2.1
+version=3.2.2
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.2"
@@ -12,7 +12,7 @@ license="PHP-3.0"
homepage="http://xdebug.org"
changelog="https://xdebug.org/updates"
distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
-checksum=ef4cb3c228192798874e4530cccceee76840cc80821909740088a1e1a8f00445
+checksum=f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157
pre_configure() {
phpize8.2
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] PHP updates and virtual package support
2023-08-08 14:33 [PR PATCH] PHP updates and virtual package support TinfoilSubmarine
` (7 preceding siblings ...)
2023-11-28 17:33 ` TinfoilSubmarine
@ 2023-11-28 18:35 ` TinfoilSubmarine
2023-12-02 5:53 ` classabbyamp
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: TinfoilSubmarine @ 2023-11-28 18:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1424 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php-updates
https://github.com/void-linux/void-packages/pull/45493
PHP updates and virtual package support
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Supersedes https://github.com/void-linux/void-packages/pull/44946
I need some help testing this as I don't use ampache or phpMyAdmin.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-updates-45493.patch --]
[-- Type: text/x-diff, Size: 57510 bytes --]
From ef306cfb32b93ad70da66774ab753a378c5cac06 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:01 -0500
Subject: [PATCH 01/19] New package: php8.3-8.3.0
- provide php-runtime vpkg
---
etc/defaults.virtual | 1 +
srcpkgs/php8.3-apache | 1 +
srcpkgs/php8.3-cgi | 1 +
srcpkgs/php8.3-devel | 1 +
srcpkgs/php8.3-embed | 1 +
srcpkgs/php8.3-enchant | 1 +
srcpkgs/php8.3-ffi | 1 +
srcpkgs/php8.3-fpm | 1 +
srcpkgs/php8.3-gd | 1 +
srcpkgs/php8.3-intl | 1 +
srcpkgs/php8.3-ldap | 1 +
srcpkgs/php8.3-mysql | 1 +
srcpkgs/php8.3-odbc | 1 +
srcpkgs/php8.3-pear | 1 +
srcpkgs/php8.3-pgsql | 1 +
srcpkgs/php8.3-phpdbg | 1 +
srcpkgs/php8.3-snmp | 1 +
srcpkgs/php8.3-sodium | 1 +
srcpkgs/php8.3-sqlite | 1 +
srcpkgs/php8.3-tidy | 1 +
srcpkgs/php8.3-xsl | 1 +
srcpkgs/php8.3/files/apache.conf | 13 +
srcpkgs/php8.3/files/php-fpm8.3/run | 3 +
srcpkgs/php8.3/patches/fix-manpages.patch | 25 ++
srcpkgs/php8.3/patches/php-706-crypt.patch | 15 +
srcpkgs/php8.3/patches/php-cross-config.patch | 22 ++
srcpkgs/php8.3/patches/php-fpm.patch | 13 +
.../patches/php-ltmain-sysroot-support.patch | 39 ++
srcpkgs/php8.3/patches/php-pear-cross.patch | 23 ++
srcpkgs/php8.3/patches/php-phar-cross.patch | 29 ++
.../patches/php-phpize-sysroot-support.patch | 28 ++
srcpkgs/php8.3/patches/php.ini.patch | 24 ++
srcpkgs/php8.3/template | 367 ++++++++++++++++++
srcpkgs/php8.3/update | 3 +
34 files changed, 625 insertions(+)
create mode 120000 srcpkgs/php8.3-apache
create mode 120000 srcpkgs/php8.3-cgi
create mode 120000 srcpkgs/php8.3-devel
create mode 120000 srcpkgs/php8.3-embed
create mode 120000 srcpkgs/php8.3-enchant
create mode 120000 srcpkgs/php8.3-ffi
create mode 120000 srcpkgs/php8.3-fpm
create mode 120000 srcpkgs/php8.3-gd
create mode 120000 srcpkgs/php8.3-intl
create mode 120000 srcpkgs/php8.3-ldap
create mode 120000 srcpkgs/php8.3-mysql
create mode 120000 srcpkgs/php8.3-odbc
create mode 120000 srcpkgs/php8.3-pear
create mode 120000 srcpkgs/php8.3-pgsql
create mode 120000 srcpkgs/php8.3-phpdbg
create mode 120000 srcpkgs/php8.3-snmp
create mode 120000 srcpkgs/php8.3-sodium
create mode 120000 srcpkgs/php8.3-sqlite
create mode 120000 srcpkgs/php8.3-tidy
create mode 120000 srcpkgs/php8.3-xsl
create mode 100644 srcpkgs/php8.3/files/apache.conf
create mode 100755 srcpkgs/php8.3/files/php-fpm8.3/run
create mode 100644 srcpkgs/php8.3/patches/fix-manpages.patch
create mode 100644 srcpkgs/php8.3/patches/php-706-crypt.patch
create mode 100644 srcpkgs/php8.3/patches/php-cross-config.patch
create mode 100644 srcpkgs/php8.3/patches/php-fpm.patch
create mode 100644 srcpkgs/php8.3/patches/php-ltmain-sysroot-support.patch
create mode 100644 srcpkgs/php8.3/patches/php-pear-cross.patch
create mode 100644 srcpkgs/php8.3/patches/php-phar-cross.patch
create mode 100644 srcpkgs/php8.3/patches/php-phpize-sysroot-support.patch
create mode 100644 srcpkgs/php8.3/patches/php.ini.patch
create mode 100644 srcpkgs/php8.3/template
create mode 100644 srcpkgs/php8.3/update
diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index 9af8895a8492c..4e6ace1856a93 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -29,6 +29,7 @@ nodejs-runtime nodejs
ntp-daemon chrony
phonon-backend phonon-backend-gstreamer
phonon-qt5-backend phonon-qt5-backend-gstreamer
+php-runtime php8.3
pipewire-session-manager base-chroot-cyclic-solver
rkt-stage1 rkt-stage1-coreos
smtp-server opensmtpd
diff --git a/srcpkgs/php8.3-apache b/srcpkgs/php8.3-apache
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-apache
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-cgi b/srcpkgs/php8.3-cgi
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-cgi
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-devel b/srcpkgs/php8.3-devel
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-devel
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-embed b/srcpkgs/php8.3-embed
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-embed
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-enchant b/srcpkgs/php8.3-enchant
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-enchant
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-ffi b/srcpkgs/php8.3-ffi
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-ffi
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-fpm b/srcpkgs/php8.3-fpm
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-fpm
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-gd b/srcpkgs/php8.3-gd
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-gd
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-intl b/srcpkgs/php8.3-intl
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-intl
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-ldap b/srcpkgs/php8.3-ldap
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-ldap
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-mysql b/srcpkgs/php8.3-mysql
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-mysql
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-odbc b/srcpkgs/php8.3-odbc
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-odbc
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-pear b/srcpkgs/php8.3-pear
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-pear
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-pgsql b/srcpkgs/php8.3-pgsql
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-pgsql
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-phpdbg b/srcpkgs/php8.3-phpdbg
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-phpdbg
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-snmp b/srcpkgs/php8.3-snmp
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-snmp
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-sodium b/srcpkgs/php8.3-sodium
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-sodium
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-sqlite b/srcpkgs/php8.3-sqlite
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-sqlite
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-tidy b/srcpkgs/php8.3-tidy
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-tidy
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3-xsl b/srcpkgs/php8.3-xsl
new file mode 120000
index 0000000000000..504b6affbe727
--- /dev/null
+++ b/srcpkgs/php8.3-xsl
@@ -0,0 +1 @@
+php8.3
\ No newline at end of file
diff --git a/srcpkgs/php8.3/files/apache.conf b/srcpkgs/php8.3/files/apache.conf
new file mode 100644
index 0000000000000..e22ea2014a152
--- /dev/null
+++ b/srcpkgs/php8.3/files/apache.conf
@@ -0,0 +1,13 @@
+# Required modules: dir_module, php8.3_module
+
+<IfModule dir_module>
+ <IfModule php8.3_module>
+ DirectoryIndex index.php index.html
+ <FilesMatch "\.php$">
+ SetHandler application/x-httpd-php
+ </FilesMatch>
+ <FilesMatch "\.phps$">
+ SetHandler application/x-httpd-php-source
+ </FilesMatch>
+ </IfModule>
+</IfModule>
diff --git a/srcpkgs/php8.3/files/php-fpm8.3/run b/srcpkgs/php8.3/files/php-fpm8.3/run
new file mode 100755
index 0000000000000..bcaa543ceafae
--- /dev/null
+++ b/srcpkgs/php8.3/files/php-fpm8.3/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec php-fpm8.3 --nodaemonize ${OPTS}
diff --git a/srcpkgs/php8.3/patches/fix-manpages.patch b/srcpkgs/php8.3/patches/fix-manpages.patch
new file mode 100644
index 0000000000000..2a87691048772
--- /dev/null
+++ b/srcpkgs/php8.3/patches/fix-manpages.patch
@@ -0,0 +1,25 @@
+This patch fixes .so links in man pages.
+It's needed because of the configure option -
+
+ --program-suffix=${_php_version}
+
+The changes made by this patch should be the same as the changes made by this
+block of code -
+
+ _regexp='^[[:space:]]*\.so[[:space:]]'
+ for file in $(grep -l -e "$_regexp" -R .); do
+ vsed -i "$file" -e "/$_regexp/"'s=^[[:space:]]*\.[^.]*=&'${_php_version}=
+ done
+
+Where _php_version is defined in the template file.
+
+--- a/ext/phar/phar.phar.1.in
++++ b/ext/phar/phar.phar.1.in
+@@ -1 +1 @@
+-.so man1/phar.1
++.so man1/phar8.3.1
+--- a/sapi/cgi/php-cgi.1.in
++++ b/sapi/cgi/php-cgi.1.in
+@@ -1 +1 @@
+-.so man1/php.1
++.so man1/php8.3.1
diff --git a/srcpkgs/php8.3/patches/php-706-crypt.patch b/srcpkgs/php8.3/patches/php-706-crypt.patch
new file mode 100644
index 0000000000000..254f1d2187c24
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-706-crypt.patch
@@ -0,0 +1,15 @@
+--- a/ext/standard/crypt.c 2016-04-28 14:13:00.000000000 -0400
++++ b/ext/standard/crypt.c 2016-04-28 21:45:24.340955313 -0400
+@@ -267,6 +267,12 @@
+ }
+ # elif defined(HAVE_CRYPT)
+ crypt_res = crypt(password, salt);
++ if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) {
++ return NULL;
++ } else {
++ result = zend_string_init(crypt_res, strlen(crypt_res), 0);
++ return result;
++ }
+ # else
+ # error No crypt() implementation
+ # endif
diff --git a/srcpkgs/php8.3/patches/php-cross-config.patch b/srcpkgs/php8.3/patches/php-cross-config.patch
new file mode 100644
index 0000000000000..141c3f0a0e66d
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-cross-config.patch
@@ -0,0 +1,22 @@
+diff --git a/configure b/configure
+index d317fd7..5560d75 100755
+--- a/configure
++++ b/configure
+@@ -60896,7 +60896,7 @@ $as_echo_n "checking for pg_config... " >&6; }
+ fi
+ done
+
+- if test -n "$PG_CONFIG"; then
++ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ $as_echo "$PG_CONFIG" >&6; }
+ PGSQL_INCLUDE=`$PG_CONFIG --includedir`
+@@ -62422,7 +62422,7 @@ $as_echo_n "checking for pg_config... " >&6; }
+ fi
+ done
+
+- if test -n "$PG_CONFIG"; then
++ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ $as_echo "$PG_CONFIG" >&6; }
+ PGSQL_INCLUDE=`$PG_CONFIG --includedir`
diff --git a/srcpkgs/php8.3/patches/php-fpm.patch b/srcpkgs/php8.3/patches/php-fpm.patch
new file mode 100644
index 0000000000000..5e55e179f8a4a
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-fpm.patch
@@ -0,0 +1,13 @@
+--- a/sapi/fpm/Makefile.frag 2017-04-15 23:58:56.965737425 +0200
++++ b/sapi/fpm/Makefile.frag 2017-04-16 00:00:57.814831649 +0200
+@@ -15,8 +15,8 @@ install-fpm: $(SAPI_FPM_PATH)
+ else \
+ echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \
+ $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
+- $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
+- $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
++ $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
++ $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \
+ fi
+
+ @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
diff --git a/srcpkgs/php8.3/patches/php-ltmain-sysroot-support.patch b/srcpkgs/php8.3/patches/php-ltmain-sysroot-support.patch
new file mode 100644
index 0000000000000..bbe0a514a9e8a
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-ltmain-sysroot-support.patch
@@ -0,0 +1,39 @@
+--- a/build/ltmain.sh 2021-09-09 15:19:14.822208365 +0200
++++ b/build/ltmain.sh 2021-09-09 15:47:55.397011151 +0200
+@@ -2375,6 +2375,13 @@ EOF
+ *) . ./$lib ;;
+ esac
+
++ newdependency_libs=
++ for deplib in $dependency_libs; do
++ deplib=$(echo "$deplib" | sed "s#^=\(.*\)#$(${CC} --print-sysroot)\1#")
++ newdependency_libs="$newdependency_libs $deplib"
++ done
++ dependency_libs=${newdependency_libs}
++
+ if test "$linkmode,$pass" = "lib,link" ||
+ test "$linkmode,$pass" = "prog,scan" ||
+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+@@ -5750,6 +5757,13 @@ fi\
+ case $host,$output,$installed,$module,$dlname in
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ esac
++
++ newdependency_libs=
++ for deplib in $dependency_libs; do
++ deplib=$(echo "$deplib" | sed "s#^$(${CC} --print-sysroot)#=#")
++ newdependency_libs="$newdependency_libs $deplib"
++ done
++
+ $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+@@ -5767,7 +5781,7 @@ library_names='$library_names'
+ old_library='$old_library'
+
+ # Libraries that this one depends upon.
+-dependency_libs='$dependency_libs'
++dependency_libs='$newdependency_libs'
+
+ # Version information for $libname.
+ current=$current
diff --git a/srcpkgs/php8.3/patches/php-pear-cross.patch b/srcpkgs/php8.3/patches/php-pear-cross.patch
new file mode 100644
index 0000000000000..f9191a50a0b58
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-pear-cross.patch
@@ -0,0 +1,23 @@
+--- a/pear/Makefile.frag 2020-03-17 11:40:21.000000000 +0100
++++ b/pear/Makefile.frag 2020-04-12 22:29:31.846943414 +0200
+@@ -8,9 +8,10 @@ FETCH = `which fetch 2>/dev/null`
+ PEAR_PREFIX = -dp a${program_prefix}
+ PEAR_SUFFIX = -ds a$(program_suffix)
+ PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
++PEAR_PHP ?= $(top_builddir)/sapi/cli/php
+
+ install-pear-installer: $(SAPI_CLI_PATH)
+- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
++ @$(PEAR_PHP) $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
+
+ install-pear:
+ @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/"
+@@ -23,7 +24,7 @@ install-pear:
+ elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
+ "$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \
+ else \
+- $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
++ $(PEAR_PHP) -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
+ fi \
+ fi \
+ fi
diff --git a/srcpkgs/php8.3/patches/php-phar-cross.patch b/srcpkgs/php8.3/patches/php-phar-cross.patch
new file mode 100644
index 0000000000000..1e4e627ec65b9
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-phar-cross.patch
@@ -0,0 +1,29 @@
+--- a/ext/phar/Makefile.frag 2020-04-13 12:18:23.998801926 +0200
++++ b/ext/phar/Makefile.frag 2020-04-13 12:20:58.031795293 +0200
+@@ -8,12 +8,14 @@ $(srcdir)/phar_path_check.c: $(srcdir)/p
+
+ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
+
++PHAR_PHP ?= $(top_builddir)/$(SAPI_CLI_PATH)
++PHAR_PHP_MODULES ?= $(top_builddir)/modules
+ PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0
+ PHP_PHARCMD_EXECUTABLE = ` \
+- if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
+- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
++ if test -x "$(PHAR_PHP)"; then \
++ $(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP) -n"; \
+ if test "x$(PHP_MODULES)" != "x"; then \
+- $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
++ $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(PHAR_PHP_MODULES)"; \
+ for i in bz2 zlib phar; do \
+ if test -f "$(top_builddir)/modules/$$i.la"; then \
+ . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
+@@ -21,7 +23,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
+ done; \
+ fi; \
+ else \
+- $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
++ $(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP)"; \
+ fi;`
+ PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
+
diff --git a/srcpkgs/php8.3/patches/php-phpize-sysroot-support.patch b/srcpkgs/php8.3/patches/php-phpize-sysroot-support.patch
new file mode 100644
index 0000000000000..76cff3f816641
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php-phpize-sysroot-support.patch
@@ -0,0 +1,28 @@
+--- a/scripts/phpize.m4 2020-03-17 11:40:21.000000000 +0100
++++ b/scripts/phpize.m4 2020-04-15 12:27:36.400466387 +0200
+@@ -44,6 +44,12 @@ PHP_ARG_WITH([libdir],
+ [lib],
+ [no])
+
++PHP_ARG_WITH([sysroot],,
++ [AS_HELP_STRING([--with-sysroot=NAME],
++ [System sysroot])],
++ [no],
++ [no])
++
+ PHP_RUNPATH_SWITCH
+ PHP_SHLIB_SUFFIX_NAMES
+
+@@ -58,7 +64,11 @@ dnl For BC.
+ PHP_CONFIG=$PHP_PHP_CONFIG
+ prefix=`$PHP_CONFIG --prefix 2>/dev/null`
+ phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null`
+-INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
++if test "x$PHP_SYSROOT" = xno; then :
++ INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
++else
++ INCLUDES=`$PHP_CONFIG --includes 2>/dev/null | sed "s#-I#-I$PHP_SYSROOT#g"`
++fi
+ EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null`
+ PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`
+
diff --git a/srcpkgs/php8.3/patches/php.ini.patch b/srcpkgs/php8.3/patches/php.ini.patch
new file mode 100644
index 0000000000000..9e8ae4e15a7b8
--- /dev/null
+++ b/srcpkgs/php8.3/patches/php.ini.patch
@@ -0,0 +1,24 @@
+diff --git a/php.ini-production b/php.ini-production
+index b39a960..68f14a6 100644
+--- a/php.ini-production
++++ b/php.ini-production
+@@ -737,7 +737,7 @@ default_charset = "UTF-8"
+ ;;;;;;;;;;;;;;;;;;;;;;;;;
+
+ ; UNIX: "/path1:/path2"
+-;include_path = ".:/php/includes"
++include_path = ".:/usr/share/pear8.3"
+ ;
+ ; Windows: "\path1;\path2"
+ ;include_path = ".;c:\php\includes"
+@@ -760,9 +760,7 @@ user_dir =
+
+ ; Directory in which the loadable extensions (modules) reside.
+ ; https://php.net/extension-dir
+-;extension_dir = "./"
+-; On windows:
+-;extension_dir = "ext"
++extension_dir = "/usr/lib/php8.3/modules/"
+
+ ; Directory where the temporary files should be placed.
+ ; Defaults to the system default (see sys_get_temp_dir)
diff --git a/srcpkgs/php8.3/template b/srcpkgs/php8.3/template
new file mode 100644
index 0000000000000..fd20d1458f9f6
--- /dev/null
+++ b/srcpkgs/php8.3/template
@@ -0,0 +1,367 @@
+# Template file for 'php8.3'
+pkgname=php8.3
+version=8.3.0
+revision=1
+_php_version=8.3
+hostmakedepends="bison pkg-config apache-devel"
+makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
+ gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
+ libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
+ postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
+ libffi-devel oniguruma-devel gd-devel"
+short_desc="HTML-embedded scripting language"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://www.php.net"
+changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
+# this is the source where the www.php.net code pulls the tarballs it serves
+# at https://www.php.net/distributions/
+distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
+checksum=557ae14650f1d1984d3213e3fcd8d93a5f11418b3f8026d3a2d5022251163951
+provides="php-runtime-${version}_1"
+
+conf_files="/etc/php${_php_version}/php.ini"
+
+lib32disabled=yes
+
+if [ -n "$CROSS_BUILD" ]; then
+ # phar and pear need php to build
+ hostmakedepends+=" php${_php_version}"
+ CFLAGS+=" -DHAVE_LIBDL
+ -DHAVE_DLOPEN
+ -DHAVE_DLSYM
+ -DHAVE_SHM_IPC
+ -DHAVE_SHM_MMAP_ANON
+ -DHAVE_SHM_MMAP_ZERO
+ -DHAVE_SHM_MMAP_POSIX
+ -DHAVE_SHM_MMAP_FILE"
+fi
+
+alternatives="
+ php:phar.phar:/usr/bin/phar${_php_version}.phar
+ php:php:/usr/bin/php${_php_version}
+ php:phar:/usr/bin/phar${_php_version}
+ php:phar.1:/usr/share/man/man1/phar${_php_version}.1
+ php:phar.phar.1:/usr/share/man/man1/phar${_php_version}.phar.1
+ php:php.1:/usr/share/man/man1/php${_php_version}.1"
+
+do_build() {
+ local _phpconfig="--srcdir=.. \
+ --config-cache \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc/php${_php_version} \
+ --localstatedir=/var \
+ --with-layout=GNU \
+ --with-config-file-path=/etc/php${_php_version} \
+ --with-config-file-scan-dir=/etc/php${_php_version}/conf.d \
+ --disable-rpath \
+ --mandir=/usr/share/man \
+ --libdir=/usr/lib/php${_php_version} \
+ --datarootdir=/usr/share/php${_php_version} \
+ --datadir=/usr/share/php${_php_version} \
+ --program-suffix=${_php_version} \
+ --includedir=/usr/include/php${_php_version} \
+ "
+
+ local _phpextensions="--enable-bcmath=shared \
+ --enable-calendar=shared \
+ --enable-exif=shared \
+ --enable-ftp=shared \
+ --enable-intl=shared \
+ --enable-mbstring \
+ --enable-opcache \
+ --enable-pcntl \
+ --enable-phar=shared \
+ --enable-posix=shared \
+ --enable-shmop=shared \
+ --enable-soap=shared \
+ --enable-sockets=shared \
+ --enable-sysvmsg=shared \
+ --enable-sysvsem=shared \
+ --enable-sysvshm=shared \
+ --enable-mysqlnd \
+ --enable-gd=shared \
+ --with-external-gd \
+ --with-ffi=shared \
+ --with-bz2=shared,$XBPS_CROSS_BASE/usr/ \
+ --with-curl=shared \
+ --with-db4=$XBPS_CROSS_BASE/usr \
+ --with-enchant=shared,$XBPS_CROSS_BASE/usr \
+ --with-gdbm=$XBPS_CROSS_BASE/usr \
+ --with-gettext=shared \
+ --with-gmp=shared \
+ --with-iconv=shared \
+ --with-ldap=shared,$XBPS_CROSS_BASE/usr \
+ --with-ldap-sasl \
+ --with-sodium=shared \
+ --with-mhash \
+ --with-mysql-sock=/run/mysqld/mysqld.sock \
+ --with-mysqli=shared,mysqlnd \
+ --with-openssl=shared \
+ --with-external-pcre \
+ --with-pear=/usr/share/pear${_php_version} \
+ --with-pdo-mysql=shared,mysqlnd \
+ --with-pdo-odbc=shared,unixODBC,$XBPS_CROSS_BASE/usr \
+ --with-pdo-pgsql=shared,$XBPS_CROSS_BASE/usr \
+ --with-pdo-sqlite=shared,$XBPS_CROSS_BASE/usr \
+ --with-pgsql=shared,$XBPS_CROSS_BASE/usr \
+ --with-readline=$XBPS_CROSS_BASE/usr \
+ --with-snmp=shared,$XBPS_CROSS_BASE/usr \
+ --with-sqlite3=shared,$XBPS_CROSS_BASE/usr \
+ --with-unixODBC=shared,$XBPS_CROSS_BASE/usr \
+ --with-xsl=shared,$XBPS_CROSS_BASE/usr \
+ --with-tidy=shared,$XBPS_CROSS_BASE/usr \
+ --with-zip=shared \
+ --with-zlib \
+ ${configure_args} \
+ "
+ if [ -n "$CROSS_BUILD" ]; then
+ local _make_env="PHAR_PHP=/usr/bin/php${_php_version} PHAR_PHP_MODULES=/usr/lib/php${_php_version}/modules"
+ fi
+
+ EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
+ export EXTENSION_DIR
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
+ export PEAR_INSTALLDIR
+ EXTRA_LIBS="-ldl"
+ export EXTRA_LIBS
+
+ # cgi,cli,embed,fcgi,fpm
+ mkdir -p build
+ cd build
+ ln -s ${wrksrc}/configure
+ ./configure ${_phpconfig} \
+ --host=${XBPS_CROSS_TRIPLET} \
+ --enable-cgi \
+ --enable-fpm \
+ --with-fpm-user=http \
+ --with-fpm-group=http \
+ --enable-embed=shared \
+ ${_phpextensions}
+ make ${makejobs} ${_make_env}
+
+ # apache
+ # reuse the previous run; this will save us a lot of time
+ cp -a ${wrksrc}/build ${wrksrc}/build-apache
+ cd ${wrksrc}/build-apache
+ ./configure ${_phpconfig} \
+ --host=${XBPS_CROSS_TRIPLET} \
+ --with-apxs2 \
+ ${_phpextensions}
+ make ${makejobs} ${_make_env}
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ local _env="INSTALL_ROOT=${DESTDIR}"
+ if [ -n "$CROSS_BUILD" ]; then
+ _env+=" PHAR_PHP=/usr/bin/php${_php_version}"
+ fi
+ make ${_env} install-{modules,cli,build,headers,programs,pharcmd}
+
+ # install php.ini
+ vinstall ${wrksrc}/php.ini-production 644 "etc/php${_php_version}" php.ini
+ # remove static modules
+ rm -f "${DESTDIR}/usr/lib/php${_php_version}/modules/*.a"
+}
+
+php8.3-devel_package() {
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/php${_php_version}/build"
+ vmove "usr/bin/php-config${_php_version}"
+ vmove "usr/bin/phpize${_php_version}"
+ vmove "usr/share/man/man1/phpize${_php_version}.1"
+ vmove "usr/share/man/man1/php-config${_php_version}.1"
+ }
+}
+
+php8.3-phpdbg_package() {
+ short_desc+=" - interactive debugger"
+ depends="php${_php_version}>=${version}_${revision}"
+ pkg_install() {
+ cd ${wrksrc}/build
+ make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg
+ }
+}
+
+php8.3-cgi_package() {
+ short_desc+=' - CGI and FCGI SAPI'
+ depends="php${_php_version}>=${version}_${revision}"
+ pkg_install() {
+ cd ${wrksrc}/build
+ make INSTALL_ROOT=${PKGDESTDIR} install-cgi
+ }
+}
+
+php8.3-apache_package() {
+ short_desc+=' - Apache SAPI'
+ depends="php${_php_version}>=${version}_${revision}"
+ conf_files="/etc/apache/extra/php${_php_version}_module.conf"
+ pkg_install() {
+ vinstall ${wrksrc}/build-apache/libs/libphp.so 755 usr/libexec/httpd/modules "libphp${_php_version}.so"
+ vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra "php${_php_version}_module.conf"
+ }
+}
+
+php8.3-fpm_package() {
+ short_desc+=' - FastCGI Process Manager'
+ depends="php${_php_version}>=${version}_${revision}"
+ conf_files="/etc/php${_php_version}/php-fpm.conf /etc/php${_php_version}/php-fpm.d/*"
+ pkg_install() {
+ cd ${wrksrc}/build
+ make INSTALL_ROOT=${PKGDESTDIR} install-fpm
+ vsv "php-fpm${_php_version}"
+ }
+}
+
+php8.3-embed_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - Embed SAPI'
+ pkg_install() {
+ cd ${wrksrc}/build
+ make INSTALL_ROOT=${PKGDESTDIR} PHP_SAPI=embed install-sapi
+ mv ${PKGDESTDIR}/usr/lib/libphp.so ${PKGDESTDIR}/usr/lib/libphp${_php_version}.so
+ }
+}
+
+php8.3-pear_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}
+ php${_php_version}>=devel-${version}_${revision} autoconf"
+ short_desc+=' - PHP Extension and Application Repository'
+ conf_files="/etc/php${_php_version}/pear.conf"
+ pkg_install() {
+ cd ${wrksrc}/build
+ local _env="INSTALL_ROOT=${PKGDESTDIR} PHP_PEAR_PHP_BIN=php${_php_version}"
+ if [ -n "$CROSS_BUILD" ]; then
+ _env+=" PEAR_PHP=/usr/bin/php${_php_version}"
+ fi
+ make install-pear ${_env}
+ rm -rf ${PKGDESTDIR}/.{channels,depdb,depdblock,filemap,lock,registry}
+ rm -rf ${PKGDESTDIR}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
+ mv ${PKGDESTDIR}/usr/bin/pear{,${_php_version}}
+ mv ${PKGDESTDIR}/usr/bin/peardev{,${_php_version}}
+ mv ${PKGDESTDIR}/usr/bin/pecl{,${_php_version}}
+ }
+}
+
+php8.3-enchant_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - enchant module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/enchant.so"
+ }
+}
+
+php8.3-gd_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - gd module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/gd.so"
+ }
+}
+
+php8.3-intl_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - Internationalization module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/intl.so"
+ }
+}
+
+php8.3-ldap_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - LDAP module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/ldap.so"
+ }
+}
+
+php8.3-mysql_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - MySQL modules'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/*mysql*.so"
+ }
+}
+
+php8.3-odbc_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - ODBC modules'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/*odbc.so"
+ }
+}
+
+php8.3-pgsql_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - PostgreSQL modules'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/*pgsql.so"
+ }
+}
+
+php8.3-snmp_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - snmp module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/snmp.so"
+ }
+}
+
+php8.3-sqlite_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - sqlite module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/*sqlite*.so"
+ }
+}
+
+php8.3-tidy_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - tidy HTML module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/*tidy*.so"
+ }
+}
+
+php8.3-xsl_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - XSL module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/xsl.so"
+ }
+}
+
+php8.3-sodium_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - sodium module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/sodium.so"
+ }
+}
+
+php8.3-ffi_package() {
+ lib32disabled=yes
+ depends="php${_php_version}>=${version}_${revision}"
+ short_desc+=' - FFI module'
+ pkg_install() {
+ vmove "usr/lib/php${_php_version}/modules/ffi.so"
+ }
+}
diff --git a/srcpkgs/php8.3/update b/srcpkgs/php8.3/update
new file mode 100644
index 0000000000000..60d5e612b273e
--- /dev/null
+++ b/srcpkgs/php8.3/update
@@ -0,0 +1,3 @@
+pkgname=php
+ignore="8.[4-9].*"
+site="https://www.php.net/distributions/"
From ee1e649f9b8b3a50a7d316ba839fd3c2aa2d75f3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:14 -0500
Subject: [PATCH 02/19] New package: php8.3-apcu-5.1.23
---
srcpkgs/php8.3-apcu/files/README.voidlinux | 3 +++
srcpkgs/php8.3-apcu/template | 29 ++++++++++++++++++++++
srcpkgs/php8.3-apcu/update | 2 ++
3 files changed, 34 insertions(+)
create mode 100644 srcpkgs/php8.3-apcu/files/README.voidlinux
create mode 100644 srcpkgs/php8.3-apcu/template
create mode 100644 srcpkgs/php8.3-apcu/update
diff --git a/srcpkgs/php8.3-apcu/files/README.voidlinux b/srcpkgs/php8.3-apcu/files/README.voidlinux
new file mode 100644
index 0000000000000..9da8a70ccc2ba
--- /dev/null
+++ b/srcpkgs/php8.3-apcu/files/README.voidlinux
@@ -0,0 +1,3 @@
+To enable APCu add the following line to your php.ini:
+
+ extension=apcu.so
diff --git a/srcpkgs/php8.3-apcu/template b/srcpkgs/php8.3-apcu/template
new file mode 100644
index 0000000000000..3867ccf2bb405
--- /dev/null
+++ b/srcpkgs/php8.3-apcu/template
@@ -0,0 +1,29 @@
+# Template file for 'php8.3-apcu'
+pkgname=php8.3-apcu
+version=5.1.23
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.3"
+make_check_target=test
+hostmakedepends="autoconf php8.3-devel"
+makedepends="php8.3-devel pcre2-devel"
+depends="php8.3"
+short_desc="In-memory key-value store for PHP"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://pecl.php.net/package/APCu"
+distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
+checksum=67ee7464ccad2335c3fa4aeb0b8edbcf6d8344feea7922620c6a13015d604482
+
+pre_configure() {
+ phpize8.3
+}
+
+pre_install() {
+ make_install_args="INSTALL_ROOT=$DESTDIR"
+}
+
+post_install() {
+ rm -r $DESTDIR/usr/include
+ vdoc "${FILESDIR}/README.voidlinux"
+}
diff --git a/srcpkgs/php8.3-apcu/update b/srcpkgs/php8.3-apcu/update
new file mode 100644
index 0000000000000..ad899519e3138
--- /dev/null
+++ b/srcpkgs/php8.3-apcu/update
@@ -0,0 +1,2 @@
+site="https://pecl.php.net/package/APCu"
+pattern="apcu-\K[\d\.]*(?=\.tgz)"
From 5887ff9613aae4cfd3276b1e1b2fd730a1d516a6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:33 -0500
Subject: [PATCH 03/19] New package: php8.3-ast-1.1.1
---
srcpkgs/php8.3-ast/files/README.voidlinux | 2 ++
srcpkgs/php8.3-ast/template | 28 +++++++++++++++++++++++
2 files changed, 30 insertions(+)
create mode 100644 srcpkgs/php8.3-ast/files/README.voidlinux
create mode 100644 srcpkgs/php8.3-ast/template
diff --git a/srcpkgs/php8.3-ast/files/README.voidlinux b/srcpkgs/php8.3-ast/files/README.voidlinux
new file mode 100644
index 0000000000000..0dd0b5df2d961
--- /dev/null
+++ b/srcpkgs/php8.3-ast/files/README.voidlinux
@@ -0,0 +1,2 @@
+To enable the ast extension please add the following to php.ini:
+ extension=ast.so
diff --git a/srcpkgs/php8.3-ast/template b/srcpkgs/php8.3-ast/template
new file mode 100644
index 0000000000000..c2764714bb268
--- /dev/null
+++ b/srcpkgs/php8.3-ast/template
@@ -0,0 +1,28 @@
+# Template file for 'php8.3-ast'
+pkgname=php8.3-ast
+version=1.1.1
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.3"
+make_check_target="test"
+hostmakedepends="php8.3-devel autoconf"
+makedepends="php8.3-devel"
+depends="php8.3"
+checkdepends="${depends}"
+short_desc="Exposes the abstract syntax tree generated by PHP"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/nikic/php-ast"
+distfiles="https://pecl.php.net/get/ast-${version}.tgz"
+checksum=0c55e09a4da43b9cc1da72ecb4ae892941f73e157b73d46326bc6a5ed7fc44b1
+make_check_pre="env NO_INTERACTION=1"
+
+pre_configure() {
+ phpize8.3
+}
+
+do_install() {
+ make INSTALL_ROOT=${DESTDIR} install
+ vlicense LICENSE
+ vdoc "${FILESDIR}/README.voidlinux"
+}
From 8dd502ce7edcdcbc008f69b07dbcc0cd5a934d87 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:46 -0500
Subject: [PATCH 04/19] New package: php8.3-mongodb-1.17.0
---
srcpkgs/php8.3-mongodb/INSTALL.msg | 3 +++
srcpkgs/php8.3-mongodb/template | 24 ++++++++++++++++++++++++
srcpkgs/php8.3-mongodb/update | 1 +
3 files changed, 28 insertions(+)
create mode 100644 srcpkgs/php8.3-mongodb/INSTALL.msg
create mode 100644 srcpkgs/php8.3-mongodb/template
create mode 100644 srcpkgs/php8.3-mongodb/update
diff --git a/srcpkgs/php8.3-mongodb/INSTALL.msg b/srcpkgs/php8.3-mongodb/INSTALL.msg
new file mode 100644
index 0000000000000..173fab80af8df
--- /dev/null
+++ b/srcpkgs/php8.3-mongodb/INSTALL.msg
@@ -0,0 +1,3 @@
+To enable the MongoDB extension add the following line to your php.ini:
+
+ extension=mongodb
diff --git a/srcpkgs/php8.3-mongodb/template b/srcpkgs/php8.3-mongodb/template
new file mode 100644
index 0000000000000..b26ed2b328602
--- /dev/null
+++ b/srcpkgs/php8.3-mongodb/template
@@ -0,0 +1,24 @@
+# Template file for 'php8.3-mongodb'
+pkgname=php8.3-mongodb
+version=1.17.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.3"
+hostmakedepends="php8.3-devel autoconf pkg-config"
+makedepends="php8.3-devel pcre2-devel openssl-devel"
+depends="php8.3"
+short_desc="Official MongoDB PHP driver"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://pecl.php.net/package/mongodb"
+changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
+distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
+checksum=5e7db95103d73212ed0edf8887d92184baa5643476045cb899efbcf439847148
+
+pre_configure() {
+ phpize8.3
+}
+
+pre_install() {
+ make_install_args="INSTALL_ROOT=$DESTDIR"
+}
diff --git a/srcpkgs/php8.3-mongodb/update b/srcpkgs/php8.3-mongodb/update
new file mode 100644
index 0000000000000..fb47044a964d5
--- /dev/null
+++ b/srcpkgs/php8.3-mongodb/update
@@ -0,0 +1 @@
+pattern='<th.*Release \K[\d.]+(?=:</th>)'
From 89cfc8555f757cf8345f19927892bbcf329a58d9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:52 -0500
Subject: [PATCH 05/19] New package: php8.3-igbinary-3.2.14
---
srcpkgs/php8.3-igbinary/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/php8.3-igbinary/template
diff --git a/srcpkgs/php8.3-igbinary/template b/srcpkgs/php8.3-igbinary/template
new file mode 100644
index 0000000000000..0604502c4c8d7
--- /dev/null
+++ b/srcpkgs/php8.3-igbinary/template
@@ -0,0 +1,24 @@
+# Template file for 'php8.3-igbinary'
+pkgname=php8.3-igbinary
+version=3.2.14
+revision=1
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.3"
+hostmakedepends="autoconf php8.3-devel"
+makedepends="php8.3-devel"
+depends="php8.3"
+short_desc="Igbinary is a drop in replacement for the standard php serializer"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/igbinary/igbinary/"
+distfiles="https://pecl.php.net/get/igbinary-${version}.tgz"
+checksum=6337147a4fb888072566674837bda9928ee06ee7f0114b4338b86c816232925d
+
+pre_configure() {
+ phpize8.3
+}
+
+do_install() {
+ make INSTALL_ROOT="${DESTDIR}" install
+ vlicense COPYING
+}
From 795b67df39455e262105af5511075a943cb02275 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:55 -0500
Subject: [PATCH 06/19] New package: php8.3-imagick-3.7.0
---
srcpkgs/php8.3-imagick/files/README.voidlinux | 3 ++
...le-libmagick-header-file-search-path.patch | 17 +++++++++++
srcpkgs/php8.3-imagick/template | 29 +++++++++++++++++++
srcpkgs/php8.3-imagick/update | 1 +
4 files changed, 50 insertions(+)
create mode 100644 srcpkgs/php8.3-imagick/files/README.voidlinux
create mode 100644 srcpkgs/php8.3-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
create mode 100644 srcpkgs/php8.3-imagick/template
create mode 100644 srcpkgs/php8.3-imagick/update
diff --git a/srcpkgs/php8.3-imagick/files/README.voidlinux b/srcpkgs/php8.3-imagick/files/README.voidlinux
new file mode 100644
index 0000000000000..00497519fcee5
--- /dev/null
+++ b/srcpkgs/php8.3-imagick/files/README.voidlinux
@@ -0,0 +1,3 @@
+To enable the Imagick extension add the following line to your php.ini:
+
+ extension=imagick.so
diff --git a/srcpkgs/php8.3-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch b/srcpkgs/php8.3-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
new file mode 100644
index 0000000000000..16b8aaa573715
--- /dev/null
+++ b/srcpkgs/php8.3-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
@@ -0,0 +1,17 @@
+--- a/imagemagick.m4 2021-09-09 10:53:42.287881616 +0200
++++ b/imagemagick.m4 2021-09-09 11:14:47.662312430 +0200
+@@ -167,6 +167,14 @@ AC_DEFUN([IM_FIND_IMAGEMAGICK],[
+
+ AC_MSG_RESULT([user location ${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/wand/MagickWand.h])
+
++ elif test -r "${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
++
++ IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
++ IM_HEADER_STYLE="SEVEN"
++ AC_DEFINE([IM_MAGICKWAND_HEADER_STYLE_SEVEN], [1], [ImageMagick 7.x style header])
++
++ AC_MSG_RESULT([${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h])
++
+ elif test -r "${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
+
+ IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
diff --git a/srcpkgs/php8.3-imagick/template b/srcpkgs/php8.3-imagick/template
new file mode 100644
index 0000000000000..a2c8ab21a8fc6
--- /dev/null
+++ b/srcpkgs/php8.3-imagick/template
@@ -0,0 +1,29 @@
+# Template file for 'php8.3-imagick'
+pkgname=php8.3-imagick
+version=3.7.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
+ --with-php-config=/usr/bin/php-config8.3"
+hostmakedepends="php8.3-devel autoconf pkg-config"
+makedepends="php8.3-devel pcre2-devel libmagick-devel"
+depends="php8.3"
+short_desc="Provides a PHP wrapper to the ImageMagick library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://pecl.php.net/package/imagick"
+distfiles="https://pecl.php.net/get/imagick-$version.tgz"
+checksum=5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e
+
+pre_configure() {
+ phpize8.3
+}
+
+pre_install() {
+ make_install_args="INSTALL_ROOT=$DESTDIR"
+}
+
+post_install() {
+ rm -r $DESTDIR/usr/include
+ vdoc "${FILESDIR}/README.voidlinux"
+}
diff --git a/srcpkgs/php8.3-imagick/update b/srcpkgs/php8.3-imagick/update
new file mode 100644
index 0000000000000..fb47044a964d5
--- /dev/null
+++ b/srcpkgs/php8.3-imagick/update
@@ -0,0 +1 @@
+pattern='<th.*Release \K[\d.]+(?=:</th>)'
From fa93dfd133aee7536c1d8268b9bb3b5e596bfaec Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:29 -0400
Subject: [PATCH 07/19] php8.1: update to 8.1.26, provide php-runtime vpkg.
---
srcpkgs/php8.1/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 9e4cbfef1d4b9..2894f2bddbc3e 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1'
pkgname=php8.1
-version=8.1.21
-revision=3
+version=8.1.26
+revision=1
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -17,7 +17,8 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
# this is the source where the www.php.net code pulls the tarballs it serves
# at https://www.php.net/distributions/
distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=a95f8d35924aa5705ad07a70dc994bf41b5d45126ecdec7aaad6edfbe5e1c37f
+checksum=d954cecfc3d294c2fccbe2b1a6bef784ce0d6c5d44a9e28f8a527e092825f2cb
+provides="php-runtime-${version}_1"
conf_files="/etc/php${_php_version}/php.ini"
From 0d95320cbcff9ce5063b8f4710150d12fab05b0e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:07 -0500
Subject: [PATCH 08/19] php8.1-apcu: update to 5.1.23.
---
srcpkgs/php8.1-apcu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.1-apcu/template b/srcpkgs/php8.1-apcu/template
index 421ae51b09c89..9c9b8a72be969 100644
--- a/srcpkgs/php8.1-apcu/template
+++ b/srcpkgs/php8.1-apcu/template
@@ -1,6 +1,6 @@
# Template file for 'php8.1-apcu'
pkgname=php8.1-apcu
-version=5.1.22
+version=5.1.23
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="PHP-3.01"
homepage="https://pecl.php.net/package/APCu"
distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
-checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
+checksum=67ee7464ccad2335c3fa4aeb0b8edbcf6d8344feea7922620c6a13015d604482
pre_configure() {
phpize8.1
From ab579f8afe39ed8801e2b7eb6775a7468e154577 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:24 -0500
Subject: [PATCH 09/19] php8.1-ast: update to 1.1.1.
---
srcpkgs/php8.1-ast/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.1-ast/template b/srcpkgs/php8.1-ast/template
index 119401d3316cf..b1306a30c210c 100644
--- a/srcpkgs/php8.1-ast/template
+++ b/srcpkgs/php8.1-ast/template
@@ -1,6 +1,6 @@
# Template file for 'php8.1-ast'
pkgname=php8.1-ast
-version=1.1.0
+version=1.1.1
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
@@ -14,7 +14,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="BSD-3-Clause"
homepage="https://github.com/nikic/php-ast"
distfiles="https://pecl.php.net/get/ast-${version}.tgz"
-checksum=ee3d4f67e24d82e4d340806a24052012e4954d223122949377665427443e6d13
+checksum=0c55e09a4da43b9cc1da72ecb4ae892941f73e157b73d46326bc6a5ed7fc44b1
make_check_pre="env NO_INTERACTION=1"
pre_configure() {
From a4f31dde1463e261aa3d3b60149d0c31ac40e5db Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:38 -0500
Subject: [PATCH 10/19] php8.1-mongodb: update to 1.17.0.
---
srcpkgs/php8.1-mongodb/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/php8.1-mongodb/template b/srcpkgs/php8.1-mongodb/template
index 5913b3e420393..a92d0a2a0fb85 100644
--- a/srcpkgs/php8.1-mongodb/template
+++ b/srcpkgs/php8.1-mongodb/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1-mongodb'
pkgname=php8.1-mongodb
-version=1.16.1
-revision=2
+version=1.17.0
+revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
hostmakedepends="php8.1-devel autoconf pkg-config"
@@ -13,7 +13,7 @@ license="Apache-2.0"
homepage="https://pecl.php.net/package/mongodb"
changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
-checksum=2c5b7c7ccf6ca26d25af8487f4028390f0a7dc49efb2eb360a65840e1d6f566e
+checksum=5e7db95103d73212ed0edf8887d92184baa5643476045cb899efbcf439847148
pre_configure() {
phpize8.1
From b1f6cd776b8c5d98cce5bb3ad82fbeb4d155453d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:39 -0400
Subject: [PATCH 11/19] xdebug8.1: update to 3.2.2.
---
srcpkgs/xdebug8.1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xdebug8.1/template b/srcpkgs/xdebug8.1/template
index 31e615b5ccb5b..d8d13c0349040 100644
--- a/srcpkgs/xdebug8.1/template
+++ b/srcpkgs/xdebug8.1/template
@@ -1,6 +1,6 @@
# Template file for 'xdebug8.1'
pkgname=xdebug8.1
-version=3.2.1
+version=3.2.2
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
@@ -12,7 +12,7 @@ license="PHP-3.0"
homepage="http://xdebug.org"
changelog="https://xdebug.org/updates"
distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
-checksum=ef4cb3c228192798874e4530cccceee76840cc80821909740088a1e1a8f00445
+checksum=f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157
pre_configure() {
phpize8.1
From bdb6e3a39aaddabe48bf1639fb75e8cc753ea475 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:50 -0400
Subject: [PATCH 12/19] phpMyAdmin: update to 5.2.1, depend on php-runtime
virtual package.
---
srcpkgs/phpMyAdmin/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/phpMyAdmin/template b/srcpkgs/phpMyAdmin/template
index 7f0b5f024df54..dc9f179f89451 100644
--- a/srcpkgs/phpMyAdmin/template
+++ b/srcpkgs/phpMyAdmin/template
@@ -1,15 +1,15 @@
# Template file for 'phpMyAdmin'
pkgname=phpMyAdmin
-version=5.2.0
-revision=2
+version=5.2.1
+revision=1
conf_files="/etc/webapps/phpMyAdmin/config.inc.php"
-depends="php8.1 mariadb"
+depends="virtual?php-runtime"
short_desc="Web interface for MySQL and MariaDB"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="GPL-2.0-only"
homepage="https://www.phpmyadmin.net"
distfiles="https://files.phpmyadmin.net/phpMyAdmin/${version}/phpMyAdmin-${version}-all-languages.tar.xz"
-checksum=66da31ca295f06182ac3f2e6e96057dc824c459baedf4b29de6ed0d3be039230
+checksum=373f9599dfbd96d6fe75316d5dad189e68c305f297edf42377db9dd6b41b2557
do_install() {
vmkdir usr/share/webapps/
From a9967b6059eeef8f23e8b78c52114135703314f7 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:55 -0400
Subject: [PATCH 13/19] phoronix-test-suite: depend on php-runtime virtual
package.
---
srcpkgs/phoronix-test-suite/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/phoronix-test-suite/template b/srcpkgs/phoronix-test-suite/template
index 16b4034bec27b..341d406258426 100644
--- a/srcpkgs/phoronix-test-suite/template
+++ b/srcpkgs/phoronix-test-suite/template
@@ -1,8 +1,8 @@
# Template file for 'phoronix-test-suite'
pkgname=phoronix-test-suite
version=10.8.4
-revision=2
-depends="php8.1"
+revision=3
+depends="virtual?php-runtime"
short_desc="Comprehensive testing and benchmarking platform for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
From d70f89c1eec9584430aba35178783f319c554a38 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:59 -0400
Subject: [PATCH 14/19] ampache: update to 5.6.2, depend on php-runtime virtual
package.
---
srcpkgs/ampache/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ampache/template b/srcpkgs/ampache/template
index d820e758f355e..2587dc4ec6adf 100644
--- a/srcpkgs/ampache/template
+++ b/srcpkgs/ampache/template
@@ -1,16 +1,16 @@
# Template file for 'ampache'
pkgname=ampache
-version=5.5.1
+version=5.6.2
revision=1
create_wrksrc=yes
hostmakedepends="unzip"
-depends="php8.1 mariadb"
+depends="virtual?php-runtime"
short_desc="Web-based tool for managing your audio/video files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="AGPL-3.0-or-later"
homepage="https://ampache.org"
distfiles="https://github.com/ampache/ampache/releases/download/${version}/${pkgname}-${version}_all.zip"
-checksum=3e37839058c263be990915759eecab9b5da3ec324638a7ff7d8094516f56a85c
+checksum=e406ff9de1537c3854ed9fad2ffdf854e193908617f8f409fa5de9036fed0927
python_version=3
do_install() {
From 3afecdba37314ee75267ec83533e6bc8a9126436 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 11:42:27 -0500
Subject: [PATCH 15/19] php8.2: update to 8.2.13, provide php-runtime vpkg.
---
srcpkgs/php8.2/patches/php-cross-config.patch | 6 +++---
srcpkgs/php8.2/template | 7 ++++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/php8.2/patches/php-cross-config.patch b/srcpkgs/php8.2/patches/php-cross-config.patch
index 169c43f1df932..1956e6690abe2 100644
--- a/srcpkgs/php8.2/patches/php-cross-config.patch
+++ b/srcpkgs/php8.2/patches/php-cross-config.patch
@@ -1,8 +1,8 @@
diff --git a/configure b/configure
-index e4b82d1..1a8678f 100755
+index 1f5489d..a7e9276 100755
--- a/configure
+++ b/configure
-@@ -62424,7 +62424,7 @@ printf %s "checking for pg_config... " >&6; }
+@@ -63653,7 +63653,7 @@ printf %s "checking for pg_config... " >&6; }
fi
done
@@ -11,7 +11,7 @@ index e4b82d1..1a8678f 100755
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
printf "%s\n" "$PG_CONFIG" >&6; }
PGSQL_INCLUDE=`$PG_CONFIG --includedir`
-@@ -63948,7 +63948,7 @@ printf %s "checking for pg_config... " >&6; }
+@@ -65177,7 +65177,7 @@ printf %s "checking for pg_config... " >&6; }
fi
done
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index add04b4d3d562..e7fb74102db49 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
-version=8.2.8
-revision=3
+version=8.2.13
+revision=1
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -17,7 +17,8 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
# this is the source where the www.php.net code pulls the tarballs it serves
# at https://www.php.net/distributions/
distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=6419b74e9b675c8d5a1afd2788c4d7996a19bbe2be409716ccb2067897af9df1
+checksum=6a194038f5a9e46d8f70a9d59c072c3b08d6edbdd8e304096e24ccf2225bcf1b
+provides="php-runtime-${version}_1"
conf_files="/etc/php${_php_version}/php.ini"
From e2437ad4af27a9267d9408cd6c129d9ae1203178 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:11 -0500
Subject: [PATCH 16/19] php8.2-apcu: update to 5.1.23.
---
srcpkgs/php8.2-apcu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.2-apcu/template b/srcpkgs/php8.2-apcu/template
index 182d4cda02d54..9ea5841c94929 100644
--- a/srcpkgs/php8.2-apcu/template
+++ b/srcpkgs/php8.2-apcu/template
@@ -1,6 +1,6 @@
# Template file for 'php8.2-apcu'
pkgname=php8.2-apcu
-version=5.1.22
+version=5.1.23
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.2"
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="PHP-3.01"
homepage="https://pecl.php.net/package/APCu"
distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
-checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
+checksum=67ee7464ccad2335c3fa4aeb0b8edbcf6d8344feea7922620c6a13015d604482
pre_configure() {
phpize8.2
From d72044570f9fd83e0abb73e38bef2de230f27c36 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:27 -0500
Subject: [PATCH 17/19] php8.2-ast: update to 1.1.1.
---
srcpkgs/php8.2-ast/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.2-ast/template b/srcpkgs/php8.2-ast/template
index 2d61ff7665f82..fccc6bc98ad09 100644
--- a/srcpkgs/php8.2-ast/template
+++ b/srcpkgs/php8.2-ast/template
@@ -1,6 +1,6 @@
# Template file for 'php8.2-ast'
pkgname=php8.2-ast
-version=1.1.0
+version=1.1.1
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.2"
@@ -14,7 +14,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="BSD-3-Clause"
homepage="https://github.com/nikic/php-ast"
distfiles="https://pecl.php.net/get/ast-${version}.tgz"
-checksum=ee3d4f67e24d82e4d340806a24052012e4954d223122949377665427443e6d13
+checksum=0c55e09a4da43b9cc1da72ecb4ae892941f73e157b73d46326bc6a5ed7fc44b1
make_check_pre="env NO_INTERACTION=1"
pre_configure() {
From 9c07bb69012011276ef22ba7cf5f05ab4514b0b7 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Nov 2023 12:14:43 -0500
Subject: [PATCH 18/19] php8.2-mongodb: update to 1.17.0.
---
srcpkgs/php8.2-mongodb/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/php8.2-mongodb/template b/srcpkgs/php8.2-mongodb/template
index 7278a83c1017a..7269686cd915a 100644
--- a/srcpkgs/php8.2-mongodb/template
+++ b/srcpkgs/php8.2-mongodb/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2-mongodb'
pkgname=php8.2-mongodb
-version=1.16.1
-revision=2
+version=1.17.0
+revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.2"
hostmakedepends="php8.2-devel autoconf pkg-config"
@@ -13,7 +13,7 @@ license="Apache-2.0"
homepage="https://pecl.php.net/package/mongodb"
changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
-checksum=2c5b7c7ccf6ca26d25af8487f4028390f0a7dc49efb2eb360a65840e1d6f566e
+checksum=5e7db95103d73212ed0edf8887d92184baa5643476045cb899efbcf439847148
pre_configure() {
phpize8.2
From 73d0bfcbc78c0a4c6ff96bf8d0c9f0adee583d05 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:41 -0400
Subject: [PATCH 19/19] xdebug8.2: update to 3.2.2.
---
srcpkgs/xdebug8.2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xdebug8.2/template b/srcpkgs/xdebug8.2/template
index c8c480b0317a6..94d61346db1eb 100644
--- a/srcpkgs/xdebug8.2/template
+++ b/srcpkgs/xdebug8.2/template
@@ -1,6 +1,6 @@
# Template file for 'xdebug8.2'
pkgname=xdebug8.2
-version=3.2.1
+version=3.2.2
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.2"
@@ -12,7 +12,7 @@ license="PHP-3.0"
homepage="http://xdebug.org"
changelog="https://xdebug.org/updates"
distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
-checksum=ef4cb3c228192798874e4530cccceee76840cc80821909740088a1e1a8f00445
+checksum=f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157
pre_configure() {
phpize8.2
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: PHP updates and virtual package support
2023-08-08 14:33 [PR PATCH] PHP updates and virtual package support TinfoilSubmarine
` (8 preceding siblings ...)
2023-11-28 18:35 ` TinfoilSubmarine
@ 2023-12-02 5:53 ` classabbyamp
2023-12-04 13:37 ` TinfoilSubmarine
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: classabbyamp @ 2023-12-02 5:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 160 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/45493#issuecomment-1837052486
Comment:
ready to go?
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: PHP updates and virtual package support
2023-08-08 14:33 [PR PATCH] PHP updates and virtual package support TinfoilSubmarine
` (9 preceding siblings ...)
2023-12-02 5:53 ` classabbyamp
@ 2023-12-04 13:37 ` TinfoilSubmarine
2023-12-13 14:16 ` TinfoilSubmarine
2023-12-13 17:46 ` [PR PATCH] [Merged]: " classabbyamp
12 siblings, 0 replies; 14+ messages in thread
From: TinfoilSubmarine @ 2023-12-04 13:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 272 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/45493#issuecomment-1838660513
Comment:
Yes; I haven't tested PHP 8.3 extensively as none of my use cases support it yet, but from initial testing it seems fine.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: PHP updates and virtual package support
2023-08-08 14:33 [PR PATCH] PHP updates and virtual package support TinfoilSubmarine
` (10 preceding siblings ...)
2023-12-04 13:37 ` TinfoilSubmarine
@ 2023-12-13 14:16 ` TinfoilSubmarine
2023-12-13 17:46 ` [PR PATCH] [Merged]: " classabbyamp
12 siblings, 0 replies; 14+ messages in thread
From: TinfoilSubmarine @ 2023-12-13 14:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/45493#issuecomment-1853998527
Comment:
My local Nextcloud install is working fine with 8.3.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Merged]: PHP updates and virtual package support
2023-08-08 14:33 [PR PATCH] PHP updates and virtual package support TinfoilSubmarine
` (11 preceding siblings ...)
2023-12-13 14:16 ` TinfoilSubmarine
@ 2023-12-13 17:46 ` classabbyamp
12 siblings, 0 replies; 14+ messages in thread
From: classabbyamp @ 2023-12-13 17:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]
There's a merged pull request on the void-packages repository
PHP updates and virtual package support
https://github.com/void-linux/void-packages/pull/45493
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Supersedes https://github.com/void-linux/void-packages/pull/44946
I need some help testing this as I don't use ampache or phpMyAdmin.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2023-12-13 17:46 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-08 14:33 [PR PATCH] PHP updates and virtual package support TinfoilSubmarine
2023-08-08 20:21 ` [PR REVIEW] " classabbyamp
2023-08-08 20:29 ` TinfoilSubmarine
2023-08-11 19:45 ` TinfoilSubmarine
2023-08-11 21:02 ` MeganerdNL
2023-09-27 14:49 ` [PR PATCH] [Updated] " TinfoilSubmarine
2023-09-27 15:01 ` TinfoilSubmarine
2023-11-28 17:18 ` TinfoilSubmarine
2023-11-28 17:33 ` TinfoilSubmarine
2023-11-28 18:35 ` TinfoilSubmarine
2023-12-02 5:53 ` classabbyamp
2023-12-04 13:37 ` TinfoilSubmarine
2023-12-13 14:16 ` TinfoilSubmarine
2023-12-13 17:46 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).