From patchwork Tue Mar 12 13:48:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dale Mellor X-Patchwork-Id: 61686 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 757B227BBEA; Tue, 12 Mar 2024 13:49:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8741127BBE2 for ; Tue, 12 Mar 2024 13:49:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rk2VV-0001B8-Pc; Tue, 12 Mar 2024 09:49:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rk2VT-0001Ah-P9 for guix-patches@gnu.org; Tue, 12 Mar 2024 09:49:28 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rk2VT-0005By-AO for guix-patches@gnu.org; Tue, 12 Mar 2024 09:49:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rk2W1-0006UM-OP for guix-patches@gnu.org; Tue, 12 Mar 2024 09:50:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69269] [PATCH v3] gnu: fcgiwrap: Update to 1.1.0-1.2870d27, switch to a fork. Resent-From: Dale Mellor Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Mar 2024 13:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69269 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69269@debbugs.gnu.org Cc: iyzsong@member.fsf.org, guix-devel-0brg6b@rdmp.org X-Debbugs-Original-Cc: =?utf-8?b?5a6L5paH5q2m?= , Dale Mellor , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171025135924811 (code B ref -1); Tue, 12 Mar 2024 13:50:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Mar 2024 13:49:19 +0000 Received: from localhost ([127.0.0.1]:42117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rk2VK-0006Rz-8k for submit@debbugs.gnu.org; Tue, 12 Mar 2024 09:49:19 -0400 Received: from lists.gnu.org ([209.51.188.17]:37160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rk2VG-0006RP-DG for submit@debbugs.gnu.org; Tue, 12 Mar 2024 09:49:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rk2Uf-0000rt-VD for guix-patches@gnu.org; Tue, 12 Mar 2024 09:48:38 -0400 Received: from [195.15.247.228] (helo=rdmp.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rk2Ud-0004u8-Mh for guix-patches@gnu.org; Tue, 12 Mar 2024 09:48:37 -0400 Received: from [127.0.0.1] (helo=localhost.localdomain) by rdmp.org with esmtp (Exim 4.96.1) (envelope-from ) id 1rk2UZ-0006nI-1a; Tue, 12 Mar 2024 13:48:31 +0000 From: Dale Mellor Date: Tue, 12 Mar 2024 13:48:28 +0000 Message-ID: <20240312134828.2226117-1-guix-devel-0brg6b@rdmp.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 195.15.247.228 (failed) Received-SPF: pass client-ip=195.15.247.228; envelope-from=guix-devel-0brg6b@rdmp.org; helo=rdmp.org X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: 宋文武 * gnu/packages/web.scm (fcgiwrap): Update to 1.1.0-1.2870d27. [source]: Switch to https://github.com/flu0r1ne/fcgiwrap. Dale Mellor: - This looks good to me - Checked the change in the delta and the forked repository, both are simple and clean - The functionality works as advertised, and fixes the original problem that 'herd restart fcgiwrap' now works properly Reviewed-by: Dale Mellor Change-Id: Ia9e7b911a0c8bde50924e3398f915f945cf955a6 --- gnu/packages/web.scm | 68 +++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index ddc673896b..f163802a60 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1109,40 +1109,44 @@ (define-public fcgi (license (license:non-copyleft "file://LICENSE.TERMS")))) (define-public fcgiwrap - (package - (name "fcgiwrap") - (version "1.1.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gnosek/fcgiwrap") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1ryw66h9aazi83amk8l7ha8k5g0c7qvk5g6jv376a1ws9xk2qw6f")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ; no tests included - #:make-flags (list "CC=gcc") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-CFLAGS - ;; Remove broken options unconditionally added to CFLAGS. - (lambda _ - (substitute* "configure.ac" - ((" -Werror") "")) - #t))))) - (native-inputs - (list autoconf automake pkg-config)) - (inputs - (list fcgi)) - (home-page "https://nginx.localdomain.pl/wiki/FcgiWrap") - (synopsis "Simple server for running CGI applications over FastCGI") - (description "Fcgiwrap is a simple server for running CGI applications + (let ((commit "2870d2729a3930988f0041e2d78fec672e69afac") + (revision "1")) + (package + (name "fcgiwrap") + (version (git-version "1.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + ;; Upstream last updated in 2015, this forked version has better + ;; socket cleanup. + (url "https://github.com/flu0r1ne/fcgiwrap") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rkpp4apfhdcrmym3pcpqlncd0r4fyr3pa45i8g6x4p38b4azmmm")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests included + #:make-flags (list "CC=gcc") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-CFLAGS + ;; Remove broken options unconditionally added to CFLAGS. + (lambda _ + (substitute* "configure.ac" + ((" -Werror") "")) + #t))))) + (native-inputs + (list autoconf automake pkg-config)) + (inputs + (list fcgi)) + (home-page "https://nginx.localdomain.pl/wiki/FcgiWrap") + (synopsis "Simple server for running CGI applications over FastCGI") + (description "Fcgiwrap is a simple server for running CGI applications over FastCGI. It hopes to provide clean CGI support to Nginx (and other web servers that may need it).") - (license license:expat))) + (license license:expat)))) (define-public starman (package