From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWl8g-0002Vn-KE for guix-patches@gnu.org; Tue, 11 Dec 2018 11:44:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWl8c-00052O-Uq for guix-patches@gnu.org; Tue, 11 Dec 2018 11:44:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:39842) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWl8c-00051r-3m for guix-patches@gnu.org; Tue, 11 Dec 2018 11:44:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gWl8b-0008SW-WB for guix-patches@gnu.org; Tue, 11 Dec 2018 11:44:02 -0500 Subject: [bug#33706] [PATCH] gnu: php: Update to 7.3.0. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42320) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWl8J-0002Af-2y for guix-patches@gnu.org; Tue, 11 Dec 2018 11:43:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWl8F-0004hY-LI for guix-patches@gnu.org; Tue, 11 Dec 2018 11:43:42 -0500 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:38821) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWl8F-0004ft-CC for guix-patches@gnu.org; Tue, 11 Dec 2018 11:43:39 -0500 Received: by mail-pg1-x544.google.com with SMTP id g189so6893333pgc.5 for ; Tue, 11 Dec 2018 08:43:38 -0800 (PST) From: Oleg Pykhalov Date: Tue, 11 Dec 2018 19:42:14 +0300 Message-Id: <20181211164214.26945-1-go.wigust@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33706@debbugs.gnu.org * gnu/packages/php.scm (php)[version]: Update to 7.3.0. [arguments]: Delete "sapi/cli/tests/upload_2G.phpt" substitution and delete "ext/pcre/tests/bug76909.phpt" file. [inputs]: Replace 'pcre' with 'pcre2'. --- gnu/packages/php.scm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index a28cb31e5..491e08481 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -53,7 +53,7 @@ (define-public php (package (name "php") - (version "7.2.12") + (version "7.3.0") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -61,7 +61,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "1qbz2j9kzqxxp0mmx02zavvz20ji7izqdnri25g1mrwyhz60974q")) + "1db0lm84hynilrjj3k1s7skp1y2gl4ip1ihr7662i2xgannmq6bx")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -74,7 +74,6 @@ ;;"fileinfo/libmagic" ; This is a patched version of libmagic. '("gd/libgd" "mbstring/oniguruma" - "pcre/pcrelib" "sqlite3/libsqlite" "xmlrpc/libxmlrpc" "zip/lib")) @@ -176,11 +175,6 @@ (substitute* "ext/standard/tests/streams/bug60602.phpt" (("'ls'") (string-append "'" (which "ls") "'"))) - ;; The expected output is slightly different from what is given, - ;; in a section that's not related to the actual test - (substitute* "sapi/cli/tests/upload_2G.phpt" - (("Test\\\\n") "Test\n\n")) - ;; Drop tests that are known to fail. (for-each delete-file '("ext/posix/tests/posix_getgrgid.phpt" ; Requires /etc/group. @@ -291,7 +285,10 @@ "ext/ldap/tests/ldap_set_option_error.phpt" ;; Sometimes cannot start the LDAP server. - "ext/ldap/tests/bug76248.phpt")) + "ext/ldap/tests/bug76248.phpt" + + ;; Bug #76909 preg_match difference between 7.3 and < 7.3 + "ext/pcre/tests/bug76909.phpt")) ;; Skip tests requiring network access. (setenv "SKIP_ONLINE_TESTS" "1") @@ -324,7 +321,7 @@ ("oniguruma" ,oniguruma-5) ("openldap" ,openldap) ("openssl" ,openssl) - ("pcre" ,pcre) + ("pcre" ,pcre2) ("postgresql" ,postgresql) ("readline" ,readline) ("sqlite" ,sqlite) -- 2.19.1