Re: fcgiwrap doesn't see gzip

[Oleg Pykhalov <go.wigust@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 703 bytes --]

Hello Ludovic,

Thank you for directing me.

ludo@gnu.org (Ludovic Courtès) writes:

>> I guess, the issue is because fcgiwrap process environment PATH only
>> contains /gnu/store/…-shadow-4.5/sbin which doesn't include gzip.
>
> There are two possible fixes:
>
>   1. Set PATH in the execution environment of ‘fcgiwrap’, just like the
>      ‘mcron-shepherd-services’ procedure does;
>
>   2. Add a build phase for ‘fcgiwrap’ that ensures that it refers to
>      ‘gzip’ by its absolute file name.
>
> I have a preference for #2 because it’s more robust.
>
> Could you look into it?

Yes, but I solve this via cgit package.  I believe it's good enough. :-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: [PATCH] gnu: cgit: Patch absolute file names. --]
[-- Type: text/x-patch, Size: 2192 bytes --]

From 9c9ad2a3716b7ad97e80028e0424f3af6c3759a6 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Tue, 12 Dec 2017 18:29:23 +0300
Subject: [PATCH] gnu: cgit: Patch absolute file names.

* gnu/packages/version-control.scm (cgit): Patch absolute file names.
---
 gnu/packages/version-control.scm | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 6820b28ba..654c63671 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -539,6 +539,21 @@ collaboration using typical untrusted file hosts or services.")
              (zero? (system*
                      "tar" "--strip-components=1" "-C" "git" "-xf"
                      (assoc-ref inputs "git:src")))))
+         (add-after 'unpack 'patch-absolute-file-names
+           (lambda* (#:key inputs #:allow-other-keys)
+             (define (quoted-path input path)
+               (string-append "\"" input path "\""))
+             (substitute* "ui-snapshot.c"
+               (("\"gzip\"")
+                (quoted-path (assoc-ref %build-inputs "gzip")
+                             "/bin/gzip"))
+               (("\"bzip2\"")
+                (quoted-path (assoc-ref %build-inputs "bzip2")
+                             "/bin/bzip2"))
+               (("\"xz\"")
+                (quoted-path (assoc-ref %build-inputs "xz")
+                             "/bin/xz")))
+             #t))
          (delete 'configure) ; no configure script
          (add-after 'build 'build-man
            (lambda* (#:key make-flags #:allow-other-keys)
@@ -559,7 +574,10 @@ collaboration using typical untrusted file hosts or services.")
                     #t)))))))
     (native-inputs
      ;; For building manpage.
-     `(("asciidoc" ,asciidoc)))
+     `(("asciidoc" ,asciidoc)
+       ("gzip" ,gzip)
+       ("bzip2" ,bzip2)
+       ("xz" ,xz)))
     (inputs
      `(;; Cgit directly accesses some internal Git interfaces that changed in
        ;; Git 2.12.  Try removing this special input and using the source of the
-- 
2.15.1


[-- Attachment #1.3: Type: text/plain, Size: 7 bytes --]


Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]