10 files changed, 52 insertions, 48 deletions
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix
index 79da3f8cf9bb..ffa119b3c53b 100644
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/pkgs/tools/backup/bareos/default.nix
@@ -12,14 +12,14 @@ let
 in
 stdenv.mkDerivation rec {
   name = "bareos-${version}";
-  version = "15.2.1";
+  version = "15.2.4";
 
   src = fetchFromGitHub {
     owner = "bareos";
     repo = "bareos";
     rev = "Release/${version}";
     name = "${name}-src";
-    sha256 = "01vnqahzjj598jjk4y7qzfnq415jh227v40sgkrdl4qcpn76spxi";
+    sha256 = "02k6wmr2n12dc6vwda8xczmbqidg6fs8nfg9n2cwwpm3k1a21qnd";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/pkgs/tools/filesystems/zfstools/default.nix
index 7a056f503e23..518e92814a41 100644
--- a/pkgs/tools/filesystems/zfstools/default.nix
+++ b/pkgs/tools/filesystems/zfstools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, ruby, zfs }:
 
-let version = "0.3.3"; in
+let version = "0.3.6"; in
 stdenv.mkDerivation rec {
   name = "zfstools-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1gj6jksc9crmjvhsx8yp3l06b5vcm415l0bmdjcil7jjbfhwwp2k";
+    sha256 = "16lvw3xbmxp2pr8nixqn7lf4504zaaxvbbdnjkv4dggwd4lsdjyg";
     rev = "v${version}";
     repo = "zfstools";
     owner = "bdrewery";
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index d1936cb11ad3..958bea34e7d3 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
     sha256 = "1v6q83qsrf7dgp3y5fa5vkppgqyy82pnsk8z9b4047b6fvclfwvv";
   };
 
-  patches = [ ./nix-ssl-cert-file.patch ];
-
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
 
   nativeBuildInputs = [ pkgconfig perl ];
diff --git a/pkgs/tools/networking/curl/nix-ssl-cert-file.patch b/pkgs/tools/networking/curl/nix-ssl-cert-file.patch
deleted file mode 100644
index 20c408bfae23..000000000000
--- a/pkgs/tools/networking/curl/nix-ssl-cert-file.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru -x '*~' curl-7.50.3-orig/src/tool_operate.c curl-7.50.3/src/tool_operate.c
---- curl-7.50.3-orig/src/tool_operate.c	2016-09-06 23:25:06.000000000 +0200
-+++ curl-7.50.3/src/tool_operate.c	2016-10-14 11:51:48.999943142 +0200
-@@ -269,7 +269,9 @@
-         capath_from_env = true;
-       }
-       else {
--        env = curlx_getenv("SSL_CERT_FILE");
-+        env = curlx_getenv("NIX_SSL_CERT_FILE");
-+        if(!env)
-+          env = curlx_getenv("SSL_CERT_FILE");
-         if(env) {
-           config->cacert = strdup(env);
-           if(!config->cacert) {
diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix
new file mode 100644
index 000000000000..9e0033cca90c
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/strongswan.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, procps
+, gnome3, libgnome_keyring, libsecret }:
+
+stdenv.mkDerivation rec {
+  name    = "${pname}-${version}";
+  pname   = "NetworkManager-strongswan";
+  version = "1.4.0";
+
+  src = fetchurl {
+    url    = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2";
+    sha256 = "0qfnylg949lkyw1nmyggz2ipgmy154ic5q5ljjcwcgi14r90ys02";
+  };
+
+  postPatch = ''
+    sed -i "s,nm_plugindir=.*,nm_plugindir=$out/lib/NetworkManager," "configure"
+    sed -i "s,nm_libexecdir=.*,nm_libexecdir=$out/libexec," "configure"
+  '';
+
+  buildInputs = [ networkmanager libsecret ]
+      ++ (with gnome3; [ gtk libgnome_keyring networkmanagerapplet ]);
+
+  nativeBuildInputs = [ intltool pkgconfig ];
+
+  preConfigure = ''
+     substituteInPlace "configure" \
+       --replace "/sbin/sysctl" "${procps}/bin/sysctl"
+  '';
+
+  meta = {
+    description = "NetworkManager's strongswan plugin";
+    inherit (networkmanager.meta) platforms;
+  };
+}
+
diff --git a/pkgs/tools/system/foreman/default.nix b/pkgs/tools/system/foreman/default.nix
index 1c74724793d4..e97d71f5c84a 100644
--- a/pkgs/tools/system/foreman/default.nix
+++ b/pkgs/tools/system/foreman/default.nix
@@ -2,7 +2,7 @@
 
 bundlerEnv {
   inherit ruby;
-  pName = "foreman";
+  pname = "foreman";
   gemdir = ./.;
 
   meta = with lib; {
diff --git a/pkgs/tools/system/hiera-eyaml/default.nix b/pkgs/tools/system/hiera-eyaml/default.nix
index 029a975dc913..e0ff7d5ca8b4 100644
--- a/pkgs/tools/system/hiera-eyaml/default.nix
+++ b/pkgs/tools/system/hiera-eyaml/default.nix
@@ -2,7 +2,7 @@
 
 bundlerEnv {
   inherit ruby;
-  pName = "hiera-eyaml";
+  pname = "hiera-eyaml";
   gemdir = ./.;
 
   meta = with lib; {
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 28ec7f1be427..13c50fe3ec9e 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -1,19 +1,24 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig }:
+{ stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig, libuuid }:
 
 stdenv.mkDerivation rec{
-  version = "1.0.0";
+  version = "1.4.0";
   name = "netdata-${version}";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "firehol";
     repo = "netdata";
-    sha256 = "03107ny98zks05p44jzypkk4lw8lbvmqja5b537ln6cnrgp20yvq";
+    sha256 = "1wknxci2baj6f7rl8z8j7haaz122jmbb74aw7i3xbj2y61cs58n8";
   };
 
-  buildInputs = [ autoreconfHook zlib pkgconfig ];
+  buildInputs = [ autoreconfHook zlib pkgconfig libuuid ];
 
-  patches = [ ./web_access.patch ];
+  preConfigure = ''
+    export ZLIB_CFLAGS=" "
+    export ZLIB_LIBS="-lz"
+    export UUID_CFLAGS=" "
+    export UUID_LIBS="-luuid"
+  '';
 
   meta = with stdenv.lib; {
     description = "Real-time performance monitoring tool";
diff --git a/pkgs/tools/system/netdata/web_access.patch b/pkgs/tools/system/netdata/web_access.patch
deleted file mode 100644
index 3c0fbf7507d7..000000000000
--- a/pkgs/tools/system/netdata/web_access.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/web_client.c.orig	2016-04-17 11:34:20.044455323 +0200
-+++ b/src/web_client.c	2016-04-17 11:34:47.432897957 +0200
-@@ -291,14 +291,14 @@
- 		buffer_sprintf(w->response.data, "File '%s' does not exist, or is not accessible.", filename);
- 		return 404;
- 	}
--
-+#if 0
- 	// check if the file is owned by us
- 	if(stat.st_uid != web_files_uid()) {
- 		error("%llu: File '%s' is owned by user %d (I run as user %d). Access Denied.", w->id, webfilename, stat.st_uid, getuid());
- 		buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", filename);
- 		return 403;
- 	}
--
-+#endif
- 	if((stat.st_mode & S_IFMT) == S_IFDIR) {
- 		snprintf(webfilename, FILENAME_MAX+1, "%s/index.html", filename);
- 		return mysendfile(w, webfilename);
diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix
index e38de5e6bd89..2535354aa229 100644
--- a/pkgs/tools/text/a2ps/default.nix
+++ b/pkgs/tools/text/a2ps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, libpaper, gperf, file, perl }:
+{ stdenv, fetchurl, fetchpatch, autoconf, bison, libpaper, gperf, file, perl }:
 
 stdenv.mkDerivation rec {
   name = "a2ps-4.14";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     substituteInPlace tests/defs.in --replace "/bin/rm" "rm"
   '';
 
-  nativeBuildInputs = [ file perl ];
+  nativeBuildInputs = [ autoconf file bison perl ];
   buildInputs = [ libpaper gperf ];
 
   meta = with stdenv.lib; {