From unknown Sat Jun 14 19:01:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#76208] [PATCH 0/3] gnu: grub: build from git source. Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Tue, 11 Feb 2025 17:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 76208 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76208@debbugs.gnu.org Cc: Denis 'GNUtoo' Carikli , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by submit@debbugs.gnu.org id=B.173929355121558 (code B ref -1); Tue, 11 Feb 2025 17:06:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Feb 2025 17:05:51 +0000 Received: from localhost ([127.0.0.1]:58329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ththm-0005be-En for submit@debbugs.gnu.org; Tue, 11 Feb 2025 12:05:50 -0500 Received: from lists.gnu.org ([2001:470:142::17]:56448) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ththi-0005bM-O6 for submit@debbugs.gnu.org; Tue, 11 Feb 2025 12:05:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ththc-0006xk-IF for guix-patches@gnu.org; Tue, 11 Feb 2025 12:05:40 -0500 Received: from cyberdimension.org ([2001:678:938:3ff::36] helo=rockpro64.cyberdimension.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1ththZ-0007uY-E2 for guix-patches@gnu.org; Tue, 11 Feb 2025 12:05:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=+3gGw/xhSTUwhg6 Zqwh0AhgON5eJlRzgroQ4RXXgTbg=; h=date:subject:cc:to:from; d=cyberdimension.org; b=DfAiwrcWHFmArIwM/VDxwKhEobk6+ULNWZ0kmFqyxWcXR6 mvAyrjMIrBPYTaef+EObK6SwAPX1SGjPNz1h9EhFNIdKl6bRmpFbhflLyomXTp8Nkfz5I9 MPHPfwnIWkC365koW07P9WlxKIO7nQKdcontq4fDZhD1zrqTJDNVfy6lNZRD+jVokRWKDv jY/emDBPdCkzmEoBuORsWO0e5E+uAGviPne6hBeB+Cec9dBKig1Ujf4NV9EDa32zBxtJtO OYmRzAtowHi5wcAsi+lC2dk006Ju0xRXfANOG6q9Me/Zd0/f5xttBNY/ifq+hv2b5NjDSk oik5e+TFsUL7P2mw== Received: from localhost.localdomain (localhost [127.0.0.1]) by rockpro64.cyberdimension.org (OpenSMTPD) with ESMTP id 317ed9a7; Tue, 11 Feb 2025 17:05:32 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Tue, 11 Feb 2025 18:05:17 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2001:678:938:3ff::36; envelope-from=GNUtoo@cyberdimension.org; helo=rockpro64.cyberdimension.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) 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.1 (/) Hi, GRUB is currently built from tarballs. This is not great because: * gnulib is bundled in the tarball, and Guix even has code to un-bundle Unicode from gnulib. * it unlocks transformation options, to build GRUB from the latest commit for instance. Since GRUB is stuck on an older gnulib version, we have to package that, along with its ucd-14.0.0 dependency. So far I only built that package from source and I'll do more in depth runtime testing in the next days, though I already tested an older version of this patch set on real hardware (a ThinkPad X200) by building a Coreboot payload with the grub-coreboot package. I can also share and/or adapt the package that builds the payload I used if necessary but I didn't include it yet in this patch set because it is very specific to a given use case, and while the grub-coreboot package is supposed to be reproducible, I've no idea yet if using that to build a payload can result in a reproducible payload as the grub bootloader code inside Guix works around some unreproducibility when creating grub images. Denis 'GNUtoo' Carikli (3): gnu: Add ucd-14.0.0. gnu: Add gnulib-2022-02-12. gnu: grub: build from git source. gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 59 +++++++--- gnu/packages/build-tools.scm | 109 ++++++++++++++++++ .../patches/gnulib-2022-02-12-bootstrap.patch | 78 +++++++++++++ gnu/packages/unicode.scm | 13 +++ 5 files changed, 247 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/gnulib-2022-02-12-bootstrap.patch base-commit: 555937448cc510517011035fbf39c3687336759d -- 2.46.0 From unknown Sat Jun 14 19:01:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#76208] [PATCH 2/3] gnu: Add gnulib-2022-02-12. Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Feb 2025 17:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76208 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76208@debbugs.gnu.org Cc: Denis 'GNUtoo' Carikli Received: via spool by 76208-submit@debbugs.gnu.org id=B76208.173929411723269 (code B ref 76208); Tue, 11 Feb 2025 17:16:02 +0000 Received: (at 76208) by debbugs.gnu.org; 11 Feb 2025 17:15:17 +0000 Received: from localhost ([127.0.0.1]:58354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1thtqu-000639-Dk for submit@debbugs.gnu.org; Tue, 11 Feb 2025 12:15:17 -0500 Received: from cyberdimension.org ([2001:678:938:3ff::36]:41180 helo=rockpro64.cyberdimension.org) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1thtqq-00061v-C7 for 76208@debbugs.gnu.org; Tue, 11 Feb 2025 12:15:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=JFrACGMTjAKwol/ KZL+rL8ygoCf2vUR3FINbjhMyD9o=; h=references:in-reply-to:date:subject: cc:to:from; d=cyberdimension.org; b=cGYarheywLqbKqDxnH5IE3pSBc0b8EIOIl zwo9bkL+JrUwT3Fo4tCqkpVq/6QFzN7qlsDc3Q0pudZEU9kcnMvwJG2dO8hP1NsV/uQzR4 vHNDuCT1WtVozVVMvhkb0nJ+5YMe7Bvj7wlzl32ffmVEHCQ7kXtsGCJSt/VEeBCsEuZaY3 p8iZlyvf4cNbC46OZYUAdss35USCM1u6E7Fh1KwpEWtwKdruq6oRWi626nEqsYZgHZySRu Rp1/mY0Xereujvq0bQHfqIJnOR15YwV4vh3mTgAv3rULeKXVhYrVSkg2Z2/9qDuF+ABUTc G3JmhEn4hBVxq/33dGsb93ZRDY5Q== Received: from localhost.localdomain (localhost [127.0.0.1]) by rockpro64.cyberdimension.org (OpenSMTPD) with ESMTP id 9d19d6ed; Tue, 11 Feb 2025 17:15:09 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Tue, 11 Feb 2025 18:14:54 +0100 Message-ID: <90fd369df4be14b88fc620856aff63231a31a983.1739292621.git.GNUtoo@cyberdimension.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: -1.0 (-) * gnu/packages/build-tools.scm (gnulib-2022-02-12): New variable. * gnu/packages/patches/gnulib-2022-02-12-bootstrap.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register patch. GRUB 2.12 depends on gnulib 9f48fb992a3d7e96610c4ce8be969cff2d61a01b ("filevercmp: fix several unexpected results"), as stated in the bootstrap.conf in the GRUB source code. Signed-off-by: Denis 'GNUtoo' Carikli Change-Id: I5c2c19aadfd0e6bf5303e10fbc602daa7dd0d0ff --- gnu/local.mk | 1 + gnu/packages/build-tools.scm | 109 ++++++++++++++++++ .../patches/gnulib-2022-02-12-bootstrap.patch | 78 +++++++++++++ 3 files changed, 188 insertions(+) create mode 100644 gnu/packages/patches/gnulib-2022-02-12-bootstrap.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9e192f1e4f1..3b54cd60177 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1497,6 +1497,7 @@ dist_patch_DATA = \ %D%/packages/patches/gnome-session-support-elogind.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnulib-bootstrap.patch \ + %D%/packages/patches/gnulib-2022-02-12-bootstrap.patch \ %D%/packages/patches/gnumach-version.patch \ %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnupg-1-build-with-gcc10.patch \ diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 20fd7bafd8e..839018cd661 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2021, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2022, 2023 Juliana Sims ;;; Copyright © 2024 Evgeny Pisemsky +;;; Copyright © 2025 Denis 'GNUtoo' Carikli ;;; ;;; This file is part of GNU Guix. ;;; @@ -988,6 +989,114 @@ (define-public gnulib #:commit "ac4b301ae15223c98b51cd5a0eda2e2cf57c817b" #:hash (base32 "0f4w56fc97clg13mmdghx84dh9xqmaqr3j672ppfh3h66gmmmvzs"))) +(define-public gnulib-2022-02-12 + (let ((gnulib-2022-02-12-checkout + (gnulib-checkout + #:version "2022-02-12" + ;; from bootstrap.conf in GRUB source code + #:commit "9f48fb992a3d7e96610c4ce8be969cff2d61a01b" + #:hash + (base32 "1njf4y5sfysrshf6l4gjbn5k7k1lm698wrpc4fjw9acdlkmwadlv")))) + (package + (inherit gnulib-2022-02-12-checkout) + (source + (origin + (inherit (package-source gnulib-2022-02-12-checkout)) + ;; The Guix path only affect the gnulib tools and not its + ;; unmodified source code. + (patches (search-patches "gnulib-2022-02-12-bootstrap.patch")))) + (arguments + (substitute-keyword-arguments + (package-arguments gnulib-2022-02-12-checkout) + ((#:install-plan base-plan) + #~'(("./gnulib-tool" "bin/") + ("./gnulib-tool.py" "bin/") + ("." "src/gnulib" #:exclude-regexp ("\\.git.*")))) + ((#:phases phases #~%standard-phases) + #~(modify-phases + #$phases + ;; The regenerate-unicode stage from gnulib-checkout in (gnu + ;; packages build-tools) passes an extra BidiMirroring.txt + ;; and this makes gen-uni-tables fails and print its help: + ;; Usage: ./gen-uni-tables UnicodeData.txt PropList.txt + ;; DerivedCoreProperties.txt emoji-data.txt + ;; ArabicShaping.txt Scripts.txt Blocks.txt + ;; PropList-3.0.1.txt EastAsianWidth.txt LineBreak.txt + ;; WordBreakProperty.txt GraphemeBreakProperty.txt + ;; CompositionExclusions.txt SpecialCasing.txt + ;; CaseFolding.txt version + (delete 'regenerate-unicode) + (add-before + 'check 'regenerate-unicode-without-bidi-mirroring + (lambda* (#:key inputs #:allow-other-keys) + (define (find-ucd-file name) + (search-input-file + inputs (string-append "share/ucd/" name))) + (define (find-ucd-files . names) + (map find-ucd-file names)) + (with-directory-excursion + "lib" + ;; See the compile-command buffer-local variable in + ;; lib/gen-uni-tables.c + (invoke "gcc" "-O" "-Wall" "gen-uni-tables.c" + "-Iunictype" "-o" "gen-uni-tables") + (apply invoke + "./gen-uni-tables" + (append + (find-ucd-files + "UnicodeData.txt" + "PropList.txt" + "DerivedCoreProperties.txt" + "emoji/emoji-data.txt" + "ArabicShaping.txt" + "Scripts.txt" + "Blocks.txt") + (list #$(this-package-native-input "PropList.txt")) + (find-ucd-files + "EastAsianWidth.txt" + "LineBreak.txt" + "auxiliary/WordBreakProperty.txt" + "auxiliary/GraphemeBreakProperty.txt" + "CompositionExclusions.txt" + "SpecialCasing.txt" + "CaseFolding.txt") + (list + #$(package-version + (this-package-native-input "ucd"))))) + (invoke "clisp" "-C" "uniname/gen-uninames.lisp" + (find-ucd-file "UnicodeData.txt") + "uniname/uninames.h" + (find-ucd-file "NameAliases.txt")) + (for-each + (match-lambda + ((ucd-file . directory) + (copy-file (find-ucd-file ucd-file) + (string-append "../tests/" directory "/" + (basename ucd-file))))) + '(("NameAliases.txt" . "uniname") + ("UnicodeData.txt" . "uniname") + ("NormalizationTest.txt" . "uninorm") + ("auxiliary/GraphemeBreakTest.txt" . "unigbrk") + ("auxiliary/WordBreakTest.txt" . "uniwbrk"))) + (delete-file "gen-uni-tables")))))))) + (native-inputs + (list + bash-minimal + clisp + git + perl + python + ucd-14.0.0 ;; Unicode data: + (origin + (method url-fetch) + (uri (string-append + "https://www.unicode.org/Public/" + "3.0-Update1/PropList-3.0.1.txt")) + (file-name "PropList.txt") + (sha256 + (base32 + "0k6wyijyzdl5g3nibcwfm898kfydx1pqaz28v7fdvnzdvd5fz7lh")))))))) + (define-public pdpmake (package (name "pdpmake") diff --git a/gnu/packages/patches/gnulib-2022-02-12-bootstrap.patch b/gnu/packages/patches/gnulib-2022-02-12-bootstrap.patch new file mode 100644 index 00000000000..f9efc061be4 --- /dev/null +++ b/gnu/packages/patches/gnulib-2022-02-12-bootstrap.patch @@ -0,0 +1,78 @@ +From b1bd3c4201d7b7936980538e85ad026f9954adcf Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Thu, 30 May 2024 14:48:04 -0400 +Subject: [PATCH] bootstrap: Use gnulib-tool from PATH if available. + +Some distributions such as GNU Guix include in their package for +gnulib a 'gnulib-tool' command under their $bindir +prefix (e.g. '/bin') for users to use, along the unmodified full +sources. The idea is that any wrapping or distribution modifications +for the *execution* of the script at run time is done on these +commands, while the rest of the source should be in their +pristine (unmodified) version. Adjust the 'gnulib-tool' discovery +mechanism to support such installation layout. + +* build-aux/bootstrap (autogen) : Prefer to use from +PATH, else from $GNULIB_SRCDIR/../../bin/gnulib-tool, else from +$GNULIB_SRCDIR/gnulib-tool. +* gnulib-tool.sh (func_gnulib_dir): Honor GNULIB_SRCDIR to locate +gnulib's main directory. + +GNUtoo: Backport on top of the commit + 9f48fb992a3d7e96610c4ce8be969cff2d61a01b + ("filevercmp: fix several unexpected results"). +Signed-off-by: Denis 'GNUtoo' Carikli +--- + build-aux/bootstrap | 12 ++++++++++-- + gnulib-tool | 6 +++++- + 2 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/build-aux/bootstrap b/build-aux/bootstrap +index dc2238f4ad..93778a7020 100755 +--- a/build-aux/bootstrap ++++ b/build-aux/bootstrap +@@ -1,6 +1,6 @@ + #! /bin/sh + # Print a version string. +-scriptversion=2022-01-26.05; # UTC ++scriptversion=2022-02-12.00; # UTC + + # Bootstrap this package from checked-out sources. + +@@ -838,7 +838,15 @@ if $use_gnulib; then + } + fi + +- gnulib_tool=$GNULIB_SRCDIR/gnulib-tool ++ gnulib_tool=$(command -v gnulib-tool) ++ if test -x "$gnulib_tool"; then ++ : # done ++ elif test -x $GNULIB_SRCDIR/../../bin/gnulib-tool; then ++ gnulib_tool=$GNULIB_SRCDIR/../../bin/gnulib-tool ++ else ++ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool ++ fi ++ + <$gnulib_tool || exit $? + fi + +diff --git a/gnulib-tool b/gnulib-tool +index 99854415ba..728430579b 100755 +--- a/gnulib-tool ++++ b/gnulib-tool +@@ -486,7 +486,11 @@ func_gnulib_dir () + * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;; + esac + done +- gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'` ++ if test -n "$GNULIB_SRCDIR"; then ++ gnulib_dir=$GNULIB_SRCDIR ++ else ++ gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'` ++ fi + } + + # func_tmpdir +-- +2.46.0 + -- 2.46.0 From unknown Sat Jun 14 19:01:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#76208] [PATCH 1/3] gnu: Add ucd-14.0.0. Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Feb 2025 17:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76208 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76208@debbugs.gnu.org Cc: Denis 'GNUtoo' Carikli Received: via spool by 76208-submit@debbugs.gnu.org id=B76208.173929411723276 (code B ref 76208); Tue, 11 Feb 2025 17:16:02 +0000 Received: (at 76208) by debbugs.gnu.org; 11 Feb 2025 17:15:17 +0000 Received: from localhost ([127.0.0.1]:58356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1thtqv-00063L-9i for submit@debbugs.gnu.org; Tue, 11 Feb 2025 12:15:17 -0500 Received: from cyberdimension.org ([79.143.250.36]:34544 helo=rockpro64.cyberdimension.org) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1thtqq-00062m-70 for 76208@debbugs.gnu.org; Tue, 11 Feb 2025 12:15:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=R1PTOwbV6dDe3jN J65GY+xWADb9Kc0NyuF7ilJEFRRk=; h=references:in-reply-to:date:subject: cc:to:from; d=cyberdimension.org; b=bXSWK2N19ih+YXMZRSmLdqaixph0DLKQbj t7D8LGxZH6+/uuRMoQedyuJ17rGhRleeksXmw+xA/pr250seeeYFxwdgsy5ucnngrDqzV0 hSFUCEdwQamswnwEsBYNq+qjMsdXDE8Z/ak6wTTCMiJsbvanb4gSXKeRo7OIKHqssxUMAv vrqpK1c9puP3+Qh4LtFoVhf/NyFCaKeQfhJOuTSKm2GUs1fTUMFc2jQTQHHkMGowGGrtsa yitusUWRQlG8CTDqe8MEyVEgkU6Chl3oKCmNxXPsqRLEnnC32osn2hcdZYiwUyimsflm7e AeJdqoN1p2BrKGcge6hKb4qr1maQ== Received: from localhost.localdomain (localhost [127.0.0.1]) by rockpro64.cyberdimension.org (OpenSMTPD) with ESMTP id a1e4add7; Tue, 11 Feb 2025 17:15:08 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Tue, 11 Feb 2025 18:14:53 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: -1.0 (-) * gnu/packages/unicode.scm (ucd-14.0.0): New variable. GRUB 2.12 depends on gnulib 9f48fb992a3d7e96610c4ce8be969cff2d61a01b ("filevercmp: fix several unexpected results"), as stated in the bootstrap.conf in the GRUB source code, and this gnulib version depends on UCD 14.0.0. Signed-off-by: Denis 'GNUtoo' Carikli Change-Id: I5c2c19aadfd0e6bf5303e10fbc602daa7dd0d0ff --- gnu/packages/unicode.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index 5f8a3655b0c..0b50b5d60ab 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2021 Felix Gruber +;;; Copyright © 2025 Denis 'GNUtoo' Carikli ;;; ;;; This file is part of GNU Guix. ;;; @@ -102,6 +103,18 @@ (define-public ucd test data for conformance to several important Unicode algorithms.") (license unicode))) +(define-public ucd-14.0.0 + (package + (inherit ucd) + (version "14.0.0") + (source + (origin + (method url-fetch/zipbomb) + (uri (string-append "https://www.unicode.org/Public/zipped/" version + "/UCD.zip")) + (sha256 + (base32 "001nq9w52ijma0vps40xwy2q6ylpyf1393lzb128ibypnmv54fh3")))))) + (define (unicode-emoji-file name version hash) (origin (method url-fetch) -- 2.46.0 From unknown Sat Jun 14 19:01:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#76208] [PATCH 3/3] gnu: grub: build from git source. Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Tue, 11 Feb 2025 17:16:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76208 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76208@debbugs.gnu.org Cc: Denis 'GNUtoo' Carikli , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 76208-submit@debbugs.gnu.org id=B76208.173929412823297 (code B ref 76208); Tue, 11 Feb 2025 17:16:03 +0000 Received: (at 76208) by debbugs.gnu.org; 11 Feb 2025 17:15:28 +0000 Received: from localhost ([127.0.0.1]:58359 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1thtr1-00063a-Pa for submit@debbugs.gnu.org; Tue, 11 Feb 2025 12:15:28 -0500 Received: from cyberdimension.org ([2001:678:938:3ff::36]:41180 helo=rockpro64.cyberdimension.org) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1thtqs-00061v-K1 for 76208@debbugs.gnu.org; Tue, 11 Feb 2025 12:15:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=lT+gAcu9SFdrkve 27MgwiDrLF3ilT/0BBo6FPtPWvKY=; h=references:in-reply-to:date:subject: cc:to:from; d=cyberdimension.org; b=ofuQFt/QundnM4BST0voRPP52C3f/ql7BC nPm9AwLNk2JnFXKvtCOw3Of2JAVNQdsUzGnO2uw7vhvBXTepUUd/BL8RuwLscPrLgLHOqH 8qRYTymye9R42MflXHG23ycwb2TQkxdicdxR6NlPO+ujTTdt5gyhs68eIETUoIqexFa8m4 tQhu4gV2bVeVX8V6ks8piPirAoDWc/czzIzo6J1aiFrKfJz40VbqDGfork6Ix32claLQlH lO/7L+q9OsbHsO3MJuvx8PwparmZ7GptjzE4R2amIeaJETv9Yix3SLdQlvNQoTa4ps4861 zjRCooQ1YOai0nAfFVXyuInEr7eg== Received: from localhost.localdomain (localhost [127.0.0.1]) by rockpro64.cyberdimension.org (OpenSMTPD) with ESMTP id 6f8fbb7f; Tue, 11 Feb 2025 17:15:09 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Tue, 11 Feb 2025 18:14:55 +0100 Message-ID: <35d33ec64be4fb6c064a8a80b8c28f02541909c9.1739292621.git.GNUtoo@cyberdimension.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: -1.0 (-) * gnu/packages/bootloaders.scm (grub) [source]: Switch to git-fetch, don't overwrite grub-core/extra_deps.lst. [native-inputs]: Add autoconf, automake, gnulib-2022-02-12, python. [arguments]: Add 'bootstrap phase. Signed-off-by: Denis 'GNUtoo' Carikli Change-Id: I894e7dcac719a4d20dc82685af7a31110a023b50 --- gnu/packages/bootloaders.scm | 59 ++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b5cfacca4bc..86fff61ad7d 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020, 2021 Pierre Langlois ;;; Copyright © 2021 Vincent Legoll ;;; Copyright © 2021 Brice Waegeneire -;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli +;;; Copyright © 2022-2023, 2025 Denis 'GNUtoo' Carikli ;;; Copyright © 2021 Stefan ;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2023 Herman Rimm @@ -40,7 +40,9 @@ (define-module (gnu packages bootloaders) #:use-module (gnu packages) #:use-module (gnu packages assembly) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages build-tools) #:use-module (gnu packages disk) #:use-module (gnu packages bison) #:use-module (gnu packages cdrom) @@ -112,22 +114,20 @@ (define-public grub (name "grub") (version "2.12") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/grub/grub-" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/grub.git") + (commit (string-append "grub-" version)))) (sha256 (base32 - "1ahgzvvvwdxx7rl08pv5dyqlgp76jxz0q2cflxvsdsn4yy8p7jgk")) + "05x4sli80ybpi38pj0313pg2ip2dd4lflz64hymvnzzn2sq63awm")) + (file-name (git-file-name name version)) (patches (search-patches "grub-efi-fat-serial-number.patch" "grub-setup-root.patch")) (modules '((guix build utils))) (snippet #~(begin - ;; Add file missing from the release tarball. - (call-with-output-file "grub-core/extra_deps.lst" - (lambda (port) - (display "depends bli part_gpt\n" port))) - ;; Use exit code 77, not 99, to tell Automake that a test ;; is skipped. (substitute* (find-files "tests" "\\.in$") @@ -156,7 +156,36 @@ (define-public grub #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'patch-stuff + ;; We need to run before the patch-stuff phase, otherwise we + ;; have this error: + ;; starting phase `patch-stuff' + ;; error: in phase 'patch-stuff': uncaught exception: + ;; system-error "stat" "~A: ~S" + ;; ("No such file or directory" "grub-core/Makefile.in") (2) + (add-after 'unpack 'bootstrap + (lambda _ + ;; The bootstrap script calls gnulib-tool{,.py} from the path + ;; passed to --gnulib-srcdir, so we need to put Guix version + ;; of these scripts there. + (copy-recursively + (string-append #$gnulib-2022-02-12 "/src/gnulib") "gnulib") + (delete-file "gnulib/gnulib-tool") + (delete-file "gnulib/gnulib-tool.py") + (copy-file + (string-append #$gnulib-2022-02-12 "/bin/gnulib-tool") + "gnulib/gnulib-tool") + (copy-file + (string-append #$gnulib-2022-02-12 "/bin/gnulib-tool.py") + "gnulib/gnulib-tool.py") + ;; We run very early so we need to patch the sheebang now as + ;; bootstrap will run autogen.sh. + (patch-shebang "autogen.sh") + (invoke + "bash" + "./bootstrap" + "--no-git" + "--gnulib-srcdir=gnulib"))) + (add-after 'bootstrap 'patch-stuff (lambda* (#:key native-inputs inputs #:allow-other-keys) (substitute* "grub-core/Makefile.in" (("/bin/sh") (which "sh"))) @@ -270,12 +299,16 @@ (define-public grub (list fuse-2) '()))) (native-inputs - (append (list pkg-config + (append (list autoconf + automake bison flex - texinfo - help2man freetype ;native version needed for build-grub-mkfont + gnulib-2022-02-12 + help2man + pkg-config + python ;to run gentpl.py during autoconf.sh + texinfo ;; Dependencies of the test suite. parted -- 2.46.0 From unknown Sat Jun 14 19:01:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#76208] gnu: grub: build from git source. References: In-Reply-To: Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 Feb 2025 01:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76208 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76208@debbugs.gnu.org Received: via spool by 76208-submit@debbugs.gnu.org id=B76208.17393248806942 (code B ref 76208); Wed, 12 Feb 2025 01:48:02 +0000 Received: (at 76208) by debbugs.gnu.org; 12 Feb 2025 01:48:00 +0000 Received: from localhost ([127.0.0.1]:59762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ti1r6-0001nt-3d for submit@debbugs.gnu.org; Tue, 11 Feb 2025 20:48:00 -0500 Received: from cyberdimension.org ([2001:678:938:3ff::36]:37272 helo=rockpro64.cyberdimension.org) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ti1r2-0001ne-0G for 76208@debbugs.gnu.org; Tue, 11 Feb 2025 20:47:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=+XwvX9Egi/iarOQ k8i1Eqcya8txT8xfKcAY4ayr3DEo=; h=subject:to:from:date; d=cyberdimension.org; b=nzCHn0cZ44qrhU+XFs1SXrAioak+Ga0U3W/Y+PVcdm0SuD Wne3U38YFvK+jQASKXWNT2WgpJ5EWz4QLzqnbepE+lbu1KTF3+XnRzI2S05cNKhJ0sHxMd zfpaiXLVksCJytMuRYeeHcmhikYOAgMXqIAs+NA5dsdN8eWzuEmbqLgsu2HubExpFnml+Q YOHf2HFvKxzxnSWM7bmeopKoOkoRMHzn6czUHWN7mMHwWru4xnYbEhwyvACiiOWqPy2q/c uARtpUawvohhfaMh4QX8fZW/TgEOJ8p2CREgZT1jfYUXBDJ9a0slilydrJ6Uoccs4Fqv9e BNcTi1OPN622TQUQ== Received: from primary_laptop (localhost [127.0.0.1]) by rockpro64.cyberdimension.org (OpenSMTPD) with ESMTP id 6ee67be1 for <76208@debbugs.gnu.org>; Wed, 12 Feb 2025 01:47:50 +0000 (UTC) Date: Wed, 12 Feb 2025 02:47:41 +0100 From: Denis 'GNUtoo' Carikli Message-ID: <20250212024546.2dc85f53@primary_laptop> X-Mailer: Claws Mail 4.3.0 (GTK 3.24.41; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/QHD=uzVHCnylUTjZH=3CPHt"; protocol="application/pgp-signature"; micalg=pgp-sha256 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: -1.0 (-) --Sig_/QHD=uzVHCnylUTjZH=3CPHt Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi again, I've now tested this patch set with grub-coreboot and it booted fine (I tested with LUKS1+LVM2+ext4 on a ThinkPad X200). I'll probably try a bit more tests by generating some rootfs with GRUB on the MBR. However I don't have x86_64 UEFI computers at home, so if I also need to test on UEFI x86_64 it will take more time until I ask a friend who has a computer like that. I might be able to test on ARM too but this is also not straightforward so it might also take more time (probably more than x86). Denis. --Sig_/QHD=uzVHCnylUTjZH=3CPHt Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEeC+d2+Nrp/PU3kkGX138wUF34mMFAmer/b0ACgkQX138wUF3 4mNrlQ/9H10sI9Nt4hl6vbqXnd9KJ2UizqDarMA+f6G8BTWCFflG7hA7nt/cIrSd p8dAatquKulLsn941FNZQBAxfbm5cq5L7X0fuvZhm7oYC2J82/qUE1VDMtubHd55 0mHBNkQvD3+9Gr3jYCKri9MC83EbksQVz9wQUkwt/Lm3PUgP2rZcN9+6ss3m7ljH 2gAtLG+s6hYfES8ElHgzbgu0eECMEJWKu0S0gObGVu86yC83Lu264lSCQYalMare kR7QEIDTEwtEzQuSJpjeqIKIOJ0OlBJxA3FzzRpKB61rUQ5SUJnqOwsde8Gz/R1K 8a4/0lHp7Apq3UooQ8OmrDczVOGF0DQAQo1a0Os4G+CvAojZO58t6t/X2mcziS1Q NN2WzZOfrJSFVhE49EZCdvEdqw4JBnQnpLyWA15E0YeIkzMepSbLNRvGHyHLDpZE CGZ6WBQF1gpvD9tWheO1qPRIOrWvqgJzAG7FWrE4qxD0hFLTQtPPB1NuFawj37wj lwQUKQUqgrtKzzDUHyw6JfuTHppuWnNoSUxkATMnofYnNGHDQ4Zdv1USZmlZtJRG 01dR20o4uFkUtvc5jnqCgUb2URmvi+XDv/JO2RxxZSWMLy/Xqvbbp+PJrzfX9pZg S/yamAwpaJ+ZSsVo5OB+aZhdur6fznIMYt7LTgwVQt5HH1TIzZ4= =KMy+ -----END PGP SIGNATURE----- --Sig_/QHD=uzVHCnylUTjZH=3CPHt-- From unknown Sat Jun 14 19:01:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#76208] gnu: grub: build from git source. References: In-Reply-To: Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Feb 2025 16:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76208 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76208@debbugs.gnu.org Received: via spool by 76208-submit@debbugs.gnu.org id=B76208.173963832012153 (code B ref 76208); Sat, 15 Feb 2025 16:52:02 +0000 Received: (at 76208) by debbugs.gnu.org; 15 Feb 2025 16:52:00 +0000 Received: from localhost ([127.0.0.1]:57608 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tjLOZ-00039u-HJ for submit@debbugs.gnu.org; Sat, 15 Feb 2025 11:51:59 -0500 Received: from cyberdimension.org ([2001:678:938:3ff::36]:50600 helo=rockpro64.cyberdimension.org) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tjLOW-00039b-Ab for 76208@debbugs.gnu.org; Sat, 15 Feb 2025 11:51:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=A+yDlSGdNmo8RQp YXgP7GwCf7NFP+ckuaJuWdVVBMIc=; h=subject:to:from:date; d=cyberdimension.org; b=mZiqTCMtMg2h0H0cPGaP/k4f3rYj7BxhBXVWCRftxBq6he PvvkoKAzg0j1+qadgDkOBZYtPoZVNh45fm/BFhgAiYnrWKOi+m5CCzRcBHpmQZD/uwf7mq bEbF/s+7Q+vOtITbVevKuOE28umFuGxqTktIRJx/rLiP+37sxYMl+u9DmH3CiE/rCCEF6i w0lAmFqHGWk4b4idzgceh0bcyCLjXi/uq+AajirOKtbcSA6iTBmI0VgvKlzNj2rkNzcavC TEgUNiAIFMIqxWQfzvJtDEWYiDZIM9f5MQJdjCcf9csCqxU/kyHcwZsynHa8G92rO2Ecbk eLOZiZhgrk5Wp8VA== Received: from primary_laptop (localhost [127.0.0.1]) by rockpro64.cyberdimension.org (OpenSMTPD) with ESMTP id 1a27b7b3 for <76208@debbugs.gnu.org>; Sat, 15 Feb 2025 16:51:52 +0000 (UTC) Date: Sat, 15 Feb 2025 17:51:32 +0100 From: Denis 'GNUtoo' Carikli Message-ID: <20250215175132.09c34621@primary_laptop> X-Mailer: Claws Mail 4.3.0 (GTK 3.24.41; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/M2Ljm4b/8n.7LhyYsFxvB=6"; protocol="application/pgp-signature"; micalg=pgp-sha256 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: -1.0 (-) --Sig_/M2Ljm4b/8n.7LhyYsFxvB=6 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi, My patch contains issues that were found during testing. If I run: > $ ./pre-inst-env guix system image --image-type=3Defi-raw \ > ./minimal-system.scm With: > ;;; This file is free software; you can redistribute it and/or modify > it ;;; under the terms of the GNU General Public License as published > by ;;; the Free Software Foundation; either version 3 of the License, > or (at ;;; your option) any later version. > ;;; > ;;; This file is distributed in the hope that it will be useful, but > ;;; WITHOUT ANY WARRANTY; without even the implied warranty of > ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > ;;; GNU General Public License for more details. > ;;; > ;;; You should have received a copy of the GNU General Public License > ;;; along with this file. If not, see . >=20 > (define-module (minimal-system) > #:use-module (gnu) > #:use-module (gnu bootloader) > #:use-module (guix build-system copy) > #:use-module ((guix licenses) #:prefix license:) > #:use-module (guix packages)) >=20 > (define-public current-system > (package > (name "current-system") > (version "0.1") > (source (local-file (current-filename))) > (arguments > (list > #:install-plan > #~(list '(#$(basename (current-filename)) > "share/current-system/")))) (build-system copy-build-system) > (synopsis "current guix system definition") > (description "The current guix system definition can be used to > get the file that was used to produce a given image. If the system > definition is self-contained, it can also be useful to point > unattended-upgrade-service to the current system definition file.") > (home-page #f) > (license license:gpl3+))) >=20 > (define-public minimal-operating-system > (operating-system > (host-name "minimal") > (bootloader (bootloader-configuration > (bootloader grub-bootloader) > (targets '(file-system-label "Guix_image")) > (terminal-outputs '(console)))) > (file-systems (append (list (file-system > (device (file-system-label > "Guix_image")) (mount-point "/") > (type "ext4"))) > %base-file-systems)) > (packages (append (list current-system) %base-packages)))) >=20 > minimal-operating-system After working around temporary network with --no-substitutes, I get this error: > -builder for > `/gnu/store/icskarx900khnyg2f551dfc8mszgrpb6-grub-locales.drv' failed > with exit code 1 build of > /gnu/store/icskarx900khnyg2f551dfc8mszgrpb6-grub-locales.drv failed > View build log at > '/var/log/guix/drvs/ic/skarx900khnyg2f551dfc8mszgrpb6-grub-locales.drv.gz= '. And this file has that: > Backtrace: > 1 (primitive-load > "/gnu/store/kyc66l3m5pvx6m97z0cyvga4m5b?") In ice-9/boot-9.scm: > 256:9 0 (for-each # > ?) >=20 > ice-9/boot-9.scm:256:9: In procedure for-each: > In procedure for-each: Not a list: #f So I probably need to rework the patch somehow. Also note that so far I only tried to unbundle gnulib, there are, according to the "6 Updating external code" section in the grub-dev info manual, 2 more bundled projects[1]: - jsmn - minilzo but they are respectively used to parse JSON and implement LZO, so this is probably not related to the error I have above. References: ------------ [1] https://www.gnu.org/software/grub/manual/grub-dev/grub-dev.html#Updatin= g-External-Code Denis. --Sig_/M2Ljm4b/8n.7LhyYsFxvB=6 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEeC+d2+Nrp/PU3kkGX138wUF34mMFAmewxhQACgkQX138wUF3 4mOZvQ//aSWkyM3byXuvMenL7i6+xoBkeA0V5zBK2GeJAexN5yjq/SjfvtQ5ij9E X5rSXyckg6QjzRjmKxQd81EL4i6FGzwiYOQ0o6ml/HK85m4mYMZDfhp02r/5gnuI OfmNGJG/wzaKAa0vbkzf7FZxOJ+AwToPwbxiU81Z/7oqsS2Bdfp/q9LzDWW/0u4X 5ELQhtsLuPq0xm9G1ASWUOFCFvHy3OVBrvlZrFhZthYWoLODvJ6gouh2KdkX4N/W o48BbDgfyu1sLUiPeGAb3QC/2FiqxC229QVhfnP3EBCYF8/SvJGJLfyCXcI85FRG P2VJ/uZoktpYBrrztO70rAtVc4xLA1RXR6+HBwfdkS+KW8fHK22p0nkhbUZb6OQd C7ZwaTL/0aB6rSuksDPvTR9oxMcf2ammuqXMYKq6Jic91AABr/EWvjk0U+ao5RaB kCg5/PecI7aB5xrcUaGnf08w1fiNZbgZ+DeXyFgse5g180OlPnot0GR+PGcxgPCm D0xe5jnSTJCZ0NrycPTpZBWKvtnvPILessmOYGfcS1dNV6b+G/iHEMjM66YK5x0y SJvr9D0zfWQGwf7cFmKyYi8TZUCF5T48ygzt1ahZZSM5RqyIl/NMjkyVhA5QoB5U ZtAfo7BHuFVYUSOmVPWn0/8iJ69kwibtaCeDUi/4Y6qjBfKeM3Y= =vhBk -----END PGP SIGNATURE----- --Sig_/M2Ljm4b/8n.7LhyYsFxvB=6--