From unknown Sun Jun 15 08:52:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26730: [PATCH] Fix bzip2 utilities Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 May 2017 09:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 26730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26730@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149363221322231 (code B ref -1); Mon, 01 May 2017 09:51:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 May 2017 09:50:13 +0000 Received: from localhost ([127.0.0.1]:48501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d57y9-0005mV-AP for submit@debbugs.gnu.org; Mon, 01 May 2017 05:50:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58605) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d57y8-0005mK-2B for submit@debbugs.gnu.org; Mon, 01 May 2017 05:50:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d57y1-0001Xb-UQ for submit@debbugs.gnu.org; Mon, 01 May 2017 05:50:06 -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.5 required=5.0 tests=BAYES_05 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:36344) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d57y1-0001XX-Qd for submit@debbugs.gnu.org; Mon, 01 May 2017 05:50:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d57xz-0003Mq-Ix for guix-patches@gnu.org; Mon, 01 May 2017 05:50:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d57xv-0001WH-LX for guix-patches@gnu.org; Mon, 01 May 2017 05:50:03 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:49489 helo=mira.cbaines.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d57xv-0001W9-Ck for guix-patches@gnu.org; Mon, 01 May 2017 05:49:59 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 5B45C13E3CA; Mon, 1 May 2017 10:49:57 +0100 (BST) Received: from [192.168.15.219] (my83-216-89-206.cust.relish.net [83.216.89.206]) by mira.cbaines.net (Postfix) with ESMTPSA id 2C24F13E3C9 for ; Mon, 1 May 2017 10:49:56 +0100 (BST) From: Christopher Baines Message-ID: Date: Mon, 1 May 2017 10:49:50 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="gDXNw4IbHb6ee67NXuaTdqqReBP8P5T3J" 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: -4.0 (----) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --gDXNw4IbHb6ee67NXuaTdqqReBP8P5T3J Content-Type: multipart/mixed; boundary="k6Oq8FPbJ9H5IbIW5xGOafNatWKf3FFwo"; protected-headers="v1" From: Christopher Baines To: guix-patches@gnu.org Message-ID: Subject: [PATCH] Fix bzip2 utilities --k6Oq8FPbJ9H5IbIW5xGOafNatWKf3FFwo Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable The bzip2 package includes wrappers around diff, grep and less/more. These shell scripts currently include /usr/bin (and sometimes /bin) on the PATH, and therefore fail if any of the commands that they rely on cannot be found. By substituting /usr/bin (and /bin) for the appropriate package paths, these scripts work much more reliably. I had some issues with bzmore which uses more from util-linux, I think there might be a circular dependency in the Guix package tree, as I get a VM stack overflow when including util-linux as a input to bzip2. Note that as the bzip2 package is used by so many other packages, any non-superficial change to it probably means rebuilding the world. Below is a script, and two invocations of it, showing first what happens with the unaltered package, and then the package with the modifications I describe above. #!/bin/sh set -x bzip2 < /etc/shells > shells.bz2 bzcmp shells.bz2 shells.bz2 bzdiff shells.bz2 shells.bz2 bzegrep bash shells.bz2 bzfgrep bash shells.bz2 bzgrep bash shells.bz2 bzless shells.bz2 bzmore shells.bz2 =E2=86=92 PATH=3D/gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/= bin =2E/test.sh + bzip2 + bzcmp shells.bz2 shells.bz2 /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzcmp: line 16: sed: command not found /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzcmp: line 40: mktemp: command not found cannot create a temporary file + bzdiff shells.bz2 shells.bz2 /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzdiff: line 16: sed: command not found /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzdiff: line 40: mktemp: command not found cannot create a temporary file + bzegrep bash shells.bz2 /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzegrep: line 11: sed: command not found /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzegrep: line 43: sed: command not found /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzegrep: line 63: grep: command not found + bzfgrep bash shells.bz2 /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzfgrep: line 11: sed: command not found /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzfgrep: line 43: sed: command not found /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzfgrep: line 63: grep: command not found + bzgrep bash shells.bz2 /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzgrep: line 11: sed: command not found /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzgrep: line 43: sed: command not found /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzgrep: line 63: grep: command not found + bzless shells.bz2 /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzless: line 8: sed: command not found ------> shells.bz2 <------ /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzless: line 55: more: command not found + bzmore shells.bz2 /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzmore: line 8: sed: command not found ------> shells.bz2 <------ /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzmore: line 55: more: command not found =E2=86=92 PATH=3D/gnu/store/i3zkljbz6ryqdlfc9gnpcjg964inp9l3-bzip2-1.0.6/= bin =2E/test.sh + bzip2 + bzcmp shells.bz2 shells.bz2 + bzdiff shells.bz2 shells.bz2 + bzegrep bash shells.bz2 /run/current-system/profile/bin/bash /gnu/store/nylrl843mkfdwzz8cd5iabsib37vqc1j-bash-4.4.A/bin/bash + bzfgrep bash shells.bz2 /run/current-system/profile/bin/bash /gnu/store/nylrl843mkfdwzz8cd5iabsib37vqc1j-bash-4.4.A/bin/bash + bzgrep bash shells.bz2 /run/current-system/profile/bin/bash /gnu/store/nylrl843mkfdwzz8cd5iabsib37vqc1j-bash-4.4.A/bin/bash + bzless shells.bz2 ------> shells.bz2 <------ + bzmore shells.bz2 ------> shells.bz2 <------ /gnu/store/i3zkljbz6ryqdlfc9gnpcjg964inp9l3-bzip2-1.0.6/bin/bzmore: line 55: more: command not found --k6Oq8FPbJ9H5IbIW5xGOafNatWKf3FFwo-- --gDXNw4IbHb6ee67NXuaTdqqReBP8P5T3J Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQJFBAEBCAAvFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlkHBL4RHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XcPWw/8CcpSJT7Et3hAyO0K/Agmdng1l0H8/XgG CPhsMRJLVi3qDAuofIesWlUWt8EtGs8USK/O5QBFkVzH+CSByZnM2HqLjwS/j7pR 59bM6tWp1bGNPPK5Jv7ns2oDR+mbYmn0kMKlJlOxJgNDaiC9eVO43ubYdrtJL22y T4z/vDuTwqyzN/BujLoCbJDQNVveHLeXKDgJf20Lg/3wKVOJXzSVsM6COU29AwHt gpq53q6AHxVUplEt3tOBHgjH4ryTTI5cCv9Tlz9qr8hYztjNjJZ+olVWH401l+cw n5QyJ/lDygRb7xfXWlJ+1SFwkXY4Vp6X16G5aB1jWSp0kKW+ULfeIfem0o5YEMh+ GXT6GWojv3NfWytwdyb9RtGv9hpT37hvbbi9aJx5yZDqctTFLPc7Kdl/Nh7/yTar rVJr7aGK36hwOklNf5SsTwjqHoPfcIQDmF1eDiRUggWkBxjeoK5lVNEt+Wzb5CTz 6vRgvZOxEYFUdzVFnjLnayOkwTIhJ5bRO3kBUXYlWXu4xB3qb8LmpjJtHdlfzdru 5P+G33SqX/o31s469wCBuIQQa/QJ6F/jQdrgVN6xnv3e/I8As+gETYB3OzEUneGb ohUy5tIw3O4CpAUq+aQ1HLIRuZDCymo8EfBFU9TZroRl0hXRZ6SnJlE6r4QbVmp8 MWBGmrieL5o= =2ngn -----END PGP SIGNATURE----- --gDXNw4IbHb6ee67NXuaTdqqReBP8P5T3J-- From unknown Sun Jun 15 08:52:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26730: [PATCH 2/2] gnu: bzip2: Patch bzip2 utilities. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 May 2017 10:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26730@debbugs.gnu.org Received: via spool by 26730-submit@debbugs.gnu.org id=B26730.149363342224105 (code B ref 26730); Mon, 01 May 2017 10:11:01 +0000 Received: (at 26730) by debbugs.gnu.org; 1 May 2017 10:10:22 +0000 Received: from localhost ([127.0.0.1]:48531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d58He-0006Gi-2F for submit@debbugs.gnu.org; Mon, 01 May 2017 06:10:22 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:49884 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d58Hb-0006GS-Mz for 26730@debbugs.gnu.org; Mon, 01 May 2017 06:10:20 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id A24B313E3C9; Mon, 1 May 2017 11:10:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (my83-216-89-206.cust.relish.net [83.216.89.206]) by mira.cbaines.net (Postfix) with ESMTPSA id 5834D13E3CA for <26730@debbugs.gnu.org>; Mon, 1 May 2017 11:10:16 +0100 (BST) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id be5319fc for <26730@debbugs.gnu.org>; Mon, 1 May 2017 10:10:15 +0000 (UTC) From: Christopher Baines Date: Mon, 1 May 2017 11:10:15 +0100 Message-Id: <20170501101015.30567-2-mail@cbaines.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170501101015.30567-1-mail@cbaines.net> References: <20170501101015.30567-1-mail@cbaines.net> X-Spam-Score: -0.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: -0.0 (/) * gnu/packages/compression.scm (bzip2)[inputs]: Add grep, less, diffutils, sed and coreutils. [arguments]: Add patch-script phase. --- gnu/packages/compression.scm | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 031ecaad4..fe32b95bd 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -46,6 +46,7 @@ #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages check) + #:use-module (gnu packages less) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -218,6 +219,12 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in (base32 "1kfrc7f0ja9fdn6j1y6yir6li818npy6217hvr3wzmnmzhs8z152")))) (build-system gnu-build-system) + (inputs + `(("grep" ,grep) + ("less" ,less) + ("diff" ,diffutils) + ("sed" ,sed) + ("coreutils" ,coreutils))) (arguments `(#:modules ((guix build gnu-build-system) (guix build utils) @@ -252,7 +259,42 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in base libdir) (copy-file file (string-append libdir "/" base)))) - (find-files "." "^libbz2\\.so")))))) + (find-files "." "^libbz2\\.so"))))) + (add-after 'install-shared-lib 'patch-scripts + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (grep (assoc-ref inputs "grep")) + (less (assoc-ref inputs "less")) + (diff (assoc-ref inputs "diff")) + (sed (assoc-ref inputs "sed")) + (coreutils (assoc-ref inputs "coreutils"))) + (substitute* (string-append out "/bin/bzgrep") + (("/usr/bin:\\$PATH") + (string-join + (list (string-append grep "/bin") + (string-append out "/bin") + (string-append sed "/bin")) + ":"))) + (substitute* (string-append out "/bin/bzmore") + (("/usr/bin") ;; Don't remove $PATH, as if bzmore is to work, + ;; more must be on the PATH in the + ;; environment. util-linux, which contains more + ;; is not included here as there is a potential + ;; issues with circular dependencies. + (string-join + (list (string-append less "/bin") + (string-append sed "/bin") + (string-append out "/bin")) + ":"))) + (substitute* (string-append out "/bin/bzdiff") + (("/usr/bin:/bin:\\$PATH") + (string-join + (list (string-append diff "/bin") + (string-append coreutils "/bin") + (string-append out "/bin") + (string-append sed "/bin")) + ":")) + (("/bin/rm") "rm")))))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) -- 2.12.2 From unknown Sun Jun 15 08:52:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26730: [PATCH 1/2] gnu: bzip2: Use 'modify-phases' syntax. References: In-Reply-To: Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 May 2017 10:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26730@debbugs.gnu.org Received: via spool by 26730-submit@debbugs.gnu.org id=B26730.149363342224111 (code B ref 26730); Mon, 01 May 2017 10:11:02 +0000 Received: (at 26730) by debbugs.gnu.org; 1 May 2017 10:10:22 +0000 Received: from localhost ([127.0.0.1]:48533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d58He-0006Gk-9b for submit@debbugs.gnu.org; Mon, 01 May 2017 06:10:22 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:49883 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d58Hb-0006GR-Mn for 26730@debbugs.gnu.org; Mon, 01 May 2017 06:10:20 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 8A87613E3CB; Mon, 1 May 2017 11:10:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (my83-216-89-206.cust.relish.net [83.216.89.206]) by mira.cbaines.net (Postfix) with ESMTPSA id 29F4813E3C9 for <26730@debbugs.gnu.org>; Mon, 1 May 2017 11:10:16 +0100 (BST) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 5e5bb6fb for <26730@debbugs.gnu.org>; Mon, 1 May 2017 10:10:15 +0000 (UTC) From: Christopher Baines Date: Mon, 1 May 2017 11:10:14 +0100 Message-Id: <20170501101015.30567-1-mail@cbaines.net> X-Mailer: git-send-email 2.12.2 X-Spam-Score: -0.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: -0.0 (/) * gnu/packages/compression.scm (bzip2)[arguments]: Use 'modify-phases' syntax. --- gnu/packages/compression.scm | 130 +++++++++++++++++++------------------------ 1 file changed, 58 insertions(+), 72 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 4793755c2..031ecaad4 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -207,84 +207,70 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in (home-page "https://www.gnu.org/software/gzip/"))) (define-public bzip2 - (let ((build-shared-lib - ;; Build a shared library. - '(lambda* (#:key inputs #:allow-other-keys) - (patch-makefile-SHELL "Makefile-libbz2_so") - (zero? (system* "make" "-f" "Makefile-libbz2_so")))) - (install-shared-lib - '(lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (libdir (string-append out "/lib"))) - (for-each (lambda (file) - (let ((base (basename file))) - (format #t "installing `~a' to `~a'~%" - base libdir) - (copy-file file - (string-append libdir "/" base)))) - (find-files "." "^libbz2\\.so"))))) - (set-cross-environment - '(lambda* (#:key target #:allow-other-keys) - (substitute* (find-files "." "Makefile") - (("CC=.*$") - (string-append "CC = " target "-gcc\n")) - (("AR=.*$") - (string-append "AR = " target "-ar\n")) - (("RANLIB=.*$") - (string-append "RANLIB = " target "-ranlib\n")) - (("^all:(.*)test" _ prerequisites) - ;; Remove 'all' -> 'test' dependency. - (string-append "all:" prerequisites "\n")))))) - (package - (name "bzip2") - (version "1.0.6") - (source (origin - (method url-fetch) - (uri (string-append "http://www.bzip.org/" version "/bzip2-" - version ".tar.gz")) - (sha256 - (base32 - "1kfrc7f0ja9fdn6j1y6yir6li818npy6217hvr3wzmnmzhs8z152")))) - (build-system gnu-build-system) - (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-1)) - #:phases - ,(if (%current-target-system) - - ;; Cross-compilation: use the cross tools. - `(alist-cons-before - 'build 'build-shared-lib ,build-shared-lib - (alist-cons-after - 'install 'install-shared-lib ,install-shared-lib - (alist-replace 'configure ,set-cross-environment - %standard-phases))) - - ;; Native compilation: build the shared library. - `(alist-cons-before - 'build 'build-shared-lib ,build-shared-lib - (alist-cons-after - 'install 'install-shared-lib ,install-shared-lib - (alist-delete 'configure %standard-phases)))) + (package + (name "bzip2") + (version "1.0.6") + (source (origin + (method url-fetch) + (uri (string-append "http://www.bzip.org/" version "/bzip2-" + version ".tar.gz")) + (sha256 + (base32 + "1kfrc7f0ja9fdn6j1y6yir6li818npy6217hvr3wzmnmzhs8z152")))) + (build-system gnu-build-system) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key target #:allow-other-keys) + (if ,(%current-target-system) + ;; Cross-compilation: use the cross tools. + (substitute* (find-files "." "Makefile") + (("CC=.*$") + (string-append "CC = " target "-gcc\n")) + (("AR=.*$") + (string-append "AR = " target "-ar\n")) + (("RANLIB=.*$") + (string-append "RANLIB = " target "-ranlib\n")) + (("^all:(.*)test" _ prerequisites) + ;; Remove 'all' -> 'test' dependency. + (string-append "all:" prerequisites "\n")))))) + (add-before 'build 'build-shared-lib + (lambda* (#:key inputs #:allow-other-keys) + (patch-makefile-SHELL "Makefile-libbz2_so") + (zero? (system* "make" "-f" "Makefile-libbz2_so")))) + (add-after 'install 'install-shared-lib + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (libdir (string-append out "/lib"))) + (for-each (lambda (file) + (let ((base (basename file))) + (format #t "installing `~a' to `~a'~%" + base libdir) + (copy-file file + (string-append libdir "/" base)))) + (find-files "." "^libbz2\\.so")))))) - #:make-flags (list (string-append "PREFIX=" - (assoc-ref %outputs "out"))) + #:make-flags (list (string-append "PREFIX=" + (assoc-ref %outputs "out"))) - ;; Don't attempt to run the tests when cross-compiling. - ,@(if (%current-target-system) - '(#:tests? #f) - '()))) - (synopsis "High-quality data compression program") - (description - "bzip2 is a freely available, patent free (see below), high-quality data + ;; Don't attempt to run the tests when cross-compiling. + ,@(if (%current-target-system) + '(#:tests? #f) + '()))) + (synopsis "High-quality data compression program") + (description + "bzip2 is a freely available, patent free (see below), high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression.") - (license (license:non-copyleft "file://LICENSE" - "See LICENSE in the distribution.")) - (home-page "http://www.bzip.org/")))) + (license (license:non-copyleft "file://LICENSE" + "See LICENSE in the distribution.")) + (home-page "http://www.bzip.org/"))) (define-public lbzip2 (package -- 2.12.2 From unknown Sun Jun 15 08:52:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26730: [PATCH] Fix bzip2 utilities Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines , 26730@debbugs.gnu.org Received: via spool by 26730-submit@debbugs.gnu.org id=B26730.14940851319546 (code B ref 26730); Sat, 06 May 2017 15:39:01 +0000 Received: (at 26730) by debbugs.gnu.org; 6 May 2017 15:38:51 +0000 Received: from localhost ([127.0.0.1]:58365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71nG-0002Tt-TM for submit@debbugs.gnu.org; Sat, 06 May 2017 11:38:51 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:33131) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71nF-0002Tm-A0 for 26730@debbugs.gnu.org; Sat, 06 May 2017 11:38:49 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 4B69720AC6; Sat, 6 May 2017 11:38:47 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sat, 06 May 2017 11:38:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=AT19Fth8tBuRDQqSFUZKB2usRTEF+R7Ax8DNcygl4 YU=; b=NP7QKyVdEpCoBy8xbRi++FqGVKV+yRiNwTYzl6JZsiTWoOglJNze2FMFI 5YvKsPRBxJmZ/a1FRBFqB2DFLKku70FuBm9athe/ikwlYWzHWIqrVnSvAUeWhKau Q1DLZJ16EwliWMKhhw4qJJiAFsCiHl5HKjZ96BwDJFl2S10JURWVoHx/WI+QMHIb fbu+3lL6KVtoHMWdEzZy38jAgPWb2AdCBD2OK9MMV26fpSxuI4HEZrVs904v8vIE nWMXBkJFReKEIHY/54uwDG+OxOjdPGdTFoXmBpGpfyBRkP3ZHOUUxpMLIbNXC7kR s4W4rWGM1+QKYH9b//MAi2+EOKlnA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=AT19Fth8tBuRDQqSFU ZKB2usRTEF+R7Ax8DNcygl4YU=; b=qWobt/288UgY6yd9JrTBJ2cCDa5M8H+yG/ Krk/yn2jK/j2y8XP+qaJ4anSvoY88q/O+qp3udK74GZHGb9LjLV/oYC3Xk1R+HMA FQ8KlKhq72+VwrUvTbeabf/Z2lX/Rt5UKtrp93C2len427K68AftLehzLrwjl/Eu 5LuMthITm5WDvjZKimZ27RaUFnQhcaT+8OKIAQsWsU7vBAuwf4MbrY8gaBC4jjDX U7cBqigsXv+ToAqHMpDNdZpUJ42FK52W0tTGnkPMxcGzvz8B3utuUqGd+A5N+4M+ jlqr1sOFVA+qe/EEjjx+2AVOWxAuILj5nbZd6gq5+5SmFuIJ9QGg== X-ME-Sender: X-Sasl-enc: j3iVq6gKMwEnvBCQG75i0FC3n5yAgPJY4QGQH9L7Ik/+ 1494085126 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id D32407E21D; Sat, 6 May 2017 11:38:46 -0400 (EDT) From: Marius Bakke In-Reply-To: References: User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sat, 06 May 2017 17:38:45 +0200 Message-ID: <87mvaqyoze.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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: -0.7 (/) --=-=-= Content-Type: text/plain Christopher Baines writes: > The bzip2 package includes wrappers around diff, grep and less/more. > These shell scripts currently include /usr/bin (and sometimes /bin) on > the PATH, and therefore fail if any of the commands that they rely on > cannot be found. > > By substituting /usr/bin (and /bin) for the appropriate package paths, > these scripts work much more reliably. Most of these dependencies are available in environments where the bz* tools will be executed. I think it would be better to simply remove the absolute /usr/bin and /bin references such that grep, sed etc invocations are picked up from PATH instead. The "xz*" equivalent tools seem to do that. The rationale being that bzip2 is often needed early in bootstrapping, and adding those inputs would complicate the dependency tree. Although I admittedly haven't looked at how bzip2 is used in Guix bootstrap. Thoughts? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkN7gUACgkQoqBt8qM6 VPqMmwgAr+2rlrBWze3dWudqZkIEVgwRgmrj2pu9/Q8Kryd+GrmZuEbK9Kzzp4Ac I3Oowd+fDgr2m0Pa9vr7sHPLZtxZE7g9WC+uzGI6vDSOAdn7v96BV1Q9qkbDN03C Vlm82Cl8dIMGoXYUuNur6QU7C8RFnO/riGaPOOtRoLVqsNfqxEIcFwPUMeg/TmmF bdkkvH+yTJozdRqKZE2bFhj11QJZBhSCwBPbj/Y2NoBw6RPvT36PmVNrfD2Xv1EX W1hY3fSB87uzypyWblXylOscvlvygrITx41iBfeMQU6sPNHPd1d4bsYFH06DraTG w8C9G56vnLeqpo9UW+E2Txj9SpAaXw== =rQv+ -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 15 08:52:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26730: [PATCH] Fix bzip2 utilities Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 May 2017 10:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke Cc: Christopher Baines , 26730@debbugs.gnu.org Received: via spool by 26730-submit@debbugs.gnu.org id=B26730.149432511713647 (code B ref 26730); Tue, 09 May 2017 10:19:02 +0000 Received: (at 26730) by debbugs.gnu.org; 9 May 2017 10:18:37 +0000 Received: from localhost ([127.0.0.1]:60649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d82E1-0003Y2-3A for submit@debbugs.gnu.org; Tue, 09 May 2017 06:18:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d82E0-0003Xr-2c for 26730@debbugs.gnu.org; Tue, 09 May 2017 06:18:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d82Dr-0007G2-Oz for 26730@debbugs.gnu.org; Tue, 09 May 2017 06:18:30 -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.0 required=5.0 tests=BAYES_20,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:37833) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d82Dr-0007Fv-La; Tue, 09 May 2017 06:18:27 -0400 Received: from [193.50.110.181] (port=35718 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d82Dr-0001mD-0Z; Tue, 09 May 2017 06:18:27 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <87mvaqyoze.fsf@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 20 =?UTF-8?Q?Flor=C3=A9al?= an 225 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Tue, 09 May 2017 12:18:24 +0200 In-Reply-To: <87mvaqyoze.fsf@fastmail.com> (Marius Bakke's message of "Sat, 06 May 2017 17:38:45 +0200") Message-ID: <87tw4u8han.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) 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] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.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 (-----) Marius Bakke skribis: > Christopher Baines writes: > >> The bzip2 package includes wrappers around diff, grep and less/more. >> These shell scripts currently include /usr/bin (and sometimes /bin) on >> the PATH, and therefore fail if any of the commands that they rely on >> cannot be found. >> >> By substituting /usr/bin (and /bin) for the appropriate package paths, >> these scripts work much more reliably. > > Most of these dependencies are available in environments where the bz* > tools will be executed. I think it would be better to simply remove the > absolute /usr/bin and /bin references such that grep, sed etc > invocations are picked up from PATH instead. Agreed. Otherwise we could end up retaining references to the bootstrap Bash and Coreutils, for instance (remember that bzip2 is built early on, in (gnu packages commencement)). Ludo=E2=80=99. From unknown Sun Jun 15 08:52:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26730: [PATCH] gnu: bzip2: Patch bzip2 utilities. References: In-Reply-To: Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 May 2017 06:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26730@debbugs.gnu.org Received: via spool by 26730-submit@debbugs.gnu.org id=B26730.14948282688589 (code B ref 26730); Mon, 15 May 2017 06:05:02 +0000 Received: (at 26730) by debbugs.gnu.org; 15 May 2017 06:04:28 +0000 Received: from localhost ([127.0.0.1]:45384 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dA97M-0002ET-5E for submit@debbugs.gnu.org; Mon, 15 May 2017 02:04:28 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:41326 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dA97J-0002EK-FZ for 26730@debbugs.gnu.org; Mon, 15 May 2017 02:04:26 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id CD4CB13E3CE; Mon, 15 May 2017 07:04:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (my83-216-88-88.cust.relish.net [83.216.88.88]) by mira.cbaines.net (Postfix) with ESMTPSA id 89C2813E3B4 for <26730@debbugs.gnu.org>; Mon, 15 May 2017 07:04:23 +0100 (BST) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 077473f5 for <26730@debbugs.gnu.org>; Mon, 15 May 2017 06:04:22 +0000 (UTC) From: Christopher Baines Date: Mon, 15 May 2017 07:04:22 +0100 Message-Id: <20170515060422.1512-1-mail@cbaines.net> X-Mailer: git-send-email 2.13.0 X-Spam-Score: -0.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: -0.0 (/) * gnu/packages/compression.scm (bzip2)[inputs]: Add grep, less, diffutils, sed and coreutils. [arguments]: Add patch-script phase. --- gnu/packages/compression.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 7d3a62e2f..829fd5053 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -252,7 +252,12 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in base libdir) (copy-file file (string-append libdir "/" base)))) - (find-files "." "^libbz2\\.so")))))) + (find-files "." "^libbz2\\.so"))))) + (add-after 'install-shared-lib 'patch-scripts + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* (string-append out "/bin/bzdiff") + (("/bin/rm") "rm")))))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) -- 2.13.0 From unknown Sun Jun 15 08:52:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26730: [PATCH] gnu: bzip2: Patch bzip2 utilities. References: In-Reply-To: Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 May 2017 06:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26730@debbugs.gnu.org Received: via spool by 26730-submit@debbugs.gnu.org id=B26730.14948284288835 (code B ref 26730); Mon, 15 May 2017 06:08:01 +0000 Received: (at 26730) by debbugs.gnu.org; 15 May 2017 06:07:08 +0000 Received: from localhost ([127.0.0.1]:45388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dA99w-0002IR-Il for submit@debbugs.gnu.org; Mon, 15 May 2017 02:07:08 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:41330 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dA99v-0002IK-Pq for 26730@debbugs.gnu.org; Mon, 15 May 2017 02:07:08 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 7D1A013E3CE; Mon, 15 May 2017 07:07:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (my83-216-88-88.cust.relish.net [83.216.88.88]) by mira.cbaines.net (Postfix) with ESMTPSA id 42FC513E3B4 for <26730@debbugs.gnu.org>; Mon, 15 May 2017 07:07:07 +0100 (BST) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 2c9aff34 for <26730@debbugs.gnu.org>; Mon, 15 May 2017 06:07:06 +0000 (UTC) From: Christopher Baines Date: Mon, 15 May 2017 07:07:06 +0100 Message-Id: <20170515060706.1758-1-mail@cbaines.net> X-Mailer: git-send-email 2.13.0 X-Spam-Score: -0.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: -0.0 (/) * gnu/packages/compression.scm (bzip2)[arguments]: Add patch-script phase to remove absolute reference to /bin/rm. --- gnu/packages/compression.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 7d3a62e2f..829fd5053 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -252,7 +252,12 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in base libdir) (copy-file file (string-append libdir "/" base)))) - (find-files "." "^libbz2\\.so")))))) + (find-files "." "^libbz2\\.so"))))) + (add-after 'install-shared-lib 'patch-scripts + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* (string-append out "/bin/bzdiff") + (("/bin/rm") "rm")))))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) -- 2.13.0 From unknown Sun Jun 15 08:52:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26730: [PATCH] Fix bzip2 utilities Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 May 2017 06:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Marius Bakke Cc: 26730@debbugs.gnu.org Received: via spool by 26730-submit@debbugs.gnu.org id=B26730.14948284898933 (code B ref 26730); Mon, 15 May 2017 06:09:02 +0000 Received: (at 26730) by debbugs.gnu.org; 15 May 2017 06:08:09 +0000 Received: from localhost ([127.0.0.1]:45392 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dA9Au-0002K1-T2 for submit@debbugs.gnu.org; Mon, 15 May 2017 02:08:09 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:41334 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dA9At-0002Ju-Ni for 26730@debbugs.gnu.org; Mon, 15 May 2017 02:08:08 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 6D48D13E3CE; Mon, 15 May 2017 07:08:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from [192.168.15.219] (my83-216-88-88.cust.relish.net [83.216.88.88]) by mira.cbaines.net (Postfix) with ESMTPSA id DE4FF13E3B4; Mon, 15 May 2017 07:08:06 +0100 (BST) References: <87mvaqyoze.fsf@fastmail.com> <87tw4u8han.fsf@gnu.org> From: Christopher Baines Message-ID: Date: Mon, 15 May 2017 07:08:02 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <87tw4u8han.fsf@gnu.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="n2HOLMWwq0uQ9Eo1TFkcLjc9OQ5gPC9Jd" X-Spam-Score: -0.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: -0.0 (/) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --n2HOLMWwq0uQ9Eo1TFkcLjc9OQ5gPC9Jd Content-Type: multipart/mixed; boundary="jTrOdOOcTKJu5l0gp7udXMxDH8p09vVSG"; protected-headers="v1" From: Christopher Baines To: =?UTF-8?Q?Ludovic_Court=c3=a8s?= , Marius Bakke Cc: 26730@debbugs.gnu.org Message-ID: Subject: Re: bug#26730: [PATCH] Fix bzip2 utilities References: <87mvaqyoze.fsf@fastmail.com> <87tw4u8han.fsf@gnu.org> In-Reply-To: <87tw4u8han.fsf@gnu.org> --jTrOdOOcTKJu5l0gp7udXMxDH8p09vVSG Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 09/05/17 11:18, Ludovic Court=C3=A8s wrote: > Marius Bakke skribis: >=20 >> Christopher Baines writes: >> >>> The bzip2 package includes wrappers around diff, grep and less/more. >>> These shell scripts currently include /usr/bin (and sometimes /bin) o= n >>> the PATH, and therefore fail if any of the commands that they rely on= >>> cannot be found. >>> >>> By substituting /usr/bin (and /bin) for the appropriate package paths= , >>> these scripts work much more reliably. >> >> Most of these dependencies are available in environments where the bz*= >> tools will be executed. I think it would be better to simply remove th= e >> absolute /usr/bin and /bin references such that grep, sed etc >> invocations are picked up from PATH instead. >=20 > Agreed. Otherwise we could end up retaining references to the bootstra= p > Bash and Coreutils, for instance (remember that bzip2 is built early on= , > in (gnu packages commencement)). Ok, I've sent a couple of updates for the 2nd patch. --jTrOdOOcTKJu5l0gp7udXMxDH8p09vVSG-- --n2HOLMWwq0uQ9Eo1TFkcLjc9OQ5gPC9Jd Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQJFBAEBCAAvFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlkZRcYRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XexTw//QmLGtrAer4+QqDLJ4inG85JduP6HT47y gKVwHCvNrDjJbIUO15+UT3VkLQdhKg9kg4ckKeZs79sUvtLkGccxLYNs9UWsWSv+ lUCXIgKhfYXNV1E4ko2ASqyLrqv94XwkuNpe8iiqW1Z5Z791pwcoR7gpVH/oSbUH FCmFATuSjZNdTfbfP+xhRr4nZ6XcmJ8WLyjgqdNegTFTgudYjs3ullM1KWdiVgBD 6jx+Ra2PaSd/bzTx9PFRUDnmmSRRD1m7O0Vaz0p2gOEt0A25QGuAPycIxivRpvLd DOoFL+/y6DCHPedSqdNJuOX+wTu/pQu2byFMjbA89LZdziRRA4Ti11UoJErmBAng ot8Z0hQwVagclh7WQNiifktNMmqTNHs4WiB8zS6RcDg+YWvPs86knxmdFISeBCMp LVDpKQA6Ak8IM35ceOYOhbvi+O6YHdHiE0TB8CX6Kkm9X7rkh+BrN26jDGsoLJhI 70henfk8U0+mLfEKoBvgZITV/bC1iKR6bWWu8Y96TbZERXG9Yd2NbzDC69cSn11q gfQhCIXOH28cg9EoTIBIb5QmZLVEkYZLcSXOAv83Zn48n/P5aFAIMO+KxeKMHZNr qeGRhf9BJHjifw/GOew8z0CCf+oXbjQ/GbHewnfPNiXmBEPifEr86R9nRCTqq55L r3ioUSdxQdM= =z+Lk -----END PGP SIGNATURE----- --n2HOLMWwq0uQ9Eo1TFkcLjc9OQ5gPC9Jd-- From unknown Sun Jun 15 08:52:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26730: [PATCH 1/2] gnu: bzip2: Use 'modify-phases' syntax. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 May 2017 15:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines , 26730@debbugs.gnu.org Received: via spool by 26730-submit@debbugs.gnu.org id=B26730.14948630113623 (code B ref 26730); Mon, 15 May 2017 15:44:02 +0000 Received: (at 26730) by debbugs.gnu.org; 15 May 2017 15:43:31 +0000 Received: from localhost ([127.0.0.1]:46738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAI9f-0000wH-Qn for submit@debbugs.gnu.org; Mon, 15 May 2017 11:43:31 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:49795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAI9O-0000vs-KP for 26730@debbugs.gnu.org; Mon, 15 May 2017 11:43:26 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id CAB2F2084E; Mon, 15 May 2017 11:43:08 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 15 May 2017 11:43:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=quIfhvGUGmkdGhbwMPn17s2tjQ+KzJVN6jobZiP6D H4=; b=X872rD2AR5ocsYYyWR0P+wGbjqwXF6Cc2mUP4mnTxaRVjzZyrSmM3Z7GB K7NT7lEDAAxKuIHWqDX6Ilny4K16ygAVPjJhgzn7aNHi4DBXMBUZ0JfefmIjBTrK v3/KdNfs3qkX2Vt5tq+5iOKSHya1riqINFINgVxdD7IyXgMMFXP996AOKt8MRKsN DIlOYOw251XQHjqGDfhewd5000pv4E4/gmQQWRxbCqYF4T89PbkI3/s+ggpEnkNV 3/gvUPt9motw4ihwi8UA1YfgDsGqfQsvN/V+ZWsgBNPDncNQmKDghZQ+eceFCs+X Nc1/LKFx4PbWuK4QafH/q3BX7uz+w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=quIfhvGUGmkdGhbwMP n17s2tjQ+KzJVN6jobZiP6DH4=; b=S6H85sEb3BPEA+vuwp4I6aOOJ/uBkr5Tb1 Ctl8RuIVaxcqnOldQNDFAydOfaC8sZeZj+T0lKHy0tzv9zLScE0xr0kJnFU+iwBw 2iyfqlnA4lszKTcDDbNUpoSh23riMWdJLR2aa0TPb3271ywTjjmOwLpsCIBnzI6e PeGuS9vLFwamHM/rsxgnV7zTMLrhw8Z8CKxM/klddUIiksggsJMFx8fbRT30a9m9 6UDyOoolYH5xeggpUPImgLviXUGTOrzCBHC3sie61zIlZQNSI/4NYdMbSom9NZSX yZeCnfYjVr/jpTNURX9UGUs6uKD+15FjFT2B0lkRSfSm6/ADtUxw== X-ME-Sender: X-Sasl-enc: My9K2TleyCO4IB799THU3pM9FZ3FajPyF7/SzItvz7SV 1494862988 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 629A97E2B0; Mon, 15 May 2017 11:43:08 -0400 (EDT) From: Marius Bakke In-Reply-To: <20170501101015.30567-1-mail@cbaines.net> References: <20170501101015.30567-1-mail@cbaines.net> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Mon, 15 May 2017 17:43:06 +0200 Message-ID: <87tw4mf7n9.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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: -0.7 (/) --=-=-= Content-Type: text/plain Christopher Baines writes: > * gnu/packages/compression.scm (bzip2)[arguments]: Use 'modify-phases' syntax. Thanks a lot for sorting this out! I only have a few nitpicks: > + (replace 'configure > + (lambda* (#:key target #:allow-other-keys) > + (if ,(%current-target-system) > + ;; Cross-compilation: use the cross tools. > + (substitute* (find-files "." "Makefile") > + (("CC=.*$") > + (string-append "CC = " target "-gcc\n")) > + (("AR=.*$") > + (string-append "AR = " target "-ar\n")) > + (("RANLIB=.*$") > + (string-append "RANLIB = " target "-ranlib\n")) > + (("^all:(.*)test" _ prerequisites) > + ;; Remove 'all' -> 'test' dependency. > + (string-append "all:" prerequisites "\n")))))) Noob question: What is returned here when (%current-target-system) is false? Can we make it more explicit? We try to make sure all phases end on a #t. > + (add-after 'install 'install-shared-lib > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (libdir (string-append out "/lib"))) > + (for-each (lambda (file) > + (let ((base (basename file))) > + (format #t "installing `~a' to `~a'~%" > + base libdir) > + (copy-file file > + (string-append libdir "/" base)))) > + (find-files "." "^libbz2\\.so")))))) Similarly, if you send an updated patch, can you add a #t at the end of this phase, since "for-each" has an unspecified return value? Otherwise I can do so in a follow-up commit. Apart from these "added-value" nitpicks LGTM. Tricky one! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkZzIoACgkQoqBt8qM6 VPrJJggAzVo0lxfOdXomUfkNNE4fxq4lK3zVziqrFSxma9E/pBdjsNsPuWYaWMht pFVWoRWy8cWvWXu+kXdQ9LfDHIr8aG+OczpeNAyHhGbRN5+CzidZEv54+cpIeYB8 KWCzzAzh7Dku1Ga2N3s8aP3cD52Hhk43pSegE6KRlmYjS3Ojh5Cw12TI8QAXgbPT wvkHVwWOZs3oFbAA4rTqse1O5uHDRnMCYFiJmH9FSkmlpuVSUnoxhTbaC50j8Wym nCAjD6NJjduQKixqxK3qZa5Rk5EE+zSXfcUlEhoIGK7sggdT3cNwGkMk9NIVZczC B0oHiYlrdKPm69EaEQVeoEGPNJqK8A== =bgPn -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 15 08:52:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26730: [PATCH] gnu: bzip2: Patch bzip2 utilities. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 May 2017 15:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines , 26730@debbugs.gnu.org Received: via spool by 26730-submit@debbugs.gnu.org id=B26730.14948631763946 (code B ref 26730); Mon, 15 May 2017 15:47:01 +0000 Received: (at 26730) by debbugs.gnu.org; 15 May 2017 15:46:16 +0000 Received: from localhost ([127.0.0.1]:46744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAICK-00011X-Rp for submit@debbugs.gnu.org; Mon, 15 May 2017 11:46:16 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:58597) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAICF-00011H-CW for 26730@debbugs.gnu.org; Mon, 15 May 2017 11:46:11 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 21FC120A03; Mon, 15 May 2017 11:46:07 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Mon, 15 May 2017 11:46:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=Hqx5bSbw5brBiTKESt0uZeZRFXS07ZW10n8Ww3ar2 Tg=; b=n1TeK5hTTzJCr07xr2gSwfLq8rfXv3lHLEtCZ0NCxPgozu6cjDiZ7HXGe FeN9PGxuJ76fIMkA7w9tnBYA9M9sEcNudGYPrbANoiDI2MiMu1jh0xohR8H8FR+H orDbqY7r2Cp9J7ddA/jxOEIfz+XdzfN7srL/2S4Q29gsnslwLkFvEiRGHFTsIOma Jvzr9OAlVQ/sGuzfbSiWVBGoUi7t5H9GxwlF1cWW16WdhsNlRsEMErerMoLwAcvo 5FMSlcwvxDvQlQkr3/2E3a6Y4rXg5rKGdjmDtS04dhF1kSL5Oso5XFZZccju7u4j LnFe4T0olrZ5rhG0S4snamqmKwvdg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=Hqx5bSbw5brBiTKESt 0uZeZRFXS07ZW10n8Ww3ar2Tg=; b=eXjxKv5CU17ZQKSOjOutOiIgCU70mauOmU DjWe5Uz5LmGQaYYuIL7Ezk7Es+Pzc5mgc8X2RA1i0bVeQcE8a6v5OJp62sdNSH8i pxsqFBXAa32r1gxEazxsrrIP4HfXwesjr83Avc7FpF46nvRl8hFuZg7BKExZ4G12 ZAratk/8tQfs1gdGQnXRBiv7/r+1lJT6DsBmxuP0j1v5n1QBbrF0/Mrqm6tHVQjR vb5pySMMx3MtUK7HvZFGA5goEbqvrxyf4aM+MJ3xL0aiUKaY3Fuv815BrvRGfTZx 4ty6TByOS7L++KAaQrrLIljPlAMM6vokjd/0FAgfQNfW0BG/i5fA== X-ME-Sender: X-Sasl-enc: a9t8/DMXe8S52TlwoSgGSpIfb2AoVaOKk7wzhIekG05J 1494863166 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id AF8B67E2B0; Mon, 15 May 2017 11:46:06 -0400 (EDT) From: Marius Bakke In-Reply-To: <20170515060706.1758-1-mail@cbaines.net> References: <20170515060706.1758-1-mail@cbaines.net> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Mon, 15 May 2017 17:46:05 +0200 Message-ID: <87r2zqf7ia.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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: -0.7 (/) --=-=-= Content-Type: text/plain Christopher Baines writes: > * gnu/packages/compression.scm (bzip2)[arguments]: Add patch-script phase to > remove absolute reference to /bin/rm. Thanks for catching this! (substitute* ...) has an unspecified return value, so I'll add a #t at the end of this new phase before pushing. Waiting for feedback on the modify-phases patch first. We still have ~two weeks until core-updates starts rolling again, so no rush ;-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkZzT0ACgkQoqBt8qM6 VPoACgf/Suf0rWcOky8XF5LPreilkpfYQeoTJZvCSkp8b3kyp4ZY0ntXS1LEmVtF /jfwh09+x76rEJMISJbK7YWlseZYJ49b/c4gcSbGf9J6a8y6AziMzFWi/AICAxAX HXKM2Zjfa7lIO5JoDGTQbdGv5sxbty1/1NPiEl4T26MHrZachlQptbxBWh3c+REv 8NP7D/WBvtqMWliMPEdiNSNcmNGAKs7sA4ILPqYsPsBlLTK1VnYrm9JY0Ul9YLyH dS/w//k39K+M3Hn4u9Et4+/aZ2t1dkpCjHJc+XOki5UjyivYBZ1fTaPei11UFhZm Zu/FSmh/kuvmVv7fJWhjkV+VbCk+WQ== =70pC -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 15 08:52:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26730: [PATCH 3/3] gnu: bzip2: Patch bzip2 utilities. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 May 2017 20:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26730@debbugs.gnu.org Received: via spool by 26730-submit@debbugs.gnu.org id=B26730.14949669986396 (code B ref 26730); Tue, 16 May 2017 20:37:02 +0000 Received: (at 26730) by debbugs.gnu.org; 16 May 2017 20:36:38 +0000 Received: from localhost ([127.0.0.1]:49190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAjCv-0001f5-LF for submit@debbugs.gnu.org; Tue, 16 May 2017 16:36:37 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:52018 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAjCt-0001ej-Gf for 26730@debbugs.gnu.org; Tue, 16 May 2017 16:36:36 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 88D8713E3B4; Tue, 16 May 2017 21:36:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (my83-216-88-20.cust.relish.net [83.216.88.20]) by mira.cbaines.net (Postfix) with ESMTPSA id 4BBFF13D066 for <26730@debbugs.gnu.org>; Tue, 16 May 2017 21:36:34 +0100 (BST) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id f1a882ce for <26730@debbugs.gnu.org>; Tue, 16 May 2017 20:36:33 +0000 (UTC) From: Christopher Baines Date: Tue, 16 May 2017 21:36:33 +0100 Message-Id: <20170516203633.7819-3-mail@cbaines.net> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170516203633.7819-1-mail@cbaines.net> References: <20170516203633.7819-1-mail@cbaines.net> X-Spam-Score: -0.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: -0.0 (/) * gnu/packages/compression.scm (bzip2)[arguments]: Add patch-script phase to remove absolute reference to /bin/rm. --- gnu/packages/compression.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 0ce9d88b7..3d2adcda5 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -254,6 +254,12 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in (copy-file file (string-append libdir "/" base)))) (find-files "." "^libbz2\\.so"))) + #t)) + (add-after 'install-shared-lib 'patch-scripts + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* (string-append out "/bin/bzdiff") + (("/bin/rm") "rm"))) #t))) #:make-flags (list (string-append "PREFIX=" -- 2.13.0 From unknown Sun Jun 15 08:52:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26730: [PATCH 2/3] gnu: bzip2: Add explicit return value for 2 phases. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 May 2017 20:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26730@debbugs.gnu.org Received: via spool by 26730-submit@debbugs.gnu.org id=B26730.14949669986403 (code B ref 26730); Tue, 16 May 2017 20:37:03 +0000 Received: (at 26730) by debbugs.gnu.org; 16 May 2017 20:36:38 +0000 Received: from localhost ([127.0.0.1]:49192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAjCv-0001f7-Un for submit@debbugs.gnu.org; Tue, 16 May 2017 16:36:38 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:52020 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAjCt-0001em-HW for 26730@debbugs.gnu.org; Tue, 16 May 2017 16:36:36 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 4F48613E3CF; Tue, 16 May 2017 21:36:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (my83-216-88-20.cust.relish.net [83.216.88.20]) by mira.cbaines.net (Postfix) with ESMTPSA id 0EB6F13E3B4 for <26730@debbugs.gnu.org>; Tue, 16 May 2017 21:36:33 +0100 (BST) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 432f110d for <26730@debbugs.gnu.org>; Tue, 16 May 2017 20:36:33 +0000 (UTC) From: Christopher Baines Date: Tue, 16 May 2017 21:36:32 +0100 Message-Id: <20170516203633.7819-2-mail@cbaines.net> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170516203633.7819-1-mail@cbaines.net> References: <20170516203633.7819-1-mail@cbaines.net> X-Spam-Score: -0.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: -0.0 (/) * gnu/packages/compression.scm (bzip2)[arguments]: Add explicit return values to the configure and build-shared-lib phases. --- gnu/packages/compression.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 7d3a62e2f..0ce9d88b7 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -237,7 +237,8 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in (string-append "RANLIB = " target "-ranlib\n")) (("^all:(.*)test" _ prerequisites) ;; Remove 'all' -> 'test' dependency. - (string-append "all:" prerequisites "\n")))))) + (string-append "all:" prerequisites "\n"))) + #t))) (add-before 'build 'build-shared-lib (lambda* (#:key inputs #:allow-other-keys) (patch-makefile-SHELL "Makefile-libbz2_so") @@ -252,7 +253,8 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in base libdir) (copy-file file (string-append libdir "/" base)))) - (find-files "." "^libbz2\\.so")))))) + (find-files "." "^libbz2\\.so"))) + #t))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) -- 2.13.0 From unknown Sun Jun 15 08:52:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26730: [PATCH 1/3] gnu: bzip2: Use 'modify-phases' syntax. References: In-Reply-To: Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 May 2017 20:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26730@debbugs.gnu.org Received: via spool by 26730-submit@debbugs.gnu.org id=B26730.14949670006412 (code B ref 26730); Tue, 16 May 2017 20:37:03 +0000 Received: (at 26730) by debbugs.gnu.org; 16 May 2017 20:36:40 +0000 Received: from localhost ([127.0.0.1]:49194 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAjCy-0001fL-6N for submit@debbugs.gnu.org; Tue, 16 May 2017 16:36:40 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:52019 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAjCt-0001el-Gf for 26730@debbugs.gnu.org; Tue, 16 May 2017 16:36:36 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 2FC0613E3CE; Tue, 16 May 2017 21:36:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (my83-216-88-20.cust.relish.net [83.216.88.20]) by mira.cbaines.net (Postfix) with ESMTPSA id A16BC13D066 for <26730@debbugs.gnu.org>; Tue, 16 May 2017 21:36:33 +0100 (BST) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id c476cd14 for <26730@debbugs.gnu.org>; Tue, 16 May 2017 20:36:33 +0000 (UTC) From: Christopher Baines Date: Tue, 16 May 2017 21:36:31 +0100 Message-Id: <20170516203633.7819-1-mail@cbaines.net> X-Mailer: git-send-email 2.13.0 X-Spam-Score: -0.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: -0.0 (/) * gnu/packages/compression.scm (bzip2)[arguments]: Use 'modify-phases' syntax. --- gnu/packages/compression.scm | 130 +++++++++++++++++++------------------------ 1 file changed, 58 insertions(+), 72 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 11db2a66f..7d3a62e2f 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -207,84 +207,70 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in (home-page "https://www.gnu.org/software/gzip/"))) (define-public bzip2 - (let ((build-shared-lib - ;; Build a shared library. - '(lambda* (#:key inputs #:allow-other-keys) - (patch-makefile-SHELL "Makefile-libbz2_so") - (zero? (system* "make" "-f" "Makefile-libbz2_so")))) - (install-shared-lib - '(lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (libdir (string-append out "/lib"))) - (for-each (lambda (file) - (let ((base (basename file))) - (format #t "installing `~a' to `~a'~%" - base libdir) - (copy-file file - (string-append libdir "/" base)))) - (find-files "." "^libbz2\\.so"))))) - (set-cross-environment - '(lambda* (#:key target #:allow-other-keys) - (substitute* (find-files "." "Makefile") - (("CC=.*$") - (string-append "CC = " target "-gcc\n")) - (("AR=.*$") - (string-append "AR = " target "-ar\n")) - (("RANLIB=.*$") - (string-append "RANLIB = " target "-ranlib\n")) - (("^all:(.*)test" _ prerequisites) - ;; Remove 'all' -> 'test' dependency. - (string-append "all:" prerequisites "\n")))))) - (package - (name "bzip2") - (version "1.0.6") - (source (origin - (method url-fetch) - (uri (string-append "http://www.bzip.org/" version "/bzip2-" - version ".tar.gz")) - (sha256 - (base32 - "1kfrc7f0ja9fdn6j1y6yir6li818npy6217hvr3wzmnmzhs8z152")))) - (build-system gnu-build-system) - (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-1)) - #:phases - ,(if (%current-target-system) - - ;; Cross-compilation: use the cross tools. - `(alist-cons-before - 'build 'build-shared-lib ,build-shared-lib - (alist-cons-after - 'install 'install-shared-lib ,install-shared-lib - (alist-replace 'configure ,set-cross-environment - %standard-phases))) - - ;; Native compilation: build the shared library. - `(alist-cons-before - 'build 'build-shared-lib ,build-shared-lib - (alist-cons-after - 'install 'install-shared-lib ,install-shared-lib - (alist-delete 'configure %standard-phases)))) + (package + (name "bzip2") + (version "1.0.6") + (source (origin + (method url-fetch) + (uri (string-append "http://www.bzip.org/" version "/bzip2-" + version ".tar.gz")) + (sha256 + (base32 + "1kfrc7f0ja9fdn6j1y6yir6li818npy6217hvr3wzmnmzhs8z152")))) + (build-system gnu-build-system) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key target #:allow-other-keys) + (if ,(%current-target-system) + ;; Cross-compilation: use the cross tools. + (substitute* (find-files "." "Makefile") + (("CC=.*$") + (string-append "CC = " target "-gcc\n")) + (("AR=.*$") + (string-append "AR = " target "-ar\n")) + (("RANLIB=.*$") + (string-append "RANLIB = " target "-ranlib\n")) + (("^all:(.*)test" _ prerequisites) + ;; Remove 'all' -> 'test' dependency. + (string-append "all:" prerequisites "\n")))))) + (add-before 'build 'build-shared-lib + (lambda* (#:key inputs #:allow-other-keys) + (patch-makefile-SHELL "Makefile-libbz2_so") + (zero? (system* "make" "-f" "Makefile-libbz2_so")))) + (add-after 'install 'install-shared-lib + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (libdir (string-append out "/lib"))) + (for-each (lambda (file) + (let ((base (basename file))) + (format #t "installing `~a' to `~a'~%" + base libdir) + (copy-file file + (string-append libdir "/" base)))) + (find-files "." "^libbz2\\.so")))))) - #:make-flags (list (string-append "PREFIX=" - (assoc-ref %outputs "out"))) + #:make-flags (list (string-append "PREFIX=" + (assoc-ref %outputs "out"))) - ;; Don't attempt to run the tests when cross-compiling. - ,@(if (%current-target-system) - '(#:tests? #f) - '()))) - (synopsis "High-quality data compression program") - (description - "bzip2 is a freely available, patent free (see below), high-quality data + ;; Don't attempt to run the tests when cross-compiling. + ,@(if (%current-target-system) + '(#:tests? #f) + '()))) + (synopsis "High-quality data compression program") + (description + "bzip2 is a freely available, patent free (see below), high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression.") - (license (license:non-copyleft "file://LICENSE" - "See LICENSE in the distribution.")) - (home-page "http://www.bzip.org/")))) + (license (license:non-copyleft "file://LICENSE" + "See LICENSE in the distribution.")) + (home-page "http://www.bzip.org/"))) (define-public lbzip2 (package -- 2.13.0 From unknown Sun Jun 15 08:52:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26730: [PATCH] gnu: bzip2: Patch bzip2 utilities. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 May 2017 20:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke , 26730@debbugs.gnu.org Received: via spool by 26730-submit@debbugs.gnu.org id=B26730.14949672926858 (code B ref 26730); Tue, 16 May 2017 20:42:02 +0000 Received: (at 26730) by debbugs.gnu.org; 16 May 2017 20:41:32 +0000 Received: from localhost ([127.0.0.1]:49202 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAjHf-0001mY-Ut for submit@debbugs.gnu.org; Tue, 16 May 2017 16:41:32 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:52037 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAjHe-0001mQ-8p for 26730@debbugs.gnu.org; Tue, 16 May 2017 16:41:30 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id C29DA13E3B4; Tue, 16 May 2017 21:41:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from [192.168.15.219] (my83-216-88-20.cust.relish.net [83.216.88.20]) by mira.cbaines.net (Postfix) with ESMTPSA id 2398113D066; Tue, 16 May 2017 21:41:29 +0100 (BST) References: <20170515060706.1758-1-mail@cbaines.net> <87r2zqf7ia.fsf@fastmail.com> From: Christopher Baines Message-ID: <86b6d0ba-0046-eb08-af93-b4b22f66179a@cbaines.net> Date: Tue, 16 May 2017 21:41:24 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <87r2zqf7ia.fsf@fastmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="gAjXk0wQ5u7HFdxh02gCu5WB2KNpEcoQi" X-Spam-Score: -0.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: -0.0 (/) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --gAjXk0wQ5u7HFdxh02gCu5WB2KNpEcoQi Content-Type: multipart/mixed; boundary="RqnPlb6vKwbAEGctoxCsbj0ae8mdhwfhS"; protected-headers="v1" From: Christopher Baines To: Marius Bakke , 26730@debbugs.gnu.org Message-ID: <86b6d0ba-0046-eb08-af93-b4b22f66179a@cbaines.net> Subject: Re: bug#26730: [PATCH] gnu: bzip2: Patch bzip2 utilities. References: <20170515060706.1758-1-mail@cbaines.net> <87r2zqf7ia.fsf@fastmail.com> In-Reply-To: <87r2zqf7ia.fsf@fastmail.com> --RqnPlb6vKwbAEGctoxCsbj0ae8mdhwfhS Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 15/05/17 16:46, Marius Bakke wrote: > Christopher Baines writes: >=20 >> * gnu/packages/compression.scm (bzip2)[arguments]: Add patch-script ph= ase to >> remove absolute reference to /bin/rm. >=20 > Thanks for catching this! (substitute* ...) has an unspecified return > value, so I'll add a #t at the end of this new phase before pushing. >=20 > Waiting for feedback on the modify-phases patch first. We still have > ~two weeks until core-updates starts rolling again, so no rush ;-) I've resent the patches with these changes, just in case that helps. Thanks for your quick feedback, Chris --RqnPlb6vKwbAEGctoxCsbj0ae8mdhwfhS-- --gAjXk0wQ5u7HFdxh02gCu5WB2KNpEcoQi Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQJFBAEBCAAvFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlkbY/gRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XeMmQ/+JwquicqDEOKzK4hflOKp+k5cSlPH1OpP JHZR9sKeiPuLvadBKj+3Z7LWU0dgGmqLeF/UzKBOiZphz04kPxDFhwLWcZ0+0i6T JfucU+UgqVVar+5mulwKIV813KMd6P/hyU2/ZKhc4nG0QbzwfYbZjQMhl5rAs4dP VxhDXyEIKmGqNstX73KWj3fHiPQzTmpnm4qdMR8frxekgfoK+085OmjpEp5dh5sr UKE1GJFHcg+vWRz6IqRVLKXJekJnu4DFN378w44kAP4Dlig9GXoOxkvr8KXT5jBI BKqZjN9toRgzTBfW0Dd1zxQAn+f27f2qsGtfjm3sYXMTDU2K27X85cBKGVai/jNq jjJ3plVAz9Ts+flS1vjjuWLIUhzxDWWmHFyFUHQie1y6gZorIMChVH384MclB2wz s4kodUe8p8m3Ypd2YzpGwtBcVUXZHWUHdbe6TzNaVU6ypcrwpYRQHKpjonlFBPxE cEt2s+gPgvG2mqGSsuP8+9X+pb7p8F0HQmmdQrwiBeAGGvXzNDQmyXe2X9s8o/Yi U+Fn7WFXUs+DDlLpqWAFGOu/Zq3N5VfTVV2uK3+gYlC15znjOSDtPXR+dvNWP1UX p/Uw8V9jzJ2WN0+vNz5HLBLWisTdNtvvnhRtZPLF19Gs5J08tBZs/I2ZuZKWBKsZ cfx2qjI3KUY= =P8H4 -----END PGP SIGNATURE----- --gAjXk0wQ5u7HFdxh02gCu5WB2KNpEcoQi-- From unknown Sun Jun 15 08:52:45 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: Christopher Baines Subject: bug#26730: closed (Re: bug#26730: [PATCH] gnu: bzip2: Patch bzip2 utilities.) Message-ID: References: <87lgpvcyxl.fsf@fastmail.com> X-Gnu-PR-Message: they-closed 26730 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 26730@debbugs.gnu.org Date: Wed, 17 May 2017 14:59:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1495033143-28839-1" This is a multi-part message in MIME format... ------------=_1495033143-28839-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #26730: [PATCH] Fix bzip2 utilities 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 26730@debbugs.gnu.org. --=20 26730: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D26730 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1495033143-28839-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 26730-done) by debbugs.gnu.org; 17 May 2017 14:58:51 +0000 Received: from localhost ([127.0.0.1]:51035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dB0Pa-0007Um-J3 for submit@debbugs.gnu.org; Wed, 17 May 2017 10:58:50 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:50775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dB0PY-0007Ue-Iq for 26730-done@debbugs.gnu.org; Wed, 17 May 2017 10:58:48 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 46AAE20B68; Wed, 17 May 2017 10:58:48 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Wed, 17 May 2017 10:58:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=qQEkUr1jNQw3BzliWr+Dk6PBH/JGl94H8w7noG1lv pg=; b=C2fUZAOBNGUk/nhGYMVrmaIDIu34DYTRAkMUHO+n8AeGjUF595y+Dd1yK c9s5x66DNDWIXDOzlHcuue62yC5wBQPgwLfm4qHp7SDSQRWtnbyfptbY3oc0YMBH MXt3lFcjJzSw70wXJDYB3MS3Emn0eUVKSxP0YU3NMRidzFjy7bv4dFViXfnS0h3J 77XkHltmIzQVWk6dXxsl9akpbGomKhsP5upW9O+MBF6VWoqkPNoHeJ6hlgWgX7Cv y+1g8c5dK4TgBeY4c8XMZyuZGCofxWbi0XlbjaW12p+u9bcjL/0SW6BloHnu1x3p Jrvx/5u4/JjddXijSBY+J8Tj+gtaw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=qQEkUr1jNQw3BzliWr +Dk6PBH/JGl94H8w7noG1lvpg=; b=nFwxtiPssSt0KGKkmWmxzbmHn23ig6Ojhw dnS+SZVp413OMVPjFW7MIh/Fph7I9NnzDgIhvd3vZBUs07W4te73w09Ekds8a6u/ +BDeHAvjTEdOaKdmDi18UbR7qBuwZ8Vku4d928rUGev8QvjfuEkAXO50n6Wg5ABB 9wp/Bn4SxrY/2uMSIca7iYf3yjEwPF2RW5Mrpr21PAvrOpeOUNgj+bqRWDud7Kva 24NYR2n5yxDJFxGHLZpFXS/nrUq4o9Ljm+y+BBEs0sDvGesNjtBlgEU+xht9a/XW ruMLJSjyME5r1gegbuloe1QoCIizSlQPkJrW0ebgprCu3VFVKwkQ== X-ME-Sender: X-Sasl-enc: zwZdDyKEvzZw7QUAShX5NcFKeGek2fCjq/ufaL2pgrJV 1495033127 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id C9E3624814; Wed, 17 May 2017 10:58:47 -0400 (EDT) From: Marius Bakke To: Christopher Baines , 26730-done@debbugs.gnu.org Subject: Re: bug#26730: [PATCH] gnu: bzip2: Patch bzip2 utilities. In-Reply-To: <86b6d0ba-0046-eb08-af93-b4b22f66179a@cbaines.net> References: <20170515060706.1758-1-mail@cbaines.net> <87r2zqf7ia.fsf@fastmail.com> <86b6d0ba-0046-eb08-af93-b4b22f66179a@cbaines.net> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Wed, 17 May 2017 16:58:46 +0200 Message-ID: <87lgpvcyxl.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26730-done 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: -0.7 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Christopher Baines writes: > On 15/05/17 16:46, Marius Bakke wrote: >> Christopher Baines writes: >>=20 >>> * gnu/packages/compression.scm (bzip2)[arguments]: Add patch-script pha= se to >>> remove absolute reference to /bin/rm. >>=20 >> Thanks for catching this! (substitute* ...) has an unspecified return >> value, so I'll add a #t at the end of this new phase before pushing. >>=20 >> Waiting for feedback on the modify-phases patch first. We still have >> ~two weeks until core-updates starts rolling again, so no rush ;-) > > I've resent the patches with these changes, just in case that helps. Pushed to 'core-updates', thank you! Note: I squashed the first two. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkcZSYACgkQoqBt8qM6 VPrBSwgAvwDb7/izo1Dp50E1yc+F/nfH0jMxflNQeLLsSPAkYe0pKRrDvqz4fcei GqCYQsqjoqnWfjb/GG3ecDiiCZZVjKlMGmg7i2cVD+LrW6GLfVc/O1Z6KpThG2fF 0ym0NdGlUnOTmb/mGX/wPV7x0Vi56jRzb9EVJDIQ34sayKUISoESKEW+/OrVJ+ni s0YO6hyInCJPLG+udygEyla7sbLEDtbWWEcHuBx+WNt9k3HkqXcwzeVd0E/3PVfP e7AIZ/4M77RA9tpklLi6ujESlXWmpo4b6auWyE8oh91fsi+z4Rae9WkveviY7s32 CHumwRHkMmUZVnEz8R1EqQJFLmu/eQ== =6oXi -----END PGP SIGNATURE----- --=-=-=-- ------------=_1495033143-28839-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 1 May 2017 09:50:13 +0000 Received: from localhost ([127.0.0.1]:48501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d57y9-0005mV-AP for submit@debbugs.gnu.org; Mon, 01 May 2017 05:50:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58605) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d57y8-0005mK-2B for submit@debbugs.gnu.org; Mon, 01 May 2017 05:50:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d57y1-0001Xb-UQ for submit@debbugs.gnu.org; Mon, 01 May 2017 05:50:06 -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.5 required=5.0 tests=BAYES_05 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:36344) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d57y1-0001XX-Qd for submit@debbugs.gnu.org; Mon, 01 May 2017 05:50:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d57xz-0003Mq-Ix for guix-patches@gnu.org; Mon, 01 May 2017 05:50:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d57xv-0001WH-LX for guix-patches@gnu.org; Mon, 01 May 2017 05:50:03 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:49489 helo=mira.cbaines.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d57xv-0001W9-Ck for guix-patches@gnu.org; Mon, 01 May 2017 05:49:59 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 5B45C13E3CA; Mon, 1 May 2017 10:49:57 +0100 (BST) Received: from [192.168.15.219] (my83-216-89-206.cust.relish.net [83.216.89.206]) by mira.cbaines.net (Postfix) with ESMTPSA id 2C24F13E3C9 for ; Mon, 1 May 2017 10:49:56 +0100 (BST) To: guix-patches@gnu.org From: Christopher Baines Subject: [PATCH] Fix bzip2 utilities Message-ID: Date: Mon, 1 May 2017 10:49:50 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="gDXNw4IbHb6ee67NXuaTdqqReBP8P5T3J" 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: -4.0 (----) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --gDXNw4IbHb6ee67NXuaTdqqReBP8P5T3J Content-Type: multipart/mixed; boundary="k6Oq8FPbJ9H5IbIW5xGOafNatWKf3FFwo"; protected-headers="v1" From: Christopher Baines To: guix-patches@gnu.org Message-ID: Subject: [PATCH] Fix bzip2 utilities --k6Oq8FPbJ9H5IbIW5xGOafNatWKf3FFwo Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable The bzip2 package includes wrappers around diff, grep and less/more. These shell scripts currently include /usr/bin (and sometimes /bin) on the PATH, and therefore fail if any of the commands that they rely on cannot be found. By substituting /usr/bin (and /bin) for the appropriate package paths, these scripts work much more reliably. I had some issues with bzmore which uses more from util-linux, I think there might be a circular dependency in the Guix package tree, as I get a VM stack overflow when including util-linux as a input to bzip2. Note that as the bzip2 package is used by so many other packages, any non-superficial change to it probably means rebuilding the world. Below is a script, and two invocations of it, showing first what happens with the unaltered package, and then the package with the modifications I describe above. #!/bin/sh set -x bzip2 < /etc/shells > shells.bz2 bzcmp shells.bz2 shells.bz2 bzdiff shells.bz2 shells.bz2 bzegrep bash shells.bz2 bzfgrep bash shells.bz2 bzgrep bash shells.bz2 bzless shells.bz2 bzmore shells.bz2 =E2=86=92 PATH=3D/gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/= bin =2E/test.sh + bzip2 + bzcmp shells.bz2 shells.bz2 /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzcmp: line 16: sed: command not found /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzcmp: line 40: mktemp: command not found cannot create a temporary file + bzdiff shells.bz2 shells.bz2 /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzdiff: line 16: sed: command not found /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzdiff: line 40: mktemp: command not found cannot create a temporary file + bzegrep bash shells.bz2 /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzegrep: line 11: sed: command not found /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzegrep: line 43: sed: command not found /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzegrep: line 63: grep: command not found + bzfgrep bash shells.bz2 /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzfgrep: line 11: sed: command not found /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzfgrep: line 43: sed: command not found /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzfgrep: line 63: grep: command not found + bzgrep bash shells.bz2 /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzgrep: line 11: sed: command not found /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzgrep: line 43: sed: command not found /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzgrep: line 63: grep: command not found + bzless shells.bz2 /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzless: line 8: sed: command not found ------> shells.bz2 <------ /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzless: line 55: more: command not found + bzmore shells.bz2 /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzmore: line 8: sed: command not found ------> shells.bz2 <------ /gnu/store/s3c442d075fc8a0q0nspc9jjsgjq613p-bzip2-1.0.6/bin/bzmore: line 55: more: command not found =E2=86=92 PATH=3D/gnu/store/i3zkljbz6ryqdlfc9gnpcjg964inp9l3-bzip2-1.0.6/= bin =2E/test.sh + bzip2 + bzcmp shells.bz2 shells.bz2 + bzdiff shells.bz2 shells.bz2 + bzegrep bash shells.bz2 /run/current-system/profile/bin/bash /gnu/store/nylrl843mkfdwzz8cd5iabsib37vqc1j-bash-4.4.A/bin/bash + bzfgrep bash shells.bz2 /run/current-system/profile/bin/bash /gnu/store/nylrl843mkfdwzz8cd5iabsib37vqc1j-bash-4.4.A/bin/bash + bzgrep bash shells.bz2 /run/current-system/profile/bin/bash /gnu/store/nylrl843mkfdwzz8cd5iabsib37vqc1j-bash-4.4.A/bin/bash + bzless shells.bz2 ------> shells.bz2 <------ + bzmore shells.bz2 ------> shells.bz2 <------ /gnu/store/i3zkljbz6ryqdlfc9gnpcjg964inp9l3-bzip2-1.0.6/bin/bzmore: line 55: more: command not found --k6Oq8FPbJ9H5IbIW5xGOafNatWKf3FFwo-- --gDXNw4IbHb6ee67NXuaTdqqReBP8P5T3J Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQJFBAEBCAAvFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlkHBL4RHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XcPWw/8CcpSJT7Et3hAyO0K/Agmdng1l0H8/XgG CPhsMRJLVi3qDAuofIesWlUWt8EtGs8USK/O5QBFkVzH+CSByZnM2HqLjwS/j7pR 59bM6tWp1bGNPPK5Jv7ns2oDR+mbYmn0kMKlJlOxJgNDaiC9eVO43ubYdrtJL22y T4z/vDuTwqyzN/BujLoCbJDQNVveHLeXKDgJf20Lg/3wKVOJXzSVsM6COU29AwHt gpq53q6AHxVUplEt3tOBHgjH4ryTTI5cCv9Tlz9qr8hYztjNjJZ+olVWH401l+cw n5QyJ/lDygRb7xfXWlJ+1SFwkXY4Vp6X16G5aB1jWSp0kKW+ULfeIfem0o5YEMh+ GXT6GWojv3NfWytwdyb9RtGv9hpT37hvbbi9aJx5yZDqctTFLPc7Kdl/Nh7/yTar rVJr7aGK36hwOklNf5SsTwjqHoPfcIQDmF1eDiRUggWkBxjeoK5lVNEt+Wzb5CTz 6vRgvZOxEYFUdzVFnjLnayOkwTIhJ5bRO3kBUXYlWXu4xB3qb8LmpjJtHdlfzdru 5P+G33SqX/o31s469wCBuIQQa/QJ6F/jQdrgVN6xnv3e/I8As+gETYB3OzEUneGb ohUy5tIw3O4CpAUq+aQ1HLIRuZDCymo8EfBFU9TZroRl0hXRZ6SnJlE6r4QbVmp8 MWBGmrieL5o= =2ngn -----END PGP SIGNATURE----- --gDXNw4IbHb6ee67NXuaTdqqReBP8P5T3J-- ------------=_1495033143-28839-1-- From unknown Sun Jun 15 08:52:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26730: [PATCH] gnu: bzip2: Patch bzip2 utilities. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2017 18:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke , 26730@debbugs.gnu.org Received: via spool by 26730-submit@debbugs.gnu.org id=B26730.1495133196311 (code B ref 26730); Thu, 18 May 2017 18:47:02 +0000 Received: (at 26730) by debbugs.gnu.org; 18 May 2017 18:46:36 +0000 Received: from localhost ([127.0.0.1]:53791 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBQRY-00004w-2U for submit@debbugs.gnu.org; Thu, 18 May 2017 14:46:36 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:46462 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBQRV-0008WS-Sc for 26730@debbugs.gnu.org; Thu, 18 May 2017 14:46:34 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 66A0E140762; Thu, 18 May 2017 19:46:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from [192.168.15.219] (my83-216-88-20.cust.relish.net [83.216.88.20]) by mira.cbaines.net (Postfix) with ESMTPSA id 1386E140760; Thu, 18 May 2017 19:46:27 +0100 (BST) References: <20170515060706.1758-1-mail@cbaines.net> <87r2zqf7ia.fsf@fastmail.com> <86b6d0ba-0046-eb08-af93-b4b22f66179a@cbaines.net> <87lgpvcyxl.fsf@fastmail.com> From: Christopher Baines Message-ID: <17f0b4b1-d12d-d444-8edb-511b714940dd@cbaines.net> Date: Thu, 18 May 2017 19:46:19 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <87lgpvcyxl.fsf@fastmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="s9kWWr9mVvMPrxbjoVNRjVG6PSOT5Vj2r" X-Spam-Score: -0.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: -0.0 (/) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --s9kWWr9mVvMPrxbjoVNRjVG6PSOT5Vj2r Content-Type: multipart/mixed; boundary="4anu8eppP6GVMC4uIQGN8oDgC4q3fP4ck"; protected-headers="v1" From: Christopher Baines To: Marius Bakke , 26730@debbugs.gnu.org Message-ID: <17f0b4b1-d12d-d444-8edb-511b714940dd@cbaines.net> Subject: Re: bug#26730: [PATCH] gnu: bzip2: Patch bzip2 utilities. References: <20170515060706.1758-1-mail@cbaines.net> <87r2zqf7ia.fsf@fastmail.com> <86b6d0ba-0046-eb08-af93-b4b22f66179a@cbaines.net> <87lgpvcyxl.fsf@fastmail.com> In-Reply-To: <87lgpvcyxl.fsf@fastmail.com> --4anu8eppP6GVMC4uIQGN8oDgC4q3fP4ck Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 17/05/17 15:58, Marius Bakke wrote: > Christopher Baines writes: >=20 >> On 15/05/17 16:46, Marius Bakke wrote: >>> Christopher Baines writes: >>> >>>> * gnu/packages/compression.scm (bzip2)[arguments]: Add patch-script = phase to >>>> remove absolute reference to /bin/rm. >>> >>> Thanks for catching this! (substitute* ...) has an unspecified return= >>> value, so I'll add a #t at the end of this new phase before pushing. >>> >>> Waiting for feedback on the modify-phases patch first. We still have >>> ~two weeks until core-updates starts rolling again, so no rush ;-) >> >> I've resent the patches with these changes, just in case that helps. >=20 > Pushed to 'core-updates', thank you! Note: I squashed the first two. Great, thanks for your review :) --4anu8eppP6GVMC4uIQGN8oDgC4q3fP4ck-- --s9kWWr9mVvMPrxbjoVNRjVG6PSOT5Vj2r Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQJFBAEBCAAvFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlkd6/4RHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xf8MhAAiDlGWuMAoND3pgkbufEnCXPsVg6OHtib uf/gjz/4Qo7Cclt07IJ8pdFOBh3+9Y6NMvjchUagmqUB0aNEK8pSdR4uVJ68cUJ+ 1RmLkVnRZeVzhVQW9S2i9P7CA3LQ4Lyk3r6mCQT8PjD58MChnQXzvC19v+I6SjmG jvk5ctqsh/pmFTggnQGs6CrwzC1+JRp74XScESuPpN88CYwmOryo+fL26c418NmQ YNookP0vuJVUh2WV3tr6+rob9h/WY17jjhs37+PZQWFp2Ly96zqbqieImI1QBqt/ bAR6jquD/JlJllsEK34tmo0+1hp5uP/6xJPbMbNKFH1DbcxPewu1/5QafPqE2yPQ w1Ttz+byb7eUHPQ5YrF3vPvnp5QydcSGaS1F+aVSXdLgw/mPQk3HKn6pxnWqsYpU tilQxhV5AgK8EVSlo+uMPemtpDvOtdLEJkR1Y2kwe9E28mjWMaWiGQuoiMnGIRtm L5uIsVCK4ok5+N2bAYctL299mn1II8b7TVTFRSoMq4P0U4mUfWOM0Qj0mXy3CUN8 gL2ugItc9mwMWhrFmADV/qS3chcWTKrDx39xAfou7xdnXsagYFH5gvboHgI2IOG5 u0C+XWFNnss64jdRMISGpFOtEiyFkDhad8n7fETi9clSuKHZQD/S1/Pj8Kdp0lHY mad1MIIbWMo= =xeNL -----END PGP SIGNATURE----- --s9kWWr9mVvMPrxbjoVNRjVG6PSOT5Vj2r--