From: TinfoilSubmarine <TinfoilSubmarine@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] PHP 7.4.32, PHP 8.0.24 + pear, PHP 8.1.11 + pear
Date: Fri, 07 Oct 2022 15:12:57 +0200 [thread overview]
Message-ID: <20221007131257.9M2P7aJr1c714i7X1bl-c-cXxNsYqkp1nNb67X63qCw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39438@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2022-10-07 13:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
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
2022-09-30 13:32 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-10-07 13:12 ` TinfoilSubmarine [this message]
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
2022-10-07 17:25 ` TinfoilSubmarine
2022-10-31 13:02 ` [PR PATCH] [Updated] " 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
2022-11-03 17:06 ` PHP 7.4.33, " TinfoilSubmarine
2022-11-15 14:29 ` [PR PATCH] [Updated] " 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221007131257.9M2P7aJr1c714i7X1bl-c-cXxNsYqkp1nNb67X63qCw@z \
--to=tinfoilsubmarine@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).