From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuMg6-0005kM-Vt for guix-patches@gnu.org; Sat, 01 Apr 2017 13:19:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cuMg3-00059x-Lw for guix-patches@gnu.org; Sat, 01 Apr 2017 13:19:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:57724) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cuMg1-00057p-Ub for guix-patches@gnu.org; Sat, 01 Apr 2017 13:19:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cuMg1-0004Yd-Mk for guix-patches@gnu.org; Sat, 01 Apr 2017 13:19:01 -0400 Subject: bug#26312: [PATCH] gnu: Add cifs-utils. Resent-Message-ID: From: Marius Bakke In-Reply-To: References: <20170330.174824.1172310425105438058.post@thomasdanckaert.be> <354af52f-2759-f845-316d-4b4577413a42@tobias.gr> Date: Sat, 01 Apr 2017 19:18:01 +0200 Message-ID: <87lgrkavxy.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Thomas Danckaert , Tobias Geerinckx-Rice Cc: 26312@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Thomas Danckaert writes: > Tobias Geerinckx-Rice writes: > >> Thomas, >> >> I don't have any Samba shares to test this on, but will try my hand at >> this reviewing business anyway. > > Thanks! I followed all of your suggestions. > >> Aside: GNU uses =E2=80=98file system=E2=80=99, not =E2=80=98filesystem= =E2=80=99, because GNU is rad. How >> about expanding the acronym at the same time? E.g.: >> >> =E2=80=98the @{Common Internet File System} (CIFS) implementation buil= t into >> the Linux kernel=E2=80=99. >> >> Bonus points for replacing the horrid word =E2=80=98implementation=E2=80= =99 :-) > > I stole this from somewhere: > > =E2=80=9C@code{cifs-utils} is a set of user-space utilities for mounting = and > managing @{Common Internet File System} (CIFS) shares using the Linux > kernel CIFS client.=E2=80=9D > > Thomas > > From 08858a1e8674f868db2fc255e47bb18aa0ee9de9 Mon Sep 17 00:00:00 2001 > From: Thomas Danckaert > Date: Thu, 30 Mar 2017 17:47:00 +0200 > Subject: [PATCH] gnu: Add cifs-utils. > > * gnu/packages/samba.scm (cifs-utils): New variable. > --- > gnu/packages/samba.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++= ++++ > 1 file changed, 48 insertions(+) > > diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm > index 3b2a6868d..92531eebf 100644 > --- a/gnu/packages/samba.scm > +++ b/gnu/packages/samba.scm > @@ -3,6 +3,7 @@ > ;;; Copyright =C2=A9 2015 Mark H Weaver > ;;; Copyright =C2=A9 2016, 2017 Efraim Flashner > ;;; Copyright =C2=A9 2016 Adonay "adfeno" Felipe Nogueira > +;;; Copyright =C2=A9 2017 Thomas Danckaert > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -26,6 +27,8 @@ > #:use-module (guix licenses) > #:use-module (gnu packages acl) > #:use-module (gnu packages admin) > + #:use-module (gnu packages autotools) > + #:use-module (gnu packages crypto) > #:use-module (gnu packages cups) > #:use-module (gnu packages databases) > #:use-module (gnu packages tls) > @@ -33,10 +36,55 @@ > #:use-module (gnu packages pkg-config) > #:use-module (gnu packages openldap) > #:use-module (gnu packages readline) > + #:use-module (gnu packages kerberos) > #:use-module (gnu packages linux) > #:use-module (gnu packages perl) > #:use-module (gnu packages python)) >=20=20 > +(define-public cifs-utils > + (package > + (name "cifs-utils") > + (version "6.7") > + (source > + (origin > + (method url-fetch) > + (uri (string-append "https://download.samba.org/pub/linux-cifs/" > + name "/" name "-" version ".tar.bz2")) > + (sha256 (base32 > + "1ayghnkryy1n1zm5dyvyyr7n3807nsm6glfcbbki5c2a8w91dwmj"))= )) > + (build-system gnu-build-system) > + (native-inputs > + `(("autoconf" ,autoconf) > + ("automake" ,automake) > + ("pkg-config" ,pkg-config))) > + (inputs > + `(("keytuils" ,keyutils) > + ("linux-pam" ,linux-pam) > + ("libcap-ng" ,libcap-ng) > + ("mit-krb5" ,mit-krb5) > + ("samba" ,samba) > + ("talloc" ,talloc))) > + (arguments > + `(#:phases > + (modify-phases %standard-phases > + ;; The 6.7 tarball is missing =E2=80=98install.sh=E2=80=99. Cre= ate it. > + (add-before 'configure 'autoreconf > + (lambda _ > + (zero? (system* "autoreconf" "-i")))) > + (add-before 'configure 'set-root-sbin > + (lambda _ ; Don't try to install in "/sbin". > + (setenv "ROOTSBINDIR" > + (string-append (assoc-ref %outputs "out") "/sbin")) > + #t))))) > + (synopsis "User-space utilities for Linux CIFS (Samba) mounts") > + (description "@code{cifs-utils} is a set of user-space utilities for > +mounting and managing @{Common Internet File System} (CIFS) shares using= the ^^^ This should be @dfn{...}. > +Linux kernel CIFS client.") > + (home-page "https://wiki.samba.org/index.php/LinuxCIFS_utils") > + ;; cifs-utils is licensed as GPL3 or later, but 3 files contain LGPL= code. > + (license > + (list gpl3+ lgpl2.1+ lgpl3+)))) Could you mention which files, since it's only three? I also think listing both lgpl2.1+ and lgpl3+ is redundant; if these source files interact in some way the result is effectively lgpl3+. If the LGPL2.1+ code is what is installed, I would pick that since it implies LGPL3+. The rest LGTM! > + > (define-public iniparser > (package > (name "iniparser") > --=20 > 2.12.2 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAljf4MkACgkQoqBt8qM6 VPr8vwf/VMJ9frdOOIGsP3Qhxv4tQAiz471qTjn4UjVKRhxUa25vRLWZncrjVpB2 A5p4TVYRHjtYOUauobdvhwMiFuJvrqn9C1GueodnoKh1ziN0iLlH/yDFlCxktGtx miIDDrJn+3Wp4LSJy1j/uoXF6Y840ARFaoK3KX2nXtLyLvFvW2W5cVDu9gsfdAcg cUVRHnbxGBnqt1M2UMqERgcMJjXgefxy4QBtw3wocTjCO0YYcJMLNMWn4tIxXWmJ SpBDomzWC+fj092EtlqPG+IH5lBTi0jtAEAhyscx2P96WhgJYusbM0KbWwcOeSqH f0AspKmhevmZcO9qsFCSzb0/8QOaOQ== =Q2GE -----END PGP SIGNATURE----- --=-=-=--