[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2024-02-07 Thread Michael Orlitzky 
commit: 41aa2e2135771de335e4487e8e4363b1e75f6aec
Author: Brahmajit Das  gmail  com>
AuthorDate: Wed Feb  7 09:20:36 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Feb  8 00:29:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41aa2e21

dev-lang/php: Fix implicit declaration of function '__c11_atomic_load'

This is observed with GCC14 and upstream commit[0] fixing the bug is
merged only in RC branches.

[0]: 
https://github.com/php/php-src/commit/72526609413e8a8cd768ed4966c17b1a9db6c12c.patch

Closes: https://bugs.gentoo.org/919003
Closes: https://github.com/gentoo/gentoo/pull/35210
Signed-off-by: Brahmajit Das  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../php/files/php-8.2.15-gcc14-build-fix.patch |  16 +
 dev-lang/php/php-8.2.15-r1.ebuild  | 840 +
 dev-lang/php/php-8.3.2-r1.ebuild   | 802 
 3 files changed, 1658 insertions(+)

diff --git a/dev-lang/php/files/php-8.2.15-gcc14-build-fix.patch 
b/dev-lang/php/files/php-8.2.15-gcc14-build-fix.patch
new file mode 100644
index ..5f21f442ee06
--- /dev/null
+++ b/dev-lang/php/files/php-8.2.15-gcc14-build-fix.patch
@@ -0,0 +1,16 @@
+https://github.com/php/php-src/commit/72526609413e8a8cd768ed4966c17b1a9db6c12c.patch
+From: Remi Collet 
+Date: Mon, 22 Jan 2024 10:01:25 +0100
+Subject: [PATCH] Fix GH-13215 GCC 14 build
+
+--- a/Zend/zend_atomic.h
 b/Zend/zend_atomic.h
+@@ -23,7 +23,7 @@
+   ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || (__GNUC__ > (x)))
+ 
+ /* Builtins are used to avoid library linkage */
+-#if __has_feature(c_atomic)
++#if __has_feature(c_atomic) && defined(__clang__)
+ #define   HAVE_C11_ATOMICS 1
+ #elif ZEND_GCC_PREREQ(4, 7)
+ #define   HAVE_GNUC_ATOMICS 1

diff --git a/dev-lang/php/php-8.2.15-r1.ebuild 
b/dev-lang/php/php-8.2.15-r1.ebuild
new file mode 100644
index ..66bb272f5852
--- /dev/null
+++ b/dev-lang/php/php-8.2.15-r1.ebuild
@@ -0,0 +1,840 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic multilib systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/;
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz;
+
+LICENSE="PHP-3.01
+   BSD
+   Zend-2.0
+   bcmath? ( LGPL-2.1+ )
+   fpm? ( BSD-2 )
+   gd? ( gd )
+   unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+   ${SAPIS/cli/+cli}
+   threads"
+
+IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
+   cdb cjk +ctype curl debug
+   enchant exif ffi +fileinfo +filter firebird
+   +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
+   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 )
+   cli? ( ^^ ( readline libedit ) )
+   !cli? ( ?? ( readline libedit ) )
+   truetype? ( gd zlib )
+   webp? ( gd zlib )
+   cjk? ( gd zlib )
+   exif? ( gd zlib )
+   xpm? ( gd zlib )
+   gd? ( zlib )
+   simplexml? ( xml )
+   soap? ( xml )
+   xmlreader? ( xml )
+   xmlwriter? ( xml )
+   xslt? ( xml )
+   ldap-sasl? ( ldap )
+   oci8-instant-client? ( !ldap )
+   qdbm? ( !gdbm )
+   session-mm? ( session !threads )
+   mysql? ( || ( mysqli pdo ) )
+   firebird? ( pdo )
+   mssql? ( pdo )
+   test? ( cli )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+   >=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+   >=dev-libs/libpcre2-10.30[jit?,unicode]
+   virtual/libcrypt:=
+   fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) 
selinux? ( sys-libs/libselinux ) )
+   apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2024-02-07 Thread Michael Orlitzky 
commit: d306a40ad0a2df3f2519749b7979375a4e099d57
Author: Brahmajit Das  gmail  com>
AuthorDate: Wed Feb  7 09:10:09 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Feb  7 14:43:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d306a40a

dev-lang/php: Fix incompatible function pointer types passing void

The was to include upstream commit 0a39890 which addresses the build
failiure.

Closes: https://bugs.gentoo.org/923884
Closes: https://github.com/gentoo/gentoo/pull/35209
Signed-off-by: Michael Orlitzky  gentoo.org>
Signed-off-by: Brahmajit Das  gmail.com>

 dev-lang/php/files/php-8.1.27-gcc14-libxml.patch |  57 ++
 dev-lang/php/php-8.1.27-r1.ebuild| 767 +++
 2 files changed, 824 insertions(+)

diff --git a/dev-lang/php/files/php-8.1.27-gcc14-libxml.patch 
b/dev-lang/php/files/php-8.1.27-gcc14-libxml.patch
new file mode 100644
index ..f477ba541bfa
--- /dev/null
+++ b/dev-lang/php/files/php-8.1.27-gcc14-libxml.patch
@@ -0,0 +1,57 @@
+https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082.patch
+From: Niels Dossche <7771979+niels...@users.noreply.github.com>
+Date: Fri, 1 Dec 2023 18:03:35 +0100
+Subject: [PATCH] Fix libxml2 2.12 build due to API breaks
+
+See https://github.com/php/php-src/actions/runs/7062192818/job/19225478601
+--- a/ext/libxml/libxml.c
 b/ext/libxml/libxml.c
+@@ -472,7 +472,11 @@ static void _php_libxml_free_error(void *ptr)
+   xmlResetError((xmlErrorPtr) ptr);
+ }
+ 
+-static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg)
++#if LIBXML_VERSION >= 21200
++static void _php_list_set_error_structure(const xmlError *error, const char 
*msg)
++#else
++static void _php_list_set_error_structure(xmlError *error, const char *msg)
++#endif
+ {
+   xmlError error_copy;
+   int ret;
+@@ -725,7 +729,11 @@ PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, 
const char *msg, ...)
+   va_end(args);
+ }
+ 
++#if LIBXML_VERSION >= 21200
++PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const 
xmlError *error)
++#else
+ PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, 
xmlErrorPtr error)
++#endif
+ {
+   _php_list_set_error_structure(error, NULL);
+ 
+@@ -957,11 +965,9 @@ PHP_FUNCTION(libxml_use_internal_errors)
+ /* {{{ Retrieve last error from libxml */
+ PHP_FUNCTION(libxml_get_last_error)
+ {
+-  xmlErrorPtr error;
+-
+   ZEND_PARSE_PARAMETERS_NONE();
+ 
+-  error = xmlGetLastError();
++  const xmlError *error = xmlGetLastError();
+ 
+   if (error) {
+   object_init_ex(return_value, libxmlerror_class_entry);
+--- a/ext/soap/php_sdl.c
 b/ext/soap/php_sdl.c
+@@ -332,7 +332,7 @@ static void load_wsdl_ex(zval *this_ptr, char *struri, 
sdlCtx *ctx, int include)
+   sdl_restore_uri_credentials(ctx);
+ 
+   if (!wsdl) {
+-  xmlErrorPtr xmlErrorPtr = xmlGetLastError();
++  const xmlError *xmlErrorPtr = xmlGetLastError();
+ 
+   if (xmlErrorPtr) {
+   soap_error2(E_ERROR, "Parsing WSDL: Couldn't load from 
'%s' : %s", struri, xmlErrorPtr->message);

diff --git a/dev-lang/php/php-8.1.27-r1.ebuild 
b/dev-lang/php/php-8.1.27-r1.ebuild
new file mode 100644
index ..3e3a44b7b8b2
--- /dev/null
+++ b/dev-lang/php/php-8.1.27-r1.ebuild
@@ -0,0 +1,767 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic multilib systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/;
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz;
+
+LICENSE="PHP-3.01
+   BSD
+   Zend-2.0
+   bcmath? ( LGPL-2.1+ )
+   fpm? ( BSD-2 )
+   gd? ( gd )
+   unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+   ${SAPIS/cli/+cli}
+   threads"
+
+IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
+   cdb cjk coverage +ctype curl debug
+   enchant exif ffi +fileinfo +filter firebird
+   +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
+   readline selinux +session session-mm sharedmem
+   +simplexml snmp soap sockets sodium spell sqlite ssl
+   sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+   +xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/, profiles/

2023-10-11 Thread Florian Schmaus 
commit: 8d5067f23033a29e67f909d0c723079766226141
Author: Florian Schmaus  gentoo  org>
AuthorDate: Wed Oct 11 19:13:38 2023 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed Oct 11 19:13:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d5067f2

dev-lang/php: drop 8.0.29, 8.0.30

Signed-off-by: Florian Schmaus  gentoo.org>

 dev-lang/php/Manifest|   2 -
 dev-lang/php/files/php80-firebird-warnings.patch |  56 --
 dev-lang/php/php-8.0.29.ebuild   | 757 --
 dev-lang/php/php-8.0.30.ebuild   | 760 ---
 profiles/package.mask|   6 -
 5 files changed, 1581 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 4d0f9f5015bf..16fdc3e26045 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,5 +1,3 @@
-DIST php-8.0.29.tar.xz 10803592 BLAKE2B 
6e15ce459aa5a51b2a07a4bfa1f6dba076dbbd4828ccdcb8dc4796f64ad3dbda6ee2b6789880591847a7de0d077072e63c46f13399b5b44a4ec34c83172fb6ac
 SHA512 
5f849753bbcc12e253160af072213bc1ede32e5051684129707d32fd6ce8e12867fcf7a5f6790b25071fdda0508dfffd3344e4bb850a747cb8f3c9aee970311d
-DIST php-8.0.30.tar.xz 10821076 BLAKE2B 
9a914ce99ec1d5d554f063ba324d95bd6d39912a13f34f9b3e09fa020c96c0a50ff919e8d829fd663522be2b68bea8934d7f67c52ad45b64d72946f0ba5f3925
 SHA512 
fb816e0a4e4dc506b0ea4425f26690edc6afadb5474ac84df0a1aa293abecd50d128b36074e3e0740c7228109d486ca446869a9c920419610a20ab5989870782
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B 
ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096
 SHA512 
d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
 DIST php-8.1.24.tar.xz 11793756 BLAKE2B 
b9eb32710aef2c298f73bc2c05c26bcc918bd06d6a9dda217e72bc3f1591502b2e8380e20f5717bf1887b0201ce656641dbec8a9ab360d8bdcdbc46417b7
 SHA512 
4a77498ddfdb171de9fa4d7c6e0155c4a5126fcd813c0370d0c7a23b3daec18e95f4b45df6a3473fc665687a3fe51ae1479f42f57658391d170ea9a8849f8fc8
 DIST php-8.2.11.tar.xz 12046180 BLAKE2B 
5795cb4cee5b4cc5d805fab5bf2ee2befda3cd41fb37727c19f9e214fd72455dd39c762c69aa0728df03b4ac834867b4687ba2d85847aa918affea24ba603548
 SHA512 
3c8db245854c0221a952e0f11fc8fbf8944caf73ae0049a710db0db5ce9c018207444dc8a60e2b3c63a6d025c5d09cd17b0542e1b7df8ad2e49635ef5faf7f45

diff --git a/dev-lang/php/files/php80-firebird-warnings.patch 
b/dev-lang/php/files/php80-firebird-warnings.patch
deleted file mode 100644
index 48e38c2135f8..
--- a/dev-lang/php/files/php80-firebird-warnings.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From c288b5294bb0e13ad2904a3ec79265f727baaea3 Mon Sep 17 00:00:00 2001
-From: Nikita Popov 
-Date: Mon, 14 Dec 2020 10:36:36 +0100
-Subject: [PATCH] Fix compile warnings in PDO Firebird
-

- ext/pdo_firebird/firebird_driver.c  | 9 +
- ext/pdo_firebird/php_pdo_firebird_int.h | 3 +--
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/ext/pdo_firebird/firebird_driver.c 
b/ext/pdo_firebird/firebird_driver.c
-index c299907f0fea1..390871cc200c8 100644
 a/ext/pdo_firebird/firebird_driver.c
-+++ b/ext/pdo_firebird/firebird_driver.c
-@@ -171,10 +171,11 @@ static const char classes_array[] = {
-   /* 127 */ 0
- };
- 
--inline char classes(char idx)
-+static inline char classes(char idx)
- {
--  if (idx > 127) return 0;
--  return classes_array[idx];
-+  unsigned char uidx = (unsigned char) idx;
-+  if (uidx > 127) return 0;
-+  return classes_array[uidx];
- }
- 
- typedef enum {
-@@ -1085,7 +1086,7 @@ static int pdo_firebird_handle_factory(pdo_dbh_t *dbh, 
zval *driver_options) /*
-   char errmsg[512];
-   const ISC_STATUS *s = H->isc_status;
-   fb_interpret(errmsg, sizeof(errmsg),);
--  zend_throw_exception_ex(php_pdo_get_exception(), 
H->isc_status[1], "SQLSTATE[%s] [%d] %s",
-+  zend_throw_exception_ex(php_pdo_get_exception(), 
H->isc_status[1], "SQLSTATE[%s] [%ld] %s",
-   "HY000", H->isc_status[1], errmsg);
-   }
- 
-diff --git a/ext/pdo_firebird/php_pdo_firebird_int.h 
b/ext/pdo_firebird/php_pdo_firebird_int.h
-index 094767fa355d3..70a895b4b9f83 100644
 a/ext/pdo_firebird/php_pdo_firebird_int.h
-+++ b/ext/pdo_firebird/php_pdo_firebird_int.h
-@@ -34,12 +34,11 @@
- #define SHORT_MAX (1 << (8*sizeof(short)-1))
- 
- #if SIZEOF_ZEND_LONG == 8 && !defined(PHP_WIN32)
--# define LL_MASK "l"
- # define LL_LIT(lit) lit ## L
- #else
--# define LL_MASK "ll"
- # define LL_LIT(lit) lit ## LL
- #endif
-+#define LL_MASK "ll"
- 
- /* Firebird API has a couple of missing const decls in its API */
- #define const_cast(s) ((char*)(s))

diff --git a/dev-lang/php/php-8.0.29.ebuild b/dev-lang/php/php-8.0.29.ebuild
deleted file mode 100644
index 7a01d64a53cc..
---

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2023-07-30 Thread Michael Orlitzky 
commit: 517dfe205cd1a9c476f44dfc0eae7b78bb23e910
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Jul 26 12:53:33 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Jul 31 00:49:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=517dfe20

dev-lang/php: improve testing in the 8.2 slot.

We had basically given up on the PHP test suite due to a high number of
"expected" failures. I've tried to track most of these down and
report/fix them upstream. In the meantime, all known failing tests have
been disabled one-at-a-time, with pointers to the upstream issue/PR. And
with that done, the test suite is once again run in anger; if it fails,
the installation will too.

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/files/php-8.2.8-openssl-tests.patch |  21 +++
 dev-lang/php/php-8.2.8.ebuild| 174 +++
 2 files changed, 135 insertions(+), 60 deletions(-)

diff --git a/dev-lang/php/files/php-8.2.8-openssl-tests.patch 
b/dev-lang/php/files/php-8.2.8-openssl-tests.patch
new file mode 100644
index ..ebade4c0cd45
--- /dev/null
+++ b/dev-lang/php/files/php-8.2.8-openssl-tests.patch
@@ -0,0 +1,21 @@
+commit 5a4083181b970411d6f3b1c1e3bdd199d5cd1a5e
+Author: Jakub Holubansky 
+Date:   Fri Mar 31 17:20:35 2023 +0200
+
+ext/openssl: pass ini options to extra processes in tests
+
+diff --git a/ext/openssl/tests/ServerClientTestCase.inc 
b/ext/openssl/tests/ServerClientTestCase.inc
+index 753366df6f..1b140b63f6 100644
+--- a/ext/openssl/tests/ServerClientTestCase.inc
 b/ext/openssl/tests/ServerClientTestCase.inc
+@@ -72,8 +72,9 @@ class ServerClientTestCase
+ );
+ } else {
+ $cmd = sprintf(
+-'%s "%s" %s %s',
++'%s %s "%s" %s %s',
+ PHP_BINARY,
++getenv('TEST_PHP_EXTRA_ARGS'),
+ __FILE__,
+ WORKER_ARGV_VALUE,
+ $worker

diff --git a/dev-lang/php/php-8.2.8.ebuild b/dev-lang/php/php-8.2.8.ebuild
index 11169ef1de48..b688e330dffc 100644
--- a/dev-lang/php/php-8.2.8.ebuild
+++ b/dev-lang/php/php-8.2.8.ebuild
@@ -67,6 +67,7 @@ REQUIRED_USE="
mysql? ( || ( mysqli pdo ) )
firebird? ( pdo )
mssql? ( pdo )
+   test? ( cli )
 "
 
 RESTRICT="!test? ( test )"
@@ -148,6 +149,7 @@ PHP_MV="$(ver_cut 1)"
 PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
"${FILESDIR}/php-capstone-optional.patch"
+   "${FILESDIR}/php-8.2.8-openssl-tests.patch"
 )
 
 php_install_ini() {
@@ -224,19 +226,85 @@ src_prepare() {
eautoconf --force
eautoheader
 
-   # Remove false positive test failures
-   # stream_isatty fails due to portage redirects
-   # curl tests here fail for network sandbox issues
-   # session tests here fail because we set the session directory to $T
-   rm tests/output/stream_isatty_err.phpt \
-  tests/output/stream_isatty_out-err.phpt \
-  tests/output/stream_isatty_out.phpt \
-  ext/curl/tests/bug76675.phpt \
-  ext/curl/tests/bug77535.phpt \
-  ext/curl/tests/curl_error_basic.phpt \
-  ext/session/tests/bug74514.phpt \
-  ext/session/tests/bug74936.phpt || die
+   # missing skipif; fixed upstream already
+   rm sapi/cgi/tests/005.phpt || die
 
+   # These three get BORKED on no-ipv6 systems,
+   #
+   #   https://github.com/php/php-src/pull/11651
+   #
+   rm ext/sockets/tests/mcast_ipv6_recv.phpt \
+  ext/sockets/tests/mcast_ipv6_recv_limited.phpt \
+  ext/sockets/tests/mcast_ipv6_send.phpt \
+  || die
+
+   # fails in a network sandbox,
+   #
+   #   https://github.com/php/php-src/issues/11662
+   #
+   rm ext/sockets/tests/bug63000.phpt || die
+
+   # expected output needs to be updated,
+   #
+   #   https://github.com/php/php-src/pull/11648
+   #
+   rm ext/dba/tests/dba_tcadb.phpt || die
+
+   # Two IMAP tests missing SKIPIFs,
+   #
+   #   https://github.com/php/php-src/pull/11654
+   #
+   rm ext/imap/tests/imap_mutf7_to_utf8.phpt \
+  ext/imap/tests/imap_utf8_to_mutf7_basic.phpt \
+  || die
+
+   # broken upstream with icu-73.x,
+   #
+   #   https://github.com/php/php-src/issues/11128
+   #
+   rm ext/intl/tests/calendar_clear_variation1.phpt || die
+
+   # overly sensitive to INI values; fixes sent upstream:
+   #
+   #  https://github.com/php/php-src/pull/11631
+   #
+   rm ext/session/tests/{bug74514,bug74936,gh7787}.phpt || die
+
+   # This is sensitive to the current "nice" level:
+   #
+   #   https://github.com/php/php-src/issues/11630
+   #
+   rm ext/standard/tests/general_functions/proc_nice_basic.phpt || die
+
+   # Tests ignoring the "-n" flag we pass to run-tests.php,
+   #
+   #

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2023-02-20 Thread Brian Evans 
commit: b711589df12322ac7ca3cbe4e5889a623dc81a96
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Feb 20 18:07:03 2023 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Feb 20 19:43:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b711589d

dev-lang/php: Revbump for backporting CVE patches to 7.4

Bug: https://bugs.gentoo.org/895416
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/files/php-7.4.33-CVE-2023-0567.patch | 114 
 dev-lang/php/files/php-7.4.33-CVE-2023-0568.patch |  37 ++
 dev-lang/php/files/php-7.4.33-CVE-2023-0662.patch |  48 ++
 dev-lang/php/php-7.4.33-r2.ebuild | 753 ++
 4 files changed, 952 insertions(+)

diff --git a/dev-lang/php/files/php-7.4.33-CVE-2023-0567.patch 
b/dev-lang/php/files/php-7.4.33-CVE-2023-0567.patch
new file mode 100644
index ..a0e72f380089
--- /dev/null
+++ b/dev-lang/php/files/php-7.4.33-CVE-2023-0567.patch
@@ -0,0 +1,114 @@
+diff --git a/ext/standard/crypt_blowfish.c b/ext/standard/crypt_blowfish.c
+index 3806a290aee4..351d40308089 100644
+--- a/ext/standard/crypt_blowfish.c
 b/ext/standard/crypt_blowfish.c
+@@ -371,7 +371,6 @@ static const unsigned char BF_atoi64[0x60] = {
+ #define BF_safe_atoi64(dst, src) \
+ { \
+   tmp = (unsigned char)(src); \
+-  if (tmp == '$') break; /* PHP hack */ \
+   if ((unsigned int)(tmp -= 0x20) >= 0x60) return -1; \
+   tmp = BF_atoi64[tmp]; \
+   if (tmp > 63) return -1; \
+@@ -399,13 +398,6 @@ static int BF_decode(BF_word *dst, const char *src, int 
size)
+   *dptr++ = ((c3 & 0x03) << 6) | c4;
+   } while (dptr < end);
+ 
+-  if (end - dptr == size) {
+-  return -1;
+-  }
+-
+-  while (dptr < end) /* PHP hack */
+-  *dptr++ = 0;
+-
+   return 0;
+ }
+ 
+diff --git a/ext/standard/tests/crypt/bcrypt_salt_dollar.phpt 
b/ext/standard/tests/crypt/bcrypt_salt_dollar.phpt
+new file mode 100644
+index ..32e335f4b087
+--- /dev/null
 b/ext/standard/tests/crypt/bcrypt_salt_dollar.phpt
+@@ -0,0 +1,82 @@
++--TEST--
++bcrypt correctly rejects salts containing $
++--FILE--
++
++--EXPECT--
++string(8) "$2y$04$$"
++string(2) "*0"
++bool(false)
++string(9) "$2y$04$0$"
++string(2) "*0"
++bool(false)
++string(10) "$2y$04$00$"
++string(2) "*0"
++bool(false)
++string(11) "$2y$04$000$"
++string(2) "*0"
++bool(false)
++string(12) "$2y$04$$"
++string(2) "*0"
++bool(false)
++string(13) "$2y$04$0$"
++string(2) "*0"
++bool(false)
++string(14) "$2y$04$00$"
++string(2) "*0"
++bool(false)
++string(15) "$2y$04$000$"
++string(2) "*0"
++bool(false)
++string(16) "$2y$04$$"
++string(2) "*0"
++bool(false)
++string(17) "$2y$04$0$"
++string(2) "*0"
++bool(false)
++string(18) "$2y$04$00$"
++string(2) "*0"
++bool(false)
++string(19) "$2y$04$000$"
++string(2) "*0"
++bool(false)
++string(20) "$2y$04$$"
++string(2) "*0"
++bool(false)
++string(21) "$2y$04$0$"
++string(2) "*0"
++bool(false)
++string(22) "$2y$04$00$"
++string(2) "*0"
++bool(false)
++string(23) "$2y$04$000$"
++string(2) "*0"
++bool(false)
++string(24) "$2y$04$$"
++string(2) "*0"
++bool(false)
++string(25) "$2y$04$0$"
++string(2) "*0"
++bool(false)
++string(26) "$2y$04$00$"
++string(2) "*0"
++bool(false)
++string(27) "$2y$04$000$"
++string(2) "*0"
++bool(false)
++string(28) "$2y$04$$"
++string(2) "*0"
++bool(false)
++string(29) "$2y$04$0$"
++string(2) "*0"
++bool(false)
++string(30) "$2y$04$00$"
++string(60) "$2y$04$0u2a2UpVexIt9k3FMJeAVr3c04F5tcI8K"
++bool(false)

diff --git a/dev-lang/php/files/php-7.4.33-CVE-2023-0568.patch 
b/dev-lang/php/files/php-7.4.33-CVE-2023-0568.patch
new file mode 100644
index ..67c172ae214f
--- /dev/null
+++ b/dev-lang/php/files/php-7.4.33-CVE-2023-0568.patch
@@ -0,0 +1,37 @@
+From a92acbad873a05470af1a47cb785a18eadd827b5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= 
+Date: Mon, 23 Jan 2023 22:13:57 +0100
+Subject: [PATCH] crypt: Fix possible buffer overread in php_crypt()
+
+---
+ ext/standard/crypt.c   | 1 +
+ ext/standard/tests/password/password_bcrypt_short.phpt | 8 
+ 2 files changed, 9 insertions(+)
+ create mode 100644 ext/standard/tests/password/password_bcrypt_short.phpt
+
+diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
+index 8c105cf910e8..8316c8b96063 100644
+--- a/ext/standard/crypt.c
 b/ext/standard/crypt.c
+@@ -135,6 +135,7 @@ PHPAPI zend_string *php_crypt(const char *password, const 
int pass_len, const ch
+   } else if (
+   salt[0] == '$' &&
+   salt[1] == '2' &&
++  salt[2] != 0 &&
+   salt[3] == '$') {
+

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2022-01-21 Thread Brian Evans 
commit: 501870ea8bf544b0082d7086daf3a842ddcea379
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Jan 21 15:04:56 2022 +
Commit: Brian Evans  gentoo  org>
CommitDate: Fri Jan 21 15:04:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=501870ea

dev-lang/php: Backport GCC 11 rpath patch to 7.4.27 in revbump

Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/files/bug81656-gcc-11.patch |  53 +++
 dev-lang/php/php-7.4.27-r1.ebuild| 746 +++
 2 files changed, 799 insertions(+)

diff --git a/dev-lang/php/files/bug81656-gcc-11.patch 
b/dev-lang/php/files/bug81656-gcc-11.patch
new file mode 100644
index ..8dfe1deb2b33
--- /dev/null
+++ b/dev-lang/php/files/bug81656-gcc-11.patch
@@ -0,0 +1,53 @@
+From bb00a649e0c1ac57718cd9971e7e6f933cb2dadd Mon Sep 17 00:00:00 2001
+From: Michael Wallner 
+Date: Thu, 25 Nov 2021 07:43:14 +0100
+Subject: [PATCH] fix #81656: GCC-11 silently ignores -R
+
+---
+ build/php.m4 | 28 ++--
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/build/php.m4 b/build/php.m4
+index 3af2b8b72d47..4697c5df9274 100644
+--- a/build/php.m4
 b/build/php.m4
+@@ -279,25 +279,25 @@ dnl
+ dnl Checks for -R, etc. switch.
+ dnl
+ AC_DEFUN([PHP_RUNPATH_SWITCH],[
+-AC_MSG_CHECKING([if compiler supports -R])
+-AC_CACHE_VAL(php_cv_cc_dashr,[
++AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
++AC_CACHE_VAL(php_cv_cc_rpath,[
+   SAVE_LIBS=$LIBS
+-  LIBS="-R /usr/$PHP_LIBDIR $LIBS"
+-  AC_LINK_IFELSE([AC_LANG_PROGRAM([], 
[])],[php_cv_cc_dashr=yes],[php_cv_cc_dashr=no])
++  LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS"
++  AC_LINK_IFELSE([AC_LANG_PROGRAM([], 
[])],[php_cv_cc_rpath=yes],[php_cv_cc_rpath=no])
+   LIBS=$SAVE_LIBS])
+-AC_MSG_RESULT([$php_cv_cc_dashr])
+-if test $php_cv_cc_dashr = "yes"; then
+-  ld_runpath_switch=-R
++AC_MSG_RESULT([$php_cv_cc_rpath])
++if test $php_cv_cc_rpath = "yes"; then
++  ld_runpath_switch=-Wl,-rpath,
+ else
+-  AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
+-  AC_CACHE_VAL(php_cv_cc_rpath,[
++  AC_MSG_CHECKING([if compiler supports -R])
++  AC_CACHE_VAL(php_cv_cc_dashr,[
+ SAVE_LIBS=$LIBS
+-LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS"
+-AC_LINK_IFELSE([AC_LANG_PROGRAM([], 
[])],[php_cv_cc_rpath=yes],[php_cv_cc_rpath=no])
++LIBS="-R /usr/$PHP_LIBDIR $LIBS"
++AC_LINK_IFELSE([AC_LANG_PROGRAM([], 
[])],[php_cv_cc_dashr=yes],[php_cv_cc_dashr=no])
+ LIBS=$SAVE_LIBS])
+-  AC_MSG_RESULT([$php_cv_cc_rpath])
+-  if test $php_cv_cc_rpath = "yes"; then
+-ld_runpath_switch=-Wl,-rpath,
++  AC_MSG_RESULT([$php_cv_cc_dashr])
++  if test $php_cv_cc_dashr = "yes"; then
++ld_runpath_switch=-R
+   else
+ dnl Something innocuous.
+ ld_runpath_switch=-L

diff --git a/dev-lang/php/php-7.4.27-r1.ebuild 
b/dev-lang/php/php-7.4.27-r1.ebuild
new file mode 100644
index ..9925c7527525
--- /dev/null
+++ b/dev-lang/php/php-7.4.27-r1.ebuild
@@ -0,0 +1,746 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/;
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz;
+
+LICENSE="PHP-3.01
+   BSD
+   Zend-2.0
+   bcmath? ( LGPL-2.1+ )
+   fpm? ( BSD-2 )
+   gd? ( gd )
+   unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+   ${SAPIS/cli/+cli}
+   threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+   coverage +ctype curl debug
+   enchant exif ffi +fileinfo +filter firebird
+   +flatfile ftp gd gdbm gmp +iconv imap inifile
+   intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb
+   mhash mssql mysql mysqli nls
+   oci8-instant-client 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 webp
+   +xml xmlreader xmlwriter xmlrpc 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 )
+   cli? ( ^^ ( readline libedit ) )
+   !cli? ( ?? ( readline libedit ) )
+   truetype? ( gd zlib )
+   webp? ( gd zlib )
+   cjk? ( gd zlib )
+   exif? ( gd zlib )
+   xpm? ( gd

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2021-11-24 Thread Brian Evans 
commit: 91dcbea9e37241ce74bf5613ccbe3cfca5b23429
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Nov 24 14:14:27 2021 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Nov 24 14:14:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91dcbea9

dev-lang/php: Backport patch from upstream for ICU 70 changes

Already fixed in 7.4.26, 8.0.13 and 8.1.0_rc6

Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/files/php-icu-70.patch | 45 +
 dev-lang/php/php-7.3.32.ebuild  |  1 +
 dev-lang/php/php-7.3.33.ebuild  |  1 +
 dev-lang/php/php-7.4.25.ebuild  |  1 +
 dev-lang/php/php-8.0.12.ebuild  |  1 +
 dev-lang/php/php-8.1.0_rc5.ebuild   |  1 +
 6 files changed, 50 insertions(+)

diff --git a/dev-lang/php/files/php-icu-70.patch 
b/dev-lang/php/files/php-icu-70.patch
new file mode 100644
index ..63bcb8533f7a
--- /dev/null
+++ b/dev-lang/php/files/php-icu-70.patch
@@ -0,0 +1,45 @@
+diff --git a/ext/intl/locale/locale_methods.c 
b/ext/intl/locale/locale_methods.c
+index 1c4ba327bd83..1bdfb27b7e2e 100644
+--- a/ext/intl/locale/locale_methods.c
 b/ext/intl/locale/locale_methods.c
+@@ -1326,7 +1326,7 @@ PHP_FUNCTION(locale_filter_matches)
+   if( token && (token==cur_lang_tag) ){
+   /* check if the char. after match is SEPARATOR */
+   chrcheck = token + (strlen(cur_loc_range));
+-  if( isIDSeparator(*chrcheck) || isEndOfTag(*chrcheck) ){
++  if( isIDSeparator(*chrcheck) || 
isKeywordSeparator(*chrcheck) || isEndOfTag(*chrcheck) ){
+   efree( cur_lang_tag );
+   efree( cur_loc_range );
+   if( can_lang_tag){
+diff --git a/ext/intl/breakiterator/codepointiterator_internal.cpp 
b/ext/intl/breakiterator/codepointiterator_internal.cpp
+index bf44678efc06..143c181590e9 100644
+--- a/ext/intl/breakiterator/codepointiterator_internal.cpp
 b/ext/intl/breakiterator/codepointiterator_internal.cpp
+@@ -75,7 +75,11 @@ CodePointBreakIterator::~CodePointBreakIterator()
+   clearCurrentCharIter();
+ }
+ 
++#if U_ICU_VERSION_MAJOR_NUM >= 70
++bool CodePointBreakIterator::operator==(const BreakIterator& that) const
++#else
+ UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
++#endif
+ {
+   if (typeid(*this) != typeid(that)) {
+   return FALSE;
+diff --git a/ext/intl/breakiterator/codepointiterator_internal.h 
b/ext/intl/breakiterator/codepointiterator_internal.h
+index 7ecf12deb5ae..0baf607782d0 100644
+--- a/ext/intl/breakiterator/codepointiterator_internal.h
 b/ext/intl/breakiterator/codepointiterator_internal.h
+@@ -39,7 +39,11 @@ namespace PHP {
+ 
+   virtual ~CodePointBreakIterator();
+ 
++#if U_ICU_VERSION_MAJOR_NUM >= 70
++  virtual bool operator==(const BreakIterator& that) const;
++#else
+   virtual UBool operator==(const BreakIterator& that) const;
++#endif
+ 
+   virtual CodePointBreakIterator* clone(void) const;
+ 

diff --git a/dev-lang/php/php-7.3.32.ebuild b/dev-lang/php/php-7.3.32.ebuild
index 80c4f1c7d3d8..eb176b40cd3d 100644
--- a/dev-lang/php/php-7.3.32.ebuild
+++ b/dev-lang/php/php-7.3.32.ebuild
@@ -152,6 +152,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
"${FILESDIR}/php-freetype-2.9.1.patch"
+   "${FILESDIR}/php-icu-70.patch"
 )
 
 PHP_MV="$(ver_cut 1)"

diff --git a/dev-lang/php/php-7.3.33.ebuild b/dev-lang/php/php-7.3.33.ebuild
index 0f10af29f7a5..e1ab493e57a6 100644
--- a/dev-lang/php/php-7.3.33.ebuild
+++ b/dev-lang/php/php-7.3.33.ebuild
@@ -152,6 +152,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
"${FILESDIR}/php-freetype-2.9.1.patch"
+   "${FILESDIR}/php-icu-70.patch"
 )
 
 PHP_MV="$(ver_cut 1)"

diff --git a/dev-lang/php/php-7.4.25.ebuild b/dev-lang/php/php-7.4.25.ebuild
index 7c74bdd02981..ea60a2d13396 100644
--- a/dev-lang/php/php-7.4.25.ebuild
+++ b/dev-lang/php/php-7.4.25.ebuild
@@ -146,6 +146,7 @@ PHP_MV="$(ver_cut 1)"
 
 PATCHES=(
"${FILESDIR}"/php-iodbc-header-location.patch
+   "${FILESDIR}/php-icu-70.patch"
 )
 
 php_install_ini() {

diff --git a/dev-lang/php/php-8.0.12.ebuild b/dev-lang/php/php-8.0.12.ebuild
index 38aa05d3df7a..fa6e96581f24 100644
--- a/dev-lang/php/php-8.0.12.ebuild
+++ b/dev-lang/php/php-8.0.12.ebuild
@@ -146,6 +146,7 @@ PHP_MV="$(ver_cut 1)"
 PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
"${FILESDIR}/php80-firebird-warnings.patch"
+   "${FILESDIR}/php-icu-70.patch"
 )
 
 php_install_ini() {

diff --git a/dev-lang/php/php-8.1.0_rc5.ebuild 
b/dev-lang/php/php-8.1.0_rc5.ebuild
index 0233f090d637..7d840eb22182 100644
--- a/dev-lang/php/php-8.1.0_rc5.ebuild
+++ b/dev-lang/php/php-8.1.0_rc5.ebuild
@@ -146,6 +146,7 @@ PHP_MV="$(ver_cut 1)"
 
 PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
+

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2021-10-25 Thread Brian Evans 
commit: 6fb720cfe0c62387092106e1ec5c494ad82cc07f
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Oct 25 14:41:47 2021 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Oct 25 14:41:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb720cf

dev-lang/php: Revbump 7.3.31 for CVE-2021-21703 security patch

Bug: https://bugs.gentoo.org/819510
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/files/php73-CVE2021-21703.patch | 397 ++
 dev-lang/php/php-7.3.31-r1.ebuild| 754 +++
 2 files changed, 1151 insertions(+)

diff --git a/dev-lang/php/files/php73-CVE2021-21703.patch 
b/dev-lang/php/files/php73-CVE2021-21703.patch
new file mode 100644
index 000..d565c84c364
--- /dev/null
+++ b/dev-lang/php/files/php73-CVE2021-21703.patch
@@ -0,0 +1,397 @@
+From c600ec7bcf2696882ffe961e7b158c67aa2e7277 Mon Sep 17 00:00:00 2001
+From: Jakub Zelenka 
+Date: Sat, 2 Oct 2021 22:53:41 +0100
+Subject: [PATCH] Fix bug #81026 (PHP-FPM oob R/W in root process leading to
+ priv escalatio)
+
+The main change is to store scoreboard procs directly to the variable sized
+array rather than indirectly through the pointer.
+---
+ sapi/fpm/fpm/fpm_children.c|  14 ++---
+ sapi/fpm/fpm/fpm_request.c |   4 +-
+ sapi/fpm/fpm/fpm_scoreboard.c  | 106 -
+ sapi/fpm/fpm/fpm_scoreboard.h  |  11 ++--
+ sapi/fpm/fpm/fpm_status.c  |   4 +-
+ sapi/fpm/fpm/fpm_worker_pool.c |   2 +-
+ 6 files changed, 81 insertions(+), 60 deletions(-)
+
+diff --git a/sapi/fpm/fpm/fpm_children.c b/sapi/fpm/fpm/fpm_children.c
+index fd121372f3..912f77c11a 100644
+--- a/sapi/fpm/fpm/fpm_children.c
 b/sapi/fpm/fpm/fpm_children.c
+@@ -246,7 +246,7 @@ void fpm_children_bury() /* {{{ */
+ 
+   fpm_child_unlink(child);
+ 
+-  fpm_scoreboard_proc_free(wp->scoreboard, 
child->scoreboard_i);
++  fpm_scoreboard_proc_free(child);
+ 
+   fpm_clock_get();
+ 
+@@ -256,9 +256,9 @@ void fpm_children_bury() /* {{{ */
+   if (!fpm_pctl_can_spawn_children()) {
+   severity = ZLOG_DEBUG;
+   }
+-  zlog(severity, "[pool %s] child %d exited %s 
after %ld.%06d seconds from start", child->wp->config->name, (int) pid, buf, 
tv2.tv_sec, (int) tv2.tv_usec);
++  zlog(severity, "[pool %s] child %d exited %s 
after %ld.%06d seconds from start", wp->config->name, (int) pid, buf, 
tv2.tv_sec, (int) tv2.tv_usec);
+   } else {
+-  zlog(ZLOG_DEBUG, "[pool %s] child %d has been 
killed by the process management after %ld.%06d seconds from start", 
child->wp->config->name, (int) pid, tv2.tv_sec, (int) tv2.tv_usec);
++  zlog(ZLOG_DEBUG, "[pool %s] child %d has been 
killed by the process management after %ld.%06d seconds from start", 
wp->config->name, (int) pid, tv2.tv_sec, (int) tv2.tv_usec);
+   }
+ 
+   fpm_child_close(child, 1 /* in event_loop */);
+@@ -324,7 +324,7 @@ static struct fpm_child_s *fpm_resources_prepare(struct 
fpm_worker_pool_s *wp) /
+   return 0;
+   }
+ 
+-  if (0 > fpm_scoreboard_proc_alloc(wp->scoreboard, >scoreboard_i)) {
++  if (0 > fpm_scoreboard_proc_alloc(c)) {
+   fpm_stdio_discard_pipes(c);
+   fpm_child_free(c);
+   return 0;
+@@ -336,7 +336,7 @@ static struct fpm_child_s *fpm_resources_prepare(struct 
fpm_worker_pool_s *wp) /
+ 
+ static void fpm_resources_discard(struct fpm_child_s *child) /* {{{ */
+ {
+-  fpm_scoreboard_proc_free(child->wp->scoreboard, child->scoreboard_i);
++  fpm_scoreboard_proc_free(child);
+   fpm_stdio_discard_pipes(child);
+   fpm_child_free(child);
+ }
+@@ -349,10 +349,10 @@ static void fpm_child_resources_use(struct fpm_child_s 
*child) /* {{{ */
+   if (wp == child->wp) {
+   continue;
+   }
+-  fpm_scoreboard_free(wp->scoreboard);
++  fpm_scoreboard_free(wp);
+   }
+ 
+-  fpm_scoreboard_child_use(child->wp->scoreboard, child->scoreboard_i, 
getpid());
++  fpm_scoreboard_child_use(child, getpid());
+   fpm_stdio_child_use_pipes(child);
+   fpm_child_free(child);
+ }
+diff --git a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c
+index c80aa14462..0a6f6a7cfb 100644
+--- a/sapi/fpm/fpm/fpm_request.c
 b/sapi/fpm/fpm/fpm_request.c
+@@ -285,7 +285,7 @@ int fpm_request_is_idle(struct fpm_child_s *child) /* {{{ 
*/
+   struct fpm_scoreboard_proc_s *proc;
+ 
+   /* no need in atomicity here */
+-  proc = fpm_scoreboard_proc_get(child->wp->scoreboard, 
child->scoreboard_i);
++  proc = fpm_scoreboard_proc_get_from_child(child);
+   if (!proc) {
+   return 0;
+

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2019-12-06 Thread Brian Evans 
commit: 52e20370c0d974fb1452c29d755b738b6a8b0523
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Dec  6 17:26:42 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Fri Dec  6 17:27:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52e20370

dev-lang/php: Fix locating iODBC for use with PDO

Closes: https://bugs.gentoo.org/702106
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/files/php-iodbc-header-location.patch | 14 
 dev-lang/php/php-7.4.0.ebuild  | 26 +-
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/dev-lang/php/files/php-iodbc-header-location.patch 
b/dev-lang/php/files/php-iodbc-header-location.patch
new file mode 100644
index 000..e34f09b6ec8
--- /dev/null
+++ b/dev-lang/php/files/php-iodbc-header-location.patch
@@ -0,0 +1,14 @@
+diff -aurN a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4
+--- a/ext/pdo_odbc/config.m4   2019-11-26 15:13:39.0 -0500
 b/ext/pdo_odbc/config.m4   2019-12-06 10:39:56.296658492 -0500
+@@ -85,6 +85,10 @@
+ PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir"
+   fi
+ 
++  if test "$pdo_odbc_def_lib" = "iodbc" ; then
++PDO_ODBC_INCDIR="$PDO_ODBC_INCDIR/iodbc"
++  fi
++
+   AC_MSG_RESULT([$pdo_odbc_flavour
+   libs   $PDO_ODBC_LIBDIR,
+   headers$PDO_ODBC_INCDIR])

diff --git a/dev-lang/php/php-7.4.0.ebuild b/dev-lang/php/php-7.4.0.ebuild
index 9f8615b21e6..fbf13a93f6b 100644
--- a/dev-lang/php/php-7.4.0.ebuild
+++ b/dev-lang/php/php-7.4.0.ebuild
@@ -150,6 +150,8 @@ BDEPEND="virtual/pkgconfig"
 
 PHP_MV="$(ver_cut 1)"
 
+PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" )
+
 php_install_ini() {
local phpsapi="${1}"
 
@@ -358,10 +360,25 @@ src_configure() {
fi
 
# ODBC support
-   our_conf+=(
-   $(use_with odbc unixODBC "${EPREFIX}/usr")
-   $(use_with iodbc)
-   )
+   if use odbc && use iodbc ; then
+   our_conf+=(
+   --without-unixODBC
+   --with-iodbc
+   $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+   )
+   elif use odbc ; then
+   our_conf+=(
+   --with-unixODBC="${EPREFIX}/usr"
+   --without-iodbc
+   $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+   )
+   else
+   our_conf+=(
+   --without-unixODBC
+   --without-iodbc
+   --without-pdo-odbc
+   )
+   fi
 
# Oracle support
our_conf+=( $(use_with oci8-instant-client oci8) )
@@ -374,7 +391,6 @@ src_configure() {
$(use_with postgres pdo-pgsql)
$(use_with sqlite pdo-sqlite)
$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-   $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
$(use_with oci8-instant-client pdo-oci)
)
fi

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2018-12-06 Thread Thomas Deutschmann 
commit: 44841df440d27a047fb34a5ebd1db9862a5bf6a4
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Dec  7 00:01:09 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Dec  7 00:01:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44841df4

dev-lang/php: bump to v7.0.33

- EAPI bump to EAPI=7

- Add compatibility with ICU >= 61

Bug: https://bugs.gentoo.org/668000
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-lang/php/Manifest  |   1 +
 ...php-7.0.33-intl-detect-icu-via-pkg-config.patch | 159 +
 .../php-7.0.33-intl-icu-memory-corruption.patch|  91 +++
 .../files/php-7.0.33-intl-use-icu-namespace.patch  | 369 ++
 dev-lang/php/php-7.0.33.ebuild | 754 +
 5 files changed, 1374 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 70aef5427e6..daea28268f7 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -2,6 +2,7 @@ DIST php-5.6-openssl-1.1-compatibility.patch 42559 BLAKE2B 
b7f13866cd85455431439
 DIST php-5.6.38.tar.xz 12467408 BLAKE2B 
d9ee47e193d80bce8a9ed6ffd3eb13e67ba6d1f597ece2803cd92fddc6245f46cdfe644d6cda12a6bb409b92c1fe748610cc5eb43dea0bf063fda81188ee8b3d
 SHA512 
66c51a8e954b1496c0bad0a2864a2a1537dd1c1c573b553991d6d5bce85fc7bc340e56a21109bc5e9a03799e703204b980b569c95a5c0a1bddb01c8947e7a682
 DIST php-5.6.39.tar.xz 12467096 BLAKE2B 
354b147c0fcc13eeec0ab333bcaa32ad26e2f4eef19a0ee52cf596ff96997eaf32cbb6d980cacf643167ed01b06ee9d27eeb7c00c95c8023d305c967c1ce3539
 SHA512 
814ea2d74df9c3c7041769803ceb4ba20dbfc18885ff85f91dca0c3ab694e3ebfb6a564427d116b35382fe292583a54d449f2528495032ca9724cfbdea82c226
 DIST php-7.0.32.tar.xz 12030780 BLAKE2B 
0c277eac4c931a6e30954cceb7feef8dea1c3ef4aebac91779b7e1a6f90f608faa93d1750a2dc8f354c73304e0f7a9b9ac17bb0d1da4768ddb68925752c11aef
 SHA512 
4a7c9a6b91ad7da69303916202062d639e6f02dcd483e851a44d8c7a2efeb5c9a666097935ab60d700c4445f86a0c68df1515300c57af1cdb76528b54b757608
+DIST php-7.0.33.tar.xz 12033040 BLAKE2B 
cb7a4eb3ba8ede93ae8e85b6a11664f33654f7e94fa077ac9a33ab95157c0c2b3b05f98413e13e36f710c6d00b35d49d38bf26092a36e508b88805d092764287
 SHA512 
9298e185702ea801e9243671ecb0b781c2b04181a2f9fd6490bc14897a333a2c0cc88fe27b0c69c6dd0079629a71c330ed1aa337f48cac6cbd624addb8855500
 DIST php-7.1.22.tar.xz 12227848 BLAKE2B 
72fab94b1c7ecfd3479f6d6c9a76a9d8813f7789402664201615d79ab8b5bb26fb1b7273769c4898a36f0336e0ce4d50bf2f17b81ddb54acc9583e39623e3a5b
 SHA512 
0fc0907d303711dbc4ba0a18618e3e73550c73d13988c769f8d50066017b1efe3feb0d22d5539f69271ea4e9532a3d997e22841cb59bdbf96313169e1c03538d
 DIST php-7.1.23.tar.xz 12227528 BLAKE2B 
d03470b07ae041c4677e100c1b4f7994d3e15d4830eccba3c654c1f3546345c8205cac057011d2d43ab962ebbc01652f6748270daa40aa1e540453923500288c
 SHA512 
d5a451f1a48415175e3117ffa84ef3504275a407698b59c13eeb403958aa27342e04dc4ffea9791b923ac0cc5d6fdacf2e8672f0e19755bae858707c7fc3627f
 DIST php-7.1.24.tar.xz 12205112 BLAKE2B 
d4dd8bdd980cbb2c8cd813cad44da7a322d75641bb5f4eb986f6be44acf61898e64e43a3206da08b6c68fb1213a95cf5c6bf28bc75356d9abd9711330fa04554
 SHA512 
ee54d04fa1bb049807e7876baf6a4d12ab8360367bb44ac77c71e53ee8ca078342b4a86f2bc4587838ead27fb8204fea8e739bd582a9e146513ae5d465e59202

diff --git a/dev-lang/php/files/php-7.0.33-intl-detect-icu-via-pkg-config.patch 
b/dev-lang/php/files/php-7.0.33-intl-detect-icu-via-pkg-config.patch
new file mode 100644
index 000..d23ec91fc83
--- /dev/null
+++ b/dev-lang/php/files/php-7.0.33-intl-detect-icu-via-pkg-config.patch
@@ -0,0 +1,159 @@
+Based on the following upstream commits:
+
+https://github.com/php/php-src/commit/9a8e7b571896f39f83cb000fdb7c466b6d328d52
+https://github.com/php/php-src/pull/3701
+https://github.com/php/php-src/commit/2bd299f7318492fd7e5cafffa562d76ba60e69d4
+
+--- a/acinclude.m4
 b/acinclude.m4
+@@ -2205,49 +2205,16 @@ dnl
+ dnl Common setup macro for ICU
+ dnl
+ AC_DEFUN([PHP_SETUP_ICU],[
+-  PHP_ARG_WITH(icu-dir,,
+-  [  --with-icu-dir=DIR  Specify where ICU libraries and headers can be 
found], DEFAULT, no)
++  PKG_CHECK_MODULES([ICU], [icu-io >= 50.1])
+ 
+-  if test "$PHP_ICU_DIR" = "no"; then
+-PHP_ICU_DIR=DEFAULT
+-  fi
+-
+-  if test "$PHP_ICU_DIR" = "DEFAULT"; then
+-dnl Try to find icu-config
+-AC_PATH_PROG(ICU_CONFIG, icu-config, no, [$PATH:/usr/local/bin])
+-  else
+-ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config"
+-  fi
+-
+-  AC_MSG_CHECKING([for location of ICU headers and libraries])
+-
+-  dnl Trust icu-config to know better what the install prefix is..
+-  icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null`
+-  if test "$?" != "0" || test -z "$icu_install_prefix"; then
+-AC_MSG_RESULT([not found])
+-AC_MSG_ERROR([Unable to detect ICU prefix or $ICU_CONFIG failed. Please 
verify ICU install prefix and make sure icu-config works.])
+-  else
+-AC_MSG_RESULT([$icu_install_prefix])
+-
+-dnl Check ICU version
+-

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2018-04-04 Thread Brian Evans 
commit: 8187eb32d10a53a0c837eadb02625329310b3582
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Apr  4 13:20:44 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Apr  4 13:21:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8187eb32

dev-lang/php: Fix compilation with dev-libs/oniguruma-6.8.1

Include upstream patch for all 7.0 versions
Limit version in 5.6.35-r1 as the patch is not the same there

Closes: https://bugs.gentoo.org/652352
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-lang/php/files/mbstring-oniguruma-6.8.patch| 30 ++
 .../{php-5.6.35.ebuild => php-5.6.35-r1.ebuild}|  2 +-
 dev-lang/php/php-7.0.27.ebuild |  2 ++
 dev-lang/php/php-7.0.28.ebuild |  2 ++
 dev-lang/php/php-7.0.29.ebuild |  2 ++
 dev-lang/php/php-7.1.13.ebuild |  2 ++
 dev-lang/php/php-7.1.14.ebuild |  2 ++
 dev-lang/php/php-7.1.15.ebuild |  2 ++
 dev-lang/php/php-7.1.16.ebuild |  2 ++
 dev-lang/php/php-7.2.4.ebuild  |  2 ++
 10 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/dev-lang/php/files/mbstring-oniguruma-6.8.patch 
b/dev-lang/php/files/mbstring-oniguruma-6.8.patch
new file mode 100644
index 000..c238f88007c
--- /dev/null
+++ b/dev-lang/php/files/mbstring-oniguruma-6.8.patch
@@ -0,0 +1,30 @@
+From 4072b2787074ee8e247a6639585b49e10c5a55fe Mon Sep 17 00:00:00 2001
+From: "Christoph M. Becker" 
+Date: Tue, 20 Mar 2018 16:35:39 +0100
+Subject: [PATCH] Fix #76113: mbstring does not build with Oniguruma 6.8.1
+
+As of Oniguruma 6.8.1, the regex structure has been moved from the
+public `oniguruma.h` to the private `regint.h`.  Thus, it is no longer
+possible to directly access the struct's members, and actually, there
+is no need to, since there are respective accessor functions available
+at least of 2.3.1.
+---
+ ext/mbstring/php_mbregex.c | 2 +-
+ 1 file changed, 1 insertions(+), 1 deletion(-)
+
+diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
+index a5a6cd0..7a70c63 100644
+--- a/ext/mbstring/php_mbregex.c
 b/ext/mbstring/php_mbregex.c
+@@ -452,7 +452,7 @@ static php_mb_regex_t *php_mbregex_compile_pattern(const 
char *pattern, int patl
+   OnigUChar err_str[ONIG_MAX_ERROR_MESSAGE_LEN];
+ 
+   rc = zend_hash_str_find_ptr((ht_rc), (char *)pattern, patlen);
+-  if (!rc || rc->options != options || rc->enc != enc || rc->syntax != 
syntax) {
++  if (!rc || onig_get_options(rc) != options || onig_get_encoding(rc) != 
enc || onig_get_syntax(rc) != syntax) {
+   if ((err_code = onig_new(, (OnigUChar *)pattern, 
(OnigUChar *)(pattern + patlen), options, enc, syntax, _info)) != 
ONIG_NORMAL) {
+   onig_error_code_to_str(err_str, err_code, _info);
+   php_error_docref(NULL, E_WARNING, "mbregex compile err: 
%s", err_str);
+-- 
+2.1.4
+

diff --git a/dev-lang/php/php-5.6.35.ebuild b/dev-lang/php/php-5.6.35-r1.ebuild
similarity index 99%
rename from dev-lang/php/php-5.6.35.ebuild
rename to dev-lang/php/php-5.6.35-r1.ebuild
index 0cbd2484dc0..ebf59c207d5 100644
--- a/dev-lang/php/php-5.6.35.ebuild
+++ b/dev-lang/php/php-5.6.35-r1.ebuild
@@ -113,7 +113,7 @@ COMMON_DEPEND="
!gd? (
virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
)
-   unicode? ( dev-libs/oniguruma:= )
+   unicode? ( =dev-libs/libxml2-2.6.8 )
xml? ( >=dev-libs/libxml2-2.6.8 )

diff --git a/dev-lang/php/php-7.0.27.ebuild b/dev-lang/php/php-7.0.27.ebuild
index 07116183964..88d8e93bc68 100644
--- a/dev-lang/php/php-7.0.27.ebuild
+++ b/dev-lang/php/php-7.0.27.ebuild
@@ -163,6 +163,8 @@ REQUIRED_USE="
mysql? ( || ( mysqli pdo ) )
 "
 
+PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+
 PHP_MV="$(get_major_version)"
 
 php_install_ini() {

diff --git a/dev-lang/php/php-7.0.28.ebuild b/dev-lang/php/php-7.0.28.ebuild
index 889e707ffc3..7964fdcd189 100644
--- a/dev-lang/php/php-7.0.28.ebuild
+++ b/dev-lang/php/php-7.0.28.ebuild
@@ -163,6 +163,8 @@ REQUIRED_USE="
mysql? ( || ( mysqli pdo ) )
 "
 
+PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+
 PHP_MV="$(get_major_version)"
 
 php_install_ini() {

diff --git a/dev-lang/php/php-7.0.29.ebuild b/dev-lang/php/php-7.0.29.ebuild
index 45b3218e4f6..ec866bd84ba 100644
--- a/dev-lang/php/php-7.0.29.ebuild
+++ b/dev-lang/php/php-7.0.29.ebuild
@@ -163,6 +163,8 @@ REQUIRED_USE="
mysql? ( || ( mysqli pdo ) )
 "
 
+PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+
 PHP_MV="$(get_major_version)"
 
 php_install_ini() {

diff --git a/dev-lang/php/php-7.1.13.ebuild b/dev-lang/php/php-7.1.13.ebuild
index 4fc386497f8..65425f9dc6a 100644
--- a/dev-lang/php/php-7.1.13.ebuild
+++ b/dev-lang/php/php-7.1.13.ebuild
@@ -145,6 +145,8 @@ REQUIRED_USE="
mysql? (

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2016-12-19 Thread Brian Evans 
commit: 7bae326257cf5f821527ca7e5289996c0b909db3
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Dec 19 18:39:47 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Dec 19 18:44:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bae3262

dev-lang/php: Drop 5.5 slot

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-lang/php/Manifest  |   2 -
 dev-lang/php/files/php-fpm-r1.conf | 311 ---
 dev-lang/php/php-5.5.37.ebuild | 784 
 dev-lang/php/php-5.5.38.ebuild | 791 -
 4 files changed, 1888 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index c228e72..0ab30d7 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,5 +1,3 @@
-DIST php-5.5.37.tar.bz2 13699851 SHA256 
d2380ebe46caf17f2c4cd055867d00a82e6702dc5f62dc29ce864a5742905d88 SHA512 
d2da921f3efd858e1cb8004873e377ca9c5821d5269d5b8e7c9be830b183f4d18f737b14653f65a43c0957bdca994e09a476d77e3a29a11e357abc24618c4c0f
 WHIRLPOOL 
8db12b1d090bc1bfb3f5b20c661ba05588b8f988484d1887a959f943dd6f1756cb62bac811c809af516e6c3582b64388443546a3b4a17f0527a69fcbafc0452c
-DIST php-5.5.38.tar.xz 11077780 SHA256 
cb527c44b48343c8557fe2446464ff1d4695155a95601083e5d1f175df95580f SHA512 
c2cdb18b2c9edaeff66591e8f58f8ff488260f537cdf9ce09820c163f20ff5209c0def89343d429932c9506ad4ef3daacf224946dac1c59622501092483f30c6
 WHIRLPOOL 
4380c1daa39f04f90d1457152e366720b295e96aba6859625c6b375a3785b4e0f30fea590c1ee1edb439c2a405446526c702a003d68ea6c817ab8684068a7581
 DIST php-5.6.28.tar.xz 12441072 SHA256 
07187ba2870f89cef334cd2ad6cb801aeec5eaf283da0293a9a6be75d6786d11 SHA512 
3af54c0533bba23fa74c3815143cb27890900d8b0726ba8ae99a5f7dde4b5411e8eb7f559f73cf41559f11437036da70c7842b64fe4fab00d40cf7c35cd1
 WHIRLPOOL 
6b288cbb8bb005360b67fe998bf024674d685399fa411c03f5feb39a285a639012864c66ab166e2cdb6d468b59c5114f245b172813b5edd384cee598d488306a
 DIST php-5.6.29.tar.xz 12444988 SHA256 
0ff352a433f73e2c82b0d5b283b600402518569bf72a74e247f356dacbf322a7 SHA512 
cb0d5eee5e705da270650439075ecacc8c3edc4f198ff96fb5ae6d63e999d5dbf65d3e45e52cd3e65f808a9ab91212a9ac5234d44a92daae683b8191d2b59619
 WHIRLPOOL 
28887945283a418d9b54378387927585a0d38718dabd650a999c3353315f428c0a46856097f056594f79f0ef7da10446a0fcb96762f4335d2afe8242f693370a
 DIST php-7.0.14.tar.xz 12534712 SHA256 
0f1dff6392a1cc2ed126b9695f580a2ed77eb09d2c23b41cabfb41e6f27a8c89 SHA512 
321d07c89873fadcf5a4edf38323cd9e350fb06f9954a16ea2e1b9341590f1047b78d69818d80b376cd8e9f92ed9c3132b79bd5832a3ded99b78d87c291fb9a5
 WHIRLPOOL 
8283f14e02c763974cc5b9c24cca475030cbfaba8bb667d5e81b41ba9e2de42afd2364c586afbfc688bad03cd3b8de1399036064b8500a5afe614114fcbbe989

diff --git a/dev-lang/php/files/php-fpm-r1.conf 
b/dev-lang/php/files/php-fpm-r1.conf
deleted file mode 100644
index 0b0a7f8..
--- a/dev-lang/php/files/php-fpm-r1.conf
+++ /dev/null
@@ -1,311 +0,0 @@
-;
-; FPM Configuration ;
-;
-
-; All relative paths in this configuration file are relative to PHP's install
-; prefix (/usr/lib/php5.3). This prefix can be dynamicaly changed by using the
-; '-p' argument from the command line.
-
-; Include one or more files. If glob(3) exists, it is used to include a bunch 
of
-; files from a glob(3) pattern. This directive can be used everywhere in the
-; file.
-; Relative path can also be used. They will be prefixed by:
-;  - the global prefix if it's been set (-p arguement)
-;  - /usr/lib/php5.3 otherwise
-;include=/etc/php/fpm-php5.3/fpm.d/*.conf
-
-;;
-; Global Options ;
-;;
-
-[global]
-; Pid file
-; Note: the default prefix is /var/lib
-; Default Value: none
-; Warning: pid file is overriden by the Gentoo init script.
-; FPM will refuse to start if you uncomment this settingi and make use of the
-; init script. 
-; pid = /var/run/php-fpm.pid
-
-; Error log file
-; Note: the default prefix is /var/lib
-; Default Value: log/php-fpm.log
-error_log = /var/log/php-fpm.log
-
-; Log level
-; Possible Values: alert, error, warning, notice, debug
-; Default Value: notice
-;log_level = notice
-
-; If this number of child processes exit with SIGSEGV or SIGBUS within the time
-; interval set by emergency_restart_interval then FPM will restart. A value
-; of '0' means 'Off'.
-; Default Value: 0
-;emergency_restart_threshold = 0
-
-; Interval of time used by emergency_restart_interval to determine when 
-; a graceful restart will be initiated.  This can be useful to work around
-; accidental corruptions in an accelerator's shared memory.
-; Available Units: s(econds), m(inutes), h(ours), or d(ays)
-; Default Unit: seconds
-; Default Value: 0
-;emergency_restart_interval = 0
-
-; Time limit for child processes to wait for a reaction on signals from master.
-; Available units: s(econds), m(inutes), h(ours), or d(ays)
-; Default Unit: seconds
-; Default Value: 0
-;process_control_timeout = 0
-
-; Send FPM to

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2016-10-26 Thread Brian Evans 
commit: dc37e4baa6900d5e31ab8302352033724785540d
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Oct 26 14:52:31 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Oct 26 14:52:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc37e4ba

dev-lang/php: Drop security vulnerable ~arch versions

Package-Manager: portage-2.3.2

 dev-lang/php/Manifest |   1 -
 dev-lang/php/files/fix-x86-build-bug_571658.patch |  51 --
 dev-lang/php/php-5.6.26-r2.ebuild | 777 --
 dev-lang/php/php-7.0.11-r2.ebuild | 768 -
 4 files changed, 1597 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index b066746..4e8c612 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -2,5 +2,4 @@ DIST php-5.5.37.tar.bz2 13699851 SHA256 
d2380ebe46caf17f2c4cd055867d00a82e6702dc
 DIST php-5.5.38.tar.xz 11077780 SHA256 
cb527c44b48343c8557fe2446464ff1d4695155a95601083e5d1f175df95580f SHA512 
c2cdb18b2c9edaeff66591e8f58f8ff488260f537cdf9ce09820c163f20ff5209c0def89343d429932c9506ad4ef3daacf224946dac1c59622501092483f30c6
 WHIRLPOOL 
4380c1daa39f04f90d1457152e366720b295e96aba6859625c6b375a3785b4e0f30fea590c1ee1edb439c2a405446526c702a003d68ea6c817ab8684068a7581
 DIST php-5.6.26.tar.xz 12412992 SHA256 
203a854f0f243cb2810d1c832bc871ff133eccdf1ff69d32846f93bc1bef58a8 SHA512 
06ef6990c1ab6ef3c94157b72039ddbc40a8373b8f38c88ec4dfa771fcd422a0673ff5f6cbf3cf67a0fb10bedd8b9fa85aa95e08abb0d74163a90a322a1d8c24
 WHIRLPOOL 
11b183089a43bfad1ee787bd2512faf8d4611916cdfe348fb8ba3a2c2d35d560dcd38656e3a5b3ee98efb649e9f7ab219a89da7a72c163270760ad44a64bba09
 DIST php-5.6.27.tar.xz 12439168 SHA256 
16eb544498339d1d855292826e2e547ab01a31600141094959073e5e10e93ab5 SHA512 
e9fdcf0feaa94d385459124e58694d69afcfe8d34ebdd10bfce5bf5828b7c20e7eb92ca75282be8eaef2bdfad0a0f25424fbf9eb9d2f77584f8a80d43f178bf7
 WHIRLPOOL 
3a942e408ede25daa2f4cb52337a26ccfce7724f2c401ea903e2fa152eef7b25e0ed0a22f53371a7145e8b043894ce5c145b29879de93f01c64c315113b3698d
-DIST php-7.0.11.tar.xz 12258500 SHA256 
d4cccea8da1d27c11b89386f8b8e95692ad3356610d571253d00ca67d524c735 SHA512 
4d7df513a61489ecb1c3a963fbb76ad8e15b88fa134f52295a5339c900f7b2f98e547a3e479b8061dd4ff3c5f90cd62e3c39ec208d7de03b6146501e60500d5e
 WHIRLPOOL 
d9867f282df9a86efecb77c44f22a403598dc950b8ae2343000517fdb69890073bd78fbe7d1ee26be41459aefb3336a6508d6dd75b915859533e124b21b4e453
 DIST php-7.0.12.tar.xz 12520004 SHA256 
f3d6c49e1c242e5995dec15e503fde996c327eb86cd7ec45c690e93c971b83ff SHA512 
0bb29da6c70ee7e0a8e23d2027be31498d521dda834f55da59e35767b169226612d4e30fb141c7354b1597e3814ce52a476d928ccd098ab246b391b7e982630d
 WHIRLPOOL 
3b6e95532d2c128980d9e8da6a34e99491d7f3b9e12a68138362253d3e0b78dc0a85c5c563ab6c03c72425ec7a86bf92042ee4ffeb1935608b3d1816f68d1ee9

diff --git a/dev-lang/php/files/fix-x86-build-bug_571658.patch 
b/dev-lang/php/files/fix-x86-build-bug_571658.patch
deleted file mode 100644
index 46f68b6..
--- a/dev-lang/php/files/fix-x86-build-bug_571658.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 2fcc388d9bf238673ed84b8f38d7753279aea48c Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky 
-Date: Thu, 4 Aug 2016 11:42:56 -0400
-Subject: [PATCH 1/1] Zend/zend_operators.h: disable x86 assembly on all newer
- GCC-4.x.
-
-In bug 69896, a fix was committed to work around a build error: 'asm'
-operand has impossible constraints, in zend_operators.h, on x86. At
-the time, the problem was only visible with gcc-4.8, and the fix was
-to disable that chunk of assembly for gcc-4.8. With gcc-4.9, the
-problem persists, so we now need to check for gcc-4.9 (at least) in
-addition to gcc-4.8.
-
-This commit modifies the earlier conditional that checks for
-gcc-4.8. The existing check was for equality on the minor component of
-the gcc version, namely 8. The == operator that performs the
-comparison has been changed to <=, so that it catches any gcc-4.x with
-x >= 8. This has been tested and fixes the build on x86 hardware with
-gcc-4.9.
-
-PHP-Bug: 69896
-Gentoo-Bug: 571658

- Zend/zend_operators.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
-index 3705022..dd7c354 100644
 a/Zend/zend_operators.h
-+++ b/Zend/zend_operators.h
-@@ -520,7 +520,7 @@ static zend_always_inline void 
fast_long_decrement_function(zval *op1)
- 
- static zend_always_inline void fast_long_add_function(zval *result, zval 
*op1, zval *op2)
- {
--#if defined(__GNUC__) && defined(__i386__) && !(4 == __GNUC__ && 8 == 
__GNUC_MINOR__)
-+#if defined(__GNUC__) && defined(__i386__) && !(4 == __GNUC__ && 8 <= 
__GNUC_MINOR__)
-   __asm__(
-   "movl   (%1), %%eax\n\t"
-   "addl   (%2), %%eax\n\t"
-@@ -606,7 +606,7 @@ static zend_always_inline int fast_add_function(zval 
*result, zval *op1, zval *o
- 
- static zend_always_inline void fast_long_sub_function(zval *result,

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2016-08-04 Thread Michael Orlitzky 
commit: 36626b1d255da79d9e52bbd907ec579b9efa93c5
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Aug  4 16:47:29 2016 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Aug  4 18:59:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36626b1d

dev-lang/php: new 7.x revision to fix the build on x86.

There is an upstream bug that causes the build to fail on x86 with
gcc-4.9. There was an earlier fix for gcc-4.8, and this new revision
has a fix that also works for gcc-4.9.

And, since we're no longer inheriting depend.apache.eclass, I was
finally able to update the ebuild to EAPI=6.

A redundant earlier ebuild for php-7.0.9 was also removed.

Gentoo-Bug: 571658

Package-Manager: portage-2.2.28

 dev-lang/php/files/fix-x86-build-bug_571658.patch  |  51 ++
 .../{php-7.0.9-r1.ebuild => php-7.0.9-r2.ebuild}   |  12 +-
 dev-lang/php/php-7.0.9.ebuild  | 808 -
 3 files changed, 58 insertions(+), 813 deletions(-)

diff --git a/dev-lang/php/files/fix-x86-build-bug_571658.patch 
b/dev-lang/php/files/fix-x86-build-bug_571658.patch
new file mode 100644
index 000..46f68b6
--- /dev/null
+++ b/dev-lang/php/files/fix-x86-build-bug_571658.patch
@@ -0,0 +1,51 @@
+From 2fcc388d9bf238673ed84b8f38d7753279aea48c Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky 
+Date: Thu, 4 Aug 2016 11:42:56 -0400
+Subject: [PATCH 1/1] Zend/zend_operators.h: disable x86 assembly on all newer
+ GCC-4.x.
+
+In bug 69896, a fix was committed to work around a build error: 'asm'
+operand has impossible constraints, in zend_operators.h, on x86. At
+the time, the problem was only visible with gcc-4.8, and the fix was
+to disable that chunk of assembly for gcc-4.8. With gcc-4.9, the
+problem persists, so we now need to check for gcc-4.9 (at least) in
+addition to gcc-4.8.
+
+This commit modifies the earlier conditional that checks for
+gcc-4.8. The existing check was for equality on the minor component of
+the gcc version, namely 8. The == operator that performs the
+comparison has been changed to <=, so that it catches any gcc-4.x with
+x >= 8. This has been tested and fixes the build on x86 hardware with
+gcc-4.9.
+
+PHP-Bug: 69896
+Gentoo-Bug: 571658
+---
+ Zend/zend_operators.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
+index 3705022..dd7c354 100644
+--- a/Zend/zend_operators.h
 b/Zend/zend_operators.h
+@@ -520,7 +520,7 @@ static zend_always_inline void 
fast_long_decrement_function(zval *op1)
+ 
+ static zend_always_inline void fast_long_add_function(zval *result, zval 
*op1, zval *op2)
+ {
+-#if defined(__GNUC__) && defined(__i386__) && !(4 == __GNUC__ && 8 == 
__GNUC_MINOR__)
++#if defined(__GNUC__) && defined(__i386__) && !(4 == __GNUC__ && 8 <= 
__GNUC_MINOR__)
+   __asm__(
+   "movl   (%1), %%eax\n\t"
+   "addl   (%2), %%eax\n\t"
+@@ -606,7 +606,7 @@ static zend_always_inline int fast_add_function(zval 
*result, zval *op1, zval *o
+ 
+ static zend_always_inline void fast_long_sub_function(zval *result, zval 
*op1, zval *op2)
+ {
+-#if defined(__GNUC__) && defined(__i386__) && !(4 == __GNUC__ && 8 == 
__GNUC_MINOR__)
++#if defined(__GNUC__) && defined(__i386__) && !(4 == __GNUC__ && 8 <= 
__GNUC_MINOR__)
+   __asm__(
+   "movl   (%1), %%eax\n\t"
+   "subl   (%2), %%eax\n\t"
+-- 
+2.7.3
+

diff --git a/dev-lang/php/php-7.0.9-r1.ebuild b/dev-lang/php/php-7.0.9-r2.ebuild
similarity index 98%
rename from dev-lang/php/php-7.0.9-r1.ebuild
rename to dev-lang/php/php-7.0.9-r2.ebuild
index 3bb3c0e..1e440f6 100644
--- a/dev-lang/php/php-7.0.9-r1.ebuild
+++ b/dev-lang/php/php-7.0.9-r2.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils autotools flag-o-matic versionator libtool systemd
+inherit autotools flag-o-matic versionator libtool systemd
 
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="http://php.net/;
@@ -217,6 +217,9 @@ php_set_ini_dir() {
 }
 
 src_prepare() {
+   # Disable some assembly on x86.
+   eapply "${FILESDIR}/fix-x86-build-bug_571658.patch"
+
# Change PHP branding
# Get the alpha/beta/rc version
sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
@@ -234,11 +237,10 @@ src_prepare() {
|| die "Failed to fix heimdal crypt library reference"
fi
 
-   # Add user patches #357637
-   epatch_user
+   eapply_user
 
# Force rebuilding aclocal.m4
-   rm -f aclocal.m4 || die
+   rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
eautoreconf
 
if [[ ${CHOST} == *-darwin* ]] ; then

diff --git a/dev-lang/php/php-7.0.9.ebuild b/dev-lang/php/php-7.0.9.ebuild
deleted file mode 100644
index df705ca..000
--- a/dev-lang/php/php-7.0.9.ebuild
+++ /dev/null
@@

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2015-11-29 Thread Michael Orlitzky 
commit: ba1354676a85e91f49f3458ef151aa431a2151a5
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Nov 29 21:35:12 2015 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Nov 29 21:35:30 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba135467

dev-lang/php: version bump the 5.6.x series.

This is a straightforward version bump, and also removes a patch
against 5.6.15 that was fixed in 5.6.16.

Package-Manager: portage-2.2.20.1

 dev-lang/php/Manifest  |  2 +-
 .../php/files/fix-5.6.15-fpm-const-crash.patch | 59 --
 .../{php-5.6.15-r4.ebuild => php-5.6.16.ebuild}|  4 --
 3 files changed, 1 insertion(+), 64 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 19f3bbc..5b66646 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,7 +1,7 @@
 DIST php-5.4.45.tar.bz2 12703324 SHA256 
4e0d28b1554c95cfaea6fa2b64aac85433f158ce72bb571bcd5574f98f4c6582 SHA512 
ba22207da70e5e8ddf9a1f41bbeb54ef4917630006c3412db8f858782baaa3ff49d7e5ca59bed76c37fc11dc518c475b81f33f0f32c533c8f00be338e0b0d9c5
 WHIRLPOOL 
b34e465dd193e9c1f5dedd7c6f279bb10471e31120f2a84246927f160adb1e54ea56563c719e59ed0654e2fd0805cebcc00198d6f6153791edef52fd0f2288a7
 DIST php-5.5.30.tar.bz2 13699702 SHA256 
e7332a713cecdd1cb44a1b1336739885c9789f633f0f51236b25e48ab03c3b29 SHA512 
9458126f579ace9e2aebdfa7ad7f8d097f1fd502f443d8fd66263ba3c542d579ca9c705e227725fae57e452649a3be7cb717a0330d339b93d3c6c94fa80dbc1f
 WHIRLPOOL 
2aa6c61a48a231d81f6c746f94e42589d87b93d0526f02d6d15f731cbbca4aecdee84b443f7ec1891f2a524939c542ac6f94e15db90a23a8b19523463025d395
 DIST php-5.6.14.tar.bz2 14073920 SHA256 
36f295f11641c1839a5df00e693f685fd134c65e8a1d46e8ee0abae8662b2eb0 SHA512 
af0c7fa5c7be15839b1189b2544ff725b935228030087c206f83727e7885750030b10bf2bfbd27adea6f18af90d4ecd3ced9defec88c5f98f7ed26b4e4c57981
 WHIRLPOOL 
8e31fc3dbeb22fa2a59112d2dcbe28f8102c8d5a14fd716d17f909399c06d27a10ea32d43ebd1a12cea78d9fd949ae7c7882628ae0c3abd7354d165107fa0c9d
-DIST php-5.6.15.tar.bz2 14060562 SHA256 
11a0645c4d4b749e256da1e0d6df89dd886b5b06b83c914d942653661dbd1c38 SHA512 
3841b1b64bbe1b3bdbbbf2591f2ca81754f1e7391dae593f45302ea7a4157dd8032e0f525308a13769938aadbfca9e25cbe15ac9bf8eed1427263fefcbede2aa
 WHIRLPOOL 
6d5a6b860d0db887c09d1bfb8304a39d44f1c5966bab3f881c277e3aa0331cd794f1bff02cbac2bdba23fd9bc4fe71a8e1d4b51cbb4c1dfe1ceadca15ec38665
+DIST php-5.6.16.tar.bz2 14066209 SHA256 
4fe6f40964c1bfaba05fc144ba20a2cdad33e11685f4f101ea5a48b98bbcd2ae SHA512 
08ceb48277785e2075a1bd8035cb32eb8bdddeff6695734d3f1f0721415beddc58413257a490852a93df445d2d342badea46801e46d96f0b85517124ba4020c9
 WHIRLPOOL 
d8669398d03288e9cf0f519a2e76eeb6b7e79f85f60b9f9fbdcc40ae313a3d9fa01b9f173cd354ab8b328b7178a433f54e4f0cf06152ec023c11f00bb98cc5b0
 DIST php-7.0.0RC7.tar.bz2 13472595 SHA256 
0b1773df54b2ed2aaa8ed04188d02fa28189045f8893c3b59afd8aacf9a7db9c SHA512 
58d03d83f2dd5dabcb468df42b3b31502dcdedca2463f7cbd9609ef611fe3bf7a64cc78505b52b2c7c6bf859a66ee6bc887462d1c5557edfe99ee83f398c2e47
 WHIRLPOOL 
624e7b606ff5f5a36140167538c7a224ff61c4a8639f348a3848d8fda6260a72d06707d055d7727417477067bd0346f631235f5dc68541a549747ca72b2570c9
 DIST php-7.0.0RC8.tar.bz2 13975805 SHA256 
8c46621e80b610749d2d31439e9b6db7b881c0249d1df1f4c3e05fdd46a2d108 SHA512 
5066966cd2e7f011c20a17a427b74db84c74035182b4de1d991d2b76060a33c84da9b3b75dafc83fb40f0de0649ba0568454b90d48e4b2356524bc6ff0444138
 WHIRLPOOL 
6b1f8192f83250b140c39e266c74f428f1f7258f8128483380656a3139b6344a66637bec87a4cfe593bc0f3df8cfde5b3f562f96dbfb83c8a5d8acf9fc2838a8
 DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 
4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 
3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde
 WHIRLPOOL 
fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea

diff --git a/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch 
b/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch
deleted file mode 100644
index 29876a9..000
--- a/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 37ed0dafe47fb1053aee7822113bacc1f213337a Mon Sep 17 00:00:00 2001
-From: Xinchen Hui 
-Date: Mon, 2 Nov 2015 10:47:02 +0800
-Subject: [PATCH] Fixed bug #70828 (php-fpm 5.6 with opcache crashes when
- referencing a non-existent constant)
-

- NEWS |  2 ++
- Zend/tests/bug70828.phpt | 24 
- Zend/zend_compile.c  |  2 +-
- 3 files changed, 27 insertions(+), 1 deletion(-)
- create mode 100644 Zend/tests/bug70828.phpt
-
-diff --git a/Zend/tests/bug70828.phpt b/Zend/tests/bug70828.phpt
-new file mode 100644
-index 000..dd285b5
 /dev/null
-+++ b/Zend/tests/bug70828.phpt
-@@ -0,0 +1,24 @@
-+--TEST--
-+Bug #70828 (php-fpm 5.6 with opcache crashes when referencing a