Hello community, here is the log from the commit of package php7.13872 for openSUSE:Leap:15.2:Update checked in at 2020-09-07 10:26:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2:Update/php7.13872 (Old) and /work/SRC/openSUSE:Leap:15.2:Update/.php7.13872.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7.13872" Mon Sep 7 10:26:35 2020 rev:1 rq:831977 version:7.4.6 Changes: -------- New Changes file: --- /dev/null 2020-08-06 00:20:10.149648038 +0200 +++ /work/SRC/openSUSE:Leap:15.2:Update/.php7.13872.new.3399/php7.changes 2020-09-07 10:26:36.994956009 +0200 @@ -0,0 +1,4597 @@ +------------------------------------------------------------------- +Thu Aug 13 14:01:39 UTC 2020 - [email protected] + +- security update +- added patches + fix CVE-2020-7068 [bsc#1175223], Use of freed hash key in the phar_parse_zipfile function + + php7-CVE-2020-7068.patch + +------------------------------------------------------------------- +Thu Jul 9 13:13:48 UTC 2020 - [email protected] + +- Use /run/php-fpm instead of /run/php +- modified sources + % php-fpm.tmpfiles.d + +------------------------------------------------------------------- +Thu Jul 9 12:23:52 UTC 2020 - [email protected] + +- do not install %{_tmpfilesdir}, %{_tmpfilesdir}/php-fpm.conf in + test favour + +------------------------------------------------------------------- +Mon Jul 6 21:21:45 UTC 2020 - Daniel Molkentin <[email protected]> + +- added tmpfiles.d for php-fpm to provide a base base for a socket + (boo#1173786) + +------------------------------------------------------------------- +Thu May 14 09:05:51 UTC 2020 - Arjen de Korte <[email protected]> + +- updated to 7.4.6: This is a security release which also contains + several bug fixes. See https://www.php.net/ChangeLog-7.php#7.4.6 + +------------------------------------------------------------------- +Wed May 13 11:42:01 UTC 2020 - [email protected] + +- added patches + build fixes in SLE12 + + php7-arm-build-fixes.patch + +------------------------------------------------------------------- +Tue May 12 13:28:05 UTC 2020 - [email protected] + +- added to SLE-12 [jsc#SLE-12474] + +------------------------------------------------------------------- +Tue May 12 13:11:31 UTC 2020 - [email protected] + +- spec file usable under SLE12 again and better prepared for + phpM -> phpMN transition + +------------------------------------------------------------------- +Mon May 11 09:59:41 UTC 2020 - [email protected] + +- added to SLE-15-SP2 [jsc#SLE-12482], including fixes for: + CVE-2020-7063 [bsc#1165289] + CVE-2020-7062 [bsc#1165280] + CVE-2019-11046, CVE-2019-11050, CVE-2019-11047, CVE-2019-11045 + +------------------------------------------------------------------- +Tue Apr 14 14:40:32 UTC 2020 - Arjen de Korte <[email protected]> + +- updated to 7.4.5: This is a security release which also contains + several bug fixes. See https://www.php.net/ChangeLog-7.php#7.4.5 + +------------------------------------------------------------------- +Thu Apr 2 11:14:13 UTC 2020 - [email protected] + +- remove Berkeley DB Database support [jsc#SLE-12210] + +------------------------------------------------------------------- +Fri Mar 20 07:39:34 UTC 2020 - [email protected] + +- build firebird extension in any case + +------------------------------------------------------------------- +Tue Mar 17 19:48:01 UTC 2020 - Arjen de Korte <[email protected]> + +- updated to 7.4.4: This is a security release which also contains + several bug fixes. See https://www.php.net/ChangeLog-7.php#7.4.4 + +------------------------------------------------------------------- +Thu Mar 12 08:47:27 UTC 2020 - Martin Liška <[email protected]> + +- Enable LTO as it works now (boo#1133275). + +------------------------------------------------------------------- +Wed Feb 19 09:11:21 UTC 2020 - Arjen de Korte <[email protected]> + +- updated to 7.4.3: This is a security release which also contains + several bug fixes. See https://www.php.net/ChangeLog-7.php#7.4.3 + +------------------------------------------------------------------- +Mon Feb 10 16:25:11 UTC 2020 - [email protected] + +- add %apache_rex_deps + +------------------------------------------------------------------- +Thu Jan 23 11:08:54 UTC 2020 - Arjen de Korte <[email protected]> + +- updated to 7.4.2: This is a security release which also contains + several bug fixes. See https://www.php.net/ChangeLog-7.php#7.4.2 + +------------------------------------------------------------------- +Wed Dec 18 13:35:41 UTC 2019 - Arjen de Korte <[email protected]> + +- updated to 7.4.1: This is a security release which also contains + several bug fixes. See https://www.php.net/ChangeLog-7.php#7.4.1 +- deleted patches + - php-fix-mysqlnd-compression-library.patch + - php-fpm-service-fails-to-start.patch + +------------------------------------------------------------------- +Tue Dec 10 13:24:53 UTC 2019 - [email protected] + +- php7-devel requires glibc-devel, libxml2-devel, pcre2-devel + again + +------------------------------------------------------------------- +Thu Dec 5 09:27:35 UTC 2019 - Arjen de Korte <[email protected]> + +- relax systemd restrictions for FPM as they were too strict in + some applications +- change leftover Requires php7-<extension> to php-<extension> +- remove external libraries from -devel subpackage +- added patches + + php-fpm-service-fails-to-start.patch + +------------------------------------------------------------------- +Thu Nov 28 10:16:27 UTC 2019 - Arjen de Korte <[email protected]> + +- update to 7.4.0: + * Typed Properties + * Arrow Functions + * Limited Return Type Covariance and Argument Type Contravariance + * Unpacking Inside Arrays + * Numeric Literal Separator + * Weak References + * Allow Exceptions from __toString() + * Opcache Preloading + * The interbase and wddx extensions are removed and now + available through PECL + * PEAR is now packaged separately in php7-pear source package + (https://externals.io/message/103977) + * See https://www.php.net/ChangeLog-7.php#7.4.0 for a complete + list of changes +- deleted patches + - php-suse-addons.tar.bz + - php-systzdata-v18.patch +- added patches + + php-fix-mysqlnd-compression-library.patch + + php-systzdata-v19.patch + + mod_php7.conf +- modified files/patches + % php-no-build-date.patch + % php-systemd-unit.patch + % php7.keyring (use keys of the PHP-7.4 release managers) + % php7.rpmlintrc + +------------------------------------------------------------------- +Tue Nov 19 09:50:52 UTC 2019 - [email protected] + +- added to SLE-15-SP2 [SLE-10860], fixes + CVE-2019-11043 [bsc#1154999] + CVE-2019-11041 [bsc#1146360] + CVE-2019-11042 [bsc#1145095] + CVE-2019-11039 [bsc#1138173] + CVE-2019-11040 [bsc#1138172] + CVE-2019-11036 [bsc#1134322] + CVE-2019-11034 [bsc#1132838] + CVE-2019-11035 [bsc#1132837] + CVE-2019-9637 [bsc#1128892] + CVE-2019-9675 [bsc#1128886] + CVE-2019-9638 [bsc#1128889], CVE-2019-9639 [bsc#1128887] + CVE-2019-9640 [bsc#1128883] + CVE-2019-9024 [bsc#1126821] + CVE-2019-9020 [bsc#1126711] + CVE-2018-20783 [bsc#1127122] + CVE-2019-9021 [bsc#1126713] + CVE-2019-9022 [bsc#1126827] + CVE-2019-9023 [bsc#1126823] + CVE-2019-9641 [bsc#1128722] + CVE-2018-19935 [bsc#1118832] + CVE-2018-17082 [bsc#1108753] + CVE-2018-1000222 [bsc#1105434] + CVE-2018-14851 [bsc#1103659] + CVE-2017-9120 [bsc#1103661] + CVE-2018-12882 [bsc#1099098] + [bsc#1151793] + +------------------------------------------------------------------- +Tue Nov 12 13:09:18 UTC 2019 - Dominique Leuenberger <[email protected]> + +- Do not add the generic provides to the php7-test package. + +------------------------------------------------------------------- +Fri Oct 25 06:53:03 UTC 2019 - [email protected] ++++ 4400 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Leap:15.2:Update/.php7.13872.new.3399/php7.changes New: ---- README.macros _multibuild build-test.sh macros.php mod_php7.conf php-7.4.6.tar.xz php-7.4.6.tar.xz.asc php-crypt-tests.patch php-date-regenerate-lexers.patch php-embed.patch php-fix_net-snmp_disable_MD5.patch php-fpm.tmpfiles.d php-ini.patch php-no-build-date.patch php-odbc-cmp-int-cast.patch php-openssl.patch php-php-config.patch php-phpize.patch php-pts.patch php-systemd-unit.patch php-systzdata-v19.patch php7-CVE-2020-7068.patch php7-arm-build-fixes.patch php7.changes php7.keyring php7.rpmlintrc php7.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php7.spec ++++++ ++++ 1623 lines (skipped) ++++++ README.macros ++++++ README for php-macros Author: Christian Wittmer <[email protected]> Author: Johannes Weberhofer <[email protected]> %php_pear_gen_filelist generates an rpmlint happy filelist of your installed files In most cases you only need to check the %doc part sometimes there is a "Changes" or "ChangeLog",.... Requirements for %php_pear_gen_filelist You have to define following parts inside your spec file Example: # # spec file for package php7-pear-Auth_SASL # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define php_name php7 %define pear_name Auth_SASL Name: php7-pear-Auth_SASL Version: 1.1.0 Release: 0 Summary: Abstraction of various SASL mechanism responses License: BSD-3-Clause Group: Productivity/Networking/Web/Servers Url: http://pear.php.net/package/%{pear_name} Source: http://pear.php.net/get/%{pear_name}-%{version}.tgz BuildRequires: %{php_name}-devel BuildRequires: %{php_name}-pear >= 1.10.1 Requires: %{php_name}-pear >= 1.10.1 Provides: php-pear-%{pear_name} = %{version} Provides: php-pear(%{pear_name}) = %{version} Obsoletes: php5-pear-Auth_SASL BuildArch: noarch %if 0%{?suse_version} < 1330 BuildRequires: %{php_name}-macros BuildRequires: %{php_name}-pear-Archive_Tar Requires: %{php_name}-pear-Archive_Tar %endif %description Provides code to generate responses to common SASL mechanisms, including: - Digest-MD5 - CramMD5 - Plain - Anonymous - Login (Pseudo mechanism) %prep %setup -q %setup -q -n %{pear_name}-%{version} mv ../package.xml . %build %install %{__pear} install --nodeps --offline --packagingroot %{buildroot} package.xml install -D -m 0644 package.xml %{buildroot}%{pear_xmldir}/%{pear_name}.xml rm -rf %{buildroot}/{doc,tmp} rm -rf %{buildroot}/%{php_peardir}/.{filemap,lock,registry,channels,depdb,depdblock} %php_pear_gen_filelist %post if [ "$1" = "1" ]; then # on "rpm -ivh" %{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{pear_name}.xml fi if [ "$1" = "2" ]; then # on "rpm -Uvh" %{__pear} upgrade --offline --register-only %{pear_xmldir}/%{pear_name}.xml fi %postun if [ "$1" = "0" ]; then # on "rpm -e" %{__pear} uninstall --nodeps --ignore-errors --register-only pear.php.net/%{pear_name} fi %files -f %{name}.files %changelog ############################################################################# And here an Example of the generated filelist (does not match above package): /usr/share/php5/PEAR/Date.php %dir /usr/share/php5/PEAR/Date /usr/share/php5/PEAR/Date/Calc.php /usr/share/php5/PEAR/Date/Human.php /usr/share/php5/PEAR/Date/Span.php /usr/share/php5/PEAR/Date/TimeZone.php %dir /usr/share/php5/PEAR/test %dir /usr/share/php5/PEAR/test/Date %dir /usr/share/php5/PEAR/test/Date/tests /usr/share/php5/PEAR/test/Date/tests/test_date_methods_span.php /usr/share/php5/PEAR/test/Date/tests/testunit_date_span.php /usr/share/php5/PEAR/test/Date/tests/test_calc.php /usr/share/php5/PEAR/test/Date/tests/calc.php /usr/share/php5/PEAR/test/Date/tests/testunit_date.php /usr/share/php5/PEAR/test/Date/tests/testunit.php %dir /usr/share/php5/PEAR/test/Date/tests/bugs /usr/share/php5/PEAR/test/Date/tests/bugs/bug-727-1.phpt /usr/share/php5/PEAR/test/Date/tests/bugs/bug-727-2.phpt /usr/share/php5/PEAR/test/Date/tests/bugs/bug-727-3.phpt /usr/share/php5/PEAR/test/Date/tests/bugs/bug-727-4.phpt /usr/share/php5/PEAR/test/Date/tests/bugs/bug-674.phpt /usr/share/php5/PEAR/test/Date/tests/bugs/bug-9213.phpt /usr/share/php5/PEAR/test/Date/tests/bugs/bug-9414.phpt /usr/share/php5/PEAR/test/Date/tests/bugs/bug-8912.phpt /usr/share/php5/PEAR/test/Date/tests/bugs/bug-967.phpt /var/lib/pear/Date.xml ++++++ _multibuild ++++++ <multibuild> <package>test</package> </multibuild> ++++++ build-test.sh ++++++ #!/bin/bash TEST_RESULT_FILE_BEFORE='test_results.before' TEST_RESULT_FILE_AFTER='test_results.after' function usage { echo "usage: $0 buildroot [osc ARGUMENTS]" echo " 1. Run first time to create ${TEST_RESULT_FILE_BEFORE}." echo " 2. Make source changes." echo " 3. Run second time to create ${TEST_RESULT_FILE_AFTER}" echo " and see changes in test results." } if [ -z $1 ]; then echo 'ERROR: missing a parameter: buildroot' usage exit 1 fi if [ "$1" == "-h" ]; then usage exit 0 fi export OSC_BUILD_ROOT=$1 shift apiurl=`cat .osc/_apiurl 2>/dev/null` if [ ! -z "$apiurl" ]; then apiurl="-A $apiurl" fi osc $apiurl build $@ --no-verify --with make_test -x valgrind *.spec if [ $? -ne 0 ]; then echo "ERROR: build failed. See $OSC_BUILD_ROOT/.build.log for details." exit 1 fi cat $OSC_BUILD_ROOT/.build.log \ | sed 's:^\[[ 0-9]\+s\] ::' \ | egrep 'TEST [0-9]+\/[0-9]+|SKIP.*reason' \ | sed 's:.*\r::' \ | sort \ > ${TEST_RESULT_FILE_AFTER} if [ ! -e ${TEST_RESULT_FILE_BEFORE} ]; then echo "Creating ${TEST_RESULT_FILE_BEFORE}" echo "Run $0 again AFTER source changes, to create ${TEST_RESULT_FILE_AFTER}." echo "Differences will be checked then." mv ${TEST_RESULT_FILE_AFTER} ${TEST_RESULT_FILE_BEFORE} else echo --- DIFFERENCES ------------------------------------------- diff -up $TEST_RESULT_FILE_BEFORE ${TEST_RESULT_FILE_AFTER} echo ----------------------------------------------------------- echo "Do not forgot to " echo "rm ${TEST_RESULT_FILE_BEFORE} ${TEST_RESULT_FILE_AFTER}" echo fi ++++++ macros.php ++++++ # macros.php file # macros for module building. handle with care. # # Interface versions exposed by PHP: # %php_core_api @PHP_APIVER@ %php_zend_api @PHP_ZENDVER@ # Useful php macros (from Christian Wittmer <[email protected]>) # %__php /usr/bin/php %__phpize /usr/bin/phpize %__php_config /usr/bin/php-config %php_version %(%{__php_config} --version) # pear related macros %__pear /usr/bin/pear %php_peardir %(%{__pear} config-get php_dir) # %pear_xmldir should be replaced by %php_pearxmldir %pear_xmldir /var/lib/pear %php_pearxmldir /var/lib/pear %pear_phpdir %(%{__pear} config-get php_dir 2> /dev/null || echo undefined) %pear_docdir %(%{__pear} config-get doc_dir 2> /dev/null || echo undefined) %pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined) %pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined) %pear_cfgdir %(%{__pear} config-get cfg_dir 2> /dev/null || echo undefined) %pear_wwwdir %(%{__pear} config-get www_dir 2> /dev/null || echo undefined) %pear_metadir %(%{__pear} config-get metadata_dir 2> /dev/null || echo undefined) # pecl related macros %__pecl /usr/bin/pecl %pecl_phpdir %(%{__pecl} config-get php_dir 2> /dev/null || echo undefined) %pecl_docdir %(%{__pecl} config-get doc_dir 2> /dev/null || echo undefined) %pecl_testdir %(%{__pecl} config-get test_dir 2> /dev/null || echo undefined) %pecl_datadir %(%{__pecl} config-get data_dir 2> /dev/null || echo undefined) # macro: php_pear_gen_filelist # do the rpmlint happy filelist generation # with %dir in front of directories %php_pear_gen_filelist(n)\ FILES=%{name}.files\ # fgen_dir func\ # IN: dir\ fgen_dir(){\ %{__cat} >> $FILES << EOF\ %dir ${1}\ EOF\ }\ # fgen_file func\ # IN: file\ fgen_file(){\ %{__cat} >> $FILES << EOF\ ${1}\ EOF\ }\ # check for files in %{php_peardir}\ RES=`find ${RPM_BUILD_ROOT}%{php_peardir} -maxdepth 1 -type f`\ if [ -n "$RES" ]; then\ for file in $RES; do\ fgen_file "%{php_peardir}/$(basename ${file})"\ done\ fi\ \ # get all dirs into array\ base_dir="${RPM_BUILD_ROOT}%{php_peardir}/"\ for dir in `find ${base_dir} -type d | sort`; do\ if [ "$dir" = "${base_dir}" ]; then\ continue\ else\ el=`echo $dir | %{__awk} -F"${base_dir}" '{print $2}'`\ all_dir=(${all_dir[@]} $el)\ fi\ done\ \ # build filelist\ for i in ${all_dir[@]}; do\ if [ -d ${base_dir}/${i} ]; then\ RES=`find "${base_dir}/${i}" -maxdepth 1 -type f`\ if [ -n "$RES" ]; then\ fgen_dir "%{php_peardir}/${i}"\ for file in $RES; do\ fgen_file "%{php_peardir}/${i}/$(basename ${file})"\ done\ else\ fgen_dir "%{php_peardir}/${i}"\ fi\ fi\ done\ # add xml file\ fgen_file "%php_pearxmldir/%{pear_name}.xml"\ # ++++++ mod_php7.conf ++++++ <IfModule mod_php7.c> <FilesMatch "\.ph(p[3457]?|tml)$"> SetHandler application/x-httpd-php </FilesMatch> <FilesMatch "\.php[3457]?s$"> SetHandler application/x-httpd-php-source </FilesMatch> DirectoryIndex index.php4 DirectoryIndex index.php5 DirectoryIndex index.php7 DirectoryIndex index.php </IfModule> ++++++ php-crypt-tests.patch ++++++ Index: php-7.2.12/ext/standard/config.m4 =================================================================== --- php-7.2.12.orig/ext/standard/config.m4 2018-11-06 11:48:33.000000000 +0100 +++ php-7.2.12/ext/standard/config.m4 2018-11-09 16:35:10.505160977 +0100 @@ -242,7 +242,7 @@ int main() { dnl dnl If one of them is missing, use our own implementation, portable code is then possible dnl -if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_sha512" = "no" || test "$ac_cv_crypt_sha256" = "no" || test "x$php_crypt_r" = "x0"; then +if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_sha512" = "no" || test "$ac_cv_crypt_sha256" = "no" || test "x$ac_cv_lib_crypt_crypt_r" = "x0"; then dnl dnl Check for __alignof__ support in the compiler ++++++ php-date-regenerate-lexers.patch ++++++ Index: php-7.1.7/ext/date/config0.m4 =================================================================== --- php-7.1.7.orig/ext/date/config0.m4 2017-07-06 11:30:06.000000000 +0200 +++ php-7.1.7/ext/date/config0.m4 2017-07-21 13:56:15.183675982 +0200 @@ -10,6 +10,8 @@ timelib_sources="lib/astro.c lib/dow.c l PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS) +PHP_ADD_MAKEFILE_FRAGMENT() + PHP_ADD_BUILD_DIR([$ext_builddir/lib], 1) PHP_ADD_INCLUDE([$ext_builddir/lib]) PHP_ADD_INCLUDE([$ext_srcdir/lib]) Index: php-7.1.7/ext/date/Makefile.frag =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ php-7.1.7/ext/date/Makefile.frag 2017-07-21 13:58:51.986357906 +0200 @@ -0,0 +1,6 @@ +$(srcdir)/lib/parse_date.c: $(srcdir)/lib/parse_date.re + @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) -b --no-generation-date -o ext/date/lib/parse_date.c ext/date/lib/parse_date.re) + +$(srcdir)/lib/parse_iso_intervals.c: $(srcdir)/lib/parse_iso_intervals.re + @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) -b --no-generation-date -o ext/date/lib/parse_iso_intervals.c ext/date/lib/parse_iso_intervals.re) + ++++++ php-embed.patch ++++++ --- php-7.1.10/sapi/embed/config.m4.embed +++ php-7.1.10/sapi/embed/config.m4 @@ -12,7 +12,7 @@ if test "$PHP_EMBED" != "no"; then case "$PHP_EMBED" in yes|shared) PHP_EMBED_TYPE=shared - INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib" + INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(LIBTOOL) --mode=install \$(INSTALL) -m 0755 \$(OVERALL_TARGET) \$(INSTALL_ROOT)\$(libdir)" ;; static) PHP_EMBED_TYPE=static ++++++ php-fix_net-snmp_disable_MD5.patch ++++++ Index: ext/snmp/snmp.c =================================================================== --- ext/snmp/snmp.c.orig 2015-09-08 12:33:18.057282498 +0200 +++ ext/snmp/snmp.c 2015-09-08 12:35:01.717693824 +0200 @@ -1256,14 +1256,17 @@ Set the authentication protocol in the snmpv3 session */ static int netsnmp_session_set_auth_protocol(struct snmp_session *s, char *prot) { +#ifndef DISABLE_MD5 if (!strcasecmp(prot, "MD5")) { s->securityAuthProto = usmHMACMD5AuthProtocol; s->securityAuthProtoLen = USM_AUTH_PROTO_MD5_LEN; - } else if (!strcasecmp(prot, "SHA")) { + } else +#endif + if (!strcasecmp(prot, "SHA")) { s->securityAuthProto = usmHMACSHA1AuthProtocol; s->securityAuthProtoLen = USM_AUTH_PROTO_SHA_LEN; } else { - php_error_docref(NULL, E_WARNING, "Unknown authentication protocol '%s'", prot); + php_error_docref(NULL, E_WARNING, "Unknown or unsupported authentication protocol '%s'", prot); return (-1); } return (0); ++++++ php-fpm.tmpfiles.d ++++++ # Type Path Mode UID GID Age Argument d /run/php-fpm 0711 root root - - ++++++ php-ini.patch ++++++ Index: php-7.3.1/php.ini-production =================================================================== --- php-7.3.1.orig/php.ini-production 2019-01-08 14:55:52.000000000 +0100 +++ php-7.3.1/php.ini-production 2019-02-07 09:28:59.154542260 +0100 @@ -729,7 +729,7 @@ default_charset = "UTF-8" ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" -;include_path = ".:/php/includes" +include_path = ".:/usr/share/php7:/usr/share/php7/PEAR" ; ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" @@ -954,7 +954,7 @@ cli_server.color = On [Date] ; Defines the default timezone used by the date functions ; http://php.net/date.timezone -;date.timezone = +date.timezone = 'UTC' ; http://php.net/date.default-latitude ;date.default_latitude = 31.7667 @@ -1161,7 +1162,7 @@ mysqli.max_persistent = -1 ; Allow or prevent persistent links. ; http://php.net/mysqli.allow-persistent -mysqli.allow_persistent = On +mysqli.allow_persistent = Off ; Maximum number of links. -1 means no limit. ; http://php.net/mysqli.max-links @@ -1354,7 +1355,7 @@ session.save_handler = files ; where MODE is the octal representation of the mode. Note that this ; does not overwrite the process's umask. ; http://php.net/session.save-path -;session.save_path = "/tmp" +session.save_path = "/var/lib/php7" ; Whether to use strict session mode. ; Strict session mode does not accept an uninitialized session ID, and ++++++ php-no-build-date.patch ++++++ Index: php-7.4.0RC6/ext/standard/info.c =================================================================== --- php-7.4.0RC6.orig/ext/standard/info.c 2019-11-11 00:33:36.000000000 +0100 +++ php-7.4.0RC6/ext/standard/info.c 2019-11-19 11:29:46.254681309 +0100 @@ -802,7 +802,7 @@ PHPAPI ZEND_COLD void php_print_info(int php_info_print_box_end(); php_info_print_table_start(); php_info_print_table_row(2, "System", ZSTR_VAL(php_uname)); - php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__); + /*php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__);*/ #ifdef COMPILER php_info_print_table_row(2, "Compiler", COMPILER); #endif @@ -810,7 +810,7 @@ PHPAPI ZEND_COLD void php_print_info(int php_info_print_table_row(2, "Architecture", ARCHITECTURE); #endif #ifdef CONFIGURE_COMMAND - php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND ); + /* php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND ); */ #endif if (sapi_module.pretty_name) { Index: php-7.4.0RC6/sapi/cli/php_cli.c =================================================================== --- php-7.4.0RC6.orig/sapi/cli/php_cli.c 2019-11-19 11:29:46.254681309 +0100 +++ php-7.4.0RC6/sapi/cli/php_cli.c 2019-11-19 11:30:06.350793571 +0100 @@ -645,8 +645,8 @@ static int do_cli(int argc, char **argv) goto out; case 'v': /* show php version & quit */ - php_printf("PHP %s (%s) (built: %s %s) ( %s)\nCopyright (c) The PHP Group\n%s", - PHP_VERSION, cli_sapi_module.name, __DATE__, __TIME__, + php_printf("PHP %s (%s) ( %s)\nCopyright (c) The PHP Group\n%s", + PHP_VERSION, cli_sapi_module.name, #if ZTS "ZTS " #else Index: php-7.4.0RC6/sapi/cgi/cgi_main.c =================================================================== --- php-7.4.0RC6.orig/sapi/cgi/cgi_main.c 2019-11-19 11:29:46.254681309 +0100 +++ php-7.4.0RC6/sapi/cgi/cgi_main.c 2019-11-19 11:30:26.346905278 +0100 @@ -2392,9 +2392,9 @@ parent_loop_end: SG(headers_sent) = 1; SG(request_info).no_headers = 1; #if ZEND_DEBUG - php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + php_printf("PHP %s (%s) (DEBUG)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); #else - php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + php_printf("PHP %s (%s) \nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); #endif php_request_shutdown((void *) 0); fcgi_shutdown(); Index: php-7.4.0RC6/configure.ac =================================================================== --- php-7.4.0RC6.orig/configure.ac 2019-11-19 11:29:46.258681331 +0100 +++ php-7.4.0RC6/configure.ac 2019-11-19 11:31:37.507302813 +0100 @@ -1295,13 +1295,12 @@ EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PR dnl SOURCE_DATE_EPOCH for reproducible builds dnl https://reproducible-builds.org/specs/source-date-epoch/ -PHP_BUILD_DATE=`date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d 2>/dev/null` -if test $? -ne 0 ; then -PHP_BUILD_DATE=`date -u +%Y-%m-%d` -fi +#totally fake, not used anywhere in userspace +PHP_BUILD_DATE="1970-01-01" AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) -PHP_UNAME=`uname -a | xargs` +dnl Totally fake, it wasnt and will never be reliable anyway. +PHP_UNAME="Linux suse 2.6.36 #1 SMP 2011-02-21 10:34:10 +0100 x86_64 x86_64 x86_64 GNU/Linux" AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) PHP_OS=`uname | xargs` AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) Index: php-7.4.0RC6/sapi/fpm/fpm/fpm_main.c =================================================================== --- php-7.4.0RC6.orig/sapi/fpm/fpm/fpm_main.c 2019-11-19 11:29:46.258681331 +0100 +++ php-7.4.0RC6/sapi/fpm/fpm/fpm_main.c 2019-11-19 11:32:27.627582756 +0100 @@ -1722,9 +1722,9 @@ int main(int argc, char *argv[]) SG(request_info).no_headers = 1; #if ZEND_DEBUG - php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + php_printf("PHP %s (%s) (DEBUG)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); #else - php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + php_printf("PHP %s (%s) \nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); #endif php_request_shutdown((void *) 0); fcgi_shutdown(); ++++++ php-odbc-cmp-int-cast.patch ++++++ https://bugs.php.net/bug.php?id=53007 Index: php-7.3.0/ext/odbc/php_odbc.c =================================================================== --- php-7.3.0.orig/ext/odbc/php_odbc.c 2018-12-04 17:12:22.000000000 +0100 +++ php-7.3.0/ext/odbc/php_odbc.c 2018-12-10 10:19:02.668378553 +0100 @@ -1804,7 +1804,7 @@ static void php_odbc_fetch_hash(INTERNAL if (rc == SQL_SUCCESS_WITH_INFO) { ZVAL_STRINGL(&tmp, buf, result->longreadlen); - } else if (result->values[i].vallen == SQL_NULL_DATA) { + } else if ((int)result->values[i].vallen == (int)SQL_NULL_DATA) { ZVAL_NULL(&tmp); break; } else { @@ -1813,7 +1813,7 @@ static void php_odbc_fetch_hash(INTERNAL break; default: - if (result->values[i].vallen == SQL_NULL_DATA) { + if ((int)result->values[i].vallen == (int)SQL_NULL_DATA) { ZVAL_NULL(&tmp); break; } @@ -1956,7 +1956,7 @@ PHP_FUNCTION(odbc_fetch_into) } if (rc == SQL_SUCCESS_WITH_INFO) { ZVAL_STRINGL(&tmp, buf, result->longreadlen); - } else if (result->values[i].vallen == SQL_NULL_DATA) { + } else if ((int)result->values[i].vallen == (int)SQL_NULL_DATA) { ZVAL_NULL(&tmp); break; } else { @@ -1965,7 +1965,7 @@ PHP_FUNCTION(odbc_fetch_into) break; default: - if (result->values[i].vallen == SQL_NULL_DATA) { + if ((int)result->values[i].vallen == (int)SQL_NULL_DATA) { ZVAL_NULL(&tmp); break; } @@ -2193,7 +2193,7 @@ PHP_FUNCTION(odbc_result) RETURN_FALSE; } - if (result->values[field_ind].vallen == SQL_NULL_DATA) { + if ((int)result->values[field_ind].vallen == (int)SQL_NULL_DATA) { zend_string_efree(field_str); RETURN_NULL(); } else if (rc == SQL_NO_DATA_FOUND) { @@ -2202,7 +2202,7 @@ PHP_FUNCTION(odbc_result) } /* Reduce fieldlen by 1 if we have char data. One day we might have binary strings... */ - if ((result->values[field_ind].coltype == SQL_LONGVARCHAR) + if (((int)result->values[field_ind].coltype == (int)SQL_LONGVARCHAR) #if defined(ODBCVER) && (ODBCVER >= 0x0300) || (result->values[field_ind].coltype == SQL_WLONGVARCHAR) #endif @@ -2219,7 +2219,7 @@ PHP_FUNCTION(odbc_result) break; default: - if (result->values[field_ind].vallen == SQL_NULL_DATA) { + if ((int)result->values[field_ind].vallen == (int)SQL_NULL_DATA) { RETURN_NULL(); } else { RETURN_STRINGL(result->values[field_ind].value, result->values[field_ind].vallen); @@ -2352,7 +2352,7 @@ PHP_FUNCTION(odbc_result_all) } if (rc == SQL_SUCCESS_WITH_INFO) { PHPWRITE(buf, result->longreadlen); - } else if (result->values[i].vallen == SQL_NULL_DATA) { + } else if ((int)result->values[i].vallen == (int)SQL_NULL_DATA) { php_printf("<td>NULL</td>"); break; } else { @@ -2361,7 +2361,7 @@ PHP_FUNCTION(odbc_result_all) php_printf("</td>"); break; default: - if (result->values[i].vallen == SQL_NULL_DATA) { + if ((int)result->values[i].vallen == (int)SQL_NULL_DATA) { php_printf("<td>NULL</td>"); } else { php_printf("<td>%s</td>", result->values[i].value); ++++++ php-openssl.patch ++++++ Index: ext/openssl/openssl.c =================================================================== --- ext/openssl/openssl.c 2017-01-17 21:44:41.000000000 +0100 +++ ext/openssl/openssl.c 2017-02-13 15:25:42.219789317 +0100 @@ -1388,6 +1388,7 @@ PHP_MINIT_FUNCTION(openssl) OpenSSL_add_all_ciphers(); OpenSSL_add_all_digests(); OpenSSL_add_all_algorithms(); + OPENSSL_config(NULL); #if !defined(OPENSSL_NO_AES) && defined(EVP_CIPH_CCM_MODE) && OPENSSL_VERSION_NUMBER < 0x100020000 EVP_add_cipher(EVP_aes_128_ccm()); Index: ext/openssl/xp_ssl.c =================================================================== --- ext/openssl/xp_ssl.c 2017-02-13 15:25:42.219789317 +0100 +++ ext/openssl/xp_ssl.c 2017-02-13 15:33:47.520365579 +0100 @@ -1518,6 +1518,10 @@ int php_openssl_setup_crypto(php_stream return FAILURE; } +#ifdef SSL_MODE_RELEASE_BUFFERS + SSL_CTX_set_mode(sslsock->ctx, SSL_MODE_RELEASE_BUFFERS); +#endif + if (GET_VER_OPT("no_ticket") && zend_is_true(val)) { ssl_ctx_options |= SSL_OP_NO_TICKET; } ++++++ php-php-config.patch ++++++ --- scripts/php-config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: scripts/php-config.in =================================================================== --- scripts/php-config.in.orig +++ scripts/php-config.in @@ -6,7 +6,7 @@ datarootdir="@datarootdir@" exec_prefix="@exec_prefix@" version="@PHP_VERSION@" vernum="@PHP_VERSION_ID@" -include_dir="@includedir@/php" +include_dir="@includedir@/php7" includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib" ldflags="@PHP_LDFLAGS@" libs="@EXTRA_LIBS@" ++++++ php-phpize.patch ++++++ --- scripts/Makefile.frag | 4 ++-- scripts/phpize.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Index: scripts/Makefile.frag =================================================================== --- scripts/Makefile.frag.orig +++ scripts/Makefile.frag @@ -3,8 +3,8 @@ # Build environment install # -phpincludedir = $(includedir)/php -phpbuilddir = $(libdir)/build +phpincludedir = $(includedir)/php7 +phpbuilddir = $(datadir)/build BUILD_FILES = \ scripts/phpize.m4 \ Index: scripts/phpize.in =================================================================== --- scripts/phpize.in.orig +++ scripts/phpize.in @@ -4,8 +4,8 @@ prefix='@prefix@' datarootdir='@datarootdir@' exec_prefix="`eval echo @exec_prefix@`" -phpdir="`eval echo @libdir@`/build" -includedir="`eval echo @includedir@`/php" +phpdir="`eval echo @datadir@`/build" +includedir="`eval echo @includedir@`/php7" builddir="`pwd`" SED="@SED@" ++++++ php-pts.patch ++++++ Index: ext/standard/proc_open.c =================================================================== --- ext/standard/proc_open.c.orig +++ ext/standard/proc_open.c @@ -56,7 +56,7 @@ * */ #ifdef PHP_CAN_SUPPORT_PROC_OPEN -#if 0 && HAVE_PTSNAME && HAVE_GRANTPT && HAVE_UNLOCKPT && HAVE_SYS_IOCTL_H && HAVE_TERMIOS_H +#if HAVE_PTSNAME && HAVE_GRANTPT && HAVE_UNLOCKPT && HAVE_SYS_IOCTL_H && HAVE_TERMIOS_H # include <sys/ioctl.h> # include <termios.h> # define PHP_CAN_DO_PTS 1 @@ -636,14 +636,18 @@ PHP_FUNCTION(proc_open) #if PHP_CAN_DO_PTS if (dev_ptmx == -1) { /* open things up */ - dev_ptmx = open("/dev/ptmx", O_RDWR); + dev_ptmx = open("/dev/ptmx", O_RDWR|O_NOCTTY); if (dev_ptmx == -1) { php_error_docref(NULL, E_WARNING, "failed to open /dev/ptmx, errno %d", errno); goto exit_fail; } grantpt(dev_ptmx); unlockpt(dev_ptmx); +#ifdef TIOCGPTPEER + slave_pty = ioctl(dev_ptmx, TIOCGPTPEER, O_RDWR); +#else slave_pty = open(ptsname(dev_ptmx), O_RDWR); +#endif if (slave_pty == -1) { php_error_docref(NULL, E_WARNING, "failed to open slave pty, errno %d", errno); ++++++ php-systemd-unit.patch ++++++ Index: php-7.4.0RC6/sapi/fpm/php-fpm.service.in =================================================================== --- php-7.4.0RC6.orig/sapi/fpm/php-fpm.service.in 2019-11-19 11:33:35.195960137 +0100 +++ php-7.4.0RC6/sapi/fpm/php-fpm.service.in 2019-11-19 11:35:45.588688471 +0100 @@ -5,10 +5,10 @@ [Unit] Description=The PHP FastCGI Process Manager After=network.target +Before=apache2.service nginx.service lighttpd.service [Service] Type=@php_fpm_systemd@ -PIDFile=@EXPANDED_LOCALSTATEDIR@/run/php-fpm.pid ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf ExecReload=/bin/kill -USR2 $MAINPID ++++++ php-systzdata-v19.patch ++++++ ++++ 657 lines (skipped) ++++++ php7-CVE-2020-7068.patch ++++++ X-Git-Url: http://208.43.231.11:8000/?p=php-src.git;a=blobdiff_plain;f=ext%2Fphar%2Fzip.c;h=50c5d69e9bebb6ab9397b4a924181f9e31a6f665;hp=d615e8addaf8cf8415a994e32e8ca3007cc0fc2a;hb=7355ab81763a3d6a04ac11660e6a16d58838d187;hpb=c68d48de9e1b6b6657d11da308f8b4059ad486dd diff --git a/ext/phar/zip.c b/ext/phar/zip.c index d615e8addaf..50c5d69e9be 100644 --- a/ext/phar/zip.c +++ b/ext/phar/zip.c @@ -703,7 +703,7 @@ foundit: efree(actual_alias); } - zend_hash_str_add_ptr(&(PHAR_G(phar_alias_map)), actual_alias, mydata->alias_len, mydata); + zend_hash_str_add_ptr(&(PHAR_G(phar_alias_map)), mydata->alias, mydata->alias_len, mydata); } else { phar_archive_data *fd_ptr; ++++++ php7-arm-build-fixes.patch ++++++ Index: php-7.4.5/ext/standard/crc32.c =================================================================== --- php-7.4.5.orig/ext/standard/crc32.c 2020-04-14 14:54:45.000000000 +0200 +++ php-7.4.5/ext/standard/crc32.c 2020-05-13 10:08:59.811448152 +0200 @@ -20,7 +20,7 @@ #include "basic_functions.h" #include "crc32.h" -#if defined(__aarch64__) && defined(HAVE_SYS_AUXV_H) +#if 0 # include <arm_acle.h> # if defined(__linux__) # include <sys/auxv.h> @@ -85,7 +85,7 @@ PHP_NAMED_FUNCTION(php_if_crc32) crc = crcinit^0xFFFFFFFF; -#if defined(__aarch64__) && defined(HAVE_SYS_AUXV_H) +#if 0 if (has_crc32_insn()) { crc = crc32_aarch64(crc, p, nr); RETURN_LONG(crc^0xFFFFFFFF); Index: php-7.4.5/Zend/zend_operators.h =================================================================== --- php-7.4.5.orig/Zend/zend_operators.h 2020-04-14 14:54:48.000000000 +0200 +++ php-7.4.5/Zend/zend_operators.h 2020-05-13 12:00:10.846071237 +0200 @@ -670,26 +670,6 @@ overflow: ZEND_ATTRIBUTE_COLD_LABEL return; overflow: ZEND_ATTRIBUTE_COLD_LABEL ZVAL_DOUBLE(result, (double) Z_LVAL_P(op1) + (double) Z_LVAL_P(op2)); -#elif ZEND_USE_ASM_ARITHMETIC && defined(__aarch64__) - __asm__ goto( - "ldr x5, [%1]\n\t" - "ldr x6, [%2]\n\t" - "adds x5, x5, x6\n\t" - "bvs %l5\n\t" - "mov w6, %3\n\t" - "str x5, [%0]\n\t" - "str w6, [%0, %c4]\n" - : - : "r"(&result->value), - "r"(&op1->value), - "r"(&op2->value), - "n"(IS_LONG), - "n"(ZVAL_OFFSETOF_TYPE) - : "x5", "x6", "cc", "memory" - : overflow); - return; -overflow: ZEND_ATTRIBUTE_COLD_LABEL - ZVAL_DOUBLE(result, (double) Z_LVAL_P(op1) + (double) Z_LVAL_P(op2)); #elif PHP_HAVE_BUILTIN_SADDL_OVERFLOW && SIZEOF_LONG == SIZEOF_ZEND_LONG long lresult; if (UNEXPECTED(__builtin_saddl_overflow(Z_LVAL_P(op1), Z_LVAL_P(op2), &lresult))) { @@ -779,26 +759,6 @@ overflow: ZEND_ATTRIBUTE_COLD_LABEL : overflow); return; overflow: ZEND_ATTRIBUTE_COLD_LABEL - ZVAL_DOUBLE(result, (double) Z_LVAL_P(op1) - (double) Z_LVAL_P(op2)); -#elif ZEND_USE_ASM_ARITHMETIC && defined(__aarch64__) - __asm__ goto( - "ldr x5, [%1]\n\t" - "ldr x6, [%2]\n\t" - "subs x5, x5, x6\n\t" - "bvs %l5\n\t" - "mov w6, %3\n\t" - "str x5, [%0]\n\t" - "str w6, [%0, %c4]\n" - : - : "r"(&result->value), - "r"(&op1->value), - "r"(&op2->value), - "n"(IS_LONG), - "n"(ZVAL_OFFSETOF_TYPE) - : "x5", "x6", "cc", "memory" - : overflow); - return; -overflow: ZEND_ATTRIBUTE_COLD_LABEL ZVAL_DOUBLE(result, (double) Z_LVAL_P(op1) - (double) Z_LVAL_P(op2)); #elif PHP_HAVE_BUILTIN_SSUBL_OVERFLOW && SIZEOF_LONG == SIZEOF_ZEND_LONG long lresult; ++++++ php7.rpmlintrc ++++++ # Non-versioned shared library, php-embed requires # exact version of main package, parallel installation # not wanted addFilter("php.-embed.* shlib-policy-name-error") # PHP5 is obsolete, replaced by PHP7 addFilter("obsolete-not-provided php5-*") # Forgot to add category? addFilter("non-standard-group Development/Libraries/PHP")
