diff options
| -rw-r--r-- | php-5.5.4-date.patch | 63 | ||||
| -rw-r--r-- | php55.spec | 18 |
2 files changed, 77 insertions, 4 deletions
diff --git a/php-5.5.4-date.patch b/php-5.5.4-date.patch new file mode 100644 index 0000000..5f9bffe --- /dev/null +++ b/php-5.5.4-date.patch @@ -0,0 +1,63 @@ +--- php5.5-201308300430/ext/date/php_date.c.old 2013-08-30 10:04:46.963985553 +0200 ++++ php5.5-201308300430/ext/date/php_date.c 2013-08-30 10:05:54.664183035 +0200 +@@ -2198,13 +2198,13 @@ + /* first we add the date and time in ISO format */ + MAKE_STD_ZVAL(zv); + ZVAL_STRING(zv, date_format("Y-m-d H:i:s", 12, dateobj->time, 1), 0); +- zend_hash_update(props, "date", 5, &zv, sizeof(zval), NULL); ++ zend_hash_update(props, "date", 5, &zv, sizeof(zv), NULL); + + /* then we add the timezone name (or similar) */ + if (dateobj->time->is_localtime) { + MAKE_STD_ZVAL(zv); + ZVAL_LONG(zv, dateobj->time->zone_type); +- zend_hash_update(props, "timezone_type", 14, &zv, sizeof(zval), NULL); ++ zend_hash_update(props, "timezone_type", 14, &zv, sizeof(zv), NULL); + + MAKE_STD_ZVAL(zv); + switch (dateobj->time->zone_type) { +@@ -2227,7 +2227,7 @@ + ZVAL_STRING(zv, dateobj->time->tz_abbr, 1); + break; + } +- zend_hash_update(props, "timezone", 9, &zv, sizeof(zval), NULL); ++ zend_hash_update(props, "timezone", 9, &zv, sizeof(zv), NULL); + } + + return props; +@@ -2305,7 +2305,7 @@ + + MAKE_STD_ZVAL(zv); + ZVAL_LONG(zv, tzobj->type); +- zend_hash_update(props, "timezone_type", 14, &zv, sizeof(zval), NULL); ++ zend_hash_update(props, "timezone_type", 14, &zv, sizeof(zv), NULL); + + MAKE_STD_ZVAL(zv); + switch (tzobj->type) { +@@ -2327,7 +2327,7 @@ + ZVAL_STRING(zv, tzobj->tzi.z.abbr, 1); + break; + } +- zend_hash_update(props, "timezone", 9, &zv, sizeof(zval), NULL); ++ zend_hash_update(props, "timezone", 9, &zv, sizeof(zv), NULL); + + return props; + } +@@ -2394,7 +2394,7 @@ + #define PHP_DATE_INTERVAL_ADD_PROPERTY(n,f) \ + MAKE_STD_ZVAL(zv); \ + ZVAL_LONG(zv, (long)intervalobj->diff->f); \ +- zend_hash_update(props, n, strlen(n) + 1, &zv, sizeof(zval), NULL); ++ zend_hash_update(props, n, strlen(n) + 1, &zv, sizeof(zv), NULL); + + PHP_DATE_INTERVAL_ADD_PROPERTY("y", y); + PHP_DATE_INTERVAL_ADD_PROPERTY("m", m); +@@ -2411,7 +2411,7 @@ + } else { + MAKE_STD_ZVAL(zv); + ZVAL_FALSE(zv); +- zend_hash_update(props, "days", 5, &zv, sizeof(zval), NULL); ++ zend_hash_update(props, "days", 5, &zv, sizeof(zv), NULL); + } + PHP_DATE_INTERVAL_ADD_PROPERTY("special_type", special.type); + PHP_DATE_INTERVAL_ADD_PROPERTY("special_amount", special.amount); @@ -79,14 +79,14 @@ %global db_devel libdb-devel %endif -#global snapdate 201306240630 +%global snapdate 201308300430 #global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: php -Version: 5.5.3 +Version: 5.5.4 %if 0%{?snapdate:1}%{?rcver:1} -Release: 0.2.%{?snapdate}%{?rcver}%{?dist} +Release: 0.1.%{?snapdate}%{?rcver}%{?dist} %else Release: 1%{?dist} %endif @@ -126,6 +126,7 @@ Patch5: php-5.2.0-includedir.patch Patch6: php-5.2.4-embed.patch Patch7: php-5.3.0-recode.patch Patch8: php-5.4.7-libdb.patch +Patch9: php-5.5.4-date.patch # Fixes for extension modules # https://bugs.php.net/63171 no odbc call during timeout @@ -826,6 +827,7 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1 %if 0%{?snapdate} %setup -q -n php5.5-%{snapdate} +rm -rf ext/json %else %setup -q -n php-%{version}%{?rcver} %endif @@ -834,11 +836,12 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1 %patch6 -p1 -b .embed %patch7 -p1 -b .recode %patch8 -p1 -b .libdb +%patch9 -p1 -b .date %patch21 -p1 -b .odbctimer %patch40 -p1 -b .dlopen -%if 0%{?fedora} >= 16 || 0%{?rhel} >= 5 +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 5 %patch42 -p1 -b .systzdata %endif %patch43 -p1 -b .headers @@ -976,7 +979,10 @@ cat `aclocal --print-ac-dir`/libtool.m4 > build/libtool.m4 touch configure.in ./buildconf --force CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-pointer-sign" +#CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-pointer-sign -fsanitize=address -ggdb" export CFLAGS +#LDFLAGS="-fsanitize=address" +#export LDFLAGS # Install extension modules in %{_libdir}/php/modules. EXTENSION_DIR=%{_libdir}/php/modules; export EXTENSION_DIR @@ -1816,6 +1822,10 @@ fi %changelog +* Fri Aug 30 2013 Remi Collet <rcollet@redhat.com> - 5.5.4.0.1-201308300430 +- test build with -fsanitize=address +- test build for https://bugs.php.net/65564 + * Wed Aug 21 2013 Remi Collet <rcollet@redhat.com> - 5.5.3-1 - update to 5.5.3 - build without zip extension, requires php-pecl-zip |