[PATCH] distro: Add util-linux.

[PATCH] distro: Add util-linux.

[Nikita Karetnikov]

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

Hi,

There are some issues:

1. './pre-inst-env guix-build -K util-linux' raises the following
warning:

kdupexe: warning: no binary for interpreter `@PERL@' found in $PATH

(Yep, I've already tried to add 'perl' as input.)

2. I'm not sure that this formatting

(uri (string-append "mirror://kernel.org/linux/utils/"
	                name "/v" version "/"
                    name "-" version ".2" ".tar.xz"))

is valid for the following mirrors:

(kernel.org
 "http://www.all.kernel.org/pub/"
 "http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/"
 "http://linux-kernel.uio.no/pub/"
 "http://kernel.osuosl.org/pub/"
 "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/")

As far as I can tell, it only works for kernel.org. How to check this?

3. 'util-linux' uses a lot of licenses. According to
'README.licensing', it uses GPLv3+, GPLv2+, GPLv2, LGPLv2+, BSD with
advertising, and Public Domain. GPLv2+ is the default license for code
without an explicitly defined license.

I've found a file that uses the Expat license
(i.e. 'util-linux-2.21.2/config/install-sh') and some files with
suspicious licenses.

Examples:

'util-linux-2.21.2/disk-utils/mkfs.bfs.8':

.\" Copyright 1999 Andries E. Brouwer (aeb@cwi.nl)
.\" May be freely distributed.

What does "free" mean in this context?

'util-linux-2.21.2/disk-utils/mkfs.minix.c':

* (C) 1991 Linus Torvalds. This file may be redistributed as per
* the Linux copyright.

And what does the above mean?

These examples show that we can't rely on 'README.licensing'. I guess
that we can use regexps to match against the licenses that are listed
in 'README.licensing' and check the rest manually.

What would you use?

4. It's necessary to do the following to force Guix to rebuild a
package:

nix-store --delete /nix/store/*-util-linux-2.21.tar.xz
nix-store --delete /nix/store/*-util-linux-2.21
./pre-inst-env guix-build -K util-linux

Is this a bug?

Nikita

[-- Attachment #2: 0001-distro-Add-util-linux.patch --]
[-- Type: text/x-diff, Size: 3301 bytes --]

From aa8bd9692fe769ef330b8b6fc3675c5390ccb017 Mon Sep 17 00:00:00 2001
From: Nikita Karetnikov <nikita@karetnikov.org>
Date: Sun, 2 Dec 2012 04:22:33 +0000
Subject: [PATCH] distro: Add util-linux.

* distro/packages/util-linux.scm: New file.
* Makefile.am (MODULES): Add it.
---
 Makefile.am                    |    1 +
 distro/packages/util-linux.scm |   52 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 0 deletions(-)
 create mode 100644 distro/packages/util-linux.scm

diff --git a/Makefile.am b/Makefile.am
index 8bb3b55..4ecd645 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,6 +82,7 @@ MODULES =					\
   distro/packages/system.scm			\
   distro/packages/texinfo.scm			\
   distro/packages/time.scm			\
+  distro/packages/util-linux.scm		\
   distro/packages/wget.scm			\
   distro/packages/which.scm			\
   distro/packages/zile.scm
diff --git a/distro/packages/util-linux.scm b/distro/packages/util-linux.scm
new file mode 100644
index 0000000..ad6b03b
--- /dev/null
+++ b/distro/packages/util-linux.scm
@@ -0,0 +1,52 @@
+;;; Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
+;;; Copyright (C) 2012 Nikita Karetnikov <nikita@karetnikov.org>
+;;;
+;;; This file is part of Guix.
+;;;
+;;; Guix 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.
+;;;
+;;; Guix 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 Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (distro packages util-linux)
+  #:use-module (distro packages compression)
+  #:use-module (distro packages ncurses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu))
+
+(define-public util-linux
+  (package
+    (name "util-linux")
+    (version "2.21")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://kernel.org/linux/utils/"
+                          name "/v" version "/"
+                          name "-" version ".2" ".tar.xz"))
+      (sha256
+       (base32
+        "1rpgghf7n0zx0cdy8hibr41wvkm2qp1yvd8ab1rxr193l1jmgcir"))))
+    (build-system gnu-build-system)
+    (arguments `(#:configure-flags '("--disable-use-tty-group")))
+    (inputs `(("zlib" ,zlib)
+              ("ncurses" ,ncurses)))
+    (home-page "https://www.kernel.org/pub/linux/utils/util-linux/")
+    (synopsis
+     "util-linux is a random collection of utilities for the Linux kernel")
+    (description
+     "util-linux is a random collection of utilities for the Linux kernel.")
+    ;; Note that util-linux doesn't use the same license for all the
+    ;; code. GPLv2+ is the default license for a code without an
+    ;; explicitly defined license.
+    (license '("GPLv3+" "GPLv2+" "GPLv2" "LGPLv2+"
+               "BSD-original" "Expat" "Public Domain"))))
\ No newline at end of file
-- 
1.7.5.4

Re: [PATCH] distro: Add util-linux.

[Ludovic Courtès]

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

Hi Nikita,

Nikita Karetnikov <nikita.karetnikov@gmail.com> skribis:

> There are some issues:
>
> 1. './pre-inst-env guix-build -K util-linux' raises the following
> warning:
>
> kdupexe: warning: no binary for interpreter `@PERL@' found in $PATH

A bug in util-linux’s build system.

I worked around it like this:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1479 bytes --]

diff --git a/distro/packages/util-linux.scm b/distro/packages/util-linux.scm
index ad6b03b..bc91839 100644
--- a/distro/packages/util-linux.scm
+++ b/distro/packages/util-linux.scm
@@ -19,6 +19,7 @@
 (define-module (distro packages util-linux)
   #:use-module (distro packages compression)
   #:use-module (distro packages ncurses)
+  #:use-module (distro packages perl)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
@@ -37,9 +38,19 @@
        (base32
         "1rpgghf7n0zx0cdy8hibr41wvkm2qp1yvd8ab1rxr193l1jmgcir"))))
     (build-system gnu-build-system)
-    (arguments `(#:configure-flags '("--disable-use-tty-group")))
+    (arguments
+     `(#:configure-flags '("--disable-use-tty-group")
+       #:phases (alist-cons-after
+                 'install 'patch-chkdupexe
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (let ((out (assoc-ref outputs "out")))
+                     (substitute* (string-append out "/bin/chkdupexe")
+                       ;; Allow `patch-shebang' to do its work.
+                       (("@PERL@") "/bin/perl"))))
+                 %standard-phases)))
     (inputs `(("zlib" ,zlib)
-              ("ncurses" ,ncurses)))
+              ("ncurses" ,ncurses)
+              ("perl" ,perl)))
     (home-page "https://www.kernel.org/pub/linux/utils/util-linux/")
     (synopsis
      "util-linux is a random collection of utilities for the Linux kernel")

[-- Attachment #3: Type: text/plain, Size: 3757 bytes --]


The #:phases thing inserts a phase right after the “make install” phase.
That new phase modifies the installed ‘chkdupexe’ to replace @PERL@ by
/bin/perl.  The ‘patch-shebang’ phase happens just after, and it
automatically replaces /bin/perl by /nix/store/...-perl/bin/perl.

Could you send an updated patch with this fix, and which adds util-linux
to ‘linux.scm’ instead?  The idea is to have all Linux-related tools in
there.

> 2. I'm not sure that this formatting
>
> (uri (string-append "mirror://kernel.org/linux/utils/"
> 	                name "/v" version "/"
>                     name "-" version ".2" ".tar.xz"))
>
> is valid for the following mirrors:
>
> (kernel.org
>  "http://www.all.kernel.org/pub/"
>  "http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/"
>  "http://linux-kernel.uio.no/pub/"
>  "http://kernel.osuosl.org/pub/"
>  "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/")
>
> As far as I can tell, it only works for kernel.org. How to check this?

The ‘mirror://kernel.org/’ prefix expands to the above mirror URLs.  See
‘url-fetch’ in (guix build download) for details.

> 3. 'util-linux' uses a lot of licenses. According to
> 'README.licensing', it uses GPLv3+, GPLv2+, GPLv2, LGPLv2+, BSD with
> advertising, and Public Domain. GPLv2+ is the default license for code
> without an explicitly defined license.
>
> I've found a file that uses the Expat license
> (i.e. 'util-linux-2.21.2/config/install-sh') and some files with
> suspicious licenses.

‘install-sh’ comes from Automake.

> Examples:
>
> 'util-linux-2.21.2/disk-utils/mkfs.bfs.8':
>
> .\" Copyright 1999 Andries E. Brouwer (aeb@cwi.nl)
> .\" May be freely distributed.
>
> What does "free" mean in this context?
>
> 'util-linux-2.21.2/disk-utils/mkfs.minix.c':
>
> * (C) 1991 Linus Torvalds. This file may be redistributed as per
> * the Linux copyright.
>
> And what does the above mean?

I think it means that these people had no clue but that they intended to
make it GPLv2.

Another funny one is ‘chkdupexe’:

  # Copyright 1993 Nicolai Langfeldt. janl@math.uio.no
  #  Distribute under gnu copyleft (included in perl package) 

> These examples show that we can't rely on 'README.licensing'. I guess
> that we can use regexps to match against the licenses that are listed
> in 'README.licensing' and check the rest manually.
>
> What would you use?

For this kind of questions, I’d first check the list at
<http://libreplanet.org/wiki/Software_blacklist>, and then ask for
advice on the gnu-linux-libre list (see
<http://lists.nongnu.org/mailman/listinfo/gnu-linux-libre>), which is
where people knowledgeable in this area are.

Now, my guess is that util-linux is OK, just hacked up with lack of
rigor.  ;-)

> 4. It's necessary to do the following to force Guix to rebuild a
> package:
>
> nix-store --delete /nix/store/*-util-linux-2.21.tar.xz
> nix-store --delete /nix/store/*-util-linux-2.21
> ./pre-inst-env guix-build -K util-linux
>
> Is this a bug?

No, it’s a feature!  :-)

Nix and Guix work on the assumption that builds are deterministic.  This
allows them to cache successful build results (and even build failures,
but this is not enabled by default.)

In fact, in the example above, you can build util-linux as many times as
you want, and you’ll most likely always get the same result, bit-by-bit.

In the event where a build process is non-deterministic, deleting the
results as shown above will allow you to restart the build, and maybe
notice that you get a different result.  That is rare enough in
practice, and usually a sign of a bug in the package’s build system.

Thanks,
Ludo’.

Re: [PATCH] distro: Add util-linux.

[Simon Josefsson]

Nikita Karetnikov <nikita.karetnikov@gmail.com> writes:

> 3. 'util-linux' uses a lot of licenses. According to
> 'README.licensing', it uses GPLv3+, GPLv2+, GPLv2, LGPLv2+, BSD with
> advertising, and Public Domain. GPLv2+ is the default license for code
> without an explicitly defined license.

Btw, what tools from util-linux is it that you believe are important?
If the licensing situation is unclear, maybe those could be moved to
some GNU project (CoreUtils/InetUtils/...?).

/Simon

Re: [PATCH] distro: Add util-linux.

[Ludovic Courtès]

Hi,

Simon Josefsson <simon@josefsson.org> skribis:

> Nikita Karetnikov <nikita.karetnikov@gmail.com> writes:
>
>> 3. 'util-linux' uses a lot of licenses. According to
>> 'README.licensing', it uses GPLv3+, GPLv2+, GPLv2, LGPLv2+, BSD with
>> advertising, and Public Domain. GPLv2+ is the default license for code
>> without an explicitly defined license.
>
> Btw, what tools from util-linux is it that you believe are important?
> If the licensing situation is unclear, maybe those could be moved to
> some GNU project (CoreUtils/InetUtils/...?).

Unfortunately, Coreutils is no longer sufficient:

  http://lists.gnu.org/archive/html/coreutils/2012-05/msg00101.html

And IIRC the latest Ineutils release lacks a few tools compared to
net-tools, no?

Thanks,
Ludo’.

Re: [PATCH] distro: Add util-linux.

[Simon Josefsson]

ludo@gnu.org (Ludovic Courtès) writes:

> Hi,
>
> Simon Josefsson <simon@josefsson.org> skribis:
>
>> Nikita Karetnikov <nikita.karetnikov@gmail.com> writes:
>>
>>> 3. 'util-linux' uses a lot of licenses. According to
>>> 'README.licensing', it uses GPLv3+, GPLv2+, GPLv2, LGPLv2+, BSD with
>>> advertising, and Public Domain. GPLv2+ is the default license for code
>>> without an explicitly defined license.
>>
>> Btw, what tools from util-linux is it that you believe are important?
>> If the licensing situation is unclear, maybe those could be moved to
>> some GNU project (CoreUtils/InetUtils/...?).
>
> Unfortunately, Coreutils is no longer sufficient:
>
>   http://lists.gnu.org/archive/html/coreutils/2012-05/msg00101.html
>
> And IIRC the latest Ineutils release lacks a few tools compared to
> net-tools, no?

Right.  Getting a list of what non-GNU tools are necessary/useful would
be useful.  Is 'su' the only tool that prompted addition of util-linux
here?  util-linux and net-tools contains a lot of tools that are rarely
needed, it would be nice to limit the number of their tools that are
added as a pre-requisite for a Guix system.  I know InetUtils could use
a 'arp' tool, and I have one almost completed sitting here locally for
some time that I intend to push...

/Simon

Re: [PATCH] distro: Add util-linux.

[Nikita Karetnikov]

> Could you send an updated patch with this fix, and which adds util-linux
> to ‘linux.scm’ instead?

Sure.

> For this kind of questions, I’d first check the list at
> <http://libreplanet.org/wiki/Software_blacklist>, and then ask for
> advice on the gnu-linux-libre list (see
> <http://lists.nongnu.org/mailman/listinfo/gnu-linux-libre>), which is
> where people knowledgeable in this area are.

OK.

> Btw, what tools from util-linux is it that you believe are important?
> If the licensing situation is unclear, maybe those could be moved to
> some GNU project (CoreUtils/InetUtils/...?).

'libuuid', which is required by 'parted'.

> util-linux and net-tools contains a lot of tools that are rarely
> needed, it would be nice to limit the number of their tools that are
> added as a pre-requisite for a Guix system.

I second this.

Re: [PATCH] distro: Add util-linux.

[Ludovic Courtès]

Hi,

Simon Josefsson <simon@josefsson.org> skribis:

> util-linux and net-tools contains a lot of tools that are rarely
> needed, it would be nice to limit the number of their tools that are
> added as a pre-requisite for a Guix system.

Indeed.  When we have a bootable distro, the goal is to use primarily
GNU versions of the tools, obviously.

Now, I think it’s OK to have packages for free variants of these GNU
tools, for users who want them; it just won’t be the default.

> I know InetUtils could use a 'arp' tool, and I have one almost
> completed sitting here locally for some time that I intend to push...

Heh, good!

(In a similar vein, I hope that GNU Pies can become suitable as our
daemon manager.)

Thanks,
Ludo’.

Re: [PATCH] distro: Add util-linux.

[Nikita Karetnikov]

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

> Could you send an updated patch with this fix, and which adds util-linux
> to ‘linux.scm’ instead?

Attached.

Note that I can't verify the signature.

$ wget https://www.kernel.org/pub/linux/utils/util-linux/v2.21/util-linux-2.21.2.tar.xz
$ wget https://www.kernel.org/pub/linux/utils/util-linux/v2.21/util-linux-2.21.2.tar.sign
$ mv util-linux-2.21.2.tar.sign util-linux-2.21.2.tar.xz.sign
$ gpg --search-keys EC39C284
$ gpg --verify util-linux-2.21.2.tar.xz.sign
[...]
gpg: BAD signature from "Karel Zak <kzak@redhat.com>"

Am I using the wrong signature?

> For this kind of questions, I’d first check the list at
> <http://libreplanet.org/wiki/Software_blacklist>, and then ask for
> advice on the gnu-linux-libre list (see
> <http://lists.nongnu.org/mailman/listinfo/gnu-linux-libre>), which is
> where people knowledgeable in this area are.

"Your request has been forwarded to the list moderator for approval."

> The ‘mirror://kernel.org/’ prefix expands to the above mirror URLs.  See
> ‘url-fetch’ in (guix build download) for details.

It works, but I haven't checked 'url-fetch' yet.

[-- Attachment #2: 0001-distro-Add-util-linux.patch --]
[-- Type: text/x-diff, Size: 3190 bytes --]

From 4c572b86d7bef7db5017559bd6e3f39adb038acc Mon Sep 17 00:00:00 2001
From: Nikita Karetnikov <nikita@karetnikov.org>
Date: Mon, 3 Dec 2012 23:13:02 +0000
Subject: [PATCH] distro: Add util-linux.

* distro/packages/linux.scm (util-linux): New variable.
---
 distro/packages/linux.scm |   45 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/distro/packages/linux.scm b/distro/packages/linux.scm
index 54a0606..bb883f2 100644
--- a/distro/packages/linux.scm
+++ b/distro/packages/linux.scm
@@ -1,5 +1,6 @@
 ;;; Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
 ;;; Copyright (C) 2012 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright (C) 2012 Nikita Karetnikov <nikita@karetnikov.org>
 ;;;
 ;;; This file is part of Guix.
 ;;;
@@ -17,10 +18,12 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages linux)
-  #:use-module (guix packages)
-  #:use-module (guix download)
+  #:use-module (distro packages compression)
   #:use-module (distro packages flex)
+  #:use-module (distro packages ncurses)
   #:use-module (distro packages perl)
+  #:use-module (guix packages)
+  #:use-module (guix download)
   #:use-module (guix build-system gnu))
 
 (define-public linux-libre-headers
@@ -104,3 +107,41 @@ Pluggable authentication modules are small shared object files that can
 be used through the PAM API to perform tasks, like authenticating a user
 at login.  Local and dynamic reconfiguration are its key features")
     (license "BSD")))
+
+(define-public util-linux
+  (package
+    (name "util-linux")
+    (version "2.21")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://kernel.org/linux/utils/"
+                          name "/v" version "/"
+                          name "-" version ".2" ".tar.xz"))
+      (sha256
+       (base32
+        "1rpgghf7n0zx0cdy8hibr41wvkm2qp1yvd8ab1rxr193l1jmgcir"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags '("--disable-use-tty-group")
+       #:phases (alist-cons-after
+                 'install 'patch-chkdupexe
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (let ((out (assoc-ref outputs "out")))
+                     (substitute* (string-append out "/bin/chkdupexe")
+                       ;; Allow 'patch-shebang' to do its work.
+                       (("@PERL@") "/bin/perl"))))
+                 %standard-phases)))
+    (inputs `(("zlib" ,zlib)
+              ("ncurses" ,ncurses)
+              ("perl" ,perl)))
+    (home-page "https://www.kernel.org/pub/linux/utils/util-linux/")
+    (synopsis
+     "util-linux is a random collection of utilities for the Linux kernel")
+    (description
+     "util-linux is a random collection of utilities for the Linux kernel.")
+    ;; Note that util-linux doesn't use the same license for all the
+    ;; code. GPLv2+ is the default license for a code without an
+    ;; explicitly defined license.
+    (license '("GPLv3+" "GPLv2+" "GPLv2" "LGPLv2+"
+               "BSD-original" "Public Domain"))))
\ No newline at end of file
-- 
1.7.5.4

Re: [PATCH] distro: Add util-linux.

[Ludovic Courtès]

Hi Nikita,

Nikita Karetnikov <nikita.karetnikov@gmail.com> skribis:

> $ wget https://www.kernel.org/pub/linux/utils/util-linux/v2.21/util-linux-2.21.2.tar.xz
> $ wget https://www.kernel.org/pub/linux/utils/util-linux/v2.21/util-linux-2.21.2.tar.sign
> $ mv util-linux-2.21.2.tar.sign util-linux-2.21.2.tar.xz.sign
> $ gpg --search-keys EC39C284
> $ gpg --verify util-linux-2.21.2.tar.xz.sign
> [...]
> gpg: BAD signature from "Karel Zak <kzak@redhat.com>"
>
> Am I using the wrong signature?

You need to check against the .tar:

--8<---------------cut here---------------start------------->8---
$ xz -d < /nix/store/jc532vwqsnwbd611ary8ffw9q97cazlc-util-linux-2.21.2.tar.xz > util-linux-2.21.2.tar

$ gpg --verify util-linux-2.21.2.tar.sign 
gpg: Signature made Fri 25 May 2012 01:04:13 PM CEST using RSA key ID EC39C284
gpg: Good signature from "Karel Zak <kzak@redhat.com>"
gpg: WARNING: This key is not certified with a trusted signature!
gpg:          There is no indication that the signature belongs to the owner.
Primary key fingerprint: B0C6 4D14 301C C6EF AEDF  60E4 E4B7 1D5E EC39 C284
--8<---------------cut here---------------end--------------->8---

Applied, thanks!

Ludo’.