[arch-commits] Commit in uwsgi/trunk (PKGBUILD uwsgi_php_7.1.patch)

[Felix Yan]

    Date: Tuesday, January 17, 2017 @ 16:38:57
  Author: felixonmars
Revision: 207752

upgpkg: uwsgi 2.0.14-7

rebuild with php 7.1

Added:
  uwsgi/trunk/uwsgi_php_7.1.patch
Modified:
  uwsgi/trunk/PKGBUILD

---------------------+
 PKGBUILD            |    6 ++++--
 uwsgi_php_7.1.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-17 16:33:59 UTC (rev 207751)
+++ PKGBUILD	2017-01-17 16:38:57 UTC (rev 207752)
@@ -22,7 +22,7 @@
          uwsgi-plugin-webdav
          mod_proxy_uwsgi)
 pkgver=2.0.14
-pkgrel=6
+pkgrel=7
 arch=(i686 x86_64)
 url="http://projects.unbit.it/$pkgbase"
 license=(GPL2)
@@ -40,6 +40,7 @@
         uwsgi_at.socket
         uwsgi_ruby20_compatibility.patch
         uwsgi_trick_chroot.patch
+        uwsgi_php_7.1.patch
         emperor.ini
         emperor.uwsgi.service
         emperor.uwsgi.socket)
@@ -51,6 +52,7 @@
             'fb51a4d102a1bc7d9f7d4c4f310ee65076bcfbc94b47e2dafdf9b20e99a661c5f938185dcf698437d81409376f0276b966f09b13c8a29462c48612df43c3f3ef'
             '162ca1be96282b32e8e6be919b6315bfd08954c491056958985bf99e7f5bdad3511665f059329d6cb6ef5d222f9aa11d4dc43c72e6a963ab941ada959fe8d964'
             'bc30f8ec69abd14fb96ada5b36cf65811a7a63ee27e224fcb6ceabe9935c1f17379cd872149a17da3d590b8ff60fbe7f77140d777aaf06e25e83388f897f611d'
+            'f973136c51ec0847ac6b3c3eb6ad45a1d137ada69e79a966ea92076ce29166b1f0b92b83d10b18153e48772a22c4b67a52a9e6c55a966c00f0cd0db644bb829f'
             '41cc29ea14ca87749959379ead773d9a3a499c6bc7be17800e06e33c998a929ae855c9ad0fe2039e26a034c24d2845833945333442b98d7c6f0924aa2a036b1b'
             '83a6859d729bf186236aaa7fb7433415f6b985f17e05b7ac571d8919bbf1fb9bd577b4f673d9787dea09752e3d8043f47ce3d9c7d5690faaa1365e477e6c9388'
             '592c85270f43b37e9c51aae126533830515b96fff9fcae969ee865fe173bd0550c7729530d5ff1e44ffee43cd5c78c96688ce091c677a4196379e24983c0180e')
@@ -58,7 +60,7 @@
 prepare() {
     cd $srcdir/$pkgbase-$pkgver
     cp $srcdir/archlinux.ini buildconf/archlinux.ini
-    for patch in uwsgi_ruby20_compatibility.patch uwsgi_trick_chroot.patch; do
+    for patch in uwsgi_ruby20_compatibility.patch uwsgi_trick_chroot.patch uwsgi_php_7.1.patch; do
         msg2 "Applying $patch"
         patch -Np1 -i $srcdir/$patch
     done

Added: uwsgi_php_7.1.patch
===================================================================
--- uwsgi_php_7.1.patch	                        (rev 0)
+++ uwsgi_php_7.1.patch	2017-01-17 16:38:57 UTC (rev 207752)
@@ -0,0 +1,30 @@
+From 03dc7e49433defbe47b0c900c86b0968eeda174c Mon Sep 17 00:00:00 2001
+From: Damjan Georgievski <gdamjan at gmail.com>
+Date: Tue, 10 Jan 2017 01:20:25 +0100
+Subject: [PATCH] fix compilation with php 7.1
+
+php 7.1 changed the signature of the log_message function in
+sapi_module_struct. Let's assume it will stay like this for all versions >= 7.1
+
+fixes #1427
+---
+ plugins/php/php_plugin.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/php/php_plugin.c b/plugins/php/php_plugin.c
+index 7440d55..78d980f 100644
+--- a/plugins/php/php_plugin.c
++++ b/plugins/php/php_plugin.c
+@@ -568,8 +568,11 @@ static int php_uwsgi_startup(sapi_module_struct *sapi_module)
+ 	}
+ }
+ 
++#if ((PHP_MAJOR_VERSION >= 7) && (PHP_MINOR_VERSION >= 1))
++static void sapi_uwsgi_log_message(char *message, int syslog_type_int) {
++#else
+ static void sapi_uwsgi_log_message(char *message TSRMLS_DC) {
+-
++#endif
+ 	uwsgi_log("%s\n", message);
+ }
+