From 1df9ec6febfff524d0dded12fb6ea7c945f30501 Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@araneo.si>
Date: Thu, 29 Dec 2022 20:37:20 +0100
Subject: gnu: cifs-utils: Update to 7.0 [fixes CVE-2022-27239].
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/samba.scm (cifs-utils): Update to 7.0.
[arguments]: Use new style. Drop unneeded phase 'install-man-pages.
[inputs]: Drop labels.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/samba.scm | 45 +++++++++++++++------------------------------
 1 file changed, 15 insertions(+), 30 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 6e2c4d4f78..00442d9645 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -71,49 +71,34 @@
 (define-public cifs-utils
   (package
     (name "cifs-utils")
-    (version "6.14")
+    (version "7.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://download.samba.org/pub/linux-cifs/"
                            "cifs-utils/cifs-utils-" version ".tar.bz2"))
        (sha256 (base32
-                "1f2n0yzqsy5v5qv83731bi0mi86rrh11z8qjy1gjj8al9c3yh2b6"))))
+                "0qc1ph94yvg87m87xangw9dd0m5ds2q1zd2sqkzldsnkbfwamvqd"))))
     (build-system gnu-build-system)
     (native-inputs
      (list autoconf automake pkg-config
            ;; To generate the manpages.
            python-docutils)) ; rst2man
     (inputs
-     `(("keytuils" ,keyutils)
-       ("linux-pam" ,linux-pam)
-       ("libcap-ng" ,libcap-ng)
-       ("mit-krb5" ,mit-krb5)
-       ("samba" ,samba)
-       ("talloc" ,talloc)))
+     (list keyutils libcap-ng linux-pam mit-krb5 samba talloc))
     (arguments
-     `(#:configure-flags
-       (list "--enable-man")
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'bootstrap 'trigger-bootstrap
-           ;; The shipped configure script is buggy, e.g., it contains a
-           ;; unexpanded literal ‘LIBCAP_NG_PATH’ line).
-           (lambda _
-             (delete-file "configure")))
-         (add-before 'configure 'set-root-sbin
-           (lambda* (#:key outputs #:allow-other-keys)
-             ;; Don't try to install into "/sbin".
-             (setenv "ROOTSBINDIR"
-                     (string-append (assoc-ref outputs "out") "/sbin"))))
-         (add-before 'install 'install-man-pages
-           ;; Create a directory that isn't created since version 6.10.
-           (lambda* (#:key make-flags parallel-build? #:allow-other-keys)
-             (apply invoke "make" "install-man"
-                    `(,@(if parallel-build?
-                            `("-j" ,(number->string (parallel-job-count)))
-                            '())
-                      ,@make-flags)))))))
+     (list #:configure-flags #~(list "--enable-man")
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-before 'bootstrap 'trigger-bootstrap
+                 ;; The shipped configure script is buggy, e.g., it contains a
+                 ;; unexpanded literal ‘LIBCAP_NG_PATH’ line).
+                 (lambda _
+                   (delete-file "configure")))
+               (add-before 'configure 'set-root-sbin
+                 ;; Don't try to install into "/sbin".
+                 (lambda _
+                   (setenv "ROOTSBINDIR" (string-append #$output "/sbin")))))))
     (synopsis "User-space utilities for Linux CIFS (Samba) mounts")
     (description "@code{cifs-utils} is a set of user-space utilities for
 mounting and managing @acronym{CIFS, Common Internet File System} shares using
-- 
cgit v1.2.3