summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--groups.d/231.native_packages_etc.group4
-rw-r--r--patches/php-8.1.20.local.patch (renamed from patches/php-8.1.19.local.patch)0
-rw-r--r--patches/php-8.1.20_pre.local.patch (renamed from patches/php-8.1.19_pre.local.patch)18
3 files changed, 2 insertions, 20 deletions
diff --git a/groups.d/231.native_packages_etc.group b/groups.d/231.native_packages_etc.group
index 131a3e02..c6291c8a 100644
--- a/groups.d/231.native_packages_etc.group
+++ b/groups.d/231.native_packages_etc.group
@@ -364,8 +364,8 @@ gl_cv_func_getopt_gnu=yes"};
: ${PKG_PCRE2_URL:=https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PKG_PCRE2_VERSION}/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 --enable-unicode"};
: ${PKG_PHP_DEPENDS:="bzip2 curl libz libzip libxml2 libxslt sqlite3 pcre2 readline libressl onig libiconv"};
-: ${PKG_PHP_SHA256SUM:=f42f0e93467415b2d30aa5b7ac825f0079a74207e0033010383cdc1e13657379};
-: ${PKG_PHP_VERSION:=8.1.19};
+: ${PKG_PHP_SHA256SUM:=4c9973f599e93ed5e8ce2b45ce1d41bb8fb54ce642824fd23e56b52fd75029a6};
+: ${PKG_PHP_VERSION:=8.1.20};
: ${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
diff --git a/patches/php-8.1.19.local.patch b/patches/php-8.1.20.local.patch
index e9f551a1..e9f551a1 100644
--- a/patches/php-8.1.19.local.patch
+++ b/patches/php-8.1.20.local.patch
diff --git a/patches/php-8.1.19_pre.local.patch b/patches/php-8.1.20_pre.local.patch
index 01e751b2..cf9f8075 100644
--- a/patches/php-8.1.19_pre.local.patch
+++ b/patches/php-8.1.20_pre.local.patch
@@ -650,24 +650,6 @@ diff -ru php-8.1.10.orig/ext/phar/Makefile.frag php-8.1.10/ext/phar/Makefile.fra
$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
-@test -d $(builddir)/phar || mkdir $(builddir)/phar
-@@ -41,10 +41,10 @@
- -@chmod +x $(builddir)/phar.phar
-
- install-pharcmd: pharcmd
-- -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-- $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix).phar
-- -@rm -f $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix)
-- $(LN_S) -f $(program_prefix)phar$(program_suffix).phar $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix)
-- @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
-- @$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phar$(program_suffix).1
-- @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phar$(program_suffix).phar.1
-+ -@$(mkinstalldirs) $(DESTDIR)$(bindir)
-+ $(INSTALL) $(builddir)/phar.phar $(DESTDIR)$(bindir)/$(program_prefix)phar$(program_suffix).phar
-+ -@rm -f $(DESTDIR)$(bindir)/$(program_prefix)phar$(program_suffix)
-+ $(LN_S) -f $(program_prefix)phar$(program_suffix).phar $(DESTDIR)$(bindir)/$(program_prefix)phar$(program_suffix)
-+ @$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
-+ @$(INSTALL_DATA) $(builddir)/phar.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)phar$(program_suffix).1
-+ @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)phar$(program_suffix).phar.1
diff -ru php-8.1.10.orig/pear/Makefile.frag php-8.1.10/pear/Makefile.frag
--- php-8.1.10.orig/pear/Makefile.frag 2022-08-30 18:09:36.000000000 +0200
+++ php-8.1.10/pear/Makefile.frag 2023-04-02 14:01:35.683117189 +0200