1 files changed, 20 insertions, 18 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 5fb621e027..7bc6f67ded 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -826,14 +826,14 @@ re-executing them as necessary.")
 (define-public inetutils
   (package
     (name "inetutils")
-    (version "2.0")
+    (version "2.3")
     (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://gnu/inetutils/inetutils-"
-                                 version ".tar.gz"))
-             (sha256
-              (base32
-               "0j1nb69bhg29cm4xkqqjh2ln1zqcj2lnpm92v638lpwrs11dypxl"))))
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/inetutils/inetutils-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1dj4ilxy1wrfxhxc85iya3x28h1mhjpqc5nv862xcq3ww2gqkv8w"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags '("--localstatedir=/var"
@@ -857,19 +857,21 @@ re-executing them as necessary.")
        ;; Make sure that canonical "coreutils" package is not referred.
        #:make-flags
        (list (string-append "CPPFLAGS=-DPATHDEF_CP=\\\""
-                            (assoc-ref %build-inputs "coreutils*")
-                            "/bin/cp\\\""))
+                            (search-input-file %build-inputs "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)
-              ("readline" ,readline)))        ;for 'ftp'
-    (native-inputs (if (member (%current-system)
-                               (package-supported-systems net-tools))
-                       `(("netstat" ,net-tools))  ;for tests
-                       '()))
+    (inputs
+     (list coreutils
+           shadow                     ;for login (used in telnetd and rlogind)
+           ncurses
+           readline))                   ;for 'ftp'
+    (native-inputs
+     (if (member (%current-system)
+                 (package-supported-systems net-tools))
+         (list net-tools)               ;for tests
+         '()))
     (home-page "https://www.gnu.org/software/inetutils/")
     (synopsis "Basic networking utilities")
     (description
@@ -1464,7 +1466,7 @@ connection alive.")
        (list config perl file))
 
       (inputs `(("inetutils" ,inetutils)
-                ("bash" ,(canonical-package bash-minimal)) ;for wrap-program
+                ("bash" ,bash-minimal)
                 ,@(if (hurd-target?) '()
                       `(("net-tools" ,net-tools)
                         ("iproute" ,iproute)))