Merge branch 'master.upstream' into staging.upstream

pkgs/tools/security/afl/default.nix

@@ -9,11 +9,11 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
-  version = "1.83b";
+  version = "1.86b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "1zkf9vdhmm1h0flxl1ybmw41amgh9cyh4hyb18jp972lgd9q642v";
+    sha256 = "1by9ncf6lgcyibzqwyla34jv64sd66mn8zhgjz2pcgsds51qwn0r";
   };
 
   # Note: libcgroup isn't needed for building, just for the afl-cgroup

pkgs/tools/security/logkeys/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "5ef6b0dcb9e3";
 
   src = fetchgit {
-    url = "https://code.google.com/p/logkeys/";
+    url = https://github.com/kernc/logkeys;
     rev = "5ef6b0dcb9e38e6137ad1579d624ec12107c56c3";
     sha256 = "02p0l92l0fq069g31ks6xbqavzxa9njj9460vw2jsa7livcn2z9d";
   };
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A GNU/Linux keylogger that works!";
     license = licenses.gpl3;
-    homepage = http://code.google.com/p/logkeys/;
+    homepage = https://github.com/kernc/logkeys;
     maintainers = with maintainers; [offline];
     platforms = with platforms; linux;
   };