unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Timotej Lazar <timotej.lazar@araneo.si>
To: 60409@debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar@araneo.si>
Subject: [bug#60409] [PATCH] gnu: cifs-utils: Update to 7.0 [fixes CVE-2022-27239].
Date: Thu, 29 Dec 2022 20:37:20 +0100	[thread overview]
Message-ID: <20221229193720.17591-1-timotej.lazar@araneo.si> (raw)

* gnu/packages/samba.scm (cifs-utils): Update to 7.0.
[arguments]: Use new style. Drop unneeded phase 'install-man-pages.
[inputs]: Drop labels.
---
 gnu/packages/samba.scm | 45 ++++++++++++++----------------------------
 1 file changed, 15 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 2a01279161..24dc0e4379 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -71,49 +71,34 @@ (define-module (gnu packages samba)
 (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

base-commit: d07d6ea31a883d395d692483d84e7797b4c2ce0f
-- 
2.38.1





             reply	other threads:[~2022-12-29 19:39 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-29 19:37 Timotej Lazar [this message]
2023-01-17 14:44 ` bug#60409: [PATCH] gnu: cifs-utils: Update to 7.0 [fixes CVE-2022-27239] Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221229193720.17591-1-timotej.lazar@araneo.si \
    --to=timotej.lazar@araneo.si \
    --cc=60409@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).