[debbugs-tracker] bug#32163: closed ([PATCH] gnu: ecryptfs-utils: Patch hardcoded-paths.)

[GNU bug Tracking System]

Your message dated Mon, 16 Jul 2018 16:53:18 +0200
with message-id <address@hidden>
and subject line Re: [bug#32163] [PATCH] gnu: ecryptfs-utils: Patch 
hardcoded-paths.
has caused the debbugs.gnu.org bug report #32163,
regarding [PATCH] gnu: ecryptfs-utils: Patch hardcoded-paths.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
32163: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=32163
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: ecryptfs-utils: Patch hardcoded-paths.
>
>
>
>
> Date: 
>
> Sun, 15 Jul 2018 17:58:41 +1000
>
>
>
>
> * gnu/packages/linux.scm: (ecryptfs-utils): Patch hardcoded-paths.
> [arguments]: Add the phase patch-hardcoded-paths to replace various hardcoded
> references to /bin, /sbin, ... with direct references to the store.
> [inputs]: Add missing inputs util-linux, cryptsetup, and lvm2 so that the
> correct paths can be found and the resulting code works.
> ---
>  gnu/packages/linux.scm | 43 +++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 42 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
> index 2ce0f56b8..277c2465b 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -28,6 +28,7 @@
>  ;;; Copyright © 2017 nee <address@hidden>
>  ;;; Copyright © 2017 Dave Love <address@hidden>
>  ;;; Copyright © 2018 Pierre-Antoine Rouby <address@hidden>
> +;;; Copyright © 2018 Brendan Tildesley <address@hidden>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -59,6 +60,7 @@
>    #:use-module (gnu packages calendar)
>    #:use-module (gnu packages check)
>    #:use-module (gnu packages crypto)
> +  #:use-module (gnu packages cryptsetup)
>    #:use-module (gnu packages compression)
>    #:use-module (gnu packages databases)
>    #:use-module (gnu packages datastructures)
> @@ -3699,7 +3701,43 @@ as used on certified hardware security devices.")
>           "0zwq19siiwf09h7lwa7n7mgmrr8cxifp45lmwgcfr8c1gviv6b0i"))))
>      (build-system gnu-build-system)
>      (arguments
> -     `(#:configure-flags (list "--disable-pywrap")))
> +     `(#:configure-flags (list "--disable-pywrap")
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'patch-source-shebangs 'patch-hardcoded-paths
> +           (lambda* (#:key inputs outputs #:allow-other-keys)
> +             (let ((out (assoc-ref outputs "out"))
> +                   (utils-linux (assoc-ref inputs "utils-linux"))
> +                   (cryptsetup (assoc-ref inputs "cryptsetup"))
> +                   (linux-pam (assoc-ref inputs "linux-pam"))
> +                   (lvm2 (assoc-ref inputs "lvm2")))
> +               (substitute* '("src/utils/ecryptfs-mount-private"
> +                              "src/utils/ecryptfs-umount-private"
> +                              "src/utils/ecryptfs-setup-private"
> +                              "src/utils/mount.ecryptfs.c"
> +                              "src/pam_ecryptfs/pam_ecryptfs.c"
> +                              "src/desktop/ecryptfs-mount-private.desktop.in"
> +                              "src/utils/ecryptfs-setup-swap")
> +                 (("/bin/mount")
> +                  (string-append utils-linux "/bin/mount"))
> +                 (("/bin/umount")
> +                  (string-append utils-linux "/bin/umount"))
> +                 (("/sbin/mount.ecryptfs_private")
> +                  (string-append out "/sbin/mount.ecryptfs_private"))
> +                 (("/sbin/umount.ecryptfs_private")
> +                  (string-append out "/sbin/umount.ecryptfs_private"))
> +                 (("/usr/bin/ecryptfs-mount-private")
> +                  (string-append out "/bin/ecryptfs-mount-private"))
> +                 (("/usr/bin/ecryptfs-rewrite-file")
> +                  (string-append out "/bin/ecryptfs-rewrite-file"))
> +                 (("/usr/bin/ecryptfs-setup-private")
> +                  (string-append out "/bin/ecryptfs-setup-private"))
> +                 (("/sbin/cryptsetup")
> +                  (string-append cryptsetup "/sbin/cryptsetup"))
> +                 (("/sbin/unix_chkpwd")
> +                  (string-append linux-pam "/sbin/unix_chkpwd"))
> +                 (("/sbin/dmsetup")
> +                  (string-append lvm2 "/sbin/dmsetup")))))))))
>      (native-inputs
>       `(("intltool" ,intltool)
>         ("perl" ,perl)                   ; for pod2man
> @@ -3707,6 +3745,9 @@ as used on certified hardware security devices.")
>      (inputs
>       `(("keyutils" ,keyutils)
>         ("linux-pam" ,linux-pam)
> +       ("utils-linux" ,util-linux)
> +       ("cryptsetup" ,cryptsetup)
> +       ("lvm2" ,lvm2)
>         ("nss" ,nss)))
>      (home-page "http://ecryptfs.org/";)
>      (synopsis "eCryptfs cryptographic file system utilities")
> -- 
> 2.18.0
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#32163] [PATCH] gnu: ecryptfs-utils: Patch hardcoded-paths.
>
>
>
>
> Date: 
>
> Mon, 16 Jul 2018 16:53:18 +0200
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux)
>
>
>
>
> Brendan Tildesley <address@hidden> skribis:
>
> > * gnu/packages/linux.scm: (ecryptfs-utils): Patch hardcoded-paths.
> > [arguments]: Add the phase patch-hardcoded-paths to replace various hardcoded
> > references to /bin, /sbin, ... with direct references to the store.
> > [inputs]: Add missing inputs util-linux, cryptsetup, and lvm2 so that the
> > correct paths can be found and the resulting code works.
>
> Applied, thanks!
>
> Ludo'.
>
>
> --- End Message ---