Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in at 2020-11-30 09:53:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7"
Mon Nov 30 09:53:17 2020 rev:87 rq:851286 version:7.4.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/php7/php7.changes 2020-11-02 14:04:10.652671609 +0100
+++ /work/SRC/openSUSE:Factory/.php7.new.5913/php7.changes 2020-11-30 09:53:31.505759840 +0100
@@ -1,0 +2,13 @@
+Fri Nov 27 09:56:49 UTC 2020 - pgajdos@suse.com
+
+- do not build firebird extension in any case
+
+-------------------------------------------------------------------
+Thu Nov 26 06:13:43 UTC 2020 - Arjen de Korte
+
+- updated to 7.4.13: This is a security release which also contains
+ several bug fixes. See https://www.php.net/ChangeLog-7.php#7.4.13
+- deleted patch (upstreamed)
+ - php-fix_net-snmp_disable_MD5.patch
+
+-------------------------------------------------------------------
Old:
----
php-7.4.12.tar.xz
php-7.4.12.tar.xz.asc
php-fix_net-snmp_disable_MD5.patch
New:
----
php-7.4.13.tar.xz
php-7.4.13.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php7.spec ++++++
--- /var/tmp/diff_new_pack.0bTlKV/_old 2020-11-30 09:53:32.445760735 +0100
+++ /var/tmp/diff_new_pack.0bTlKV/_new 2020-11-30 09:53:32.449760739 +0100
@@ -30,18 +30,14 @@
%global zendver 20190902
%define extension_dir %{_libdir}/%{name}/extensions
%define php_sysconf %{_sysconfdir}/%{name}
-%if 0%{?is_opensuse} || 0%{?sle_version} >= 150200
-%define build_firebird 1
-%else
%define build_firebird 0
-%endif
%define build_sodium 1
%define build_argon2 0
%if %{?suse_version} >= 1500
%define build_argon2 1
%endif
Name: php7%{psuffix}
-Version: 7.4.12
+Version: 7.4.13
Release: 0
Summary: Interpreter for the PHP scripting language version 7
License: PHP-3.01
@@ -77,8 +73,6 @@
Patch12: php-crypt-tests.patch
# https://bugs.php.net/bug.php?id=53007
Patch14: php-odbc-cmp-int-cast.patch
-# https://bugs.php.net/bug.php?id=70461
-Patch15: php-fix_net-snmp_disable_MD5.patch
# should be upstreamed, will do later
Patch17: php-date-regenerate-lexers.patch
# build fixes in SLE12
@@ -922,7 +916,6 @@
%patch10 -p1
%patch12 -p1
%patch14 -p1
-%patch15
%patch17 -p1
%if 0%{?suse_version} <= 1315
%patch18 -p1
++++++ php-7.4.12.tar.xz -> php-7.4.13.tar.xz ++++++
/work/SRC/openSUSE:Factory/php7/php-7.4.12.tar.xz /work/SRC/openSUSE:Factory/.php7.new.5913/php-7.4.13.tar.xz differ: char 27, line 1
++++++ php-odbc-cmp-int-cast.patch ++++++
--- /var/tmp/diff_new_pack.0bTlKV/_old 2020-11-30 09:53:32.573760857 +0100
+++ /var/tmp/diff_new_pack.0bTlKV/_new 2020-11-30 09:53:32.573760857 +0100
@@ -1,18 +1,18 @@
https://bugs.php.net/bug.php?id=53007
-Index: php-7.3.0/ext/odbc/php_odbc.c
+Index: php-7.4.13/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);
+--- php-7.4.13.orig/ext/odbc/php_odbc.c 2020-11-24 11:03:41.000000000 +0100
++++ php-7.4.13/ext/odbc/php_odbc.c 2020-11-26 08:19:46.512139501 +0100
+@@ -1811,7 +1811,7 @@ static void php_odbc_fetch_hash(INTERNAL
+ } else if (rc != SQL_SUCCESS) {
+ php_error_docref(NULL, E_WARNING, "Cannot get data of column #%d (retcode %u)", i + 1, rc);
+ ZVAL_FALSE(&tmp);
- } 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
+@@ -1820,7 +1820,7 @@ static void php_odbc_fetch_hash(INTERNAL
break;
default:
@@ -21,16 +21,16 @@
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);
+@@ -1967,7 +1967,7 @@ PHP_FUNCTION(odbc_fetch_into)
+ } else if (rc != SQL_SUCCESS) {
+ php_error_docref(NULL, E_WARNING, "Cannot get data of column #%d (retcode %u)", i + 1, rc);
+ ZVAL_FALSE(&tmp);
- } 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)
+@@ -1976,7 +1976,7 @@ PHP_FUNCTION(odbc_fetch_into)
break;
default:
@@ -39,16 +39,14 @@
ZVAL_NULL(&tmp);
break;
}
-@@ -2193,7 +2193,7 @@ PHP_FUNCTION(odbc_result)
+@@ -2208,13 +2208,13 @@ PHP_FUNCTION(odbc_result)
+ zend_string_efree(field_str);
+ php_error_docref(NULL, E_WARNING, "Cannot get data of column #%d (retcode %u)", field_ind + 1, rc);
RETURN_FALSE;
- }
-
-- if (result->values[field_ind].vallen == SQL_NULL_DATA) {
-+ if ((int)result->values[field_ind].vallen == (int)SQL_NULL_DATA) {
+- } else if (result->values[field_ind].vallen == SQL_NULL_DATA) {
++ } else 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... */
@@ -57,7 +55,7 @@
#if defined(ODBCVER) && (ODBCVER >= 0x0300)
|| (result->values[field_ind].coltype == SQL_WLONGVARCHAR)
#endif
-@@ -2219,7 +2219,7 @@ PHP_FUNCTION(odbc_result)
+@@ -2232,7 +2232,7 @@ PHP_FUNCTION(odbc_result)
break;
default:
@@ -66,16 +64,25 @@
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);
+@@ -2262,7 +2262,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) {
+ efree(field);
+ RETURN_NULL();
+ }
+@@ -2376,7 +2376,7 @@ PHP_FUNCTION(odbc_result_all)
+ php_error_docref(NULL, E_WARNING, "Cannot get data of column #%zu (retcode %u)", i + 1, rc);
+ efree(buf);
+ RETURN_FALSE;
- } 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)
+@@ -2385,7 +2385,7 @@ PHP_FUNCTION(odbc_result_all)
php_printf("</td>");
break;
default: