Hello community, here is the log from the commit of package php7 for openSUSE:Factory checked in at 2018-11-12 09:37:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php7 (Old) and /work/SRC/openSUSE:Factory/.php7.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7" Mon Nov 12 09:37:02 2018 rev:49 rq:647627 version:7.2.12 Changes: -------- --- /work/SRC/openSUSE:Factory/php7/php7.changes 2018-10-18 15:29:37.934764634 +0200 +++ /work/SRC/openSUSE:Factory/.php7.new/php7.changes 2018-11-12 09:37:39.729513107 +0100 @@ -1,0 +2,10 @@ +Fri Nov 9 15:41:53 UTC 2018 - Petr Gajdos <[email protected]> + +- update to 7.2.12: This is a bugfix release. + http://php.net/ChangeLog-7.php +- forward ported: + % php7-crypt-tests.patch + % php7-honor-re2c-flags.patch + % php7-odbc-cmp-int-cast.patch + +------------------------------------------------------------------- Old: ---- php-7.2.11.tar.xz php-7.2.11.tar.xz.asc New: ---- php-7.2.12.tar.xz php-7.2.12.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php7.spec ++++++ --- /var/tmp/diff_new_pack.1FWVil/_old 2018-11-12 09:37:40.669511753 +0100 +++ /var/tmp/diff_new_pack.1FWVil/_new 2018-11-12 09:37:40.677511742 +0100 @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -43,7 +43,7 @@ %endif %bcond_with make_test Name: php7 -Version: 7.2.11 +Version: 7.2.12 Release: 0 Summary: Interpreter for the PHP scripting language version 7 License: PHP-3.01 @@ -1009,7 +1009,7 @@ %patch8 -p1 %patch10 -p1 %patch12 -p1 -%patch14 +%patch14 -p1 %patch15 %patch17 -p1 %patch19 -p1 ++++++ php-7.2.11.tar.xz -> php-7.2.12.tar.xz ++++++ /work/SRC/openSUSE:Factory/php7/php-7.2.11.tar.xz /work/SRC/openSUSE:Factory/.php7.new/php-7.2.12.tar.xz differ: char 25, line 1 ++++++ php7-crypt-tests.patch ++++++ --- /var/tmp/diff_new_pack.1FWVil/_old 2018-11-12 09:37:40.805511557 +0100 +++ /var/tmp/diff_new_pack.1FWVil/_new 2018-11-12 09:37:40.809511551 +0100 @@ -1,23 +1,8 @@ -Index: php-7.1.1/ext/standard/config.m4 +Index: php-7.2.12/ext/standard/config.m4 =================================================================== ---- php-7.1.1.orig/ext/standard/config.m4 2017-01-17 21:44:35.000000000 +0100 -+++ php-7.1.1/ext/standard/config.m4 2017-02-14 12:47:25.502587310 +0100 -@@ -58,6 +58,14 @@ if test "$ac_cv_func_crypt" = "no"; then - AC_DEFINE(HAVE_CRYPT, 1, [ ]) - ]) - fi -+ -+if test "$ac_cv_func_crypt_r" = "no"; then -+ AC_CHECK_LIB(crypt, crypt_r, [ -+ LIBS="-lcrypt $LIBS -lcrypt" -+ AC_DEFINE(HAVE_CRYPT_R, 1, [ ]) -+ ]) -+fi -+ - - AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[ - AC_TRY_RUN([ -@@ -242,7 +250,7 @@ int main() { +--- 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 ++++++ php7-honor-re2c-flags.patch ++++++ --- /var/tmp/diff_new_pack.1FWVil/_old 2018-11-12 09:37:40.825511529 +0100 +++ /var/tmp/diff_new_pack.1FWVil/_new 2018-11-12 09:37:40.829511522 +0100 @@ -1,9 +1,8 @@ -Index: php-7.2.7/ext/standard/Makefile.frag +Index: php-7.2.12/ext/standard/Makefile.frag =================================================================== ---- php-7.2.7.orig/ext/standard/Makefile.frag -+++ php-7.2.7/ext/standard/Makefile.frag -@@ -1,9 +1,9 @@ - +--- php-7.2.12.orig/ext/standard/Makefile.frag 2018-11-09 16:40:29.246599404 +0100 ++++ php-7.2.12/ext/standard/Makefile.frag 2018-11-09 16:41:11.494789053 +0100 +@@ -1,8 +1,8 @@ $(srcdir)/var_unserializer.c: $(srcdir)/var_unserializer.re - @(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o ext/standard/var_unserializer.c ext/standard/var_unserializer.re) + @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o ext/standard/var_unserializer.c ext/standard/var_unserializer.re) @@ -14,10 +13,10 @@ $(builddir)/info.lo: $(builddir)/../../main/build-defs.h -Index: php-7.2.7/ext/json/Makefile.frag +Index: php-7.2.12/ext/json/Makefile.frag =================================================================== ---- php-7.2.7.orig/ext/json/Makefile.frag -+++ php-7.2.7/ext/json/Makefile.frag +--- php-7.2.12.orig/ext/json/Makefile.frag 2018-11-06 11:48:42.000000000 +0100 ++++ php-7.2.12/ext/json/Makefile.frag 2018-11-09 16:40:29.246599404 +0100 @@ -1,5 +1,5 @@ $(srcdir)/json_scanner.c: $(srcdir)/json_scanner.re - $(RE2C) -t $(srcdir)/php_json_scanner_defs.h --no-generation-date -bci -o $@ $(srcdir)/json_scanner.re @@ -25,10 +24,10 @@ $(srcdir)/json_parser.tab.c: $(srcdir)/json_parser.y $(YACC) --defines -l $(srcdir)/json_parser.y -o $@ -Index: php-7.2.7/ext/phar/Makefile.frag +Index: php-7.2.12/ext/phar/Makefile.frag =================================================================== ---- php-7.2.7.orig/ext/phar/Makefile.frag -+++ php-7.2.7/ext/phar/Makefile.frag +--- php-7.2.12.orig/ext/phar/Makefile.frag 2018-11-06 11:48:37.000000000 +0100 ++++ php-7.2.12/ext/phar/Makefile.frag 2018-11-09 16:40:29.246599404 +0100 @@ -1,9 +1,9 @@ $(srcdir)/phar_path_check.c: $(srcdir)/phar_path_check.re @(cd $(top_srcdir); \ @@ -41,10 +40,10 @@ fi) pharcmd: $(builddir)/phar.php $(builddir)/phar.phar -Index: php-7.2.7/ext/pdo/Makefile.frag +Index: php-7.2.12/ext/pdo/Makefile.frag =================================================================== ---- php-7.2.7.orig/ext/pdo/Makefile.frag -+++ php-7.2.7/ext/pdo/Makefile.frag +--- php-7.2.12.orig/ext/pdo/Makefile.frag 2018-11-06 11:48:38.000000000 +0100 ++++ php-7.2.12/ext/pdo/Makefile.frag 2018-11-09 16:40:29.246599404 +0100 @@ -9,9 +9,9 @@ PDO_HEADER_FILES= \ $(srcdir)/pdo_sql_parser.c: $(srcdir)/pdo_sql_parser.re @(cd $(top_srcdir); \ ++++++ php7-odbc-cmp-int-cast.patch ++++++ --- /var/tmp/diff_new_pack.1FWVil/_old 2018-11-12 09:37:40.837511511 +0100 +++ /var/tmp/diff_new_pack.1FWVil/_new 2018-11-12 09:37:40.837511511 +0100 @@ -1,9 +1,9 @@ https://bugs.php.net/bug.php?id=53007 -Index: ext/odbc/php_odbc.c +Index: php-7.2.12/ext/odbc/php_odbc.c =================================================================== ---- ext/odbc/php_odbc.c.orig 2015-09-04 19:50:10.129774538 +0200 -+++ ext/odbc/php_odbc.c 2015-09-04 19:52:34.202740738 +0200 -@@ -1796,7 +1796,7 @@ +--- php-7.2.12.orig/ext/odbc/php_odbc.c 2018-11-06 11:48:42.000000000 +0100 ++++ php-7.2.12/ext/odbc/php_odbc.c 2018-11-09 16:38:38.694103185 +0100 +@@ -1811,7 +1811,7 @@ static void php_odbc_fetch_hash(INTERNAL if (rc == SQL_SUCCESS_WITH_INFO) { ZVAL_STRINGL(&tmp, buf, result->longreadlen); @@ -12,7 +12,7 @@ ZVAL_NULL(&tmp); break; } else { -@@ -1805,7 +1805,7 @@ +@@ -1820,7 +1820,7 @@ static void php_odbc_fetch_hash(INTERNAL break; default: @@ -21,7 +21,7 @@ ZVAL_NULL(&tmp); break; } -@@ -1948,7 +1948,7 @@ +@@ -1963,7 +1963,7 @@ PHP_FUNCTION(odbc_fetch_into) } if (rc == SQL_SUCCESS_WITH_INFO) { ZVAL_STRINGL(&tmp, buf, result->longreadlen); @@ -30,7 +30,7 @@ ZVAL_NULL(&tmp); break; } else { -@@ -1957,7 +1957,7 @@ +@@ -1972,7 +1972,7 @@ PHP_FUNCTION(odbc_fetch_into) break; default: @@ -39,7 +39,7 @@ ZVAL_NULL(&tmp); break; } -@@ -2185,7 +2185,7 @@ +@@ -2200,7 +2200,7 @@ PHP_FUNCTION(odbc_result) RETURN_FALSE; } @@ -48,25 +48,25 @@ zend_string_free(field_str); RETURN_NULL(); } else if (rc == SQL_NO_DATA_FOUND) { -@@ -2211,7 +2211,7 @@ +@@ -2209,7 +2209,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 +@@ -2226,7 +2226,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); -@@ -2235,7 +2235,7 @@ - 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(); - } -@@ -2344,7 +2344,7 @@ +@@ -2359,7 +2359,7 @@ PHP_FUNCTION(odbc_result_all) } if (rc == SQL_SUCCESS_WITH_INFO) { PHPWRITE(buf, result->longreadlen); @@ -75,7 +75,7 @@ php_printf("<td>NULL</td>"); break; } else { -@@ -2353,7 +2353,7 @@ +@@ -2368,7 +2368,7 @@ PHP_FUNCTION(odbc_result_all) php_printf("</td>"); break; default:
