Date: Friday, June 21, 2019 @ 01:52:14 Author: lfleischer Revision: 482558
archrelease: copy trunk to community-x86_64 Added: fcgiwrap/repos/community-x86_64/LICENSE (from rev 482557, fcgiwrap/trunk/LICENSE) fcgiwrap/repos/community-x86_64/PKGBUILD (from rev 482557, fcgiwrap/trunk/PKGBUILD) fcgiwrap/repos/community-x86_64/dc0c3b14f0d7bb014a9a4c6c17eb55a123496365.patch (from rev 482557, fcgiwrap/trunk/dc0c3b14f0d7bb014a9a4c6c17eb55a123496365.patch) fcgiwrap/repos/community-x86_64/link-with-libsystemd-instead-of-libsystemd-daemon.patch (from rev 482557, fcgiwrap/trunk/link-with-libsystemd-instead-of-libsystemd-daemon.patch) Deleted: fcgiwrap/repos/community-x86_64/LICENSE fcgiwrap/repos/community-x86_64/PKGBUILD fcgiwrap/repos/community-x86_64/link-with-libsystemd-instead-of-libsystemd-daemon.patch ---------------------------------------------------------+ LICENSE | 48 +++---- PKGBUILD | 95 +++++++------- dc0c3b14f0d7bb014a9a4c6c17eb55a123496365.patch | 22 +++ link-with-libsystemd-instead-of-libsystemd-daemon.patch | 52 +++---- 4 files changed, 122 insertions(+), 95 deletions(-) Deleted: LICENSE =================================================================== --- LICENSE 2019-06-21 01:52:02 UTC (rev 482557) +++ LICENSE 2019-06-21 01:52:14 UTC (rev 482558) @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2007-2010 Grzegorz Nosek - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ Copied: fcgiwrap/repos/community-x86_64/LICENSE (from rev 482557, fcgiwrap/trunk/LICENSE) =================================================================== --- LICENSE (rev 0) +++ LICENSE 2019-06-21 01:52:14 UTC (rev 482558) @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2007-2010 Grzegorz Nosek + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-06-21 01:52:02 UTC (rev 482557) +++ PKGBUILD 2019-06-21 01:52:14 UTC (rev 482558) @@ -1,45 +0,0 @@ -# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> -# Contributor: Aaron Bull Schaefer <aa...@elasticdog.com> -# Contributor: Ron Huang <ronhuang+aur at gmail dot com> - -pkgname=fcgiwrap -pkgver=1.1.0 -pkgrel=5 -pkgdesc='A simple server for running CGI applications over FastCGI.' -arch=('x86_64') -url='http://nginx.localdomain.pl/wiki/FcgiWrap' -license=('MIT') -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' - 'LICENSE') -md5sums=('d14f56bda6758a6e02aa7b3fb125cbce' - 'b2428010802d80c577553ee8c0fd8d7a' - '5aee62c27b4308f25ab32f05da387366') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # https://github.com/gnosek/fcgiwrap/pull/37 - patch -Np1 -i ../link-with-libsystemd-instead-of-libsystemd-daemon.patch - - autoreconf -vi -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # -Werror is not much fun in release builds - CFLAGS+=' -Wno-error=implicit-fallthrough' - - # Here --sbindir is implicitly prefixed by /usr - ./configure --prefix=/usr --mandir=/share/man --sbindir=/bin --with-systemd - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - install -Dm0644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: fcgiwrap/repos/community-x86_64/PKGBUILD (from rev 482557, fcgiwrap/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-06-21 01:52:14 UTC (rev 482558) @@ -0,0 +1,50 @@ +# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> +# Contributor: Aaron Bull Schaefer <aa...@elasticdog.com> +# Contributor: Ron Huang <ronhuang+aur at gmail dot com> + +pkgname=fcgiwrap +pkgver=1.1.0 +pkgrel=6 +pkgdesc='A simple server for running CGI applications over FastCGI.' +arch=('x86_64') +url='http://nginx.localdomain.pl/wiki/FcgiWrap' +license=('MIT') +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() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # 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 +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # -Werror is not much fun in release builds + CFLAGS+=' -Wno-error=implicit-fallthrough' + + # Here --sbindir is implicitly prefixed by /usr + ./configure --prefix=/usr --mandir=/share/man --sbindir=/bin --with-systemd + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -Dm0644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Copied: fcgiwrap/repos/community-x86_64/dc0c3b14f0d7bb014a9a4c6c17eb55a123496365.patch (from rev 482557, fcgiwrap/trunk/dc0c3b14f0d7bb014a9a4c6c17eb55a123496365.patch) =================================================================== --- dc0c3b14f0d7bb014a9a4c6c17eb55a123496365.patch (rev 0) +++ dc0c3b14f0d7bb014a9a4c6c17eb55a123496365.patch 2019-06-21 01:52:14 UTC (rev 482558) @@ -0,0 +1,22 @@ +From dc0c3b14f0d7bb014a9a4c6c17eb55a123496365 Mon Sep 17 00:00:00 2001 +From: "D.pz" <xp...@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) Deleted: link-with-libsystemd-instead-of-libsystemd-daemon.patch =================================================================== --- link-with-libsystemd-instead-of-libsystemd-daemon.patch 2019-06-21 01:52:02 UTC (rev 482557) +++ link-with-libsystemd-instead-of-libsystemd-daemon.patch 2019-06-21 01:52:14 UTC (rev 482558) @@ -1,26 +0,0 @@ -From e621d6acb538d717d6767429e3f85190019a887d Mon Sep 17 00:00:00 2001 -From: Thomas Claveirole <thomas.claveir...@green-communications.fr> -Date: Mon, 18 Jul 2016 15:06:59 +0200 -Subject: [PATCH] configure.ac: Check for libsystemd, not libsystemd-daemon. - -Newer versions of systemd do not provide libsystemd-daemon anymore. -Therefore, use libsystemd instead. - -Signed-off-by: Thomas Claveirole <thomas.claveir...@green-communications.fr> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index bb3674e..2b02ef4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -28,7 +28,7 @@ AC_ARG_WITH([systemd], - [], [with_systemd=check]) - have_systemd=no - if test "x$with_systemd" != "xno"; then -- PKG_CHECK_MODULES(systemd, [libsystemd-daemon], -+ PKG_CHECK_MODULES(systemd, [libsystemd], - [AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is available]) - have_systemd=yes], - have_systemd=no) Copied: fcgiwrap/repos/community-x86_64/link-with-libsystemd-instead-of-libsystemd-daemon.patch (from rev 482557, fcgiwrap/trunk/link-with-libsystemd-instead-of-libsystemd-daemon.patch) =================================================================== --- link-with-libsystemd-instead-of-libsystemd-daemon.patch (rev 0) +++ link-with-libsystemd-instead-of-libsystemd-daemon.patch 2019-06-21 01:52:14 UTC (rev 482558) @@ -0,0 +1,26 @@ +From e621d6acb538d717d6767429e3f85190019a887d Mon Sep 17 00:00:00 2001 +From: Thomas Claveirole <thomas.claveir...@green-communications.fr> +Date: Mon, 18 Jul 2016 15:06:59 +0200 +Subject: [PATCH] configure.ac: Check for libsystemd, not libsystemd-daemon. + +Newer versions of systemd do not provide libsystemd-daemon anymore. +Therefore, use libsystemd instead. + +Signed-off-by: Thomas Claveirole <thomas.claveir...@green-communications.fr> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index bb3674e..2b02ef4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -28,7 +28,7 @@ AC_ARG_WITH([systemd], + [], [with_systemd=check]) + have_systemd=no + if test "x$with_systemd" != "xno"; then +- PKG_CHECK_MODULES(systemd, [libsystemd-daemon], ++ PKG_CHECK_MODULES(systemd, [libsystemd], + [AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is available]) + have_systemd=yes], + have_systemd=no)