summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-09-12 16:04:25 +0200
committerRemi Collet <remi@php.net>2023-09-12 16:04:25 +0200
commit69fec948fa82145fc0f2534a67c779c74185eaad (patch)
tree7b3db351328ab6f5da5b1169a3ad5a36e4d36df0
parentd792d850dfb33c25e87dc02767ae34a07c7441d9 (diff)
update to 8.3.0RC2
use oracle client library version 21.11
-rw-r--r--failed.txt2
-rw-r--r--php-7.4.0-phpize.patch34
-rw-r--r--php-dtrace.patch126
-rw-r--r--php83.spec13
4 files changed, 41 insertions, 134 deletions
diff --git a/failed.txt b/failed.txt
index ae2101d..01aaa81 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.3.0RC1 (2023-08-31)
+===== 8.3.0RC2 (2023-09-14)
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
diff --git a/php-7.4.0-phpize.patch b/php-7.4.0-phpize.patch
index fb99f3e..46aff56 100644
--- a/php-7.4.0-phpize.patch
+++ b/php-7.4.0-phpize.patch
@@ -1,7 +1,7 @@
diff -up ./scripts/phpize.in.headers ./scripts/phpize.in
--- ./scripts/phpize.in.headers 2019-07-23 10:05:11.000000000 +0200
+++ ./scripts/phpize.in 2019-07-23 10:18:13.648098089 +0200
-@@ -165,6 +165,15 @@ phpize_autotools()
+@@ -166,6 +166,15 @@ phpize_autotools()
$PHP_AUTOHEADER || exit 1
}
@@ -17,7 +17,7 @@ diff -up ./scripts/phpize.in.headers ./scripts/phpize.in
# Main script
case "$1" in
-@@ -183,12 +192,15 @@ case "$1" in
+@@ -184,12 +193,15 @@ case "$1" in
# Version
--version|-v)
@@ -33,3 +33,33 @@ diff -up ./scripts/phpize.in.headers ./scripts/phpize.in
phpize_check_configm4 0
phpize_check_build_files
+From c454f120857df6f771c5475bf1fcc99e683b87dc Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 7 Sep 2023 09:56:51 +0200
+Subject: [PATCH] also display PHP version in phpize
+
+---
+ scripts/phpize.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/scripts/phpize.in b/scripts/phpize.in
+index 7d9c1df14c8e..81605e06a590 100644
+--- a/scripts/phpize.in
++++ b/scripts/phpize.in
+@@ -59,6 +59,8 @@ phpize_check_configm4()
+ phpize_get_api_numbers()
+ {
+ # extracting API NOs:
++ PHP_MINOR_VERSION=`grep '#define PHP_MINOR_VERSION' $includedir/main/php_version.h|$SED 's/#define PHP_MINOR_VERSION //'`
++ PHP_MAJOR_VERSION=`grep '#define PHP_MAJOR_VERSION' $includedir/main/php_version.h|$SED 's/#define PHP_MAJOR_VERSION//'`
+ PHP_API_VERSION=`grep '#define PHP_API_VERSION' $includedir/main/php.h|$SED 's/#define PHP_API_VERSION//'`
+ ZEND_MODULE_API_NO=`grep '#define ZEND_MODULE_API_NO' $includedir/Zend/zend_modules.h|$SED 's/#define ZEND_MODULE_API_NO//'`
+ ZEND_EXTENSION_API_NO=`grep '#define ZEND_EXTENSION_API_NO' $includedir/Zend/zend_extensions.h|$SED 's/#define ZEND_EXTENSION_API_NO//'`
+@@ -68,6 +70,7 @@ phpize_print_api_numbers()
+ {
+ phpize_get_api_numbers
+ echo "Configuring for:"
++ echo "PHP Version: ${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}"
+ echo "PHP Api Version: "$PHP_API_VERSION
+ echo "Zend Module Api No: "$ZEND_MODULE_API_NO
+ echo "Zend Extension Api No: "$ZEND_EXTENSION_API_NO
diff --git a/php-dtrace.patch b/php-dtrace.patch
deleted file mode 100644
index b9e21b5..0000000
--- a/php-dtrace.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 475fd29527ffd86297e7cd61fd1617a7374c5220 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Filip=20Zr=C5=AFst?=
- <128540+f4z4on@users.noreply.github.com>
-Date: Wed, 19 Jul 2023 15:30:02 +0200
-Subject: [PATCH] Improve DTrace probe generation /w non-default compiler
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-With DTrace support enabled during ./configure, our custom Autoconf
-macro PHP_INIT_DTRACE creates make rules to generate header and object
-files using dtrace utility. SystemTap† implementation of dtrace relies
-on other utilities to provide header preprocessing and final object file
-compilation. These utilities are configured by common environment
-variables with common defaults:‡
-
-* preprocessor from CPP defaults to “cpp”
-* compiler from CC defaults to “gcc”
-* compiler arguments can be expanded with CFLAGS
-
-This has been in SystemTap since version 1.5 released on 2011-05-23. We
-have been setting CFLAGS for dtrace since 717b367 released in versions
-5.4.20 and 5.5.4 on 2013-09-18. This change fixed build against
-SystemTap. It fixes majority of cases since practically all free Linux
-distributions use SystemTap for DTrace-like dynamic tracing and
-practically all of them use GCC or compatible compiler suite. However,
-this becomes an issue when cross-compiling using GCC because utility
-names contain target triplets. Autoconf already handles
-cross-compilation well —setting correct CC and CPP make macros
-(variables).
-
-Therefore, we simply set CC and CPP environment variables using
-respective macros when executing dtrace. Although SystemTap dtrace does
-not always use CC nor CPP, we set it every time. SystemTap documentation
-does not talk about this at all¶, so it is safer to always set it. We
-also follow how we set CFLAGS every time in the past.
-
-Original (or ported) DTrace mainly used on Oracle Linux, Solaris and
-macOS ignores these and does not support cross compilation.§
-
-† Well-known dynamic tracing infrastructure for Linux compatible with
-statically-defined tracing from DTrace.
-‡ https://sourceware.org/git/?p=systemtap.git;a=blob;f=dtrace.in;h=73a6f22e2de072773c692e3fea05c4b8cf814e43;hb=ebb424eee5599fcc131901c0d82d0bfc0d2f57ab
-¶ https://sourceware.org/systemtap/man/dtrace.1.html
-§ https://docs.oracle.com/cd/E88353_01/html/E72487/dtrace-8.html
-
-Closes GH-11643
----
- build/php.m4 | 8 ++++----
- ext/oci8/config.m4 | 8 ++++----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/build/php.m4 b/build/php.m4
-index 919279833f79..921a78eb78e3 100644
---- a/build/php.m4
-+++ b/build/php.m4
-@@ -2389,7 +2389,7 @@ dnl overwritten (Bug 61268).
- $abs_srcdir/$ac_provsrc:;
-
- $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
-- CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
-+ CPP="\$(CPP)" CC="\$(CC)" CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
-
- \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
-
-@@ -2409,12 +2409,12 @@ EOF
- $ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS)
- echo "[#] Generated by Makefile for libtool" > \$[]@
- @test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir
-- if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
-+ if CPP="\$(CPP)" CC="\$(CC)" CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
- echo "pic_object=['].libs/$dtrace_prov_name[']" >> \$[]@ [;\\]
- else [\\]
- echo "pic_object='none'" >> \$[]@ [;\\]
- fi
-- if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
-+ if CPP="\$(CPP)" CC="\$(CC)" CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
- echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\]
- else [\\]
- echo "non_pic_object='none'" >> \$[]@ [;\\]
-@@ -2426,7 +2426,7 @@ EOF
- *)
- cat>>Makefile.objects<<EOF
- $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
-- CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
-+ CPP="\$(CPP)" CC="\$(CC)" CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
-
- EOF
- ;;
-diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
-index 714c655be439..883e272fb1fa 100644
---- a/ext/oci8/config.m4
-+++ b/ext/oci8/config.m4
-@@ -124,7 +124,7 @@ dnl overwritten (Bug 61268).
- PHP_EXT_SRCDIR([oci8])/$ac_provsrc:;
-
- $ac_bdir[$]ac_hdrobj: $ac_srcdir[$]ac_provsrc
-- CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHPOCI_,DTRACE_,g' \$[]@.bak > \$[]@
-+ CPP="\$(CPP)" CC="\$(CC)" CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHPOCI_,DTRACE_,g' \$[]@.bak > \$[]@
-
- \$(OCI8_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
-
-@@ -145,12 +145,12 @@ EOF
- $ac_bdir[$]ac_provsrc.lo: \$(OCI8_DTRACE_OBJS)
- echo "[#] Generated by Makefile for libtool" > \$[]@
- @test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir
-- if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $ac_srcdir[$]ac_provsrc $dtrace_oci8_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
-+ if CPP="\$(CPP)" CC="\$(CC)" CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $ac_srcdir[$]ac_provsrc $dtrace_oci8_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
- echo "pic_object=['].libs/$dtrace_prov_name[']" >> \$[]@ [;\\]
- else [\\]
- echo "pic_object='none'" >> \$[]@ [;\\]
- fi
-- if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir[$]ac_provsrc.o -s $ac_srcdir[$]ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
-+ if CPP="\$(CPP)" CC="\$(CC)" CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir[$]ac_provsrc.o -s $ac_srcdir[$]ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
- echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\]
- else [\\]
- echo "non_pic_object='none'" >> \$[]@ [;\\]
-@@ -162,7 +162,7 @@ EOF
- AC_MSG_WARN([OCI8 extension: OCI8 DTrace support is not confirmed on this platform])
- cat>>Makefile.objects<<EOF
- $ac_bdir[$]ac_provsrc.o: \$(OCI8_DTRACE_OBJS)
-- CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $ac_srcdir[$]ac_provsrc $dtrace_oci8_objs
-+ CPP="\$(CPP)" CC="\$(CC)" CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $ac_srcdir[$]ac_provsrc $dtrace_oci8_objs
-
- EOF
- ;;
diff --git a/php83.spec b/php83.spec
index 6f0f7c3..426ecd1 100644
--- a/php83.spec
+++ b/php83.spec
@@ -24,7 +24,7 @@
%global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock)
-%global oraclever 21.10
+%global oraclever 21.11
%global oraclelib 21.1
# Build for LiteSpeed Web Server (LSAPI), you can disable using --without tests
@@ -110,7 +110,7 @@
%bcond_with zip
%global upver 8.3.0
-%global rcver RC1
+%global rcver RC2
# TODO set PHP_EXTRA_VERSION for EOL version
Summary: PHP scripting language for creating dynamic web sites
@@ -164,6 +164,7 @@ Patch41: php-8.3.0-parser.patch
# use system tzdata
Patch42: php-8.1.0-systzdata-v23.patch
# See http://bugs.php.net/53436
+# + display PHP version backported from 8.4
Patch43: php-7.4.0-phpize.patch
# Use -lldap_r for OpenLDAP
Patch45: php-7.4.0-ldap_r.patch
@@ -188,7 +189,6 @@ Patch91: php-7.2.0-oci8conf.patch
Patch300: php-7.4.0-datetests.patch
# WIP
-Patch400: php-dtrace.patch
BuildRequires: gnupg2
BuildRequires: bzip2-devel
@@ -494,7 +494,7 @@ Obsoletes: php74-devel, php74w-devel
Obsoletes: php80-devel
%endif
%if 0%{?fedora} || 0%{?rhel} >= 8
-Recommends: php-nikic-php-parser4 >= 4.15.1
+Recommends: php-nikic-php-parser5 >= 5.0.0~alpha3
%endif
%description devel
@@ -1206,7 +1206,6 @@ in pure PHP.
%endif
# WIP patch
-%patch -P400 -p1 -R -b .dtrace
# Prevent %%doc confusion over LICENSE files
cp Zend/LICENSE ZEND_LICENSE
@@ -2208,6 +2207,10 @@ fi
%changelog
+* Tue Sep 12 2023 Remi Collet <remi@remirepo.net> - 8.3.0~rc2-1
+- update to 8.3.0RC2
+- use oracle client library version 21.11
+
* Tue Aug 29 2023 Remi Collet <remi@remirepo.net> - 8.3.0~rc1-1
- update to 8.3.0RC1
- bump to final API/ABI