From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adonay Felipe Nogueira Subject: bug#24834: Samba commands expect configuration file inside store Date: Sat, 03 Dec 2016 22:06:33 -0200 Message-ID: <87fum4fth2.fsf@openmailbox.org> References: <1477909074.12434.4.camel@adfeno-VPCEG17FB> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57163) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cDKLe-0001P9-6Z for bug-guix@gnu.org; Sat, 03 Dec 2016 19:08:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cDKLa-0008K3-6n for bug-guix@gnu.org; Sat, 03 Dec 2016 19:08:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:36323) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cDKLZ-0008Jx-W6 for bug-guix@gnu.org; Sat, 03 Dec 2016 19:08:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cDKLZ-00073O-MC for bug-guix@gnu.org; Sat, 03 Dec 2016 19:08:01 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <1477909074.12434.4.camel@adfeno-VPCEG17FB> (Adonay Felipe Nogueira's message of "Mon, 31 Oct 2016 08:17:54 -0200") List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: 24834@debbugs.gnu.org --=-=-= Content-Type: text/plain Here's a patch that tries to fix this issue. I already tested it, but please do so also just in case. Respectfully, Adonay. --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=guix.patch Content-Transfer-Encoding: quoted-printable >From 086396d33e113a6d991b7c63063844c66a5610ca Mon Sep 17 00:00:00 2001 From: Adonay Felipe Nogueira Date: Sat, 3 Dec 2016 21:22:56 -0200 Subject: [PATCH] gnu: samba: Don't expect configuration files inside the store. Attempts to fix . * gnu/packages/samba.scm (samba) [arguments]: * Set `--sysconfdir` to "/etc". * Avoid creation of "/etc/samba" (otherwise would require root). --- gnu/packages/samba.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 1706ec3..6a27a63 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2013, 2015 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2015 Mark H Weaver ;;; Copyright =C2=A9 2016 Efraim Flashner +;;; Copyright =C2=A9 2016 Adonay "adfeno" Felipe Nogueira ;;; ;;; This file is part of GNU Guix. ;;; @@ -121,11 +122,17 @@ anywhere.") ;; XXX: heimdal not packaged. "--bundled-libraries=3Dcom_err" (string-append "--prefix=3D" out) + ;; Don't write to store. + "--sysconfdir=3D/etc" ;; Install public and private libraries into ;; a single directory to avoid RPATH issues. (string-append "--libdir=3D" libdir) - (string-append "--with-privatelibdir=3D" libdir))))= ))) - + (string-append "--with-privatelibdir=3D" 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 ro= ot." ;; So disable tests until there's a workaround. --=20 1.9.1 --=-=-=--