GNU bug report logs - #62154
[PATCH core-updates 0/4] gnu: inetutils: Update to 2.4.

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 62154 in the body.
You can then email your comments to 62154 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: Felix Lechner <felix.lechner <at> lease-up.com>
To: guix-patches <at> gnu.org
Cc: Felix Lechner <felix.lechner <at> lease-up.com>
Subject: [PATCH 0/4] gnu: inetutils: Update to 2.4.
Date: Sun, 12 Mar 2023 18:19:52 -0700

Below please find a patch to update GNU Inetutils to the latest version.

There are some remaining 'lint' warnings.

> gnu/packages/admin.scm:937:12: inetutils <at> 2.4: label 'coreutils*' does not match package name 'coreutils'

I was unable to convert the regular inputs due to the asterisk in coreutils.

> gnu/packages/admin.scm:948:5: inetutils <at> 2.4: proposed description:
>      "Inetutils is a collection of common network programs, such as an ftp
> client and server, a telnet client and server, and an rsh client and server."

The suggested description leaves out the 'hostname' command.

> gnu/packages/admin.scm:900:12: inetutils <at> 2.4: source not archived on Software Heritage and missing from the Disarchive database

We could pull the sources from Git, but Guix seems to prefer tarballs.

Finally, there is a compilation warning related to the ordering of
(define-public ...). 'shadow' follows immediately below.

> guix build: error: gnu/packages/admin.scm:897:2: package `inetutils <at> 2.4' has an invalid input: #<package shadow <at> 4.9
> gnu/packages/admin.scm:955 7f15cd722c60>"

Felix Lechner (4):
  gnu: Update inetutils to 2.4; use tar.xz.
  gnu: inetutils: Convert to gexp.
  gnu: inetutils: Use new-style inputs.
  gnu: inetutils: Apply formatting rules (non-functional change).

 gnu/packages/admin.scm | 68 ++++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 33 deletions(-)


base-commit: 9584b1daa687d1212550841d1c5f62e7ffa44ffc
-- 
2.39.1

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

From: Felix Lechner <felix.lechner <at> lease-up.com>
To: 62154 <at> debbugs.gnu.org
Cc: Felix Lechner <felix.lechner <at> lease-up.com>
Subject: [PATCH 1/4] gnu: Update inetutils to 2.4; use tar.xz.
Date: Sun, 12 Mar 2023 18:21:53 -0700

* gnu/packages/admin.scm (inetutils): Update to 2.4; use tar.xz
---
 gnu/packages/admin.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index eba4378cf8..77c7577cfa 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -896,14 +896,14 @@ (define-public pies
 (define-public inetutils
   (package
     (name "inetutils")
-    (version "2.0")
+    (version "2.4")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/inetutils/inetutils-"
-                                 version ".tar.gz"))
+                                 version ".tar.xz"))
              (sha256
               (base32
-               "0j1nb69bhg29cm4xkqqjh2ln1zqcj2lnpm92v638lpwrs11dypxl"))))
+               "1ck81y6x0bk1qaripfsrbfzrrzaxkzp37ddpg8mgwzd5n6qxd28p"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags '("--localstatedir=/var"
-- 
2.39.1

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

From: Felix Lechner <felix.lechner <at> lease-up.com>
To: 62154 <at> debbugs.gnu.org
Cc: Felix Lechner <felix.lechner <at> lease-up.com>
Subject: [PATCH 2/4] gnu: inetutils: Convert to gexp.
Date: Sun, 12 Mar 2023 18:21:54 -0700

* gnu/packages/admin.scm (inetutils): Convert to gexp.
---
 gnu/packages/admin.scm | 52 ++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 77c7577cfa..8147274b77 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -906,32 +906,34 @@ (define-public inetutils
                "1ck81y6x0bk1qaripfsrbfzrrzaxkzp37ddpg8mgwzd5n6qxd28p"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags '("--localstatedir=/var"
+     (list
+      #:configure-flags
+      #~(list "--localstatedir=/var"
 
-                           ;; Make sure 'PATH_PROCNET_DEV' gets defined when
-                           ;; cross-compiling (by default it does not.)
-                           ,@(if (%current-target-system)
-                                 '("--with-path-procnet-dev=/proc/net/dev")
-                                 '())
-                           ,@(if (hurd-target?)
-                                 '("--disable-rcp"
-                                   "--disable-rexec"
-                                   "--disable-rexecd"
-                                   "--disable-rlogin"
-                                   "--disable-rlogind"
-                                   "--disable-rsh"
-                                   "--disable-rshd"
-                                   "--disable-uucpd"
-                                   "--disable-whois")
-                                 '()))
-       ;; Make sure that canonical "coreutils" package is not referred.
-       #:make-flags
-       (list (string-append "CPPFLAGS=-DPATHDEF_CP=\\\""
-                            (assoc-ref %build-inputs "coreutils*")
-                            "/bin/cp\\\""))
-       ;; On some systems, 'libls.sh' may fail with an error such as:
-       ;; "Failed to tell switch -a apart from -A".
-       #:parallel-tests? #f))
+              ;; Make sure 'PATH_PROCNET_DEV' gets defined when
+              ;; cross-compiling (by default it does not.)
+              #$@(if (%current-target-system)
+                     '("--with-path-procnet-dev=/proc/net/dev")
+                     '())
+              #$@(if (hurd-target?)
+                     '("--disable-rcp"
+                       "--disable-rexec"
+                       "--disable-rexecd"
+                       "--disable-rlogin"
+                       "--disable-rlogind"
+                       "--disable-rsh"
+                       "--disable-rshd"
+                       "--disable-uucpd"
+                       "--disable-whois")
+                     '()))
+      ;; Make sure that canonical "coreutils" package is not referred.
+      #:make-flags
+      #~(list (string-append "CPPFLAGS=-DPATHDEF_CP=\\\""
+                             #$(this-package-input "coreutils*")
+                             "/bin/cp\\\""))
+      ;; On some systems, 'libls.sh' may fail with an error such as:
+      ;; "Failed to tell switch -a apart from -A".
+      #:parallel-tests? #f))
     (inputs `(("coreutils*" ,coreutils)
               ("shadow" ,shadow)    ;for login (used in telnetd and rlogind)
               ("ncurses" ,ncurses)
-- 
2.39.1

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

From: Felix Lechner <felix.lechner <at> lease-up.com>
To: 62154 <at> debbugs.gnu.org
Cc: Felix Lechner <felix.lechner <at> lease-up.com>
Subject: [PATCH 3/4] gnu: inetutils: Use new-style inputs.
Date: Sun, 12 Mar 2023 18:21:55 -0700

* gnu/packages/admin.scm (inetutils): Use new-style inputs.
---
 gnu/packages/admin.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 8147274b77..6c1c1aca1e 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -940,7 +940,7 @@ (define-public inetutils
               ("readline" ,readline)))        ;for 'ftp'
     (native-inputs (if (member (%current-system)
                                (package-supported-systems net-tools))
-                       `(("netstat" ,net-tools))  ;for tests
+                       (list net-tools)  ;for tests
                        '()))
     (home-page "https://www.gnu.org/software/inetutils/")
     (synopsis "Basic networking utilities")
-- 
2.39.1

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

From: Felix Lechner <felix.lechner <at> lease-up.com>
To: 62154 <at> debbugs.gnu.org
Cc: Felix Lechner <felix.lechner <at> lease-up.com>
Subject: [PATCH 4/4] gnu: inetutils: Apply formatting rules (non-functional
 change).
Date: Sun, 12 Mar 2023 18:21:56 -0700

* gnu/packages/admin.scm (inetutils): Apply formatting rules (non-functional
change).
---
 gnu/packages/admin.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 6c1c1aca1e..5a0e12d05c 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -898,12 +898,12 @@ (define-public inetutils
     (name "inetutils")
     (version "2.4")
     (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://gnu/inetutils/inetutils-"
-                                 version ".tar.xz"))
-             (sha256
-              (base32
-               "1ck81y6x0bk1qaripfsrbfzrrzaxkzp37ddpg8mgwzd5n6qxd28p"))))
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/inetutils/inetutils-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "1ck81y6x0bk1qaripfsrbfzrrzaxkzp37ddpg8mgwzd5n6qxd28p"))))
     (build-system gnu-build-system)
     (arguments
      (list
-- 
2.39.1

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Felix Lechner <felix.lechner <at> lease-up.com>
Cc: 62154-done <at> debbugs.gnu.org
Subject: Re: [bug#62154] [PATCH 4/4] gnu: inetutils: Apply formatting rules
 (non-functional change).
Date: Sat, 20 Jan 2024 14:50:27 -0500

Hi Felix,

Felix Lechner <felix.lechner <at> lease-up.com> writes:

> * gnu/packages/admin.scm (inetutils): Apply formatting rules (non-functional
> change).
> ---
>  gnu/packages/admin.scm | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
> index 6c1c1aca1e..5a0e12d05c 100644
> --- a/gnu/packages/admin.scm
> +++ b/gnu/packages/admin.scm
> @@ -898,12 +898,12 @@ (define-public inetutils
>      (name "inetutils")
>      (version "2.4")
>      (source (origin
> -             (method url-fetch)
> -             (uri (string-append "mirror://gnu/inetutils/inetutils-"
> -                                 version ".tar.xz"))
> -             (sha256
> -              (base32
> -               "1ck81y6x0bk1qaripfsrbfzrrzaxkzp37ddpg8mgwzd5n6qxd28p"))))
> +              (method url-fetch)
> +              (uri (string-append "mirror://gnu/inetutils/inetutils-"
> +                                  version ".tar.xz"))
> +              (sha256
> +               (base32
> +                "1ck81y6x0bk1qaripfsrbfzrrzaxkzp37ddpg8mgwzd5n6qxd28p"))))
>      (build-system gnu-build-system)
>      (arguments
>       (list

I've applied the parts that hadn't been made already to core-updates,
except the "this-package-input" change in the configure flags, which I
think is best suited for a search-input-file (it provides better error
reporting in case something is wrong).

-- 
Thanks,
Maxim

Previous Next

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