gnu: runc: Update to 1.3.0.

* gnu/packages/virtualization.scm (runc): Update to 1.3.0.
  [source] Switch to git-fetch and build from source.
  <snippet>: Delete vendor directory.
  [arguments] <phases>: Add 'patch-source; remove custom 'check as it's
  not used.
  [native-inputs]: Add go-github-com-checkpoint-restore-go-criu-v6,
  go-github-com-containerd-console,
  go-github-com-coreos-go-systemd-v22,
  go-github-com-cyphar-filepath-securejoin,
  go-github-com-docker-go-units, go-github-com-godbus-dbus-v5,
  go-github-com-moby-sys-capability, go-github-com-moby-sys-mountinfo,
  go-github-com-moby-sys-user, go-github-com-moby-sys-userns,
  go-github-com-mrunalp-fileutils,
  go-github-com-opencontainers-cgroups-0.0.1,
  go-github-com-opencontainers-runtime-spec,
  go-github-com-opencontainers-selinux,
  go-github-com-seccomp-libseccomp-golang,
  go-github-com-sirupsen-logrus, go-github-com-urfave-cli,
  go-github-com-vishvananda-netlink, go-golang-org-x-net,
  go-golang-org-x-sys, and go-google-golang-org-protobuf.

Change-Id: I190473163defa90a017a42d6919dc6f0d2556990

1 files changed, 45 insertions, 21 deletions

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index c9a38bfb33..fa3de25793 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2342,43 +2342,67 @@ main monitor/GPU.")
 (define-public runc
   (package
     (name "runc")
-    (version "1.1.14")
-    ;; XXX: Source contains "vendor", consider to unbundle and pack missing
-    ;; packages.
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/opencontainers/runc/releases/"
-                    "download/v" version "/runc.tar.xz"))
-              (file-name (string-append name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1nypczyb3fp3cnfdg13grxjhg9361i44zialsdkxcfxb0c9g79jf"))))
+    (version "1.3.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/opencontainers/runc")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0midvxwmj4fvhy5mqv616bhlx39j0gd6y890adx7dnz5in506ym1"))
+       (snippet
+        #~(begin
+            (use-modules (guix build utils))
+            (delete-file-recursively "vendor")))))
     (build-system go-build-system)
     (arguments
      (list
-      #:import-path "github.com/opencontainers/runc"
-      #:install-source? #f
       ;; XXX: 20/139 tests fail due to missing /var, cgroups and apparmor in
       ;; the build environment.
       #:tests? #f
+      #:install-source? #f
+      #:import-path "github.com/opencontainers/runc"
       #:phases
       #~(modify-phases %standard-phases
+         (add-after 'unpack 'patch-source
+           (lambda* (#:key import-path #:allow-other-keys)
+             (substitute*  (string-append "src/" import-path "/Makefile")
+               (("/bin/bash") (which "bash")))))
           (replace 'build
             (lambda* (#:key import-path #:allow-other-keys)
               (with-directory-excursion (string-append "src/" import-path)
                 (invoke "make" "all" "man"))))
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "make" "localunittest"))))
           (replace 'install
             (lambda* (#:key import-path outputs #:allow-other-keys)
               (with-directory-excursion (string-append "src/" import-path)
-                  (invoke "make" "install" "install-bash" "install-man"
-                          (string-append "PREFIX=" #$output))))))))
+                (invoke "make" "install" "install-bash" "install-man"
+                        (string-append "PREFIX=" #$output))))))))
     (native-inputs
-     (list go-md2man pkg-config))
+     (list go-github-com-checkpoint-restore-go-criu-v6
+           go-github-com-containerd-console
+           go-github-com-coreos-go-systemd-v22
+           go-github-com-cyphar-filepath-securejoin
+           go-github-com-docker-go-units
+           go-github-com-godbus-dbus-v5
+           go-github-com-moby-sys-capability
+           go-github-com-moby-sys-mountinfo
+           go-github-com-moby-sys-user
+           go-github-com-moby-sys-userns
+           go-github-com-mrunalp-fileutils
+           go-github-com-opencontainers-cgroups-0.0.1
+           go-github-com-opencontainers-runtime-spec
+           go-github-com-opencontainers-selinux
+           go-github-com-seccomp-libseccomp-golang
+           go-github-com-sirupsen-logrus
+           go-github-com-urfave-cli
+           go-github-com-vishvananda-netlink
+           go-golang-org-x-net
+           go-golang-org-x-sys
+           go-google-golang-org-protobuf
+           go-md2man
+           pkg-config))
     (inputs
      (list libseccomp))
     (synopsis "Open container initiative runtime")