Hello community,
here is the log from the commit of package php5 for openSUSE:Factory checked in
at 2016-09-20 13:18:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php5 (Old)
and /work/SRC/openSUSE:Factory/.php5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5"
Changes:
--------
--- /work/SRC/openSUSE:Factory/php5/php5.changes 2016-08-25
09:52:58.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2016-09-20
13:18:08.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Sep 16 07:15:37 UTC 2016 - pgaj...@suse.com
+
+- updated to 5.6.26: Several security bugs were fixed in this
+ release.
+
+-------------------------------------------------------------------
Old:
----
php-5.6.25.tar.xz
php-5.6.25.tar.xz.asc
New:
----
php-5.6.26.tar.xz
php-5.6.26.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php5.spec ++++++
--- /var/tmp/diff_new_pack.K1UTom/_old 2016-09-20 13:18:12.000000000 +0200
+++ /var/tmp/diff_new_pack.K1UTom/_new 2016-09-20 13:18:12.000000000 +0200
@@ -46,7 +46,7 @@
%define need_libxml2_hack %(if [ -e %{_includedir}/libxml/parser.h ]; then if
grep -q XML_PARSE_OLDSAX %{_includedir}/libxml/parser.h; then echo 1; else echo
0; fi; else echo 0; fi)
Name: php5
-Version: 5.6.25
+Version: 5.6.26
Release: 0
Summary: PHP5 Core Files
License: PHP-3.01
@@ -1028,7 +1028,7 @@
%patch12
%patch13
%patch14
-%patch16
+%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19
++++++ php-5.6.25.tar.xz -> php-5.6.26.tar.xz ++++++
/work/SRC/openSUSE:Factory/php5/php-5.6.25.tar.xz
/work/SRC/openSUSE:Factory/.php5.new/php-5.6.26.tar.xz differ: char 27, line 1
++++++ php5-format-string-issues.patch ++++++
--- /var/tmp/diff_new_pack.K1UTom/_old 2016-09-20 13:18:12.000000000 +0200
+++ /var/tmp/diff_new_pack.K1UTom/_new 2016-09-20 13:18:12.000000000 +0200
@@ -1,7 +1,7 @@
-Index: main/snprintf.h
+Index: php-5.6.26/main/snprintf.h
===================================================================
---- main/snprintf.h.orig
-+++ main/snprintf.h
+--- php-5.6.26.orig/main/snprintf.h 2016-09-15 23:02:50.000000000 +0200
++++ php-5.6.26/main/snprintf.h 2016-09-16 09:16:17.357620879 +0200
@@ -83,7 +83,7 @@ PHPAPI int ap_php_vslprintf(char *buf, s
PHPAPI int ap_php_snprintf(char *, size_t, const char *, ...);
PHPAPI int ap_php_vsnprintf(char *, size_t, const char *, va_list ap);
@@ -11,11 +11,11 @@
PHPAPI int php_sprintf (char* s, const char* format, ...)
PHP_ATTRIBUTE_FORMAT(printf, 2, 3);
PHPAPI char * php_gcvt(double value, int ndigit, char dec_point, char
exponent, char *buf);
PHPAPI char * php_conv_fp(register char format, register double num,
-Index: main/main.c
+Index: php-5.6.26/main/main.c
===================================================================
---- main/main.c.orig
-+++ main/main.c
-@@ -935,7 +935,7 @@ PHPAPI void php_html_puts(const char *st
+--- php-5.6.26.orig/main/main.c 2016-09-15 23:02:50.000000000 +0200
++++ php-5.6.26/main/main.c 2016-09-16 09:16:17.361620934 +0200
+@@ -1026,7 +1026,7 @@ PHPAPI void php_html_puts(const char *st
/* {{{ php_error_cb
extended error handling function */
@@ -24,18 +24,19 @@
{
char *buffer;
int buffer_len, display;
-Index: Zend/zend_alloc.h
+Index: php-5.6.26/Zend/zend_alloc.h
===================================================================
---- Zend/zend_alloc.h.orig
-+++ Zend/zend_alloc.h
-@@ -55,13 +55,13 @@ BEGIN_EXTERN_C()
+--- php-5.6.26.orig/Zend/zend_alloc.h 2016-09-15 23:02:50.000000000 +0200
++++ php-5.6.26/Zend/zend_alloc.h 2016-09-16 09:22:16.678535960 +0200
+@@ -55,14 +55,14 @@ BEGIN_EXTERN_C()
ZEND_API char *zend_strndup(const char *s, unsigned int length)
ZEND_ATTRIBUTE_MALLOC;
ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
ZEND_ATTRIBUTE_MALLOC ZEND_ATTRIBUTE_ALLOC_SIZE(1);
-ZEND_API void *_safe_emalloc(size_t nmemb, size_t size, size_t offset
ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC;
--ZEND_API void *_safe_malloc(size_t nmemb, size_t size, size_t offset)
ZEND_ATTRIBUTE_MALLOC;
+ZEND_API void *_safe_emalloc(size_t nmemb, size_t size, size_t offset
ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC
ZEND_ATTR_ALLOC_SIZE2(1,2);
-+ZEND_API void *_safe_malloc(size_t nmemb, size_t size, size_t offset)
ZEND_ATTR_ALLOC_SIZE2(1,2);
+ ZEND_API void *_safe_emalloc_string(size_t nmemb, size_t size, size_t offset
ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC;
+-ZEND_API void *_safe_malloc(size_t nmemb, size_t size, size_t offset)
ZEND_ATTRIBUTE_MALLOC;
++ZEND_API void *_safe_malloc(size_t nmemb, size_t size, size_t offset)
ZEND_ATTRIBUTE_MALLOC ZEND_ATTR_ALLOC_SIZE2(1,2);
ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC
ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC ZEND_ATTRIBUTE_ALLOC_SIZE2(1,2);
ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure
ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_ALLOC_SIZE(2);
@@ -46,7 +47,7 @@
ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC
ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC;
ZEND_API char *_estrndup(const char *s, unsigned int length ZEND_FILE_LINE_DC
ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC;
ZEND_API size_t _zend_mem_block_size(void *ptr TSRMLS_DC ZEND_FILE_LINE_DC
ZEND_FILE_LINE_ORIG_DC);
-@@ -90,7 +90,7 @@ ZEND_API size_t _zend_mem_block_size(voi
+@@ -92,7 +92,7 @@ ZEND_API size_t _zend_mem_block_size(voi
#define estrndup_rel(s, length)
_estrndup((s), (length) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
#define zend_mem_block_size_rel(ptr)
_zend_mem_block_size((ptr) TSRMLS_CC ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
@@ -55,7 +56,7 @@
{
void *tmp = malloc(len);
if (tmp) {
-@@ -100,14 +100,14 @@ inline static void * __zend_malloc(size_
+@@ -102,14 +102,14 @@ inline static void * __zend_malloc(size_
exit(1);
}
@@ -72,10 +73,10 @@
{
p = realloc(p, len);
if (p) {
-Index: Zend/zend.h
+Index: php-5.6.26/Zend/zend.h
===================================================================
---- Zend/zend.h.orig
-+++ Zend/zend.h
+--- php-5.6.26.orig/Zend/zend.h 2016-09-15 23:02:50.000000000 +0200
++++ php-5.6.26/Zend/zend.h 2016-09-16 09:16:17.361620934 +0200
@@ -159,6 +159,14 @@ char *alloca ();
# define ZEND_ATTRIBUTE_ALLOC_SIZE2(X,Y)
#endif
