From patchwork Sat Jan 28 14:30:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 46488 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5AECE27BBED; Sat, 28 Jan 2023 14:32:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 719E127BBE9 for ; Sat, 28 Jan 2023 14:32:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLmFV-0007vo-Fj; Sat, 28 Jan 2023 09:32:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pLmFO-0007v6-IZ for guix-patches@gnu.org; Sat, 28 Jan 2023 09:32:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pLmFO-0004Vy-AX for guix-patches@gnu.org; Sat, 28 Jan 2023 09:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pLmFO-0000Sh-5R for guix-patches@gnu.org; Sat, 28 Jan 2023 09:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61123] [PATCH] gnu: php: Update to 8.2.1. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Jan 2023 14:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61123 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61123@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16749162881725 (code B ref -1); Sat, 28 Jan 2023 14:32:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Jan 2023 14:31:28 +0000 Received: from localhost ([127.0.0.1]:39954 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLmEq-0000Rl-6M for submit@debbugs.gnu.org; Sat, 28 Jan 2023 09:31:28 -0500 Received: from lists.gnu.org ([209.51.188.17]:60752) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLmEl-0000RY-Fn for submit@debbugs.gnu.org; Sat, 28 Jan 2023 09:31:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pLmEh-0007pp-RN for guix-patches@gnu.org; Sat, 28 Jan 2023 09:31:22 -0500 Received: from lepiller.eu ([89.234.186.109]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pLmEc-0004JH-1Z for guix-patches@gnu.org; Sat, 28 Jan 2023 09:31:18 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 939057fc for ; Sat, 28 Jan 2023 14:31:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:mime-version:content-transfer-encoding; s=dkim; bh=bV+FaWR66cc1E7AptF5vznvxYavqD1xtge/H+HjKSnY=; b=FNV0 3gRTZCw51s7EMxP4fz0rui1UNwN03093vZaBB/tSkYjBzsZf0/IRnAtxLJoKuYug sGck42PWAyj00vGG7qLTbl1dtRF5dfiYrwUAOIQ5dl6exEmT6WJQi8GytaZGN/+P 9a8O9AvML+3D4wMBn/5q9KoLtZnzZzqFnWXG1wM05rrZYmuWLvQi57qkVz6cOHdi 5FtgYP4WiRgWwHFZsiQ7sDIRE9dUWtmobhhTPngZPwaDyeNrLx09HpaiEe1kppuY SZhHr7FOLsw6yoAcnJvNsaLcqS1AJk854vVkk6YUcTtM1Va9IIjLsbHVWsqKWcb9 Jr/4n7xmhw879fJufg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 47eacacb (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Sat, 28 Jan 2023 14:31:02 +0000 (UTC) From: Julien Lepiller Date: Sat, 28 Jan 2023 15:30:55 +0100 Message-Id: X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Received-SPF: pass client-ip=89.234.186.109; envelope-from=julien@lepiller.eu; helo=lepiller.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/php.scm (php): Update to 8.2.1. * gnu/packages/patches/php-curl-compat.patch: Remove file. * gnu/packages/patches/php-bug-74093-test.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 2 - gnu/packages/patches/php-bug-74093-test.patch | 48 ------------------- gnu/packages/patches/php-curl-compat.patch | 17 ------- gnu/packages/php.scm | 26 ++++++---- 4 files changed, 17 insertions(+), 76 deletions(-) delete mode 100644 gnu/packages/patches/php-bug-74093-test.patch delete mode 100644 gnu/packages/patches/php-curl-compat.patch base-commit: 37fdb382dad47149d8f5be41af108478800e9d30 diff --git a/gnu/local.mk b/gnu/local.mk index 7433654f0b..a899802348 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1668,8 +1668,6 @@ dist_patch_DATA = \ %D%/packages/patches/perl-www-curl-fix-struct-void.patch \ %D%/packages/patches/perl-www-curl-remove-symbol.patch \ %D%/packages/patches/phoronix-test-suite-fsdg.patch \ - %D%/packages/patches/php-bug-74093-test.patch \ - %D%/packages/patches/php-curl-compat.patch \ %D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/pidgin-add-search-path.patch \ %D%/packages/patches/pinball-system-ltdl.patch \ diff --git a/gnu/packages/patches/php-bug-74093-test.patch b/gnu/packages/patches/php-bug-74093-test.patch deleted file mode 100644 index 07b1949cef..0000000000 --- a/gnu/packages/patches/php-bug-74093-test.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c641825c64e42627a2c9cac969b371ed532e0b57 Mon Sep 17 00:00:00 2001 -From: Ryan Sundberg -Date: Mon, 4 Oct 2021 20:12:25 -0700 -Subject: [PATCH] Zend/tests/bug74093.phpt: Fix failing test case - -This test case fails (on non-Windows hosts, where it is enabled) due -to mismatching output in the error log language. This fixes the -expectation, and also rewrites the test procedure in a more stable -fashion. - -The objective of the test case is to run a program that exceeds -the max_execution_time and verify that the process was aborted. The -previous implementation tested this using a loop on array_intersect with -large enough inputs to "probably" take enough time to trigger -max_execution_time to abort it. With faster CPUs, over time this test -can become flaky. Instead we simply spin a loop until enough -wall clock time has passed to check our assertion. ---- - Zend/tests/bug74093.phpt | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Zend/tests/bug74093.phpt b/Zend/tests/bug74093.phpt -index 7f20285805..32eb445ddc 100644 ---- a/Zend/tests/bug74093.phpt -+++ b/Zend/tests/bug74093.phpt -@@ -1,5 +1,5 @@ - --TEST-- --Bug #74093 (Maximum execution time of n+2 seconds exceed not written in error_log) -+Bug #74093 (Maximum execution time exceeded not written in error_log) - --SKIPIF-- - - --EXPECTF-- --Fatal error: Maximum execution time of 1+1 seconds exceeded %s -+Fatal error: Maximum execution time of 1 second exceeded in %s --- -2.31.1 diff --git a/gnu/packages/patches/php-curl-compat.patch b/gnu/packages/patches/php-curl-compat.patch deleted file mode 100644 index 0617251194..0000000000 --- a/gnu/packages/patches/php-curl-compat.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix test result with cURL 7.83 and later. - -Taken from upstream: - - https://github.com/php/php-src/commit/a4179e4c92b6365d39e09cb9cd63c476848013af - -diff --git a/ext/curl/tests/curl_basic_007.phpt b/ext/curl/tests/curl_basic_007.phpt -index 3b53658d6a7e..3834e4674f82 100644 ---- a/ext/curl/tests/curl_basic_007.phpt -+++ b/ext/curl/tests/curl_basic_007.phpt -@@ -20,5 +20,5 @@ curl_close($ch); - - ?> - --EXPECTF-- --string(%d) "No URL set!%w" -+string(%d) "No URL set%A" - int(3) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 645a8edee1..4874e3f50b 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -61,17 +61,15 @@ (define-module (gnu packages php) (define-public php (package (name "php") - (version "7.4.30") - (home-page "https://secure.php.net/") + (version "8.2.1") + (home-page "https://www.php.net/") (source (origin (method url-fetch) (uri (string-append home-page "distributions/" "php-" version ".tar.xz")) (sha256 (base32 - "03d7icwys4ikl45q3rgsxv1m3i7kfxhykpx75nn7jzn6697s6wpa")) - (patches (search-patches "php-bug-74093-test.patch" - "php-curl-compat.patch")) + "1bqp5hhww7kxvqvamgjbaxlx6p54igfz3xm0yq3vzjjnl3bkn3b5")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -83,8 +81,7 @@ (define-public php ;;"bcmath/libbcmath" ;;"fileinfo/libmagic" ; a patched version of libmagic '("gd/libgd" - "pcre/pcre2lib" - "xmlrpc/libxmlrpc")))))) + "pcre/pcre2lib")))))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -272,8 +269,6 @@ (define-public php ;; Some WebP related tests fail. "ext/gd/tests/webp_basic.phpt" "ext/gd/tests/imagecreatefromstring_webp.phpt" - ;; Expected error message, but from the wrong function - "ext/gd/tests/bug77269.phpt" ;; TODO: Enable these when libgd is built with xpm support. "ext/gd/tests/xpm2gd.phpt" "ext/gd/tests/xpm2jpg.phpt" @@ -291,6 +286,14 @@ (define-public php ;; The following test fails with "The image size ;; differs: expected 114x115, got 117x117". "ext/gd/tests/bug79068.phpt" + ;; AVIF support disabled + "ext/gd/tests/avif_decode_encode.phpt" + ;; Typo in expected outputs + "ext/gd/tests/bug72339.phpt" + "ext/gd/tests/bug77272.phpt" + "ext/gd/tests/bug66356.phpt" + ;; AVIF support disabled + "ext/gd/tests/imagecreatefromstring_avif.phpt" ;; XXX: These iconv tests have the expected outcome, ;; but with different error messages. @@ -310,6 +313,11 @@ (define-public php ;; XXX: These test failures appear legitimate, needs investigation. ;; open_basedir() restriction failure. "ext/curl/tests/bug61948-unix.phpt" + ;; Same error reason but error code slightly different + "ext/curl/tests/curl_setopt_ssl.phpt" + + ;; Wrong error name + "ext/dba/tests/dba_gdbm_creation_matrix.phpt" ;; Expects a false boolean, gets empty array from glob(). "ext/standard/tests/file/bug41655_1.phpt" "ext/standard/tests/file/glob_variation5.phpt"