diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-05-06 15:56:24 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-05-06 15:56:24 +0200 |
| commit | 12bd588346f8b2fb3709acfe0ee89d153da2db34 (patch) | |
| tree | 459d8eb13a0508170ba462fe61a8b45fb55ea79f /gnu/packages/samba.scm | |
| parent | 7d5adf013127c89826e9fbe9f1a67265b3538609 (diff) | |
| parent | 8e020519b45bbdb9403164bd4403f2465bac99ad (diff) | |
| download | gnu-guix-12bd588346f8b2fb3709acfe0ee89d153da2db34.tar gnu-guix-12bd588346f8b2fb3709acfe0ee89d153da2db34.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/samba.scm')
| -rw-r--r-- | gnu/packages/samba.scm | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 13b904a6c5..c194249596 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -150,14 +150,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 @@ -192,8 +192,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." @@ -206,14 +206,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 @@ -340,14 +342,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 |