void-linux · paper42 · Nov 17, 2022 · Sep 30, 2022 · Sep 23, 2022 · Sep 23, 2022
diff --git 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 <[email protected]>"
 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

diff --git 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 <[email protected]>"
 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

diff --git 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 <[email protected]>"
 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
@@ -1 +1,2 @@
 ignore="8.*"
+site="https://www.php.net/distributions/"
diff --git 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 <[email protected]>"
 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/* .

diff --git 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 <[email protected]>"
 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

diff --git a/srcpkgs/php8.0-pear b/srcpkgs/php8.0-pear
@@ -0,0 +1 @@
+php8.0
diff --git 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
@@ -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 <[email protected]>"
 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
@@ -1,2 +1,3 @@
 pkgname=php
 ignore="8.[1-9].*"
+site="https://www.php.net/distributions/"
diff --git 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 <[email protected]>"
 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/* .

diff --git 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 <[email protected]>"
 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

diff --git a/srcpkgs/php8.1-pear b/srcpkgs/php8.1-pear
@@ -0,0 +1 @@
+php8.1
diff --git 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
@@ -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 <[email protected]>"
 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
@@ -1,2 +1,3 @@
 pkgname=php
 ignore="8.[2-9].*"
+site="https://www.php.net/distributions/"
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		ignore="8.*"
		site="https://www.php.net/distributions/"