From 470771c5e4c996067935643e8217db4fd43c6a16 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 2 May 2018 14:42:49 +0200
Subject: gnu: samba: Propagate some inputs.

* gnu/packages/samba.scm (samba)[inputs]: Move LDB, TALLOC and TEVENT ...
[propagated-inputs]: ... here.  New field.
---
 gnu/packages/samba.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/samba.scm')

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index fda1ad3e5b..5ac18e1ac0 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -204,14 +204,16 @@ anywhere.")
        ("gnutls" ,gnutls)
        ("iniparser" ,iniparser)
        ("libaio" ,libaio)
-       ("ldb" ,ldb)
        ("linux-pam" ,linux-pam)
        ("openldap" ,openldap)
        ("popt" ,popt)
        ("readline" ,readline)
-       ("talloc" ,talloc)
-       ("tevent" ,tevent)
        ("tdb" ,tdb)))
+    (propagated-inputs
+     ;; In Requires or Requires.private of pkg-config files.
+     `(("ldb" ,ldb)
+       ("talloc" ,talloc)
+       ("tevent" ,tevent)))
     (native-inputs
      `(("docbook-xsl" ,docbook-xsl)    ;for generating manpages
        ("xsltproc" ,libxslt)           ;ditto
-- 
cgit v1.2.3


From 2ea806f062197615dbb50f84e905e832a779143b Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 2 May 2018 14:43:49 +0200
Subject: gnu: samba: Update to 4.8.1.

* gnu/packages/samba.scm (samba): Update to 4.8.1.
[arguments]: Adjust 'disable-etc-samba-directory-creation' phase.
---
 gnu/packages/samba.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/samba.scm')

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 5ac18e1ac0..3a41854e9c 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -148,14 +148,14 @@ anywhere.")
 (define-public samba
   (package
     (name "samba")
-    (version "4.7.7")
+    (version "4.8.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://download.samba.org/pub/samba/stable/"
                                  "samba-" version ".tar.gz"))
              (sha256
               (base32
-               "0c81x2ncnvz3mi6fjj81clm1mh049d3ip3fj031l44qclxpx3yi9"))))
+               "17bqgxyv34hjnb4hfamag75gwhqipp6mpvba5xg7lszi0xskdxwf"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
@@ -190,8 +190,8 @@ anywhere.")
          (add-before 'install 'disable-etc-samba-directory-creation
            (lambda _
              (substitute* "dynconfig/wscript"
-               (("bld\\.INSTALL_DIRS\\(\"\",[[:blank:]]{1,}\"\\$\\{CONFIGDIR\\}[[:blank:]]{1,}")
-                "bld.INSTALL_DIRS(\"\", \""))
+               (("bld\\.INSTALL_DIR\\(\"\\$\\{CONFIGDIR\\}\"\\)")
+                ""))
              #t)))
        ;; XXX: The test infrastructure attempts to set password with
        ;; smbpasswd, which fails with "smbpasswd -L can only be used by root."
-- 
cgit v1.2.3


From 43e68aa4eec4f570ce7f29423e3d9f3e50ddf290 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 3 May 2018 20:31:12 +0200
Subject: gnu: ldb: Update to 1.3.3.

* gnu/packages/samba.scm (ldb): Update to 1.3.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 3a41854e9c..d12ca8f6e8 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -340,14 +340,14 @@ many event types, including timers, signals, and the classic file descriptor eve
 (define-public ldb
   (package
     (name "ldb")
-    (version "1.3.2")
+    (version "1.3.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.samba.org/ftp/ldb/ldb-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1avn4fl393kc80krbc47phbp0argdkys62ycs8vm934a6nvz0gnf"))))
+                "14gsrm7dvyjpbpnc60z75j6fz2p187abm2h353lq95kx2bv70c1b"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
-- 
cgit v1.2.3