update to 7.4.33 [release 7.4.33-1mamba;Mon Jan 15 2024]

This commit is contained in:
Silvan Calarco 2024-01-15 18:31:22 +01:00
parent 501aec6079
commit 777807c378
2 changed files with 26 additions and 41 deletions

View File

@ -0,0 +1,12 @@
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1482,7 +1482,9 @@
REGISTER_LONG_CONSTANT("PKCS7_NOSIGS", PKCS7_NOSIGS, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_PADDING", RSA_PKCS1_PADDING, CONST_CS|CONST_PERSISTENT);
+#ifdef RSA_SSLV23_PADDING
REGISTER_LONG_CONSTANT("OPENSSL_SSLV23_PADDING", RSA_SSLV23_PADDING, CONST_CS|CONST_PERSISTENT);
+#endif
REGISTER_LONG_CONSTANT("OPENSSL_NO_PADDING", RSA_NO_PADDING, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_OAEP_PADDING", RSA_PKCS1_OAEP_PADDING, CONST_CS|CONST_PERSISTENT);

View File

@ -6,7 +6,7 @@
%define with_hardening_patch 0 %define with_hardening_patch 0
Name: php Name: php
Version: 7.4.23 Version: 7.4.33
Release: 1mamba Release: 1mamba
Summary: The PHP HTML-embedded scripting language Summary: The PHP HTML-embedded scripting language
Group: Applications/Development Group: Applications/Development
@ -25,68 +25,36 @@ Patch4: %{name}-5.2.11-BID_36555.patch
Patch5: %{name}-5.3.13-apache-2.4.patch Patch5: %{name}-5.3.13-apache-2.4.patch
Patch6: php-7.4.6-mariadb-10.4.13.patch Patch6: php-7.4.6-mariadb-10.4.13.patch
Patch7: php-7.4.23-php-fpm.patch Patch7: php-7.4.23-php-fpm.patch
Patch8: php-7.4.33-openssl-3.patch
License: PHP License License: PHP License
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
#libdl.so.2()(64bit): /usr/lib64/libdl.so: file not owned by any package
#librt.so.1()(64bit): /usr/lib64/librt.so: file not owned by any package
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: libX11-devel
BuildRequires: libXau-devel
BuildRequires: libXdmcp-devel
BuildRequires: libXpm-devel
BuildRequires: libacl-devel BuildRequires: libacl-devel
BuildRequires: libapparmor-devel
BuildRequires: libattr-devel BuildRequires: libattr-devel
BuildRequires: libbrotli-devel
BuildRequires: libbsd-devel
BuildRequires: libbzip2-devel BuildRequires: libbzip2-devel
BuildRequires: libcares-devel
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: libdb53-devel BuildRequires: libdb53-devel
BuildRequires: libe2fs-devel BuildRequires: libe2fs-devel
BuildRequires: libexpat-devel
BuildRequires: libfontconfig-devel
BuildRequires: libfreetype-devel
BuildRequires: libgcc BuildRequires: libgcc
BuildRequires: libgd-devel
BuildRequires: libglib-devel
BuildRequires: libgraphite2-devel
BuildRequires: libgsasl-devel
BuildRequires: libgss-devel
BuildRequires: libharfbuzz-devel
BuildRequires: libicu-devel BuildRequires: libicu-devel
BuildRequires: libidn-devel
BuildRequires: libidn2-devel
BuildRequires: libimap-c-client-devel BuildRequires: libimap-c-client-devel
BuildRequires: libjbig-devel
BuildRequires: libjpeg-devel
BuildRequires: libkrb5-devel BuildRequires: libkrb5-devel
BuildRequires: liblzma-devel
BuildRequires: libnghttp2-devel
BuildRequires: libntlm-devel
BuildRequires: libodbc-devel BuildRequires: libodbc-devel
BuildRequires: libonig-devel BuildRequires: libonig-devel
BuildRequires: libopenldap-devel BuildRequires: libopenldap-devel
BuildRequires: libopenssl-devel BuildRequires: libopenssl-devel
BuildRequires: libpam-devel BuildRequires: libpam-devel
BuildRequires: libpcre-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: libpostgresql-devel BuildRequires: libpostgresql-devel
BuildRequires: libpsl-devel
BuildRequires: librtmp-devel
BuildRequires: libsasl2-devel
BuildRequires: libsqlite-devel BuildRequires: libsqlite-devel
BuildRequires: libssh2-devel
BuildRequires: libstdc++6-devel BuildRequires: libstdc++6-devel
BuildRequires: libsystemd-devel BuildRequires: libsystemd-devel
BuildRequires: libtiff-devel BuildRequires: libxcrypt-devel
BuildRequires: libunistring-devel
BuildRequires: libwebp-devel
BuildRequires: libxcb-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: libxslt-devel BuildRequires: libxslt-devel
BuildRequires: libz-devel BuildRequires: libz-devel
BuildRequires: libzip-devel BuildRequires: libzip-devel
BuildRequires: libzstd-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: apache-devel BuildRequires: apache-devel
BuildRequires: libapr-devel BuildRequires: libapr-devel
@ -297,14 +265,16 @@ This package adds PHP support to the Apache Web Server.
%debug_package %debug_package
%prep %prep
%setup -q -D -T %setup -q
:<< _EOF #-D -T
#:<< _EOF
%if %with_hardening_patch %if %with_hardening_patch
%patch0 -p1 -b .hardening %patch0 -p1 -b .hardening
%endif %endif
%patch1 -p1 -b .phpbuilddir %patch1 -p1 -b .phpbuilddir
#%patch6 -p1 #%patch6 -p1
%patch7 -p0 %patch7 -p0
%patch 8 -p1 -b .openssl-3
# phpize dir # phpize dir
sed -i "s|@libdir@\`/build|@libdir@\`/php/build|" scripts/phpize.in sed -i "s|@libdir@\`/build|@libdir@\`/php/build|" scripts/phpize.in
@ -315,7 +285,7 @@ cp TSRM/LICENSE TSRM_LICENSE
#cp ext/gd/libgd/README gd_README #cp ext/gd/libgd/README gd_README
%build %build
:<< _EOF #:<< _EOF
EXTENSION_DIR=%{_libdir}/php/extensions EXTENSION_DIR=%{_libdir}/php/extensions
export EXTENSION_DIR export EXTENSION_DIR
@ -362,7 +332,7 @@ _phpconfig="\
--enable-exif \ --enable-exif \
--enable-intl \ --enable-intl \
--enable-gd \ --enable-gd \
--with-external-gd --with-external-gd=no
" "
# FPM # FPM
@ -385,7 +355,7 @@ cd ..
# Apache # Apache
# reuse the previous run; this will save us a lot of time # reuse the previous run; this will save us a lot of time
cp -a build-fpm build-apache cp -a build-fpm build-apache
_EOF
cd build-apache cd build-apache
%ifarch arm aarch64 %ifarch arm aarch64
@ -594,6 +564,9 @@ fi
%config(noreplace) %{_sysconfdir}/httpd/httpd.d/php.conf %config(noreplace) %{_sysconfdir}/httpd/httpd.d/php.conf
%changelog %changelog
* Mon Jan 15 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 7.4.33-1mamba
- update to 7.4.33
* Mon Aug 30 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 7.4.23-1mamba * Mon Aug 30 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 7.4.23-1mamba
- update to 7.4.23 - update to 7.4.23
- added php-fpm - added php-fpm