From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 17830158041 for ; Mon, 1 Apr 2024 12:29:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5416CE2A1D; Mon, 1 Apr 2024 12:29:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1E4F2E2A1D for ; Mon, 1 Apr 2024 12:29:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF99C343115 for ; Mon, 1 Apr 2024 12:29:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 274B514E0 for ; Mon, 1 Apr 2024 12:29:22 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1711972767.8b48069d406937f13bc10d14c0c8ad66b136e103.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/php/Manifest dev-lang/php/php-8.3.3-r1.ebuild dev-lang/php/php-8.3.4.ebuild X-VCS-Directories: dev-lang/php/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 8b48069d406937f13bc10d14c0c8ad66b136e103 X-VCS-Branch: master Date: Mon, 1 Apr 2024 12:29:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c2f3cd6a-6666-4382-9a5d-7d364802ea13 X-Archives-Hash: cdfd01a3f8b87222229da5ab6638f9d0 commit: 8b48069d406937f13bc10d14c0c8ad66b136e103 Author: Michael Orlitzky gentoo org> AuthorDate: Mon Apr 1 11:57:00 2024 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Mon Apr 1 11:59:27 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b48069d dev-lang/php: add 8.3.4, drop 8.3.3-r1 In addition to the version bump, this commit drops support for the oci8 extension within PHP itself. This extension no longer builds with the latest dev-db/oracle-instantclient (bug 928312, the ./configure check is looking for 32-bit libs), and upstream PHP has moved the extension to a separate PECL repository: * https://github.com/php/php-src/pull/13327 * https://wiki.php.net/rfc/unbundle_imap_pspell_oci8 Anyone interested in Oracle support should work on packaging those two PECL extensions. Closes: https://bugs.gentoo.org/928312 Signed-off-by: Michael Orlitzky gentoo.org> dev-lang/php/Manifest | 2 +- .../php/{php-8.3.3-r1.ebuild => php-8.3.4.ebuild} | 28 +--------------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 527d4ce6c828..644a082dd64e 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -2,4 +2,4 @@ DIST php-8.1.26.tar.xz 11809448 BLAKE2B e1d50f1de572580a207586b3c3b57081f7b9f1b6 DIST php-8.1.27.tar.xz 11915228 BLAKE2B 83f4f3c25435b26dc526dc1fd7aff44cd03157349f9bb6454e216525a16c2bbc3bfac47cce6b5ea8bfdfcf3c7f27e342fc602ca7d2491fe89db06ea93f686f0e SHA512 07fb2b8e10e2487635e26bfd8a27949a26b85f76bc3984ad8599224bb7a7f9498d84299335ae5a0bba16599275e9747ab141f73f4f2076ddf49ebec8e76fd0ed DIST php-8.2.15.tar.xz 12075384 BLAKE2B cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4 SHA512 56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166 DIST php-8.2.17.tar.xz 12092404 BLAKE2B 352ad673c6eb4e827982b822c0d2f50f62b047e759bb056224f83f939b26a2348a36c3fea3950f3c55df2845a5eb56c103ffef5a81f192c07f02fb2cbaefa7a4 SHA512 113cd8c6a481770aba7e21f1bc22500c93dfa41ff85a7b54e1abbfd5b5a32f51501c91eb45c29a5e2d8ec5f61861060c193a96e27224c97f8cad7979f378bde8 -DIST php-8.3.3.tar.xz 12463880 BLAKE2B ac0baabe875be8ce42c26713f78733140d47f33636aa0e16e2685c83f558afea905707ca133b06ea28ad8de043d7db7d0931259c7c07a2de2c04a935d76db365 SHA512 42141cc46b6abb11fa51cc96c34424cbf9990150b973d84488fa39a07935b22552a1316978f5a4e48762bf3c94eee3d7dfe741c4ee1a12bf752ce1c2660cc8b0 +DIST php-8.3.4.tar.xz 12443980 BLAKE2B b3e7c491583081cc24cef24a1adaee91da4454518e6feb1320e3c2fe474c1e84b8cc861d3706976cee0df011da734321ae4ea5336fc17f9c799a6728eb74de44 SHA512 7254421c57de6c8f9f84079212ead38b397e053ad2dc202bd4e0c9d63aa5d9884a6a856fb93fcdbc9e671051436814188439bc5de480979e53fdcb5488cdc321 diff --git a/dev-lang/php/php-8.3.3-r1.ebuild b/dev-lang/php/php-8.3.4.ebuild similarity index 95% rename from dev-lang/php/php-8.3.3-r1.ebuild rename to dev-lang/php/php-8.3.4.ebuild index 8fe4000652a6..f4f263225218 100644 --- a/dev-lang/php/php-8.3.3-r1.ebuild +++ b/dev-lang/php/php-8.3.4.ebuild @@ -36,14 +36,13 @@ IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls - oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm + odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode valgrind webp +xml xmlreader xmlwriter xpm xslt zip zlib" # Without USE=readline or libedit, the interactive "php -a" CLI will hang. -# The Oracle instant client provides its own incompatible ldap library. REQUIRED_USE=" || ( cli cgi fpm apache2 embed phpdbg ) avif? ( gd zlib ) @@ -61,7 +60,6 @@ REQUIRED_USE=" xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) - oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) @@ -104,7 +102,6 @@ COMMON_DEPEND=" lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) @@ -261,14 +258,6 @@ src_prepare() { sapi/cli/tests/bug78323.phpt \ || die - # Most Oracle tests are borked, - # - # * https://github.com/php/php-src/issues/11804 - # * https://github.com/php/php-src/pull/11820 - # * https://github.com/php/php-src/issues/11819 - # - rm ext/oci8/tests/*.phpt || die - # https://github.com/php/php-src/issues/12801 rm ext/pcre/tests/gh11374.phpt || die @@ -445,9 +434,6 @@ src_configure() { ) fi - # Oracle support - our_conf+=( $(use_with oci8-instant-client oci8) ) - # PDO support if use pdo ; then our_conf+=( @@ -456,7 +442,6 @@ src_configure() { $(use_with postgres pdo-pgsql) $(use_with sqlite pdo-sqlite) $(use_with firebird pdo-firebird "${EPREFIX}/usr") - $(use_with oci8-instant-client pdo-oci) ) fi @@ -569,17 +554,6 @@ src_compile() { addpredict /usr/share/snmp/mibs/.index #nowarn addpredict /var/lib/net-snmp/mib_indexes #nowarn - if use oci8-instant-client && use kerberos && use imap && use phar; then - # A conspiracy takes place when the first three of these flags - # are set together, causing the newly-built "php" to open - # /dev/urandom with mode rw when it starts. That's not actually - # a problem... unless you also have USE=phar, which runs that - # "php" to build some phar thingy in src_compile(). Later in - # src_test(), portage (at least) sets "addpredict /" so the - # problem does not repeat. - addpredict /dev/urandom #nowarn - fi - local sapi for sapi in ${SAPIS} ; do use "${sapi}" && emake -C "${WORKDIR}/sapis-build/${sapi}"