[bug#68555] [PATCH 0/3] debootstrap: Add Trisquel support.

[bug#68555] [PATCH 0/3] debootstrap: Add Trisquel support.

[Denis 'GNUtoo' Carikli]

Hi,

Upstream debootstrap now has Trisquel support in its releases, so we simply
need to add a trisquel-keyring package, patch the trisquel debootstrap
script to use that, and fix a missing dependency to make it work. 

To test this patchset I first compiled Guix:
    $ guix shell -W -C -D guix
    $ ./bootstrap
    $ ./configure --localstatedir=/var --sysconfdir=/etc
    $ make clean
    $ make -j2

Then I used the following commands to install debootstrap inside a Guix x86_64
system installation in a new shell:
    $ ./pre-inst-env guix package -i debootstrap

And once installed, I opened a new shell and run the following commands to
create a Trisquel 11 (aramo) rootfs:
    $ sudo -E debootstrap aramo aramo-root http://archive.trisquel.info/trisquel
    [...]
    I: Base system installed successfully.
    $ echo $?
    0

And it returned no errors.

Chrooting inside also worked:
    # chroot aramo /bin/bash
    # source /etc/environment
    # lsb_release -a
    No LSB modules are available.
    Distributor ID:	Trisquel
    Description:	Trisquel GNU/Linux Aramo (11.0)
    Release:	11.0
    Codename:	aramo

Denis 'GNUtoo' Carikli (3):
  gnu: Add trisquel-keyring.
  gnu: debootstrap: use trisquel-keyring.
  gnu: debootstrap: Add zstd dependency.

 gnu/packages/debian.scm | 63 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 62 insertions(+), 1 deletion(-)


base-commit: b3e0a973bca6fe5de7356f3d70c4b7d468b0a759
-- 
2.41.0

[bug#68555] [PATCH 1/3] gnu: Add trisquel-keyring.

[Denis 'GNUtoo' Carikli]

* gnu/packages/debian.scm (trisquel-keyring): New variable.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 gnu/packages/debian.scm | 50 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm
index de43182172..4e398f619c 100644
--- a/gnu/packages/debian.scm
+++ b/gnu/packages/debian.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2018, 2020-2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,6 +25,7 @@ (define-module (gnu packages debian)
   #:use-module (guix git-download)
   #:use-module (guix gexp)
   #:use-module (guix packages)
+  #:use-module (guix build-system copy)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system trivial)
   #:use-module (gnu packages autotools)
@@ -146,6 +148,54 @@ (define-public debian-ports-archive-keyring
     ;; "The keys in the keyrings don't fall under any copyright."
     (license license:public-domain)))
 
+(define-public pureos-archive-keyring
+  (package
+    (name "pureos-archive-keyring")
+    (version "2021.11.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://repo.puri.sm/pureos/pool/main/p/pureos-archive-keyring/"
+                    "pureos-archive-keyring_" version ".tar.xz"))
+              (sha256
+               (base32
+                "1a0d084a98bycyhbw531646rbivvlfkdk6ldshl5dy6fvzmbci0d"))))
+    (build-system copy-build-system)
+    (arguments
+     '(#:install-plan '(("keyrings/pureos-archive-keyring.gpg"
+                         "share/keyrings/")
+                        ("keyrings/pureos-archive-removed-keys.gpg"
+                         "share/keyrings/"))))
+    (home-page "https://source.puri.sm/pureos/core/pureos-archive-keyring")
+    (synopsis "GnuPG archive keys of the Pureos archive")
+    (description "The Pureos distribution signs its packages.  This package
+contains the archive keys used for that.")
+    (license (list license:public-domain ;; the keys
+                   license:gpl2+))))     ;; see debian/copyright
+
+(define-public trisquel-keyring
+  (package
+    (name "trisquel-keyring")
+    (version "2022.10.19")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://archive.trisquel.info/trisquel/"
+                    "pool/main/t/trisquel-keyring/trisquel-keyring_"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "1qkqm3wb945i2izm47xni21hi3ad807bvl106r2mnwdxnjs4ij08"))))
+    (build-system copy-build-system)
+    (arguments
+     '(#:install-plan '(("keyrings/trisquel-archive-keyring.gpg"
+                         "share/keyrings/"))))
+    (home-page "http://archive.trisquel.info/trisquel/pool/main/t/trisquel-keyring")
+    (synopsis "GnuPG archive keys of the Trisquel archive")
+    (description "The Trisquel distribution signs its packages.  This package
+contains the archive keys used for that.")
+    (license license:gpl2+)))     ;; see debian/copyright
+
 (define-public ubuntu-keyring
   (package
     (name "ubuntu-keyring")
-- 
2.41.0

[bug#68555] [PATCH 2/3] gnu: debootstrap: use trisquel-keyring.

[Denis 'GNUtoo' Carikli]

* gnu/packages/debian.scm (debootstrap): [arguments]: In 'patch-source' phase,
    use trisquel-keyring.
  [inputs]: Add trisquel-keyring.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 gnu/packages/debian.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm
index 4e398f619c..7c2d7fedfb 100644
--- a/gnu/packages/debian.scm
+++ b/gnu/packages/debian.scm
@@ -258,6 +258,7 @@ (define-public debootstrap
            (add-after 'unpack 'patch-source
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let ((debian #$(this-package-input "debian-archive-keyring"))
+                     (trisquel #$(this-package-input "trisquel-keyring"))
                      (ubuntu #$(this-package-input "ubuntu-keyring")))
                  (substitute* "Makefile"
                    (("/usr") ""))
@@ -270,6 +271,11 @@ (define-public debootstrap
                    (("/usr") debian))
                  (substitute* "scripts/gutsy"
                    (("/usr") ubuntu))
+                 (substitute* "scripts/robur"
+                   (("/usr/share/keyrings/trisquel-archive-keyring.gpg")
+                    (string-append
+                     trisquel
+                     "/share/keyrings/trisquel-archive-keyring.gpg")))
                  (substitute* "debootstrap"
                    (("=/usr") (string-append "=" #$output))
                    (("/usr/bin/dpkg") (search-input-file inputs "/bin/dpkg")))
@@ -277,6 +283,8 @@ (define-public debootstrap
                  (substitute* (find-files "scripts")
                    (("keyring.*(debian-archive-keyring.gpg)"_ keyring)
                     (string-append "keyring " debian "/share/keyrings/" keyring))
+                   (("keyring.*(trisquel-archive-keyring.gpg)" _ keyring)
+                    (string-append "keyring " trisquel "/share/keyrings/" keyring))
                    (("keyring.*(ubuntu-archive-keyring.gpg)" _ keyring)
                     (string-append "keyring " ubuntu "/share/keyrings/" keyring)))
                  ;; Ensure PATH works both in guix and within the debian chroot
@@ -301,6 +309,7 @@ (define-public debootstrap
          #:tests? #f))  ; no tests
     (inputs
      (list debian-archive-keyring
+           trisquel-keyring
            ubuntu-keyring
            bash-minimal
            dpkg
-- 
2.41.0

[bug#68555] [PATCH 3/3] gnu: debootstrap: Add zstd dependency.

[Denis 'GNUtoo' Carikli]

Without that fix, the following command:
    # debootstrap aramo aramo-root http://archive.trisquel.info/trisquel
fails with this error:
    I: Chosen extractor for .deb packages: dpkg-deb
    I: Extracting base-files...
    E: Tried to extract package, but tar failed. Exit...

And if we run the falling command manually:
    # sudo dpkg-deb --fsys-tarfile [...]/cache/apt/archives/base-files[...].deb
it shows that zstd is missing (from the PATH):
    dpkg-deb (subprocess): unable to execute decompressing archive
    'var/cache/apt/archives/base-files[...].deb' (size=60544) member
    'data.tar' (zstd): No such file or directory

* gnu/packages/debian.scm (debootstrap): [inputs]: Add zstd.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Change-Id: If24c80c70c9ec3e6ea88a38a30324fee3c0641fe
---
 gnu/packages/debian.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm
index 7c2d7fedfb..4aa432abfa 100644
--- a/gnu/packages/debian.scm
+++ b/gnu/packages/debian.scm
@@ -314,7 +314,9 @@ (define-public debootstrap
            bash-minimal
            dpkg
            tzdata
-
+           ;; Needed by dpkg-deb in extract_dpkg_deb_data for at least
+           ;; Trisquel 11 (aramo).
+           zstd
            ;; Called at run-time from various places, needs to be in PATH.
            gnupg
            wget))
-- 
2.41.0

[bug#68555] [PATCH 1/3] gnu: Add trisquel-keyring.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 4191 bytes --]

I'm not against adding both keyrings, but they should be in separate
commits.  Also, are there scripts to build the keyrings (like debian) or
are there not really and its just the released keyring file?

On Thu, Jan 18, 2024 at 12:29:53AM +0100, Denis 'GNUtoo' Carikli wrote:
> * gnu/packages/debian.scm (trisquel-keyring): New variable.
> 
> Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
> ---
>  gnu/packages/debian.scm | 50 +++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 50 insertions(+)
> 
> diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm
> index de43182172..4e398f619c 100644
> --- a/gnu/packages/debian.scm
> +++ b/gnu/packages/debian.scm
> @@ -2,6 +2,7 @@
>  ;;; Copyright © 2018, 2020-2024 Efraim Flashner <efraim@flashner.co.il>
>  ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
>  ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
> +;;; Copyright © 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -24,6 +25,7 @@ (define-module (gnu packages debian)
>    #:use-module (guix git-download)
>    #:use-module (guix gexp)
>    #:use-module (guix packages)
> +  #:use-module (guix build-system copy)
>    #:use-module (guix build-system gnu)
>    #:use-module (guix build-system trivial)
>    #:use-module (gnu packages autotools)
> @@ -146,6 +148,54 @@ (define-public debian-ports-archive-keyring
>      ;; "The keys in the keyrings don't fall under any copyright."
>      (license license:public-domain)))
>  
> +(define-public pureos-archive-keyring
> +  (package
> +    (name "pureos-archive-keyring")
> +    (version "2021.11.0")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append
> +                    "https://repo.puri.sm/pureos/pool/main/p/pureos-archive-keyring/"
> +                    "pureos-archive-keyring_" version ".tar.xz"))
> +              (sha256
> +               (base32
> +                "1a0d084a98bycyhbw531646rbivvlfkdk6ldshl5dy6fvzmbci0d"))))
> +    (build-system copy-build-system)
> +    (arguments
> +     '(#:install-plan '(("keyrings/pureos-archive-keyring.gpg"
> +                         "share/keyrings/")
> +                        ("keyrings/pureos-archive-removed-keys.gpg"
> +                         "share/keyrings/"))))
> +    (home-page "https://source.puri.sm/pureos/core/pureos-archive-keyring")
> +    (synopsis "GnuPG archive keys of the Pureos archive")
> +    (description "The Pureos distribution signs its packages.  This package
> +contains the archive keys used for that.")
> +    (license (list license:public-domain ;; the keys
> +                   license:gpl2+))))     ;; see debian/copyright
> +
> +(define-public trisquel-keyring
> +  (package
> +    (name "trisquel-keyring")
> +    (version "2022.10.19")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append
> +                    "http://archive.trisquel.info/trisquel/"
> +                    "pool/main/t/trisquel-keyring/trisquel-keyring_"
> +                    version ".tar.gz"))
> +              (sha256
> +               (base32
> +                "1qkqm3wb945i2izm47xni21hi3ad807bvl106r2mnwdxnjs4ij08"))))
> +    (build-system copy-build-system)
> +    (arguments
> +     '(#:install-plan '(("keyrings/trisquel-archive-keyring.gpg"
> +                         "share/keyrings/"))))
> +    (home-page "http://archive.trisquel.info/trisquel/pool/main/t/trisquel-keyring")
> +    (synopsis "GnuPG archive keys of the Trisquel archive")
> +    (description "The Trisquel distribution signs its packages.  This package
> +contains the archive keys used for that.")
> +    (license license:gpl2+)))     ;; see debian/copyright
> +
>  (define-public ubuntu-keyring
>    (package
>      (name "ubuntu-keyring")
> -- 
> 2.41.0
> 
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

[bug#68555] [PATCH 1/3] gnu: Add trisquel-keyring.

[Denis 'GNUtoo' Carikli]

[-- Attachment #1: Type: text/plain, Size: 857 bytes --]

On Fri, 19 Jan 2024 11:38:49 +0200
Efraim Flashner <efraim@flashner.co.il> wrote:

> I'm not against adding both keyrings, but they should be in separate
> commits. 
Indeed. The PureOS keyring is a leftover from a previous version of
this patchset.

I originally added support for PureOS as well but at some point PureOS
changed the way their repository worked so that broke upstream
debootstrap. Here I forgot to remove the keyring package.

> Also, are there scripts to build the keyrings (like debian)
> or are there not really and its just the released keyring file?
Unfortunately Trisquel only provides a keyring file. It's also
available through git here:

https://gitlab.trisquel.org/trisquel/trisquel-packages/-/tree/master/extra/trisquel-keyring?ref_type=heads

I'll send a v2 of the patch set without pureos-keyring.

Denis.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#68555] [PATCH v2 1/3] gnu: Add trisquel-keyring.

[Denis 'GNUtoo' Carikli]

* gnu/packages/debian.scm (trisquel-keyring): New variable.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
ChangeLog since v1: 
- Remove (accidental adding of) pureos-keyring.
---
 gnu/packages/debian.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm
index de43182172..bd6baffa2f 100644
--- a/gnu/packages/debian.scm
+++ b/gnu/packages/debian.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2018, 2020-2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,6 +25,7 @@ (define-module (gnu packages debian)
   #:use-module (guix git-download)
   #:use-module (guix gexp)
   #:use-module (guix packages)
+  #:use-module (guix build-system copy)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system trivial)
   #:use-module (gnu packages autotools)
@@ -146,6 +148,29 @@ (define-public debian-ports-archive-keyring
     ;; "The keys in the keyrings don't fall under any copyright."
     (license license:public-domain)))
 
+(define-public trisquel-keyring
+  (package
+    (name "trisquel-keyring")
+    (version "2022.10.19")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://archive.trisquel.info/trisquel/"
+                    "pool/main/t/trisquel-keyring/trisquel-keyring_"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "1qkqm3wb945i2izm47xni21hi3ad807bvl106r2mnwdxnjs4ij08"))))
+    (build-system copy-build-system)
+    (arguments
+     '(#:install-plan '(("keyrings/trisquel-archive-keyring.gpg"
+                         "share/keyrings/"))))
+    (home-page "http://archive.trisquel.info/trisquel/pool/main/t/trisquel-keyring")
+    (synopsis "GnuPG archive keys of the Trisquel archive")
+    (description "The Trisquel distribution signs its packages.  This package
+contains the archive keys used for that.")
+    (license license:gpl2+)))     ;; see debian/copyright
+
 (define-public ubuntu-keyring
   (package
     (name "ubuntu-keyring")

base-commit: b3e0a973bca6fe5de7356f3d70c4b7d468b0a759
-- 
2.41.0

[bug#68555] [PATCH v2 2/3] gnu: debootstrap: use trisquel-keyring.

[Denis 'GNUtoo' Carikli]

* gnu/packages/debian.scm (debootstrap): [arguments]: In 'patch-source' phase,
    use trisquel-keyring.
  [inputs]: Add trisquel-keyring.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
ChangeLog since v1: no changes.
---
 gnu/packages/debian.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm
index bd6baffa2f..33c39e809e 100644
--- a/gnu/packages/debian.scm
+++ b/gnu/packages/debian.scm
@@ -233,6 +233,7 @@ (define-public debootstrap
            (add-after 'unpack 'patch-source
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let ((debian #$(this-package-input "debian-archive-keyring"))
+                     (trisquel #$(this-package-input "trisquel-keyring"))
                      (ubuntu #$(this-package-input "ubuntu-keyring")))
                  (substitute* "Makefile"
                    (("/usr") ""))
@@ -245,6 +246,11 @@ (define-public debootstrap
                    (("/usr") debian))
                  (substitute* "scripts/gutsy"
                    (("/usr") ubuntu))
+                 (substitute* "scripts/robur"
+                   (("/usr/share/keyrings/trisquel-archive-keyring.gpg")
+                    (string-append
+                     trisquel
+                     "/share/keyrings/trisquel-archive-keyring.gpg")))
                  (substitute* "debootstrap"
                    (("=/usr") (string-append "=" #$output))
                    (("/usr/bin/dpkg") (search-input-file inputs "/bin/dpkg")))
@@ -252,6 +258,8 @@ (define-public debootstrap
                  (substitute* (find-files "scripts")
                    (("keyring.*(debian-archive-keyring.gpg)"_ keyring)
                     (string-append "keyring " debian "/share/keyrings/" keyring))
+                   (("keyring.*(trisquel-archive-keyring.gpg)" _ keyring)
+                    (string-append "keyring " trisquel "/share/keyrings/" keyring))
                    (("keyring.*(ubuntu-archive-keyring.gpg)" _ keyring)
                     (string-append "keyring " ubuntu "/share/keyrings/" keyring)))
                  ;; Ensure PATH works both in guix and within the debian chroot
@@ -276,6 +284,7 @@ (define-public debootstrap
          #:tests? #f))  ; no tests
     (inputs
      (list debian-archive-keyring
+           trisquel-keyring
            ubuntu-keyring
            bash-minimal
            dpkg
-- 
2.41.0

[bug#68555] [PATCH v2 3/3] gnu: debootstrap: Add zstd dependency.

[Denis 'GNUtoo' Carikli]

Without that fix, the following command:
    # debootstrap aramo aramo-root http://archive.trisquel.info/trisquel
fails with this error:
    I: Chosen extractor for .deb packages: dpkg-deb
    I: Extracting base-files...
    E: Tried to extract package, but tar failed. Exit...

And if we run the falling command manually:
    # sudo dpkg-deb --fsys-tarfile [...]/cache/apt/archives/base-files[...].deb
it shows that zstd is missing (from the PATH):
    dpkg-deb (subprocess): unable to execute decompressing archive
    'var/cache/apt/archives/base-files[...].deb' (size=60544) member
    'data.tar' (zstd): No such file or directory

* gnu/packages/debian.scm (debootstrap): [inputs]: Add zstd.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Change-Id: If24c80c70c9ec3e6ea88a38a30324fee3c0641fe
---
ChangeLog since V1: no changes.
---
 gnu/packages/debian.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm
index 33c39e809e..1715b963a9 100644
--- a/gnu/packages/debian.scm
+++ b/gnu/packages/debian.scm
@@ -289,7 +289,9 @@ (define-public debootstrap
            bash-minimal
            dpkg
            tzdata
-
+           ;; Needed by dpkg-deb in extract_dpkg_deb_data for at least
+           ;; Trisquel 11 (aramo).
+           zstd
            ;; Called at run-time from various places, needs to be in PATH.
            gnupg
            wget))
-- 
2.41.0

[bug#68555] [PATCH 1/3] gnu: Add trisquel-keyring.

[Denis 'GNUtoo' Carikli]

[-- Attachment #1: Type: text/plain, Size: 640 bytes --]

On Wed, 24 Jan 2024 00:49:33 +0100
Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> wrote:
> I originally added support for PureOS as well but at some point PureOS
> changed the way their repository worked so that broke upstream
> debootstrap. Here I forgot to remove the keyring package.
I forgot to ask in my previous mail: Is there already an automatic tool
to detect mistakes like that (that I could run before sending patches)?

I have that in the commit message:
> * gnu/packages/debian.scm (trisquel-keyring): New variable.

But the patch shows something different where there is also an
additional package.

Denis.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#68555: [PATCH v2 1/3] gnu: Add trisquel-keyring.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 238 bytes --]

Thanks. Patches pushed.

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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