From c451474488a2a9497ba4f839b90b0eff643d1945 Mon Sep 17 00:00:00 2001 From: Adonay Felipe Nogueira Date: Sat, 3 Dec 2016 21:22:56 -0200 Subject: gnu: samba: Don't expect configuration files inside the store. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/packages/samba.scm (samba)[arguments]: Add --sysconfdir configure flag. Add 'disable-etc-samba-directory-creation' phase. Signed-off-by: Ludovic Courtès --- gnu/packages/samba.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu/packages/samba.scm') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 1706ec3030..913d5f7d98 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2015 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira ;;; ;;; This file is part of GNU Guix. ;;; @@ -121,11 +122,16 @@ (define-public samba ;; XXX: heimdal not packaged. "--bundled-libraries=com_err" (string-append "--prefix=" out) + "--sysconfdir=/etc" ;; Install public and private libraries into ;; a single directory to avoid RPATH issues. (string-append "--libdir=" libdir) - (string-append "--with-privatelibdir=" libdir))))))) - + (string-append "--with-privatelibdir=" libdir)))))) + (add-before 'install 'disable-etc-samba-directory-creation + (lambda _ + (substitute* "dynconfig/wscript" + (("bld\\.INSTALL_DIRS\\(\"\",[[:blank:]]{1,}\"\\$\\{CONFIGDIR\\}[[:blank:]]{1,}") + "bld.INSTALL_DIRS(\"\", \""))))) ;; XXX: The test infrastructure attempts to set password with ;; smbpasswd, which fails with "smbpasswd -L can only be used by root." ;; So disable tests until there's a workaround. -- cgit v1.2.3 From 307349f6f7acc44e5271c2acc3291c7020269c7b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 19 Dec 2016 09:46:28 -0500 Subject: gnu: samba: Update to 4.5.3 [fixes CVE-2016-{2123,2125,2126}]. * gnu/packages/samba.scm (samba): Update to 4.5.3. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/samba.scm') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 913d5f7d98..b2309f4b51 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -99,14 +99,14 @@ (define (copy dir) (define-public samba (package (name "samba") - (version "4.5.1") + (version "4.5.3") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/samba/stable/" "samba-" version ".tar.gz")) (sha256 (base32 - "11ghsfvqxzfv8gnl62jfnpil9cwd04gak8sx5qcg6zv7d7h079xh")))) + "1jif95684swssqwp9v3i2r08cn3r2iddf6ly68db4wmvl5ac8vgh")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3