[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: 0771e0a34345350b76153a1d4826dbec82e0dbea
Author: Michael Orlitzky gentoo org>
AuthorDate: Tue Jul 9 19:16:23 2024 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Wed Jul 10 14:07:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0771e0a3
dev-lang/php: add 8.3.9, drop 8.3.8
Various improvements on top of the version bump:
* The system copy of media-libs/gd is now used.
* Autoconf cache variables are overridden to allow
cross-compiles with external libraries.
* New USE=opcache-jit flag to control the use of a
JIT within the opcache extension.
Closes: https://bugs.gentoo.org/857597
Closes: https://bugs.gentoo.org/906585
Bug: https://bugs.gentoo.org/931884
Signed-off-by: Michael Orlitzky gentoo.org>
dev-lang/php/Manifest |2 +-
dev-lang/php/files/php-8.3.9-gd-cachevars.patch| 68 ++
.../files/php-8.3.9-optional-png-testfixen.patch | 1277
dev-lang/php/metadata.xml |3 +
.../php/{php-8.3.8.ebuild => php-8.3.9.ebuild} | 89 +-
5 files changed, 1406 insertions(+), 33 deletions(-)
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index d558144544a8..56ca4d9663cd 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -4,4 +4,4 @@ DIST php-8.1.29.tar.xz 11826292 BLAKE2B
471f85504531c61e534c857a854de2ce9935b263
DIST php-8.2.15.tar.xz 12075384 BLAKE2B
cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4
SHA512
56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166
DIST php-8.2.18.tar.xz 12089400 BLAKE2B
82a4ef0aee7fa66018cb528e6fc2da40f67be2a75449ed85c54881e6725cfa9fe82d6d5655c12d2e92f3fd685479367b7c038df5af0d7a0a122d627c78c50514
SHA512
8bdd6e5aa19dac80745d258a43f7330a3096d47dc66cbef0054b8f9eb9ace5e87d841a4001185a783241a416975753c922425e977f50b2716ce643b6a7bf351f
DIST php-8.2.20.tar.xz 12097568 BLAKE2B
1e38e48ea9c28abfe2c3bd860bc5d959fbe327669c007f2e2a665ae14f5a045f6ad8a0a972f32618f88ea1ff3636c2692504478b5b094b48404d6c4a214f863b
SHA512
c659ed4809b6507aa428b483c85c7322815ac9d7d8e4bfe575513a5e69c5a680b8d089fd98a19f83d3a00df3de61468809f21408455913aa24d519776e44abc5
-DIST php-8.3.8.tar.xz 12480896 BLAKE2B
477129fcd766f2235e3d776c923ba51b76539f074245e8041a861db09ebbc648658b2756e6a23051a75a512fdc6e5c129633d1471213dec6f7e24d4da0d317e8
SHA512
1a2840f0b5dcbea6dfcc3894cb9e38d103bf4110c1b956438199deee0b60e5ae63cce34be25ca6f03ac8d26581a852657f8800f92fefe38345e20443b646bb3e
+DIST php-8.3.9.tar.xz 12470616 BLAKE2B
44cc360c91b121f6fe1c768134d2e5e355fe1ab23ebefb98e60e878755e79b0bd31fa46a435eb5c3dabf034fb7b4bd785db014dc63f40331a6b168a14d849571
SHA512
f6291b71cf2c66f9effc2a8a7b0365364481cd5532551161194376893074f1f20dc7e9dbd628727e3b07460ac63b6d38bf4871bf4976e2b3b290f230b0111360
diff --git a/dev-lang/php/files/php-8.3.9-gd-cachevars.patch
b/dev-lang/php/files/php-8.3.9-gd-cachevars.patch
new file mode 100644
index ..cb6ae9f3479d
--- /dev/null
+++ b/dev-lang/php/files/php-8.3.9-gd-cachevars.patch
@@ -0,0 +1,68 @@
+From b5e5a42d145be30be3856ff4be9af7978adec5c5 Mon Sep 17 00:00:00 2001
+From: Peter Kokot
+Date: Sun, 2 Jun 2024 19:47:39 +0200
+Subject: [PATCH] Wrap gdImageCreateFrom* checks in AC_CACHE_CHECK
+
+This enables cross-compiling edge cases to manually override the checks
+with the php_cv_lib_gd_gdImageCreateFrom* cache variables.
+---
+ ext/gd/config.m4 | 39 ---
+ 1 file changed, 20 insertions(+), 19 deletions(-)
+
+diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
+index d9c6d4f6ee0c2..5c1c7a867c2f8 100644
+--- a/ext/gd/config.m4
b/ext/gd/config.m4
+@@ -147,14 +147,15 @@ dnl that gd defines "junk" versions of each
gdImageCreateFromFoo function
+ dnl even when it does not support the Foo format. Those junk functions
+ dnl display a warning but eventually return normally, making a simple link
+ dnl or run test insufficient.
+-AC_DEFUN([PHP_GD_CHECK_FORMAT],[
+- old_LIBS="${LIBS}"
+- LIBS="${LIBS} ${GD_SHARED_LIBADD}"
+- old_CFLAGS="${CFLAGS}"
+- CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
+- AC_MSG_CHECKING([for working gdImageCreateFrom$1 in libgd])
+- AC_LANG_PUSH([C])
+- AC_RUN_IFELSE([AC_LANG_SOURCE([
++AC_DEFUN([PHP_GD_CHECK_FORMAT],
++[AS_VAR_PUSHDEF([php_var], [php_cv_lib_gd_gdImageCreateFrom$1])
++old_LIBS="${LIBS}"
++LIBS="${LIBS} ${GD_SHARED_LIBADD}"
++old_CFLAGS="${CFLAGS}"
++CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
++AC_LANG_PUSH([C])
++AC_CACHE_CHECK([for working gdImageCreateFrom$1 in libgd], [php_var],
++ [AC_RUN_IFELSE([AC_LANG_SOURCE([
+ #include
+ #include
+ #include
+@@ -173,17 +174,17 @@ int main(int argc, char** argv) {
+ gdSetErrorMethod(exit1);
+ gdImagePtr p = gdImageCreateFrom$1(f);
+ return 0;
+-}])],[
+-AC_MSG_RESULT([yes])
+-AC_DEFINE($2, 1, [Does gdImageCreateFrom$1 work?])
+
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: ccc5cdc89ecf3ad501acfa34650e63b3329e18da
Author: Michael Orlitzky gentoo org>
AuthorDate: Tue Apr 9 13:08:47 2024 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Tue Apr 9 13:50:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccc5cdc8
dev-lang/php: fix a failing test and a musl compatibility issue
Closes: https://bugs.gentoo.org/927461
Closes: https://bugs.gentoo.org/928072
Signed-off-by: Michael Orlitzky gentoo.org>
dev-lang/php/files/fix-musl-llvm.patch | 37 ++
dev-lang/php/php-8.1.27-r2.ebuild | 5 +++--
dev-lang/php/php-8.2.17.ebuild | 7 +++
dev-lang/php/php-8.3.4.ebuild | 7 +++
4 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/dev-lang/php/files/fix-musl-llvm.patch
b/dev-lang/php/files/fix-musl-llvm.patch
new file mode 100644
index ..bf299837829c
--- /dev/null
+++ b/dev-lang/php/files/fix-musl-llvm.patch
@@ -0,0 +1,37 @@
+From 684f0d9e5946e92008404b3d5a131edc4f34f7da Mon Sep 17 00:00:00 2001
+From: Arnaud Le Blanc
+Date: Thu, 4 Apr 2024 16:10:28 +0200
+Subject: [PATCH] Fix stream_cookie_seeker signature under musl
+
+---
+ main/streams/cast.c | 10 +++---
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/main/streams/cast.c b/main/streams/cast.c
+index 3bad65fbac1f5..8d9f4a9d2d54b 100644
+--- a/main/streams/cast.c
b/main/streams/cast.c
+@@ -104,6 +104,9 @@ static ssize_t stream_cookie_writer(void *cookie, const
char *buffer, size_t siz
+
+ # ifdef COOKIE_SEEKER_USES_OFF64_T
+ static int stream_cookie_seeker(void *cookie, off64_t *position, int whence)
++# else
++static int stream_cookie_seeker(void *cookie, off_t *position, int whence)
++# endif
+ {
+
+ *position = php_stream_seek((php_stream *)cookie,
(zend_off_t)*position, whence);
+@@ -113,13 +116,6 @@ static int stream_cookie_seeker(void *cookie, off64_t
*position, int whence)
+ }
+ return 0;
+ }
+-# else
+-static int stream_cookie_seeker(void *cookie, zend_off_t position, int whence)
+-{
+-
+- return php_stream_seek((php_stream *)cookie, position, whence);
+-}
+-# endif
+
+ static int stream_cookie_closer(void *cookie)
+ {
diff --git a/dev-lang/php/php-8.1.27-r2.ebuild
b/dev-lang/php/php-8.1.27-r2.ebuild
index 38bbbc21e31c..f434f0df4366 100644
--- a/dev-lang/php/php-8.1.27-r2.ebuild
+++ b/dev-lang/php/php-8.1.27-r2.ebuild
@@ -150,6 +150,7 @@ PATCHES=(
"${FILESDIR}/php-capstone-optional.patch"
"${FILESDIR}/php-8.1.27-gcc14-libxml.patch"
"${FILESDIR}/php-8.1.27-implicit-decls.patch"
+ "${FILESDIR}/fix-musl-llvm.patch"
)
# ARM/Windows functions that are expected to be undefined.
@@ -250,8 +251,8 @@ src_prepare() {
ext/curl/tests/bug77535.phpt \
ext/curl/tests/curl_error_basic.phpt \
ext/session/tests/bug74514.phpt \
- ext/session/tests/bug74936.phpt || die
-
+ ext/session/tests/bug74936.phpt \
+ ext/fileinfo/tests/bug78987.phpt || die
}
src_configure() {
diff --git a/dev-lang/php/php-8.2.17.ebuild b/dev-lang/php/php-8.2.17.ebuild
index f27df005dc4f..abe657f95e1d 100644
--- a/dev-lang/php/php-8.2.17.ebuild
+++ b/dev-lang/php/php-8.2.17.ebuild
@@ -151,6 +151,7 @@ PATCHES=(
"${FILESDIR}/php-capstone-optional.patch"
"${FILESDIR}/php-8.2.8-openssl-tests.patch"
"${FILESDIR}/php-8.1.27-implicit-decls.patch"
+ "${FILESDIR}/fix-musl-llvm.patch"
)
# ARM/Windows functions (bug 923335)
@@ -322,6 +323,12 @@ src_prepare() {
# https://github.com/php/php-src/issues/12801
rm ext/pcre/tests/gh11374.phpt || die
+
+ # This is a memory usage test with hard-coded limits. Whenever the
+ # limits are surpassed... they get increased... but in the meantime,
+ # the tests fail. This is not really a test that end users should
+ # be running pre-install, in my opinion. Bug 927461.
+ rm ext/fileinfo/tests/bug78987.phpt || die
}
src_configure() {
diff --git a/dev-lang/php/php-8.3.4.ebuild b/dev-lang/php/php-8.3.4.ebuild
index f4f263225218..7242d6432c71 100644
--- a/dev-lang/php/php-8.3.4.ebuild
+++ b/dev-lang/php/php-8.3.4.ebuild
@@ -146,6 +146,7 @@ PHP_MV="$(ver_cut 1)"
PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
+ "${FILESDIR}/fix-musl-llvm.patch"
)
# ARM/Windows functions (bug 923335)
@@ -267,6 +268,12 @@ src_prepare() {
# https://github.com/php/php-src/pull/13017
#
rm ext/dom/tests/DOMNode_isEqualNode.phpt || die
+
+ # This is a memory usage test with hard-coded limits. Whenever the
+ # limits are surpassed... they get increased... but in the meantime,
+ # the tests fail. This is not really a test that end users should
+ # be running pre-install, in my opinion. Bug 927461.
+ rm ext/fileinfo/tests/bug78987.phpt || die
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: 65a1a144e66496d746998a54d2c5ad7cf53252cb
Author: Michael Orlitzky gentoo org>
AuthorDate: Mon Mar 4 16:42:16 2024 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Mon Mar 4 16:49:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65a1a144
dev-lang/php: some more implicit function decl fixes for 8.1.x
Closes: https://bugs.gentoo.org/925877
Signed-off-by: Michael Orlitzky gentoo.org>
dev-lang/php/files/php-8.1.27-implicit-decls.patch | 72 ++
.../{php-8.1.27-r1.ebuild => php-8.1.27-r2.ebuild} | 7 +++
2 files changed, 79 insertions(+)
diff --git a/dev-lang/php/files/php-8.1.27-implicit-decls.patch
b/dev-lang/php/files/php-8.1.27-implicit-decls.patch
new file mode 100644
index ..443b02ba17c2
--- /dev/null
+++ b/dev-lang/php/files/php-8.1.27-implicit-decls.patch
@@ -0,0 +1,72 @@
+From 79df2b9dcbe0388667c832b2c702ca3158330ed7 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky
+Date: Mon, 4 Mar 2024 11:48:01 -0500
+Subject: [PATCH] ext/iconv/config.m4: add missing stdio.h include.
+
+The next generation of C compilers is going to enforce the C standard
+more strictly:
+
+ https://wiki.gentoo.org/wiki/Modern_C_porting
+
+One warning that will eventually become an error is
+-Wimplicit-function-declaration. This is relatively easy to catch in
+most code (it will fail to compile), but inside of autoconf tests it
+can go unnoticed because many feature-test compilations fail by
+design. For example,
+
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]],
+ [[iconv_ccs_init(NULL, NULL);]])]...
+
+is designed to fail if iconv_ccs_init() is not in iconv.h. On the
+other hand,
+
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include
+ int main() {
+printf("%d", _libiconv_version);
+return 0;
+ }
+
+should pass if _libiconv_version is defined. If the user has
+-Werror=implicit-function-declaration in his CFLAGS, however,
+it will not:
+
+ $ export CFLAGS="$CFLAGS -Werror=implicit-function-declaration"
+ $ ./configure
+ ...
+ checking if using GNU libiconv... no
+
+This is because the stdio.h header that defines printf() is missing:
+
+ conftest.c:240:3: error: implicit declaration of function 'printf'
+ [-Werror=implicit-function-declaration]
+240 | printf("%d", _libiconv_version);
+| ^~
+ conftest.c:239:1: note: include '' or provide a declaration
+ of 'printf'
+
+This commit adds the include, correcting the test with any compiler
+that balks at implicit function definitions.
+
+(Backport to php-8.1.27)
+
+Closes GH-10751
+---
+ ext/iconv/config.m4 | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
+index ac57c81e..b8044bf2 100644
+--- a/ext/iconv/config.m4
b/ext/iconv/config.m4
+@@ -30,6 +30,7 @@ if test "$PHP_ICONV" != "no"; then
+ AC_MSG_CHECKING([if using GNU libiconv])
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include
++#include
+ int main() {
+ printf("%d", _libiconv_version);
+ return 0;
+--
+2.43.0
+
diff --git a/dev-lang/php/php-8.1.27-r1.ebuild
b/dev-lang/php/php-8.1.27-r2.ebuild
similarity index 99%
rename from dev-lang/php/php-8.1.27-r1.ebuild
rename to dev-lang/php/php-8.1.27-r2.ebuild
index ee3853ec5893..38bbbc21e31c 100644
--- a/dev-lang/php/php-8.1.27-r1.ebuild
+++ b/dev-lang/php/php-8.1.27-r2.ebuild
@@ -149,6 +149,7 @@ PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
"${FILESDIR}/php-capstone-optional.patch"
"${FILESDIR}/php-8.1.27-gcc14-libxml.patch"
+ "${FILESDIR}/php-8.1.27-implicit-decls.patch"
)
# ARM/Windows functions that are expected to be undefined.
@@ -158,6 +159,12 @@ QA_CONFIG_IMPL_DECL_SKIP=(
_controlfp_s
)
+# Functions from alternate iconv implementations (bug 925268)
+QA_CONFIG_IMPL_DECL_SKIP+=(
+ iconv_ccs_init
+ cstoccsid
+)
+
php_install_ini() {
local phpsapi="${1}"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: 4a5ef8029ab6211cfc7b710e1c0e49375dd1d0a7
Author: Michael Orlitzky gentoo org>
AuthorDate: Sun Feb 18 22:57:48 2024 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Sun Feb 18 23:54:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a5ef802
dev-lang/php: replace 8.2.15-r1 and 8.3.2-r1 with 8.2.16 and 8.3.3
Closes: https://bugs.gentoo.org/923335
Signed-off-by: Michael Orlitzky gentoo.org>
dev-lang/php/Manifest| 3 ++-
dev-lang/php/files/php-8.2.15-gcc14-build-fix.patch | 16
dev-lang/php/{php-8.2.15-r1.ebuild => php-8.2.16.ebuild} | 8 +++-
dev-lang/php/{php-8.3.2-r1.ebuild => php-8.3.3.ebuild} | 8 +++-
4 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index f0d120a348b5..1924401cad65 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,5 @@
DIST php-8.1.26.tar.xz 11809448 BLAKE2B
e1d50f1de572580a207586b3c3b57081f7b9f1b680ffe8f9e82c88c9285af117dd7e9e2576fcb13119176cb9cd02b39481b6f40e9a1df81aa90b8c4d3e59e4b1
SHA512
5bc40077e57c0fccdf17810d688baea416f22ac248bb01b73d2e2590fc4cfabc7001c1c3833281a60870c74178f7b06cbc85474eba695aabf969ad0081a98417
DIST php-8.1.27.tar.xz 11915228 BLAKE2B
83f4f3c25435b26dc526dc1fd7aff44cd03157349f9bb6454e216525a16c2bbc3bfac47cce6b5ea8bfdfcf3c7f27e342fc602ca7d2491fe89db06ea93f686f0e
SHA512
07fb2b8e10e2487635e26bfd8a27949a26b85f76bc3984ad8599224bb7a7f9498d84299335ae5a0bba16599275e9747ab141f73f4f2076ddf49ebec8e76fd0ed
DIST php-8.2.15.tar.xz 12075384 BLAKE2B
cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4
SHA512
56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166
-DIST php-8.3.2.tar.xz 12440200 BLAKE2B
90ab2fe220d99cc1da47162e04c768dc35ed4044ea9154f67bbc9124372859b85a33270bc38d41e9ab28df4b0defaf0e78cffe8eb8bd6fdfbec296a31ea4beab
SHA512
acf9013d35ae639558fd4816d12dcae03f8af7944c2639f33cd33517503c6170d30101da6c72ebdaf5542bcaf858a54a22ecc8f86822a128f52938bd6ea9606c
+DIST php-8.2.16.tar.xz 12085228 BLAKE2B
6fcf3f5be8443c70e88746fdd609016c322b86ebc0257ee8db0f8551c73804bae2ecb156ee835b09aedb23bb2026658c3f24a8f722dce80e427bdab844bc27ce
SHA512
99e5c9eee4c5a35b3e1939c748ded87c8bff4a340d677516ed24dcf4207c51403d38524c46d6e79de5efe90d7368ba82052ec8a29dd5955f549e8198c1e917f6
+DIST php-8.3.3.tar.xz 12463880 BLAKE2B
ac0baabe875be8ce42c26713f78733140d47f33636aa0e16e2685c83f558afea905707ca133b06ea28ad8de043d7db7d0931259c7c07a2de2c04a935d76db365
SHA512
42141cc46b6abb11fa51cc96c34424cbf9990150b973d84488fa39a07935b22552a1316978f5a4e48762bf3c94eee3d7dfe741c4ee1a12bf752ce1c2660cc8b0
diff --git a/dev-lang/php/files/php-8.2.15-gcc14-build-fix.patch
b/dev-lang/php/files/php-8.2.15-gcc14-build-fix.patch
deleted file mode 100644
index 5f21f442ee06..
--- a/dev-lang/php/files/php-8.2.15-gcc14-build-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://github.com/php/php-src/commit/72526609413e8a8cd768ed4966c17b1a9db6c12c.patch
-From: Remi Collet
-Date: Mon, 22 Jan 2024 10:01:25 +0100
-Subject: [PATCH] Fix GH-13215 GCC 14 build
-
a/Zend/zend_atomic.h
-+++ b/Zend/zend_atomic.h
-@@ -23,7 +23,7 @@
- ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || (__GNUC__ > (x)))
-
- /* Builtins are used to avoid library linkage */
--#if __has_feature(c_atomic)
-+#if __has_feature(c_atomic) && defined(__clang__)
- #define HAVE_C11_ATOMICS 1
- #elif ZEND_GCC_PREREQ(4, 7)
- #define HAVE_GNUC_ATOMICS 1
diff --git a/dev-lang/php/php-8.2.15-r1.ebuild b/dev-lang/php/php-8.2.16.ebuild
similarity index 99%
rename from dev-lang/php/php-8.2.15-r1.ebuild
rename to dev-lang/php/php-8.2.16.ebuild
index 66bb272f5852..b577e38682dd 100644
--- a/dev-lang/php/php-8.2.15-r1.ebuild
+++ b/dev-lang/php/php-8.2.16.ebuild
@@ -150,7 +150,13 @@ PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
"${FILESDIR}/php-capstone-optional.patch"
"${FILESDIR}/php-8.2.8-openssl-tests.patch"
- "${FILESDIR}/php-8.2.15-gcc14-build-fix.patch"
+)
+
+# ARM/Windows functions that are expected to be undefined.
+QA_CONFIG_IMPL_DECL_SKIP=(
+ __crc32d
+ _controlfp
+ _controlfp_s
)
php_install_ini() {
diff --git a/dev-lang/php/php-8.3.2-r1.ebuild b/dev-lang/php/php-8.3.3.ebuild
similarity index 99%
rename from dev-lang/php/php-8.3.2-r1.ebuild
rename to dev-lang/php/php-8.3.3.ebuild
index e2dff19d343f..c914d8167246 100644
--- a/dev-lang/php/php-8.3.2-r1.ebuild
+++ b/dev-lang/php/php-8.3.3.ebuild
@@ -149,7 +149,13 @@ PHP_MV="$(ver_cut 1)"
PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
- "${FILESDIR}/php-8.2.15-gcc14-build-fix.patch"
+)
+
+# ARM/Windows functions that are expected to be undefined.
+QA_CONFIG_IMPL_DECL_SKIP=(
+ __crc32d
+ _controlfp
+ _controlfp_s
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, profiles/, dev-lang/php/
commit: e8d2efcc6257f0f976c80d31349d65a24fde1c9c Author: David Seifert gentoo org> AuthorDate: Fri Sep 15 07:52:24 2023 + Commit: David Seifert gentoo org> CommitDate: Fri Sep 15 07:52:24 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8d2efcc dev-lang/php: drop 7.4.33-r4, 7.4.33-r5, 7.4.33-r6 Signed-off-by: David Seifert gentoo.org> dev-lang/php/Manifest | 1 - dev-lang/php/files/bug81656-gcc-11.patch | 53 -- dev-lang/php/files/php-7.4.33-CVE-2022-31631.patch | 50 -- dev-lang/php/files/php-7.4.33-CVE-2023-0567.patch | 114 dev-lang/php/files/php-7.4.33-CVE-2023-0568.patch | 37 - dev-lang/php/files/php-7.4.33-CVE-2023-0662.patch | 48 -- dev-lang/php/metadata.xml | 3 - dev-lang/php/php-7.4.33-r4.ebuild | 749 dev-lang/php/php-7.4.33-r5.ebuild | 753 - dev-lang/php/php-7.4.33-r6.ebuild | 751 profiles/package.mask | 8 - 11 files changed, 2567 deletions(-) diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 25c8dbe4043c..64d30eed7555 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -1,4 +1,3 @@ -DIST php-7.4.33.tar.xz 10420144 BLAKE2B e75817e79c698628c873c90afb3b5677480d03ecf07e8f2e26a062bc5b91affc6079e792e864f28cf12d45f86e5d01ede289ecdcefc06477986d193d22c982ef SHA512 499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d DIST php-8.0.29.tar.xz 10803592 BLAKE2B 6e15ce459aa5a51b2a07a4bfa1f6dba076dbbd4828ccdcb8dc4796f64ad3dbda6ee2b6789880591847a7de0d077072e63c46f13399b5b44a4ec34c83172fb6ac SHA512 5f849753bbcc12e253160af072213bc1ede32e5051684129707d32fd6ce8e12867fcf7a5f6790b25071fdda0508dfffd3344e4bb850a747cb8f3c9aee970311d DIST php-8.0.30.tar.xz 10821076 BLAKE2B 9a914ce99ec1d5d554f063ba324d95bd6d39912a13f34f9b3e09fa020c96c0a50ff919e8d829fd663522be2b68bea8934d7f67c52ad45b64d72946f0ba5f3925 SHA512 fb816e0a4e4dc506b0ea4425f26690edc6afadb5474ac84df0a1aa293abecd50d128b36074e3e0740c7228109d486ca446869a9c920419610a20ab5989870782 DIST php-8.1.20.tar.xz 11793228 BLAKE2B ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096 SHA512 d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558 diff --git a/dev-lang/php/files/bug81656-gcc-11.patch b/dev-lang/php/files/bug81656-gcc-11.patch deleted file mode 100644 index 8dfe1deb2b33.. --- a/dev-lang/php/files/bug81656-gcc-11.patch +++ /dev/null @@ -1,53 +0,0 @@ -From bb00a649e0c1ac57718cd9971e7e6f933cb2dadd Mon Sep 17 00:00:00 2001 -From: Michael Wallner -Date: Thu, 25 Nov 2021 07:43:14 +0100 -Subject: [PATCH] fix #81656: GCC-11 silently ignores -R - - build/php.m4 | 28 ++-- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/build/php.m4 b/build/php.m4 -index 3af2b8b72d47..4697c5df9274 100644 a/build/php.m4 -+++ b/build/php.m4 -@@ -279,25 +279,25 @@ dnl - dnl Checks for -R, etc. switch. - dnl - AC_DEFUN([PHP_RUNPATH_SWITCH],[ --AC_MSG_CHECKING([if compiler supports -R]) --AC_CACHE_VAL(php_cv_cc_dashr,[ -+AC_MSG_CHECKING([if compiler supports -Wl,-rpath,]) -+AC_CACHE_VAL(php_cv_cc_rpath,[ - SAVE_LIBS=$LIBS -- LIBS="-R /usr/$PHP_LIBDIR $LIBS" -- AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],[php_cv_cc_dashr=yes],[php_cv_cc_dashr=no]) -+ LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],[php_cv_cc_rpath=yes],[php_cv_cc_rpath=no]) - LIBS=$SAVE_LIBS]) --AC_MSG_RESULT([$php_cv_cc_dashr]) --if test $php_cv_cc_dashr = "yes"; then -- ld_runpath_switch=-R -+AC_MSG_RESULT([$php_cv_cc_rpath]) -+if test $php_cv_cc_rpath = "yes"; then -+ ld_runpath_switch=-Wl,-rpath, - else -- AC_MSG_CHECKING([if compiler supports -Wl,-rpath,]) -- AC_CACHE_VAL(php_cv_cc_rpath,[ -+ AC_MSG_CHECKING([if compiler supports -R]) -+ AC_CACHE_VAL(php_cv_cc_dashr,[ - SAVE_LIBS=$LIBS --LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS" --AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],[php_cv_cc_rpath=yes],[php_cv_cc_rpath=no]) -+LIBS="-R /usr/$PHP_LIBDIR $LIBS" -+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],[php_cv_cc_dashr=yes],[php_cv_cc_dashr=no]) - LIBS=$SAVE_LIBS]) -- AC_MSG_RESULT([$php_cv_cc_rpath]) -- if test $php_cv_cc_rpath = "yes"; then --ld_runpath_switch=-Wl,-rpath, -+ AC_MSG_RESULT([$php_cv_cc_dashr]) -+ if test $php_cv_cc_dashr = "yes"; then -+ld_runpath_switch=-R - else - dnl Something innocuous. - ld_runpath_switch=-L diff --git a/dev-lang/php/files/php-7.4.33-CVE-2022-31631.patch b/dev-lang/php/files/php-7.4.33-CVE-2022-31631.patch deleted file mode 100644 index 6aa309549c88.. --- a/dev-lang/php/files/php-7.4.
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: e3633b3970dbbde652043324504ce21064668f8f
Author: Brian Evans gentoo org>
AuthorDate: Fri May 5 13:11:26 2023 +
Commit: Brian Evans gentoo org>
CommitDate: Fri May 5 13:18:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3633b39
dev-lang/php: Backport capstone detection added upstream
This is a trimmed down version of mjo's patch to apply to a wider array
of versions. The oprofile bits omiitted are not important as defines
block their calling and the defines are removed from the configure.
Fixes: https://bugs.gentoo.org/905725
Signed-off-by: Brian Evans gentoo.org>
dev-lang/php/files/php-capstone-optional.patch | 78 ++
dev-lang/php/php-8.1.18.ebuild | 1 +
dev-lang/php/php-8.2.5.ebuild | 1 +
3 files changed, 80 insertions(+)
diff --git a/dev-lang/php/files/php-capstone-optional.patch
b/dev-lang/php/files/php-capstone-optional.patch
new file mode 100644
index ..a4719bbb6857
--- /dev/null
+++ b/dev-lang/php/files/php-capstone-optional.patch
@@ -0,0 +1,78 @@
+diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
+index 444ded9976ac..fb3324cf82a3 100644
+--- a/ext/opcache/config.m4
b/ext/opcache/config.m4
+@@ -18,6 +18,12 @@ PHP_ARG_ENABLE([opcache-jit],
+ [yes],
+ [no])
+
++PHP_ARG_WITH([opcache-capstone],,
++ [AS_HELP_STRING([--with-opcache-capstone],
++[support opcache JIT disassembly through capstone])],
++ [no],
++ [no])
++
+ if test "$PHP_OPCACHE" != "no"; then
+
+ dnl Always build as shared extension
+@@ -68,41 +74,18 @@ if test "$PHP_OPCACHE" != "no"; then
+ DASM_FLAGS="$DASM_FLAGS -D ZTS=1"
+ fi
+
+-PKG_CHECK_MODULES([CAPSTONE], [capstone >= 3.0.0],
+-[have_capstone="yes"], [have_capstone="no"])
+-if test "$have_capstone" = "yes"; then
+-AC_DEFINE(HAVE_CAPSTONE, 1, [ ])
++AS_IF([test x"$with_opcache_capstone" = "xyes"],[
++ PKG_CHECK_MODULES([CAPSTONE],[capstone >= 3.0.0],[
++AC_DEFINE([HAVE_CAPSTONE], [1], [Capstone is available])
+ PHP_EVAL_LIBLINE($CAPSTONE_LIBS, OPCACHE_SHARED_LIBADD)
+ PHP_EVAL_INCLINE($CAPSTONE_CFLAGS)
+-fi
+-
+-PHP_SUBST(DASM_FLAGS)
+-PHP_SUBST(DASM_ARCH)
+-
+-AC_MSG_CHECKING(for opagent in default path)
+-for i in /usr/local /usr; do
+- if test -r $i/include/opagent.h; then
+-OPAGENT_DIR=$i
+-AC_MSG_RESULT(found in $i)
+-break
+- fi
+-done
+-if test -z "$OPAGENT_DIR"; then
+- AC_MSG_RESULT(not found)
+-else
+- PHP_CHECK_LIBRARY(opagent, op_write_native_code,
+- [
+-AC_DEFINE(HAVE_OPROFILE,1,[ ])
+-PHP_ADD_INCLUDE($OPAGENT_DIR/include)
+-PHP_ADD_LIBRARY_WITH_PATH(opagent, $OPAGENT_DIR/$PHP_LIBDIR/oprofile,
OPCACHE_SHARED_LIBADD)
+-PHP_SUBST(OPCACHE_SHARED_LIBADD)
+- ],[
+-AC_MSG_RESULT(not found)
+ ],[
+--L$OPAGENT_DIR/$PHP_LIBDIR/oprofile
++AC_MSG_ERROR([capstone >= 3.0 required but not found])
+ ])
+-fi
++])
+
++PHP_SUBST(DASM_FLAGS)
++PHP_SUBST(DASM_ARCH)
+ fi
+
+ AC_CHECK_FUNCS([mprotect memfd_create])
+diff --git a/ext/opcache/jit/Makefile.frag b/ext/opcache/jit/Makefile.frag
+index 98c5cdaea249..f9ae2e0cf4b9 100644
+--- a/ext/opcache/jit/Makefile.frag
b/ext/opcache/jit/Makefile.frag
+@@ -11,7 +11,6 @@ $(builddir)/jit/zend_jit.lo: \
+ $(srcdir)/jit/zend_jit_disasm.c \
+ $(srcdir)/jit/zend_jit_gdb.c \
+ $(srcdir)/jit/zend_jit_perf_dump.c \
+- $(srcdir)/jit/zend_jit_oprofile.c \
+ $(srcdir)/jit/zend_jit_vtune.c \
+ $(srcdir)/jit/zend_jit_trace.c \
+ $(srcdir)/jit/zend_elf.c
diff --git a/dev-lang/php/php-8.1.18.ebuild b/dev-lang/php/php-8.1.18.ebuild
index 20d68c6387fd..7a0c8ba9fcf7 100644
--- a/dev-lang/php/php-8.1.18.ebuild
+++ b/dev-lang/php/php-8.1.18.ebuild
@@ -147,6 +147,7 @@ PHP_MV="$(ver_cut 1)"
PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
+ "${FILESDIR}/php-capstone-optional.patch"
)
php_install_ini() {
diff --git a/dev-lang/php/php-8.2.5.ebuild b/dev-lang/php/php-8.2.5.ebuild
index bb2d5ee06588..d8e80841110d 100644
--- a/dev-lang/php/php-8.2.5.ebuild
+++ b/dev-lang/php/php-8.2.5.ebuild
@@ -148,6 +148,7 @@ PHP_MV="$(ver_cut 1)"
PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
+ "${FILESDIR}/php-capstone-optional.patch"
)
php_install_ini() {
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: 7cb74e0dfb7422871ba57d0dc76fc8531576f32e
Author: Brian Evans gentoo org>
AuthorDate: Thu Jan 5 20:46:07 2023 +
Commit: Brian Evans gentoo org>
CommitDate: Thu Jan 5 21:30:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb74e0d
dev-lang/php: Apply CVE-2022-31631 patch to 7.4.33
Bug: https://bugs.gentoo.org/889882
Signed-off-by: Brian Evans gentoo.org>
dev-lang/php/files/php-7.4.33-CVE-2022-31631.patch | 50 ++
dev-lang/php/php-7.4.33-r1.ebuild | 750 +
2 files changed, 800 insertions(+)
diff --git a/dev-lang/php/files/php-7.4.33-CVE-2022-31631.patch
b/dev-lang/php/files/php-7.4.33-CVE-2022-31631.patch
new file mode 100644
index ..6aa309549c88
--- /dev/null
+++ b/dev-lang/php/files/php-7.4.33-CVE-2022-31631.patch
@@ -0,0 +1,50 @@
+From 921b6813da3237a83e908998483f46ae3d8bacba Mon Sep 17 00:00:00 2001
+From: "Christoph M. Becker"
+Date: Mon, 31 Oct 2022 17:20:23 +0100
+Subject: [PATCH] Fix #81740: PDO::quote() may return unquoted string
+
+`sqlite3_snprintf()` expects its first parameter to be `int`; we need
+to avoid overflow.
+---
+ ext/pdo_sqlite/sqlite_driver.c | 3 +++
+ ext/pdo_sqlite/tests/bug81740.phpt | 17 +
+ 2 files changed, 20 insertions(+)
+ create mode 100644 ext/pdo_sqlite/tests/bug81740.phpt
+
+diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c
+index 4233ff10ff2e..5a72a1eda23f 100644
+--- a/ext/pdo_sqlite/sqlite_driver.c
b/ext/pdo_sqlite/sqlite_driver.c
+@@ -232,6 +232,9 @@ static char *pdo_sqlite_last_insert_id(pdo_dbh_t *dbh,
const char *name, size_t
+ /* NB: doesn't handle binary strings... use prepared stmts for that */
+ static int sqlite_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, size_t
unquotedlen, char **quoted, size_t *quotedlen, enum pdo_param_type paramtype )
+ {
++ if (unquotedlen > (INT_MAX - 3) / 2) {
++ return 0;
++ }
+ *quoted = safe_emalloc(2, unquotedlen, 3);
+ sqlite3_snprintf(2*unquotedlen + 3, *quoted, "'%q'", unquoted);
+ *quotedlen = strlen(*quoted);
+diff --git a/ext/pdo_sqlite/tests/bug81740.phpt
b/ext/pdo_sqlite/tests/bug81740.phpt
+new file mode 100644
+index ..99fb07c3048b
+--- /dev/null
b/ext/pdo_sqlite/tests/bug81740.phpt
+@@ -0,0 +1,17 @@
++--TEST--
++Bug #81740 (PDO::quote() may return unquoted string)
++--SKIPIF--
++
++--INI--
++memory_limit=-1
++--FILE--
++quote($string));
++?>
++--EXPECT--
++bool(false)
diff --git a/dev-lang/php/php-7.4.33-r1.ebuild
b/dev-lang/php/php-7.4.33-r1.ebuild
new file mode 100644
index ..782d2e8f7e1d
--- /dev/null
+++ b/dev-lang/php/php-7.4.33-r1.ebuild
@@ -0,0 +1,750 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/";
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz";
+
+LICENSE="PHP-3.01
+ BSD
+ Zend-2.0
+ bcmath? ( LGPL-2.1+ )
+ fpm? ( BSD-2 )
+ gd? ( gd )
+ unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+ ${SAPIS/cli/+cli}
+ threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+ coverage +ctype curl debug
+ enchant exif ffi +fileinfo +filter firebird
+ +flatfile ftp gd gdbm gmp +iconv imap inifile
+ intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb
+ mhash mssql mysql mysqli nls
+ oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+ readline selinux +session session-mm sharedmem
+ +simplexml snmp soap sockets sodium spell sqlite ssl
+ sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+ +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+ || ( cli cgi fpm apache2 embed phpdbg )
+ cli? ( ^^ ( readline libedit ) )
+ !cli? ( ?? ( readline libedit ) )
+ truetype? ( gd zlib )
+ webp? ( gd zlib )
+ cjk? ( gd zlib )
+ exif? ( gd zlib )
+ xpm? ( gd zlib )
+ gd? ( zlib )
+ simplexml? ( xml )
+ soap? ( xml )
+ xmlrpc? ( xml iconv )
+ xmlreader? ( xml )
+ xmlwriter? ( xml )
+ xslt? ( xml )
+ ldap-sasl? ( ldap )
+ oci8-instant-client? ( !ldap )
+ q
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: 0b3af89c17ec692f4dc4c73bf062b4495be26a28
Author: Brian Evans gentoo org>
AuthorDate: Tue Apr 5 19:02:25 2022 +
Commit: Brian Evans gentoo org>
CommitDate: Tue Apr 5 19:02:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b3af89c
dev-lang/php: Drop 7.3 slot
Signed-off-by: Brian Evans gentoo.org>
dev-lang/php/Manifest | 2 -
dev-lang/php/files/php-freetype-2.9.1.patch | 233 -
dev-lang/php/files/php-icu-70.patch | 45 --
dev-lang/php/php-7.3.32-r1.ebuild | 754
dev-lang/php/php-7.3.33-r1.ebuild | 754
5 files changed, 1788 deletions(-)
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 915425358534..4dada26aa33b 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,5 +1,3 @@
-DIST php-7.3.32.tar.xz 12142436 BLAKE2B
375092f7fade8b93d2fbf409552cda42a685267248e3bce373913eeae5f133e7773554c2302b12bf09588d74a76898b138c47287f7d9a721f294635799ca46f6
SHA512
afed20a90aa7d207f9b409fb2066789a637b24d6c6874fc5733bbe6e9972616b387669ce40cba16b606893d88572f398e34aff7a36626308e3ede312f09fcc56
-DIST php-7.3.33.tar.xz 12143820 BLAKE2B
77b5ada50169b308b42dbf2c69b5aebd6e9ab9663be8de5bd26391e42015d856631f12b0268b98889f2c3058564a6c71ad298b725b8afff920e277aa3e787422
SHA512
b05edb3e87775c0b2d7bd5990e47751279076e6ef2356f59dc917f4a1447d95894f596cd8de711f03278650ff74ff9f2687ed96cec69d2d669a6af563a455e25
DIST php-7.4.28.tar.xz 10418352 BLAKE2B
27673b5a891723a4c20a19fa22708f733b8ff12e16e5bbd727ed841845bcb8802ea98e8c2a4936b184704cde96f8725a2c338470ba573e8d3a0732a3f449e7e5
SHA512
e7fa281a3be9ec46b7fa69619fd417fc04200dc64fd153f9670184d84b0aa3d5f3698536cf18476a96d8a42ba40b856ff57ab18e8e8a485dd9b95467d1952fa8
DIST php-8.0.16.tar.xz 10864076 BLAKE2B
e5820ecd40632e458a0ada1d1886cd054520ab7f1492766fd8d5c3561977359abddd886b47f7d7255bcc80d00c96afeceb5cbd515eb779ed4ac15db9e01f1fe3
SHA512
68952638f2965752be26dc0a49f938eb4f251f2d5a7b309a2983c4f9bc064738c9da2e8015ec9b2ecc0dc06e014ace3c0348222166b898a4a38c31ab8b0fd139
DIST php-8.0.17.tar.xz 10771016 BLAKE2B
ed2b9fb4f8c2210e112d27e43acff2a71c57802c5fd72429ffc716f6b7666d00a24d35166e5e85d20d7f67e00d5cdae89eaf5d30238a0758b42964e27422507b
SHA512
9e1e44860be8f5ddf0c264f791e2c8936ca3abd02c18c432ff340057e94f0fbc5f40f1ee8f4feee60416eb4ce712f43764d3757f2e667dc78150d2d86d3c02e3
diff --git a/dev-lang/php/files/php-freetype-2.9.1.patch
b/dev-lang/php/files/php-freetype-2.9.1.patch
deleted file mode 100644
index 02dfd9ce3cd4..
--- a/dev-lang/php/files/php-freetype-2.9.1.patch
+++ /dev/null
@@ -1,233 +0,0 @@
a/ext/gd/config.m4 2018-04-24 11:09:54.0 -0400
-+++ b/ext/gd/config.m4 2018-05-04 15:18:49.867283889 -0400
-@@ -186,21 +186,36 @@
- 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/bin/freetype-config"; then
--FREETYPE2_DIR=$i
--FREETYPE2_CONFIG="$i/bin/freetype-config"
--break
-+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+AC_MSG_CHECKING(for freetype2)
-+
-+if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then
-+
-+ 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
-+
-+ for i in $PHP_FREETYPE_DIR /usr/local /usr; do
-+if test -f "$i/bin/freetype-config"; then
-+ FREETYPE2_DIR=$i
-+ FREETYPE2_CONFIG="$i/bin/freetype-config"
-+ break
-+fi
-+ done
-+
-+ if test -z "$FREETYPE2_DIR"; then
-+AC_MSG_ERROR([freetype-config not found.])
- fi
--done
-
--if test -z "$FREETYPE2_DIR"; then
-- AC_MSG_ERROR([freetype-config not found.])
-+ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
-+ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
-+ AC_MSG_RESULT(found via freetype-config)
- fi
-
--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(HAVE_LIBFREETYPE,1,[ ])
a/configure2018-04-24 11:10:05.0 -0400
-+++ b/configure2018-05-04 15:18:45.626367913 -0400
-@@ -34348,21 +34348,79 @@
-
- if test "$PHP_FREETYPE_DIR" != "no"; then
-
--for i in $PHP_FREETYPE_DIR /usr/local /usr; do
-- if test -f "$i/bin/freetype-config"; then
--FREETYPE2_DIR=$i
--FREETYPE2_CONFIG="$i/bin/freetype-config"
--break
-+# Extract the first word of "pkg-config", so it can be a program name
with args.
-+set dummy pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/
commit: 8387d6dd241f9ef9569b07297ae559caf796c319 Author: Brian Evans gentoo org> AuthorDate: Wed Mar 23 15:23:12 2022 + Commit: Brian Evans gentoo org> CommitDate: Wed Mar 23 15:23:12 2022 + 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 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/"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/
commit: 2529898489229fc1f00654103c0606c56c58
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Wed Nov 10 17:07:08 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Mon Nov 15 21:55:57 2021 +
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 levelnine.at>
Signed-off-by: Conrad Kostecki 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..
--- 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
-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);
-
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: c2d94c33c28a931a2c4371fafb335b7e5d84aadb
Author: Brian Evans gentoo org>
AuthorDate: Thu Mar 25 15:53:03 2021 +
Commit: Brian Evans gentoo org>
CommitDate: Thu Mar 25 15:53:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2d94c33
dev-lang/php: Include upstream patch on 8.0 slot for pdo_firebird
This patch eliminates several warnings which are normally harmless.
However, with certain CFLAGS, the linking may fail as can be seen with
the coverage USE.
This is taken from upstream development branch but has not been
backported to the 8.0 branch.
Closes: https://bugs.gentoo.org/778053
Signed-off-by: Brian Evans gentoo.org>
dev-lang/php/files/php80-firebird-warnings.patch | 56
dev-lang/php/php-8.0.3.ebuild| 5 ++-
2 files changed, 60 insertions(+), 1 deletion(-)
diff --git a/dev-lang/php/files/php80-firebird-warnings.patch
b/dev-lang/php/files/php80-firebird-warnings.patch
new file mode 100644
index 000..48e38c2135f
--- /dev/null
+++ b/dev-lang/php/files/php80-firebird-warnings.patch
@@ -0,0 +1,56 @@
+From c288b5294bb0e13ad2904a3ec79265f727baaea3 Mon Sep 17 00:00:00 2001
+From: Nikita Popov
+Date: Mon, 14 Dec 2020 10:36:36 +0100
+Subject: [PATCH] Fix compile warnings in PDO Firebird
+
+---
+ ext/pdo_firebird/firebird_driver.c | 9 +
+ ext/pdo_firebird/php_pdo_firebird_int.h | 3 +--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/ext/pdo_firebird/firebird_driver.c
b/ext/pdo_firebird/firebird_driver.c
+index c299907f0fea1..390871cc200c8 100644
+--- a/ext/pdo_firebird/firebird_driver.c
b/ext/pdo_firebird/firebird_driver.c
+@@ -171,10 +171,11 @@ static const char classes_array[] = {
+ /* 127 */ 0
+ };
+
+-inline char classes(char idx)
++static inline char classes(char idx)
+ {
+- if (idx > 127) return 0;
+- return classes_array[idx];
++ unsigned char uidx = (unsigned char) idx;
++ if (uidx > 127) return 0;
++ return classes_array[uidx];
+ }
+
+ typedef enum {
+@@ -1085,7 +1086,7 @@ static int pdo_firebird_handle_factory(pdo_dbh_t *dbh,
zval *driver_options) /*
+ char errmsg[512];
+ const ISC_STATUS *s = H->isc_status;
+ fb_interpret(errmsg, sizeof(errmsg),&s);
+- zend_throw_exception_ex(php_pdo_get_exception(),
H->isc_status[1], "SQLSTATE[%s] [%d] %s",
++ zend_throw_exception_ex(php_pdo_get_exception(),
H->isc_status[1], "SQLSTATE[%s] [%ld] %s",
+ "HY000", H->isc_status[1], errmsg);
+ }
+
+diff --git a/ext/pdo_firebird/php_pdo_firebird_int.h
b/ext/pdo_firebird/php_pdo_firebird_int.h
+index 094767fa355d3..70a895b4b9f83 100644
+--- a/ext/pdo_firebird/php_pdo_firebird_int.h
b/ext/pdo_firebird/php_pdo_firebird_int.h
+@@ -34,12 +34,11 @@
+ #define SHORT_MAX (1 << (8*sizeof(short)-1))
+
+ #if SIZEOF_ZEND_LONG == 8 && !defined(PHP_WIN32)
+-# define LL_MASK "l"
+ # define LL_LIT(lit) lit ## L
+ #else
+-# define LL_MASK "ll"
+ # define LL_LIT(lit) lit ## LL
+ #endif
++#define LL_MASK "ll"
+
+ /* Firebird API has a couple of missing const decls in its API */
+ #define const_cast(s) ((char*)(s))
diff --git a/dev-lang/php/php-8.0.3.ebuild b/dev-lang/php/php-8.0.3.ebuild
index c3b57be91fa..599f1188e1c 100644
--- a/dev-lang/php/php-8.0.3.ebuild
+++ b/dev-lang/php/php-8.0.3.ebuild
@@ -151,7 +151,10 @@ BDEPEND="virtual/pkgconfig"
PHP_MV="$(ver_cut 1)"
-PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" )
+PATCHES=(
+ "${FILESDIR}/php-iodbc-header-location.patch"
+ "${FILESDIR}/php80-firebird-warnings.patch"
+)
php_install_ini() {
local phpsapi="${1}"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: 99ef9ab9765aaa94a90c9bc74275672417a75fbb
Author: Brian Evans gentoo org>
AuthorDate: Thu Feb 25 19:14:02 2021 +
Commit: Brian Evans gentoo org>
CommitDate: Thu Feb 25 19:14:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99ef9ab9
dev-lang/php: Drop end-of-life 7.2 slot
Signed-off-by: Brian Evans gentoo.org>
dev-lang/php/Manifest | 1 -
.../files/php-7.2.13-intl-use-icu-namespace.patch | 379 --
.../files/php-7.2.34-use-after-free-bug76047.patch | 174 -
dev-lang/php/php-7.2.34-r1.ebuild | 764 -
dev-lang/php/php-7.2.34-r2.ebuild | 764 -
5 files changed, 2082 deletions(-)
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index e4b919001b1..b27a5dce1c2 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,3 @@
-DIST php-7.2.34.tar.xz 12309432 BLAKE2B
50522786d39296bc7411931c4f357d53c7a25da264192a6a6e7f7594f3dee108e22974e00a4bdc4d3af269ab63d07b28045ff6b4f4f0c79672ed059882647b93
SHA512
7ecc3de3b5db41ec4ff6a5ce6c7e77dc330753c6f3fd87db4d07d6bb763a0b047e83afeef2251b4c6a5d2ff53fd9f3d7e99d091ef2e2c6ab8f18db7447d8a97d
DIST php-7.3.25.tar.xz 12136668 BLAKE2B
b9bfb1de15a3f02bf5d228a2cf9b307c9eeadaea10cac22d40647db0147f4f93b41858ea4affa0701478dd397f0a87cae4e2f29a378f7c6730fdf7da5c48e0e8
SHA512
30b27deab12cf2544671afbbdaefd4bfea308eeed8e9c2150751c5bc9ece18d981bcc020eace35cbdbe88b45cffba8a1fca718fc4e74c3a7903d8b038015d31e
DIST php-7.3.26.tar.xz 12138088 BLAKE2B
eb0090d1edff251341a9d7668a9a6d9ad2f45f7db902e7a51b133d77b0ac155248643ea2bb5fb68b9ba5f363bfdecf1db58dc41b78e5ae24ad66e4443f7c607e
SHA512
36494c7907adf75378bcd2c8e5a4761271307d2b507df09c35b8f1114d189320bc7e73f1b05cb171aa93209dc2c3026256f7826e5563f13b99f1b4dbe9741732
DIST php-7.3.27.tar.xz 12137924 BLAKE2B
f4648fdc2b8903ce1b68221eeb49e7764c5446a3d0d0d93e9cd2d8b4cb08e57229261f6fac4ebf35127e94afd5f157ec8f27659ce463e281784c755a3759481e
SHA512
a5c186663d656b473f6165b433077057972b1454013ca0f99831be61bd7b7f1c841b8dae69951fa371f678ea3f0e5410518427ee08cb20611bfc00f263d4d47a
diff --git a/dev-lang/php/files/php-7.2.13-intl-use-icu-namespace.patch
b/dev-lang/php/files/php-7.2.13-intl-use-icu-namespace.patch
deleted file mode 100644
index b5d2b473f1a..000
--- a/dev-lang/php/files/php-7.2.13-intl-use-icu-namespace.patch
+++ /dev/null
@@ -1,379 +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
-@@ -33,6 +33,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
-+#include
-
--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
-@@ -26,6 +26,9 @@ extern "C" {
- #include "../intl_convertcpp.h"
- #include "../intl_common.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
- }
-
-+using icu::GregorianCalendar;
-+using icu::Locale;
-+
- /* {{{ Global variables */
- zend_class_entry *Calendar_ce_ptr;
- zend_class_entry *Gre
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: 280c5e27b96f27eed2f3325576d74361abb36294
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Dec 23 00:38:40 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Dec 23 00:39:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=280c5e27
dev-lang/php: fix use-after-free when accessing already destructed backtrace
arguments
Bug: https://bugs.gentoo.org/711140
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
.../files/php-7.2.34-use-after-free-bug76047.patch | 174 +
.../{php-7.2.34.ebuild => php-7.2.34-r1.ebuild}| 1 +
2 files changed, 175 insertions(+)
diff --git a/dev-lang/php/files/php-7.2.34-use-after-free-bug76047.patch
b/dev-lang/php/files/php-7.2.34-use-after-free-bug76047.patch
new file mode 100644
index 000..b3a864ee82a
--- /dev/null
+++ b/dev-lang/php/files/php-7.2.34-use-after-free-bug76047.patch
@@ -0,0 +1,174 @@
+Backport of
https://git.php.net/?p=php-src.git;a=commit;h=ef1e4891b47949c8dc0f9482eef9454a0ecdfa1d
+
+--- a/Zend/tests/bug52361.phpt
b/Zend/tests/bug52361.phpt
+@@ -25,9 +25,8 @@ try {
+ --EXPECTF--
+ 1. Exception: aaa in %sbug52361.php:5
+ Stack trace:
+-#0 %sbug52361.php(13): aaa->__destruct()
+-#1 %sbug52361.php(16): bbb()
+-#2 {main}
++#0 %sbug52361.php(16): aaa->__destruct()
++#1 {main}
+ 2. Exception: bbb in %sbug52361.php:13
+ Stack trace:
+ #0 %sbug52361.php(16): bbb()
+--- /dev/null
b/Zend/tests/bug76047.phpt
+@@ -0,0 +1,68 @@
++--TEST--
++Bug #76047: Use-after-free when accessing already destructed backtrace
arguments
++--FILE--
++a);
++$backtrace = (new Exception)->getTrace();
++var_dump($backtrace);
++}
++}
++
++function test($arg) {
++$arg = str_shuffle(str_repeat('A', 79));
++$vuln = new Vuln();
++$vuln->a = $arg;
++}
++
++function test2($arg) {
++$$arg = 1; // Trigger symbol table
++$arg = str_shuffle(str_repeat('A', 79));
++$vuln = new Vuln();
++$vuln->a = $arg;
++}
++
++test('x');
++test2('x');
++
++?>
++--EXPECTF--
++array(1) {
++ [0]=>
++ array(6) {
++["file"]=>
++string(%d) "%s"
++["line"]=>
++int(%d)
++["function"]=>
++string(10) "__destruct"
++["class"]=>
++string(4) "Vuln"
++["type"]=>
++string(2) "->"
++["args"]=>
++array(0) {
++}
++ }
++}
++array(1) {
++ [0]=>
++ array(6) {
++["file"]=>
++string(%d) "%s"
++["line"]=>
++int(%d)
++["function"]=>
++string(10) "__destruct"
++["class"]=>
++string(4) "Vuln"
++["type"]=>
++string(2) "->"
++["args"]=>
++array(0) {
++}
++ }
++}
+--- a/Zend/zend_vm_def.h
b/Zend/zend_vm_def.h
+@@ -2366,9 +2366,9 @@ ZEND_VM_HELPER(zend_leave_helper, ANY, ANY)
+ uint32_t call_info = EX_CALL_INFO();
+
+ if (EXPECTED((call_info &
(ZEND_CALL_CODE|ZEND_CALL_TOP|ZEND_CALL_HAS_SYMBOL_TABLE|ZEND_CALL_FREE_EXTRA_ARGS|ZEND_CALL_ALLOCATED))
== 0)) {
++ EG(current_execute_data) = EX(prev_execute_data);
+ i_free_compiled_variables(execute_data);
+
+- EG(current_execute_data) = EX(prev_execute_data);
+ if (UNEXPECTED(call_info & ZEND_CALL_RELEASE_THIS)) {
+ zend_object *object = Z_OBJ(execute_data->This);
+ #if 0
+@@ -2394,12 +2394,12 @@ ZEND_VM_HELPER(zend_leave_helper, ANY, ANY)
+ LOAD_NEXT_OPLINE();
+ ZEND_VM_LEAVE();
+ } else if (EXPECTED((call_info & (ZEND_CALL_CODE|ZEND_CALL_TOP)) == 0))
{
++ EG(current_execute_data) = EX(prev_execute_data);
+ i_free_compiled_variables(execute_data);
+
+ if (UNEXPECTED(call_info & ZEND_CALL_HAS_SYMBOL_TABLE)) {
+ zend_clean_and_cache_symbol_table(EX(symbol_table));
+ }
+- EG(current_execute_data) = EX(prev_execute_data);
+
+ /* Free extra args before releasing the closure,
+* as that may free the op_array. */
+@@ -2449,6 +2449,7 @@ ZEND_VM_HELPER(zend_leave_helper, ANY, ANY)
+ ZEND_VM_LEAVE();
+ } else {
+ if (EXPECTED((call_info & ZEND_CALL_CODE) == 0)) {
++ EG(current_execute_data) = EX(prev_execute_data);
+ i_free_compiled_variables(execute_data);
+ if (UNEXPECTED(call_info &
(ZEND_CALL_HAS_SYMBOL_TABLE|ZEND_CALL_FREE_EXTRA_ARGS))) {
+ if (UNEXPECTED(call_info &
ZEND_CALL_HAS_SYMBOL_TABLE)) {
+@@ -2456,7 +2457,6 @@ ZEND_VM_HELPER(zend_leave_helper, ANY, ANY)
+ }
+ zend_vm_stack_free_extra_args_ex(call_info,
execute_data);
+ }
+- EG(current_execute_data) = EX(prev_execute_data);
+ if (UNEXPECTED(call_info & ZEND_CALL_CLOSURE)) {
+
OBJ_RELEASE((zend_object*)EX(func)-
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: ac8830e5ca56ab4ba2a047220e5462024b32444d
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Dec 3 20:47:25 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Dec 3 20:48:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac8830e5
dev-lang/php: fix building against libressl
Fixes
ext/openssl/openssl.c:6501:8: error: ‘EVP_CIPH_OCB_MODE’ undeclared (first
use in this function)
when building against >=dev-libs/libressl-3.3.
Closes: https://bugs.gentoo.org/757123
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-lang/php/files/php-7.4.13-issue80368.patch | 17 +
dev-lang/php/php-7.4.13.ebuild | 5 -
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/dev-lang/php/files/php-7.4.13-issue80368.patch
b/dev-lang/php/files/php-7.4.13-issue80368.patch
new file mode 100644
index 000..adad8f864ec
--- /dev/null
+++ b/dev-lang/php/files/php-7.4.13-issue80368.patch
@@ -0,0 +1,17 @@
+https://github.com/php/php-src/commit/0f579fd7c8171cb0f7ecc8db912933df450f3861
+https://github.com/php/php-src/commit/ecee3f1209a7c0ac9f99c7f640b2f5df56656e58
+
+--- a/ext/openssl/openssl.c
b/ext/openssl/openssl.c
+@@ -6496,7 +6496,9 @@ static void php_openssl_load_cipher_mode(struct
php_openssl_cipher_mode *mode, c
+ int cipher_mode = EVP_CIPHER_mode(cipher_type);
+ memset(mode, 0, sizeof(struct php_openssl_cipher_mode));
+ switch (cipher_mode) {
+-#if PHP_OPENSSL_API_VERSION >= 0x10100
++#ifdef EVP_CIPH_OCB_MODE
++ /* Since OpenSSL 1.1, all AEAD ciphers use a common framework.
We check for
++ * EVP_CIPH_OCB_MODE, because LibreSSL does not support it. */
+ case EVP_CIPH_GCM_MODE:
+ case EVP_CIPH_OCB_MODE:
+ case EVP_CIPH_CCM_MODE:
+
diff --git a/dev-lang/php/php-7.4.13.ebuild b/dev-lang/php/php-7.4.13.ebuild
index 3ac0d8c9ace..97ccf43d8c7 100644
--- a/dev-lang/php/php-7.4.13.ebuild
+++ b/dev-lang/php/php-7.4.13.ebuild
@@ -150,7 +150,10 @@ BDEPEND="virtual/pkgconfig"
PHP_MV="$(ver_cut 1)"
-PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" )
+PATCHES=(
+ "${FILESDIR}"/php-iodbc-header-location.patch
+ "${FILESDIR}"/${P}-issue80368.patch
+)
php_install_ini() {
local phpsapi="${1}"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, profiles/, dev-lang/php/
commit: 364e0decedaf1e8990bc88be05545544e15f5f6e
Author: Brian Evans gentoo org>
AuthorDate: Thu Jan 23 16:29:57 2020 +
Commit: Brian Evans gentoo org>
CommitDate: Thu Jan 23 16:29:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=364e0dec
dev-lang/php: Drop 7.1 slot
Signed-off-by: Brian Evans gentoo.org>
dev-lang/php/Manifest | 1 -
.../files/php-7.1.25-intl-use-icu-namespace.patch | 379 ---
dev-lang/php/php-7.1.33.ebuild | 739 -
profiles/package.mask | 6 -
4 files changed, 1125 deletions(-)
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index ca57a2a8c75..921365da2df 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,3 @@
-DIST php-7.1.33.tar.xz 12370228 BLAKE2B
610f501c1729ca3f5fa6f104b9f229046cf1e497f2fdc1194b80b4a5f9ca7f799dc6a458de34dd7a87976b7252ba2f548a8d689e4b2a45c025f1807ab8489f12
SHA512
ed37a79e3402c767f20e55c1cbe27957cc78240eafc719fffccd7d29ae10a45112aa0f29082f56133cd9c25f2750e9e57246d95b4f38d766f49bd29d1397eb1d
DIST php-7.2.26.tar.xz 12309176 BLAKE2B
2208aee696fc2aed50b4f08f2dd7ca0f70d9913c22091687f6c694a343e4b5fd5e1f0d0b6b127fe0c00c5611cb60e627c2257a1fad9bff6e9fc8bb921e1eb57d
SHA512
457e3420120135e311a22cd11529d5a3efc5885af4f298196f403093141801619d4dcdb38d6a4a5f8d9dcfa619688d8fdf33fea4a30e2d885e987b739a268f12
DIST php-7.2.27.tar.xz 12307512 BLAKE2B
8d51a1a88c718ba9ef683e190f9ed80b46fccfc7b237d9175f5db3012a3d4ae8f698dbe6b2b8f233121be6d08e28bdb1062a357dd6ae2df5228a7e56c8604807
SHA512
02416e2bdfcd47ef660c7403ca25c7358c2f9a685b1dee6a2a95c52d1b1178666f9fa0bb32dc070cfd09febb5c44ecdb70116546142369d7ead4432634dc38c5
DIST php-7.3.13.tar.xz 12102012 BLAKE2B
32a346470ea0d0a3db873ae94b5e4dcc650c25e24db244ea94417f092e0458a0825cb99e9c3429000ee5cbd50120824d9bd2a58a7ed2ada1f39c6d7c41b2ba08
SHA512
d0624b3b841fed49d9cea56b17e7c8c7abf8e6572832b6f86c98f48c23f86690c310b460eae27a6fcd41fbfbc2e8a4b56f6bfb0c738fa1db36ce3795454d7798
diff --git a/dev-lang/php/files/php-7.1.25-intl-use-icu-namespace.patch
b/dev-lang/php/files/php-7.1.25-intl-use-icu-namespace.patch
deleted file mode 100644
index 5a1cc472f10..000
--- a/dev-lang/php/files/php-7.1.25-intl-use-icu-namespace.patch
+++ /dev/null
@@ -1,379 +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
-@@ -33,6 +33,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
-+#include
-
--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
-@@ -26,6 +26,9 @@ extern "C" {
- #include "../intl_convertcpp.h"
- #include "../intl_common.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
- }
-
-+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/calen
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/
commit: d4d35067dee48487ffbb89116d51e8af195d5258 Author: Michael Mair-Keimberger gmail com> AuthorDate: Fri Apr 19 18:16:30 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Sat Apr 20 01:29:05 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4d35067 dev-lang/php: remove unused patches Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11527 Signed-off-by: Aaron Bauman 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..000 --- 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 \ - breakiterato
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/
commit: 4ea7582008609ece894f2a38d59baec92ae58403
Author: Brian Evans gentoo org>
AuthorDate: Fri Apr 5 14:34:57 2019 +
Commit: Brian Evans gentoo org>
CommitDate: Fri Apr 5 14:34:57 2019 +
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 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..000
--- 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.0 -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..000
--- 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 \
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: 4e0b35ca89aef4813880834c5efdfdd0881391dd
Author: Brian Evans gentoo org>
AuthorDate: Mon Feb 11 14:17:26 2019 +
Commit: Brian Evans gentoo org>
CommitDate: Mon Feb 11 14:20:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e0b35ca
dev-lang/php: Drop support for 7.0
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Brian Evans gentoo.org>
dev-lang/php/Manifest | 2 -
dev-lang/php/files/libressl-compatibility.patch| 65 --
dev-lang/php/files/mbstring-oniguruma-6.8.patch| 30 -
...php-7.0.33-intl-detect-icu-via-pkg-config.patch | 159 -
.../php-7.0.33-intl-icu-memory-corruption.patch| 91 ---
.../files/php-7.0.33-intl-use-icu-namespace.patch | 369 --
dev-lang/php/php-7.0.32.ebuild | 751
dev-lang/php/php-7.0.33.ebuild | 754 -
8 files changed, 2221 deletions(-)
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index aca5c7dfd36..8f9044d2808 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,7 +1,5 @@
DIST php-5.6-openssl-1.1-compatibility.patch 42559 BLAKE2B
b7f13866cd8545543143932930f31bcd928fa0b4b36ef63f04798b9ef4699f12b4f4227772ac9e6e5c498aaeacf7b106abcfa48031a12214e123de4b79d3a4cd
SHA512
eed695a3dd7ce27e8651b4a4b96ccd0514f256e7d2f0214fac899e9eeea6412aa24f863f1b5d13305bcac50667ccb62709597fb34da1002b005ebf411dd2f5df
DIST php-5.6.40.tar.xz 12472236 BLAKE2B
f41147eaec9b15e965540f9e871691cc88848dd619bae6af85e7bba0130b71ce91bad5cdbbadbb537c42df83369f5c731007339a9d9e21e689e913c135201afc
SHA512
997b5a952a60cf9166671cc91fcc34c674dd62bfd5cb0a9cdf3fdf2d088b5d19943d94c1cf193f8ab71fc4957d9a9a4c7c2fb8826f937501c1c0a0858f10e329
-DIST php-7.0.32.tar.xz 12030780 BLAKE2B
0c277eac4c931a6e30954cceb7feef8dea1c3ef4aebac91779b7e1a6f90f608faa93d1750a2dc8f354c73304e0f7a9b9ac17bb0d1da4768ddb68925752c11aef
SHA512
4a7c9a6b91ad7da69303916202062d639e6f02dcd483e851a44d8c7a2efeb5c9a666097935ab60d700c4445f86a0c68df1515300c57af1cdb76528b54b757608
-DIST php-7.0.33.tar.xz 12033040 BLAKE2B
cb7a4eb3ba8ede93ae8e85b6a11664f33654f7e94fa077ac9a33ab95157c0c2b3b05f98413e13e36f710c6d00b35d49d38bf26092a36e508b88805d092764287
SHA512
9298e185702ea801e9243671ecb0b781c2b04181a2f9fd6490bc14897a333a2c0cc88fe27b0c69c6dd0079629a71c330ed1aa337f48cac6cbd624addb8855500
DIST php-7.1.26.tar.xz 12206956 BLAKE2B
af78f764349a05905d7db22260c8a6415a2755b29e0dd01225160235b3b38ea76c8910d79c69798aa2de3fc6d4d41e45ab951161b54e62753111f81ac9d85bc2
SHA512
3c80dce2d5dcbf6f253ca4ca4e4ce01fdd3a3d31a6e6045f539fefadc1ea3c391d4d4995600a4ff758ab0361e0ec2244e2eaa6591ecb3e9b8e8a9c44f67a5b32
DIST php-7.2.14.tar.xz 12156460 BLAKE2B
88727241ca3fd68238ce50dcb4c12868f8e6df54213b04dba7650c5f98c3f18a3d02e0a191c0ebd13d85c83cc686fef60135f69ca7cc3e425bd5d7f80035fdd7
SHA512
13f2c97b730e3e872bd24bcc004c6cff5e2cc633c37a4eb60b8b5d1d4454bc5985f7d52943448d61cf4a227c64be770edc5eadd2c9612b297d71c0840b4b1259
DIST php-7.2.15.tar.xz 12164460 BLAKE2B
16ab89c1deee7fcb1edd49b5227456f6bcf40a43668b5e1ffbab41a9f4c48a24fd318122886521838a687a52e36cb77258f6ca266046605441b835904c2dde23
SHA512
feecabb6ee1ec4bc98cf1aa868190c758ee57e5f2d80c91376a2d91082d01f481b0a2e3d7dbae4822d6cfbafe8bccffed15335ff561f8b239e16028ed6bdbee7
diff --git a/dev-lang/php/files/libressl-compatibility.patch
b/dev-lang/php/files/libressl-compatibility.patch
deleted file mode 100644
index 3b9c39dcc59..000
--- a/dev-lang/php/files/libressl-compatibility.patch
+++ /dev/null
@@ -1,65 +0,0 @@
a/ext/openssl/openssl.c2018-04-04 14:26:34.58300 +
-+++ b/ext/openssl/openssl.c2018-04-04 14:20:16.90700 +
-@@ -73,7 +73,7 @@
- #ifdef HAVE_OPENSSL_MD2_H
- #define OPENSSL_ALGO_MD2 4
- #endif
--#if OPENSSL_VERSION_NUMBER < 0x1010L || defined (LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || (defined
(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070L)
- #define OPENSSL_ALGO_DSS1 5
- #endif
- #define OPENSSL_ALGO_SHA224 6
-@@ -560,7 +560,7 @@
- #endif
-
- /* {{{ OpenSSL compatibility functions and macros */
--#if OPENSSL_VERSION_NUMBER < 0x1010L || defined (LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || (defined
(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070L)
- #define EVP_PKEY_get0_RSA(_pkey) _pkey->pkey.rsa
- #define EVP_PKEY_get0_DH(_pkey) _pkey->pkey.dh
- #define EVP_PKEY_get0_DSA(_pkey) _pkey->pkey.dsa
-@@ -677,7 +677,7 @@
- return M_ASN1_STRING_data(asn1);
- }
-
--#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined (LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || (defined
(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070L)
-
- static int X509_get_signature_nid(const X509 *x)
- {
-@@ -1324,7 +1324,7 @@
- mdtype = (EVP_MD *) EVP_md2();
- break;
- #endif
--#if OPEN
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: 95c0ba4995b7c9d11f5525da518fa082def059c9
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Feb 6 18:25:45 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Feb 6 18:26:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95c0ba49
dev-lang/php: bump to v7.3.2
- Fix iptcembed [bug 77546]
Bug: https://bugs.php.net/bug.php?id=77546
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-lang/php/Manifest | 1 +
.../files/php-7.3.2-fix-iptcembed-bug77546.patch | 127
dev-lang/php/php-7.3.2.ebuild | 749 +
3 files changed, 877 insertions(+)
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 0197e3ec413..892bc832a35 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -5,3 +5,4 @@ DIST php-7.0.33.tar.xz 12033040 BLAKE2B
cb7a4eb3ba8ede93ae8e85b6a11664f33654f7e9
DIST php-7.1.26.tar.xz 12206956 BLAKE2B
af78f764349a05905d7db22260c8a6415a2755b29e0dd01225160235b3b38ea76c8910d79c69798aa2de3fc6d4d41e45ab951161b54e62753111f81ac9d85bc2
SHA512
3c80dce2d5dcbf6f253ca4ca4e4ce01fdd3a3d31a6e6045f539fefadc1ea3c391d4d4995600a4ff758ab0361e0ec2244e2eaa6591ecb3e9b8e8a9c44f67a5b32
DIST php-7.2.14.tar.xz 12156460 BLAKE2B
88727241ca3fd68238ce50dcb4c12868f8e6df54213b04dba7650c5f98c3f18a3d02e0a191c0ebd13d85c83cc686fef60135f69ca7cc3e425bd5d7f80035fdd7
SHA512
13f2c97b730e3e872bd24bcc004c6cff5e2cc633c37a4eb60b8b5d1d4454bc5985f7d52943448d61cf4a227c64be770edc5eadd2c9612b297d71c0840b4b1259
DIST php-7.3.1.tar.xz 11944376 BLAKE2B
55b3192774c08b1e4c6621e16176a1e352ff6ba5540794a5d769b6416929723638f1409f2f8224c7fe3db99c9b020fa51db7b78d50eaa00e790308562a0a5334
SHA512
0663d90537fe3901cad00ba1056782050b8a61e8edb49f01851add4992df21d23aee3e9468e32b76b7f53ffd513f1ba10c9513c549e247d796416ed176355348
+DIST php-7.3.2.tar.xz 11966760 BLAKE2B
bb913e754e86ebbbef641d0516eb1fff7dfd7d7fe54776d4de0312175cdbc292694addd60e8ad863726796d482517e9312d83754eb70201de1a8a21e892cd87e
SHA512
e49eaf1f0811098910beddc407d5047e09a0f528baf4b62f2a42e8faba9d3d7a0ae82a0fd7a5bec265e22ef1bcf0cdcc4e9f0a521258412405923800798cba66
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
new file mode 100644
index 000..e157d250f2f
--- /dev/null
+++ b/dev-lang/php/files/php-7.3.2-fix-iptcembed-bug77546.patch
@@ -0,0 +1,127 @@
+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--
++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/xAAfAAABBQEBAQEBAQAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAQIDBAUGBwgJCgv/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;e
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: 169d25ffd06419b07d213a1adbef8ee370be9d97
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Dec 7 01:15:56 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Dec 7 01:16:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=169d25ff
dev-lang/php: bump to v7.2.13
- EAPI bump to EAPI=7
- Use pkg-config for detecting ICU
- Proper ICU namespace usage backported
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-lang/php/Manifest | 1 +
.../files/php-7.2.13-intl-use-icu-namespace.patch | 379 +++
dev-lang/php/php-7.2.13.ebuild | 748 +
3 files changed, 1128 insertions(+)
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 7b889cd1d3f..01e629a8190 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -10,4 +10,5 @@ DIST php-7.1.25.tar.xz 12205972 BLAKE2B
3d69cc87d75ee45dc85e5e672ddb6c312fcba128
DIST php-7.2.10.tar.xz 12160864 BLAKE2B
f1959a00622c1bd11fa87c61d152c802b307f0b9e89b51ed86b40086cda03eeb6652d47b59df8cc7c9b4e79ab687ae1292b978f453e9f07ac352d209b64c62d8
SHA512
aa90fce17034b2649012d66461626ae74c21ea938b1c71c7eb12419e562c641b432df87a7e900c245ad28df39624cf64a1b2f8ffb123608d94cd35e41f09c0fe
DIST php-7.2.11.tar.xz 12132268 BLAKE2B
8007f6a8f4236efb796681d25f2066deeba98e6e136def0c323aa13399951d58d7f218b3544b3bd0418dfe220f87a38b6515547c50f65c641bd09a2d440eb4e1
SHA512
0cd8578147d17d612e013dfc22b73977719177058b39c7b61dd0bfdfb8c2441aba78af49f58c824f7e66c89b5ad201c36fafb89ccf1e2d20f19b79d6a8fed7e5
DIST php-7.2.12.tar.xz 12141472 BLAKE2B
25d55fcbe63aab64c658e9c4ab52b552831d5c03a8887e1c64f0cadbb8b0d9f3c38cd5d15dac89002c328b737ad864fce392baa0891292ee77d1975562a2bc17
SHA512
bbeaed1278d0d2f1ecb2249dab1ebaab1489ef43be0797dac57d8b523d8e5d284166e6cbf52095f5d34eef447fbdeb0c6916caaa5770221a180ec064f4ffcad8
+DIST php-7.2.13.tar.xz 12116484 BLAKE2B
00d265c10343e590772a4de103ae885149a56a7c0ef957cb24d5e81f86021231da5e75b655081e9fcba99b83956d55265b6af1d779ee65cebee9a974f936a634
SHA512
9df1d43e9cd701db10281811b328721b85cb90c6c8dae1842b0fd848cb5388328918b3040bbad7634b340550d82b93746ea479ed45f4d8a80e8a316e6324115d
DIST php-7.3.0.tar.xz 11928820 BLAKE2B
36fee652cbbc28bbeb1b2df037b4b05084910d94af86c16150d776b82f91fb85691f9846c51538dbf6f3e64ece26894fe9c7a5f272d2848d41cdf8e1338b9805
SHA512
d991101eb833d3a47833aa930341e75c56f26c4cb0249896728ebe209c6c02af1704fccc3052128d8f9fdffc60dcef0ece38a532697131141946898d8b1abcda
diff --git a/dev-lang/php/files/php-7.2.13-intl-use-icu-namespace.patch
b/dev-lang/php/files/php-7.2.13-intl-use-icu-namespace.patch
new file mode 100644
index 000..b5d2b473f1a
--- /dev/null
+++ b/dev-lang/php/files/php-7.2.13-intl-use-icu-namespace.patch
@@ -0,0 +1,379 @@
+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
+@@ -33,6 +33,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
++#include
+
+-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
+@@ -26,6 +26,9 @@ extern "C" {
+ #include "../intl_convertcpp.h"
+ #include "../intl_common.h"
+
++using icu::RuleBasedBreakIterator;
++using icu::Locale;
++
+ static inline
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: 8afd29d91effe9a8e70bad4c15cbe7f1b581d97d Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Dec 7 00:27:48 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Dec 7 00:41:37 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8afd29d9 dev-lang/php: bump to v7.1.25 - EAPI bump to EAPI=7 - Use pkg-config for detecting ICU - Proper ICU namespace usage backported Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> dev-lang/php/Manifest | 1 + ...php-7.1.25-intl-detect-icu-via-pkg-config.patch | 121 .../files/php-7.1.25-intl-use-icu-namespace.patch | 379 +++ dev-lang/php/php-7.1.25.ebuild | 736 + 4 files changed, 1237 insertions(+) diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index daea28268f7..7b889cd1d3f 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -6,6 +6,7 @@ DIST php-7.0.33.tar.xz 12033040 BLAKE2B cb7a4eb3ba8ede93ae8e85b6a11664f33654f7e9 DIST php-7.1.22.tar.xz 12227848 BLAKE2B 72fab94b1c7ecfd3479f6d6c9a76a9d8813f7789402664201615d79ab8b5bb26fb1b7273769c4898a36f0336e0ce4d50bf2f17b81ddb54acc9583e39623e3a5b SHA512 0fc0907d303711dbc4ba0a18618e3e73550c73d13988c769f8d50066017b1efe3feb0d22d5539f69271ea4e9532a3d997e22841cb59bdbf96313169e1c03538d DIST php-7.1.23.tar.xz 12227528 BLAKE2B d03470b07ae041c4677e100c1b4f7994d3e15d4830eccba3c654c1f3546345c8205cac057011d2d43ab962ebbc01652f6748270daa40aa1e540453923500288c SHA512 d5a451f1a48415175e3117ffa84ef3504275a407698b59c13eeb403958aa27342e04dc4ffea9791b923ac0cc5d6fdacf2e8672f0e19755bae858707c7fc3627f DIST php-7.1.24.tar.xz 12205112 BLAKE2B d4dd8bdd980cbb2c8cd813cad44da7a322d75641bb5f4eb986f6be44acf61898e64e43a3206da08b6c68fb1213a95cf5c6bf28bc75356d9abd9711330fa04554 SHA512 ee54d04fa1bb049807e7876baf6a4d12ab8360367bb44ac77c71e53ee8ca078342b4a86f2bc4587838ead27fb8204fea8e739bd582a9e146513ae5d465e59202 +DIST php-7.1.25.tar.xz 12205972 BLAKE2B 3d69cc87d75ee45dc85e5e672ddb6c312fcba12882e227d28e397e1e796e0149588b9519beeb990111315a747a07fa5349ad5f9662c0725b4551478f9e95b51d SHA512 10a75b96d5fa104bc1d5b63f4606d9cfacfc594f7d6ab34f9c5e9e8f209b896516c4121b9cbd323a862724d6dfbd275ef902993cfab619d9a4b9518790b9147c DIST php-7.2.10.tar.xz 12160864 BLAKE2B f1959a00622c1bd11fa87c61d152c802b307f0b9e89b51ed86b40086cda03eeb6652d47b59df8cc7c9b4e79ab687ae1292b978f453e9f07ac352d209b64c62d8 SHA512 aa90fce17034b2649012d66461626ae74c21ea938b1c71c7eb12419e562c641b432df87a7e900c245ad28df39624cf64a1b2f8ffb123608d94cd35e41f09c0fe DIST php-7.2.11.tar.xz 12132268 BLAKE2B 8007f6a8f4236efb796681d25f2066deeba98e6e136def0c323aa13399951d58d7f218b3544b3bd0418dfe220f87a38b6515547c50f65c641bd09a2d440eb4e1 SHA512 0cd8578147d17d612e013dfc22b73977719177058b39c7b61dd0bfdfb8c2441aba78af49f58c824f7e66c89b5ad201c36fafb89ccf1e2d20f19b79d6a8fed7e5 DIST php-7.2.12.tar.xz 12141472 BLAKE2B 25d55fcbe63aab64c658e9c4ab52b552831d5c03a8887e1c64f0cadbb8b0d9f3c38cd5d15dac89002c328b737ad864fce392baa0891292ee77d1975562a2bc17 SHA512 bbeaed1278d0d2f1ecb2249dab1ebaab1489ef43be0797dac57d8b523d8e5d284166e6cbf52095f5d34eef447fbdeb0c6916caaa5770221a180ec064f4ffcad8 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 new file mode 100644 index 000..2d4254d6e59 --- /dev/null +++ b/dev-lang/php/files/php-7.1.25-intl-detect-icu-via-pkg-config.patch @@ -0,0 +1,121 @@ +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_fu
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: 84aad4ad45480f8e32471abb446c72f72e5b50fe Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Dec 6 23:19:44 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Dec 6 23:19:59 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84aad4ad dev-lang/php: bump to v5.6.39 - EAPI bump to EAPI=7 - Add compatibility with ICU >= 61 Bug: https://bugs.gentoo.org/668000 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> dev-lang/php/Manifest | 1 + .../php-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/php-5.6.39.ebuild | 785 + 5 files changed, 1393 insertions(+) diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index a4165302dd2..70aef5427e6 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -1,5 +1,6 @@ DIST php-5.6-openssl-1.1-compatibility.patch 42559 BLAKE2B b7f13866cd8545543143932930f31bcd928fa0b4b36ef63f04798b9ef4699f12b4f4227772ac9e6e5c498aaeacf7b106abcfa48031a12214e123de4b79d3a4cd SHA512 eed695a3dd7ce27e8651b4a4b96ccd0514f256e7d2f0214fac899e9eeea6412aa24f863f1b5d13305bcac50667ccb62709597fb34da1002b005ebf411dd2f5df DIST php-5.6.38.tar.xz 12467408 BLAKE2B d9ee47e193d80bce8a9ed6ffd3eb13e67ba6d1f597ece2803cd92fddc6245f46cdfe644d6cda12a6bb409b92c1fe748610cc5eb43dea0bf063fda81188ee8b3d SHA512 66c51a8e954b1496c0bad0a2864a2a1537dd1c1c573b553991d6d5bce85fc7bc340e56a21109bc5e9a03799e703204b980b569c95a5c0a1bddb01c8947e7a682 +DIST php-5.6.39.tar.xz 12467096 BLAKE2B 354b147c0fcc13eeec0ab333bcaa32ad26e2f4eef19a0ee52cf596ff96997eaf32cbb6d980cacf643167ed01b06ee9d27eeb7c00c95c8023d305c967c1ce3539 SHA512 814ea2d74df9c3c7041769803ceb4ba20dbfc18885ff85f91dca0c3ab694e3ebfb6a564427d116b35382fe292583a54d449f2528495032ca9724cfbdea82c226 DIST php-7.0.32.tar.xz 12030780 BLAKE2B 0c277eac4c931a6e30954cceb7feef8dea1c3ef4aebac91779b7e1a6f90f608faa93d1750a2dc8f354c73304e0f7a9b9ac17bb0d1da4768ddb68925752c11aef SHA512 4a7c9a6b91ad7da69303916202062d639e6f02dcd483e851a44d8c7a2efeb5c9a666097935ab60d700c4445f86a0c68df1515300c57af1cdb76528b54b757608 DIST php-7.1.22.tar.xz 12227848 BLAKE2B 72fab94b1c7ecfd3479f6d6c9a76a9d8813f7789402664201615d79ab8b5bb26fb1b7273769c4898a36f0336e0ce4d50bf2f17b81ddb54acc9583e39623e3a5b SHA512 0fc0907d303711dbc4ba0a18618e3e73550c73d13988c769f8d50066017b1efe3feb0d22d5539f69271ea4e9532a3d997e22841cb59bdbf96313169e1c03538d DIST php-7.1.23.tar.xz 12227528 BLAKE2B d03470b07ae041c4677e100c1b4f7994d3e15d4830eccba3c654c1f3546345c8205cac057011d2d43ab962ebbc01652f6748270daa40aa1e540453923500288c SHA512 d5a451f1a48415175e3117ffa84ef3504275a407698b59c13eeb403958aa27342e04dc4ffea9791b923ac0cc5d6fdacf2e8672f0e19755bae858707c7fc3627f 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 new file mode 100644 index 000..dea2949c25e --- /dev/null +++ b/dev-lang/php/files/php-5.6-intl-detect-icu-via-pkg-config.patch @@ -0,0 +1,154 @@ +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 +- A
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/
commit: 400a7eb881369ddda92d5d16b9a31179d44a6bfa
Author: Brian Evans gentoo org>
AuthorDate: Tue May 8 17:56:32 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Tue May 8 17:56:32 2018 +
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.0 -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/configure2018-04-24 11:10:05.0 -0400
+++ b/configure2018-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; }
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: 71ef0a9d7feaa6bc13c22a33267a1bd496d98e8d
Author: Brian Evans gentoo org>
AuthorDate: Fri May 4 21:03:32 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Fri May 4 21:03:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71ef0a9d
dev-lang/php: Fix building with freetype 2.9.1 by using pkgconfig
Closes: 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 | 231
dev-lang/php/php-5.6.35-r1.ebuild | 1 +
dev-lang/php/php-5.6.36.ebuild | 1 +
dev-lang/php/php-7.0.29.ebuild | 1 +
dev-lang/php/php-7.0.30.ebuild | 1 +
dev-lang/php/php-7.1.16.ebuild | 1 +
dev-lang/php/php-7.1.17.ebuild | 1 +
dev-lang/php/php-7.2.5.ebuild | 1 +
8 files changed, 238 insertions(+)
diff --git a/dev-lang/php/files/php-freetype-2.9.1.patch
b/dev-lang/php/files/php-freetype-2.9.1.patch
new file mode 100644
index 000..3ddf8d1154d
--- /dev/null
+++ b/dev-lang/php/files/php-freetype-2.9.1.patch
@@ -0,0 +1,231 @@
+--- a/ext/gd/config.m4 2018-04-24 11:09:54.0 -0400
b/ext/gd/config.m4 2018-05-04 15:18:49.867283889 -0400
+@@ -186,21 +186,35 @@
+ 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/bin/freetype-config"; then
+-FREETYPE2_DIR=$i
+-FREETYPE2_CONFIG="$i/bin/freetype-config"
+-break
++AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++AC_MSG_CHECKING(for freetype2)
++
++if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then
++
++ FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
++ FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
++ FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2`
++
++ AC_MSG_RESULT(from pkgconfig: version $FREETYPE2_VERSION found)
++else
++
++ for i in $PHP_FREETYPE_DIR /usr/local /usr; do
++if test -f "$i/bin/freetype-config"; then
++ FREETYPE2_DIR=$i
++ FREETYPE2_CONFIG="$i/bin/freetype-config"
++ break
++fi
++ done
++
++ if test -z "$FREETYPE2_DIR"; then
++AC_MSG_ERROR([freetype-config not found.])
+ fi
+-done
+
+-if test -z "$FREETYPE2_DIR"; then
+- AC_MSG_ERROR([freetype-config not found.])
++ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
++ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
++ AC_MSG_RESULT(found via freetype-config)
+ fi
+
+-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(HAVE_LIBFREETYPE,1,[ ])
+--- a/configure2018-04-24 11:10:05.0 -0400
b/configure2018-05-04 15:18:45.626367913 -0400
+@@ -34348,21 +34348,78 @@
+
+ if test "$PHP_FREETYPE_DIR" != "no"; then
+
+-for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+- if test -f "$i/bin/freetype-config"; then
+-FREETYPE2_DIR=$i
+-FREETYPE2_CONFIG="$i/bin/freetype-config"
+-break
++# Extract the first word of "pkg-config", so it can be a program name
with args.
++set dummy pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a
path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++$as_echo "$as_me:${as_lineno-$LINENO}: found
$as_dir/$ac_word$ac_exec_ext" >&5
++break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++ ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
++$as_echo_n "checking for freetype2... " >&6; }
++
++
++if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then
++
++ FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2`
++ FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
++ FREETYPE2_VERSION=`$PKG_CONFIG --modversion freetype2`
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: from pkgco
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: d8af50b8b4257360017447d012a08ca968a7c2a7
Author: Aaron Bauman gentoo org>
AuthorDate: Mon Apr 30 00:14:35 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Mon Apr 30 00:14:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8af50b8
dev-lang/php: add LibreSSL compatibility patch
This patch fixes building with >=dev-libs/libressl-2.7.x. Patch taken
from upstream bug https://bugs.php.net/bug.php?id=76174. Hopefully this
will be included in future releases to properly detect LibreSSL
versions due to API differences.
Closes: https://bugs.gentoo.org/651308
Package-Manager: Portage-2.3.31, Repoman-2.3.9
dev-lang/php/files/libressl-compatibility.patch | 65 +
dev-lang/php/php-7.0.29.ebuild | 7 ++-
dev-lang/php/php-7.0.30.ebuild | 7 ++-
dev-lang/php/php-7.1.16.ebuild | 7 ++-
dev-lang/php/php-7.1.17.ebuild | 5 ++
dev-lang/php/php-7.2.5.ebuild | 5 ++
6 files changed, 93 insertions(+), 3 deletions(-)
diff --git a/dev-lang/php/files/libressl-compatibility.patch
b/dev-lang/php/files/libressl-compatibility.patch
new file mode 100644
index 000..3b9c39dcc59
--- /dev/null
+++ b/dev-lang/php/files/libressl-compatibility.patch
@@ -0,0 +1,65 @@
+--- a/ext/openssl/openssl.c2018-04-04 14:26:34.58300 +
b/ext/openssl/openssl.c2018-04-04 14:20:16.90700 +
+@@ -73,7 +73,7 @@
+ #ifdef HAVE_OPENSSL_MD2_H
+ #define OPENSSL_ALGO_MD2 4
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x1010L || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x1010L || (defined
(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070L)
+ #define OPENSSL_ALGO_DSS1 5
+ #endif
+ #define OPENSSL_ALGO_SHA224 6
+@@ -560,7 +560,7 @@
+ #endif
+
+ /* {{{ OpenSSL compatibility functions and macros */
+-#if OPENSSL_VERSION_NUMBER < 0x1010L || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x1010L || (defined
(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070L)
+ #define EVP_PKEY_get0_RSA(_pkey) _pkey->pkey.rsa
+ #define EVP_PKEY_get0_DH(_pkey) _pkey->pkey.dh
+ #define EVP_PKEY_get0_DSA(_pkey) _pkey->pkey.dsa
+@@ -677,7 +677,7 @@
+ return M_ASN1_STRING_data(asn1);
+ }
+
+-#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10002000L || (defined
(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070L)
+
+ static int X509_get_signature_nid(const X509 *x)
+ {
+@@ -1324,7 +1324,7 @@
+ mdtype = (EVP_MD *) EVP_md2();
+ break;
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x1010L || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x1010L || (defined
(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070L)
+ case OPENSSL_ALGO_DSS1:
+ mdtype = (EVP_MD *) EVP_dss1();
+ break;
+@@ -1450,7 +1450,7 @@
+ #ifdef HAVE_OPENSSL_MD2_H
+ REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD2", OPENSSL_ALGO_MD2,
CONST_CS|CONST_PERSISTENT);
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x1010L || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x1010L || (defined
(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070L)
+ REGISTER_LONG_CONSTANT("OPENSSL_ALGO_DSS1", OPENSSL_ALGO_DSS1,
CONST_CS|CONST_PERSISTENT);
+ #endif
+ REGISTER_LONG_CONSTANT("OPENSSL_ALGO_SHA224", OPENSSL_ALGO_SHA224,
CONST_CS|CONST_PERSISTENT);
+@@ -3620,7 +3620,7 @@
+ RETURN_FALSE;
+ }
+
+-#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !(defined
(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070L)
+ /* Due to changes in OpenSSL 1.1 related to locking when decoding CSR,
+* the pub key is not changed after assigning. It means if we pass
+* a private key, it will be returned including the private part.
+@@ -3631,7 +3631,7 @@
+ /* Retrieve the public key from the CSR */
+ tpubkey = X509_REQ_get_pubkey(csr);
+
+-#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !(defined
(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070L)
+ /* We need to free the CSR as it was duplicated */
+ X509_REQ_free(csr);
+ #endif
diff --git a/dev-lang/php/php-7.0.29.ebuild b/dev-lang/php/php-7.0.29.ebuild
index ab385d52c39..f0c6303f1cb 100644
--- a/dev-lang/php/php-7.0.29.ebuild
+++ b/dev-lang/php/php-7.0.29.ebuild
@@ -163,7 +163,12 @@ REQUIRED_USE="
mysql? ( || ( mysqli pdo ) )
"
-PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+PATCHES=(
+ "${FILESDIR}/mbstring-oniguruma-6.8.patch"
+ # hopefully upstream will include the s
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: 86446552c92ba69dbad23b24a1254cf2fb7666f6
Author: Brian Evans gentoo org>
AuthorDate: Fri Apr 27 00:48:05 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Fri Apr 27 02:21:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86446552
dev-lang/php: Version bump for 5.6.36
Package-Manager: Portage-2.3.31, Repoman-2.3.9
dev-lang/php/Manifest | 1 +
.../php/files/5.6-mbstring-oniguruma-6.8.patch | 12 +
dev-lang/php/php-5.6.36.ebuild | 776 +
3 files changed, 789 insertions(+)
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 2606ae4b12b..ee4e17e0877 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,6 +1,7 @@
DIST php-5.6.33.tar.xz 12465256 BLAKE2B
a33ce429c1565e6304031304168aa63ce82fa6c0968fc5ef09f5955e43c04ebe112db92475a999f39d997e2a3c9724ece60902ef0db84e2599d97d0e42ce57d2
SHA512
c494721594511f79a103ea3c73c5035aa0fcbca626710a0b85d2395693caf6762edefa3347cd0f8567b186f98c0df7f83cd4c698b158f0f72aa62aa4e297
DIST php-5.6.34.tar.xz 12465748 BLAKE2B
6b12f52a04d6b645d78f3d00617386a72fafffda24850e10f545464c9d0ca55321e91a292c3eb83409d0a303c4e37c2a686f547d86227c280ec78b428e73a92e
SHA512
9aa02f943d6949a28ad96df5e75eec3ecab3731824400d0a0a8ccba9dee95b7af6421b38b86f352a45c778019ebfb1e6161a03256e4ef712341a9e0bad596ae7
DIST php-5.6.35.tar.xz 12466396 BLAKE2B
96757fc064c139f238329c51741538fdbdefd04abad59c37565e1882a5a7df7d3755cf496561336b25748a968fb18dbf9d542a54a672f553f4be5ead292141cc
SHA512
dd7d891954aa7f8e83eecb265e1bb01dfd357092dad0cfc5a3f441bea069f7181cd79330653b178d4953ac1ee8570d7f4c21acc8fc67975dd7dc1413eaebf0af
+DIST php-5.6.36.tar.xz 12467560 BLAKE2B
8badaabc668ff3a4b1129f03605a1570729f8196d2e2539fe85bc42a628f2b24ea76c298b194e8466d9218ae98218243430c8d36d73fbd32b042dd6453510361
SHA512
807c68ab85b6685b19707bd18cfd46f3695b2dc67f9f17f85476634e4a80a036cb413ccae05ed5ba529eafe8df57ebf758dd664ed2942ec44f90a6e8b0172e5e
DIST php-7.0.27.tar.xz 11916824 BLAKE2B
9d2881a611435b3f9607e04d1f271ca497b8543792608f3690f00aa767fe8cc1f442822ae702076d21df0b56005d7b4e8e88b11ec6dd50d0bc198197b48cafda
SHA512
1987ad5573fdcbd5c8d92fdbf5ba8dca6e9621d89d30f66a003338467e31f09f9e8ceb5cdcb2ddf24ec7aa5acf0c8e33c3774e586e7682667eb3ed148237d1bb
DIST php-7.0.28.tar.xz 11917836 BLAKE2B
8110b0486b0556abf2249d7cbdbd245249f32e230d8197e493edfdf8df38d8eac61b79b90983fa8a2918f67a5d80fefd9a213adff4c3eb760b3844e555614650
SHA512
054c765011d2ad5bb1ef2fd2d66df05f374032015869e69112b309a13b79f437de25e9692719110efbd79f33c677add36430dab21ae12231a7730207c9e877aa
DIST php-7.0.29.tar.xz 12400192 BLAKE2B
0bd1bd9450b87437e539ec5131cb4f7e4dbf76d5fd5212bdf34c4f022dd8f2d357e9a845d83b485d89469e20675c031bcf382a8ca348161dfd082d7a389ffcb2
SHA512
ea5a2fbcfc875dd2621e3f67038c1e00f43b53bc7079ae2127fcefbf116db0f32e34d4435f8211305402a4eccdaa5dfd6b96cf9416e68700f2c1f438d74a0af8
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
new file mode 100644
index 000..642b261950f
--- /dev/null
+++ b/dev-lang/php/files/5.6-mbstring-oniguruma-6.8.patch
@@ -0,0 +1,12 @@
+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.0 -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/php-5.6.36.ebuild b/dev-lang/php/php-5.6.36.ebuild
new file mode 100644
index 000..97094f855af
--- /dev/null
+++ b/dev-lang/php/php-5.6.36.ebuild
@@ -0,0 +1,776 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic versionator systemd
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/";
+SRC_URI="https://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="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~amd6
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: 523dcfa9e646dacf81f8e43bb9f1262bff211473
Author: Michael Orlitzky gentoo org>
AuthorDate: Fri Sep 30 14:22:37 2016 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Fri Sep 30 15:05:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=523dcfa9
dev-lang/php: new 5.6 and 7.0 revisions with bison dependencies.
The PHP build system checks for the presence of bison (even if it will
not be needed), and it emits a warning if an appropriate version is
not found. In the 7.0.x series, this is easy to address by simply
adding a newish version of bison to DEPEND.
In the 5.6.x series, however, there is a bug in the bison version
check. A warning is emitted even when a suitable version of bison
(>= 3.0.1) is present on the system. So in that series, we have added
>=sys-devel/bison-3.0.1 to DEPEND, but also added a new patch. The
patch disables the buggy bison version check, eliminating the
warning. There should be no danger in doing so now that a newer bison
is in DEPEND.
Gentoo-Bug: 593278
Package-Manager: portage-2.3.0
dev-lang/php/files/php-5.6-no-bison-warnings.patch | 42
.../{php-7.0.11.ebuild => php-5.6.26-r1.ebuild}| 76 --
.../{php-7.0.11.ebuild => php-7.0.11-r1.ebuild}| 1 +
3 files changed, 86 insertions(+), 33 deletions(-)
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
new file mode 100644
index ..1896659
--- /dev/null
+++ b/dev-lang/php/files/php-5.6-no-bison-warnings.patch
@@ -0,0 +1,42 @@
+From d3466a04345b31dfc62d94fe994b40321a6418ec Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky
+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
+
diff --git a/dev-lang/php/php-7.0.11.ebuild b/dev-lang/php/php-5.6.26-r1.ebuild
similarity index 93%
copy from dev-lang/php/php-7.0.11.ebuild
copy to dev-lang/php/php-5.6.26-r1.ebuild
index 71c2ec4..420cbd7 100644
--- a/dev-lang/php/php-7.0.11.ebuild
+++ b/dev-lang/php/php-5.6.26-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="$(get_version_component_range 1-2)"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos"
# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
+SAPIS="embed cli cgi fpm apache2"
# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
IUSE="${IUSE}
@@ -26,11 +26,11 @@ IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
enchant exif frontbase +fileinfo +filter firebird
flatfile ftp gd gdbm gmp +hash +iconv imap inifile
intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
- mhash mssql mysql mysqli nls
+ mhash mssql mysql libmysqlclient mysqli nls
oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
readline recode selinux +session sharedmem
+simplexml snmp soap sockets spell sqlite ssl
- sysvipc systemd tidy +tokenizer truetype unicode wddx webp
+ sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
# The supported (that is, autodetected) versions of BDB are listed in
@@ -75,6 +75,10 @@ COMMON_DEPEND="
ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
mssql? ( dev-db/freetds[mssql] )
+ libmysqlclient? (
+ mysql? ( virtual/libmysqlclient:= )
+ mysqli? ( virtual/libmysqlclient:= )
+ )
nls? ( sys-devel/gettext )
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/
commit: 2f8066e2129485296c0493997894e666143be129
Author: Michael Orlitzky gentoo org>
AuthorDate: Tue Jul 26 20:21:44 2016 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Tue Jul 26 21:43:28 2016 +
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..000
--- a/dev-lang/php/files/php5-ldvs
+++ /dev/null
@@ -1 +0,0 @@
-PHP_5 { global: *; };
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/
commit: e8af3741c2780564e21ca7970c1e91b5c22c2324
Author: Michael Orlitzky gentoo org>
AuthorDate: Thu Nov 19 21:32:54 2015 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Thu Nov 19 21:33:17 2015 +
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..000
--- 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.c2010-10-22 17:46:26.0 +0200
-+++ b/ext/mysqlnd/mysqlnd.c2010-12-08 21:54:47.0 +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..000
--- 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.old2013-01-01 13:49:04.587825704 +0100
-+++ Zend/zend_execute.h2013-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..000
--- a/dev-lang/php/files/bison_any_version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
./Zend/acinclude.m42013-03-20 15:09:27.0 +0100
-+++ ./Zend/acinclude.m4.new2013-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..000
--- 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
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
commit: d9454b5d1c5a22855e7c22f30644ba7c8980f923
Author: Michael Orlitzky gentoo org>
AuthorDate: Mon Nov 2 23:00:20 2015 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Mon Nov 2 23:35:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9454b5d
dev-lang/php: revbump php-5.6.15 to fix a segfault.
The segfault issue was reported in bug #564690 by Zoltán
Halassy. There is an upstream fix that we've added as a patch. The
problem/fix have both been confirmed.
Since this requires a revbump, the sys-libs/db dependency has been
fixed along with it according to bug #521222. It still remains to
address that issue for the php-7.x series.
Gentoo-Bug: 521222
Gentoo-Bug: 564690
Package-Manager: portage-2.2.20.1
.../php/files/fix-5.6.15-fpm-const-crash.patch | 59 ++
.../{php-5.6.15.ebuild => php-5.6.15-r1.ebuild}| 23 -
2 files changed, 80 insertions(+), 2 deletions(-)
diff --git a/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch
b/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch
new file mode 100644
index 000..29876a9
--- /dev/null
+++ b/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch
@@ -0,0 +1,59 @@
+From 37ed0dafe47fb1053aee7822113bacc1f213337a Mon Sep 17 00:00:00 2001
+From: Xinchen Hui
+Date: Mon, 2 Nov 2015 10:47:02 +0800
+Subject: [PATCH] Fixed bug #70828 (php-fpm 5.6 with opcache crashes when
+ referencing a non-existent constant)
+
+---
+ NEWS | 2 ++
+ Zend/tests/bug70828.phpt | 24
+ Zend/zend_compile.c | 2 +-
+ 3 files changed, 27 insertions(+), 1 deletion(-)
+ create mode 100644 Zend/tests/bug70828.phpt
+
+diff --git a/Zend/tests/bug70828.phpt b/Zend/tests/bug70828.phpt
+new file mode 100644
+index 000..dd285b5
+--- /dev/null
b/Zend/tests/bug70828.phpt
+@@ -0,0 +1,24 @@
++--TEST--
++Bug #70828 (php-fpm 5.6 with opcache crashes when referencing a non-existent
constant)
++--FILE--
++
++--EXPECTF--
++Notice: Use of undefined constant nonexistent - assumed 'nonexistent' in
/home/huixinchen/opensource/php-5.6/Zend/tests/bug70828.php on line 8
++string(11) "nonexistent"
+diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
+index 5ff1b04..fca4e2a 100644
+--- a/Zend/zend_compile.c
b/Zend/zend_compile.c
+@@ -5804,7 +5804,7 @@ void zend_do_fetch_constant(znode *result, znode
*constant_container, znode *con
+ opline->op2.constant =
zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 0
TSRMLS_CC);
+ } else {
+ opline->extended_value =
IS_CONSTANT_UNQUALIFIED;
+- if (CG(current_namespace)) {
++ if (check_namespace && CG(current_namespace)) {
+ opline->extended_value |=
IS_CONSTANT_IN_NAMESPACE;
+ opline->op2.constant =
zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 1
TSRMLS_CC);
+ } else {
+--
+2.1.4
+
diff --git a/dev-lang/php/php-5.6.15.ebuild b/dev-lang/php/php-5.6.15-r1.ebuild
similarity index 96%
rename from dev-lang/php/php-5.6.15.ebuild
rename to dev-lang/php/php-5.6.15-r1.ebuild
index c6cc5ca..c64fd9d 100644
--- a/dev-lang/php/php-5.6.15.ebuild
+++ b/dev-lang/php/php-5.6.15-r1.ebuild
@@ -79,8 +79,23 @@ DEPEND="
>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
>=dev-libs/libpcre-8.32[unicode]
apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-
