[PR PATCH] php: update to 8.0.0 & xdebug: update to 3.0.0

[PR PATCH] php: update to 8.0.0 & xdebug: update to 3.0.0

[the-eater]

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

There is a new pull request by the-eater against master on the void-packages repository

https://github.com/the-eater/neo-void-packages pkg/php/8.0.0
https://github.com/void-linux/void-packages/pull/26928

php: update to 8.0.0 & xdebug: update to 3.0.0
I am unsure

A patch file from https://github.com/void-linux/void-packages/pull/26928.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/php/8.0.0-26928.patch --]
[-- Type: text/x-diff, Size: 5411 bytes --]

From 34595f524a0bb19ca090b03015518bcf7b131540 Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Thu, 3 Dec 2020 20:22:08 +0100
Subject: [PATCH 1/2] php: update to 8.0.0

---
 srcpkgs/php/patches/php-cross-config.patch    |  4 ++--
 .../php/patches/php-openssl-libressl.patch    | 13 ++++++++++++
 srcpkgs/php/template                          | 21 +++++++++++++------
 3 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/php/patches/php-openssl-libressl.patch

diff --git a/srcpkgs/php/patches/php-cross-config.patch b/srcpkgs/php/patches/php-cross-config.patch
index 5ce95cda930..0102b297999 100644
--- a/srcpkgs/php/patches/php-cross-config.patch
+++ b/srcpkgs/php/patches/php-cross-config.patch
@@ -10,7 +10,7 @@
      INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
                   $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
 +                       -S PREFIX='$APXS_PREFIX' \
-                        -i -n php7"
+                        -i -n php"
    else
      APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
 @@ -6385,6 +6387,7 @@ IFS="- /.
@@ -18,7 +18,7 @@
                   $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                         -S SYSCONFDIR='$APXS_SYSCONFDIR' \
 +                       -S PREFIX='$APXS_PREFIX' \
-                        -i -a -n php7"
+                        -i -a -n php"
    fi
  
 @@ -57170,7 +57173,7 @@ $as_echo_n "checking for pg_config... "
diff --git a/srcpkgs/php/patches/php-openssl-libressl.patch b/srcpkgs/php/patches/php-openssl-libressl.patch
new file mode 100644
index 00000000000..c811ca8ee9b
--- /dev/null
+++ b/srcpkgs/php/patches/php-openssl-libressl.patch
@@ -0,0 +1,13 @@
+diff --git ext/openssl/openssl.c ext/openssl/openssl.c.new
+index 18c822ed67..4c0f5b916f 100644
+--- ext/openssl/openssl.c
++++ ext/openssl/openssl.c.new
+@@ -6901,7 +6901,7 @@ static void php_openssl_load_cipher_mode(struct php_openssl_cipher_mode *mode, c
+ 	int cipher_mode = EVP_CIPHER_mode(cipher_type);
+ 	memset(mode, 0, sizeof(struct php_openssl_cipher_mode));
+ 	switch (cipher_mode) {
+-#if PHP_OPENSSL_API_VERSION >= 0x10100
++#if PHP_OPENSSL_API_VERSION >= 0x10100 && !defined(LIBRESSL_VERSION_NUMBER)
+ 		case EVP_CIPH_GCM_MODE:
+ 		case EVP_CIPH_OCB_MODE:
+ 		case EVP_CIPH_CCM_MODE:
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 613e0215751..b098edb3b96 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
-version=7.4.11
-revision=2
+version=8.0.0
+revision=1
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmysqlclient-devel
@@ -13,7 +13,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="PHP-3.01"
 homepage="https://www.php.net"
 distfiles="http://www.php.net/distributions/php-${version}.tar.xz"
-checksum=5d31675a9b9c21b5bd03389418218c30b26558246870caba8eb54f5856e2d6ce
+checksum=b5278b3eef584f0c075d15666da4e952fa3859ee509d6b0cc2ed13df13f65ebb
 
 conf_files="/etc/php/php.ini"
 
@@ -180,10 +180,10 @@ php-cgi_package() {
 php-apache_package() {
 	short_desc+=' - Apache SAPI'
 	depends="php-${version}_${revision}"
-	conf_files="/etc/apache/extra/php7_module.conf"
+	conf_files="/etc/apache/extra/php8_module.conf"
 	pkg_install() {
-		vinstall ${wrksrc}/build-apache/libs/libphp7.so 755 usr/libexec/httpd/modules
-		vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra php7_module.conf
+		vinstall ${wrksrc}/build-apache/libs/libphp.so 755 usr/libexec/httpd/modules
+		vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra php8_module.conf
 	}
 }
 
@@ -219,6 +219,15 @@ php-pear_package() {
 		if [ -n "$CROSS_BUILD" ]; then
 			_env+=" PEAR_PHP=/usr/bin/php"
 		fi
+		# Open bug since July, hacky fix
+		# Bug: https://bugs.php.net/bug.php?id=79869
+		# Proposed fix: https://github.com/pear/PHP_Archive/pull/4
+
+		# This will download the pear installer but ultimately fail because of syntax errors
+		make install-pear ${_env} || true;
+		# Patch the syntax error and remove some spaces to keep the length the same and the zip valid
+		sed -i 's: \$flags \& 0x00010000:\$flags[1]\&0x00010000:' pear/install-pear-nozlib.phar
+
 		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}

From 3482e773fcbb8b9824b0f327d5cb0867e92f3738 Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Thu, 3 Dec 2020 21:25:18 +0100
Subject: [PATCH 2/2] xdebug: update to 3.0.0

---
 srcpkgs/xdebug/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdebug/template b/srcpkgs/xdebug/template
index 350eef2f283..bf718d69861 100644
--- a/srcpkgs/xdebug/template
+++ b/srcpkgs/xdebug/template
@@ -1,6 +1,6 @@
 # Template file for 'xdebug'
 pkgname=xdebug
-version=2.9.3
+version=3.0.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf"
@@ -10,7 +10,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="PHP-3.0"
 homepage="http://xdebug.org"
 distfiles="http://xdebug.org/files/${pkgname}-${version,,}.tgz"
-checksum=a63f567f2238d75a2244c2a4bd6f5abee817280b3567f9006c99481488dc977c
+checksum=845007e82c1d4e088770d1d87f5832aa3a767cb5a3664fc1615db62cecc3ca62
 
 pre_configure() {
 	phpize

Re: php: update to 8.0.0 & xdebug: update to 3.0.0

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 597 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26928#issuecomment-739381463

Comment:
Has cross failures:

```
checking for shm_open in -lrt... yes
checking for shm_open in -lroot... no
checking for __shm_open in -lroot... no
checking for mmap() using shm_open() shared memory support... no
configure: error: No supported shared memory caching support was found when configuring opcache. Check config.log for any errors or missing dependencies.
```

Might be something worth adding to autoconfigure cache, or just as an option here.

Re: php: update to 8.0.0 & xdebug: update to 3.0.0

[the-eater]

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

New comment by the-eater on void-packages repository

https://github.com/void-linux/void-packages/pull/26928#issuecomment-739497222

Comment:
I don't have any ARM machines at hand, but I can just Assume™ they are available? <the autoconf does a hard fail on cross compiling>

Re: php: update to 8.0.0 & xdebug: update to 3.0.0

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 362 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26928#issuecomment-739696257

Comment:
> I don't have any ARM machines at hand, but I can just Assume™ they are available? 

We cross build to arm, so you can attempt the same procedure that will happen in the builders by doing `./xbps-src -a aarch64 php`.

Re: php: update to 8.0.0 & xdebug: update to 3.0.0

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 217 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26928#issuecomment-739699150

Comment:
Sorry, you meant the functions, right?

Then yes, you can just assume! :) 

Re: php: update to 8.0.0 & xdebug: update to 3.0.0

[the-eater]

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

New comment by the-eater on void-packages repository

https://github.com/void-linux/void-packages/pull/26928#issuecomment-739916507

Comment:
yes the functions! thanks!

Re: php: update to 8.0.0 & xdebug: update to 3.0.0

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26928#issuecomment-756970171

Comment:
Oops, sorry for the noise. We are updating to latest 7.x in #27767, so you'll have to rebase in a bit :) 

Did you manage to figure out the cross stuff? Otherwise I can try my hand.

Re: php: update to 8.0.0 & xdebug: update to 3.0.0

[the-eater]

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

New comment by the-eater on void-packages repository

https://github.com/void-linux/void-packages/pull/26928#issuecomment-756988215

Comment:
hehe, I honestly haven't had time to look at it so you might take over if you want :)

Re: php: update to 8.0.0 & xdebug: update to 3.0.0

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26928#issuecomment-756990518

Comment:
Are you currently using php 8? I'd at most fix cross, I don't use it nor know how to test adequately

Re: php: update to 8.0.0 & xdebug: update to 3.0.0

[the-eater]

[-- Attachment #1: Type: text/plain, Size: 261 bytes --]

New comment by the-eater on void-packages repository

https://github.com/void-linux/void-packages/pull/26928#issuecomment-756991119

Comment:
yeah I am currently using it (not in production, but i can confirm it works as intended) the cross was the only issue 

Re: php: update to 8.0.0 & xdebug: update to 3.0.0

[jonagoldman]

[-- Attachment #1: Type: text/plain, Size: 347 bytes --]

New comment by jonagoldman on void-packages repository

https://github.com/void-linux/void-packages/pull/26928#issuecomment-779216676

Comment:
Some options were renamed or removed in 8.0:

```
configure: WARNING: unrecognized options: --with-freetype-dir, --with-icu-dir, --with-jpeg-dir, --with-libzip, --with-pcre-regex, --with-png-dir
```

Re: [PR PATCH] [Closed]: php: update to 8.0.0 & xdebug: update to 3.0.0

[the-eater]

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

There's a closed pull request on the void-packages repository

php: update to 8.0.0 & xdebug: update to 3.0.0
https://github.com/void-linux/void-packages/pull/26928

Description:
I am unsure