summary refs log tree commit diff
diff options
context:
space:
mode:
author宋文武 <iyzsong@gmail.com>2015-12-18 10:08:33 +0800
committer宋文武 <iyzsong@gmail.com>2015-12-18 10:30:17 +0800
commit095da0234299372c9793d1ccd7ee05e5abf0ff04 (patch)
tree68c05df1fa64d28a98e0ad3d5c441f3a240f192f
parent960ae0cde4d05c33547b16fe97f17f82a9c562e1 (diff)
downloadguix-095da0234299372c9793d1ccd7ee05e5abf0ff04.tar.gz
gnu: talloc: Update to 2.1.5.
* gnu/packages/samba.scm (talloc): Update to 2.1.5.
[arguments]: Modify wscript to skip the 'magic_differs' test.
-rw-r--r--gnu/packages/samba.scm9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 0873a00267..743784c02e 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -169,20 +169,25 @@ Desktops into Active Directory environments using the winbind daemon.")
 (define-public talloc
   (package
     (name "talloc")
-    (version "2.1.2")
+    (version "2.1.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.samba.org/ftp/talloc/talloc-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "13c365f7y8idjf2v1jxdjpkc3lxdmsxxfxjx1ymianm7zjiph393"))))
+                "1pfx3kmj973hpacfw46fzfnjd7ms1j03ifkc30wk930brx8ffcrq"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
          (replace 'configure
            (lambda* (#:key outputs #:allow-other-keys)
+             ;; test_magic_differs.sh has syntax error, and is not in the right
+             ;; place where wscript expected.
+             ;; Skip the test.
+             (substitute* "wscript"
+               (("magic_ret = .*") "magic_ret = 0\n"))
              ;; talloc uses a custom configuration script that runs a
              ;; python script called 'waf'.
              (setenv "CONFIG_SHELL" (which "sh"))