From patchwork Thu Dec 29 19:37:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 45690 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 737BF27BBEB; Thu, 29 Dec 2022 19:39:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C5E6F27BBE9 for ; Thu, 29 Dec 2022 19:39:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAyk6-0005Of-0m; Thu, 29 Dec 2022 14:39:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pAyk3-0005Nm-4J for guix-patches@gnu.org; Thu, 29 Dec 2022 14:39:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pAyk2-0006HM-PZ for guix-patches@gnu.org; Thu, 29 Dec 2022 14:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pAyk2-0003by-2D for guix-patches@gnu.org; Thu, 29 Dec 2022 14:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60409] [PATCH] gnu: cifs-utils: Update to 7.0 [fixes CVE-2022-27239]. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 29 Dec 2022 19:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60409 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60409@debbugs.gnu.org Cc: Timotej Lazar X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167234268313695 (code B ref -1); Thu, 29 Dec 2022 19:39:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Dec 2022 19:38:03 +0000 Received: from localhost ([127.0.0.1]:32941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAyj5-0003Ym-Aw for submit@debbugs.gnu.org; Thu, 29 Dec 2022 14:38:03 -0500 Received: from lists.gnu.org ([209.51.188.17]:55810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAyj3-0003YK-9v for submit@debbugs.gnu.org; Thu, 29 Dec 2022 14:38:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pAyj3-0005IY-1L for guix-patches@gnu.org; Thu, 29 Dec 2022 14:38:01 -0500 Received: from araneo.si ([2001:15c0:2110:3400::2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pAyiw-0006AR-W9 for guix-patches@gnu.org; Thu, 29 Dec 2022 14:38:00 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id e3ccf983 for ; Thu, 29 Dec 2022 19:37:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20180623; bh=DpoKePi1KwQ45OhygAPkP yD8brc=; b=zm8ktELkLYUdckgrPpOpIgnwcOf1HqBZfDTG42sDLUrIf55z++ov9 /pdCYwB4ZyFXzprSwdVX5KvgqmNlY4dvk5jSPJkik0dkKu4afpIOmpJ8D+tTxN5H Gzc8miD8rVIVUa5N0gy8s2aECGF/jMcPhPmezDfGcHE80OvxsVK9X8MJhAhmSFKZ 1JmH+ZgX8y/Gvurr3wEFdjzmXtXvfCIjF2Xl7hDDSV38n4Iw9TjRVAYgnc3yU1Ph Ekm6WDNcNvrh8c/1nqzvyq9QSZ8kZGc9TARzT5+lSe6keK6xT37qlanYRIqEvn1P MjHPkOqNOZqlbu5I0HYIcwHjNZxc4MGYw== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 64ab7684 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 29 Dec 2022 19:37:47 +0000 (UTC) From: Timotej Lazar Date: Thu, 29 Dec 2022 20:37:20 +0100 Message-Id: <20221229193720.17591-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2001:15c0:2110:3400::2; envelope-from=timotej.lazar@araneo.si; helo=araneo.si X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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(-) base-commit: d07d6ea31a883d395d692483d84e7797b4c2ce0f 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