Mailinglist Archive: opensuse-commit (861 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package php5 for openSUSE:Factory
checked in at Fri Jan 7 09:45:21 CET 2011.



--------
--- php5/php5.changes   2010-12-14 02:10:35.000000000 +0100
+++ /mounts/work_src_done/STABLE/php5/php5.changes      2011-01-06 
23:47:48.000000000 +0100
@@ -1,0 +2,19 @@
+Thu Jan  6 22:44:12 UTC 2011 - cristian.rodriguez@xxxxxxxxxxxx
+
+- Update to version 5.3.5, Critical Update
+* Fixed bug #53632 (PHP hangs on numeric value 2.2250738585072011e-308). 
(CVE-2010-4645)
+  Only 32 bit binaries affected, confirmed in factory i586.
+
+-------------------------------------------------------------------
+Fri Dec 17 21:37:18 UTC 2010 - cristian.rodriguez@xxxxxxxxxxxx
+
+- revert unsuitable patch php-5.3.4-dlopen.patch
+
+-------------------------------------------------------------------
+Tue Dec 14 23:19:26 UTC 2010 - cristian.rodriguez@xxxxxxxxxxxx
+
+- Add  php-5.3.4-dlopen.patch from fedora,makes dlopen to use
+  bind_now instead of lazy.
+- Compiler is now in C99 mode for both core and extensions. 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  php-5.3.4.tar.bz2

New:
----
  php-5.3.5.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ php5.spec ++++++
--- /var/tmp/diff_new_pack.UvJw1X/_old  2011-01-07 09:44:56.000000000 +0100
+++ /var/tmp/diff_new_pack.UvJw1X/_new  2011-01-07 09:44:56.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package php5 (Version 5.3.4)
+# spec file for package php5 (Version 5.3.5)
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -76,8 +76,8 @@
 #define builtin_tz_ver         2007.9
 ###
 ###
-Version:        5.3.4
-Release:        2
+Version:        5.3.5
+Release:        1
 License:        The PHP License, version 3.01
 Group:          Development/Languages/Other
 Provides:       php zend php-xml php-spl php-simplexml php-session php-pcre 
php-date php-reflection php-filter
@@ -1223,6 +1223,7 @@
 %patch25
 %patch26
 %patch27
+
 # we build three SAPI
 %{__mkdir_p} build-apache2 build-fpm
 %{__mkdir_p} build-fastcgi/sapi/cgi/libfcgi
@@ -1242,12 +1243,10 @@
         build-$sapi/Zend
 done
 %endif
-#vtzdb=`grep timezonedb_builtin  ext/date/lib/timezonedb.h | sed  -e 
's/[^"]*"\([^"]\+\)"*[^"]*/\1\n/g' | head -n1`
-#if test "x${vtzdb}" != "x%{builtin_tz_ver}"; then
-#   : Error: Built-in timezonedb version is now ${vtzdb}, expecting 
%{builtin_tz_ver}.
-#   : Update the builtin_tz_ver macro and rebuild.
-#   exit 1
-#fi
+
+for parser in `find -name "*.re"`;do
+       re2c --no-generation-date -gi "$parser" > ${parser%.*}.c
+done
 # Safety check for API version change.
 vapi=`sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h`
 if test "x${vapi}" != "x%{apiver}"; then
@@ -1469,7 +1468,7 @@
 %check
 cd build-cli
 # Run tests, using the CLI SAPI
-export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 LANG=POSIX 
LC_ALL=POSIX
+export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 LANG=POSIX LC_ALL=POSIX
 unset TZ
 #%{__make} test
 set +x
@@ -1479,7 +1478,7 @@
        echo "-- $f result ends."
 done
 set -x
-unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_
+unset NO_INTERACTION REPORT_EXIT_STATUS 
 
 %install
 # install function


++++++ php-5.3.2-aconf26x.patch ++++++
--- /var/tmp/diff_new_pack.UvJw1X/_old  2011-01-07 09:44:57.000000000 +0100
+++ /var/tmp/diff_new_pack.UvJw1X/_new  2011-01-07 09:44:57.000000000 +0100
@@ -8,6 +8,16 @@
  
  AC_PREREQ(2.13)
  AC_INIT(config.m4)
+@@ -23,7 +23,8 @@ test -z "$CFLAGS" && auto_cflags=1
+ abs_srcdir=`(cd $srcdir && pwd)`
+ abs_builddir=`pwd`
+ 
+-AC_PROG_CC([cc gcc])
++AC_PROG_CC_STDC
++AC_USE_SYSTEM_EXTENSIONS
+ PHP_DETECT_ICC
+ PHP_DETECT_SUNCC
+ AC_PROG_CC_C_O
 --- ext/standard/config.m4.orig
 +++ ext/standard/config.m4
 @@ -1,6 +1,6 @@
@@ -30,7 +40,7 @@
 --- configure.in.orig
 +++ configure.in
 @@ -1,7 +1,7 @@
- ## $Id: configure.in 306090 2010-12-08 21:38:51Z johannes $ -*- autoconf -*-
+ ## $Id: configure.in 307133 2011-01-05 16:35:33Z johannes $ -*- autoconf -*-
  dnl ## Process this file with autoconf to produce a configure script.
  
 -divert(1)
@@ -38,6 +48,21 @@
  
  dnl ## Diversion 1 is the autoconf + automake setup phase. We also
  dnl ## set the PHP version, deal with platform-specific compile
+@@ -125,12 +125,12 @@ rm -f libs/*
+ dnl Checks for programs.
+ dnl -------------------------------------------------------------------------
+ 
+-AC_PROG_CC([cc gcc])
++AC_USE_SYSTEM_EXTENSIONS
+ PHP_DETECT_ICC
+ PHP_DETECT_SUNCC
+ AC_PROG_CC_C_O
+ dnl Change to AC_PROG_CC_STDC when we start requiring a post-2.13 autoconf
+-dnl AC_PROG_CC_STDC
++AC_PROG_CC_STDC
+ AC_PROG_CPP
+ AC_AIX
+ AC_PROG_LN_S
 @@ -290,7 +290,7 @@ sinclude(TSRM/threads.m4)
  sinclude(TSRM/tsrm.m4)
  

++++++ php-5.3.4-format-string-issues.patch ++++++
--- /var/tmp/diff_new_pack.UvJw1X/_old  2011-01-07 09:44:57.000000000 +0100
+++ /var/tmp/diff_new_pack.UvJw1X/_new  2011-01-07 09:44:57.000000000 +0100
@@ -72,3 +72,74 @@
  {
        char *buffer;
        int buffer_len, display;
+Index: Zend/zend.h
+===================================================================
+--- Zend/zend.h        (revisión: 306414)
++++ Zend/zend.h        (copia de trabajo)
+@@ -146,6 +146,14 @@
+ # define ZEND_ATTRIBUTE_MALLOC
+ #endif
+ 
++#if ZEND_GCC_VERSION >= 4003
++#define ZEND_ATTR_ALLOC_SIZE(x) __attribute__((__alloc_size__(x)))
++#define ZEND_ATTR_ALLOC_SIZE2(x,y) __attribute__((__alloc_size__(x,y)))
++#else
++#define ZEND_ATTR_ALLOC_SIZE(x)
++#define ZEND_ATTR_ALLOC_SIZE2(x,y)
++#endif
++
+ #if ZEND_GCC_VERSION >= 2007
+ # define ZEND_ATTRIBUTE_FORMAT(type, idx, first) __attribute__ ((format(type, 
idx, first)))
+ #else
+Index: Zend/zend_alloc.h
+===================================================================
+--- Zend/zend_alloc.h  (revisión: 306414)
++++ Zend/zend_alloc.h  (copia de trabajo)
+@@ -54,14 +54,14 @@
+ 
+ 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_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 *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) 
ZEND_ATTRIBUTE_MALLOC ZEND_ATTR_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_ATTR_ALLOC_SIZE2(1,2);
++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_API void *_erealloc(void *ptr, size_t size, int allow_failure 
ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
+-ZEND_API void *_safe_erealloc(void *ptr, size_t nmemb, size_t size, size_t 
offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
+-ZEND_API void *_safe_realloc(void *ptr, size_t nmemb, size_t size, size_t 
offset);
++ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC 
ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC ZEND_ATTR_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_ATTR_ALLOC_SIZE(2);
++ZEND_API void *_safe_erealloc(void *ptr, size_t nmemb, size_t size, size_t 
offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTR_ALLOC_SIZE2(2,3);
++ZEND_API void *_safe_realloc(void *ptr, size_t nmemb, size_t size, size_t 
offset) ZEND_ATTR_ALLOC_SIZE2(2,3);
+ 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 @@
+ #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)
+ 
+-inline static void * __zend_malloc(size_t len)
++inline static ZEND_ATTR_ALLOC_SIZE(1) void * __zend_malloc(size_t len)
+ {
+       void *tmp = malloc(len);
+       if (tmp) {
+@@ -100,14 +100,14 @@
+       exit(1);
+ }
+ 
+-inline static void * __zend_calloc(size_t nmemb, size_t len)
++inline static ZEND_ATTR_ALLOC_SIZE2(1,2) void * __zend_calloc(size_t nmemb, 
size_t len)
+ {
+       void *tmp = _safe_malloc(nmemb, len, 0);
+       memset(tmp, 0, nmemb * len);
+       return tmp;
+ }
+ 
+-inline static void * __zend_realloc(void *p, size_t len)
++inline static ZEND_ATTR_ALLOC_SIZE(2) void * __zend_realloc(void *p, size_t 
len)
+ {
+       p = realloc(p, len);
+       if (p) {

++++++ php-5.3.4.tar.bz2 -> php-5.3.5.tar.bz2 ++++++
php5/php-5.3.4.tar.bz2 /mounts/work_src_done/STABLE/php5/php-5.3.5.tar.bz2 
differ: byte 11, line 1


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx