Merge branch 'master' into core-updates

gnu/packages/admin.scm

@@ -1599,14 +1599,14 @@ done with the @code{auditctl} utility.")
 (define-public nmap
   (package
     (name "nmap")
-    (version "7.50")
+    (version "7.60")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://nmap.org/dist/nmap-" version
                                   ".tar.bz2"))
               (sha256
                (base32
-                "1ckl2qxqxkrfa2qxdrqyaa4k1hhj273aqckrc46fijdz0a76mag9"))
+                "08bga42ipymmbxd7wy4x5sl26c0ir1fm3n9rc6nqmhx69z66wyd8"))
               (modules '((guix build utils)))
               (snippet
                '(map delete-file-recursively

gnu/packages/curl.scm

@@ -4,6 +4,7 @@
 ;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
 ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,6 +25,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
   #:use-module (gnu packages compression)
@@ -40,6 +42,7 @@
 (define-public curl
   (package
    (name "curl")
+   (replacement curl-7.55.0)
    (version "7.54.1")
    (source (origin
             (method url-fetch)
@@ -119,3 +122,28 @@ tunneling, and so on.")
    (license (license:non-copyleft "file://COPYING"
                                   "See COPYING in the distribution."))
    (home-page "https://curl.haxx.se/")))
+
+(define-public curl-7.55.0
+  (package
+    (inherit curl)
+    (version "7.55.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "https://curl.haxx.se/download/curl-"
+                            version ".tar.xz"))
+        (sha256
+         (base32
+          "1785vxi0jamiv9d1wr1l45g0fm9ircxdfyfzf7ld8zv0z0i8bmfd"))))
+    (arguments
+     `(,@(substitute-keyword-arguments (package-arguments curl)
+           ((#:phases phases)
+            `(modify-phases ,phases
+               (add-before 'install 'fix-Makefile
+                 ;; Fix a regression in 7.55.0 where docs are not installed.
+                 ;; https://github.com/curl/curl/commit/a7bbbb7c368c6096802007f61f19a02e9d75285b
+                 (lambda _
+                   (substitute* "Makefile"
+                     (("install-data-hook:\n")
+                      "install-data-hook:\n\tcd docs/libcurl && $(MAKE) install\n"))
+                   #t)))))))))

gnu/packages/samba.scm

@@ -149,14 +149,14 @@ anywhere.")
 (define-public samba
   (package
     (name "samba")
-    (version "4.6.6")
+    (version "4.6.7")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://download.samba.org/pub/samba/stable/"
                                  "samba-" version ".tar.gz"))
              (sha256
               (base32
-               "13hs7xplygbl5dgwnn3l0hkbc0a282wdrkbx5c7y6nnqyw4whcgw"))))
+               "1ynxndfk45zkkylz3jsrx42a7kmm42jddk5bdhihyf88vs9l7wly"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases