commit:     6fb720cfe0c62387092106e1ec5c494ad82cc07f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 25 14:41:47 2021 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Oct 25 14:41:47 2021 +0000
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 <grknight <AT> 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 00000000000..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 <bu...@php.net>
+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(&tv1);
+ 
+@@ -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, &c->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;
+       }
+@@ -300,7 +300,7 @@ int fpm_request_last_activity(struct fpm_child_s *child, 
struct timeval *tv) /*
+ 
+       if (!tv) return -1;
+ 
+-      proc = fpm_scoreboard_proc_get(child->wp->scoreboard, 
child->scoreboard_i);
++      proc = fpm_scoreboard_proc_get_from_child(child);
+       if (!proc) {
+               return -1;
+       }
+diff --git a/sapi/fpm/fpm/fpm_scoreboard.c b/sapi/fpm/fpm/fpm_scoreboard.c
+index 328f999f0c..7e9da4d684 100644
+--- a/sapi/fpm/fpm/fpm_scoreboard.c
++++ b/sapi/fpm/fpm/fpm_scoreboard.c
+@@ -6,6 +6,7 @@
+ #include <time.h>
+ 
+ #include "fpm_config.h"
++#include "fpm_children.h"
+ #include "fpm_scoreboard.h"
+ #include "fpm_shm.h"
+ #include "fpm_sockets.h"
+@@ -23,7 +24,6 @@ static float fpm_scoreboard_tick;
+ int fpm_scoreboard_init_main() /* {{{ */
+ {
+       struct fpm_worker_pool_s *wp;
+-      unsigned int i;
+ 
+ #ifdef HAVE_TIMES
+ #if (defined(HAVE_SYSCONF) && defined(_SC_CLK_TCK))
+@@ -40,7 +40,7 @@ int fpm_scoreboard_init_main() /* {{{ */
+ 
+ 
+       for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
+-              size_t scoreboard_size, scoreboard_nprocs_size;
++              size_t scoreboard_procs_size;
+               void *shm_mem;
+ 
+               if (wp->config->pm_max_children < 1) {
+@@ -53,22 +53,15 @@ int fpm_scoreboard_init_main() /* {{{ */
+                       return -1;
+               }
+ 
+-              scoreboard_size        = sizeof(struct fpm_scoreboard_s) + 
(wp->config->pm_max_children) * sizeof(struct fpm_scoreboard_proc_s *);
+-              scoreboard_nprocs_size = sizeof(struct fpm_scoreboard_proc_s) * 
wp->config->pm_max_children;
+-              shm_mem                = fpm_shm_alloc(scoreboard_size + 
scoreboard_nprocs_size);
++              scoreboard_procs_size = sizeof(struct fpm_scoreboard_proc_s) * 
wp->config->pm_max_children;
++              shm_mem = fpm_shm_alloc(sizeof(struct fpm_scoreboard_s) + 
scoreboard_procs_size);
+ 
+               if (!shm_mem) {
+                       return -1;
+               }
+-              wp->scoreboard         = shm_mem;
++              wp->scoreboard = shm_mem;
++              wp->scoreboard->pm = wp->config->pm;
+               wp->scoreboard->nprocs = wp->config->pm_max_children;
+-              shm_mem               += scoreboard_size;
+-
+-              for (i = 0; i < wp->scoreboard->nprocs; i++, shm_mem += 
sizeof(struct fpm_scoreboard_proc_s)) {
+-                      wp->scoreboard->procs[i] = shm_mem;
+-              }
+-
+-              wp->scoreboard->pm          = wp->config->pm;
+               wp->scoreboard->start_epoch = time(NULL);
+               strlcpy(wp->scoreboard->pool, wp->config->name, 
sizeof(wp->scoreboard->pool));
+       }
+@@ -162,28 +155,48 @@ struct fpm_scoreboard_s *fpm_scoreboard_get() /* {{{*/
+ }
+ /* }}} */
+ 
+-struct fpm_scoreboard_proc_s *fpm_scoreboard_proc_get(struct fpm_scoreboard_s 
*scoreboard, int child_index) /* {{{*/
++static inline struct fpm_scoreboard_proc_s *fpm_scoreboard_proc_get_ex(
++              struct fpm_scoreboard_s *scoreboard, int child_index, unsigned 
int nprocs) /* {{{*/
+ {
+       if (!scoreboard) {
+-              scoreboard = fpm_scoreboard;
++              return NULL;
+       }
+ 
+-      if (!scoreboard) {
++      if (child_index < 0 || (unsigned int)child_index >= nprocs) {
+               return NULL;
+       }
+ 
++      return &scoreboard->procs[child_index];
++}
++/* }}} */
++
++struct fpm_scoreboard_proc_s *fpm_scoreboard_proc_get(
++              struct fpm_scoreboard_s *scoreboard, int child_index) /* {{{*/
++{
++      if (!scoreboard) {
++              scoreboard = fpm_scoreboard;
++      }
++
+       if (child_index < 0) {
+               child_index = fpm_scoreboard_i;
+       }
+ 
+-      if (child_index < 0 || (unsigned int)child_index >= scoreboard->nprocs) 
{
+-              return NULL;
+-      }
++      return fpm_scoreboard_proc_get_ex(scoreboard, child_index, 
scoreboard->nprocs);
++}
++/* }}} */
+ 
+-      return scoreboard->procs[child_index];
++struct fpm_scoreboard_proc_s *fpm_scoreboard_proc_get_from_child(struct 
fpm_child_s *child) /* {{{*/
++{
++      struct fpm_worker_pool_s *wp = child->wp;
++      unsigned int nprocs = wp->config->pm_max_children;
++      struct fpm_scoreboard_s *scoreboard = wp->scoreboard;
++      int child_index = child->scoreboard_i;
++
++      return fpm_scoreboard_proc_get_ex(scoreboard, child_index, nprocs);
+ }
+ /* }}} */
+ 
++
+ struct fpm_scoreboard_s *fpm_scoreboard_acquire(struct fpm_scoreboard_s 
*scoreboard, int nohang) /* {{{ */
+ {
+       struct fpm_scoreboard_s *s;
+@@ -234,28 +247,28 @@ void fpm_scoreboard_proc_release(struct 
fpm_scoreboard_proc_s *proc) /* {{{ */
+       proc->lock = 0;
+ }
+ 
+-void fpm_scoreboard_free(struct fpm_scoreboard_s *scoreboard) /* {{{ */
++void fpm_scoreboard_free(struct fpm_worker_pool_s *wp) /* {{{ */
+ {
+-      size_t scoreboard_size, scoreboard_nprocs_size;
++      size_t scoreboard_procs_size;
++      struct fpm_scoreboard_s *scoreboard = wp->scoreboard;
+ 
+       if (!scoreboard) {
+               zlog(ZLOG_ERROR, "**scoreboard is NULL");
+               return;
+       }
+ 
+-      scoreboard_size        = sizeof(struct fpm_scoreboard_s) + 
(scoreboard->nprocs) * sizeof(struct fpm_scoreboard_proc_s *);
+-      scoreboard_nprocs_size = sizeof(struct fpm_scoreboard_proc_s) * 
scoreboard->nprocs;
++      scoreboard_procs_size = sizeof(struct fpm_scoreboard_proc_s) * 
wp->config->pm_max_children;
+ 
+-      fpm_shm_free(scoreboard, scoreboard_size + scoreboard_nprocs_size);
++      fpm_shm_free(scoreboard, sizeof(struct fpm_scoreboard_s) + 
scoreboard_procs_size);
+ }
+ /* }}} */
+ 
+-void fpm_scoreboard_child_use(struct fpm_scoreboard_s *scoreboard, int 
child_index, pid_t pid) /* {{{ */
++void fpm_scoreboard_child_use(struct fpm_child_s *child, pid_t pid) /* {{{ */
+ {
+       struct fpm_scoreboard_proc_s *proc;
+-      fpm_scoreboard = scoreboard;
+-      fpm_scoreboard_i = child_index;
+-      proc = fpm_scoreboard_proc_get(scoreboard, child_index);
++      fpm_scoreboard = child->wp->scoreboard;
++      fpm_scoreboard_i = child->scoreboard_i;
++      proc = fpm_scoreboard_proc_get_from_child(child);
+       if (!proc) {
+               return;
+       }
+@@ -264,18 +277,22 @@ void fpm_scoreboard_child_use(struct fpm_scoreboard_s 
*scoreboard, int child_ind
+ }
+ /* }}} */
+ 
+-void fpm_scoreboard_proc_free(struct fpm_scoreboard_s *scoreboard, int 
child_index) /* {{{ */
++void fpm_scoreboard_proc_free(struct fpm_child_s *child) /* {{{ */
+ {
++      struct fpm_worker_pool_s *wp = child->wp;
++      struct fpm_scoreboard_s *scoreboard = wp->scoreboard;
++      int child_index = child->scoreboard_i;
++
+       if (!scoreboard) {
+               return;
+       }
+ 
+-      if (child_index < 0 || (unsigned int)child_index >= scoreboard->nprocs) 
{
++      if (child_index < 0 || child_index >= wp->config->pm_max_children) {
+               return;
+       }
+ 
+-      if (scoreboard->procs[child_index] && 
scoreboard->procs[child_index]->used > 0) {
+-              memset(scoreboard->procs[child_index], 0, sizeof(struct 
fpm_scoreboard_proc_s));
++      if (scoreboard->procs[child_index].used > 0) {
++              memset(&scoreboard->procs[child_index], 0, sizeof(struct 
fpm_scoreboard_proc_s));
+       }
+ 
+       /* set this slot as free to avoid search on next alloc */
+@@ -283,41 +300,44 @@ void fpm_scoreboard_proc_free(struct fpm_scoreboard_s 
*scoreboard, int child_ind
+ }
+ /* }}} */
+ 
+-int fpm_scoreboard_proc_alloc(struct fpm_scoreboard_s *scoreboard, int 
*child_index) /* {{{ */
++int fpm_scoreboard_proc_alloc(struct fpm_child_s *child) /* {{{ */
+ {
+       int i = -1;
++      struct fpm_worker_pool_s *wp = child->wp;
++      struct fpm_scoreboard_s *scoreboard = wp->scoreboard;
++      int nprocs = wp->config->pm_max_children;
+ 
+-      if (!scoreboard || !child_index) {
++      if (!scoreboard) {
+               return -1;
+       }
+ 
+       /* first try the slot which is supposed to be free */
+-      if (scoreboard->free_proc >= 0 && (unsigned int)scoreboard->free_proc < 
scoreboard->nprocs) {
+-              if (scoreboard->procs[scoreboard->free_proc] && 
!scoreboard->procs[scoreboard->free_proc]->used) {
++      if (scoreboard->free_proc >= 0 && scoreboard->free_proc < nprocs) {
++              if (!scoreboard->procs[scoreboard->free_proc].used) {
+                       i = scoreboard->free_proc;
+               }
+       }
+ 
+       if (i < 0) { /* the supposed free slot is not, let's search for a free 
slot */
+               zlog(ZLOG_DEBUG, "[pool %s] the proc->free_slot was not free. 
Let's search", scoreboard->pool);
+-              for (i = 0; i < (int)scoreboard->nprocs; i++) {
+-                      if (scoreboard->procs[i] && 
!scoreboard->procs[i]->used) { /* found */
++              for (i = 0; i < nprocs; i++) {
++                      if (!scoreboard->procs[i].used) { /* found */
+                               break;
+                       }
+               }
+       }
+ 
+       /* no free slot */
+-      if (i < 0 || i >= (int)scoreboard->nprocs) {
++      if (i < 0 || i >= nprocs) {
+               zlog(ZLOG_ERROR, "[pool %s] no free scoreboard slot", 
scoreboard->pool);
+               return -1;
+       }
+ 
+-      scoreboard->procs[i]->used = 1;
+-      *child_index = i;
++      scoreboard->procs[i].used = 1;
++      child->scoreboard_i = i;
+ 
+       /* supposed next slot is free */
+-      if (i + 1 >= (int)scoreboard->nprocs) {
++      if (i + 1 >= nprocs) {
+               scoreboard->free_proc = 0;
+       } else {
+               scoreboard->free_proc = i + 1;
+diff --git a/sapi/fpm/fpm/fpm_scoreboard.h b/sapi/fpm/fpm/fpm_scoreboard.h
+index 1fecde1d0f..9d5981e1c7 100644
+--- a/sapi/fpm/fpm/fpm_scoreboard.h
++++ b/sapi/fpm/fpm/fpm_scoreboard.h
+@@ -63,7 +63,7 @@ struct fpm_scoreboard_s {
+       unsigned int nprocs;
+       int free_proc;
+       unsigned long int slow_rq;
+-      struct fpm_scoreboard_proc_s *procs[];
++      struct fpm_scoreboard_proc_s procs[];
+ };
+ 
+ int fpm_scoreboard_init_main();
+@@ -72,18 +72,19 @@ int fpm_scoreboard_init_child(struct fpm_worker_pool_s 
*wp);
+ void fpm_scoreboard_update(int idle, int active, int lq, int lq_len, int 
requests, int max_children_reached, int slow_rq, int action, struct 
fpm_scoreboard_s *scoreboard);
+ struct fpm_scoreboard_s *fpm_scoreboard_get();
+ struct fpm_scoreboard_proc_s *fpm_scoreboard_proc_get(struct fpm_scoreboard_s 
*scoreboard, int child_index);
++struct fpm_scoreboard_proc_s *fpm_scoreboard_proc_get_from_child(struct 
fpm_child_s *child);
+ 
+ struct fpm_scoreboard_s *fpm_scoreboard_acquire(struct fpm_scoreboard_s 
*scoreboard, int nohang);
+ void fpm_scoreboard_release(struct fpm_scoreboard_s *scoreboard);
+ struct fpm_scoreboard_proc_s *fpm_scoreboard_proc_acquire(struct 
fpm_scoreboard_s *scoreboard, int child_index, int nohang);
+ void fpm_scoreboard_proc_release(struct fpm_scoreboard_proc_s *proc);
+ 
+-void fpm_scoreboard_free(struct fpm_scoreboard_s *scoreboard);
++void fpm_scoreboard_free(struct fpm_worker_pool_s *wp);
+ 
+-void fpm_scoreboard_child_use(struct fpm_scoreboard_s *scoreboard, int 
child_index, pid_t pid);
++void fpm_scoreboard_child_use(struct fpm_child_s *child, pid_t pid);
+ 
+-void fpm_scoreboard_proc_free(struct fpm_scoreboard_s *scoreboard, int 
child_index);
+-int fpm_scoreboard_proc_alloc(struct fpm_scoreboard_s *scoreboard, int 
*child_index);
++void fpm_scoreboard_proc_free(struct fpm_child_s *child);
++int fpm_scoreboard_proc_alloc(struct fpm_child_s *child);
+ 
+ #ifdef HAVE_TIMES
+ float fpm_scoreboard_get_tick();
+diff --git a/sapi/fpm/fpm/fpm_status.c b/sapi/fpm/fpm/fpm_status.c
+index 36d2240635..de8db9d61a 100644
+--- a/sapi/fpm/fpm/fpm_status.c
++++ b/sapi/fpm/fpm/fpm_status.c
+@@ -498,10 +498,10 @@ int fpm_status_handle_request(void) /* {{{ */
+ 
+                       first = 1;
+                       for (i=0; i<scoreboard_p->nprocs; i++) {
+-                              if (!scoreboard_p->procs[i] || 
!scoreboard_p->procs[i]->used) {
++                              if (!scoreboard_p->procs[i].used) {
+                                       continue;
+                               }
+-                              proc = *scoreboard_p->procs[i];
++                              proc = scoreboard_p->procs[i];
+ 
+                               if (first) {
+                                       first = 0;
+diff --git a/sapi/fpm/fpm/fpm_worker_pool.c b/sapi/fpm/fpm/fpm_worker_pool.c
+index d04528f4e0..65a9b226b1 100644
+--- a/sapi/fpm/fpm/fpm_worker_pool.c
++++ b/sapi/fpm/fpm/fpm_worker_pool.c
+@@ -54,7 +54,7 @@ static void fpm_worker_pool_cleanup(int which, void *arg) /* 
{{{ */
+               fpm_worker_pool_config_free(wp->config);
+               fpm_children_free(wp->children);
+               if ((which & FPM_CLEANUP_CHILD) == 0 && fpm_globals.parent_pid 
== getpid()) {
+-                      fpm_scoreboard_free(wp->scoreboard);
++                      fpm_scoreboard_free(wp);
+               }
+               fpm_worker_pool_free(wp);
+       }
+-- 
+2.25.1
+

diff --git a/dev-lang/php/php-7.3.31-r1.ebuild 
b/dev-lang/php/php-7.3.31-r1.ebuild
new file mode 100644
index 00000000000..68107492ff9
--- /dev/null
+++ b/dev-lang/php/php-7.3.31-r1.ebuild
@@ -0,0 +1,754 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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 ~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 +fileinfo +filter firebird
+       +flatfile ftp gd gdbm gmp +hash +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 recode selinux +session session-mm sharedmem
+       +simplexml snmp soap sockets sodium spell sqlite ssl
+       sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx 
webp
+       +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# 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.1[apache2?,fpm?]
+       >=dev-libs/libpcre2-10.30[jit?,unicode]
+       fpm? ( acl? ( sys-apps/acl ) )
+       apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+       argon2? ( app-crypt/argon2:= )
+       berkdb? ( || (  sys-libs/db:5.3 sys-libs/db:4.8 ) )
+       bzip2? ( app-arch/bzip2:0= )
+       cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+       coverage? ( dev-util/lcov )
+       curl? ( >=net-misc/curl-7.10.5 )
+       enchant? ( <app-text/enchant-2.0:0 )
+       firebird? ( dev-db/firebird )
+       gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= 
>=sys-libs/zlib-1.2.0.4 )
+       gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+       gmp? ( dev-libs/gmp:0= )
+       iconv? ( virtual/libiconv )
+       imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+       intl? ( dev-libs/icu:= )
+       iodbc? ( dev-db/libiodbc )
+       kerberos? ( virtual/krb5 )
+       ldap? ( >=net-nds/openldap-1.2.11 )
+       ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+       libedit? ( dev-libs/libedit )
+       lmdb? ( dev-db/lmdb:= )
+       mssql? ( dev-db/freetds[mssql] )
+       nls? ( sys-devel/gettext )
+       oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+       odbc? ( >=dev-db/unixODBC-1.8.13 )
+       postgres? ( dev-db/postgresql:* )
+       qdbm? ( dev-db/qdbm )
+       readline? ( sys-libs/readline:0= )
+       recode? ( app-text/recode:0= )
+       session-mm? ( dev-libs/mm )
+       simplexml? ( >=dev-libs/libxml2-2.6.8 )
+       snmp? ( >=net-analyzer/net-snmp-5.2 )
+       soap? ( >=dev-libs/libxml2-2.6.8 )
+       sodium? ( dev-libs/libsodium:=[-minimal] )
+       spell? ( >=app-text/aspell-0.50 )
+       sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+       ssl? ( >=dev-libs/openssl-1.0.1:0= )
+       tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+       tokyocabinet? ( dev-db/tokyocabinet )
+       truetype? ( =media-libs/freetype-2* )
+       unicode? ( dev-libs/oniguruma:= )
+       wddx? ( >=dev-libs/libxml2-2.6.8 )
+       webp? ( media-libs/libwebp:0= )
+       xml? ( >=dev-libs/libxml2-2.6.8 )
+       xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+       xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+       xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+       xpm? ( x11-libs/libXpm )
+       xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+       zip? ( >=sys-libs/zlib-1.2.0.4:0= )
+       zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+       zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+       virtual/mta
+       fpm? (
+               selinux? ( sec-policy/selinux-phpfpm )
+               systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+       app-arch/xz-utils
+       >=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+# 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 ) )
+       truetype? ( gd zlib )
+       webp? ( gd zlib )
+       cjk? ( gd zlib )
+       exif? ( gd zlib )
+       xpm? ( gd zlib )
+       gd? ( zlib )
+       simplexml? ( xml )
+       soap? ( xml )
+       wddx? ( xml )
+       xmlrpc? ( || ( xml iconv ) )
+       xmlreader? ( xml )
+       xslt? ( xml )
+       ldap-sasl? ( ldap )
+       mhash? ( hash )
+       oci8-instant-client? ( !ldap )
+       phar? ( hash )
+       qdbm? ( !gdbm )
+       readline? ( !libedit )
+       recode? ( !imap !mysqli !mysql )
+       session-mm? ( session !threads )
+       mysql? ( || ( mysqli pdo ) )
+       zip-encryption? ( zip )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+       "${FILESDIR}/php-freetype-2.9.1.patch"
+       "${FILESDIR}/php73-CVE2021-21703.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+       local phpsapi="${1}"
+
+       # work out where we are installing the ini file
+       php_set_ini_dir "${phpsapi}"
+
+       # Always install the production INI file, bug 611214.
+       local phpinisrc="php.ini-production-${phpsapi}"
+       cp php.ini-production "${phpinisrc}" || die
+
+       # default to /tmp for save_path, bug #282768
+       sed -e 's|^;session.save_path .*$|session.save_path = 
"'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+       # Set the extension dir
+       sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+               -i "${phpinisrc}" || die
+
+       # Set the include path to point to where we want to find PEAR packages
+       sed -e 's|^;include_path = ".:/php/includes".*|include_path = 
".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i 
"${phpinisrc}" || die
+
+       insinto "${PHP_INI_DIR#${EPREFIX}}"
+       newins "${phpinisrc}" php.ini
+
+       elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+       elog
+
+       dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+       dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+       if use opcache; then
+               elog "Adding opcache to $PHP_EXT_INI_DIR"
+               echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" 
>> \
+                        "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+               dosym "../ext/opcache.ini" \
+                         "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+       fi
+
+       # SAPI-specific handling
+       if [[ "${sapi}" == "fpm" ]] ; then
+               einfo "Installing FPM config files php-fpm.conf and www.conf"
+               insinto "${PHP_INI_DIR#${EPREFIX}}"
+               doins sapi/fpm/php-fpm.conf
+               insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+               doins sapi/fpm/www.conf
+       fi
+
+       dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+       PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+       PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+       PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+       default
+
+       # In php-7.x, the FPM pool configuration files have been split off
+       # of the main config. By default the pool config files go in
+       # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+       # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+       # we'll install the pool configuration file "www.conf" there.
+       php_set_ini_dir fpm
+       sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+               sapi/fpm/php-fpm.conf.in \
+               || die 'failed to move the include directory in php-fpm.conf'
+
+       # Bug 669566 - necessary so that build tools are updated for commands 
like pecl
+       # Force rebuilding aclocal.m4
+       rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+       eautoreconf
+}
+
+src_configure() {
+       addpredict /usr/share/snmp/mibs/.index #nowarn
+       addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+       PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+       # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+       # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+       local our_conf=(
+               --prefix="${PHP_DESTDIR}"
+               --mandir="${PHP_DESTDIR}/man"
+               --infodir="${PHP_DESTDIR}/info"
+               --libdir="${PHP_DESTDIR}/lib"
+               --with-libdir="$(get_libdir)"
+               --localstatedir="${EPREFIX}/var"
+               --without-pear
+               $(use_enable threads maintainer-zts)
+       )
+
+       our_conf+=(
+               $(use_with argon2 password-argon2 "${EPREFIX}/usr")
+               $(use_enable bcmath bcmath)
+               $(use_with bzip2 bz2 "${EPREFIX}/usr")
+               $(use_enable calendar calendar)
+               $(use_enable coverage gcov)
+               $(use_enable ctype ctype)
+               $(use_with curl curl "${EPREFIX}/usr")
+               $(use_enable xml dom)
+               $(use_with enchant enchant "${EPREFIX}/usr")
+               $(use_enable exif exif)
+               $(use_enable fileinfo fileinfo)
+               $(use_enable filter filter)
+               $(use_enable ftp ftp)
+               $(use_with nls gettext "${EPREFIX}/usr")
+               $(use_with gmp gmp "${EPREFIX}/usr")
+               $(use_enable hash hash)
+               $(use_with mhash mhash "${EPREFIX}/usr")
+               $(use_with iconv iconv \
+                       $(use elibc_glibc || use elibc_musl || use 
elibc_FreeBSD || echo "${EPREFIX}/usr"))
+               $(use_enable intl intl)
+               $(use_enable ipv6 ipv6)
+               $(use_enable json json)
+               $(use_with kerberos kerberos "${EPREFIX}/usr")
+               $(use_enable xml libxml)
+               $(use_with xml libxml-dir "${EPREFIX}/usr")
+               $(use_enable unicode mbstring)
+               $(use_with unicode onig "${EPREFIX}/usr")
+               $(use_with ssl openssl "${EPREFIX}/usr")
+               $(use_with ssl openssl-dir "${EPREFIX}/usr")
+               $(use_enable pcntl pcntl)
+               $(use_enable phar phar)
+               $(use_enable pdo pdo)
+               $(use_enable opcache opcache)
+               $(use_with postgres pgsql "${EPREFIX}/usr")
+               $(use_enable posix posix)
+               $(use_with spell pspell "${EPREFIX}/usr")
+               $(use_with recode recode "${EPREFIX}/usr")
+               $(use_enable simplexml simplexml)
+               $(use_enable sharedmem shmop)
+               $(use_with snmp snmp "${EPREFIX}/usr")
+               $(use_enable soap soap)
+               $(use_enable sockets sockets)
+               $(use_with sodium sodium "${EPREFIX}/usr")
+               $(use_with sqlite sqlite3 "${EPREFIX}/usr")
+               $(use_enable sysvipc sysvmsg)
+               $(use_enable sysvipc sysvsem)
+               $(use_enable sysvipc sysvshm)
+               $(use_with tidy tidy "${EPREFIX}/usr")
+               $(use_enable tokenizer tokenizer)
+               $(use_enable wddx wddx)
+               $(use_enable xml xml)
+               $(use_enable xmlreader xmlreader)
+               $(use_enable xmlwriter xmlwriter)
+               $(use_with xmlrpc xmlrpc)
+               $(use_with xslt xsl "${EPREFIX}/usr")
+               $(use_enable zip zip)
+               $(use_with zip-encryption libzip "${EPREFIX}/usr")
+               $(use_with zlib zlib "${EPREFIX}/usr")
+               $(use_enable debug debug)
+       )
+
+       # DBA support
+       if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+               || use qdbm || use lmdb || use tokyocabinet ; then
+               our_conf+=( "--enable-dba${shared}" )
+       fi
+
+       # DBA drivers support
+       our_conf+=(
+               $(use_with cdb cdb)
+               $(use_with berkdb db4 "${EPREFIX}/usr")
+               $(use_enable flatfile flatfile)
+               $(use_with gdbm gdbm "${EPREFIX}/usr")
+               $(use_enable inifile inifile)
+               $(use_with qdbm qdbm "${EPREFIX}/usr")
+               $(use_with lmdb lmdb "${EPREFIX}/usr")
+       )
+
+       # Support for the GD graphics library
+       our_conf+=(
+               $(use_with truetype freetype-dir "${EPREFIX}/usr")
+               $(use_enable cjk gd-jis-conv)
+               $(use_with gd jpeg-dir "${EPREFIX}/usr")
+               $(use_with gd png-dir "${EPREFIX}/usr")
+               $(use_with xpm xpm-dir "${EPREFIX}/usr")
+       )
+       if use webp; then
+               our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+       fi
+       # enable gd last, so configure can pick up the previous settings
+       our_conf+=( $(use_with gd gd) )
+
+       # IMAP support
+       if use imap ; then
+               our_conf+=(
+                       $(use_with imap imap "${EPREFIX}/usr")
+                       $(use_with ssl imap-ssl "${EPREFIX}/usr")
+               )
+       fi
+
+       # Interbase/firebird support
+       our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+       # LDAP support
+       if use ldap ; then
+               our_conf+=(
+                       $(use_with ldap ldap "${EPREFIX}/usr")
+                       $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+               )
+       fi
+
+       # MySQL support
+       local mysqllib="mysqlnd"
+       local mysqlilib="mysqlnd"
+
+       our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+       local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+       if use mysql || use mysqli ; then
+               our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+       fi
+
+       # ODBC support
+       our_conf+=(
+               $(use_with odbc unixODBC "${EPREFIX}/usr")
+               $(use_with iodbc iodbc "${EPREFIX}/usr")
+       )
+
+       # Oracle support
+       our_conf+=( $(use_with oci8-instant-client oci8) )
+
+       # PDO support
+       if use pdo ; then
+               our_conf+=(
+                       $(use_with mssql pdo-dblib "${EPREFIX}/usr")
+                       $(use_with mysql pdo-mysql "${mysqllib}")
+                       $(use_with postgres pdo-pgsql)
+                       $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+                       $(use_with firebird pdo-firebird "${EPREFIX}/usr")
+                       $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+                       $(use_with oci8-instant-client pdo-oci)
+               )
+       fi
+
+       # readline/libedit support
+       our_conf+=(
+               $(use_with readline readline "${EPREFIX}/usr")
+               $(use_with libedit libedit "${EPREFIX}/usr")
+       )
+
+       # Session support
+       if use session ; then
+               our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+       else
+               our_conf+=( $(use_enable session session) )
+       fi
+
+       # Use pic for shared modules such as apache2's mod_php
+       our_conf+=( --with-pic )
+
+       # we use the system copy of pcre
+       # --with-pcre-regex affects ext/pcre
+       # --with-pcre-dir affects ext/filter and ext/zip
+       # --with-pcre-valgrind cannot be enabled with system pcre
+       our_conf+=(
+               --with-pcre-regex="${EPREFIX}/usr"
+               --with-pcre-dir="${EPREFIX}/usr"
+               --without-pcre-valgrind
+               $(use_with jit pcre-jit)
+       )
+
+       # Catch CFLAGS problems
+       # Fixes bug #14067.
+       # Changed order to run it in reverse for bug #32022 and #12021.
+       replace-cpu-flags "k6*" "i586"
+
+       # Cache the ./configure test results between SAPIs.
+       our_conf+=( --cache-file="${T}/config.cache" )
+
+       # Support user-passed configuration parameters
+       our_conf+=( ${EXTRA_ECONF:-} )
+
+       # Support the Apache2 extras, they must be set globally for all
+       # SAPIs to work correctly, especially for external PHP extensions
+
+       local one_sapi
+       local sapi
+       mkdir -p "${WORKDIR}/sapis-build" || die
+       for one_sapi in $SAPIS ; do
+               use "${one_sapi}" || continue
+               php_set_ini_dir "${one_sapi}"
+
+               # The BUILD_DIR variable is used to determine where to output
+               # the files that autotools creates. This was all originally
+               # based on the autotools-utils eclass.
+               BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+               cp -a "${S}" "${BUILD_DIR}" || die
+               cd "${BUILD_DIR}" || die
+
+               local sapi_conf=(
+                       --with-config-file-path="${PHP_INI_DIR}"
+                       --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+               )
+
+               for sapi in $SAPIS ; do
+                       case "$sapi" in
+                               cli|cgi|embed|fpm|phpdbg)
+                                       if [[ "${one_sapi}" == "${sapi}" ]] ; 
then
+                                               sapi_conf+=( "--enable-${sapi}" 
)
+                                               if [[ "fpm" == "${sapi}" ]] ; 
then
+                                                       sapi_conf+=(
+                                                               $(use_with acl 
fpm-acl)
+                                                               $(use_with 
systemd fpm-systemd)
+                                                       )
+                                               fi
+                                       else
+                                               sapi_conf+=( 
"--disable-${sapi}" )
+                                       fi
+                                       ;;
+
+                               apache2)
+                                       if [[ "${one_sapi}" == "${sapi}" ]] ; 
then
+                                               sapi_conf+=( 
--with-apxs2="${EPREFIX}/usr/bin/apxs" )
+                                       else
+                                               sapi_conf+=( --without-apxs2 )
+                                       fi
+                                       ;;
+                       esac
+               done
+
+               # Construct the $myeconfargs array by concatenating $our_conf
+               # (the common args) and $sapi_conf (the SAPI-specific args).
+               local myeconfargs=( "${our_conf[@]}" )
+               myeconfargs+=( "${sapi_conf[@]}" )
+
+               pushd "${BUILD_DIR}" > /dev/null || die
+               econf "${myeconfargs[@]}"
+               popd > /dev/null || die
+       done
+}
+
+src_compile() {
+       # snmp seems to run during src_compile, too (bug #324739)
+       addpredict /usr/share/snmp/mibs/.index #nowarn
+       addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+       local sapi
+       for sapi in ${SAPIS} ; do
+               if use "${sapi}"; then
+                       cd "${WORKDIR}/sapis-build/$sapi" || \
+                               die "Failed to change dir to 
${WORKDIR}/sapis-build/$1"
+                       emake
+               fi
+       done
+}
+
+src_install() {
+       # see bug #324739 for what happens when we don't have that
+       addpredict /usr/share/snmp/mibs/.index #nowarn
+
+       # grab the first SAPI that got built and install common files from there
+       local first_sapi="", sapi=""
+       for sapi in $SAPIS ; do
+               if use $sapi ; then
+                       first_sapi=$sapi
+                       break
+               fi
+       done
+
+       # Makefile forgets to create this before trying to write to it...
+       dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+       # Install php environment (without any sapis)
+       cd "${WORKDIR}/sapis-build/$first_sapi" || die
+       emake INSTALL_ROOT="${D}" \
+               install-build install-headers install-programs
+
+       local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" 
--extension-dir)"
+
+       # Create the directory where we'll put version-specific php scripts
+       keepdir "/usr/share/php${PHP_MV}"
+
+       local file=""
+       local sapi_list=""
+
+       for sapi in ${SAPIS}; do
+               if use "${sapi}" ; then
+                       einfo "Installing SAPI: ${sapi}"
+                       cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+                       if [[ "${sapi}" == "apache2" ]] ; then
+                               # We're specifically not using emake 
install-sapi as libtool
+                               # may cause unnecessary relink failures (see 
bug #351266)
+                               insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+                               newins ".libs/libphp${PHP_MV}$(get_libname)" \
+                                          "libphp${PHP_MV}$(get_libname)"
+                               keepdir "/usr/$(get_libdir)/apache2/modules"
+                       else
+                               # needed each time, php_install_ini would reset 
it
+                               local dest="${PHP_DESTDIR#${EPREFIX}}"
+                               into "${dest}"
+                               case "$sapi" in
+                                       cli)
+                                               source="sapi/cli/php"
+                                               # Install the "phar" archive 
utility.
+                                               if use phar ; then
+                                                       emake 
INSTALL_ROOT="${D}" install-pharcmd
+                                                       dosym 
"..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+                                               fi
+                                               ;;
+                                       cgi)
+                                               source="sapi/cgi/php-cgi"
+                                               ;;
+                                       fpm)
+                                               source="sapi/fpm/php-fpm"
+                                               ;;
+                                       embed)
+                                               
source="libs/libphp${PHP_MV}$(get_libname)"
+                                               ;;
+                                       phpdbg)
+                                               source="sapi/phpdbg/phpdbg"
+                                               ;;
+                                       *)
+                                               die "unhandled sapi in 
src_install"
+                                               ;;
+                               esac
+
+                               if [[ "${source}" == *"$(get_libname)" ]]; then
+                                       dolib.so "${source}"
+                               else
+                                       dobin "${source}"
+                                       local name="$(basename ${source})"
+                                       dosym "..${dest#/usr}/bin/${name}" 
"/usr/bin/${name}${SLOT}"
+                               fi
+                       fi
+
+                       php_install_ini "${sapi}"
+
+                       # construct correct SAPI string for php-config
+                       # thanks to ferringb for the bash voodoo
+                       if [[ "${sapi}" == "apache2" ]]; then
+                               sapi_list="${sapi_list:+${sapi_list} 
}apache2handler"
+                       else
+                               sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+                       fi
+               fi
+       done
+
+       # Installing opcache module
+       if use opcache ; then
+               into "${PHP_DESTDIR#${EPREFIX}}"
+               dolib.so "modules/opcache$(get_libname)"
+       fi
+
+       # Install env.d files
+       newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+       sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || 
die
+       sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+       # set php-config variable correctly (bug #278439)
+       sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+               "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+       if use fpm ; then
+               if use systemd; then
+                       systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+                                                       
"php-fpm@${SLOT}.service"
+               else
+                       systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" 
\
+                                                       
"php-fpm@${SLOT}.service"
+               fi
+       fi
+}
+
+src_test() {
+       echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+       PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+       if [[ ! -x "${PHP_BIN}" ]] ; then
+               ewarn "Test phase requires USE=cli, skipping"
+               return
+       else
+               export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+       fi
+
+       if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+               export 
TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+       fi
+
+       if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+               export 
TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+       fi
+
+       REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+                                         "session.save_path=${T}" \
+                                         
"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+                                         "session.save_path=${T}"
+
+       for name in ${EXPECTED_TEST_FAILURES}; do
+               mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+       done
+
+       local failed="$(find -name '*.out')"
+       if [[ ${failed} != "" ]] ; then
+               ewarn "The following test cases failed unexpectedly:"
+               for name in ${failed}; do
+                       ewarn "  ${name/.out/}"
+               done
+       else
+               einfo "No unexpected test failures, all fine"
+       fi
+
+       if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+               local passed=""
+               for name in ${EXPECTED_TEST_FAILURES}; do
+                       [[ -f "${name}.diff" ]] && continue
+                       passed="${passed} ${name}"
+               done
+               if [[ ${passed} != "" ]] ; then
+                       einfo "The following test cases passed unexpectedly:"
+                       for name in ${passed}; do
+                               ewarn "  ${passed}"
+                       done
+               else
+                       einfo "None of the known-to-fail tests passed, all fine"
+               fi
+       fi
+}
+
+pkg_postinst() {
+       # Output some general info to the user
+       if use apache2 ; then
+               elog
+               elog "To enable PHP in apache, you will need to add \"-D PHP\" 
to"
+               elog "your apache2 command. OpenRC users can append that string 
to"
+               elog "APACHE2_OPTS in /etc/conf.d/apache2."
+               elog
+               elog "The apache module configuration file 70_mod_php.conf is"
+               elog "provided (and maintained) by eselect-php."
+               elog
+       fi
+
+       # Create the symlinks for php
+       local m
+       for m in ${SAPIS}; do
+               [[ ${m} == 'embed' ]] && continue;
+               if use $m ; then
+                       local ci=$(eselect php show $m)
+                       if [[ -z $ci ]]; then
+                               eselect php set $m php${SLOT} || die
+                               einfo "Switched ${m} to use php:${SLOT}"
+                               einfo
+                       elif [[ $ci != "php${SLOT}" ]] ; then
+                               elog "To switch $m to use php:${SLOT}, run"
+                               elog "    eselect php set $m php${SLOT}"
+                               elog
+                       fi
+               fi
+       done
+
+       # Remove dead symlinks for SAPIs that were just disabled. For
+       # example, if the user has the cgi SAPI enabled, then he has an
+       # eselect-php symlink for it. If he later reinstalls PHP with
+       # USE="-cgi", that symlink will break. This call to eselect is
+       # supposed to remove that dead link per bug 572436.
+       eselect php cleanup || die
+
+       if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+          elog "To build extensions for this version of PHP, you will need to"
+          elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+          elog
+       fi
+
+       # Warn about the removal of PHP_INI_VERSION if the user has it set.
+       if [[ -n "${PHP_INI_VERSION}" ]]; then
+               ewarn 'The PHP_INI_VERSION variable has been phased out. You 
may'
+               ewarn 'remove it from your configuration at your convenience. 
See'
+               ewarn
+               ewarn '  https://bugs.gentoo.org/611214'
+               ewarn
+               ewarn 'for more information.'
+       fi
+
+       elog "For details on how version slotting works, please see"
+       elog "the wiki:"
+       elog
+       elog "  https://wiki.gentoo.org/wiki/PHP";
+       elog
+}
+
+pkg_postrm() {
+       # This serves two purposes. First, if we have just removed the last
+       # installed version of PHP, then this will remove any dead symlinks
+       # belonging to eselect-php. Second, if a user upgrades slots from
+       # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+       # his existing symlinks to point to the new 7.0 installation. The
+       # latter is bug 432962.
+       #
+       # Note: the eselect-php package may not be installed at this point,
+       # so we can't die() if this command fails.
+       eselect php cleanup
+}

Reply via email to