diff options
| -rw-r--r-- | php-wip.patch | 35 | ||||
| -rw-r--r-- | php55.spec | 12 |
2 files changed, 41 insertions, 6 deletions
diff --git a/php-wip.patch b/php-wip.patch new file mode 100644 index 0000000..1c2cee7 --- /dev/null +++ b/php-wip.patch @@ -0,0 +1,35 @@ +diff -up ext/calendar/jewish.c.old ext/calendar/jewish.c +--- ext/calendar/jewish.c.old 2013-05-22 08:11:57.663604019 +0200 ++++ ext/calendar/jewish.c 2013-05-22 08:13:16.560934578 +0200 +@@ -272,7 +272,7 @@ + #define HALAKIM_PER_METONIC_CYCLE (HALAKIM_PER_LUNAR_CYCLE * (12 * 19 + 7)) + + #define JEWISH_SDN_OFFSET 347997 +-#define JEWISH_SDN_MAX 38245310 /* year 103759, 100000 A.D. */ ++#define JEWISH_SDN_MAX 324542846 /* 12/13/887605, greater value raises interger overflow */ + #define NEW_MOON_OF_CREATION 31524 + + #define SUNDAY 0 +diff -up ext/calendar/tests/jdtojewish64.phpt.old ext/calendar/tests/jdtojewish64.phpt +--- ext/calendar/tests/jdtojewish64.phpt.old 2013-05-21 18:37:45.000000000 +0200 ++++ ext/calendar/tests/jdtojewish64.phpt 2013-05-22 08:15:08.113424723 +0200 +@@ -1,5 +1,5 @@ + --TEST-- +-Integer overflow in SndToJewish leads to php hang ++Bug #64895: Integer overflow in SndToJewish + --SKIPIF-- + <?php + include 'skipif.inc'; +@@ -9,10 +9,11 @@ if (PHP_INT_SIZE == 4) { + ?> + --FILE-- + <?php +-$a = array(38245310, 38245311, 9223372036854743639); ++$a = array(38245310, 324542846, 324542847, 9223372036854743639); + + foreach ($a as $x) var_dump(jdtojewish($x)); + --EXPECTF-- + string(11) "2/22/103759" ++string(12) "12/13/887605" + string(5) "0/0/0" + string(5) "0/0/0" @@ -79,7 +79,7 @@ %global db_devel libdb-devel %endif -%global snapdate 201305181030 +%global snapdate 201305220430 #global rcver RC1 Summary: PHP scripting language for creating dynamic web sites @@ -140,8 +140,6 @@ Patch45: php-5.4.8-ldap_r.patch Patch46: php-5.4.9-fixheader.patch # drop "Configure command" from phpinfo output Patch47: php-5.4.9-phpinfo.patch -# systemd integration -Patch48: php-5.5.0-systemd.patch # Fixes for tests @@ -149,7 +147,7 @@ Patch48: php-5.5.0-systemd.patch Patch91: php-5.3.7-oci8conf.patch # WIP -#Patch99: php-5.5.0-wip.patch +Patch99: php-wip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -839,12 +837,11 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1 %endif %patch46 -p1 -b .fixheader %patch47 -p1 -b .phpinfo -%patch48 -p1 -b .systemd %patch91 -p1 -b .remi-oci8 # wip patches -#patch99 -p1 -b .wip +%patch99 -p0 -b .wip # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE @@ -1811,6 +1808,9 @@ fi %changelog +* Sat May 22 2013 Remi Collet <rcollet@redhat.com> 5.5.0-0.32.201305220430 +- test build for https://bugs.php.net/64895 + * Sat May 18 2013 Remi Collet <rcollet@redhat.com> 5.5.0-0.32.201305181030 - test build with systemd integration (type=notify) |