GNU bug report logs - #71327
[PATCH 1/8] gnu: libbytesize: Update to 2.10.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 71327 in the body.
You can then email your comments to 71327 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [PATCH 1/8] gnu: libbytesize: Update to 2.10.
Date: Sun,  2 Jun 2024 22:43:19 -0400

* gnu/packages/c.scm (libbytesize): Update to 2.10.

Change-Id: Id0640e9c118fcf3ced3f6c6aa145a0f15e4f07d8
---
 gnu/packages/c.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index d13b62b5e2..bb75dccf8e 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -404,7 +404,7 @@ (define-public python-pcpp
 (define-public libbytesize
   (package
     (name "libbytesize")
-    (version "2.6")
+    (version "2.10")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -412,7 +412,7 @@ (define-public libbytesize
                     "download/" version "/libbytesize-" version ".tar.gz"))
               (sha256
                (base32
-                "0h87ryi0mp8msq43h1cna453cqaw5knx1xaggfzm4fxvn8sjpapg"))))
+                "1lfa02ac96p12xxq75ilx3qk7kym4xrlqyfh26axb7y5iazf670x"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f))

base-commit: dc4c48f10281007a0ab3541b8a64198c60c6d5b0
-- 
2.45.1

Message #8 received at 71327 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: 71327 <at> debbugs.gnu.org
Cc: Sarah Morgensen <iskarian <at> mgsn.dev>,
 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [PATCH 3/8] gnu: libblockdev: Fix inputs.
Date: Mon,  3 Jun 2024 08:02:51 -0400

From: Sarah Morgensen <iskarian <at> mgsn.dev>

Add missing inputs; make util-linux a regular input since libblockdev
retains references to it.

* gnu/packages/disk.scm (libblockdev):
[native-inputs]: Move util-linu...
[inputs]: ... here.  Add bcache-tools, e2fsprogs, gptfdisk, multipath-tools,
and ntfs-3g.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Change-Id: I0eca44547a03e787e992e45ec4f71792e293868a
---
 gnu/packages/disk.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 10073864ed..2541828dd3 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -1208,23 +1208,28 @@ (define-public libblockdev
     (native-inputs
      (list gobject-introspection
            pkg-config
-           python-wrapper
-           util-linux))
+           python-wrapper))
     (inputs
-     (list btrfs-progs
+     (list bcache-tools
+           btrfs-progs
            cryptsetup
            dosfstools
            dmraid
+           e2fsprogs
            eudev
            glib
+           gptfdisk
            kmod
            libbytesize
            libyaml
            lvm2
            mdadm
+           multipath-tools
            ndctl
            nss
+           ntfs-3g
            parted
+           util-linux
            volume-key
            xfsprogs))
     (home-page "https://github.com/storaged-project/libblockdev")
-- 
2.45.1

Message #11 received at 71327 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: 71327 <at> debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [PATCH 6/8] gnu: udisks: Remove input labels.
Date: Mon,  3 Jun 2024 08:02:54 -0400

* gnu/packages/freedesktop.scm (udisks) [native-inputs]: Remove input labels.
[phases]: Remove trailing #t.

Change-Id: I805df6ac2e5ad96cf7a092d34354aefb12bd7586
---
 gnu/packages/freedesktop.scm | 67 +++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 6941450436..bb0858cd9e 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -27,7 +27,7 @@
 ;;; Copyright © 2021 Robby Zambito <contact <at> robbyzambito.me>
 ;;; Copyright © 2021, 2022, 2023 Maxime Devos <maximedevos <at> telenet.be>
 ;;; Copyright © 2021, 2022 John Kehayias <john.kehayias <at> protonmail.com>
-;;; Copyright © 2021, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2021, 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k <at> ruhr-uni-bochum.de>
 ;;; Copyright © 2022 Wamm K. D. <jaft.r <at> outlook.com>
 ;;; Copyright © 2022 Petr Hodina <phodina <at> protonmail.com>
@@ -1732,34 +1732,31 @@ (define-public udisks
                 "06cq52kp1nyy15qzylywy9s7hhhqc45k0s3y68crf0zsmjyng0yj"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("docbook-xml" ,docbook-xml-4.3) ; to build the manpages
-       ("docbook-xsl" ,docbook-xsl)
-       ("glib:bin" ,glib "bin")         ; for glib-mkenums
-       ("gnome-common" ,gnome-common)   ; TODO: Why is this needed?
-       ("gobject-introspection" ,gobject-introspection)
-       ("gtk-doc" ,gtk-doc/stable)
-       ("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)
-       ("xsltproc" ,libxslt)))
+     (list docbook-xml-4.3              ; to build the manpages
+           docbook-xsl
+           `(,glib "bin")               ; for glib-mkenums
+           gnome-common                 ; TODO: Why is this needed?
+           gobject-introspection
+           gtk-doc/stable
+           intltool
+           pkg-config
+           libxslt))
     (propagated-inputs
-     (list glib)) ; required by udisks2.pc
+     (list glib))                       ; required by udisks2.pc
     (inputs
-     `(,acl
-       ;; TODO(staging): Make unconditional.
-       ,@(if (%current-target-system)
-             (list bash-minimal) ; for wrap-program
-             '())
-       ,cryptsetup
-       ,libatasmart
-       ,libblockdev
-       ,libgudev
-       ,polkit
-       ,util-linux))
+     (list acl
+           bash-minimal
+           cryptsetup
+           libatasmart
+           libblockdev
+           libgudev
+           polkit
+           util-linux))
     (outputs '("out"
-               "doc"))                            ;5 MiB of gtk-doc HTML
+               "doc"))                  ;5 MiB of gtk-doc HTML
     (arguments
-     `(#:tests? #f ; requiring system message dbus
-       #:disallowed-references ("doc")            ;enforce separation of "doc"
+     `(#:tests? #f                      ; requiring system message dbus
+       #:disallowed-references ("doc")  ;enforce separation of "doc"
        #:configure-flags
        (list "--enable-man"
              "--enable-available-modules" ; Such as lvm2, btrfs, etc.
@@ -1786,15 +1783,14 @@ (define-public udisks
                               docbook-xml-catalog-file)))
        #:phases
        (modify-phases %standard-phases
-         (add-before
-          'configure 'fix-girdir
-          (lambda _
-            ;; Install introspection data to its own output.
-            (substitute* "udisks/Makefile.in"
-              (("girdir = .*")
-               "girdir = $(datadir)/gir-1.0\n")
-              (("typelibsdir = .*")
-               "typelibsdir = $(libdir)/girepository-1.0\n"))))
+         (add-before 'configure 'fix-girdir
+           (lambda _
+             ;; Install introspection data to its own output.
+             (substitute* "udisks/Makefile.in"
+               (("girdir = .*")
+                "girdir = $(datadir)/gir-1.0\n")
+               (("typelibsdir = .*")
+                "typelibsdir = $(libdir)/girepository-1.0\n"))))
          (add-after 'install 'wrap-udisksd
            (lambda* (#:key outputs inputs #:allow-other-keys)
              ;; Tell 'udisksd' where to find the 'mount' command.
@@ -1809,8 +1805,7 @@ (define-public udisks
                     ;; partitions, e.g. in gnome-disks
                     ,(string-append cryptsetup "/sbin")
                     "/run/current-system/profile/bin"
-                    "/run/current-system/profile/sbin")))
-               #t))))))
+                    "/run/current-system/profile/sbin")))))))))
     (home-page "https://www.freedesktop.org/wiki/Software/udisks/")
     (synopsis "Disk manager service")
     (description
-- 
2.45.1

Message #14 received at 71327 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: 71327 <at> debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [PATCH 7/8] gnu: udisks: Update to 2.10.1.
Date: Mon,  3 Jun 2024 08:02:55 -0400

* gnu/packages/freedesktop.scm (udisks): Update to 2.10.1.
[native-inputs]: Replace intltool with gettext-minimal.  Remove gnome-common.

Change-Id: I4fbc4f6949eb14763dad58dbccd9974793ea02f6
---
 gnu/packages/freedesktop.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index bb0858cd9e..063816282b 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1721,7 +1721,7 @@ (define-public libatasmart
 (define-public udisks
   (package
     (name "udisks")
-    (version "2.8.4")
+    (version "2.10.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1729,16 +1729,15 @@ (define-public udisks
                     version "/udisks-" version ".tar.bz2"))
               (sha256
                (base32
-                "06cq52kp1nyy15qzylywy9s7hhhqc45k0s3y68crf0zsmjyng0yj"))))
+                "1klf5pcr9yg8g88mwwh3q2j0idfwd8hfr2q6nknhsm02yv638mxp"))))
     (build-system gnu-build-system)
     (native-inputs
      (list docbook-xml-4.3              ; to build the manpages
            docbook-xsl
+           gettext-minimal
            `(,glib "bin")               ; for glib-mkenums
-           gnome-common                 ; TODO: Why is this needed?
            gobject-introspection
            gtk-doc/stable
-           intltool
            pkg-config
            libxslt))
     (propagated-inputs
-- 
2.45.1

Message #17 received at 71327 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: 71327 <at> debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [PATCH 8/8] gnu: udisks: Remove obsolete wrap-udisksd phase.
Date: Mon,  3 Jun 2024 08:02:56 -0400

The tools are now patched in the libblockdev plugin sources directly.

* gnu/packages/freedesktop.scm (udisks) [phases]: Delete the wrap-udisksd
phase.

Change-Id: I0de4016adb0cb8af2dca4ef9ebec82e5951b689c
---
 gnu/packages/freedesktop.scm | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 063816282b..39ca00296e 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1789,22 +1789,7 @@ (define-public udisks
                (("girdir = .*")
                 "girdir = $(datadir)/gir-1.0\n")
                (("typelibsdir = .*")
-                "typelibsdir = $(libdir)/girepository-1.0\n"))))
-         (add-after 'install 'wrap-udisksd
-           (lambda* (#:key outputs inputs #:allow-other-keys)
-             ;; Tell 'udisksd' where to find the 'mount' command.
-             (let ((out   (assoc-ref outputs "out"))
-                   (utils (assoc-ref inputs "util-linux"))
-                   (cryptsetup (assoc-ref inputs "cryptsetup"))
-                   (parted (assoc-ref inputs "parted")))
-               (wrap-program (string-append out "/libexec/udisks2/udisksd")
-                 `("PATH" ":" prefix
-                   (,(string-append utils "/bin") ;for 'mount'
-                    ;; cryptsetup is required for setting encrypted
-                    ;; partitions, e.g. in gnome-disks
-                    ,(string-append cryptsetup "/sbin")
-                    "/run/current-system/profile/bin"
-                    "/run/current-system/profile/sbin")))))))))
+                "typelibsdir = $(libdir)/girepository-1.0\n")))))))
     (home-page "https://www.freedesktop.org/wiki/Software/udisks/")
     (synopsis "Disk manager service")
     (description
-- 
2.45.1

Message #20 received at 71327 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: 71327 <at> debbugs.gnu.org
Cc: Sarah Morgensen <iskarian <at> mgsn.dev>,
 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [PATCH 2/8] gnu: libblockdev: Embed executable paths.
Date: Mon,  3 Jun 2024 08:02:50 -0400

From: Sarah Morgensen <iskarian <at> mgsn.dev>

* gnu/packages/disk.scm (libblockdev)[arguments]<#:phases>: Add
'patch-plugin-paths' phase.

Fixes: <https://bugs.gnu.org/33896>.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Change-Id: I96f9e2f03650b22ffef5a7fe091159450e4c5b67
---
 gnu/packages/disk.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 10d546b918..10073864ed 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2021 Mathieu Othacehe <othacehe <at> gnu.org>
 ;;; Copyright © 2021 Brice Waegeneire <brice <at> waegenei.re>
 ;;; Copyright © 2021 Justin Veilleux <terramorpha <at> cock.li>
+;;; Copyright © 2021 Sarah Morgensen <iskarian <at> mgsn.dev>
 ;;; Copyright © 2014, 2022 Ludovic Courtès <ludo <at> gnu.org>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2022 Disseminate Dissent <disseminatedissent <at> protonmail.com>
@@ -29,6 +30,7 @@
 ;;; Copyright © 2023 Morgan Smith <Morgan.J.Smith <at> outlook.com>
 ;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
 ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus <at> gmail.com>
+
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1196,7 +1198,13 @@ (define-public libblockdev
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
               (substitute* "src/lib/blockdev.c"
-               (("/etc/libblockdev/conf.d/" path) (string-append out path)))))))))
+                (("/etc/libblockdev/conf.d/" path) (string-append out path))))))
+         (add-after 'unpack 'patch-plugin-paths
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* (find-files "src/plugins" "\\.c$")
+               (("(gchar \\*arg.+\\{\")([^\"]+)" all start program)
+                ;; XXX: Use 'search-input-file' when available.
+                (string-append start (or (which program) program)))))))))
     (native-inputs
      (list gobject-introspection
            pkg-config
-- 
2.45.1

Message #23 received at 71327 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: 71327 <at> debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [PATCH 5/8] gnu: libblockdev: Use gexps.
Date: Mon,  3 Jun 2024 08:02:53 -0400

* gnu/packages/disk.scm (libblockdev)
[phases]: Use gexps.
{patch-plugin-paths}: Use search-input-file.

Change-Id: I61f9b3dfdd4dc249fb0f59abb99826a8e759bb42
---
 gnu/packages/disk.scm | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 7fbd6a52d7..1cdeb53597 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -1192,19 +1192,26 @@ (define-public libblockdev
                 "1ny2glwmb5dcdv2x0giinbyma9fhk59z8117k1kr15pm7yjk7jx5"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-configuration-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-configuration-directory
+            (lambda _
               (substitute* "src/lib/blockdev.c"
-                (("/etc/libblockdev/conf.d/" path) (string-append out path))))))
-         (add-after 'unpack 'patch-plugin-paths
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* (find-files "src/plugins" "\\.c$")
-               (("(gchar \\*arg.+\\{\")([^\"]+)" all start program)
-                ;; XXX: Use 'search-input-file' when available.
-                (string-append start (or (which program) program)))))))))
+                (("/etc/libblockdev/conf.d/" path)
+                 (string-append #$output path)))))
+          (add-after 'unpack 'patch-plugin-paths
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* (find-files "src/plugins" "\\.c$")
+                (("(gchar \\*arg.+\\{\")([^\"]+)" all start program)
+                 (string-append
+                  start (or (false-if-exception
+                             (search-input-file inputs
+                                                (string-append "bin/" program)))
+                            (false-if-exception
+                             (search-input-file inputs
+                                                (string-append "sbin/" program)))
+                            program)))))))))
     (native-inputs
      (list gobject-introspection
            pkg-config
-- 
2.45.1

Message #26 received at 71327 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: 71327 <at> debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [PATCH 4/8] gnu: libblockdev: Update to 3.1.1.
Date: Mon,  3 Jun 2024 08:02:52 -0400

* gnu/packages/disk.scm (libblockdev): Update to 3.1.1.
[inputs]: Add keyutils and libnvme.

Change-Id: I6b229426531d584669a50b02c0c5acef9021a2fa
---
 gnu/packages/disk.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 2541828dd3..7fbd6a52d7 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -24,7 +24,7 @@
 ;;; Copyright © 2021 Justin Veilleux <terramorpha <at> cock.li>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian <at> mgsn.dev>
 ;;; Copyright © 2014, 2022 Ludovic Courtès <ludo <at> gnu.org>
-;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2022, 2024 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2022 Disseminate Dissent <disseminatedissent <at> protonmail.com>
 ;;; Copyright © 2023 Timotej Lazar <timotej.lazar <at> araneo.si>
 ;;; Copyright © 2023 Morgan Smith <Morgan.J.Smith <at> outlook.com>
@@ -1181,7 +1181,7 @@ (define-public dmraid
 (define-public libblockdev
   (package
     (name "libblockdev")
-    (version "2.28")
+    (version "3.1.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/storaged-project/"
@@ -1189,7 +1189,7 @@ (define-public libblockdev
                                   version "-1/libblockdev-" version ".tar.gz"))
               (sha256
                (base32
-                "1x3xbgd2dyjhcqvyalpnrp727xidfxmaxgyyvv5gwx4aw90wijc2"))))
+                "1ny2glwmb5dcdv2x0giinbyma9fhk59z8117k1kr15pm7yjk7jx5"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
@@ -1219,8 +1219,10 @@ (define-public libblockdev
            eudev
            glib
            gptfdisk
+           keyutils
            kmod
            libbytesize
+           libnvme
            libyaml
            lvm2
            mdadm
-- 
2.45.1

Message #29 received at 71327 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 71327 <at> debbugs.gnu.org
Cc: iskarian <at> mgsn.dev, Nicolas Graves <ngraves <at> ngraves.fr>,
 maxim.cournoyer <at> gmail.com
Subject: [PATCH v2 0/7] gnu: udisks: Update to 3.1.1. [security fixes]
Date: Mon,  7 Oct 2024 22:12:26 +0200

Maxim Cournoyer (5):
  gnu: libbytesize: Update to 2.10.
  gnu: libblockdev: Update to 3.1.1.
  gnu: libblockdev: Use gexps.
  gnu: udisks: Update to 2.10.1.
  gnu: udisks: Remove obsolete wrap-udisksd phase.

Sarah Morgensen (2):
  gnu: libblockdev: Embed executable paths.
  gnu: libblockdev: Fix inputs.

 gnu/packages/c.scm           |  4 ++--
 gnu/packages/disk.scm        | 44 +++++++++++++++++++++++++++---------
 gnu/packages/freedesktop.scm | 23 ++++---------------
 3 files changed, 39 insertions(+), 32 deletions(-)

-- 
2.46.0

Message #32 received at 71327 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 71327 <at> debbugs.gnu.org
Cc: iskarian <at> mgsn.dev, maxim.cournoyer <at> gmail.com
Subject: [PATCH v2 1/7] gnu: libbytesize: Update to 2.10.
Date: Mon,  7 Oct 2024 22:12:27 +0200

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

* gnu/packages/c.scm (libbytesize): Update to 2.10.

Change-Id: Id0640e9c118fcf3ced3f6c6aa145a0f15e4f07d8
---
 gnu/packages/c.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index 7c93676f0c..9a9691a81a 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -436,7 +436,7 @@ (define-public aml
 (define-public libbytesize
   (package
     (name "libbytesize")
-    (version "2.6")
+    (version "2.10")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -444,7 +444,7 @@ (define-public libbytesize
                     "download/" version "/libbytesize-" version ".tar.gz"))
               (sha256
                (base32
-                "0h87ryi0mp8msq43h1cna453cqaw5knx1xaggfzm4fxvn8sjpapg"))))
+                "1lfa02ac96p12xxq75ilx3qk7kym4xrlqyfh26axb7y5iazf670x"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f))
-- 
2.46.0

Message #35 received at 71327 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 71327 <at> debbugs.gnu.org
Cc: iskarian <at> mgsn.dev, maxim.cournoyer <at> gmail.com
Subject: [PATCH v2 2/7] gnu: libblockdev: Embed executable paths.
Date: Mon,  7 Oct 2024 22:12:28 +0200

From: Sarah Morgensen <iskarian <at> mgsn.dev>

* gnu/packages/disk.scm (libblockdev)[arguments]<#:phases>: Add
'patch-plugin-paths' phase.

Fixes: <https://bugs.gnu.org/33896>.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Change-Id: I96f9e2f03650b22ffef5a7fe091159450e4c5b67
---
 gnu/packages/disk.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 0f3bf10ffa..fa1b87127b 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2021 Mathieu Othacehe <othacehe <at> gnu.org>
 ;;; Copyright © 2021 Brice Waegeneire <brice <at> waegenei.re>
 ;;; Copyright © 2021 Justin Veilleux <terramorpha <at> cock.li>
+;;; Copyright © 2021 Sarah Morgensen <iskarian <at> mgsn.dev>
 ;;; Copyright © 2014, 2022 Ludovic Courtès <ludo <at> gnu.org>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2022 Disseminate Dissent <disseminatedissent <at> protonmail.com>
@@ -29,6 +30,7 @@
 ;;; Copyright © 2023 Morgan Smith <Morgan.J.Smith <at> outlook.com>
 ;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
 ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus <at> gmail.com>
+
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1195,7 +1197,13 @@ (define-public libblockdev
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
               (substitute* "src/lib/blockdev.c"
-               (("/etc/libblockdev/conf.d/" path) (string-append out path)))))))))
+                (("/etc/libblockdev/conf.d/" path) (string-append out path))))))
+         (add-after 'unpack 'patch-plugin-paths
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* (find-files "src/plugins" "\\.c$")
+               (("(gchar \\*arg.+\\{\")([^\"]+)" all start program)
+                ;; XXX: Use 'search-input-file' when available.
+                (string-append start (or (which program) program)))))))))
     (native-inputs
      (list gobject-introspection
            pkg-config
-- 
2.46.0

Message #38 received at 71327 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 71327 <at> debbugs.gnu.org
Cc: iskarian <at> mgsn.dev, maxim.cournoyer <at> gmail.com
Subject: [PATCH v2 3/7] gnu: libblockdev: Fix inputs.
Date: Mon,  7 Oct 2024 22:12:29 +0200

From: Sarah Morgensen <iskarian <at> mgsn.dev>

Add missing inputs; make util-linux a regular input since libblockdev
retains references to it.

* gnu/packages/disk.scm (libblockdev):
[native-inputs]: Move util-linux...
[inputs]: ... here.  Add bcache-tools, e2fsprogs, gptfdisk, multipath-tools,
and ntfs-3g.
---
 gnu/packages/disk.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index fa1b87127b..7197af0d99 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -1207,24 +1207,29 @@ (define-public libblockdev
     (native-inputs
      (list gobject-introspection
            pkg-config
-           python-wrapper
-           util-linux))
+           python-wrapper))
     (inputs
      (append
       (cons cryptsetup (libcryptsetup-propagated-inputs))
-      (list btrfs-progs
+      (list bcache-tools
+            btrfs-progs
             dosfstools
             dmraid
+            e2fsprogs
             eudev
             glib
+            gptfdisk
             kmod
             libbytesize
             libyaml
             lvm2
             mdadm
+            multipath-tools
             ndctl
             nss
+            ntfs-3g
             parted
+            util-linux
             volume-key
             xfsprogs)))
     (home-page "https://github.com/storaged-project/libblockdev")
-- 
2.46.0

Message #41 received at 71327 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 71327 <at> debbugs.gnu.org
Cc: iskarian <at> mgsn.dev, maxim.cournoyer <at> gmail.com
Subject: [PATCH v2 4/7] gnu: libblockdev: Update to 3.1.1.
Date: Mon,  7 Oct 2024 22:12:30 +0200

From: Sarah Morgensen <iskarian <at> mgsn.dev>

 * gnu/packages/disk.scm (libblockdev): Update to 3.1.1.
 [inputs]: Add keyutils and libnvme.
---
 gnu/packages/disk.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 7197af0d99..1278eb2aca 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -1180,7 +1180,7 @@ (define-public dmraid
 (define-public libblockdev
   (package
     (name "libblockdev")
-    (version "2.28")
+    (version "3.1.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/storaged-project/"
@@ -1188,7 +1188,7 @@ (define-public libblockdev
                                   version "-1/libblockdev-" version ".tar.gz"))
               (sha256
                (base32
-                "1x3xbgd2dyjhcqvyalpnrp727xidfxmaxgyyvv5gwx4aw90wijc2"))))
+                "1ny2glwmb5dcdv2x0giinbyma9fhk59z8117k1kr15pm7yjk7jx5"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
@@ -1219,8 +1219,10 @@ (define-public libblockdev
             eudev
             glib
             gptfdisk
+            keyutils
             kmod
             libbytesize
+            libnvme
             libyaml
             lvm2
             mdadm
-- 
2.46.0

Message #44 received at 71327 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 71327 <at> debbugs.gnu.org
Cc: iskarian <at> mgsn.dev, maxim.cournoyer <at> gmail.com
Subject: [PATCH v2 5/7] gnu: libblockdev: Use gexps.
Date: Mon,  7 Oct 2024 22:12:31 +0200

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

* gnu/packages/disk.scm (libblockdev)
[phases]: Use gexps.
{patch-plugin-paths}: Use search-input-file.

Change-Id: I61f9b3dfdd4dc249fb0f59abb99826a8e759bb42
---
 gnu/packages/disk.scm | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 1278eb2aca..e9b21763e1 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -1191,19 +1191,26 @@ (define-public libblockdev
                 "1ny2glwmb5dcdv2x0giinbyma9fhk59z8117k1kr15pm7yjk7jx5"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-configuration-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-configuration-directory
+            (lambda _
               (substitute* "src/lib/blockdev.c"
-                (("/etc/libblockdev/conf.d/" path) (string-append out path))))))
-         (add-after 'unpack 'patch-plugin-paths
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* (find-files "src/plugins" "\\.c$")
-               (("(gchar \\*arg.+\\{\")([^\"]+)" all start program)
-                ;; XXX: Use 'search-input-file' when available.
-                (string-append start (or (which program) program)))))))))
+                (("/etc/libblockdev/conf.d/" path)
+                 (string-append #$output path)))))
+          (add-after 'unpack 'patch-plugin-paths
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* (find-files "src/plugins" "\\.c$")
+                (("(gchar \\*arg.+\\{\")([^\"]+)" all start program)
+                 (string-append
+                  start (or (false-if-exception
+                             (search-input-file inputs
+                                                (string-append "bin/" program)))
+                            (false-if-exception
+                             (search-input-file inputs
+                                                (string-append "sbin/" program)))
+                            program)))))))))
     (native-inputs
      (list gobject-introspection
            pkg-config
-- 
2.46.0

Message #47 received at 71327 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 71327 <at> debbugs.gnu.org
Cc: iskarian <at> mgsn.dev, maxim.cournoyer <at> gmail.com
Subject: [PATCH v2 6/7] gnu: udisks: Update to 2.10.1.
Date: Mon,  7 Oct 2024 22:12:32 +0200

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

* gnu/packages/freedesktop.scm (udisks): Update to 2.10.1.
[native-inputs]: Replace intltool with gettext-minimal.  Remove gnome-common.

Change-Id: I4fbc4f6949eb14763dad58dbccd9974793ea02f6
---
 gnu/packages/freedesktop.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 6760cddb3e..14c0482496 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1750,7 +1750,7 @@ (define-public libatasmart
 (define-public udisks
   (package
     (name "udisks")
-    (version "2.8.4")
+    (version "2.10.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1758,16 +1758,15 @@ (define-public udisks
                     version "/udisks-" version ".tar.bz2"))
               (sha256
                (base32
-                "06cq52kp1nyy15qzylywy9s7hhhqc45k0s3y68crf0zsmjyng0yj"))))
+                "1klf5pcr9yg8g88mwwh3q2j0idfwd8hfr2q6nknhsm02yv638mxp"))))
     (build-system gnu-build-system)
     (native-inputs
      (list docbook-xml-4.3              ; to build the manpages
            docbook-xsl
+           gettext-minimal
            `(,glib "bin")               ; for glib-mkenums
-           gnome-common                 ; TODO: Why is this needed?
            gobject-introspection
            gtk-doc/stable
-           intltool
            pkg-config
            libxslt))
     (propagated-inputs
-- 
2.46.0

Message #50 received at 71327 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 71327 <at> debbugs.gnu.org
Cc: iskarian <at> mgsn.dev, maxim.cournoyer <at> gmail.com
Subject: [PATCH v2 7/7] gnu: udisks: Remove obsolete wrap-udisksd phase.
Date: Mon,  7 Oct 2024 22:12:33 +0200

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

The tools are now patched in the libblockdev plugin sources directly.

* gnu/packages/freedesktop.scm (udisks) [phases]: Delete the wrap-udisksd
phase.
---
 gnu/packages/freedesktop.scm | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 14c0482496..0ab0bb5104 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1804,21 +1804,7 @@ (define-public udisks
                 (("girdir = .*")
                  "girdir = $(datadir)/gir-1.0\n")
                 (("typelibsdir = .*")
-                 "typelibsdir = $(libdir)/girepository-1.0\n"))))
-          (add-after 'install 'wrap-udisksd
-            (lambda _
-              ;; Tell 'udisksd' where to find the 'mount' command.
-              (let ((utils #$(this-package-input "util-linux"))
-                    (cryptsetup #$(this-package-input "cryptsetup"))
-                    (parted #$(this-package-input "parted")))
-                (wrap-program (string-append #$output "/libexec/udisks2/udisksd")
-                  `("PATH" ":" prefix
-                    (,(string-append utils "/bin") ;for 'mount'
-                     ;; cryptsetup is required for setting encrypted
-                     ;; partitions, e.g. in gnome-disks
-                     ,(string-append cryptsetup "/sbin")
-                     "/run/current-system/profile/bin"
-                     "/run/current-system/profile/sbin")))))))))
+                 "typelibsdir = $(libdir)/girepository-1.0\n")))))))
     (home-page "https://www.freedesktop.org/wiki/Software/udisks/")
     (synopsis "Disk manager service")
     (description
-- 
2.46.0

Message #55 received at 71327-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Nicolas Graves <ngraves <at> ngraves.fr>
Cc: iskarian <at> mgsn.dev, maxim.cournoyer <at> gmail.com, 71327-done <at> debbugs.gnu.org
Subject: Re: [bug#71327] [PATCH v2 0/7] gnu: udisks: Update to 3.1.1.
 [security fixes]
Date: Wed, 16 Oct 2024 19:25:08 +0200

Hi,

Nicolas Graves <ngraves <at> ngraves.fr> skribis:

> Maxim Cournoyer (5):
>   gnu: libbytesize: Update to 2.10.
>   gnu: libblockdev: Update to 3.1.1.
>   gnu: libblockdev: Use gexps.
>   gnu: udisks: Update to 2.10.1.
>   gnu: udisks: Remove obsolete wrap-udisksd phase.
>
> Sarah Morgensen (2):
>   gnu: libblockdev: Embed executable paths.
>   gnu: libblockdev: Fix inputs.

Finally applied.  Thanks to the three of you! :-)

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.