* Re: [PR PATCH] [Updated] php8.[01]: add php8.[01]-pear subpackage.
2022-09-23 17:51 [PR PATCH] php8.[01]: add php8.[01]-pear subpackage TinfoilSubmarine
@ 2022-09-26 14:40 ` TinfoilSubmarine
2022-09-29 13:16 ` TinfoilSubmarine
` (14 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-09-26 14:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1287 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php-pear
https://github.com/void-linux/void-packages/pull/39438
php8.[01]: add php8.[01]-pear subpackage.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/39438.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-pear-39438.patch --]
[-- Type: text/x-diff, Size: 5473 bytes --]
From c368342b4ea95229b07a735613cec47e80f6f4c5 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:03:12 -0400
Subject: [PATCH 1/2] php8.0: add php8.0-pear subpackage.
---
srcpkgs/php8.0-pear | 1 +
srcpkgs/php8.0/template | 28 ++++++++++++++++++++++++----
2 files changed, 25 insertions(+), 4 deletions(-)
create mode 120000 srcpkgs/php8.0-pear
diff --git a/srcpkgs/php8.0-pear b/srcpkgs/php8.0-pear
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-pear
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 4b2fa162e3e3..17c46a76c1ec 100644
--- a/srcpkgs/php8.0/template
+++ b/srcpkgs/php8.0/template
@@ -1,7 +1,7 @@
# Template file for 'php8.0'
pkgname=php8.0
version=8.0.23
-revision=1
+revision=2
_php_version=8.0
wrksrc="php-${version}"
hostmakedepends="bison pkg-config apache-devel"
@@ -23,7 +23,7 @@ conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +90,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -112,7 +112,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +218,26 @@ php8.0-embed_package() {
}
}
+php8.0-pear_package() {
+ lib32disabled=yes
+ depends="php${_php_version}-${version}_${revision}"
+ 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.0-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
From 0abc2b640e3d420b2f9ebe2080d1656e23efa06c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:06:45 -0400
Subject: [PATCH 2/2] php8.1: add php8.1-pear subpackage.
---
srcpkgs/php8.1-pear | 1 +
srcpkgs/php8.1/template | 28 ++++++++++++++++++++++++----
2 files changed, 25 insertions(+), 4 deletions(-)
create mode 120000 srcpkgs/php8.1-pear
diff --git a/srcpkgs/php8.1-pear b/srcpkgs/php8.1-pear
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-pear
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index f18fa2cb9a7c..5b531400f541 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.10
-revision=1
+revision=2
_php_version=8.1
wrksrc="php-${version}"
hostmakedepends="bison pkg-config apache-devel"
@@ -23,7 +23,7 @@ conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +90,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -112,7 +112,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +218,26 @@ php8.1-embed_package() {
}
}
+php8.1-pear_package() {
+ lib32disabled=yes
+ depends="php${_php_version}-${version}_${revision}"
+ 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.1-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] php8.[01]: add php8.[01]-pear subpackage.
2022-09-23 17:51 [PR PATCH] php8.[01]: add php8.[01]-pear subpackage TinfoilSubmarine
2022-09-26 14:40 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2022-09-29 13:16 ` TinfoilSubmarine
2022-09-29 13:28 ` TinfoilSubmarine
` (13 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-09-29 13:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1287 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php-pear
https://github.com/void-linux/void-packages/pull/39438
php8.[01]: add php8.[01]-pear subpackage.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/39438.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-pear-39438.patch --]
[-- Type: text/x-diff, Size: 5473 bytes --]
From da09cf132ee95560d06318c4a77d0f848c49b60a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:03:12 -0400
Subject: [PATCH 1/2] php8.0: add php8.0-pear subpackage.
---
srcpkgs/php8.0-pear | 1 +
srcpkgs/php8.0/template | 28 ++++++++++++++++++++++++----
2 files changed, 25 insertions(+), 4 deletions(-)
create mode 120000 srcpkgs/php8.0-pear
diff --git a/srcpkgs/php8.0-pear b/srcpkgs/php8.0-pear
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-pear
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 4b2fa162e3e3..17c46a76c1ec 100644
--- a/srcpkgs/php8.0/template
+++ b/srcpkgs/php8.0/template
@@ -1,7 +1,7 @@
# Template file for 'php8.0'
pkgname=php8.0
version=8.0.23
-revision=1
+revision=2
_php_version=8.0
wrksrc="php-${version}"
hostmakedepends="bison pkg-config apache-devel"
@@ -23,7 +23,7 @@ conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +90,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -112,7 +112,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +218,26 @@ php8.0-embed_package() {
}
}
+php8.0-pear_package() {
+ lib32disabled=yes
+ depends="php${_php_version}-${version}_${revision}"
+ 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.0-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
From 0ae1fe34a28792f0adafe9825cf91c4557e96e26 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:06:45 -0400
Subject: [PATCH 2/2] php8.1: add php8.1-pear subpackage.
---
srcpkgs/php8.1-pear | 1 +
srcpkgs/php8.1/template | 28 ++++++++++++++++++++++++----
2 files changed, 25 insertions(+), 4 deletions(-)
create mode 120000 srcpkgs/php8.1-pear
diff --git a/srcpkgs/php8.1-pear b/srcpkgs/php8.1-pear
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-pear
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index f18fa2cb9a7c..5b531400f541 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.10
-revision=1
+revision=2
_php_version=8.1
wrksrc="php-${version}"
hostmakedepends="bison pkg-config apache-devel"
@@ -23,7 +23,7 @@ conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +90,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -112,7 +112,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +218,26 @@ php8.1-embed_package() {
}
}
+php8.1-pear_package() {
+ lib32disabled=yes
+ depends="php${_php_version}-${version}_${revision}"
+ 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.1-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: php8.[01]: add php8.[01]-pear subpackage.
2022-09-23 17:51 [PR PATCH] php8.[01]: add php8.[01]-pear subpackage TinfoilSubmarine
2022-09-26 14:40 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-09-29 13:16 ` TinfoilSubmarine
@ 2022-09-29 13:28 ` TinfoilSubmarine
2022-09-30 13:19 ` TinfoilSubmarine
` (12 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-09-29 13:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 633 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/39438#issuecomment-1262283840
Comment:
```
=> php8.1-8.1.10_2: running do-fetch hook: 00-distfiles ...
=> php8.1-8.1.10_2: fetching distfile 'php-8.1.10.tar.gz' from 'https://www.php.net/distributions/php-8.1.10.tar.gz'...
https://www.php.net/distributions/php-8.1.10.tar.gz: Service Unavailable
=> ERROR: php8.1-8.1.10_2: failed to fetch 'php-8.1.10.tar.gz'.
Error: Process completed with exit code 1.
```
Great, looks like https://github.com/void-linux/void-packages/pull/36026#issuecomment-1061348932 again...
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: php8.[01]: add php8.[01]-pear subpackage.
2022-09-23 17:51 [PR PATCH] php8.[01]: add php8.[01]-pear subpackage TinfoilSubmarine
` (2 preceding siblings ...)
2022-09-29 13:28 ` TinfoilSubmarine
@ 2022-09-30 13:19 ` TinfoilSubmarine
2022-09-30 13:32 ` [PR PATCH] [Updated] " TinfoilSubmarine
` (11 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-09-30 13:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 241 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/39438#issuecomment-1263567172
Comment:
Possibly related issue for the www.php.net code: https://github.com/php/web-php/issues/483
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] php8.[01]: add php8.[01]-pear subpackage.
2022-09-23 17:51 [PR PATCH] php8.[01]: add php8.[01]-pear subpackage TinfoilSubmarine
` (3 preceding siblings ...)
2022-09-30 13:19 ` TinfoilSubmarine
@ 2022-09-30 13:32 ` TinfoilSubmarine
2022-10-07 13:12 ` [PR PATCH] [Updated] PHP 7.4.32, PHP 8.0.24 + pear, PHP 8.1.11 + pear TinfoilSubmarine
` (10 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-09-30 13:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1287 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php-pear
https://github.com/void-linux/void-packages/pull/39438
php8.[01]: add php8.[01]-pear subpackage.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/39438.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-pear-39438.patch --]
[-- Type: text/x-diff, Size: 8849 bytes --]
From 1dc9b3f2eca4ba81f9bc7eeae56fd5f0b6078483 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 30 Sep 2022 09:27:11 -0400
Subject: [PATCH 1/3] php: update to 7.4.32.
---
srcpkgs/php/template | 10 ++++++----
srcpkgs/php/update | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3eb8e38cd928..2173e7f9a3af 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
# Template file for 'php'
pkgname=php
-version=7.4.30
-revision=2
+version=7.4.32
+revision=1
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
@@ -13,8 +13,10 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="PHP-3.01"
homepage="https://www.php.net"
changelog="https://www.php.net/ChangeLog-7.php"
-distfiles="http://www.php.net/distributions/php-${version}.tar.xz"
-checksum=ea72a34f32c67e79ac2da7dfe96177f3c451c3eefae5810ba13312ed398ba70d
+# 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=197e3372afd69694eb6b230838305eb9e1cbe5db272e0fa3bbe0d38e329a95bc
conf_files="/etc/php/php.ini"
diff --git a/srcpkgs/php/update b/srcpkgs/php/update
index ac2289b24b76..caf45c0dd8d1 100644
--- a/srcpkgs/php/update
+++ b/srcpkgs/php/update
@@ -1 +1,2 @@
ignore="8.*"
+site="https://www.php.net/distributions/"
From 481a66b6b10ccf5c6b1c2243ef09f391cc6c6268 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:03:12 -0400
Subject: [PATCH 2/3] php8.0: update to 8.0.24, add php8.0-pear subpackage.
---
srcpkgs/php8.0-pear | 1 +
srcpkgs/php8.0/template | 34 ++++++++++++++++++++++++++++------
srcpkgs/php8.0/update | 1 +
3 files changed, 30 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/php8.0-pear
diff --git a/srcpkgs/php8.0-pear b/srcpkgs/php8.0-pear
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-pear
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 4b2fa162e3e3..0e985fad88ab 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.23
+version=8.0.24
revision=1
_php_version=8.0
wrksrc="php-${version}"
@@ -15,15 +15,17 @@ 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"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=a2dd50e9c4a0328d921b6bc914e8b4e6572f94f09867318f88acca5ac4fa76c7
+# 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=6020843a2f1ce36745d958b3ca17f3fdc42e78a43899f552ab5dbc509ff19232
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +92,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -112,7 +114,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +220,26 @@ php8.0-embed_package() {
}
}
+php8.0-pear_package() {
+ lib32disabled=yes
+ depends="php${_php_version}-${version}_${revision}"
+ 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.0-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.0/update b/srcpkgs/php8.0/update
index c4d9bc5958ca..566cd8005690 100644
--- a/srcpkgs/php8.0/update
+++ b/srcpkgs/php8.0/update
@@ -1,2 +1,3 @@
pkgname=php
ignore="8.[1-9].*"
+site="https://www.php.net/distributions/"
From b1a5c7d1e24c919d57eb9740fd59ca829d597d06 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:06:45 -0400
Subject: [PATCH 3/3] php8.1: update to 8.1.11, add php8.1-pear subpackage.
---
srcpkgs/php8.1-pear | 1 +
srcpkgs/php8.1/template | 34 ++++++++++++++++++++++++++++------
srcpkgs/php8.1/update | 1 +
3 files changed, 30 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/php8.1-pear
diff --git a/srcpkgs/php8.1-pear b/srcpkgs/php8.1-pear
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-pear
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index f18fa2cb9a7c..75b2c3134c14 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.10
+version=8.1.11
revision=1
_php_version=8.1
wrksrc="php-${version}"
@@ -15,15 +15,17 @@ 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"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=3ea4f323109dfbc8d2631d08aa0e08602c1f713678e9dc6c750f081ef49eab0f
+# 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=3660e8408321149f5d382bb8eeb9ea7b12ea8dd7ea66069da33f6f7383750ab2
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +92,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -112,7 +114,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +220,26 @@ php8.1-embed_package() {
}
}
+php8.1-pear_package() {
+ lib32disabled=yes
+ depends="php${_php_version}-${version}_${revision}"
+ 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.1-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.1/update b/srcpkgs/php8.1/update
index 0c2792ec963f..e39f4573be89 100644
--- a/srcpkgs/php8.1/update
+++ b/srcpkgs/php8.1/update
@@ -1,2 +1,3 @@
pkgname=php
ignore="8.[2-9].*"
+site="https://www.php.net/distributions/"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] PHP 7.4.32, PHP 8.0.24 + pear, PHP 8.1.11 + pear
2022-09-23 17:51 [PR PATCH] php8.[01]: add php8.[01]-pear subpackage TinfoilSubmarine
` (4 preceding siblings ...)
2022-09-30 13:32 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2022-10-07 13:12 ` TinfoilSubmarine
2022-10-07 13:17 ` [PR PATCH] [Updated] PHP 7.4.32, PHP 8.0.24 + pear, PHP 8.1.11 + pear, php.*apcu 5.1.22 TinfoilSubmarine
` (9 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-10-07 13:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1395 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php-pear
https://github.com/void-linux/void-packages/pull/39438
PHP 7.4.32, PHP 8.0.24 + pear, PHP 8.1.11 + pear
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
I tested the changes in this PR:
- php: **briefly**
- php8.0: **YES**
- php8.0-pear: **briefly**
- php8.1: **YES**
- php8.1-pear: **briefly**
<!--
#### 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/39438.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-pear-39438.patch --]
[-- Type: text/x-diff, Size: 10891 bytes --]
From 21c32a0a61618f8bcab14f2d8b2a2b3df7ce2529 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 30 Sep 2022 09:27:11 -0400
Subject: [PATCH 1/5] php: update to 7.4.32.
---
srcpkgs/php/template | 10 ++++++----
srcpkgs/php/update | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3eb8e38cd928..2173e7f9a3af 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
# Template file for 'php'
pkgname=php
-version=7.4.30
-revision=2
+version=7.4.32
+revision=1
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
@@ -13,8 +13,10 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="PHP-3.01"
homepage="https://www.php.net"
changelog="https://www.php.net/ChangeLog-7.php"
-distfiles="http://www.php.net/distributions/php-${version}.tar.xz"
-checksum=ea72a34f32c67e79ac2da7dfe96177f3c451c3eefae5810ba13312ed398ba70d
+# 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=197e3372afd69694eb6b230838305eb9e1cbe5db272e0fa3bbe0d38e329a95bc
conf_files="/etc/php/php.ini"
diff --git a/srcpkgs/php/update b/srcpkgs/php/update
index ac2289b24b76..caf45c0dd8d1 100644
--- a/srcpkgs/php/update
+++ b/srcpkgs/php/update
@@ -1 +1,2 @@
ignore="8.*"
+site="https://www.php.net/distributions/"
From 0f4368ef1b18ef740dfde35ca78c3b89cb3a5ca2 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:03:12 -0400
Subject: [PATCH 2/5] php8.0: update to 8.0.24, add php8.0-pear subpackage.
---
srcpkgs/php8.0-pear | 1 +
srcpkgs/php8.0/template | 34 ++++++++++++++++++++++++++++------
srcpkgs/php8.0/update | 1 +
3 files changed, 30 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/php8.0-pear
diff --git a/srcpkgs/php8.0-pear b/srcpkgs/php8.0-pear
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-pear
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 4b2fa162e3e3..0e985fad88ab 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.23
+version=8.0.24
revision=1
_php_version=8.0
wrksrc="php-${version}"
@@ -15,15 +15,17 @@ 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"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=a2dd50e9c4a0328d921b6bc914e8b4e6572f94f09867318f88acca5ac4fa76c7
+# 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=6020843a2f1ce36745d958b3ca17f3fdc42e78a43899f552ab5dbc509ff19232
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +92,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -112,7 +114,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +220,26 @@ php8.0-embed_package() {
}
}
+php8.0-pear_package() {
+ lib32disabled=yes
+ depends="php${_php_version}-${version}_${revision}"
+ 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.0-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.0/update b/srcpkgs/php8.0/update
index c4d9bc5958ca..566cd8005690 100644
--- a/srcpkgs/php8.0/update
+++ b/srcpkgs/php8.0/update
@@ -1,2 +1,3 @@
pkgname=php
ignore="8.[1-9].*"
+site="https://www.php.net/distributions/"
From 97f5213fb3d239ca601472ec1f60cd0f068108a2 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:06:45 -0400
Subject: [PATCH 3/5] php8.1: update to 8.1.11, add php8.1-pear subpackage.
---
srcpkgs/php8.1-pear | 1 +
srcpkgs/php8.1/template | 34 ++++++++++++++++++++++++++++------
srcpkgs/php8.1/update | 1 +
3 files changed, 30 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/php8.1-pear
diff --git a/srcpkgs/php8.1-pear b/srcpkgs/php8.1-pear
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-pear
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index f18fa2cb9a7c..75b2c3134c14 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.10
+version=8.1.11
revision=1
_php_version=8.1
wrksrc="php-${version}"
@@ -15,15 +15,17 @@ 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"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=3ea4f323109dfbc8d2631d08aa0e08602c1f713678e9dc6c750f081ef49eab0f
+# 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=3660e8408321149f5d382bb8eeb9ea7b12ea8dd7ea66069da33f6f7383750ab2
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +92,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -112,7 +114,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +220,26 @@ php8.1-embed_package() {
}
}
+php8.1-pear_package() {
+ lib32disabled=yes
+ depends="php${_php_version}-${version}_${revision}"
+ 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.1-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.1/update b/srcpkgs/php8.1/update
index 0c2792ec963f..e39f4573be89 100644
--- a/srcpkgs/php8.1/update
+++ b/srcpkgs/php8.1/update
@@ -1,2 +1,3 @@
pkgname=php
ignore="8.[2-9].*"
+site="https://www.php.net/distributions/"
From 7fa9cd0a858afb82f1e011d4e9169efe4265edb0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:03:13 -0400
Subject: [PATCH 4/5] php8.0-apcu: update to 5.1.22.
---
srcpkgs/php8.0-apcu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.0-apcu/template b/srcpkgs/php8.0-apcu/template
index 0409dd840ff5..7dccffa049f6 100644
--- a/srcpkgs/php8.0-apcu/template
+++ b/srcpkgs/php8.0-apcu/template
@@ -1,6 +1,6 @@
# Template file for 'php8.0-apcu'
pkgname=php8.0-apcu
-version=5.1.21
+version=5.1.22
revision=1
wrksrc="apcu-${version}"
build_style=gnu-configure
@@ -14,7 +14,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=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize8.0
From 7dd90ec8f9a99826a7575c4279e0aecc08dbbfea Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:03:45 -0400
Subject: [PATCH 5/5] php8.1-apcu: update to 5.1.22.
---
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 60d5ca79143d..293a0d1020f4 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.21
+version=5.1.22
revision=1
wrksrc="apcu-${version}"
build_style=gnu-configure
@@ -14,7 +14,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=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize8.1
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] PHP 7.4.32, PHP 8.0.24 + pear, PHP 8.1.11 + pear, php.*apcu 5.1.22
2022-09-23 17:51 [PR PATCH] php8.[01]: add php8.[01]-pear subpackage TinfoilSubmarine
` (5 preceding siblings ...)
2022-10-07 13:12 ` [PR PATCH] [Updated] PHP 7.4.32, PHP 8.0.24 + pear, PHP 8.1.11 + pear TinfoilSubmarine
@ 2022-10-07 13:17 ` TinfoilSubmarine
2022-10-07 14:12 ` TinfoilSubmarine
` (8 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-10-07 13:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1413 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php-pear
https://github.com/void-linux/void-packages/pull/39438
PHP 7.4.32, PHP 8.0.24 + pear, PHP 8.1.11 + pear, php.*apcu 5.1.22
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
I tested the changes in this PR:
- php: **briefly**
- php8.0: **YES**
- php8.0-pear: **briefly**
- php8.1: **YES**
- php8.1-pear: **briefly**
<!--
#### 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/39438.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-pear-39438.patch --]
[-- Type: text/x-diff, Size: 11923 bytes --]
From 21c32a0a61618f8bcab14f2d8b2a2b3df7ce2529 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 30 Sep 2022 09:27:11 -0400
Subject: [PATCH 1/6] php: update to 7.4.32.
---
srcpkgs/php/template | 10 ++++++----
srcpkgs/php/update | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3eb8e38cd928..2173e7f9a3af 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
# Template file for 'php'
pkgname=php
-version=7.4.30
-revision=2
+version=7.4.32
+revision=1
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
@@ -13,8 +13,10 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="PHP-3.01"
homepage="https://www.php.net"
changelog="https://www.php.net/ChangeLog-7.php"
-distfiles="http://www.php.net/distributions/php-${version}.tar.xz"
-checksum=ea72a34f32c67e79ac2da7dfe96177f3c451c3eefae5810ba13312ed398ba70d
+# 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=197e3372afd69694eb6b230838305eb9e1cbe5db272e0fa3bbe0d38e329a95bc
conf_files="/etc/php/php.ini"
diff --git a/srcpkgs/php/update b/srcpkgs/php/update
index ac2289b24b76..caf45c0dd8d1 100644
--- a/srcpkgs/php/update
+++ b/srcpkgs/php/update
@@ -1 +1,2 @@
ignore="8.*"
+site="https://www.php.net/distributions/"
From 0f4368ef1b18ef740dfde35ca78c3b89cb3a5ca2 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:03:12 -0400
Subject: [PATCH 2/6] php8.0: update to 8.0.24, add php8.0-pear subpackage.
---
srcpkgs/php8.0-pear | 1 +
srcpkgs/php8.0/template | 34 ++++++++++++++++++++++++++++------
srcpkgs/php8.0/update | 1 +
3 files changed, 30 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/php8.0-pear
diff --git a/srcpkgs/php8.0-pear b/srcpkgs/php8.0-pear
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-pear
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 4b2fa162e3e3..0e985fad88ab 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.23
+version=8.0.24
revision=1
_php_version=8.0
wrksrc="php-${version}"
@@ -15,15 +15,17 @@ 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"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=a2dd50e9c4a0328d921b6bc914e8b4e6572f94f09867318f88acca5ac4fa76c7
+# 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=6020843a2f1ce36745d958b3ca17f3fdc42e78a43899f552ab5dbc509ff19232
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +92,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -112,7 +114,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +220,26 @@ php8.0-embed_package() {
}
}
+php8.0-pear_package() {
+ lib32disabled=yes
+ depends="php${_php_version}-${version}_${revision}"
+ 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.0-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.0/update b/srcpkgs/php8.0/update
index c4d9bc5958ca..566cd8005690 100644
--- a/srcpkgs/php8.0/update
+++ b/srcpkgs/php8.0/update
@@ -1,2 +1,3 @@
pkgname=php
ignore="8.[1-9].*"
+site="https://www.php.net/distributions/"
From 97f5213fb3d239ca601472ec1f60cd0f068108a2 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:06:45 -0400
Subject: [PATCH 3/6] php8.1: update to 8.1.11, add php8.1-pear subpackage.
---
srcpkgs/php8.1-pear | 1 +
srcpkgs/php8.1/template | 34 ++++++++++++++++++++++++++++------
srcpkgs/php8.1/update | 1 +
3 files changed, 30 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/php8.1-pear
diff --git a/srcpkgs/php8.1-pear b/srcpkgs/php8.1-pear
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-pear
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index f18fa2cb9a7c..75b2c3134c14 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.10
+version=8.1.11
revision=1
_php_version=8.1
wrksrc="php-${version}"
@@ -15,15 +15,17 @@ 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"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=3ea4f323109dfbc8d2631d08aa0e08602c1f713678e9dc6c750f081ef49eab0f
+# 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=3660e8408321149f5d382bb8eeb9ea7b12ea8dd7ea66069da33f6f7383750ab2
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +92,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -112,7 +114,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +220,26 @@ php8.1-embed_package() {
}
}
+php8.1-pear_package() {
+ lib32disabled=yes
+ depends="php${_php_version}-${version}_${revision}"
+ 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.1-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.1/update b/srcpkgs/php8.1/update
index 0c2792ec963f..e39f4573be89 100644
--- a/srcpkgs/php8.1/update
+++ b/srcpkgs/php8.1/update
@@ -1,2 +1,3 @@
pkgname=php
ignore="8.[2-9].*"
+site="https://www.php.net/distributions/"
From 3b146cff6d784b2948fe40b62d6b91d0d67d9142 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:15:58 -0400
Subject: [PATCH 4/6] php-apcu: update to 5.1.22.
---
srcpkgs/php-apcu/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/php-apcu/template b/srcpkgs/php-apcu/template
index 16c7b707761e..b5f0bbcccbd1 100644
--- a/srcpkgs/php-apcu/template
+++ b/srcpkgs/php-apcu/template
@@ -1,7 +1,7 @@
# Template file for 'php-apcu'
pkgname=php-apcu
-version=5.1.17
-revision=2
+version=5.1.22
+revision=1
wrksrc="apcu-${version}"
build_style=gnu-configure
make_check_target=test
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="PHP-3.01"
homepage="https://pecl.php.net/package/APCu"
distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
-checksum=6b11b477890a9c096ad856e0251920d1d8b9558b7d115256c027e0223755c793
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize
From 04173c4e711c3d4adf5b457cadaa11c0b94b9abc Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:03:13 -0400
Subject: [PATCH 5/6] php8.0-apcu: update to 5.1.22.
---
srcpkgs/php8.0-apcu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.0-apcu/template b/srcpkgs/php8.0-apcu/template
index 0409dd840ff5..7dccffa049f6 100644
--- a/srcpkgs/php8.0-apcu/template
+++ b/srcpkgs/php8.0-apcu/template
@@ -1,6 +1,6 @@
# Template file for 'php8.0-apcu'
pkgname=php8.0-apcu
-version=5.1.21
+version=5.1.22
revision=1
wrksrc="apcu-${version}"
build_style=gnu-configure
@@ -14,7 +14,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=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize8.0
From 2585ab9ecdea59925a08d3bbe10f457ab75205ec Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:03:45 -0400
Subject: [PATCH 6/6] php8.1-apcu: update to 5.1.22.
---
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 60d5ca79143d..293a0d1020f4 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.21
+version=5.1.22
revision=1
wrksrc="apcu-${version}"
build_style=gnu-configure
@@ -14,7 +14,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=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize8.1
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] PHP 7.4.32, PHP 8.0.24 + pear, PHP 8.1.11 + pear, php.*apcu 5.1.22
2022-09-23 17:51 [PR PATCH] php8.[01]: add php8.[01]-pear subpackage TinfoilSubmarine
` (6 preceding siblings ...)
2022-10-07 13:17 ` [PR PATCH] [Updated] PHP 7.4.32, PHP 8.0.24 + pear, PHP 8.1.11 + pear, php.*apcu 5.1.22 TinfoilSubmarine
@ 2022-10-07 14:12 ` TinfoilSubmarine
2022-10-07 14:14 ` TinfoilSubmarine
` (7 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-10-07 14:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1431 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php-pear
https://github.com/void-linux/void-packages/pull/39438
PHP 7.4.32, PHP 8.0.24 + pear, PHP 8.1.11 + pear, php.*apcu 5.1.22
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
I tested the changes in this PR:
- php: **YES**
- php8.0: **YES**
- php8.0-pear: **briefly**
- php8.1: **YES**
- php8.1-pear: **briefly**
- php.*apcu: **YES**
<!--
#### 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/39438.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-pear-39438.patch --]
[-- Type: text/x-diff, Size: 56596 bytes --]
From ad8c90a082ddedd2166f616b49f537b08d10a6b9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 30 Sep 2022 09:27:11 -0400
Subject: [PATCH 1/6] php: update to 7.4.32.
---
srcpkgs/php/template | 10 ++++++----
srcpkgs/php/update | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3eb8e38cd928..2173e7f9a3af 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
# Template file for 'php'
pkgname=php
-version=7.4.30
-revision=2
+version=7.4.32
+revision=1
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
@@ -13,8 +13,10 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="PHP-3.01"
homepage="https://www.php.net"
changelog="https://www.php.net/ChangeLog-7.php"
-distfiles="http://www.php.net/distributions/php-${version}.tar.xz"
-checksum=ea72a34f32c67e79ac2da7dfe96177f3c451c3eefae5810ba13312ed398ba70d
+# 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=197e3372afd69694eb6b230838305eb9e1cbe5db272e0fa3bbe0d38e329a95bc
conf_files="/etc/php/php.ini"
diff --git a/srcpkgs/php/update b/srcpkgs/php/update
index ac2289b24b76..caf45c0dd8d1 100644
--- a/srcpkgs/php/update
+++ b/srcpkgs/php/update
@@ -1 +1,2 @@
ignore="8.*"
+site="https://www.php.net/distributions/"
From cb4675d53b7ae68106d555762cac5e50e1fc387a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:03:12 -0400
Subject: [PATCH 2/6] php8.0: update to 8.0.24, add php8.0-pear subpackage.
---
.../files/firefly-iii.conf | 463 ++++++++++++++++++
srcpkgs/firefly-iii/files/firefly-iii.conf | 463 ++++++++++++++++++
srcpkgs/php8.0-pear | 1 +
srcpkgs/php8.0/patches/php.ini.patch | 2 +-
srcpkgs/php8.0/template | 35 +-
srcpkgs/php8.0/update | 1 +
6 files changed, 958 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/firefly-iii-data-importer/files/firefly-iii.conf
create mode 100644 srcpkgs/firefly-iii/files/firefly-iii.conf
create mode 120000 srcpkgs/php8.0-pear
diff --git a/srcpkgs/firefly-iii-data-importer/files/firefly-iii.conf b/srcpkgs/firefly-iii-data-importer/files/firefly-iii.conf
new file mode 100644
index 000000000000..f5c585e0f89b
--- /dev/null
+++ b/srcpkgs/firefly-iii-data-importer/files/firefly-iii.conf
@@ -0,0 +1,463 @@
+; Start a new pool named 'www'.
+; the variable $pool can be used in any directive and will be replaced by the
+; pool name ('www' here)
+[www]
+
+; Per pool prefix
+; It only applies on the following directives:
+; - 'access.log'
+; - 'slowlog'
+; - 'listen' (unixsocket)
+; - 'chroot'
+; - 'chdir'
+; - 'php_values'
+; - 'php_admin_values'
+; When not set, the global prefix (or /usr) applies instead.
+; Note: This directive can also be relative to the global prefix.
+; Default Value: none
+;prefix = /path/to/pools/$pool
+
+; Unix user/group of processes
+; Note: The user is mandatory. If the group is not set, the default user's group
+; will be used.
+user = http
+group = http
+
+; The address on which to accept FastCGI requests.
+; Valid syntaxes are:
+; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on
+; a specific port;
+; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
+; a specific port;
+; 'port' - to listen on a TCP socket to all addresses
+; (IPv6 and IPv4-mapped) on a specific port;
+; '/path/to/unix/socket' - to listen on a unix socket.
+; Note: This value is mandatory.
+listen = 127.0.0.1:9000
+
+; Set listen(2) backlog.
+; Default Value: 511 (-1 on FreeBSD and OpenBSD)
+;listen.backlog = 511
+
+; Set permissions for unix socket, if one is used. In Linux, read/write
+; permissions must be set in order to allow connections from a web server. Many
+; BSD-derived systems allow connections regardless of permissions. The owner
+; and group can be specified either by name or by their numeric IDs.
+; Default Values: user and group are set as the running user
+; mode is set to 0660
+;listen.owner = http
+;listen.group = http
+;listen.mode = 0660
+; When POSIX Access Control Lists are supported you can set them using
+; these options, value is a comma separated list of user/group names.
+; When set, listen.owner and listen.group are ignored
+;listen.acl_users =
+;listen.acl_groups =
+
+; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
+; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
+; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
+; must be separated by a comma. If this value is left blank, connections will be
+; accepted from any ip address.
+; Default Value: any
+;listen.allowed_clients = 127.0.0.1
+
+; Specify the nice(2) priority to apply to the pool processes (only if set)
+; The value can vary from -19 (highest priority) to 20 (lower priority)
+; Note: - It will only work if the FPM master process is launched as root
+; - The pool processes will inherit the master process priority
+; unless it specified otherwise
+; Default Value: no set
+; process.priority = -19
+
+; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user
+; or group is different than the master process user. It allows to create process
+; core dump and ptrace the process for the pool user.
+; Default Value: no
+; process.dumpable = yes
+
+; Choose how the process manager will control the number of child processes.
+; Possible Values:
+; static - a fixed number (pm.max_children) of child processes;
+; dynamic - the number of child processes are set dynamically based on the
+; following directives. With this process management, there will be
+; always at least 1 children.
+; pm.max_children - the maximum number of children that can
+; be alive at the same time.
+; pm.start_servers - the number of children created on startup.
+; pm.min_spare_servers - the minimum number of children in 'idle'
+; state (waiting to process). If the number
+; of 'idle' processes is less than this
+; number then some children will be created.
+; pm.max_spare_servers - the maximum number of children in 'idle'
+; state (waiting to process). If the number
+; of 'idle' processes is greater than this
+; number then some children will be killed.
+; pm.max_spawn_rate - the maximum number of rate to spawn child
+; processes at once.
+; ondemand - no children are created at startup. Children will be forked when
+; new requests will connect. The following parameter are used:
+; pm.max_children - the maximum number of children that
+; can be alive at the same time.
+; pm.process_idle_timeout - The number of seconds after which
+; an idle process will be killed.
+; Note: This value is mandatory.
+pm = dynamic
+
+; The number of child processes to be created when pm is set to 'static' and the
+; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
+; This value sets the limit on the number of simultaneous requests that will be
+; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
+; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
+; CGI. The below defaults are based on a server without much resources. Don't
+; forget to tweak pm.* to fit your needs.
+; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
+; Note: This value is mandatory.
+pm.max_children = 5
+
+; The number of child processes created on startup.
+; Note: Used only when pm is set to 'dynamic'
+; Default Value: (min_spare_servers + max_spare_servers) / 2
+pm.start_servers = 2
+
+; The desired minimum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.min_spare_servers = 1
+
+; The desired maximum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.max_spare_servers = 3
+
+; The number of rate to spawn child processes at once.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+; Default Value: 32
+;pm.max_spawn_rate = 32
+
+; The number of seconds after which an idle process will be killed.
+; Note: Used only when pm is set to 'ondemand'
+; Default Value: 10s
+;pm.process_idle_timeout = 10s;
+
+; The number of requests each child process should execute before respawning.
+; This can be useful to work around memory leaks in 3rd party libraries. For
+; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
+; Default Value: 0
+;pm.max_requests = 500
+
+; The URI to view the FPM status page. If this value is not set, no URI will be
+; recognized as a status page. It shows the following information:
+; pool - the name of the pool;
+; process manager - static, dynamic or ondemand;
+; start time - the date and time FPM has started;
+; start since - number of seconds since FPM has started;
+; accepted conn - the number of request accepted by the pool;
+; listen queue - the number of request in the queue of pending
+; connections (see backlog in listen(2));
+; max listen queue - the maximum number of requests in the queue
+; of pending connections since FPM has started;
+; listen queue len - the size of the socket queue of pending connections;
+; idle processes - the number of idle processes;
+; active processes - the number of active processes;
+; total processes - the number of idle + active processes;
+; max active processes - the maximum number of active processes since FPM
+; has started;
+; max children reached - number of times, the process limit has been reached,
+; when pm tries to start more children (works only for
+; pm 'dynamic' and 'ondemand');
+; Value are updated in real time.
+; Example output:
+; pool: www
+; process manager: static
+; start time: 01/Jul/2011:17:53:49 +0200
+; start since: 62636
+; accepted conn: 190460
+; listen queue: 0
+; max listen queue: 1
+; listen queue len: 42
+; idle processes: 4
+; active processes: 11
+; total processes: 15
+; max active processes: 12
+; max children reached: 0
+;
+; By default the status page output is formatted as text/plain. Passing either
+; 'html', 'xml' or 'json' in the query string will return the corresponding
+; output syntax. Example:
+; http://www.foo.bar/status
+; http://www.foo.bar/status?json
+; http://www.foo.bar/status?html
+; http://www.foo.bar/status?xml
+;
+; By default the status page only outputs short status. Passing 'full' in the
+; query string will also return status for each pool process.
+; Example:
+; http://www.foo.bar/status?full
+; http://www.foo.bar/status?json&full
+; http://www.foo.bar/status?html&full
+; http://www.foo.bar/status?xml&full
+; The Full status returns for each process:
+; pid - the PID of the process;
+; state - the state of the process (Idle, Running, ...);
+; start time - the date and time the process has started;
+; start since - the number of seconds since the process has started;
+; requests - the number of requests the process has served;
+; request duration - the duration in µs of the requests;
+; request method - the request method (GET, POST, ...);
+; request URI - the request URI with the query string;
+; content length - the content length of the request (only with POST);
+; user - the user (PHP_AUTH_USER) (or '-' if not set);
+; script - the main script called (or '-' if not set);
+; last request cpu - the %cpu the last request consumed
+; it's always 0 if the process is not in Idle state
+; because CPU calculation is done when the request
+; processing has terminated;
+; last request memory - the max amount of memory the last request consumed
+; it's always 0 if the process is not in Idle state
+; because memory calculation is done when the request
+; processing has terminated;
+; If the process is in Idle state, then informations are related to the
+; last request the process has served. Otherwise informations are related to
+; the current request being served.
+; Example output:
+; ************************
+; pid: 31330
+; state: Running
+; start time: 01/Jul/2011:17:53:49 +0200
+; start since: 63087
+; requests: 12808
+; request duration: 1250261
+; request method: GET
+; request URI: /test_mem.php?N=10000
+; content length: 0
+; user: -
+; script: /home/fat/web/docs/php/test_mem.php
+; last request cpu: 0.00
+; last request memory: 0
+;
+; Note: There is a real-time FPM status monitoring sample web page available
+; It's available in: /usr/share/php8.1/fpm/status.html
+;
+; Note: The value must start with a leading slash (/). The value can be
+; anything, but it may not be a good idea to use the .php extension or it
+; may conflict with a real PHP file.
+; Default Value: not set
+;pm.status_path = /status
+
+; The address on which to accept FastCGI status request. This creates a new
+; invisible pool that can handle requests independently. This is useful
+; if the main pool is busy with long running requests because it is still possible
+; to get the status before finishing the long running requests.
+;
+; Valid syntaxes are:
+; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on
+; a specific port;
+; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
+; a specific port;
+; 'port' - to listen on a TCP socket to all addresses
+; (IPv6 and IPv4-mapped) on a specific port;
+; '/path/to/unix/socket' - to listen on a unix socket.
+; Default Value: value of the listen option
+;pm.status_listen = 127.0.0.1:9001
+
+; The ping URI to call the monitoring page of FPM. If this value is not set, no
+; URI will be recognized as a ping page. This could be used to test from outside
+; that FPM is alive and responding, or to
+; - create a graph of FPM availability (rrd or such);
+; - remove a server from a group if it is not responding (load balancing);
+; - trigger alerts for the operating team (24/7).
+; Note: The value must start with a leading slash (/). The value can be
+; anything, but it may not be a good idea to use the .php extension or it
+; may conflict with a real PHP file.
+; Default Value: not set
+;ping.path = /ping
+
+; This directive may be used to customize the response of a ping request. The
+; response is formatted as text/plain with a 200 response code.
+; Default Value: pong
+;ping.response = pong
+
+; The access log file
+; Default: not set
+;access.log = log/$pool.access.log
+
+; The access log format.
+; The following syntax is allowed
+; %%: the '%' character
+; %C: %CPU used by the request
+; it can accept the following format:
+; - %{user}C for user CPU only
+; - %{system}C for system CPU only
+; - %{total}C for user + system CPU (default)
+; %d: time taken to serve the request
+; it can accept the following format:
+; - %{seconds}d (default)
+; - %{milliseconds}d
+; - %{milli}d
+; - %{microseconds}d
+; - %{micro}d
+; %e: an environment variable (same as $_ENV or $_SERVER)
+; it must be associated with embraces to specify the name of the env
+; variable. Some examples:
+; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
+; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
+; %f: script filename
+; %l: content-length of the request (for POST request only)
+; %m: request method
+; %M: peak of memory allocated by PHP
+; it can accept the following format:
+; - %{bytes}M (default)
+; - %{kilobytes}M
+; - %{kilo}M
+; - %{megabytes}M
+; - %{mega}M
+; %n: pool name
+; %o: output header
+; it must be associated with embraces to specify the name of the header:
+; - %{Content-Type}o
+; - %{X-Powered-By}o
+; - %{Transfert-Encoding}o
+; - ....
+; %p: PID of the child that serviced the request
+; %P: PID of the parent of the child that serviced the request
+; %q: the query string
+; %Q: the '?' character if query string exists
+; %r: the request URI (without the query string, see %q and %Q)
+; %R: remote IP address
+; %s: status (response code)
+; %t: server time the request was received
+; it can accept a strftime(3) format:
+; %d/%b/%Y:%H:%M:%S %z (default)
+; The strftime(3) format must be encapsulated in a %{<strftime_format>}t tag
+; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+; %T: time the log has been written (the request has finished)
+; it can accept a strftime(3) format:
+; %d/%b/%Y:%H:%M:%S %z (default)
+; The strftime(3) format must be encapsulated in a %{<strftime_format>}t tag
+; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+; %u: remote user
+;
+; Default: "%R - %u %t \"%m %r\" %s"
+;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{milli}d %{kilo}M %C%%"
+
+; The log file for slow requests
+; Default Value: not set
+; Note: slowlog is mandatory if request_slowlog_timeout is set
+;slowlog = log/$pool.log.slow
+
+; The timeout for serving a single request after which a PHP backtrace will be
+; dumped to the 'slowlog' file. A value of '0s' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_slowlog_timeout = 0
+
+; Depth of slow log stack trace.
+; Default Value: 20
+;request_slowlog_trace_depth = 20
+
+; The timeout for serving a single request after which the worker process will
+; be killed. This option should be used when the 'max_execution_time' ini option
+; does not stop script execution for some reason. A value of '0' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_terminate_timeout = 0
+
+; The timeout set by 'request_terminate_timeout' ini option is not engaged after
+; application calls 'fastcgi_finish_request' or when application has finished and
+; shutdown functions are being called (registered via register_shutdown_function).
+; This option will enable timeout limit to be applied unconditionally
+; even in such cases.
+; Default Value: no
+;request_terminate_timeout_track_finished = no
+
+; Set open file descriptor rlimit.
+; Default Value: system defined value
+;rlimit_files = 1024
+
+; Set max core size rlimit.
+; Possible Values: 'unlimited' or an integer greater or equal to 0
+; Default Value: system defined value
+;rlimit_core = 0
+
+; Chroot to this directory at the start. This value must be defined as an
+; absolute path. When this value is not set, chroot is not used.
+; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
+; of its subdirectories. If the pool prefix is not set, the global prefix
+; will be used instead.
+; Note: chrooting is a great security feature and should be used whenever
+; possible. However, all PHP paths will be relative to the chroot
+; (error_log, sessions.save_path, ...).
+; Default Value: not set
+;chroot =
+
+; Chdir to this directory at the start.
+; Note: relative path can be used.
+; Default Value: current directory or / when chroot
+;chdir = /var/www
+
+; Redirect worker stdout and stderr into main error log. If not set, stdout and
+; stderr will be redirected to /dev/null according to FastCGI specs.
+; Note: on highloaded environment, this can cause some delay in the page
+; process time (several ms).
+; Default Value: no
+;catch_workers_output = yes
+
+; Decorate worker output with prefix and suffix containing information about
+; the child that writes to the log and if stdout or stderr is used as well as
+; log level and time. This options is used only if catch_workers_output is yes.
+; Settings to "no" will output data as written to the stdout or stderr.
+; Default value: yes
+;decorate_workers_output = no
+
+; Clear environment in FPM workers
+; Prevents arbitrary environment variables from reaching FPM worker processes
+; by clearing the environment in workers before env vars specified in this
+; pool configuration are added.
+; Setting to "no" will make all environment variables available to PHP code
+; via getenv(), $_ENV and $_SERVER.
+; Default Value: yes
+;clear_env = no
+
+; Limits the extensions of the main script FPM will allow to parse. This can
+; prevent configuration mistakes on the web server side. You should only limit
+; FPM to .php extensions to prevent malicious users to use other extensions to
+; execute php code.
+; Note: set an empty value to allow all extensions.
+; Default Value: .php
+;security.limit_extensions = .php .php3 .php4 .php5 .php7
+
+; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
+; the current environment.
+; Default Value: clean env
+;env[HOSTNAME] = $HOSTNAME
+;env[PATH] = /usr/local/bin:/usr/bin:/bin
+;env[TMP] = /tmp
+;env[TMPDIR] = /tmp
+;env[TEMP] = /tmp
+
+; Additional php.ini defines, specific to this pool of workers. These settings
+; overwrite the values previously defined in the php.ini. The directives are the
+; same as the PHP SAPI:
+; php_value/php_flag - you can set classic ini defines which can
+; be overwritten from PHP call 'ini_set'.
+; php_admin_value/php_admin_flag - these directives won't be overwritten by
+; PHP call 'ini_set'
+; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
+
+; Defining 'extension' will load the corresponding shared extension from
+; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
+; overwrite previously defined php.ini values, but will append the new value
+; instead.
+
+; Note: path INI options can be relative and will be expanded with the prefix
+; (pool, global or /usr)
+
+; Default Value: nothing is defined by default except the values in php.ini and
+; specified at startup with the -d argument
+;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
+;php_flag[display_errors] = off
+;php_admin_value[error_log] = /var/log/fpm-php.www.log
+;php_admin_flag[log_errors] = on
+;php_admin_value[memory_limit] = 32M
diff --git a/srcpkgs/firefly-iii/files/firefly-iii.conf b/srcpkgs/firefly-iii/files/firefly-iii.conf
new file mode 100644
index 000000000000..f5c585e0f89b
--- /dev/null
+++ b/srcpkgs/firefly-iii/files/firefly-iii.conf
@@ -0,0 +1,463 @@
+; Start a new pool named 'www'.
+; the variable $pool can be used in any directive and will be replaced by the
+; pool name ('www' here)
+[www]
+
+; Per pool prefix
+; It only applies on the following directives:
+; - 'access.log'
+; - 'slowlog'
+; - 'listen' (unixsocket)
+; - 'chroot'
+; - 'chdir'
+; - 'php_values'
+; - 'php_admin_values'
+; When not set, the global prefix (or /usr) applies instead.
+; Note: This directive can also be relative to the global prefix.
+; Default Value: none
+;prefix = /path/to/pools/$pool
+
+; Unix user/group of processes
+; Note: The user is mandatory. If the group is not set, the default user's group
+; will be used.
+user = http
+group = http
+
+; The address on which to accept FastCGI requests.
+; Valid syntaxes are:
+; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on
+; a specific port;
+; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
+; a specific port;
+; 'port' - to listen on a TCP socket to all addresses
+; (IPv6 and IPv4-mapped) on a specific port;
+; '/path/to/unix/socket' - to listen on a unix socket.
+; Note: This value is mandatory.
+listen = 127.0.0.1:9000
+
+; Set listen(2) backlog.
+; Default Value: 511 (-1 on FreeBSD and OpenBSD)
+;listen.backlog = 511
+
+; Set permissions for unix socket, if one is used. In Linux, read/write
+; permissions must be set in order to allow connections from a web server. Many
+; BSD-derived systems allow connections regardless of permissions. The owner
+; and group can be specified either by name or by their numeric IDs.
+; Default Values: user and group are set as the running user
+; mode is set to 0660
+;listen.owner = http
+;listen.group = http
+;listen.mode = 0660
+; When POSIX Access Control Lists are supported you can set them using
+; these options, value is a comma separated list of user/group names.
+; When set, listen.owner and listen.group are ignored
+;listen.acl_users =
+;listen.acl_groups =
+
+; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
+; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
+; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
+; must be separated by a comma. If this value is left blank, connections will be
+; accepted from any ip address.
+; Default Value: any
+;listen.allowed_clients = 127.0.0.1
+
+; Specify the nice(2) priority to apply to the pool processes (only if set)
+; The value can vary from -19 (highest priority) to 20 (lower priority)
+; Note: - It will only work if the FPM master process is launched as root
+; - The pool processes will inherit the master process priority
+; unless it specified otherwise
+; Default Value: no set
+; process.priority = -19
+
+; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user
+; or group is different than the master process user. It allows to create process
+; core dump and ptrace the process for the pool user.
+; Default Value: no
+; process.dumpable = yes
+
+; Choose how the process manager will control the number of child processes.
+; Possible Values:
+; static - a fixed number (pm.max_children) of child processes;
+; dynamic - the number of child processes are set dynamically based on the
+; following directives. With this process management, there will be
+; always at least 1 children.
+; pm.max_children - the maximum number of children that can
+; be alive at the same time.
+; pm.start_servers - the number of children created on startup.
+; pm.min_spare_servers - the minimum number of children in 'idle'
+; state (waiting to process). If the number
+; of 'idle' processes is less than this
+; number then some children will be created.
+; pm.max_spare_servers - the maximum number of children in 'idle'
+; state (waiting to process). If the number
+; of 'idle' processes is greater than this
+; number then some children will be killed.
+; pm.max_spawn_rate - the maximum number of rate to spawn child
+; processes at once.
+; ondemand - no children are created at startup. Children will be forked when
+; new requests will connect. The following parameter are used:
+; pm.max_children - the maximum number of children that
+; can be alive at the same time.
+; pm.process_idle_timeout - The number of seconds after which
+; an idle process will be killed.
+; Note: This value is mandatory.
+pm = dynamic
+
+; The number of child processes to be created when pm is set to 'static' and the
+; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
+; This value sets the limit on the number of simultaneous requests that will be
+; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
+; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
+; CGI. The below defaults are based on a server without much resources. Don't
+; forget to tweak pm.* to fit your needs.
+; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
+; Note: This value is mandatory.
+pm.max_children = 5
+
+; The number of child processes created on startup.
+; Note: Used only when pm is set to 'dynamic'
+; Default Value: (min_spare_servers + max_spare_servers) / 2
+pm.start_servers = 2
+
+; The desired minimum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.min_spare_servers = 1
+
+; The desired maximum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.max_spare_servers = 3
+
+; The number of rate to spawn child processes at once.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+; Default Value: 32
+;pm.max_spawn_rate = 32
+
+; The number of seconds after which an idle process will be killed.
+; Note: Used only when pm is set to 'ondemand'
+; Default Value: 10s
+;pm.process_idle_timeout = 10s;
+
+; The number of requests each child process should execute before respawning.
+; This can be useful to work around memory leaks in 3rd party libraries. For
+; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
+; Default Value: 0
+;pm.max_requests = 500
+
+; The URI to view the FPM status page. If this value is not set, no URI will be
+; recognized as a status page. It shows the following information:
+; pool - the name of the pool;
+; process manager - static, dynamic or ondemand;
+; start time - the date and time FPM has started;
+; start since - number of seconds since FPM has started;
+; accepted conn - the number of request accepted by the pool;
+; listen queue - the number of request in the queue of pending
+; connections (see backlog in listen(2));
+; max listen queue - the maximum number of requests in the queue
+; of pending connections since FPM has started;
+; listen queue len - the size of the socket queue of pending connections;
+; idle processes - the number of idle processes;
+; active processes - the number of active processes;
+; total processes - the number of idle + active processes;
+; max active processes - the maximum number of active processes since FPM
+; has started;
+; max children reached - number of times, the process limit has been reached,
+; when pm tries to start more children (works only for
+; pm 'dynamic' and 'ondemand');
+; Value are updated in real time.
+; Example output:
+; pool: www
+; process manager: static
+; start time: 01/Jul/2011:17:53:49 +0200
+; start since: 62636
+; accepted conn: 190460
+; listen queue: 0
+; max listen queue: 1
+; listen queue len: 42
+; idle processes: 4
+; active processes: 11
+; total processes: 15
+; max active processes: 12
+; max children reached: 0
+;
+; By default the status page output is formatted as text/plain. Passing either
+; 'html', 'xml' or 'json' in the query string will return the corresponding
+; output syntax. Example:
+; http://www.foo.bar/status
+; http://www.foo.bar/status?json
+; http://www.foo.bar/status?html
+; http://www.foo.bar/status?xml
+;
+; By default the status page only outputs short status. Passing 'full' in the
+; query string will also return status for each pool process.
+; Example:
+; http://www.foo.bar/status?full
+; http://www.foo.bar/status?json&full
+; http://www.foo.bar/status?html&full
+; http://www.foo.bar/status?xml&full
+; The Full status returns for each process:
+; pid - the PID of the process;
+; state - the state of the process (Idle, Running, ...);
+; start time - the date and time the process has started;
+; start since - the number of seconds since the process has started;
+; requests - the number of requests the process has served;
+; request duration - the duration in µs of the requests;
+; request method - the request method (GET, POST, ...);
+; request URI - the request URI with the query string;
+; content length - the content length of the request (only with POST);
+; user - the user (PHP_AUTH_USER) (or '-' if not set);
+; script - the main script called (or '-' if not set);
+; last request cpu - the %cpu the last request consumed
+; it's always 0 if the process is not in Idle state
+; because CPU calculation is done when the request
+; processing has terminated;
+; last request memory - the max amount of memory the last request consumed
+; it's always 0 if the process is not in Idle state
+; because memory calculation is done when the request
+; processing has terminated;
+; If the process is in Idle state, then informations are related to the
+; last request the process has served. Otherwise informations are related to
+; the current request being served.
+; Example output:
+; ************************
+; pid: 31330
+; state: Running
+; start time: 01/Jul/2011:17:53:49 +0200
+; start since: 63087
+; requests: 12808
+; request duration: 1250261
+; request method: GET
+; request URI: /test_mem.php?N=10000
+; content length: 0
+; user: -
+; script: /home/fat/web/docs/php/test_mem.php
+; last request cpu: 0.00
+; last request memory: 0
+;
+; Note: There is a real-time FPM status monitoring sample web page available
+; It's available in: /usr/share/php8.1/fpm/status.html
+;
+; Note: The value must start with a leading slash (/). The value can be
+; anything, but it may not be a good idea to use the .php extension or it
+; may conflict with a real PHP file.
+; Default Value: not set
+;pm.status_path = /status
+
+; The address on which to accept FastCGI status request. This creates a new
+; invisible pool that can handle requests independently. This is useful
+; if the main pool is busy with long running requests because it is still possible
+; to get the status before finishing the long running requests.
+;
+; Valid syntaxes are:
+; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on
+; a specific port;
+; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
+; a specific port;
+; 'port' - to listen on a TCP socket to all addresses
+; (IPv6 and IPv4-mapped) on a specific port;
+; '/path/to/unix/socket' - to listen on a unix socket.
+; Default Value: value of the listen option
+;pm.status_listen = 127.0.0.1:9001
+
+; The ping URI to call the monitoring page of FPM. If this value is not set, no
+; URI will be recognized as a ping page. This could be used to test from outside
+; that FPM is alive and responding, or to
+; - create a graph of FPM availability (rrd or such);
+; - remove a server from a group if it is not responding (load balancing);
+; - trigger alerts for the operating team (24/7).
+; Note: The value must start with a leading slash (/). The value can be
+; anything, but it may not be a good idea to use the .php extension or it
+; may conflict with a real PHP file.
+; Default Value: not set
+;ping.path = /ping
+
+; This directive may be used to customize the response of a ping request. The
+; response is formatted as text/plain with a 200 response code.
+; Default Value: pong
+;ping.response = pong
+
+; The access log file
+; Default: not set
+;access.log = log/$pool.access.log
+
+; The access log format.
+; The following syntax is allowed
+; %%: the '%' character
+; %C: %CPU used by the request
+; it can accept the following format:
+; - %{user}C for user CPU only
+; - %{system}C for system CPU only
+; - %{total}C for user + system CPU (default)
+; %d: time taken to serve the request
+; it can accept the following format:
+; - %{seconds}d (default)
+; - %{milliseconds}d
+; - %{milli}d
+; - %{microseconds}d
+; - %{micro}d
+; %e: an environment variable (same as $_ENV or $_SERVER)
+; it must be associated with embraces to specify the name of the env
+; variable. Some examples:
+; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
+; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
+; %f: script filename
+; %l: content-length of the request (for POST request only)
+; %m: request method
+; %M: peak of memory allocated by PHP
+; it can accept the following format:
+; - %{bytes}M (default)
+; - %{kilobytes}M
+; - %{kilo}M
+; - %{megabytes}M
+; - %{mega}M
+; %n: pool name
+; %o: output header
+; it must be associated with embraces to specify the name of the header:
+; - %{Content-Type}o
+; - %{X-Powered-By}o
+; - %{Transfert-Encoding}o
+; - ....
+; %p: PID of the child that serviced the request
+; %P: PID of the parent of the child that serviced the request
+; %q: the query string
+; %Q: the '?' character if query string exists
+; %r: the request URI (without the query string, see %q and %Q)
+; %R: remote IP address
+; %s: status (response code)
+; %t: server time the request was received
+; it can accept a strftime(3) format:
+; %d/%b/%Y:%H:%M:%S %z (default)
+; The strftime(3) format must be encapsulated in a %{<strftime_format>}t tag
+; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+; %T: time the log has been written (the request has finished)
+; it can accept a strftime(3) format:
+; %d/%b/%Y:%H:%M:%S %z (default)
+; The strftime(3) format must be encapsulated in a %{<strftime_format>}t tag
+; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+; %u: remote user
+;
+; Default: "%R - %u %t \"%m %r\" %s"
+;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{milli}d %{kilo}M %C%%"
+
+; The log file for slow requests
+; Default Value: not set
+; Note: slowlog is mandatory if request_slowlog_timeout is set
+;slowlog = log/$pool.log.slow
+
+; The timeout for serving a single request after which a PHP backtrace will be
+; dumped to the 'slowlog' file. A value of '0s' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_slowlog_timeout = 0
+
+; Depth of slow log stack trace.
+; Default Value: 20
+;request_slowlog_trace_depth = 20
+
+; The timeout for serving a single request after which the worker process will
+; be killed. This option should be used when the 'max_execution_time' ini option
+; does not stop script execution for some reason. A value of '0' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_terminate_timeout = 0
+
+; The timeout set by 'request_terminate_timeout' ini option is not engaged after
+; application calls 'fastcgi_finish_request' or when application has finished and
+; shutdown functions are being called (registered via register_shutdown_function).
+; This option will enable timeout limit to be applied unconditionally
+; even in such cases.
+; Default Value: no
+;request_terminate_timeout_track_finished = no
+
+; Set open file descriptor rlimit.
+; Default Value: system defined value
+;rlimit_files = 1024
+
+; Set max core size rlimit.
+; Possible Values: 'unlimited' or an integer greater or equal to 0
+; Default Value: system defined value
+;rlimit_core = 0
+
+; Chroot to this directory at the start. This value must be defined as an
+; absolute path. When this value is not set, chroot is not used.
+; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
+; of its subdirectories. If the pool prefix is not set, the global prefix
+; will be used instead.
+; Note: chrooting is a great security feature and should be used whenever
+; possible. However, all PHP paths will be relative to the chroot
+; (error_log, sessions.save_path, ...).
+; Default Value: not set
+;chroot =
+
+; Chdir to this directory at the start.
+; Note: relative path can be used.
+; Default Value: current directory or / when chroot
+;chdir = /var/www
+
+; Redirect worker stdout and stderr into main error log. If not set, stdout and
+; stderr will be redirected to /dev/null according to FastCGI specs.
+; Note: on highloaded environment, this can cause some delay in the page
+; process time (several ms).
+; Default Value: no
+;catch_workers_output = yes
+
+; Decorate worker output with prefix and suffix containing information about
+; the child that writes to the log and if stdout or stderr is used as well as
+; log level and time. This options is used only if catch_workers_output is yes.
+; Settings to "no" will output data as written to the stdout or stderr.
+; Default value: yes
+;decorate_workers_output = no
+
+; Clear environment in FPM workers
+; Prevents arbitrary environment variables from reaching FPM worker processes
+; by clearing the environment in workers before env vars specified in this
+; pool configuration are added.
+; Setting to "no" will make all environment variables available to PHP code
+; via getenv(), $_ENV and $_SERVER.
+; Default Value: yes
+;clear_env = no
+
+; Limits the extensions of the main script FPM will allow to parse. This can
+; prevent configuration mistakes on the web server side. You should only limit
+; FPM to .php extensions to prevent malicious users to use other extensions to
+; execute php code.
+; Note: set an empty value to allow all extensions.
+; Default Value: .php
+;security.limit_extensions = .php .php3 .php4 .php5 .php7
+
+; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
+; the current environment.
+; Default Value: clean env
+;env[HOSTNAME] = $HOSTNAME
+;env[PATH] = /usr/local/bin:/usr/bin:/bin
+;env[TMP] = /tmp
+;env[TMPDIR] = /tmp
+;env[TEMP] = /tmp
+
+; Additional php.ini defines, specific to this pool of workers. These settings
+; overwrite the values previously defined in the php.ini. The directives are the
+; same as the PHP SAPI:
+; php_value/php_flag - you can set classic ini defines which can
+; be overwritten from PHP call 'ini_set'.
+; php_admin_value/php_admin_flag - these directives won't be overwritten by
+; PHP call 'ini_set'
+; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
+
+; Defining 'extension' will load the corresponding shared extension from
+; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
+; overwrite previously defined php.ini values, but will append the new value
+; instead.
+
+; Note: path INI options can be relative and will be expanded with the prefix
+; (pool, global or /usr)
+
+; Default Value: nothing is defined by default except the values in php.ini and
+; specified at startup with the -d argument
+;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
+;php_flag[display_errors] = off
+;php_admin_value[error_log] = /var/log/fpm-php.www.log
+;php_admin_flag[log_errors] = on
+;php_admin_value[memory_limit] = 32M
diff --git a/srcpkgs/php8.0-pear b/srcpkgs/php8.0-pear
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-pear
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0/patches/php.ini.patch b/srcpkgs/php8.0/patches/php.ini.patch
index 07e38a04cf4f..00428db5270d 100644
--- a/srcpkgs/php8.0/patches/php.ini.patch
+++ b/srcpkgs/php8.0/patches/php.ini.patch
@@ -7,7 +7,7 @@ index 794d3e8ddb..c7acf9c883 100644
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
++include_path = ".:/usr/share/pear8.0"
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 4b2fa162e3e3..bc4d56eed1b5 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.23
+version=8.0.24
revision=1
_php_version=8.0
wrksrc="php-${version}"
@@ -15,15 +15,17 @@ 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"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=a2dd50e9c4a0328d921b6bc914e8b4e6572f94f09867318f88acca5ac4fa76c7
+# 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=6020843a2f1ce36745d958b3ca17f3fdc42e78a43899f552ab5dbc509ff19232
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +92,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -112,7 +114,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +220,27 @@ php8.0-embed_package() {
}
}
+php8.0-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.0-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.0/update b/srcpkgs/php8.0/update
index c4d9bc5958ca..566cd8005690 100644
--- a/srcpkgs/php8.0/update
+++ b/srcpkgs/php8.0/update
@@ -1,2 +1,3 @@
pkgname=php
ignore="8.[1-9].*"
+site="https://www.php.net/distributions/"
From 59d61d13e994db0152430dd681f7202fe0c6bfbf Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:06:45 -0400
Subject: [PATCH 3/6] php8.1: update to 8.1.11, add php8.1-pear subpackage.
---
srcpkgs/php8.1-pear | 1 +
srcpkgs/php8.1/patches/php.ini.patch | 2 +-
srcpkgs/php8.1/template | 35 +++++++++++++++++++++++-----
srcpkgs/php8.1/update | 1 +
4 files changed, 32 insertions(+), 7 deletions(-)
create mode 120000 srcpkgs/php8.1-pear
diff --git a/srcpkgs/php8.1-pear b/srcpkgs/php8.1-pear
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-pear
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1/patches/php.ini.patch b/srcpkgs/php8.1/patches/php.ini.patch
index 186898f63fab..e4d45eafed32 100644
--- a/srcpkgs/php8.1/patches/php.ini.patch
+++ b/srcpkgs/php8.1/patches/php.ini.patch
@@ -7,7 +7,7 @@ index b39a960..68f14a6 100644
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
++include_path = ".:/usr/share/pear8.1"
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index f18fa2cb9a7c..04c0de334f93 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.10
+version=8.1.11
revision=1
_php_version=8.1
wrksrc="php-${version}"
@@ -15,15 +15,17 @@ 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"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=3ea4f323109dfbc8d2631d08aa0e08602c1f713678e9dc6c750f081ef49eab0f
+# 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=3660e8408321149f5d382bb8eeb9ea7b12ea8dd7ea66069da33f6f7383750ab2
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +92,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -112,7 +114,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +220,27 @@ php8.1-embed_package() {
}
}
+php8.1-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.1-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.1/update b/srcpkgs/php8.1/update
index 0c2792ec963f..e39f4573be89 100644
--- a/srcpkgs/php8.1/update
+++ b/srcpkgs/php8.1/update
@@ -1,2 +1,3 @@
pkgname=php
ignore="8.[2-9].*"
+site="https://www.php.net/distributions/"
From eef734f19515828790a4b9dc60e1d344079301d9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:15:58 -0400
Subject: [PATCH 4/6] php-apcu: update to 5.1.22.
---
srcpkgs/php-apcu/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/php-apcu/template b/srcpkgs/php-apcu/template
index 16c7b707761e..b5f0bbcccbd1 100644
--- a/srcpkgs/php-apcu/template
+++ b/srcpkgs/php-apcu/template
@@ -1,7 +1,7 @@
# Template file for 'php-apcu'
pkgname=php-apcu
-version=5.1.17
-revision=2
+version=5.1.22
+revision=1
wrksrc="apcu-${version}"
build_style=gnu-configure
make_check_target=test
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="PHP-3.01"
homepage="https://pecl.php.net/package/APCu"
distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
-checksum=6b11b477890a9c096ad856e0251920d1d8b9558b7d115256c027e0223755c793
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize
From cb374a1c3956198d889935aeb803036278f04f24 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:03:13 -0400
Subject: [PATCH 5/6] php8.0-apcu: update to 5.1.22.
---
srcpkgs/php8.0-apcu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.0-apcu/template b/srcpkgs/php8.0-apcu/template
index 0409dd840ff5..7dccffa049f6 100644
--- a/srcpkgs/php8.0-apcu/template
+++ b/srcpkgs/php8.0-apcu/template
@@ -1,6 +1,6 @@
# Template file for 'php8.0-apcu'
pkgname=php8.0-apcu
-version=5.1.21
+version=5.1.22
revision=1
wrksrc="apcu-${version}"
build_style=gnu-configure
@@ -14,7 +14,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=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize8.0
From 39359fe22db8c3b4da7512f0eee9bcd94ca11b7d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:03:45 -0400
Subject: [PATCH 6/6] php8.1-apcu: update to 5.1.22.
---
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 60d5ca79143d..293a0d1020f4 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.21
+version=5.1.22
revision=1
wrksrc="apcu-${version}"
build_style=gnu-configure
@@ -14,7 +14,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=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize8.1
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] PHP 7.4.32, PHP 8.0.24 + pear, PHP 8.1.11 + pear, php.*apcu 5.1.22
2022-09-23 17:51 [PR PATCH] php8.[01]: add php8.[01]-pear subpackage TinfoilSubmarine
` (7 preceding siblings ...)
2022-10-07 14:12 ` TinfoilSubmarine
@ 2022-10-07 14:14 ` TinfoilSubmarine
2022-10-07 17:25 ` TinfoilSubmarine
` (6 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-10-07 14:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1306 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php-pear
https://github.com/void-linux/void-packages/pull/39438
PHP 7.4.32, PHP 8.0.24 + pear, PHP 8.1.11 + pear, php.*apcu 5.1.22
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
I tested the changes in this PR: **YES**
<!--
#### 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/39438.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-pear-39438.patch --]
[-- Type: text/x-diff, Size: 13155 bytes --]
From ad8c90a082ddedd2166f616b49f537b08d10a6b9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 30 Sep 2022 09:27:11 -0400
Subject: [PATCH 1/6] php: update to 7.4.32.
---
srcpkgs/php/template | 10 ++++++----
srcpkgs/php/update | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3eb8e38cd928..2173e7f9a3af 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
# Template file for 'php'
pkgname=php
-version=7.4.30
-revision=2
+version=7.4.32
+revision=1
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
@@ -13,8 +13,10 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="PHP-3.01"
homepage="https://www.php.net"
changelog="https://www.php.net/ChangeLog-7.php"
-distfiles="http://www.php.net/distributions/php-${version}.tar.xz"
-checksum=ea72a34f32c67e79ac2da7dfe96177f3c451c3eefae5810ba13312ed398ba70d
+# 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=197e3372afd69694eb6b230838305eb9e1cbe5db272e0fa3bbe0d38e329a95bc
conf_files="/etc/php/php.ini"
diff --git a/srcpkgs/php/update b/srcpkgs/php/update
index ac2289b24b76..caf45c0dd8d1 100644
--- a/srcpkgs/php/update
+++ b/srcpkgs/php/update
@@ -1 +1,2 @@
ignore="8.*"
+site="https://www.php.net/distributions/"
From e82e602b8883845dd4bffcbb8e38dddce0e03410 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:03:12 -0400
Subject: [PATCH 2/6] php8.0: update to 8.0.24, add php8.0-pear subpackage.
---
srcpkgs/php8.0-pear | 1 +
srcpkgs/php8.0/patches/php.ini.patch | 2 +-
srcpkgs/php8.0/template | 35 +++++++++++++++++++++++-----
srcpkgs/php8.0/update | 1 +
4 files changed, 32 insertions(+), 7 deletions(-)
create mode 120000 srcpkgs/php8.0-pear
diff --git a/srcpkgs/php8.0-pear b/srcpkgs/php8.0-pear
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-pear
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0/patches/php.ini.patch b/srcpkgs/php8.0/patches/php.ini.patch
index 07e38a04cf4f..00428db5270d 100644
--- a/srcpkgs/php8.0/patches/php.ini.patch
+++ b/srcpkgs/php8.0/patches/php.ini.patch
@@ -7,7 +7,7 @@ index 794d3e8ddb..c7acf9c883 100644
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
++include_path = ".:/usr/share/pear8.0"
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 4b2fa162e3e3..bc4d56eed1b5 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.23
+version=8.0.24
revision=1
_php_version=8.0
wrksrc="php-${version}"
@@ -15,15 +15,17 @@ 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"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=a2dd50e9c4a0328d921b6bc914e8b4e6572f94f09867318f88acca5ac4fa76c7
+# 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=6020843a2f1ce36745d958b3ca17f3fdc42e78a43899f552ab5dbc509ff19232
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +92,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -112,7 +114,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +220,27 @@ php8.0-embed_package() {
}
}
+php8.0-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.0-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.0/update b/srcpkgs/php8.0/update
index c4d9bc5958ca..566cd8005690 100644
--- a/srcpkgs/php8.0/update
+++ b/srcpkgs/php8.0/update
@@ -1,2 +1,3 @@
pkgname=php
ignore="8.[1-9].*"
+site="https://www.php.net/distributions/"
From 7b525e488071d4008ddb09a6a3ca9097a325b11d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:06:45 -0400
Subject: [PATCH 3/6] php8.1: update to 8.1.11, add php8.1-pear subpackage.
---
srcpkgs/php8.1-pear | 1 +
srcpkgs/php8.1/patches/php.ini.patch | 2 +-
srcpkgs/php8.1/template | 35 +++++++++++++++++++++++-----
srcpkgs/php8.1/update | 1 +
4 files changed, 32 insertions(+), 7 deletions(-)
create mode 120000 srcpkgs/php8.1-pear
diff --git a/srcpkgs/php8.1-pear b/srcpkgs/php8.1-pear
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-pear
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1/patches/php.ini.patch b/srcpkgs/php8.1/patches/php.ini.patch
index 186898f63fab..e4d45eafed32 100644
--- a/srcpkgs/php8.1/patches/php.ini.patch
+++ b/srcpkgs/php8.1/patches/php.ini.patch
@@ -7,7 +7,7 @@ index b39a960..68f14a6 100644
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
++include_path = ".:/usr/share/pear8.1"
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index f18fa2cb9a7c..04c0de334f93 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.10
+version=8.1.11
revision=1
_php_version=8.1
wrksrc="php-${version}"
@@ -15,15 +15,17 @@ 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"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=3ea4f323109dfbc8d2631d08aa0e08602c1f713678e9dc6c750f081ef49eab0f
+# 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=3660e8408321149f5d382bb8eeb9ea7b12ea8dd7ea66069da33f6f7383750ab2
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +92,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -112,7 +114,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +220,27 @@ php8.1-embed_package() {
}
}
+php8.1-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.1-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.1/update b/srcpkgs/php8.1/update
index 0c2792ec963f..e39f4573be89 100644
--- a/srcpkgs/php8.1/update
+++ b/srcpkgs/php8.1/update
@@ -1,2 +1,3 @@
pkgname=php
ignore="8.[2-9].*"
+site="https://www.php.net/distributions/"
From be362c285d6f6bd478d993642434d9aa3515dbcb Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:15:58 -0400
Subject: [PATCH 4/6] php-apcu: update to 5.1.22.
---
srcpkgs/php-apcu/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/php-apcu/template b/srcpkgs/php-apcu/template
index 16c7b707761e..b5f0bbcccbd1 100644
--- a/srcpkgs/php-apcu/template
+++ b/srcpkgs/php-apcu/template
@@ -1,7 +1,7 @@
# Template file for 'php-apcu'
pkgname=php-apcu
-version=5.1.17
-revision=2
+version=5.1.22
+revision=1
wrksrc="apcu-${version}"
build_style=gnu-configure
make_check_target=test
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="PHP-3.01"
homepage="https://pecl.php.net/package/APCu"
distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
-checksum=6b11b477890a9c096ad856e0251920d1d8b9558b7d115256c027e0223755c793
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize
From 57cef51b8b474a5c484264faed998c372c39b92b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:03:13 -0400
Subject: [PATCH 5/6] php8.0-apcu: update to 5.1.22.
---
srcpkgs/php8.0-apcu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.0-apcu/template b/srcpkgs/php8.0-apcu/template
index 0409dd840ff5..7dccffa049f6 100644
--- a/srcpkgs/php8.0-apcu/template
+++ b/srcpkgs/php8.0-apcu/template
@@ -1,6 +1,6 @@
# Template file for 'php8.0-apcu'
pkgname=php8.0-apcu
-version=5.1.21
+version=5.1.22
revision=1
wrksrc="apcu-${version}"
build_style=gnu-configure
@@ -14,7 +14,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=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize8.0
From b66105b92075b10f8e0beefe073d3cc1753b1cc3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:03:45 -0400
Subject: [PATCH 6/6] php8.1-apcu: update to 5.1.22.
---
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 60d5ca79143d..293a0d1020f4 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.21
+version=5.1.22
revision=1
wrksrc="apcu-${version}"
build_style=gnu-configure
@@ -14,7 +14,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=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize8.1
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: PHP 7.4.32, PHP 8.0.24 + pear, PHP 8.1.11 + pear, php.*apcu 5.1.22
2022-09-23 17:51 [PR PATCH] php8.[01]: add php8.[01]-pear subpackage TinfoilSubmarine
` (8 preceding siblings ...)
2022-10-07 14:14 ` TinfoilSubmarine
@ 2022-10-07 17:25 ` TinfoilSubmarine
2022-10-31 13:02 ` [PR PATCH] [Updated] " TinfoilSubmarine
` (5 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-10-07 17:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/39438#issuecomment-1271856977
Comment:
This is ready to merge.
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] PHP 7.4.32, PHP 8.0.24 + pear, PHP 8.1.11 + pear, php.*apcu 5.1.22
2022-09-23 17:51 [PR PATCH] php8.[01]: add php8.[01]-pear subpackage TinfoilSubmarine
` (9 preceding siblings ...)
2022-10-07 17:25 ` TinfoilSubmarine
@ 2022-10-31 13:02 ` TinfoilSubmarine
2022-11-03 15:30 ` [PR PATCH] [Updated] PHP 7.4.32, PHP 8.0.25 + pear, PHP 8.1.12 + pear, php.*apcu 5.1.22, php.*igbinary 3.2.9 TinfoilSubmarine
` (4 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-10-31 13:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1306 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php-pear
https://github.com/void-linux/void-packages/pull/39438
PHP 7.4.32, PHP 8.0.24 + pear, PHP 8.1.11 + pear, php.*apcu 5.1.22
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
I tested the changes in this PR: **YES**
<!--
#### 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/39438.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-pear-39438.patch --]
[-- Type: text/x-diff, Size: 16335 bytes --]
From 2f16d950a01d4603aab7e5df453db69e30976bd1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 30 Sep 2022 09:27:11 -0400
Subject: [PATCH 1/9] php: update to 7.4.32.
---
srcpkgs/php/template | 10 ++++++----
srcpkgs/php/update | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3eb8e38cd928..2173e7f9a3af 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
# Template file for 'php'
pkgname=php
-version=7.4.30
-revision=2
+version=7.4.32
+revision=1
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
@@ -13,8 +13,10 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="PHP-3.01"
homepage="https://www.php.net"
changelog="https://www.php.net/ChangeLog-7.php"
-distfiles="http://www.php.net/distributions/php-${version}.tar.xz"
-checksum=ea72a34f32c67e79ac2da7dfe96177f3c451c3eefae5810ba13312ed398ba70d
+# 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=197e3372afd69694eb6b230838305eb9e1cbe5db272e0fa3bbe0d38e329a95bc
conf_files="/etc/php/php.ini"
diff --git a/srcpkgs/php/update b/srcpkgs/php/update
index ac2289b24b76..caf45c0dd8d1 100644
--- a/srcpkgs/php/update
+++ b/srcpkgs/php/update
@@ -1 +1,2 @@
ignore="8.*"
+site="https://www.php.net/distributions/"
From 8bdec063eec7e076b4be45f894a2e02fffabeecc Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:03:12 -0400
Subject: [PATCH 2/9] php8.0: update to 8.0.25, add php8.0-pear subpackage.
---
srcpkgs/php8.0-pear | 1 +
srcpkgs/php8.0/patches/php.ini.patch | 2 +-
srcpkgs/php8.0/template | 35 +++++++++++++++++++++++-----
srcpkgs/php8.0/update | 1 +
4 files changed, 32 insertions(+), 7 deletions(-)
create mode 120000 srcpkgs/php8.0-pear
diff --git a/srcpkgs/php8.0-pear b/srcpkgs/php8.0-pear
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-pear
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0/patches/php.ini.patch b/srcpkgs/php8.0/patches/php.ini.patch
index 07e38a04cf4f..00428db5270d 100644
--- a/srcpkgs/php8.0/patches/php.ini.patch
+++ b/srcpkgs/php8.0/patches/php.ini.patch
@@ -7,7 +7,7 @@ index 794d3e8ddb..c7acf9c883 100644
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
++include_path = ".:/usr/share/pear8.0"
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 4b2fa162e3e3..b35257e4e283 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.23
+version=8.0.25
revision=1
_php_version=8.0
wrksrc="php-${version}"
@@ -15,15 +15,17 @@ 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"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=a2dd50e9c4a0328d921b6bc914e8b4e6572f94f09867318f88acca5ac4fa76c7
+# 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=349a2b5a01bfccbc9af8afdf183e57bed3349706a084f3c4694aa4c7ff7cb2e9
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +92,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -112,7 +114,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +220,27 @@ php8.0-embed_package() {
}
}
+php8.0-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.0-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.0/update b/srcpkgs/php8.0/update
index c4d9bc5958ca..566cd8005690 100644
--- a/srcpkgs/php8.0/update
+++ b/srcpkgs/php8.0/update
@@ -1,2 +1,3 @@
pkgname=php
ignore="8.[1-9].*"
+site="https://www.php.net/distributions/"
From b0c72f2cf1d81decb61f89fec64426b233dd7683 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:06:45 -0400
Subject: [PATCH 3/9] php8.1: update to 8.1.12, add php8.1-pear subpackage.
---
srcpkgs/php8.1-pear | 1 +
srcpkgs/php8.1/patches/php.ini.patch | 2 +-
srcpkgs/php8.1/template | 35 +++++++++++++++++++++++-----
srcpkgs/php8.1/update | 1 +
4 files changed, 32 insertions(+), 7 deletions(-)
create mode 120000 srcpkgs/php8.1-pear
diff --git a/srcpkgs/php8.1-pear b/srcpkgs/php8.1-pear
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-pear
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1/patches/php.ini.patch b/srcpkgs/php8.1/patches/php.ini.patch
index 186898f63fab..e4d45eafed32 100644
--- a/srcpkgs/php8.1/patches/php.ini.patch
+++ b/srcpkgs/php8.1/patches/php.ini.patch
@@ -7,7 +7,7 @@ index b39a960..68f14a6 100644
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
++include_path = ".:/usr/share/pear8.1"
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index f18fa2cb9a7c..06c3dbf3f272 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.10
+version=8.1.12
revision=1
_php_version=8.1
wrksrc="php-${version}"
@@ -15,15 +15,17 @@ 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"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=3ea4f323109dfbc8d2631d08aa0e08602c1f713678e9dc6c750f081ef49eab0f
+# 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=e0e7c823c9f9aa4c021f5e34ae1a7acafc2a9f3056ca60eb70a8af8f33da3fdf
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +92,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -112,7 +114,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +220,27 @@ php8.1-embed_package() {
}
}
+php8.1-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.1-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.1/update b/srcpkgs/php8.1/update
index 0c2792ec963f..e39f4573be89 100644
--- a/srcpkgs/php8.1/update
+++ b/srcpkgs/php8.1/update
@@ -1,2 +1,3 @@
pkgname=php
ignore="8.[2-9].*"
+site="https://www.php.net/distributions/"
From 757d3955c156d8c70925bccd47039dc3dae3998d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:15:58 -0400
Subject: [PATCH 4/9] php-apcu: update to 5.1.22.
---
srcpkgs/php-apcu/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/php-apcu/template b/srcpkgs/php-apcu/template
index 16c7b707761e..b5f0bbcccbd1 100644
--- a/srcpkgs/php-apcu/template
+++ b/srcpkgs/php-apcu/template
@@ -1,7 +1,7 @@
# Template file for 'php-apcu'
pkgname=php-apcu
-version=5.1.17
-revision=2
+version=5.1.22
+revision=1
wrksrc="apcu-${version}"
build_style=gnu-configure
make_check_target=test
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="PHP-3.01"
homepage="https://pecl.php.net/package/APCu"
distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
-checksum=6b11b477890a9c096ad856e0251920d1d8b9558b7d115256c027e0223755c793
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize
From 7965d9d5799707afea9cc518e84224b6655074e5 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:03:13 -0400
Subject: [PATCH 5/9] php8.0-apcu: update to 5.1.22.
---
srcpkgs/php8.0-apcu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.0-apcu/template b/srcpkgs/php8.0-apcu/template
index 0409dd840ff5..7dccffa049f6 100644
--- a/srcpkgs/php8.0-apcu/template
+++ b/srcpkgs/php8.0-apcu/template
@@ -1,6 +1,6 @@
# Template file for 'php8.0-apcu'
pkgname=php8.0-apcu
-version=5.1.21
+version=5.1.22
revision=1
wrksrc="apcu-${version}"
build_style=gnu-configure
@@ -14,7 +14,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=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize8.0
From 86d7c10742d3944fecfeabb7189dca54688986f5 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:03:45 -0400
Subject: [PATCH 6/9] php8.1-apcu: update to 5.1.22.
---
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 60d5ca79143d..293a0d1020f4 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.21
+version=5.1.22
revision=1
wrksrc="apcu-${version}"
build_style=gnu-configure
@@ -14,7 +14,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=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize8.1
From 4222a8a7ebb6bca4a3a4adb5e30e5b1a557db2d5 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 31 Oct 2022 08:40:05 -0400
Subject: [PATCH 7/9] php-igbinary: update to 3.2.9.
---
srcpkgs/php-igbinary/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php-igbinary/template b/srcpkgs/php-igbinary/template
index d969703a7c37..cd7730f677a1 100644
--- a/srcpkgs/php-igbinary/template
+++ b/srcpkgs/php-igbinary/template
@@ -1,6 +1,6 @@
# Template file for 'php-igbinary'
pkgname=php-igbinary
-version=3.1.2
+version=3.2.9
revision=1
wrksrc="igbinary-${version}"
build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Merlin Diavova <merlindiavova@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/igbinary/igbinary/"
distfiles="https://pecl.php.net/get/igbinary-${version}.tgz"
-checksum=e78b327dad5397ed42f7b0c6fe017eddcde8c3c24ab8b59562cb691c411fa90b
+checksum=2937ec9d554e6e5fb690502b564865a6fc4ad6e34644843aef70ede049d77586
pre_configure() {
phpize
From 1ac47d4d8026fa0d8dd55f62b2c6fcb0b7eda204 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 31 Oct 2022 08:38:53 -0400
Subject: [PATCH 8/9] php8.0-igbinary: update to 3.2.9.
---
srcpkgs/php8.0-igbinary/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.0-igbinary/template b/srcpkgs/php8.0-igbinary/template
index f74c6f88186c..4d5b082adb10 100644
--- a/srcpkgs/php8.0-igbinary/template
+++ b/srcpkgs/php8.0-igbinary/template
@@ -1,6 +1,6 @@
# Template file for 'php8.0-igbinary'
pkgname=php8.0-igbinary
-version=3.2.7
+version=3.2.9
revision=1
wrksrc="igbinary-${version}"
build_style=gnu-configure
@@ -13,7 +13,7 @@ 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=d0dc0d0b56a985f4f52cea20717133d3da05368876bc0f94317c1e60e0319e7d
+checksum=2937ec9d554e6e5fb690502b564865a6fc4ad6e34644843aef70ede049d77586
pre_configure() {
phpize8.0
From c83505ad906f62d110186bf392643964caaabded Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 31 Oct 2022 08:38:56 -0400
Subject: [PATCH 9/9] php8.1-igbinary: update to 3.2.9.
---
srcpkgs/php8.1-igbinary/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.1-igbinary/template b/srcpkgs/php8.1-igbinary/template
index 14fadb10e252..5f652915afa5 100644
--- a/srcpkgs/php8.1-igbinary/template
+++ b/srcpkgs/php8.1-igbinary/template
@@ -1,6 +1,6 @@
# Template file for 'php8.1-igbinary'
pkgname=php8.1-igbinary
-version=3.2.7
+version=3.2.9
revision=1
wrksrc="igbinary-${version}"
build_style=gnu-configure
@@ -13,7 +13,7 @@ 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=d0dc0d0b56a985f4f52cea20717133d3da05368876bc0f94317c1e60e0319e7d
+checksum=2937ec9d554e6e5fb690502b564865a6fc4ad6e34644843aef70ede049d77586
pre_configure() {
phpize8.1
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] PHP 7.4.32, PHP 8.0.25 + pear, PHP 8.1.12 + pear, php.*apcu 5.1.22, php.*igbinary 3.2.9
2022-09-23 17:51 [PR PATCH] php8.[01]: add php8.[01]-pear subpackage TinfoilSubmarine
` (10 preceding siblings ...)
2022-10-31 13:02 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2022-11-03 15:30 ` TinfoilSubmarine
2022-11-03 17:06 ` PHP 7.4.33, " TinfoilSubmarine
` (3 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-11-03 15:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1327 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php-pear
https://github.com/void-linux/void-packages/pull/39438
PHP 7.4.32, PHP 8.0.25 + pear, PHP 8.1.12 + pear, php.*apcu 5.1.22, php.*igbinary 3.2.9
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
I tested the changes in this PR: **YES**
<!--
#### 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/39438.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-pear-39438.patch --]
[-- Type: text/x-diff, Size: 16335 bytes --]
From 2c672ec09abca16746cf4057cf2a3603765b557a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 30 Sep 2022 09:27:11 -0400
Subject: [PATCH 1/9] php: update to 7.4.33.
---
srcpkgs/php/template | 10 ++++++----
srcpkgs/php/update | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3eb8e38cd928..7e79418e3554 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
# Template file for 'php'
pkgname=php
-version=7.4.30
-revision=2
+version=7.4.33
+revision=1
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
@@ -13,8 +13,10 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="PHP-3.01"
homepage="https://www.php.net"
changelog="https://www.php.net/ChangeLog-7.php"
-distfiles="http://www.php.net/distributions/php-${version}.tar.xz"
-checksum=ea72a34f32c67e79ac2da7dfe96177f3c451c3eefae5810ba13312ed398ba70d
+# 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=5a2337996f07c8a097e03d46263b5c98d2c8e355227756351421003bea8f463e
conf_files="/etc/php/php.ini"
diff --git a/srcpkgs/php/update b/srcpkgs/php/update
index ac2289b24b76..caf45c0dd8d1 100644
--- a/srcpkgs/php/update
+++ b/srcpkgs/php/update
@@ -1 +1,2 @@
ignore="8.*"
+site="https://www.php.net/distributions/"
From 900eddf53258aad1118f156930460ffb74b390ee Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:03:12 -0400
Subject: [PATCH 2/9] php8.0: update to 8.0.25, add php8.0-pear subpackage.
---
srcpkgs/php8.0-pear | 1 +
srcpkgs/php8.0/patches/php.ini.patch | 2 +-
srcpkgs/php8.0/template | 35 +++++++++++++++++++++++-----
srcpkgs/php8.0/update | 1 +
4 files changed, 32 insertions(+), 7 deletions(-)
create mode 120000 srcpkgs/php8.0-pear
diff --git a/srcpkgs/php8.0-pear b/srcpkgs/php8.0-pear
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-pear
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0/patches/php.ini.patch b/srcpkgs/php8.0/patches/php.ini.patch
index 07e38a04cf4f..00428db5270d 100644
--- a/srcpkgs/php8.0/patches/php.ini.patch
+++ b/srcpkgs/php8.0/patches/php.ini.patch
@@ -7,7 +7,7 @@ index 794d3e8ddb..c7acf9c883 100644
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
++include_path = ".:/usr/share/pear8.0"
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 4b2fa162e3e3..b35257e4e283 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.23
+version=8.0.25
revision=1
_php_version=8.0
wrksrc="php-${version}"
@@ -15,15 +15,17 @@ 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"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=a2dd50e9c4a0328d921b6bc914e8b4e6572f94f09867318f88acca5ac4fa76c7
+# 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=349a2b5a01bfccbc9af8afdf183e57bed3349706a084f3c4694aa4c7ff7cb2e9
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +92,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -112,7 +114,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +220,27 @@ php8.0-embed_package() {
}
}
+php8.0-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.0-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.0/update b/srcpkgs/php8.0/update
index c4d9bc5958ca..566cd8005690 100644
--- a/srcpkgs/php8.0/update
+++ b/srcpkgs/php8.0/update
@@ -1,2 +1,3 @@
pkgname=php
ignore="8.[1-9].*"
+site="https://www.php.net/distributions/"
From f8b9da43f17da592100194f72f17e0c1e1ea5394 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:06:45 -0400
Subject: [PATCH 3/9] php8.1: update to 8.1.12, add php8.1-pear subpackage.
---
srcpkgs/php8.1-pear | 1 +
srcpkgs/php8.1/patches/php.ini.patch | 2 +-
srcpkgs/php8.1/template | 35 +++++++++++++++++++++++-----
srcpkgs/php8.1/update | 1 +
4 files changed, 32 insertions(+), 7 deletions(-)
create mode 120000 srcpkgs/php8.1-pear
diff --git a/srcpkgs/php8.1-pear b/srcpkgs/php8.1-pear
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-pear
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1/patches/php.ini.patch b/srcpkgs/php8.1/patches/php.ini.patch
index 186898f63fab..e4d45eafed32 100644
--- a/srcpkgs/php8.1/patches/php.ini.patch
+++ b/srcpkgs/php8.1/patches/php.ini.patch
@@ -7,7 +7,7 @@ index b39a960..68f14a6 100644
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
++include_path = ".:/usr/share/pear8.1"
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index f18fa2cb9a7c..06c3dbf3f272 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.10
+version=8.1.12
revision=1
_php_version=8.1
wrksrc="php-${version}"
@@ -15,15 +15,17 @@ 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"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=3ea4f323109dfbc8d2631d08aa0e08602c1f713678e9dc6c750f081ef49eab0f
+# 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=e0e7c823c9f9aa4c021f5e34ae1a7acafc2a9f3056ca60eb70a8af8f33da3fdf
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -90,7 +92,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -112,7 +114,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -218,6 +220,27 @@ php8.1-embed_package() {
}
}
+php8.1-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.1-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.1/update b/srcpkgs/php8.1/update
index 0c2792ec963f..e39f4573be89 100644
--- a/srcpkgs/php8.1/update
+++ b/srcpkgs/php8.1/update
@@ -1,2 +1,3 @@
pkgname=php
ignore="8.[2-9].*"
+site="https://www.php.net/distributions/"
From 9fa9546e3d86d90a15a5e6ac8cc57659c2919ff0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:15:58 -0400
Subject: [PATCH 4/9] php-apcu: update to 5.1.22.
---
srcpkgs/php-apcu/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/php-apcu/template b/srcpkgs/php-apcu/template
index 16c7b707761e..b5f0bbcccbd1 100644
--- a/srcpkgs/php-apcu/template
+++ b/srcpkgs/php-apcu/template
@@ -1,7 +1,7 @@
# Template file for 'php-apcu'
pkgname=php-apcu
-version=5.1.17
-revision=2
+version=5.1.22
+revision=1
wrksrc="apcu-${version}"
build_style=gnu-configure
make_check_target=test
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="PHP-3.01"
homepage="https://pecl.php.net/package/APCu"
distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
-checksum=6b11b477890a9c096ad856e0251920d1d8b9558b7d115256c027e0223755c793
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize
From 52e5699ed3c921c9c74d8021f413b1f2bc90e368 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:03:13 -0400
Subject: [PATCH 5/9] php8.0-apcu: update to 5.1.22.
---
srcpkgs/php8.0-apcu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.0-apcu/template b/srcpkgs/php8.0-apcu/template
index 0409dd840ff5..7dccffa049f6 100644
--- a/srcpkgs/php8.0-apcu/template
+++ b/srcpkgs/php8.0-apcu/template
@@ -1,6 +1,6 @@
# Template file for 'php8.0-apcu'
pkgname=php8.0-apcu
-version=5.1.21
+version=5.1.22
revision=1
wrksrc="apcu-${version}"
build_style=gnu-configure
@@ -14,7 +14,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=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize8.0
From f3686e634702bf2db610f1606c764df03668ad2b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:03:45 -0400
Subject: [PATCH 6/9] php8.1-apcu: update to 5.1.22.
---
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 60d5ca79143d..293a0d1020f4 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.21
+version=5.1.22
revision=1
wrksrc="apcu-${version}"
build_style=gnu-configure
@@ -14,7 +14,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=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize8.1
From f3e1e382b551db467337a4b2b42352a7a0e2db72 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 31 Oct 2022 08:40:05 -0400
Subject: [PATCH 7/9] php-igbinary: update to 3.2.9.
---
srcpkgs/php-igbinary/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php-igbinary/template b/srcpkgs/php-igbinary/template
index d969703a7c37..cd7730f677a1 100644
--- a/srcpkgs/php-igbinary/template
+++ b/srcpkgs/php-igbinary/template
@@ -1,6 +1,6 @@
# Template file for 'php-igbinary'
pkgname=php-igbinary
-version=3.1.2
+version=3.2.9
revision=1
wrksrc="igbinary-${version}"
build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Merlin Diavova <merlindiavova@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/igbinary/igbinary/"
distfiles="https://pecl.php.net/get/igbinary-${version}.tgz"
-checksum=e78b327dad5397ed42f7b0c6fe017eddcde8c3c24ab8b59562cb691c411fa90b
+checksum=2937ec9d554e6e5fb690502b564865a6fc4ad6e34644843aef70ede049d77586
pre_configure() {
phpize
From 439e7abe3a6b5161e215e3e6ed4df213a23ff5ea Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 31 Oct 2022 08:38:53 -0400
Subject: [PATCH 8/9] php8.0-igbinary: update to 3.2.9.
---
srcpkgs/php8.0-igbinary/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.0-igbinary/template b/srcpkgs/php8.0-igbinary/template
index f74c6f88186c..4d5b082adb10 100644
--- a/srcpkgs/php8.0-igbinary/template
+++ b/srcpkgs/php8.0-igbinary/template
@@ -1,6 +1,6 @@
# Template file for 'php8.0-igbinary'
pkgname=php8.0-igbinary
-version=3.2.7
+version=3.2.9
revision=1
wrksrc="igbinary-${version}"
build_style=gnu-configure
@@ -13,7 +13,7 @@ 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=d0dc0d0b56a985f4f52cea20717133d3da05368876bc0f94317c1e60e0319e7d
+checksum=2937ec9d554e6e5fb690502b564865a6fc4ad6e34644843aef70ede049d77586
pre_configure() {
phpize8.0
From 97139785bc6ae8bfa73d586047f108990f496087 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 31 Oct 2022 08:38:56 -0400
Subject: [PATCH 9/9] php8.1-igbinary: update to 3.2.9.
---
srcpkgs/php8.1-igbinary/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.1-igbinary/template b/srcpkgs/php8.1-igbinary/template
index 14fadb10e252..5f652915afa5 100644
--- a/srcpkgs/php8.1-igbinary/template
+++ b/srcpkgs/php8.1-igbinary/template
@@ -1,6 +1,6 @@
# Template file for 'php8.1-igbinary'
pkgname=php8.1-igbinary
-version=3.2.7
+version=3.2.9
revision=1
wrksrc="igbinary-${version}"
build_style=gnu-configure
@@ -13,7 +13,7 @@ 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=d0dc0d0b56a985f4f52cea20717133d3da05368876bc0f94317c1e60e0319e7d
+checksum=2937ec9d554e6e5fb690502b564865a6fc4ad6e34644843aef70ede049d77586
pre_configure() {
phpize8.1
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: PHP 7.4.33, PHP 8.0.25 + pear, PHP 8.1.12 + pear, php.*apcu 5.1.22, php.*igbinary 3.2.9
2022-09-23 17:51 [PR PATCH] php8.[01]: add php8.[01]-pear subpackage TinfoilSubmarine
` (11 preceding siblings ...)
2022-11-03 15:30 ` [PR PATCH] [Updated] PHP 7.4.32, PHP 8.0.25 + pear, PHP 8.1.12 + pear, php.*apcu 5.1.22, php.*igbinary 3.2.9 TinfoilSubmarine
@ 2022-11-03 17:06 ` TinfoilSubmarine
2022-11-15 14:29 ` [PR PATCH] [Updated] " TinfoilSubmarine
` (2 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-11-03 17:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 239 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/39438#issuecomment-1302416256
Comment:
Anything holding this up? I think there's at least one CVE that these updates address...
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] PHP 7.4.33, PHP 8.0.25 + pear, PHP 8.1.12 + pear, php.*apcu 5.1.22, php.*igbinary 3.2.9
2022-09-23 17:51 [PR PATCH] php8.[01]: add php8.[01]-pear subpackage TinfoilSubmarine
` (12 preceding siblings ...)
2022-11-03 17:06 ` PHP 7.4.33, " TinfoilSubmarine
@ 2022-11-15 14:29 ` TinfoilSubmarine
2022-11-15 14:48 ` [PR PATCH] [Updated] php.*: 7.4.33, 8.0.25 + pear, 8.1.12 + pear, apcu 5.1.22, igbinary 3.2.12 TinfoilSubmarine
2022-11-17 11:51 ` [PR PATCH] [Merged]: " paper42
15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-11-15 14:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1327 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php-pear
https://github.com/void-linux/void-packages/pull/39438
PHP 7.4.33, PHP 8.0.25 + pear, PHP 8.1.12 + pear, php.*apcu 5.1.22, php.*igbinary 3.2.9
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
I tested the changes in this PR: **YES**
<!--
#### 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/39438.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-pear-39438.patch --]
[-- Type: text/x-diff, Size: 16531 bytes --]
From b3c4c64df0c2a3294f43762ba24cf3f2079eb072 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 30 Sep 2022 09:27:11 -0400
Subject: [PATCH 1/9] php: update to 7.4.33.
---
srcpkgs/php/template | 10 ++++++----
srcpkgs/php/update | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3eb8e38cd928..7e79418e3554 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
# Template file for 'php'
pkgname=php
-version=7.4.30
-revision=2
+version=7.4.33
+revision=1
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
@@ -13,8 +13,10 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="PHP-3.01"
homepage="https://www.php.net"
changelog="https://www.php.net/ChangeLog-7.php"
-distfiles="http://www.php.net/distributions/php-${version}.tar.xz"
-checksum=ea72a34f32c67e79ac2da7dfe96177f3c451c3eefae5810ba13312ed398ba70d
+# 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=5a2337996f07c8a097e03d46263b5c98d2c8e355227756351421003bea8f463e
conf_files="/etc/php/php.ini"
diff --git a/srcpkgs/php/update b/srcpkgs/php/update
index ac2289b24b76..caf45c0dd8d1 100644
--- a/srcpkgs/php/update
+++ b/srcpkgs/php/update
@@ -1 +1,2 @@
ignore="8.*"
+site="https://www.php.net/distributions/"
From df442b39b7c1f9b1f3cacc738f154ae3fb4fc695 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:03:12 -0400
Subject: [PATCH 2/9] php8.0: update to 8.0.25, add php8.0-pear subpackage.
---
srcpkgs/php8.0-pear | 1 +
srcpkgs/php8.0/patches/php.ini.patch | 2 +-
srcpkgs/php8.0/template | 35 +++++++++++++++++++++++-----
srcpkgs/php8.0/update | 1 +
4 files changed, 32 insertions(+), 7 deletions(-)
create mode 120000 srcpkgs/php8.0-pear
diff --git a/srcpkgs/php8.0-pear b/srcpkgs/php8.0-pear
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-pear
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0/patches/php.ini.patch b/srcpkgs/php8.0/patches/php.ini.patch
index 07e38a04cf4f..00428db5270d 100644
--- a/srcpkgs/php8.0/patches/php.ini.patch
+++ b/srcpkgs/php8.0/patches/php.ini.patch
@@ -7,7 +7,7 @@ index 794d3e8ddb..c7acf9c883 100644
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
++include_path = ".:/usr/share/pear8.0"
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 381f073a73d3..74c50da0e46f 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.23
+version=8.0.25
revision=1
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
@@ -14,15 +14,17 @@ 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"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=a2dd50e9c4a0328d921b6bc914e8b4e6572f94f09867318f88acca5ac4fa76c7
+# 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=349a2b5a01bfccbc9af8afdf183e57bed3349706a084f3c4694aa4c7ff7cb2e9
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -89,7 +91,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -111,7 +113,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -217,6 +219,27 @@ php8.0-embed_package() {
}
}
+php8.0-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.0-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.0/update b/srcpkgs/php8.0/update
index c4d9bc5958ca..566cd8005690 100644
--- a/srcpkgs/php8.0/update
+++ b/srcpkgs/php8.0/update
@@ -1,2 +1,3 @@
pkgname=php
ignore="8.[1-9].*"
+site="https://www.php.net/distributions/"
From f3f3690f740da30fbd1b86c30ac0969c6eb57950 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:06:45 -0400
Subject: [PATCH 3/9] php8.1: update to 8.1.12, add php8.1-pear subpackage.
---
srcpkgs/php8.1-pear | 1 +
srcpkgs/php8.1/patches/php.ini.patch | 2 +-
srcpkgs/php8.1/template | 35 +++++++++++++++++++++++-----
srcpkgs/php8.1/update | 1 +
4 files changed, 32 insertions(+), 7 deletions(-)
create mode 120000 srcpkgs/php8.1-pear
diff --git a/srcpkgs/php8.1-pear b/srcpkgs/php8.1-pear
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-pear
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1/patches/php.ini.patch b/srcpkgs/php8.1/patches/php.ini.patch
index 186898f63fab..e4d45eafed32 100644
--- a/srcpkgs/php8.1/patches/php.ini.patch
+++ b/srcpkgs/php8.1/patches/php.ini.patch
@@ -7,7 +7,7 @@ index b39a960..68f14a6 100644
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
++include_path = ".:/usr/share/pear8.1"
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 33e38c1db282..f19688b52f6c 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.10
+version=8.1.12
revision=1
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
@@ -14,15 +14,17 @@ 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"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=3ea4f323109dfbc8d2631d08aa0e08602c1f713678e9dc6c750f081ef49eab0f
+# 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=e0e7c823c9f9aa4c021f5e34ae1a7acafc2a9f3056ca60eb70a8af8f33da3fdf
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -89,7 +91,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -111,7 +113,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -217,6 +219,27 @@ php8.1-embed_package() {
}
}
+php8.1-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.1-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.1/update b/srcpkgs/php8.1/update
index 0c2792ec963f..e39f4573be89 100644
--- a/srcpkgs/php8.1/update
+++ b/srcpkgs/php8.1/update
@@ -1,2 +1,3 @@
pkgname=php
ignore="8.[2-9].*"
+site="https://www.php.net/distributions/"
From 5698660a3bf534ed85cefdbc68f33c5a41255c9d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:15:58 -0400
Subject: [PATCH 4/9] php-apcu: update to 5.1.22.
---
srcpkgs/php-apcu/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/php-apcu/template b/srcpkgs/php-apcu/template
index e5b6a2490e4a..143322579e0b 100644
--- a/srcpkgs/php-apcu/template
+++ b/srcpkgs/php-apcu/template
@@ -1,7 +1,7 @@
# Template file for 'php-apcu'
pkgname=php-apcu
-version=5.1.17
-revision=2
+version=5.1.22
+revision=1
build_wrksrc=apcu-$version
build_style=gnu-configure
make_check_target=test
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="PHP-3.01"
homepage="https://pecl.php.net/package/APCu"
distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
-checksum=6b11b477890a9c096ad856e0251920d1d8b9558b7d115256c027e0223755c793
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize
From 10738712689d3478391fd2129261517b25261cd8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:03:13 -0400
Subject: [PATCH 5/9] php8.0-apcu: update to 5.1.22.
---
srcpkgs/php8.0-apcu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.0-apcu/template b/srcpkgs/php8.0-apcu/template
index d022a08f3a30..39b3360b86d0 100644
--- a/srcpkgs/php8.0-apcu/template
+++ b/srcpkgs/php8.0-apcu/template
@@ -1,6 +1,6 @@
# Template file for 'php8.0-apcu'
pkgname=php8.0-apcu
-version=5.1.21
+version=5.1.22
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.0"
@@ -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=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
post_extract() {
mv apcu-$version/* .
From 7c0dfc981d344b1b1fc09832b302a7d3894748d0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:03:45 -0400
Subject: [PATCH 6/9] php8.1-apcu: update to 5.1.22.
---
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 22eadd38e042..2b1ed3a177ed 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.21
+version=5.1.22
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=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
post_extract() {
mv apcu-$version/* .
From ecf3d83e0d5e2f8d4152f6bcf3d60fd8695eedb4 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 31 Oct 2022 08:40:05 -0400
Subject: [PATCH 7/9] php-igbinary: update to 3.2.9.
---
srcpkgs/php-igbinary/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php-igbinary/template b/srcpkgs/php-igbinary/template
index f111a4b2ff64..b31889048248 100644
--- a/srcpkgs/php-igbinary/template
+++ b/srcpkgs/php-igbinary/template
@@ -1,6 +1,6 @@
# Template file for 'php-igbinary'
pkgname=php-igbinary
-version=3.1.2
+version=3.2.9
revision=1
build_wrksrc=igbinary-$version
build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Merlin Diavova <merlindiavova@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/igbinary/igbinary/"
distfiles="https://pecl.php.net/get/igbinary-${version}.tgz"
-checksum=e78b327dad5397ed42f7b0c6fe017eddcde8c3c24ab8b59562cb691c411fa90b
+checksum=2937ec9d554e6e5fb690502b564865a6fc4ad6e34644843aef70ede049d77586
pre_configure() {
phpize
From 9123cb2b3dd88c6ec19dd33d0121a44fbb39df20 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 31 Oct 2022 08:38:53 -0400
Subject: [PATCH 8/9] php8.0-igbinary: update to 3.2.9.
---
srcpkgs/php8.0-igbinary/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.0-igbinary/template b/srcpkgs/php8.0-igbinary/template
index a1dedaeec4a2..b3df1c5db77f 100644
--- a/srcpkgs/php8.0-igbinary/template
+++ b/srcpkgs/php8.0-igbinary/template
@@ -1,6 +1,6 @@
# Template file for 'php8.0-igbinary'
pkgname=php8.0-igbinary
-version=3.2.7
+version=3.2.9
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.0"
@@ -12,7 +12,7 @@ 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=d0dc0d0b56a985f4f52cea20717133d3da05368876bc0f94317c1e60e0319e7d
+checksum=2937ec9d554e6e5fb690502b564865a6fc4ad6e34644843aef70ede049d77586
pre_configure() {
phpize8.0
From 855cb39bdb3e21ba10becf6e2a02e53d107b42c4 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 31 Oct 2022 08:38:56 -0400
Subject: [PATCH 9/9] php8.1-igbinary: update to 3.2.9.
---
srcpkgs/php8.1-igbinary/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.1-igbinary/template b/srcpkgs/php8.1-igbinary/template
index e86a1ab4dba4..0fb7e289b848 100644
--- a/srcpkgs/php8.1-igbinary/template
+++ b/srcpkgs/php8.1-igbinary/template
@@ -1,6 +1,6 @@
# Template file for 'php8.1-igbinary'
pkgname=php8.1-igbinary
-version=3.2.7
+version=3.2.9
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
@@ -12,7 +12,7 @@ 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=d0dc0d0b56a985f4f52cea20717133d3da05368876bc0f94317c1e60e0319e7d
+checksum=2937ec9d554e6e5fb690502b564865a6fc4ad6e34644843aef70ede049d77586
pre_configure() {
phpize8.1
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] php.*: 7.4.33, 8.0.25 + pear, 8.1.12 + pear, apcu 5.1.22, igbinary 3.2.12
2022-09-23 17:51 [PR PATCH] php8.[01]: add php8.[01]-pear subpackage TinfoilSubmarine
` (13 preceding siblings ...)
2022-11-15 14:29 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2022-11-15 14:48 ` TinfoilSubmarine
2022-11-17 11:51 ` [PR PATCH] [Merged]: " paper42
15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-11-15 14:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1313 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/php-pear
https://github.com/void-linux/void-packages/pull/39438
php.*: 7.4.33, 8.0.25 + pear, 8.1.12 + pear, apcu 5.1.22, igbinary 3.2.12
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
I tested the changes in this PR: **YES**
<!--
#### 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/39438.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-pear-39438.patch --]
[-- Type: text/x-diff, Size: 16685 bytes --]
From b3c4c64df0c2a3294f43762ba24cf3f2079eb072 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 30 Sep 2022 09:27:11 -0400
Subject: [PATCH 1/9] php: update to 7.4.33.
---
srcpkgs/php/template | 10 ++++++----
srcpkgs/php/update | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3eb8e38cd928..7e79418e3554 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
# Template file for 'php'
pkgname=php
-version=7.4.30
-revision=2
+version=7.4.33
+revision=1
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
@@ -13,8 +13,10 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="PHP-3.01"
homepage="https://www.php.net"
changelog="https://www.php.net/ChangeLog-7.php"
-distfiles="http://www.php.net/distributions/php-${version}.tar.xz"
-checksum=ea72a34f32c67e79ac2da7dfe96177f3c451c3eefae5810ba13312ed398ba70d
+# 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=5a2337996f07c8a097e03d46263b5c98d2c8e355227756351421003bea8f463e
conf_files="/etc/php/php.ini"
diff --git a/srcpkgs/php/update b/srcpkgs/php/update
index ac2289b24b76..caf45c0dd8d1 100644
--- a/srcpkgs/php/update
+++ b/srcpkgs/php/update
@@ -1 +1,2 @@
ignore="8.*"
+site="https://www.php.net/distributions/"
From df442b39b7c1f9b1f3cacc738f154ae3fb4fc695 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:03:12 -0400
Subject: [PATCH 2/9] php8.0: update to 8.0.25, add php8.0-pear subpackage.
---
srcpkgs/php8.0-pear | 1 +
srcpkgs/php8.0/patches/php.ini.patch | 2 +-
srcpkgs/php8.0/template | 35 +++++++++++++++++++++++-----
srcpkgs/php8.0/update | 1 +
4 files changed, 32 insertions(+), 7 deletions(-)
create mode 120000 srcpkgs/php8.0-pear
diff --git a/srcpkgs/php8.0-pear b/srcpkgs/php8.0-pear
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-pear
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0/patches/php.ini.patch b/srcpkgs/php8.0/patches/php.ini.patch
index 07e38a04cf4f..00428db5270d 100644
--- a/srcpkgs/php8.0/patches/php.ini.patch
+++ b/srcpkgs/php8.0/patches/php.ini.patch
@@ -7,7 +7,7 @@ index 794d3e8ddb..c7acf9c883 100644
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
++include_path = ".:/usr/share/pear8.0"
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 381f073a73d3..74c50da0e46f 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.23
+version=8.0.25
revision=1
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
@@ -14,15 +14,17 @@ 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"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=a2dd50e9c4a0328d921b6bc914e8b4e6572f94f09867318f88acca5ac4fa76c7
+# 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=349a2b5a01bfccbc9af8afdf183e57bed3349706a084f3c4694aa4c7ff7cb2e9
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -89,7 +91,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -111,7 +113,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -217,6 +219,27 @@ php8.0-embed_package() {
}
}
+php8.0-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.0-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.0/update b/srcpkgs/php8.0/update
index c4d9bc5958ca..566cd8005690 100644
--- a/srcpkgs/php8.0/update
+++ b/srcpkgs/php8.0/update
@@ -1,2 +1,3 @@
pkgname=php
ignore="8.[1-9].*"
+site="https://www.php.net/distributions/"
From f3f3690f740da30fbd1b86c30ac0969c6eb57950 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 23 Sep 2022 12:06:45 -0400
Subject: [PATCH 3/9] php8.1: update to 8.1.12, add php8.1-pear subpackage.
---
srcpkgs/php8.1-pear | 1 +
srcpkgs/php8.1/patches/php.ini.patch | 2 +-
srcpkgs/php8.1/template | 35 +++++++++++++++++++++++-----
srcpkgs/php8.1/update | 1 +
4 files changed, 32 insertions(+), 7 deletions(-)
create mode 120000 srcpkgs/php8.1-pear
diff --git a/srcpkgs/php8.1-pear b/srcpkgs/php8.1-pear
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-pear
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1/patches/php.ini.patch b/srcpkgs/php8.1/patches/php.ini.patch
index 186898f63fab..e4d45eafed32 100644
--- a/srcpkgs/php8.1/patches/php.ini.patch
+++ b/srcpkgs/php8.1/patches/php.ini.patch
@@ -7,7 +7,7 @@ index b39a960..68f14a6 100644
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
++include_path = ".:/usr/share/pear8.1"
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 33e38c1db282..f19688b52f6c 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.10
+version=8.1.12
revision=1
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
@@ -14,15 +14,17 @@ 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"
-distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=3ea4f323109dfbc8d2631d08aa0e08602c1f713678e9dc6c750f081ef49eab0f
+# 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=e0e7c823c9f9aa4c021f5e34ae1a7acafc2a9f3056ca60eb70a8af8f33da3fdf
conf_files="/etc/php${_php_version}/php.ini"
lib32disabled=yes
if [ -n "$CROSS_BUILD" ]; then
- # phar needs php to build
+ # phar and pear need php to build
hostmakedepends+=" php${_php_version}"
CFLAGS+=" -DHAVE_LIBDL
-DHAVE_DLOPEN
@@ -89,7 +91,7 @@ do_build() {
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
--with-external-pcre \
- --without-pear \
+ --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 \
@@ -111,7 +113,7 @@ do_build() {
EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
+ PEAR_INSTALLDIR=/usr/share/pear${_php_version}
export PEAR_INSTALLDIR
EXTRA_LIBS="-ldl"
export EXTRA_LIBS
@@ -217,6 +219,27 @@ php8.1-embed_package() {
}
}
+php8.1-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.1-enchant_package() {
lib32disabled=yes
depends="php${_php_version}-${version}_${revision}"
diff --git a/srcpkgs/php8.1/update b/srcpkgs/php8.1/update
index 0c2792ec963f..e39f4573be89 100644
--- a/srcpkgs/php8.1/update
+++ b/srcpkgs/php8.1/update
@@ -1,2 +1,3 @@
pkgname=php
ignore="8.[2-9].*"
+site="https://www.php.net/distributions/"
From 5698660a3bf534ed85cefdbc68f33c5a41255c9d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:15:58 -0400
Subject: [PATCH 4/9] php-apcu: update to 5.1.22.
---
srcpkgs/php-apcu/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/php-apcu/template b/srcpkgs/php-apcu/template
index e5b6a2490e4a..143322579e0b 100644
--- a/srcpkgs/php-apcu/template
+++ b/srcpkgs/php-apcu/template
@@ -1,7 +1,7 @@
# Template file for 'php-apcu'
pkgname=php-apcu
-version=5.1.17
-revision=2
+version=5.1.22
+revision=1
build_wrksrc=apcu-$version
build_style=gnu-configure
make_check_target=test
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="PHP-3.01"
homepage="https://pecl.php.net/package/APCu"
distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
-checksum=6b11b477890a9c096ad856e0251920d1d8b9558b7d115256c027e0223755c793
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
pre_configure() {
phpize
From 10738712689d3478391fd2129261517b25261cd8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:03:13 -0400
Subject: [PATCH 5/9] php8.0-apcu: update to 5.1.22.
---
srcpkgs/php8.0-apcu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.0-apcu/template b/srcpkgs/php8.0-apcu/template
index d022a08f3a30..39b3360b86d0 100644
--- a/srcpkgs/php8.0-apcu/template
+++ b/srcpkgs/php8.0-apcu/template
@@ -1,6 +1,6 @@
# Template file for 'php8.0-apcu'
pkgname=php8.0-apcu
-version=5.1.21
+version=5.1.22
revision=1
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.0"
@@ -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=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
post_extract() {
mv apcu-$version/* .
From 7c0dfc981d344b1b1fc09832b302a7d3894748d0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 7 Oct 2022 09:03:45 -0400
Subject: [PATCH 6/9] php8.1-apcu: update to 5.1.22.
---
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 22eadd38e042..2b1ed3a177ed 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.21
+version=5.1.22
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=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+checksum=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
post_extract() {
mv apcu-$version/* .
From dc851d66ea70bc33902eb669f610275e9f62fdfa Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 31 Oct 2022 08:40:05 -0400
Subject: [PATCH 7/9] php-igbinary: update to 3.2.12.
---
srcpkgs/php-igbinary/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php-igbinary/template b/srcpkgs/php-igbinary/template
index f111a4b2ff64..d8b3e1aa25dd 100644
--- a/srcpkgs/php-igbinary/template
+++ b/srcpkgs/php-igbinary/template
@@ -1,6 +1,6 @@
# Template file for 'php-igbinary'
pkgname=php-igbinary
-version=3.1.2
+version=3.2.12
revision=1
build_wrksrc=igbinary-$version
build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Merlin Diavova <merlindiavova@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/igbinary/igbinary/"
distfiles="https://pecl.php.net/get/igbinary-${version}.tgz"
-checksum=e78b327dad5397ed42f7b0c6fe017eddcde8c3c24ab8b59562cb691c411fa90b
+checksum=b69cffdf054cc6e6b02893ff77cf440cec8c7a87d2dc00c1af183c212269581c
pre_configure() {
phpize
From 76c86bf73fd230e05e321a4f235e7b34affb2f92 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 31 Oct 2022 08:38:53 -0400
Subject: [PATCH 8/9] php8.0-igbinary: update to 3.2.12.
---
srcpkgs/php8.0-igbinary/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.0-igbinary/template b/srcpkgs/php8.0-igbinary/template
index a1dedaeec4a2..7a0808db4d05 100644
--- a/srcpkgs/php8.0-igbinary/template
+++ b/srcpkgs/php8.0-igbinary/template
@@ -1,7 +1,8 @@
# Template file for 'php8.0-igbinary'
pkgname=php8.0-igbinary
-version=3.2.7
+version=3.2.12
revision=1
+build_wrksrc=igbinary-$version
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.0"
hostmakedepends="autoconf php8.0-devel"
@@ -12,7 +13,7 @@ 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=d0dc0d0b56a985f4f52cea20717133d3da05368876bc0f94317c1e60e0319e7d
+checksum=b69cffdf054cc6e6b02893ff77cf440cec8c7a87d2dc00c1af183c212269581c
pre_configure() {
phpize8.0
From f724f20982f39be7173bb51aed375a990372113e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 31 Oct 2022 08:38:56 -0400
Subject: [PATCH 9/9] php8.1-igbinary: update to 3.2.12.
---
srcpkgs/php8.1-igbinary/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.1-igbinary/template b/srcpkgs/php8.1-igbinary/template
index e86a1ab4dba4..fbccec917236 100644
--- a/srcpkgs/php8.1-igbinary/template
+++ b/srcpkgs/php8.1-igbinary/template
@@ -1,7 +1,8 @@
# Template file for 'php8.1-igbinary'
pkgname=php8.1-igbinary
-version=3.2.7
+version=3.2.12
revision=1
+build_wrksrc=igbinary-$version
build_style=gnu-configure
configure_args="--with-php-config=/usr/bin/php-config8.1"
hostmakedepends="autoconf php8.1-devel"
@@ -12,7 +13,7 @@ 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=d0dc0d0b56a985f4f52cea20717133d3da05368876bc0f94317c1e60e0319e7d
+checksum=b69cffdf054cc6e6b02893ff77cf440cec8c7a87d2dc00c1af183c212269581c
pre_configure() {
phpize8.1
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Merged]: php.*: 7.4.33, 8.0.25 + pear, 8.1.12 + pear, apcu 5.1.22, igbinary 3.2.12
2022-09-23 17:51 [PR PATCH] php8.[01]: add php8.[01]-pear subpackage TinfoilSubmarine
` (14 preceding siblings ...)
2022-11-15 14:48 ` [PR PATCH] [Updated] php.*: 7.4.33, 8.0.25 + pear, 8.1.12 + pear, apcu 5.1.22, igbinary 3.2.12 TinfoilSubmarine
@ 2022-11-17 11:51 ` paper42
15 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2022-11-17 11:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1132 bytes --]
There's a merged pull request on the void-packages repository
php.*: 7.4.33, 8.0.25 + pear, 8.1.12 + pear, apcu 5.1.22, igbinary 3.2.12
https://github.com/void-linux/void-packages/pull/39438
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
I tested the changes in this PR: **YES**
<!--
#### 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] 17+ messages in thread