Merge remote-tracking branch 'upstream/master' into hardened-stdenv

pkgs/tools/security/gnupg/1compat.nix

@@ -6,12 +6,12 @@ stdenv.mkDerivation {
   builder = writeScript "gnupg1compat-builder" ''
     # First symlink all top-level dirs
     ${coreutils}/bin/mkdir -p $out
-    ${coreutils}/bin/ln -s ${gnupg}/* $out
+    ${coreutils}/bin/ln -s "${gnupg}/"* $out
 
     # Replace bin with directory and symlink it contents
     ${coreutils}/bin/rm $out/bin
     ${coreutils}/bin/mkdir -p $out/bin
-    ${coreutils}/bin/ln -s ${gnupg}/bin/* $out/bin
+    ${coreutils}/bin/ln -s "${gnupg}/bin/"* $out/bin
 
     # Add gpg->gpg2 and gpgv->gpgv2 symlinks
     ${coreutils}/bin/ln -s gpg2 $out/bin/gpg

pkgs/tools/security/gpgstats/default.nix

@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
     cp gpgstats $out/bin
   '';
 
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionals (!stdenv.is64bit)
+    [ "-D_FILE_OFFSET_BITS=64" "-DLARGEFILE_SOURCE=1" ];
+
   meta = with stdenv.lib; {
     description = "Calculates statistics on the keys in your gpg key-ring";
     longDescription = ''

pkgs/tools/security/lastpass-cli/default.nix

@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "lastpass-cli-${version}";
 
-  version = "0.7.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "lastpass";
     repo = "lastpass-cli";
     rev = "v${version}";
-    sha256 = "18dn4sx173666w6aaqhwcya5x2z3q0fmhg8h76lgdmx8adrhzdzc";
+    sha256 = "1iaz36bcyss2kahhlm92l7yh26rxvs12wnkkh1289yarl5wi0yld";
   };
 
   buildInputs = [

pkgs/tools/security/minisign/default.nix

@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "029g8ian72fy07k73nf451dw1yggav6crjjc2x6kv4nfpq3pl9pj";
   };
 
-  buildInputs = [ cmake libsodium ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libsodium ];
 
   meta = with stdenv.lib; {
     description = "A simple tool for signing files and verifying signatures";

pkgs/tools/security/sshuttle/default.nix

@@ -3,10 +3,10 @@
   
 pythonPackages.buildPythonApplication rec {
   name = "sshuttle-${version}";
-  version = "0.76";
+  version = "0.77.2";
 
   src = fetchurl {
-    sha256 = "1q0hr0vhdvv23cw5dqndsmf61283mvs6b14662ci00xj6zp5v48b";
+    sha256 = "1fwlhr5r9pl3pns65nn4mxf5ivypmd2a12gv3vpyznfy5f097k10";
     url = "https://pypi.python.org/packages/source/s/sshuttle/${name}.tar.gz";
   };