* [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/
@ 2015-11-19 21:34 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2015-11-19 21:34 UTC (permalink / raw
To: gentoo-commits
commit: e8af3741c2780564e21ca7970c1e91b5c22c2324
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 21:32:54 2015 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 21:33:17 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8af3741
dev-lang/php: remove old patch and init files.
Most of the patches in $FILESDIR are no longer being used. There's
also an old php-fpm-r4.init script that has been moved to
app-eselect/eselect-php. Get rid of them.
Package-Manager: portage-2.2.20.1
.../files/all_mysql_socket_location-gentoo.patch | 13 -----
dev-lang/php/files/all_strict_aliasing.patch | 14 -----
dev-lang/php/files/bison_any_version.patch | 16 ------
dev-lang/php/files/bison_build_2.patch | 29 ----------
dev-lang/php/files/bison_build_2a.patch | 30 ----------
.../php/files/fix-libstdc++-underlinking.patch | 10 ----
.../php/files/freetype-2.5.1-linking-fix.patch | 64 ----------------------
dev-lang/php/files/iodbc-pkgconfig-r1.patch | 52 ------------------
dev-lang/php/files/iodbc-pkgconfig.patch | 52 ------------------
dev-lang/php/files/missing-openssl-include.patch | 14 -----
dev-lang/php/files/php-fpm-r4.init | 47 ----------------
dev-lang/php/files/php-libvpx.patch | 24 --------
.../files/stricter-libc-client-symlink-check.patch | 15 -----
13 files changed, 380 deletions(-)
diff --git a/dev-lang/php/files/all_mysql_socket_location-gentoo.patch b/dev-lang/php/files/all_mysql_socket_location-gentoo.patch
deleted file mode 100644
index bd17998..0000000
--- a/dev-lang/php/files/all_mysql_socket_location-gentoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
---- a/ext/mysqlnd/mysqlnd.c 2010-10-22 17:46:26.000000000 +0200
-+++ b/ext/mysqlnd/mysqlnd.c 2010-12-08 21:54:47.000000000 +0100
-@@ -619,7 +619,8 @@
- if (host_len == sizeof("localhost") - 1 && !strncasecmp(host, "localhost", host_len)) {
- DBG_INF_FMT("socket=%s", socket_or_pipe? socket_or_pipe:"n/a");
- if (!socket_or_pipe) {
-- socket_or_pipe = "/tmp/mysql.sock";
-+ // gentoo mysql default socket location
-+ socket_or_pipe = "/var/run/mysqld/mysqld.sock";
- }
- transport_len = spprintf(&transport, 0, "unix://%s", socket_or_pipe);
- unix_socket = TRUE;
diff --git a/dev-lang/php/files/all_strict_aliasing.patch b/dev-lang/php/files/all_strict_aliasing.patch
deleted file mode 100644
index cfa6090..0000000
--- a/dev-lang/php/files/all_strict_aliasing.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-upstream bug: http://bugs.php.net/bug.php?id=46311
-The current patch follows a suggestion from Siarhei Siamashka
-Adapted for php 5.5
---- Zend/zend_execute.h.old 2013-01-01 13:49:04.587825704 +0100
-+++ Zend/zend_execute.h 2013-01-01 13:53:28.762958578 +0100
-@@ -293,7 +293,7 @@
- void **end = p - (int)(zend_uintptr_t)*p;
-
- while (p != end) {
-- zval *q = *(zval **)(--p);
-+ zval *q = (zval *)*(--p);
- *p = NULL;
- i_zval_ptr_dtor(q ZEND_FILE_LINE_CC);
- }
diff --git a/dev-lang/php/files/bison_any_version.patch b/dev-lang/php/files/bison_any_version.patch
deleted file mode 100644
index 94271e5..0000000
--- a/dev-lang/php/files/bison_any_version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./Zend/acinclude.m4 2013-03-20 15:09:27.000000000 +0100
-+++ ./Zend/acinclude.m4.new 2013-03-25 21:35:27.654016588 +0100
-@@ -17,12 +17,7 @@
- if test -n "$bison_version_vars"; then
- set $bison_version_vars
- bison_version="${1}.${2}"
-- for bison_check_version in $bison_version_list; do
-- if test "$bison_version" = "$bison_check_version"; then
-- php_cv_bison_version="$bison_check_version (ok)"
-- break
-- fi
-- done
-+ php_cv_bison_version="$bison_version (ok)"
- fi
- ])
- fi
diff --git a/dev-lang/php/files/bison_build_2.patch b/dev-lang/php/files/bison_build_2.patch
deleted file mode 100644
index dd2481d..0000000
--- a/dev-lang/php/files/bison_build_2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
-index ccbc9b1..6a9a24a 100644
---- a/Zend/zend_language_parser.y
-+++ b/Zend/zend_language_parser.y
-@@ -41,17 +41,19 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
-
- #define YYERROR_VERBOSE
- #define YYSTYPE znode
--#ifdef ZTS
--# define YYPARSE_PARAM tsrm_ls
--# define YYLEX_PARAM tsrm_ls
--#endif
--
-
- %}
-
- %pure_parser
- %expect 3
-
-+%code requires {
-+#ifdef ZTS
-+# define YYPARSE_PARAM tsrm_ls
-+# define YYLEX_PARAM tsrm_ls
-+#endif
-+}
-+
- %token END 0 "end of file"
- %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
- %token T_INCLUDE "include (T_INCLUDE)"
diff --git a/dev-lang/php/files/bison_build_2a.patch b/dev-lang/php/files/bison_build_2a.patch
deleted file mode 100644
index 7dedd03..0000000
--- a/dev-lang/php/files/bison_build_2a.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Gentoo bug: #494240
-Upstream: #64503
-
---- Zend/zend_language_parser.y.orig 2013-12-14 12:25:43.528989017 +0100
-+++ Zend/zend_language_parser.y 2013-12-14 12:26:30.088988957 +0100
-@@ -38,10 +38,6 @@
-
- #define YYERROR_VERBOSE
- #define YYSTYPE znode
--#ifdef ZTS
--# define YYPARSE_PARAM tsrm_ls
--# define YYLEX_PARAM tsrm_ls
--#endif
-
-
- %}
-@@ -49,6 +45,13 @@
- %pure_parser
- %expect 2
-
-+%code requires {
-+#ifdef ZTS
-+# define YYPARSE_PARAM tsrm_ls
-+# define YYLEX_PARAM tsrm_ls
-+#endif
-+}
-+
- %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
- %left ','
- %left T_LOGICAL_OR
diff --git a/dev-lang/php/files/fix-libstdc++-underlinking.patch b/dev-lang/php/files/fix-libstdc++-underlinking.patch
deleted file mode 100644
index a35305a..0000000
--- a/dev-lang/php/files/fix-libstdc++-underlinking.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- acinclude.m4 2013-04-02 09:58:33.069274096 +0200
-+++ acinclude.m4.new 2013-04-02 09:58:25.221240142 +0200
-@@ -762,6 +762,7 @@
- if test -z "$php_cxx_done"; then
- AC_PROG_CXX
- AC_PROG_CXXCPP
-+ PHP_ADD_LIBRARY(stdc++)
- php_cxx_done=yes
- fi
- ])
diff --git a/dev-lang/php/files/freetype-2.5.1-linking-fix.patch b/dev-lang/php/files/freetype-2.5.1-linking-fix.patch
deleted file mode 100644
index 3b78f9b..0000000
--- a/dev-lang/php/files/freetype-2.5.1-linking-fix.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From a0955f351c7eb1022da7ae36970ffef3b00c8aff Mon Sep 17 00:00:00 2001
-From: Adam Harvey <aharvey@php.net>
-Date: Sat, 7 Dec 2013 19:39:40 -0800
-Subject: [PATCH] Switch to using freetype-config for freetype detection.
-
-This fixes GD compilation against libfreetype 2.5.1 and later after they made
-the rather interesting decision to change their include directory layout in a
-point release.
-
-The original suggestion in the bug was to use pkg-config, but my inclination is
-to use freetype-config instead: we should be able to get the same configuration
-information without actually needing pkg-config installed, since pkg-config is
-by no means guaranteed to exist on many Unices and distros, whereas
-freetype-config should always be present if a libfreetype build environment is
-installed. Let's try it out and see what happens.
-
-Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)).
-
-diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
-index 0e35ece..732e14c 100644
---- a/ext/gd/config.m4
-+++ b/ext/gd/config.m4
-@@ -193,30 +193,25 @@ AC_DEFUN([PHP_GD_FREETYPE2],[
- if test "$PHP_FREETYPE_DIR" != "no"; then
-
- for i in $PHP_FREETYPE_DIR /usr/local /usr; do
-- if test -f "$i/include/freetype2/freetype/freetype.h"; then
-+ if test -f "$i/bin/freetype-config"; then
- FREETYPE2_DIR=$i
-- FREETYPE2_INC_DIR=$i/include/freetype2
-+ FREETYPE2_CONFIG="$i/bin/freetype-config"
- break
- fi
- done
-
- if test -z "$FREETYPE2_DIR"; then
-- AC_MSG_ERROR([freetype.h not found.])
-+ AC_MSG_ERROR([freetype-config not found.])
- fi
-
-- PHP_CHECK_LIBRARY(freetype, FT_New_Face,
-- [
-- PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
-- PHP_ADD_INCLUDE($FREETYPE2_DIR/include)
-- PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
-- AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
-- AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
-- AC_DEFINE(ENABLE_GD_TTF,1,[ ])
-- ],[
-- AC_MSG_ERROR([Problem with freetype.(a|so). Please check config.log for more information.])
-- ],[
-- -L$FREETYPE2_DIR/$PHP_LIBDIR
-- ])
-+ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
-+ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
-+
-+ PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
-+ PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
-+ AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
-+ AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
-+ AC_DEFINE(ENABLE_GD_TTF,1,[ ])
- else
- AC_MSG_RESULT([If configure fails try --with-freetype-dir=<DIR>])
- fi
diff --git a/dev-lang/php/files/iodbc-pkgconfig-r1.patch b/dev-lang/php/files/iodbc-pkgconfig-r1.patch
deleted file mode 100644
index b215984..0000000
--- a/dev-lang/php/files/iodbc-pkgconfig-r1.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- ext/odbc/config.m4.old 2013-04-06 11:26:04.047017826 +0200
-+++ ext/odbc/config.m4 2013-04-06 12:29:47.180617161 +0200
-@@ -366,22 +366,37 @@
-
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(iodbc,,
--[ --with-iodbc[=DIR] Include iODBC support [/usr/local]])
-+[ --with-iodbc[=DIR] Include iODBC support])
-
- if test "$PHP_IODBC" != "no"; then
- AC_MSG_CHECKING(for iODBC support)
-- if test "$PHP_IODBC" = "yes"; then
-- PHP_IODBC=/usr/local
-+ if test -z "$PKG_CONFIG"; then
-+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+ fi
-+ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
-+ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-+ ODBC_TYPE=iodbc
-+ ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
-+ ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
-+ ODBC_LIBS=`$PKG_CONFIG --libs-only-l libiodbc`
-+ PHP_EVAL_INCLINE($ODBC_INCLUDE)
-+ AC_DEFINE(HAVE_IODBC,1,[ ])
-+ AC_DEFINE(HAVE_ODBC2,1,[ ])
-+ AC_MSG_RESULT([$ext_output])
-+ else
-+ if test "$PHP_IODBC" = "yes"; then
-+ PHP_IODBC=/usr/local
-+ fi
-+ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-+ PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
-+ ODBC_TYPE=iodbc
-+ ODBC_INCLUDE=-I$PHP_IODBC/include
-+ ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
-+ ODBC_LIBS=-liodbc
-+ AC_DEFINE(HAVE_IODBC,1,[ ])
-+ AC_DEFINE(HAVE_ODBC2,1,[ ])
-+ AC_MSG_RESULT([$ext_output])
- fi
-- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-- PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
-- ODBC_TYPE=iodbc
-- ODBC_INCLUDE=-I$PHP_IODBC/include
-- ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
-- ODBC_LIBS=-liodbc
-- AC_DEFINE(HAVE_IODBC,1,[ ])
-- AC_DEFINE(HAVE_ODBC2,1,[ ])
-- AC_MSG_RESULT([$ext_output])
- fi
- fi
-
diff --git a/dev-lang/php/files/iodbc-pkgconfig.patch b/dev-lang/php/files/iodbc-pkgconfig.patch
deleted file mode 100644
index f32f8eb..0000000
--- a/dev-lang/php/files/iodbc-pkgconfig.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- ext/odbc/config.m4.old 2013-04-06 11:26:04.047017826 +0200
-+++ ext/odbc/config.m4 2013-04-06 12:29:47.180617161 +0200
-@@ -366,22 +366,37 @@
-
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(iodbc,,
--[ --with-iodbc[=DIR] Include iODBC support [/usr/local]])
-+[ --with-iodbc[=DIR] Include iODBC support])
-
- if test "$PHP_IODBC" != "no"; then
- AC_MSG_CHECKING(for iODBC support)
-- if test "$PHP_IODBC" = "yes"; then
-- PHP_IODBC=/usr/local
-+ if test -z "$PKG_CONFIG"; then
-+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+ fi
-+ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
-+ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-+ ODBC_TYPE=iodbc
-+ ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
-+ ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
-+ ODBC_LIBS=`$PKG_CONFIG --libs-only-l libiodbc`
-+ PHP_EVAL_INCLINE($ODBC_INCLUDE)
-+ AC_DEFINE(HAVE_IODBC,1,[ ])
-+ AC_DEFINE(HAVE_ODBC2,1,[ ])
-+ AC_MSG_RESULT([$ext_output])
-+ else
-+ if test "$PHP_IODBC" = "yes"; then
-+ PHP_IODBC=/usr/local
-+ fi
-+ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-+ PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
-+ ODBC_TYPE=iodbc
-+ ODBC_INCLUDE=-I$PHP_IODBC/include
-+ ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
-+ ODBC_LIBS=-liodbc
-+ AC_DEFINE(HAVE_IODBC,1,[ ])
-+ AC_DEFINE(HAVE_ODBC2,1,[ ])
-+ AC_MSG_RESULT([$ext_output])
- fi
-- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-- PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
-- ODBC_TYPE=iodbc
-- ODBC_INCLUDE=-I$PHP_IODBC/include
-- ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
-- ODBC_LIBS=-liodbc
-- AC_DEFINE(HAVE_IODBC,1,[ ])
-- AC_DEFINE(HAVE_ODBC2,1,[ ])
-- AC_MSG_RESULT([$ext_output])
- fi
- fi
-
diff --git a/dev-lang/php/files/missing-openssl-include.patch b/dev-lang/php/files/missing-openssl-include.patch
deleted file mode 100644
index 28cc7dd..0000000
--- a/dev-lang/php/files/missing-openssl-include.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- acinclude.m4 2012-11-17 21:53:06.346408695 +0100
-+++ acinclude.m4.new 2013-03-18 11:37:09.253432820 +0100
-@@ -2331,8 +2331,10 @@
- AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])
- fi
-
-- if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then
-+ if test -n "$OPENSSL_LIBS" ; then
- PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
-+ fi
-+ if test -n "$OPENSSL_INCS" ; then
- PHP_EVAL_INCLINE($OPENSSL_INCS)
- fi
- fi
diff --git a/dev-lang/php/files/php-fpm-r4.init b/dev-lang/php/files/php-fpm-r4.init
deleted file mode 100644
index a186d83..0000000
--- a/dev-lang/php/files/php-fpm-r4.init
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/runscript
-
-set_phpvars() {
- PHPSLOT=${SVCNAME#php-fpm-}
- [ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)"
-
- PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
- PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid"
-}
-
-extra_commands="depend"
-extra_started_commands="reload"
-
-depend() {
- need net
- use apache2 lighttpd nginx
-}
-
-start() {
- ebegin "Starting PHP FastCGI Process Manager"
- set_phpvars
- start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \
- /usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}"
- local i=0
- local timeout=5
- while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do
- sleep 1
- i=$(($i + 1))
- done
-
- [ $timeout -gt $i ]
- eend $?
-}
-
-stop() {
- ebegin "Stopping PHP FastCGI Process Manager"
- set_phpvars
- start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID}
- eend $?
-}
-
-reload() {
- ebegin "Reloading PHP FastCGI Process Manager"
- set_phpvars
- [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID})
- eend $?
-}
diff --git a/dev-lang/php/files/php-libvpx.patch b/dev-lang/php/files/php-libvpx.patch
deleted file mode 100644
index e23ae0e..0000000
--- a/dev-lang/php/files/php-libvpx.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ext/gd/libgd/webpimg.c.orig 2015-04-10 17:33:03.864937281 +0300
-+++ ext/gd/libgd/webpimg.c 2015-04-10 17:33:32.089873980 +0300
-@@ -706,14 +706,14 @@
- codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
- codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
-
-- vpx_img_wrap(&img, IMG_FMT_I420,
-+ vpx_img_wrap(&img, VPX_IMG_FMT_I420,
- y_width, y_height, 16, (uint8*)(Y));
-- img.planes[PLANE_Y] = (uint8*)(Y);
-- img.planes[PLANE_U] = (uint8*)(U);
-- img.planes[PLANE_V] = (uint8*)(V);
-- img.stride[PLANE_Y] = y_stride;
-- img.stride[PLANE_U] = uv_stride;
-- img.stride[PLANE_V] = uv_stride;
-+ img.planes[VPX_PLANE_Y] = (uint8*)(Y);
-+ img.planes[VPX_PLANE_U] = (uint8*)(U);
-+ img.planes[VPX_PLANE_V] = (uint8*)(V);
-+ img.stride[VPX_PLANE_Y] = y_stride;
-+ img.stride[VPX_PLANE_U] = uv_stride;
-+ img.stride[VPX_PLANE_V] = uv_stride;
-
- res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);
-
diff --git a/dev-lang/php/files/stricter-libc-client-symlink-check.patch b/dev-lang/php/files/stricter-libc-client-symlink-check.patch
deleted file mode 100644
index 7cf3664..0000000
--- a/dev-lang/php/files/stricter-libc-client-symlink-check.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Gentoo bugs: 88944 463800
---- ext/imap/config.m4 2013-03-27 19:31:13.000000000 +0100
-+++ ext/imap/config.m4.new 2013-03-30 18:34:17.581557062 +0100
-@@ -198,9 +198,9 @@
- AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
- fi
-
-- if test -r "$IMAP_DIR/c-client/c-client.a"; then
-+ if test ! -r "$IMAP_DIR/c-client/libc-client.a" && -r "$IMAP_DIR/c-client/c-client.a" ; then
- ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
-- elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
-+ elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
- ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1
- fi
-
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/
@ 2016-07-26 21:46 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2016-07-26 21:46 UTC (permalink / raw
To: gentoo-commits
commit: 2f8066e2129485296c0493997894e666143be129
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 20:21:44 2016 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 21:43:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f8066e2
dev-lang/php: remove unused file ${FILESDIR}/php5-ldvs.
Package-Manager: portage-2.2.28
dev-lang/php/files/php5-ldvs | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-lang/php/files/php5-ldvs b/dev-lang/php/files/php5-ldvs
deleted file mode 100644
index 783b0f6..0000000
--- a/dev-lang/php/files/php5-ldvs
+++ /dev/null
@@ -1 +0,0 @@
-PHP_5 { global: *; };
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/
@ 2018-05-08 17:56 Brian Evans
0 siblings, 0 replies; 7+ messages in thread
From: Brian Evans @ 2018-05-08 17:56 UTC (permalink / raw
To: gentoo-commits
commit: 400a7eb881369ddda92d5d16b9a31179d44a6bfa
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue May 8 17:56:32 2018 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue May 8 17:56:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=400a7eb8
dev-lang/php: Fix freetype patch to make sure functions are available
Bug: https://bugs.gentoo.org/654794
Package-Manager: Portage-2.3.36, Repoman-2.3.9
dev-lang/php/files/php-freetype-2.9.1.patch | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-lang/php/files/php-freetype-2.9.1.patch b/dev-lang/php/files/php-freetype-2.9.1.patch
index 3ddf8d1154d..02dfd9ce3cd 100644
--- a/dev-lang/php/files/php-freetype-2.9.1.patch
+++ b/dev-lang/php/files/php-freetype-2.9.1.patch
@@ -1,6 +1,6 @@
--- a/ext/gd/config.m4 2018-04-24 11:09:54.000000000 -0400
+++ b/ext/gd/config.m4 2018-05-04 15:18:49.867283889 -0400
-@@ -186,21 +186,35 @@
+@@ -186,21 +186,36 @@
AC_DEFUN([PHP_GD_FREETYPE2],[
if test "$PHP_FREETYPE_DIR" != "no"; then
@@ -17,6 +17,7 @@
+ FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
+ FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
+ FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2`
++ FREETYPE2_DIR="found"
+
+ AC_MSG_RESULT(from pkgconfig: version $FREETYPE2_VERSION found)
+ else
@@ -49,7 +50,7 @@
AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
--- a/configure 2018-04-24 11:10:05.000000000 -0400
+++ b/configure 2018-05-04 15:18:45.626367913 -0400
-@@ -34348,21 +34348,78 @@
+@@ -34348,21 +34348,79 @@
if test "$PHP_FREETYPE_DIR" != "no"; then
@@ -107,6 +108,7 @@
+ FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
+ FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
+ FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2`
++ FREETYPE2_DIR="found"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: from pkgconfig: version $FREETYPE2_VERSION found" >&5
+$as_echo "from pkgconfig: version $FREETYPE2_VERSION found" >&6; }
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/
@ 2019-04-05 14:35 Brian Evans
0 siblings, 0 replies; 7+ messages in thread
From: Brian Evans @ 2019-04-05 14:35 UTC (permalink / raw
To: gentoo-commits
commit: 4ea7582008609ece894f2a38d59baec92ae58403
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 5 14:34:57 2019 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Apr 5 14:34:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ea75820
dev-lang/php: Drop old patches relocated to an archive
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
.../php/files/5.6-mbstring-oniguruma-6.8.patch | 12 -
.../php-5.6-intl-detect-icu-via-pkg-config.patch | 154 ---------
.../files/php-5.6-intl-icu-memory-corruption.patch | 88 -----
.../php/files/php-5.6-intl-use-icu-namespace.patch | 365 ---------------------
dev-lang/php/files/php-5.6-no-bison-warnings.patch | 42 ---
5 files changed, 661 deletions(-)
diff --git a/dev-lang/php/files/5.6-mbstring-oniguruma-6.8.patch b/dev-lang/php/files/5.6-mbstring-oniguruma-6.8.patch
deleted file mode 100644
index 642b261950f..00000000000
--- a/dev-lang/php/files/5.6-mbstring-oniguruma-6.8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aurN a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
---- a/ext/mbstring/php_mbregex.c 2018-03-28 17:28:58.000000000 -0400
-+++ b/ext/mbstring/php_mbregex.c 2018-04-04 12:53:23.268296387 -0400
-@@ -454,7 +454,7 @@
- OnigUChar err_str[ONIG_MAX_ERROR_MESSAGE_LEN];
-
- found = zend_hash_find(&MBREX(ht_rc), (char *)pattern, patlen+1, (void **) &rc);
-- if (found == FAILURE || (*rc)->options != options || (*rc)->enc != enc || (*rc)->syntax != syntax) {
-+ if (found == FAILURE || onig_get_options(*rc) != options || onig_get_encoding(*rc) != enc || onig_get_syntax(*rc) != syntax) {
- if ((err_code = onig_new(&retval, (OnigUChar *)pattern, (OnigUChar *)(pattern + patlen), options, enc, syntax, &err_info)) != ONIG_NORMAL) {
- onig_error_code_to_str(err_str, err_code, &err_info);
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "mbregex compile err: %s", err_str);
diff --git a/dev-lang/php/files/php-5.6-intl-detect-icu-via-pkg-config.patch b/dev-lang/php/files/php-5.6-intl-detect-icu-via-pkg-config.patch
deleted file mode 100644
index dea2949c25e..00000000000
--- a/dev-lang/php/files/php-5.6-intl-detect-icu-via-pkg-config.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-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
-@@ -2201,49 +2201,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
-- AC_MSG_CHECKING([for ICU 4.0 or greater])
-- icu_version_full=`$ICU_CONFIG --version`
-- ac_IFS=$IFS
-- IFS="."
-- set $icu_version_full
-- IFS=$ac_IFS
-- icu_version=`expr [$]1 \* 1000 + [$]2`
-- AC_MSG_RESULT([found $icu_version_full])
-+ PHP_EVAL_INCLINE($ICU_CFLAGS)
-+ PHP_EVAL_LIBLINE($ICU_LIBS, $1)
-
-- if test "$icu_version" -lt "4000"; then
-- AC_MSG_ERROR([ICU version 4.0 or later is required])
-- fi
-+ ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
-+ ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit"
-
-- ICU_VERSION=$icu_version
-- ICU_INCS=`$ICU_CONFIG --cppflags-searchpath`
-- ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
-- PHP_EVAL_INCLINE($ICU_INCS)
-- PHP_EVAL_LIBLINE($ICU_LIBS, $1)
-+ if test "$PKG_CONFIG icu-io --atleast-version=60"; then
-+ ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"
- fi
- ])
-
---- a/ext/intl/config.m4
-+++ b/ext/intl/config.m4
-@@ -9,18 +9,10 @@ if test "$PHP_INTL" != "no"; then
- PHP_SETUP_ICU(INTL_SHARED_LIBADD)
- PHP_SUBST(INTL_SHARED_LIBADD)
- PHP_REQUIRE_CXX()
-- if test "$icu_version" -ge "4002"; then
-- icu_spoof_src=" spoofchecker/spoofchecker_class.c \
-- spoofchecker/spoofchecker.c\
-- spoofchecker/spoofchecker_create.c\
-- spoofchecker/spoofchecker_main.c"
-- else
-- icu_spoof_src=""
-- fi
-+ INTL_COMMON_FLAGS="$ICU_CFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
- PHP_NEW_EXTENSION(intl, php_intl.c \
- intl_error.c \
- intl_convert.c \
-- intl_convertcpp.cpp \
- collator/collator.c \
- collator/collator_class.c \
- collator/collator_sort.c \
-@@ -32,8 +24,6 @@ if test "$PHP_INTL" != "no"; then
- collator/collator_is_numeric.c \
- collator/collator_error.c \
- common/common_error.c \
-- common/common_enum.cpp \
-- common/common_date.cpp \
- converter/converter.c \
- formatter/formatter.c \
- formatter/formatter_main.c \
-@@ -53,17 +43,12 @@ if test "$PHP_INTL" != "no"; then
- dateformat/dateformat_attr.c \
- dateformat/dateformat_data.c \
- dateformat/dateformat_format.c \
-- dateformat/dateformat_format_object.cpp \
- dateformat/dateformat_parse.c \
-- dateformat/dateformat_create.cpp \
-- dateformat/dateformat_attrcpp.cpp \
-- dateformat/dateformat_helpers.cpp \
- msgformat/msgformat.c \
- msgformat/msgformat_attr.c \
- msgformat/msgformat_class.c \
- msgformat/msgformat_data.c \
- msgformat/msgformat_format.c \
-- msgformat/msgformat_helpers.cpp \
- msgformat/msgformat_parse.c \
- grapheme/grapheme_string.c \
- grapheme/grapheme_util.c \
-@@ -73,6 +58,20 @@ if test "$PHP_INTL" != "no"; then
- transliterator/transliterator.c \
- transliterator/transliterator_class.c \
- transliterator/transliterator_methods.c \
-+ idn/idn.c \
-+ spoofchecker/spoofchecker_class.c \
-+ spoofchecker/spoofchecker.c\
-+ spoofchecker/spoofchecker_create.c\
-+ spoofchecker/spoofchecker_main.c, $ext_shared,,$INTL_COMMON_FLAGS,cxx)
-+
-+ PHP_INTL_CPP_SOURCES="intl_convertcpp.cpp \
-+ common/common_enum.cpp \
-+ common/common_date.cpp \
-+ dateformat/dateformat_format_object.cpp \
-+ dateformat/dateformat_create.cpp \
-+ dateformat/dateformat_attrcpp.cpp \
-+ dateformat/dateformat_helpers.cpp \
-+ msgformat/msgformat_helpers.cpp \
- timezone/timezone_class.cpp \
- timezone/timezone_methods.cpp \
- calendar/calendar_class.cpp \
-@@ -83,9 +82,15 @@ if test "$PHP_INTL" != "no"; then
- breakiterator/breakiterator_methods.cpp \
- breakiterator/rulebasedbreakiterator_methods.cpp \
- breakiterator/codepointiterator_internal.cpp \
-- breakiterator/codepointiterator_methods.cpp \
-- idn/idn.c \
-- $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings)
-+ breakiterator/codepointiterator_methods.cpp"
-+
-+ PHP_INTL_CPP_FLAGS="$ICU_CXXFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
-+ if test "$ext_shared" = "no"; then
-+ PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CPP_SOURCES, $PHP_INTL_CPP_FLAGS)
-+ else
-+ PHP_ADD_SOURCES_X(PHP_EXT_DIR(intl), $PHP_INTL_CPP_SOURCES, $PHP_INTL_CPP_FLAGS, shared_objects_intl, yes)
-+ fi
-+
- PHP_ADD_BUILD_DIR($ext_builddir/collator)
- PHP_ADD_BUILD_DIR($ext_builddir/converter)
- PHP_ADD_BUILD_DIR($ext_builddir/common)
diff --git a/dev-lang/php/files/php-5.6-intl-icu-memory-corruption.patch b/dev-lang/php/files/php-5.6-intl-icu-memory-corruption.patch
deleted file mode 100644
index 1b18f7fc5c4..00000000000
--- a/dev-lang/php/files/php-5.6-intl-icu-memory-corruption.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Based on the following upstream commits:
-
-https://github.com/php/php-src/commit/45a05f38410d4a67c8c83c09906e2cfb42fc6e4c
-https://github.com/php/php-src/commit/534684d1042978f3c21caf9b665a7aca27f3f325
-
---- a/ext/intl/msgformat/msgformat_helpers.cpp
-+++ b/ext/intl/msgformat/msgformat_helpers.cpp
-@@ -27,6 +27,7 @@
- #include <unicode/timezone.h>
- #include <unicode/datefmt.h>
- #include <unicode/calendar.h>
-+#include <unicode/strenum.h>
-
- #include <vector>
-
-@@ -45,6 +46,7 @@ extern "C" {
-
- #if U_ICU_VERSION_MAJOR_NUM * 10 + U_ICU_VERSION_MINOR_NUM >= 48
- #define HAS_MESSAGE_PATTERN 1
-+#define HAS_MISALLOCATE_MEMORY_BUG 1
- #endif
-
- U_NAMESPACE_BEGIN
-@@ -345,6 +347,26 @@ static void umsg_set_timezone(MessageFormatter_object *mfo,
- return; /* already done */
- }
-
-+#ifdef HAS_MISALLOCATE_MEMORY_BUG
-+ /* There is a bug in ICU which prevents MessageFormatter::getFormats()
-+ to handle more than 10 formats correctly. The enumerator could be
-+ used to walk through the present formatters using getFormat(), which
-+ however seems to provide just a readonly access. This workaround
-+ prevents crash when there are > 10 formats but doesn't set any error.
-+ As a result, only DateFormatters with > 10 subformats are affected.
-+ This workaround should be ifdef'd out, when the bug has been fixed
-+ in ICU. */
-+ icu::StringEnumeration* fnames = mf->getFormatNames(err.code);
-+ if (!fnames || U_FAILURE(err.code)) {
-+ return;
-+ }
-+ count = fnames->count(err.code);
-+ delete fnames;
-+ if (count > 10) {
-+ return;
-+ }
-+#endif
-+
- formats = mf->getFormats(count);
-
- if (formats == NULL) {
---- /dev/null
-+++ b/ext/intl/tests/bug74484_MessageFormatter.phpt
-@@ -0,0 +1,35 @@
-+--TEST--
-+Bug #74484 MessageFormatter::formatMessage memory corruption with 11+ named placeholder
-+--SKIPIF--
-+<?php
-+if (!extension_loaded('intl'))
-+ die('skip intl extension not enabled');
-+if (version_compare(INTL_ICU_VERSION, '4.8') < 0)
-+ die('skip for ICU 4.8+');
-+?>
-+--FILE--
-+<?php
-+$text = "{a} {b} {c} {d} {e} {f} {g} {h} {i} {j} {k} {l}";
-+
-+$vars = array(
-+ 'a' => 1,
-+ 'b' => 2,
-+ 'c' => 3,
-+ 'd' => 4,
-+ 'e' => 5,
-+ 'f' => 6,
-+ 'g' => 7,
-+ 'h' => 8,
-+ 'i' => 9,
-+ 'j' => 10,
-+ 'k' => 11,
-+ 'l' => 12
-+);
-+
-+var_dump(MessageFormatter::formatMessage('en_US', $text, $vars));
-+
-+?>
-+==DONE==
-+--EXPECT--
-+string(26) "1 2 3 4 5 6 7 8 9 10 11 12"
-+==DONE==
diff --git a/dev-lang/php/files/php-5.6-intl-use-icu-namespace.patch b/dev-lang/php/files/php-5.6-intl-use-icu-namespace.patch
deleted file mode 100644
index 715adb303d6..00000000000
--- a/dev-lang/php/files/php-5.6-intl-use-icu-namespace.patch
+++ /dev/null
@@ -1,365 +0,0 @@
-Based on the following upstream commits:
-
-https://github.com/php/php-src/commit/8d35a423838eb462cd39ee535c5d003073cc5f22
-https://github.com/php/php-src/commit/d8200e48857aeaf09f7127751efc5632ef7660a7
-https://github.com/php/php-src/commit/9a8e7b571896f39f83cb000fdb7c466b6d328d52
-
---- a/ext/intl/breakiterator/breakiterator_class.cpp
-+++ b/ext/intl/breakiterator/breakiterator_class.cpp
-@@ -38,6 +38,7 @@ extern "C" {
- }
-
- using PHP::CodePointBreakIterator;
-+using icu::RuleBasedBreakIterator;
-
- /* {{{ Global variables */
- zend_class_entry *BreakIterator_ce_ptr;
---- a/ext/intl/breakiterator/breakiterator_class.h
-+++ b/ext/intl/breakiterator/breakiterator_class.h
-@@ -26,6 +26,8 @@
-
- #ifndef USE_BREAKITERATOR_POINTER
- typedef void BreakIterator;
-+#else
-+using icu::BreakIterator;
- #endif
-
- typedef struct {
---- a/ext/intl/breakiterator/breakiterator_methods.cpp
-+++ b/ext/intl/breakiterator/breakiterator_methods.cpp
-@@ -32,6 +32,8 @@ extern "C" {
- }
-
- using PHP::CodePointBreakIterator;
-+using icu::BreakIterator;
-+using icu::Locale;
-
- U_CFUNC PHP_METHOD(BreakIterator, __construct)
- {
---- a/ext/intl/breakiterator/codepointiterator_internal.cpp
-+++ b/ext/intl/breakiterator/codepointiterator_internal.cpp
-@@ -31,6 +31,8 @@ typedef union {
-
- using namespace PHP;
-
-+using icu::UCharCharacterIterator;
-+
- UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CodePointBreakIterator);
-
- CodePointBreakIterator::CodePointBreakIterator()
---- a/ext/intl/breakiterator/codepointiterator_internal.h
-+++ b/ext/intl/breakiterator/codepointiterator_internal.h
-@@ -18,8 +18,11 @@
- #define CODEPOINTITERATOR_INTERNAL_H
-
- #include <unicode/brkiter.h>
-+#include <unicode/unistr.h>
-
--using U_ICU_NAMESPACE::BreakIterator;
-+using icu::BreakIterator;
-+using icu::CharacterIterator;
-+using icu::UnicodeString;
-
- namespace PHP {
-
---- a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
-+++ b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
-@@ -25,6 +25,9 @@ extern "C" {
-
- #include "../intl_convertcpp.h"
-
-+using icu::RuleBasedBreakIterator;
-+using icu::Locale;
-+
- static inline RuleBasedBreakIterator *fetch_rbbi(BreakIterator_object *bio) {
- return (RuleBasedBreakIterator*)bio->biter;
- }
---- a/ext/intl/calendar/calendar_class.cpp
-+++ b/ext/intl/calendar/calendar_class.cpp
-@@ -34,6 +34,9 @@ extern "C" {
- #include <assert.h>
- }
-
-+using icu::GregorianCalendar;
-+using icu::Locale;
-+
- /* {{{ Global variables */
- zend_class_entry *Calendar_ce_ptr;
- zend_class_entry *GregorianCalendar_ce_ptr;
---- a/ext/intl/calendar/calendar_class.h
-+++ b/ext/intl/calendar/calendar_class.h
-@@ -26,6 +26,8 @@
-
- #ifndef USE_CALENDAR_POINTER
- typedef void Calendar;
-+#else
-+using icu::Calendar;
- #endif
-
- typedef struct {
---- a/ext/intl/calendar/calendar_methods.cpp
-+++ b/ext/intl/calendar/calendar_methods.cpp
-@@ -40,6 +40,8 @@ extern "C" {
- }
- #include "../common/common_enum.h"
-
-+using icu::Locale;
-+
- U_CFUNC PHP_METHOD(IntlCalendar, __construct)
- {
- zend_throw_exception( NULL,
---- a/ext/intl/calendar/gregoriancalendar_methods.cpp
-+++ b/ext/intl/calendar/gregoriancalendar_methods.cpp
-@@ -23,6 +23,8 @@
- #include <unicode/locid.h>
- #include <unicode/calendar.h>
- #include <unicode/gregocal.h>
-+#include <unicode/ustring.h>
-+
- extern "C" {
- #include "../php_intl.h"
- #define USE_TIMEZONE_POINTER 1
-@@ -32,6 +34,11 @@ extern "C" {
- #include <ext/date/php_date.h>
- }
-
-+using icu::GregorianCalendar;
-+using icu::Locale;
-+using icu::UnicodeString;
-+using icu::StringPiece;
-+
- static inline GregorianCalendar *fetch_greg(Calendar_object *co) {
- return (GregorianCalendar*)co->ucal;
- }
---- a/ext/intl/common/common_date.cpp
-+++ b/ext/intl/common/common_date.cpp
-@@ -25,6 +25,9 @@ extern "C" {
- #include <ext/date/php_date.h>
- }
-
-+using icu::TimeZone;
-+using icu::UnicodeString;
-+
- #ifndef INFINITY
- #define INFINITY (DBL_MAX+DBL_MAX)
- #endif
---- a/ext/intl/common/common_date.h
-+++ b/ext/intl/common/common_date.h
-@@ -28,6 +28,8 @@ U_CDECL_END
-
- #include <unicode/timezone.h>
-
-+using icu::TimeZone;
-+
- U_CFUNC TimeZone *timezone_convert_datetimezone(int type, void *object, int is_datetime, intl_error *outside_error, const char *func TSRMLS_DC);
- U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz,
- intl_error *err, const char *func TSRMLS_DC);
---- a/ext/intl/common/common_enum.h
-+++ b/ext/intl/common/common_enum.h
-@@ -69,6 +69,7 @@ U_CFUNC void zoi_with_current_get_current_data(zend_object_iterator *iter, zval
- U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter TSRMLS_DC);
-
- #ifdef __cplusplus
-+using icu::StringEnumeration;
- U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object TSRMLS_DC);
- #endif
-
---- a/ext/intl/converter/converter.c
-+++ b/ext/intl/converter/converter.c
-@@ -18,6 +18,8 @@
- #include "zend_exceptions.h"
-
- #include <unicode/utypes.h>
-+#include <unicode/utf8.h>
-+#include <unicode/utf16.h>
- #include <unicode/ucnv.h>
- #include <unicode/ustring.h>
-
---- a/ext/intl/dateformat/dateformat_format_object.cpp
-+++ b/ext/intl/dateformat/dateformat_format_object.cpp
-@@ -33,6 +33,12 @@ extern "C" {
- #include "../common/common_date.h"
- }
-
-+using icu::Locale;
-+using icu::DateFormat;
-+using icu::GregorianCalendar;
-+using icu::StringPiece;
-+using icu::SimpleDateFormat;
-+
- static const DateFormat::EStyle valid_styles[] = {
- DateFormat::kNone,
- DateFormat::kFull,
---- a/ext/intl/dateformat/dateformat_helpers.cpp
-+++ b/ext/intl/dateformat/dateformat_helpers.cpp
-@@ -28,6 +28,8 @@ extern "C" {
- #include "../calendar/calendar_class.h"
- }
-
-+using icu::GregorianCalendar;
-+
- int datefmt_process_calendar_arg(zval* calendar_zv,
- Locale const& locale,
- const char *func_name,
---- a/ext/intl/dateformat/dateformat_helpers.h
-+++ b/ext/intl/dateformat/dateformat_helpers.h
-@@ -22,11 +22,16 @@
- #endif
-
- #include <unicode/calendar.h>
-+#include <unicode/datefmt.h>
-
- extern "C" {
- #include "../php_intl.h"
- }
-
-+using icu::Locale;
-+using icu::Calendar;
-+using icu::DateFormat;
-+
- int datefmt_process_calendar_arg(zval* calendar_zv,
- Locale const& locale,
- const char *func_name,
---- a/ext/intl/grapheme/grapheme_string.c
-+++ b/ext/intl/grapheme/grapheme_string.c
-@@ -24,6 +24,7 @@
- #include "grapheme_util.h"
-
- #include <unicode/utypes.h>
-+#include <unicode/utf8.h>
- #include <unicode/ucol.h>
- #include <unicode/ustring.h>
- #include <unicode/ubrk.h>
-@@ -860,10 +861,10 @@ PHP_FUNCTION(grapheme_extract)
- pstr = str + start;
-
- /* just in case pstr points in the middle of a character, move forward to the start of the next char */
-- if ( !UTF8_IS_SINGLE(*pstr) && !U8_IS_LEAD(*pstr) ) {
-+ if ( !U8_IS_SINGLE(*pstr) && !U8_IS_LEAD(*pstr) ) {
- unsigned char *str_end = str + str_len;
-
-- while ( !UTF8_IS_SINGLE(*pstr) && !U8_IS_LEAD(*pstr) ) {
-+ while ( !U8_IS_SINGLE(*pstr) && !U8_IS_LEAD(*pstr) ) {
- pstr++;
- if ( pstr >= str_end ) {
- intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
---- a/ext/intl/intl_convertcpp.h
-+++ b/ext/intl/intl_convertcpp.h
-@@ -25,6 +25,8 @@
-
- #include <unicode/unistr.h>
-
-+using icu::UnicodeString;
-+
- int intl_stringFromChar(UnicodeString &ret, char *str, int32_t str_len, UErrorCode *status);
-
- int intl_charFromString(const UnicodeString &from, char **res, int *res_len, UErrorCode *status);
---- a/ext/intl/msgformat/msgformat_helpers.cpp
-+++ b/ext/intl/msgformat/msgformat_helpers.cpp
-@@ -76,6 +76,16 @@ MessageFormatAdapter::getMessagePattern(MessageFormat* m) {
- #endif
- U_NAMESPACE_END
-
-+using icu::Formattable;
-+using icu::Format;
-+using icu::DateFormat;
-+using icu::MessageFormat;
-+#ifdef HAS_MESSAGE_PATTERN
-+using icu::MessagePattern;
-+#endif
-+using icu::MessageFormatAdapter;
-+using icu::FieldPosition;
-+
- U_CFUNC int32_t umsg_format_arg_count(UMessageFormat *fmt)
- {
- int32_t fmt_count = 0;
-@@ -227,15 +237,16 @@ static HashTable *umsg_parse_format(MessageFormatter_object *mfo,
- UnicodeString typeString = mp.getSubstring(type_part);
- /* This is all based on the rules in the docs for MessageFormat
- * @see http://icu-project.org/apiref/icu4c/classMessageFormat.html */
-- if (typeString == "number") {
-+#define ASCII_LITERAL(s) UNICODE_STRING(s, sizeof(s)-1)
-+ if (typeString == ASCII_LITERAL("number")) {
- MessagePattern::Part style_part = mp.getPart(i + 1); /* Not advancing i */
- if (style_part.getType() == UMSGPAT_PART_TYPE_ARG_STYLE) {
- UnicodeString styleString = mp.getSubstring(style_part);
-- if (styleString == "integer") {
-+ if (styleString == ASCII_LITERAL("integer")) {
- type = Formattable::kInt64;
-- } else if (styleString == "currency") {
-+ } else if (styleString == ASCII_LITERAL("currency")) {
- type = Formattable::kDouble;
-- } else if (styleString == "percent") {
-+ } else if (styleString == ASCII_LITERAL("percent")) {
- type = Formattable::kDouble;
- } else { /* some style invalid/unknown to us */
- type = Formattable::kDouble;
-@@ -243,12 +254,13 @@ static HashTable *umsg_parse_format(MessageFormatter_object *mfo,
- } else { // if missing style, part, make it a double
- type = Formattable::kDouble;
- }
-- } else if ((typeString == "date") || (typeString == "time")) {
-+ } else if ((typeString == ASCII_LITERAL("date")) || (typeString == ASCII_LITERAL("time"))) {
- type = Formattable::kDate;
-- } else if ((typeString == "spellout") || (typeString == "ordinal")
-- || (typeString == "duration")) {
-+ } else if ((typeString == ASCII_LITERAL("spellout")) || (typeString == ASCII_LITERAL("ordinal"))
-+ || (typeString == ASCII_LITERAL("duration"))) {
- type = Formattable::kDouble;
- }
-+#undef ASCII_LITERAL
- } else {
- /* If there's no UMSGPAT_PART_TYPE_ARG_TYPE right after a
- * UMSGPAT_ARG_TYPE_SIMPLE argument, then the pattern
---- a/ext/intl/normalizer/normalizer_normalize.c
-+++ b/ext/intl/normalizer/normalizer_normalize.c
-@@ -24,6 +24,7 @@
- #include "normalizer_class.h"
- #include "normalizer_normalize.h"
- #include "intl_convert.h"
-+#include <unicode/utf8.h>
-
- /* {{{ proto string Normalizer::normalize( string $input [, string $form = FORM_C] )
- * Normalize a string. }}} */
---- a/ext/intl/timezone/timezone_class.cpp
-+++ b/ext/intl/timezone/timezone_class.cpp
-@@ -37,6 +37,8 @@ extern "C" {
- #include <ext/date/php_date.h>
- }
-
-+using icu::Calendar;
-+
- /* {{{ Global variables */
- U_CDECL_BEGIN
- zend_class_entry *TimeZone_ce_ptr = NULL;
---- a/ext/intl/timezone/timezone_class.h
-+++ b/ext/intl/timezone/timezone_class.h
-@@ -29,6 +29,8 @@
-
- #ifndef USE_TIMEZONE_POINTER
- typedef void TimeZone;
-+#else
-+using icu::TimeZone;
- #endif
-
- typedef struct {
---- a/ext/intl/timezone/timezone_methods.cpp
-+++ b/ext/intl/timezone/timezone_methods.cpp
-@@ -23,6 +23,7 @@
- #include <unicode/locid.h>
- #include <unicode/timezone.h>
- #include <unicode/ustring.h>
-+#include <unicode/calendar.h>
- #include "intl_convertcpp.h"
-
- #include "../common/common_date.h"
-@@ -37,6 +38,9 @@ extern "C" {
- }
- #include "common/common_enum.h"
-
-+using icu::Locale;
-+using icu::Calendar;
-+
- U_CFUNC PHP_METHOD(IntlTimeZone, __construct)
- {
- zend_throw_exception( NULL,
diff --git a/dev-lang/php/files/php-5.6-no-bison-warnings.patch b/dev-lang/php/files/php-5.6-no-bison-warnings.patch
deleted file mode 100644
index 18966599596..00000000000
--- a/dev-lang/php/files/php-5.6-no-bison-warnings.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From d3466a04345b31dfc62d94fe994b40321a6418ec Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 29 Sep 2016 15:43:06 -0400
-Subject: [PATCH 1/1] Zend/acinclude.m4: don't warn about >=bison-3.0.1
- versions.
-
-The PHP configure script will emit a warning if it thinks your bison
-version is insufficient:
-
- WARNING: This bison version is not supported for regeneration of
- the Zend/PHP parsers (found: 3.0, min: 204, excluded: 3.0).
-
-However, there is an error in the test that causes it to treat all
-3.0.x versions as if they were 3.0. The result is that users get
-warned about a perfectly acceptable version of bison.
-
-This patch is meant only for Gentoo, where we can require a working
-version of bison (something newer than 3.0.1). Having done so, this
-patch removes the check and the WARNING.
-
-Gentoo-Bug: 593278
-PHP-Bug: 69055
----
- Zend/acinclude.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4
-index 7fa8c99..9d6cb1d 100644
---- a/Zend/acinclude.m4
-+++ b/Zend/acinclude.m4
-@@ -9,7 +9,7 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
- # non-working versions, e.g. "3.0 3.2";
- # remove "none" when introducing the first incompatible bison version an
- # separate any following additions by spaces
-- bison_version_exclude="3.0"
-+ bison_version_exclude=""
-
- # for standalone build of Zend Engine
- test -z "$SED" && SED=sed
---
-2.7.3
-
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/
@ 2019-04-20 1:29 Aaron Bauman
0 siblings, 0 replies; 7+ messages in thread
From: Aaron Bauman @ 2019-04-20 1:29 UTC (permalink / raw
To: gentoo-commits
commit: d4d35067dee48487ffbb89116d51e8af195d5258
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Apr 19 18:16:30 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 01:29:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4d35067
dev-lang/php: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11527
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
...php-7.1.25-intl-detect-icu-via-pkg-config.patch | 121 --------------------
.../files/php-7.3.2-fix-iptcembed-bug77546.patch | 127 ---------------------
2 files changed, 248 deletions(-)
diff --git a/dev-lang/php/files/php-7.1.25-intl-detect-icu-via-pkg-config.patch b/dev-lang/php/files/php-7.1.25-intl-detect-icu-via-pkg-config.patch
deleted file mode 100644
index 2d4254d6e59..00000000000
--- a/dev-lang/php/files/php-7.1.25-intl-detect-icu-via-pkg-config.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-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,52 +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
-- AC_MSG_CHECKING([for ICU 4.0 or greater])
-- icu_version_full=`$ICU_CONFIG --version`
-- ac_IFS=$IFS
-- IFS="."
-- set $icu_version_full
-- IFS=$ac_IFS
-- icu_version=`expr [$]1 \* 1000 + [$]2`
-- AC_MSG_RESULT([found $icu_version_full])
--
-- if test "$icu_version" -lt "4000"; then
-- AC_MSG_ERROR([ICU version 4.0 or later is required])
-- fi
-+ PHP_EVAL_INCLINE($ICU_CFLAGS)
-+ PHP_EVAL_LIBLINE($ICU_LIBS, $1)
-
-- ICU_VERSION=$icu_version
-- ICU_INCS=`$ICU_CONFIG --cppflags-searchpath`
-- ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
-- PHP_EVAL_INCLINE($ICU_INCS)
-- PHP_EVAL_LIBLINE($ICU_LIBS, $1)
-+ ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
-+ ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit"
-
-- ICU_CXXFLAGS=`$ICU_CONFIG --cxxflags`
-- ICU_CXXFLAGS="$ICU_CXXFLAGS -DU_USING_ICU_NAMESPACE=1"
-+ if test "$PKG_CONFIG icu-io --atleast-version=60"; then
-+ ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"
- fi
- ])
-
---- a/ext/intl/config.m4
-+++ b/ext/intl/config.m4
-@@ -9,15 +9,7 @@ if test "$PHP_INTL" != "no"; then
- PHP_SETUP_ICU(INTL_SHARED_LIBADD)
- PHP_SUBST(INTL_SHARED_LIBADD)
- PHP_REQUIRE_CXX()
-- INTL_COMMON_FLAGS="$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
-- if test "$icu_version" -ge "4002"; then
-- icu_spoof_src=" spoofchecker/spoofchecker_class.c \
-- spoofchecker/spoofchecker.c\
-- spoofchecker/spoofchecker_create.c\
-- spoofchecker/spoofchecker_main.c"
-- else
-- icu_spoof_src=""
-- fi
-+ INTL_COMMON_FLAGS="$ICU_CFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
- PHP_NEW_EXTENSION(intl, php_intl.c \
- intl_error.c \
- intl_convert.c \
-@@ -68,9 +60,12 @@ if test "$PHP_INTL" != "no"; then
- transliterator/transliterator_methods.c \
- uchar/uchar.c \
- idn/idn.c \
-- $icu_spoof_src, $ext_shared,,$INTL_COMMON_FLAGS,cxx)
-+ spoofchecker/spoofchecker_class.c \
-+ spoofchecker/spoofchecker.c\
-+ spoofchecker/spoofchecker_create.c\
-+ spoofchecker/spoofchecker_main.c, $ext_shared,,$INTL_COMMON_FLAGS,cxx)
-
-- PHP_INTL_CXX_SOURCES="intl_convertcpp.cpp \
-+ PHP_INTL_CPP_SOURCES="intl_convertcpp.cpp \
- common/common_enum.cpp \
- common/common_date.cpp \
- dateformat/dateformat_format_object.cpp \
-@@ -89,11 +84,12 @@ if test "$PHP_INTL" != "no"; then
- breakiterator/rulebasedbreakiterator_methods.cpp \
- breakiterator/codepointiterator_internal.cpp \
- breakiterator/codepointiterator_methods.cpp"
-- PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $ICU_CXXFLAGS"
-+
-+ PHP_INTL_CPP_FLAGS="$ICU_CXXFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
- if test "$ext_shared" = "no"; then
-- PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CXX_SOURCES, $PHP_INTL_CXX_FLAGS)
-+ PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CPP_SOURCES, $PHP_INTL_CPP_FLAGS)
- else
-- PHP_ADD_SOURCES_X(PHP_EXT_DIR(intl), $PHP_INTL_CXX_SOURCES, $PHP_INTL_CXX_FLAGS, shared_objects_intl, yes)
-+ PHP_ADD_SOURCES_X(PHP_EXT_DIR(intl), $PHP_INTL_CPP_SOURCES, $PHP_INTL_CPP_FLAGS, shared_objects_intl, yes)
- fi
-
- PHP_ADD_BUILD_DIR($ext_builddir/collator)
---
-2.19.2
-
diff --git a/dev-lang/php/files/php-7.3.2-fix-iptcembed-bug77546.patch b/dev-lang/php/files/php-7.3.2-fix-iptcembed-bug77546.patch
deleted file mode 100644
index e157d250f2f..00000000000
--- a/dev-lang/php/files/php-7.3.2-fix-iptcembed-bug77546.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-https://git.php.net/?p=php-src.git;a=commit;h=f27f9022660d28c13c6209f4679768dcbd961b43
-
---- a/ext/standard/iptc.c
-+++ b/ext/standard/iptc.c
-@@ -273,7 +273,7 @@ PHP_FUNCTION(iptcembed)
- iptcdata_len++; /* make the length even */
- }
-
-- psheader[ 2 ] = (char) (iptcdata_len+28)>>8;
-+ psheader[ 2 ] = (char) ((iptcdata_len+28)>>8);
- psheader[ 3 ] = (iptcdata_len+28)&0xff;
-
- for (inx = 0; inx < 28; inx++) {
---- /dev/null
-+++ b/ext/standard/tests/image/iptcembed_002.phpt
-@@ -0,0 +1,110 @@
-+--TEST--
-+iptcembed() valid jpg stream
-+--FILE--
-+<?php
-+/*
-+# source code to generate base64 use behind as $base64_1x1_jpeg
-+# we don't want to be gd library dependant for this test
-+$file="1x1.jpg";
-+$ret=imagejpeg(imagecreatetruecolor(1, 1), $file, 100);
-+echo md5(file_get_contents($file)).PHP_EOL;
-+echo base64_encode(file_get_contents($file)).PHP_EOL;
-+unlink($file);
-+*/
-+
-+/*
-+test description :
-+1) create local file 1x1 jpeg (without iptc) (use base64 content to create file)
-+2) generate iptcdata string with function iptc_make_tag describe behind
-+3) use iptcembed php function with our 1x1 jpeg file and our iptcdata string
-+4) write local file2 with iptcembed return content
-+5) various check on file2 to verify that's a valid jpeg file with our tags
-+*/
-+
-+
-+#iptc_make_tag function from http://php.net/iptcembed
-+function iptc_make_tag($rec, $data, $value)
-+ {
-+ $length = strlen($value);
-+ $retval = chr(0x1C) . chr($rec) . chr($data);
-+ if($length < 0x8000) { $retval .= chr($length >> 8) . chr($length & 0xFF); }
-+ else { $retval .= chr(0x80) . chr(0x04) . chr(($length >> 24) & 0xFF) . chr(($length >> 16) & 0xFF) . chr(($length >> 8) & 0xFF) . chr($length & 0xFF); }
-+ return $retval . $value;
-+ }
-+
-+
-+$file="1x1.jpg";
-+$file2="1x1_with_iptc_tags.jpg";
-+$base64_1x1_jpeg="/9j/4AAQSkZJRgABAQEAYABgAAD//gA8Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2ODApLCBxdWFsaXR5ID0gMTAwCv/bAEMAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/bAEMBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/AABEIAAEAAQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AP8AP/oA/9k=";
-+#write file
-+$fd=fopen($file,"wb");
-+if ($fd) { fputs($fd,base64_decode($base64_1x1_jpeg)); fclose($fd); }
-+else { echo "error cant write $file".PHP_EOL;exit(1); }
-+#check file md5
-+$md5=md5_file($file);
-+if ($md5!="07dd8594450e8c18ab8a79d7cb4573c7") { echo "md5 error".PHP_EOL;exit(1); }
-+#check jpeg properties
-+list($width, $height, $type, $attr) = getimagesize($file,$info);
-+if ($width!=1) { echo "width error".PHP_EOL;exit(1); }
-+if ($height!=1) { echo "height error".PHP_EOL;exit(1); }
-+if ($type!=2) { echo "type error".PHP_EOL;exit(1); }
-+if (!isset($info["APP0"])) { echo "APP0 error".PHP_EOL;exit(1); }
-+
-+#our iptc tags
-+$tags=array();
-+$tags["2#105"]= "Tauren";
-+$tags["2#120"]= "Tauren with Trunk";
-+$tags["2#110"]= "Copyright 2004-2016, Blizzard";
-+$tags["2#025"]= "Tauren, Chaman, Blizzard";
-+$tags["2#090"]= "Thunder Bluffs";
-+#feed iptc string for iptcembed
-+$iptc='';
-+foreach ($tags as $tag => $string) { $rec=$tag[0]; $tag = substr($tag, 2); $iptc .= iptc_make_tag($rec, $tag, $string); }
-+#check iptc string md5
-+if (md5(base64_encode($iptc))!="7056c4b3060f92a4f9e5b7d0caa61859") { echo "iptc md5 error".PHP_EOL;exit(1); }
-+
-+#use iptcembed to get jpeg stream content with iptc tags
-+$content = iptcembed($iptc, $file,0);
-+
-+#write new image with iptc tags
-+if ($content === false) {echo "iptcembed error".PHP_EOL;exit(1); }
-+$fd=fopen($file2,"wb");
-+if ($fd) { fputs($fd,$content); fclose($fd); }
-+else { echo "error cant write $file2".PHP_EOL;exit(1); }
-+
-+
-+#check jpeg properties for new image with iptc tags
-+echo "new generated image with itpc tags : $file2".PHP_EOL;
-+$ret = getimagesize($file2,$info);
-+if ($ret===false) { echo "getimagesize error".PHP_EOL;exit(1); }
-+list($width, $height, $type, $attr) = $ret;
-+if ($width!=1) { echo "width error".PHP_EOL;exit(1); }
-+if ($height!=1) { echo "height error".PHP_EOL;exit(1); }
-+if ($type!=2) { echo "type error".PHP_EOL;exit(1); }
-+if (!isset($info["APP0"])) { echo "APP0 error".PHP_EOL;exit(1); }
-+if (!isset($info["APP13"])) { echo "APP13 error".PHP_EOL;exit(1); }
-+
-+$error=0;
-+$iptc_data_from_created_image = iptcparse($info['APP13']);
-+foreach ($tags as $tag => $string) {
-+ #check if tag exists
-+ if (!isset($iptc_data_from_created_image[$tag])) {
-+ echo "error iptc tag $tag not found".PHP_EOL;
-+ $error++;
-+ } else {
-+ #check value
-+ if ($iptc_data_from_created_image[$tag][0]!=$string) {
-+ echo "error tag $tag : bad value ($string != ".$iptc_data_from_created_image[$tag][0].")".PHP_EOL;
-+ $error++;
-+ }
-+ }
-+}
-+#clean before exit
-+@unlink($file);
-+@unlink($file2);
-+if ($error==0) { echo "OK".PHP_EOL;exit(0);}
-+echo "something wrong: $error errors".PHP_EOL;
-+?>
-+--EXPECT--
-+new generated image with itpc tags : 1x1_with_iptc_tags.jpg
-+OK
---
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/
@ 2021-11-15 21:56 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2021-11-15 21:56 UTC (permalink / raw
To: gentoo-commits
commit: 2529898489229fc1f055550654103c0606c56c58
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Nov 10 17:07:08 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 21:55:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25298984
dev-lang/php: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/22883
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-lang/php/files/php73-CVE2021-21703.patch | 397 ---------------------------
1 file changed, 397 deletions(-)
diff --git a/dev-lang/php/files/php73-CVE2021-21703.patch b/dev-lang/php/files/php73-CVE2021-21703.patch
deleted file mode 100644
index d565c84c364e..000000000000
--- a/dev-lang/php/files/php73-CVE2021-21703.patch
+++ /dev/null
@@ -1,397 +0,0 @@
-From c600ec7bcf2696882ffe961e7b158c67aa2e7277 Mon Sep 17 00:00:00 2001
-From: Jakub Zelenka <bukka@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
-
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/
@ 2022-03-23 15:24 Brian Evans
0 siblings, 0 replies; 7+ messages in thread
From: Brian Evans @ 2022-03-23 15:24 UTC (permalink / raw
To: gentoo-commits
commit: 8387d6dd241f9ef9569b07297ae559caf796c319
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 15:23:12 2022 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 15:23:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8387d6dd
dev-lang/php: Add additional SAPIs to the env.d CONFIG_PROTECT_MASK
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
dev-lang/php/files/20php5-envd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/php/files/20php5-envd b/dev-lang/php/files/20php5-envd
index f6033ae517c7..2a7cb1bd34b7 100644
--- a/dev-lang/php/files/20php5-envd
+++ b/dev-lang/php/files/20php5-envd
@@ -1,2 +1,2 @@
MANPATH="/usr/lib/php5/man/"
-CONFIG_PROTECT_MASK="/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache2-php5/ext-active/"
+CONFIG_PROTECT_MASK="/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache2-php5/ext-active/ /etc/php/fpm-php5/ext-active/ /etc/php/phpdbg-php5/ext-active/"
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-03-23 15:24 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-23 15:24 [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/ Brian Evans
-- strict thread matches above, loose matches on Subject: below --
2021-11-15 21:56 Conrad Kostecki
2019-04-20 1:29 Aaron Bauman
2019-04-05 14:35 Brian Evans
2018-05-08 17:56 Brian Evans
2016-07-26 21:46 Michael Orlitzky
2015-11-19 21:34 Michael Orlitzky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox