From unknown Sun Jun 15 01:10:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#32163] [PATCH] gnu: ecryptfs-utils: Patch hardcoded-paths. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jul 2018 08:00:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 32163 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 32163@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15316415491188 (code B ref -1); Sun, 15 Jul 2018 08:00:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 Jul 2018 07:59:09 +0000 Received: from localhost ([127.0.0.1]:60459 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1febvr-0000Iy-NC for submit@debbugs.gnu.org; Sun, 15 Jul 2018 03:59:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57694) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1febvp-0000IR-T1 for submit@debbugs.gnu.org; Sun, 15 Jul 2018 03:59:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1febvj-0008D2-Hm for submit@debbugs.gnu.org; Sun, 15 Jul 2018 03:58:56 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:58468) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1febvj-0008Cv-Dx for submit@debbugs.gnu.org; Sun, 15 Jul 2018 03:58:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48664) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1febvh-0007rf-Si for guix-patches@gnu.org; Sun, 15 Jul 2018 03:58:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1febve-0008BA-Q8 for guix-patches@gnu.org; Sun, 15 Jul 2018 03:58:53 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:36432 helo=mta-1.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1febve-0008AY-Ix for guix-patches@gnu.org; Sun, 15 Jul 2018 03:58:50 -0400 Received: by mta-1.openmailbox.org (Postfix, from userid 20002) id AB5674E0008; Sun, 15 Jul 2018 09:58:48 +0200 (CEST) From: Brendan Tildesley Date: Sun, 15 Jul 2018 17:58:41 +1000 Message-Id: <20180715075841.28725-1-brendan.tildesley@openmailbox.org> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) * gnu/packages/linux.scm: (ecryptfs-utils): Patch hardcoded-paths. [arguments]: Add the phase patch-hardcoded-paths to replace various hardc= oded 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 =C2=A9 2017 nee ;;; Copyright =C2=A9 2017 Dave Love ;;; Copyright =C2=A9 2018 Pierre-Antoine Rouby +;;; Copyright =C2=A9 2018 Brendan Tildesley ;;; ;;; 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.deskto= p.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") --=20 2.18.0 From unknown Sun Jun 15 01:10:10 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Brendan Tildesley Subject: bug#32163: closed (Re: [bug#32163] [PATCH] gnu: ecryptfs-utils: Patch hardcoded-paths.) Message-ID: References: <8736wjut9d.fsf@gnu.org> <20180715075841.28725-1-brendan.tildesley@openmailbox.org> X-Gnu-PR-Message: they-closed 32163 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 32163@debbugs.gnu.org Date: Mon, 16 Jul 2018 14:54:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1531752842-30156-1" This is a multi-part message in MIME format... ------------=_1531752842-30156-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #32163: [PATCH] gnu: ecryptfs-utils: Patch hardcoded-paths. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 32163@debbugs.gnu.org. --=20 32163: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D32163 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1531752842-30156-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 32163-done) by debbugs.gnu.org; 16 Jul 2018 14:53:30 +0000 Received: from localhost ([127.0.0.1]:43917 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ff4sT-0007pg-Ti for submit@debbugs.gnu.org; Mon, 16 Jul 2018 10:53:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ff4sS-0007pQ-Jw for 32163-done@debbugs.gnu.org; Mon, 16 Jul 2018 10:53:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ff4sK-0005kK-F5 for 32163-done@debbugs.gnu.org; Mon, 16 Jul 2018 10:53:23 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47254) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ff4sK-0005kB-9s; Mon, 16 Jul 2018 10:53:20 -0400 Received: from [193.50.110.117] (port=46044 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ff4sJ-0008NC-Oo; Mon, 16 Jul 2018 10:53:20 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Brendan Tildesley Subject: Re: [bug#32163] [PATCH] gnu: ecryptfs-utils: Patch hardcoded-paths. References: <20180715075841.28725-1-brendan.tildesley@openmailbox.org> Date: Mon, 16 Jul 2018 16:53:18 +0200 In-Reply-To: <20180715075841.28725-1-brendan.tildesley@openmailbox.org> (Brendan Tildesley's message of "Sun, 15 Jul 2018 17:58:41 +1000") Message-ID: <8736wjut9d.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 32163-done Cc: 32163-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Brendan Tildesley 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'. ------------=_1531752842-30156-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 15 Jul 2018 07:59:09 +0000 Received: from localhost ([127.0.0.1]:60459 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1febvr-0000Iy-NC for submit@debbugs.gnu.org; Sun, 15 Jul 2018 03:59:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57694) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1febvp-0000IR-T1 for submit@debbugs.gnu.org; Sun, 15 Jul 2018 03:59:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1febvj-0008D2-Hm for submit@debbugs.gnu.org; Sun, 15 Jul 2018 03:58:56 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:58468) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1febvj-0008Cv-Dx for submit@debbugs.gnu.org; Sun, 15 Jul 2018 03:58:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48664) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1febvh-0007rf-Si for guix-patches@gnu.org; Sun, 15 Jul 2018 03:58:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1febve-0008BA-Q8 for guix-patches@gnu.org; Sun, 15 Jul 2018 03:58:53 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:36432 helo=mta-1.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1febve-0008AY-Ix for guix-patches@gnu.org; Sun, 15 Jul 2018 03:58:50 -0400 Received: by mta-1.openmailbox.org (Postfix, from userid 20002) id AB5674E0008; Sun, 15 Jul 2018 09:58:48 +0200 (CEST) From: Brendan Tildesley To: guix-patches@gnu.org Subject: [PATCH] gnu: ecryptfs-utils: Patch hardcoded-paths. Date: Sun, 15 Jul 2018 17:58:41 +1000 Message-Id: <20180715075841.28725-1-brendan.tildesley@openmailbox.org> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) * gnu/packages/linux.scm: (ecryptfs-utils): Patch hardcoded-paths. [arguments]: Add the phase patch-hardcoded-paths to replace various hardc= oded 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 =C2=A9 2017 nee ;;; Copyright =C2=A9 2017 Dave Love ;;; Copyright =C2=A9 2018 Pierre-Antoine Rouby +;;; Copyright =C2=A9 2018 Brendan Tildesley ;;; ;;; 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.deskto= p.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") --=20 2.18.0 ------------=_1531752842-30156-1--