diff --git a/.gitignore b/.gitignore index 3642b15..6d49f8f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ clog TODO *.md +/php-7.4.*.tar.xz +/php-7.4.*.tar.xz.asc /php-8.0.*.tar.xz /php-8.0.*.tar.xz.asc /php-8.1.*.tar.xz @@ -9,7 +11,5 @@ TODO /php-8.2.*.tar.xz.asc /php-8.3.7.tar.xz /php-8.3.7.tar.xz.asc -/php-8.3.10.tar.xz -/php-8.3.10.tar.xz.asc -/php-8.3.12.tar.xz -/php-8.3.12.tar.xz.asc +/php-8.3.15.tar.xz +/php-8.3.15.tar.xz.asc diff --git a/news2markdown.php b/news2markdown.php deleted file mode 100755 index 8387b5d..0000000 --- a/news2markdown.php +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env php - %s System => %s - Build Date => %s%a + Build Date => %r(.+?)%r -Configure Command => %s Server API => Command Line Interface Virtual Directory Support => %s diff --git a/php.spec b/php.spec index f00546e..de2098b 100644 --- a/php.spec +++ b/php.spec @@ -63,12 +63,12 @@ %bcond_with imap %bcond_without lmdb -%global upver 8.3.12 +%global upver 8.3.15 Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{rcver}} -Release: 2%{?dist} +Release: 1%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -117,7 +117,7 @@ Patch43: php-7.4.0-phpize.patch Patch45: php-7.4.0-ldap_r.patch # drop "Configure command" from phpinfo output # and only use gcc (instead of full version) -Patch47: php-8.1.0-phpinfo.patch +Patch47: php-8.3.13-phpinfo.patch # Always warn about missing curve_name # Both Fedora and RHEL do not support arbitrary EC parameters Patch48: php-8.3.0-openssl-ec-param.patch @@ -161,6 +161,7 @@ BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: libtool-ltdl-devel BuildRequires: systemtap-sdt-devel +BuildRequires: systemtap-sdt-dtrace # used for tests BuildRequires: %{_bindir}/ps BuildRequires: tzdata @@ -741,7 +742,7 @@ cp TSRM/LICENSE TSRM_LICENSE cp Zend/asm/LICENSE BOOST_LICENSE cp sapi/fpm/LICENSE fpm_LICENSE cp ext/mbstring/libmbfl/LICENSE libmbfl_LICENSE -# cp ext/fileinfo/libmagic/LICENSE libmagic_LICENSE +cp ext/fileinfo/libmagic/LICENSE libmagic_LICENSE cp ext/bcmath/libbcmath/LICENSE libbcmath_LICENSE cp ext/date/lib/LICENSE.rst timelib_LICENSE @@ -1035,7 +1036,7 @@ build --enable-fpm \ popd # Build for inclusion as embedded script language into applications, -# /usr/lib[64]/libphp7.so +# /usr/lib[64]/libphp.so pushd build-embedded build --enable-embed \ --without-mysqli --disable-pdo \ @@ -1418,7 +1419,7 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %files common -f files.common %doc EXTENSIONS NEWS UPGRADING* README.REDIST.BINS *md docs %license LICENSE TSRM_LICENSE ZEND_LICENSE BOOST_LICENSE -#license libmagic_LICENSE +%license libmagic_LICENSE %license timelib_LICENSE %doc php.ini-* %config(noreplace) %{_sysconfdir}/php.ini @@ -1553,6 +1554,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %changelog +* Mon Jan 20 2025 Remi Collet - 8.3.15-1 +- rebase to 8.3.15 + * Tue Oct 29 2024 Troy Dawson - 8.3.12-2 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018 diff --git a/sources b/sources index 46b87be..52eb240 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (php-8.3.12.tar.xz) = 2c4b440fa52950c75934559e977f39a179d1ad9edf8a17fe1b9ff89b58fbcafffb1bc1d59b6df46a9631554f0255c9271d906238c59287c799d195459be3e6a3 -SHA512 (php-8.3.12.tar.xz.asc) = c9b72a7d6dca695f3498aa720a4fbf18771e3b6132e432f4c8fc764a15bdb2b9d5db97f8b6064f1291f7e1ec1a59c3ddec3d79c8a1bbfe68d7bf29f666998f47 +SHA512 (php-8.3.15.tar.xz) = 43057cca0a6c2187f7991dfbf9743495784f0fa4d0336f08392036ecc2b6f83c7155737ebef3af6144a79eca557bf84cba4aedd34e0d19c701249ca4e8fa86d0 +SHA512 (php-8.3.15.tar.xz.asc) = 619023075dbf356057e7a2beed29d60228abc9e12cf1a8f569256e5bc4074347f4a5742769c974438e63787ced9227f6f842eabf258013d999f5d813c1f43399