From patchwork Tue Dec 11 16:42:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 448 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 1C91516902; Tue, 11 Dec 2018 16:58:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTP id 9591916900 for ; Tue, 11 Dec 2018 16:58:32 +0000 (GMT) Received: from localhost ([::1]:40125 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWlMd-0007e6-Qq for patchwork@mira.cbaines.net; Tue, 11 Dec 2018 11:58:31 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#33706] [PATCH] gnu: php: Update to 7.3.0. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Dec 2018 16:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33706 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33706@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154454663632494 (code B ref -1); Tue, 11 Dec 2018 16:44:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Dec 2018 16:43:56 +0000 Received: from localhost ([127.0.0.1]:44100 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gWl8V-0008S2-Uz for submit@debbugs.gnu.org; Tue, 11 Dec 2018 11:43:56 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60962) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gWl8T-0008Rm-IS for submit@debbugs.gnu.org; Tue, 11 Dec 2018 11:43:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWl8L-0004n1-GT for submit@debbugs.gnu.org; Tue, 11 Dec 2018 11:43:48 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:58931) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gWl8L-0004mt-Bx for submit@debbugs.gnu.org; Tue, 11 Dec 2018 11:43:45 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ofYEIOZ+RmFubb1AjMVEyd2g4cQ2iK6iiBAvdXr7TXo=; b=AISDpK00Ky9BLZFs6edcx5W+P8HusXpjbSamYHHuuQdh6OV+cgGbSudMHYG/l6WWLC lyocmrtMl/BaOETJClHSNBcqKhIUDegnDIpHlJxIdtZvcrj7IsiapjRhiXslcEgy0GmZ bWfvuPmfSedj+RIcgVFAAIGy5IIc+Mm9K+UAH6zquaIFQcigyOw3rR/ck63d88Jqg1yT jqAr6okdJ+rZmZ+2eAuUxNsDo5hmYKV9Q+6mfH9u/R3dnvLkPbjED6dIxcJVtAPfIUjW ZJXJMfytiEeoYkCGBiVxKMpD9BL7JCibcno2Xnm81zCwr4FM6OI1P0oChi773REaWcjq zbRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ofYEIOZ+RmFubb1AjMVEyd2g4cQ2iK6iiBAvdXr7TXo=; b=Y00/0BVzXfSHrCOU1g3+SguUfS9xFckV93RpbtCKPhGWDJWp6JAX334mSsA03k7nt9 6wusyPpbeA063bewET40+gP0CAu7WzZ6nBW7dZiP6aRdwgFnDuHqvZSlmk/L5wodQ72c sEkYBOFR2SX/xBc1XO8KvMVrtXDYjmra41gFWyQPHQm6vaWaGKlQZl2lE2HN1ucE6gp3 bOnlk4NBm6HPa0d2J4JNlirnafyWtzdn5yRiE3TXeM7hgBOWz1/lV3P8Sutyj0V9K0XO k6BTGkiKbhxiY7gMw6s5k6e7laVO8gIrHBp2h+tRve9GaskkNELi/t524JQONZPb/HNK G/7g== X-Gm-Message-State: AA+aEWaod4Gr4LmQDHreR21T2VkPArtb/axAo9QhY1W7w4RtQ9s0vSzR WWTiOUG5ByJTXO/0ezxbMyDF2U+V7Oo= X-Google-Smtp-Source: AFSGD/UboHindKQUUxAw9wjBjDd3JjxLxJoqvpBtGRtHizKZn6oKOLeT53pWFw+jzP5mj24Lc0QjPA== X-Received: by 2002:a63:83c1:: with SMTP id h184mr15085810pge.437.1544546616742; Tue, 11 Dec 2018 08:43:36 -0800 (PST) Received: from localhost.localdomain ([178.71.65.49]) by smtp.gmail.com with ESMTPSA id i1sm23570058pgb.46.2018.12.11.08.43.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 08:43:36 -0800 (PST) From: Oleg Pykhalov Date: Tue, 11 Dec 2018 19:42:14 +0300 Message-Id: <20181211164214.26945-1-go.wigust@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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" X-getmail-retrieved-from-mailbox: Patches * 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)