[arch-commits] Commit in fcgiwrap/trunk (2 files)

[Lukas Fleischer]

    Date: Friday, June 21, 2019 @ 01:52:02
  Author: lfleischer
Revision: 482557

upgpkg: fcgiwrap 1.1.0-6

Apply upstream bug fix.

Added:
  fcgiwrap/trunk/dc0c3b14f0d7bb014a9a4c6c17eb55a123496365.patch
Modified:
  fcgiwrap/trunk/PKGBUILD

------------------------------------------------+
 PKGBUILD                                       |    7 ++++++-
 dc0c3b14f0d7bb014a9a4c6c17eb55a123496365.patch |   22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-21 01:50:08 UTC (rev 482556)
+++ PKGBUILD	2019-06-21 01:52:02 UTC (rev 482557)
@@ -4,7 +4,7 @@
 
 pkgname=fcgiwrap
 pkgver=1.1.0
-pkgrel=5
+pkgrel=6
 pkgdesc='A simple server for running CGI applications over FastCGI.'
 arch=('x86_64')
 url='http://nginx.localdomain.pl/wiki/FcgiWrap'
@@ -12,9 +12,11 @@
 depends=('fcgi' 'systemd')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/gnosek/fcgiwrap/archive/${pkgver}.tar.gz"
         'link-with-libsystemd-instead-of-libsystemd-daemon.patch'
+        'dc0c3b14f0d7bb014a9a4c6c17eb55a123496365.patch'
         'LICENSE')
 md5sums=('d14f56bda6758a6e02aa7b3fb125cbce'
          'b2428010802d80c577553ee8c0fd8d7a'
+         '3d573f45fac637a1076388683bd0beaf'
          '5aee62c27b4308f25ab32f05da387366')
 
 prepare() {
@@ -23,6 +25,9 @@
   # https://github.com/gnosek/fcgiwrap/pull/37
   patch -Np1 -i ../link-with-libsystemd-instead-of-libsystemd-daemon.patch
 
+  # fix kill() parameters
+  patch -Np1 -i ../dc0c3b14f0d7bb014a9a4c6c17eb55a123496365.patch
+
   autoreconf -vi
 }
 

Added: dc0c3b14f0d7bb014a9a4c6c17eb55a123496365.patch
===================================================================
--- dc0c3b14f0d7bb014a9a4c6c17eb55a123496365.patch	                        (rev 0)
+++ dc0c3b14f0d7bb014a9a4c6c17eb55a123496365.patch	2019-06-21 01:52:02 UTC (rev 482557)
@@ -0,0 +1,22 @@
+From dc0c3b14f0d7bb014a9a4c6c17eb55a123496365 Mon Sep 17 00:00:00 2001
+From: "D.pz" <xpz91 at 126.me>
+Date: Mon, 28 Aug 2017 23:54:08 +0800
+Subject: [PATCH] 1.fix: kill() parameter sequence wrong
+
+---
+ fcgiwrap.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fcgiwrap.c b/fcgiwrap.c
+index b44d8aa..bfd9a90 100644
+--- a/fcgiwrap.c
++++ b/fcgiwrap.c
+@@ -205,7 +205,7 @@ static void fcgi_finish(struct fcgi_context *fc, const char* msg)
+ 	if (fc->fd_stderr >= 0) close(fc->fd_stderr);
+ 
+ 	if (fc->cgi_pid)
+-		kill(SIGTERM, fc->cgi_pid);
++		kill(fc->cgi_pid, SIGTERM);
+ }
+ 
+ static const char * fcgi_pass_fd(struct fcgi_context *fc, int *fdp, FCGI_FILE *ffp, char *buf, size_t bufsize)