- fix building with libevent 2.1

- rel 23

diff --git a/libevent-2.1.patch b/libevent-2.1.patch
new file mode 100644 (file)
index 0000000..3248659
--- /dev/null
+++ b/libevent-2.1.patch
@@ -0,0 +1,10 @@
+--- php-5.2.17/sapi/cgi/fpm/fpm_events.c~      2017-04-03 20:18:01.000000000 +0200
++++ php-5.2.17/sapi/cgi/fpm/fpm_events.c       2017-04-05 09:28:49.495634577 +0200
+@@ -130,6 +130,6 @@
+ 
+ void fpm_event_fire(struct event *ev)
+ {
+-      (*ev->ev_callback)( (int) ev->ev_fd, (short) ev->ev_res, ev->ev_arg);   
++      (*ev->ev_evcallback.evcb_cb_union.evcb_callback)( (int) ev->ev_fd, (short) ev->ev_res, ev->ev_evcallback.evcb_arg);
+ }
+ 

diff --git a/php.spec b/php.spec
index 4ae69ed229fe4c63b23b3e7dcb1ff7059d157a4e..3e38f8eb867bf50f469cb602d6acc0178eea02b7 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -112,7 +112,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %define                magic_mime      /usr/share/misc/magic.mime
 %endif
 
-%define                rel     22
+%define                rel     23
 %define                orgname php
 %define                ver_suffix 52
 %define                php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -225,6 +225,7 @@ Patch75:    php-secbug-67498.patch
 Patch76:       CVE-2015-0232.patch
 Patch77:       x32.patch
 Patch78:       php-bug-68486.patch
+Patch79:       libevent-2.1.patch
 # CENTALT patches
 # Backport from 5.3.6
 Patch311:      php-5.3.6-bug-47435.patch
@@ -1953,6 +1954,7 @@ done
 %patch76 -p1
 %patch77 -p1
 %patch78 -p1
+%patch79 -p1
 
 # Bugfix backport from 5.3.6
 %patch311 -p1 -b .bug-47435