From 44eff75ea3edae22cc258e42549eee4e5f84accb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 16:38:53 +0100 Subject: gnu: samba: Update to 4.9.3. * gnu/packages/samba.scm (samba): Update to 4.9.3. [inputs]: Add GPGME, JANSSON, LIBARCHIVE and LMDB. --- gnu/packages/samba.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu/packages/samba.scm') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index b927bbbf9b..f1145fdaa1 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -32,11 +32,13 @@ #:use-module (gnu packages acl) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) + #:use-module (gnu packages backup) #:use-module (gnu packages check) #:use-module (gnu packages crypto) #:use-module (gnu packages cups) #:use-module (gnu packages databases) #:use-module (gnu packages docbook) + #:use-module (gnu packages gnupg) #:use-module (gnu packages tls) #:use-module (gnu packages popt) #:use-module (gnu packages pkg-config) @@ -46,6 +48,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages perl) #:use-module (gnu packages python) + #:use-module (gnu packages web) #:use-module (gnu packages xml)) (define-public cifs-utils @@ -147,14 +150,14 @@ anywhere.") (define-public samba (package (name "samba") - (version "4.8.6") + (version "4.9.3") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/samba/stable/" "samba-" version ".tar.gz")) (sha256 (base32 - "15hawqdm37l6lp9k14c634315p77cllsx89bvbw9h38fg1hj3fbk")))) + "1krm47x08c0vcrq12dxs8mbicma1ck2sl1i0hgkvrmwsgrqdi3yg")))) (build-system gnu-build-system) (arguments `(#:phases @@ -199,10 +202,14 @@ anywhere.") `(("acl" ,acl) ("cups" ,cups) ;; ("gamin" ,gamin) + ("gpgme" ,gpgme) ("gnutls" ,gnutls) ("iniparser" ,iniparser) + ("jansson" ,jansson) ("libaio" ,libaio) + ("libarchive" ,libarchive) ("linux-pam" ,linux-pam) + ("lmdb" ,lmdb) ("openldap" ,openldap) ("popt" ,popt) ("readline" ,readline) -- cgit v1.2.3 From bdf161251aa45882a5919d4814303ca619d47a79 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 16:21:56 +0100 Subject: gnu: ldb: Update to 1.4.3. * gnu/packages/samba.scm (ldb): Update to 1.4.3. [inputs]: Add LMDB. --- gnu/packages/samba.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/samba.scm') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index f1145fdaa1..b4a01b1c95 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -345,14 +345,14 @@ many event types, including timers, signals, and the classic file descriptor eve (define-public ldb (package (name "ldb") - (version "1.3.6") + (version "1.4.3") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/ldb/ldb-" version ".tar.gz")) (sha256 (base32 - "16lkz3gyvsm9als1wyimsl573hclr72xy6454mshwjanncs33lji")) + "07vacwr941y2x31yl9knsr2rpffz5pqabvqds6sbyngqxy4r785c")) (modules '((guix build utils))) (snippet '(begin @@ -385,7 +385,8 @@ many event types, including timers, signals, and the classic file descriptor eve `(("talloc" ,talloc) ("tdb" ,tdb))) (inputs - `(("popt" ,popt) + `(("lmdb" ,lmdb) + ("popt" ,popt) ("tevent" ,tevent))) (synopsis "LDAP-like embedded database") (home-page "https://ldb.samba.org/") -- cgit v1.2.3 From 17074cae32a37886ce0862eb81645dfe98205e29 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 18:14:22 +0100 Subject: gnu: samba.scm: Sort module imports. * gnu/packages/samba.scm (gnu): Sort imports. --- gnu/packages/samba.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/samba.scm') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index b4a01b1c95..66d0b5a35d 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -39,15 +39,15 @@ #:use-module (gnu packages databases) #:use-module (gnu packages docbook) #:use-module (gnu packages gnupg) - #:use-module (gnu packages tls) - #:use-module (gnu packages popt) - #: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 openldap) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages popt) #:use-module (gnu packages python) + #:use-module (gnu packages readline) + #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xml)) -- cgit v1.2.3 From 3d53869e302540cb9a80cdcbbabea2b67200c0c5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 12 Jun 2018 19:51:23 +0200 Subject: gnu: ldb: Fix build on 32-bit systems. * gnu/packages/samba.scm (ldb)[inputs]: Only add LMDB on 64-bit systems. [arguments]: Make #:tests? conditional on LMDB availability. --- gnu/packages/samba.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu/packages/samba.scm') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 66d0b5a35d..fd9bdd9724 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -365,7 +365,10 @@ many event types, including timers, signals, and the classic file descriptor eve #t)))) (build-system gnu-build-system) (arguments - '(#:phases + '(;; LMDB is only supported on 64-bit systems, yet the test suite + ;; requires it. + #:tests? (assoc-ref %build-inputs "lmdb") + #:phases (modify-phases %standard-phases (replace 'configure ;; ldb use a custom configuration script that runs waf. @@ -385,7 +388,9 @@ many event types, including timers, signals, and the classic file descriptor eve `(("talloc" ,talloc) ("tdb" ,tdb))) (inputs - `(("lmdb" ,lmdb) + `(,@(if (target-64bit?) + `(("lmdb" ,lmdb)) + '()) ("popt" ,popt) ("tevent" ,tevent))) (synopsis "LDAP-like embedded database") -- cgit v1.2.3