|
[-]
[+]
|
Changed |
php5.spec
|
|
|
|
[-]
[+]
|
Added |
php5-depdb-path.patch
^
|
| @@ -0,0 +1,16 @@
+# pear installer from 1.10.1 installs .depdb{,lock} files into
+# %{buildroot}%{peardir} along with .lock, .registry, etc. when
+# metadata_dir is not set but does not install them if
+# metadata_dir is set; our Horde packages expect them there though,
+# (they rm them without -f) so always install them along
+--- PEAR/Registry.php 2015-12-01 13:11:24.965179369 +0000
++++ PEAR/Registry.php 2015-12-01 13:18:42.036075538 +0000
+@@ -325,6 +325,7 @@ class PEAR_Registry extends PEAR
+ $file);
+ $this->_config->setRegistry($this);
+ $this->_config->set('php_dir', $this->install_dir);
++ $this->_config->set('metadata_dir', dirname($this->lockfile));
+ }
+
+ $this->_dependencyDB = &PEAR_DependencyDB::singleton($this->_config);
+
|
|
[-]
[+]
|
Added |
php5-mbstring-missing-return.patch
^
|
| @@ -0,0 +1,13 @@
+Index: ext/mbstring/libmbfl/filters/mbfilter_utf8.c
+===================================================================
+--- ext/mbstring/libmbfl/filters/mbfilter_utf8.c.orig 2013-09-18 07:48:57.000000000 +0200
++++ ext/mbstring/libmbfl/filters/mbfilter_utf8.c 2013-09-25 12:22:04.061030824 +0200
+@@ -101,6 +101,7 @@
+ filter->status = 0;
+ filter->cache = 0;
+ CK((*filter->output_function)(w, filter->data));
++ return 0;
+ }
+
+
+
|
|
[-]
[+]
|
Changed |
php5-systemd-unit.patch
^
|
| @@ -1,9 +1,12 @@
---- sapi/fpm/php-fpm.service.in.orig
-+++ sapi/fpm/php-fpm.service.in
-@@ -1,12 +1,14 @@
+Index: php-5.6.22/sapi/fpm/php-fpm.service.in
+===================================================================
+--- php-5.6.22.orig/sapi/fpm/php-fpm.service.in 2016-05-26 03:08:57.000000000 +0200
++++ php-5.6.22/sapi/fpm/php-fpm.service.in 2016-06-20 13:39:39.790849850 +0200
+@@ -1,12 +1,15 @@
[Unit]
Description=The PHP FastCGI Process Manager
- After=syslog.target network.target
+-After=syslog.target network.target
++After=network.target
+Before=apache2.service nginx.service lighttpd.service
[Service]
@@ -14,6 +17,8 @@
ExecReload=/bin/kill -USR2 $MAINPID
+ExecStop=/bin/kill -QUIT $MAINPID
+PrivateTmp=true
++KillMode=mixed
[Install]
WantedBy=multi-user.target
+
|
