groups/231.native_packages_etc.group: php: bump to v8.0.11

Signed-off-by: Ørjan Malde <red@foxi.me>

2 files changed, 97 insertions, 4 deletions

diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index f85c09fe..1301e3b4 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -377,13 +377,13 @@ gl_cv_func_getopt_gnu=yes"};
 : ${PKG_PCRE2_URL:=https://ftp.pcre.org/pub/pcre/pcre2-${PKG_PCRE2_VERSION}.tar.bz2};
 : ${PKG_PCRE2_CONFIGURE_ARGS_EXTRA:="--enable-pcre2grep-libz --enable-pcre2grep-libbz2 --enable-pcre2-16 --enable-pcre2-32 --enable-jit"};
 : ${PKG_PHP_DEPENDS:="bzip2 libz libxml2 sqlite3 pcre2"};
-: ${PKG_PHP_SHA256SUM:=71a01b2b56544e20e28696ad5b366e431a0984eaa39aa5e35426a4843e172010};
-: ${PKG_PHP_VERSION:=8.0.9};
+: ${PKG_PHP_SHA256SUM:=e3e5f764ae57b31eb65244a45512f0b22d7bef05f2052b23989c053901552e16};
+: ${PKG_PHP_VERSION:=8.0.11};
 : ${PKG_PHP_URL:=https://www.php.net/distributions/php-${PKG_PHP_VERSION}.tar.xz};
 : ${PKG_PHP_CONFIG_CACHE_EXTRA:="
 ac_cv_c_bigendian_php=no
 ac_cv_write_stdout=yes"};
-: ${PKG_PHP_CONFIGURE_ARGS_EXTRA:="--with-layout=GNU --with-zlib --with-external-pcre --with-bz2=${PREFIX_NATIVE} --with-gmp --disable-opcache --disable-phar"};
+: ${PKG_PHP_CONFIGURE_ARGS_EXTRA:="--with-layout=GNU --with-zlib --with-external-pcre --with-bz2=${PREFIX_NATIVE} --with-gmp --disable-opcache --disable-phar --enable-embed=shared"};
 : ${PKG_PHP_LIBTOOL:=rdlibtool};
 : ${PKG_POPT_SHA256SUM:=5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1};
 : ${PKG_POPT_VERSION:=1.18};
diff --git a/patches/php-8.0.9_pre.local.patch b/patches/php-8.0.11_pre.local.patch
index 4cbf4179..5a7c0c6c 100644
--- a/patches/php-8.0.9_pre.local.patch
+++ b/patches/php-8.0.11_pre.local.patch
@@ -1,3 +1,17 @@
+diff -ru php-8.0.11.orig/build/ php-8.0.11/build/libtool.m4
+--- php-8.0.11.orig/build/libtool.m4    2021-09-21 19:07:44.000000000 +0200
++++ php-8.0.11/build/libtool.m4 2021-09-29 22:21:23.610917784 +0200
+@@ -56,10 +56,6 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-AC_SUBST(LIBTOOL)dnl
+-
+ # Prevent multiple expansion
+ define([AC_PROG_LIBTOOL], [])
+ ])# _AC_PROG_LIBTOOL
 diff -ru php-8.0.8.orig/TSRM/TSRM.h php-8.0.8/TSRM/TSRM.h
 --- php-8.0.8.orig/TSRM/TSRM.h  2021-06-29 09:41:19.000000000 +0200
 +++ php-8.0.8/TSRM/TSRM.h       2021-07-17 21:51:11.409950944 +0200
@@ -27,7 +41,38 @@ diff -ru php-8.0.1.orig/configure php-8.0.1/configure
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -87098,6 +87101,16 @@
+@@ -81688,7 +81691,7 @@
+ enable_static=yes
+
+ case $php_sapi_module in
+-  shared)
++  *)
+     if test "$PHP_CGI" = "no" && test "$PHP_CLI" = "no" && test "$PHP_FPM" = "no" && test "$PHP_LITESPEED" = "no" && test "$PHP_PHPDBG" = "no"; then
+       enable_static=no
+     fi
+@@ -81702,12 +81705,6 @@
+     esac
+     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
+     ;;
+-  *)
+-    standard_libtool_flag='-prefer-non-pic -static'
+-    if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then
+-      enable_shared=no
+-    fi
+-    ;;
+ esac
+
+ EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
+@@ -85405,7 +85408,7 @@
+       lt_prog_compiler_static='-Bstatic'
+       ;;
+
+-    linux* | k*bsd*-gnu)
++    linux* | k*bsd*-gnu | midipix*)
+       case $cc_basename in
+       # old Intel for x86_64 which still supported -KPIC.
+       ecc*)
+@@ -87098,6 +87101,17 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -39,11 +84,59 @@ diff -ru php-8.0.1.orig/configure php-8.0.1/configure
 +  soname_spec='$libname$release$shared_ext$major'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
++  dynamic_linker='GNU/Linux ld.so'
 +  ;;
 +
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
+@@ -89172,7 +89185,7 @@
+     hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+     hardcode_libdir_separator_CXX=:
+     ;;
+-  linux* | k*bsd*-gnu)
++  linux* | k*bsd*-gnu | midipix*)
+     case $cc_basename in
+       KCC*)
+        # Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -91441,37 +91448,6 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-
+-# Prevent multiple expansion
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-  if test -z "$LIBTOOL"; then
+-    LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
+-  else
+-    LIBTOOL="$LIBTOOL --silent"
+-  fi
+-
+-
+-
+-  if test -z "$LIBTOOL"; then
+-    LIBTOOL='$(SHELL) $(top_builddir)/libtool --preserve-dup-deps'
+-  else
+-    LIBTOOL="$LIBTOOL --preserve-dup-deps"
+-  fi
+-
+-
+ test -z "$PHP_COMPILE" && PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<'
+ test -z "$CXX_PHP_COMPILE" && CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<'
+ SHARED_LIBTOOL='$(LIBTOOL)'
 diff -ru php-8.0.1.orig/sapi/cgi/Makefile.frag php-8.0.1/sapi/cgi/Makefile.frag
 --- php-8.0.1.orig/sapi/cgi/Makefile.frag	2021-01-05 14:54:54.000000000 +0100
 +++ php-8.0.1/sapi/cgi/Makefile.frag	2021-01-14 00:20:44.769574312 +0100