Merge master into staging-next

3 files changed, 29 insertions, 29 deletions

diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
index 97f6ec21b548..d4db02cc9ed1 100644
--- a/pkgs/tools/security/john/default.nix
+++ b/pkgs/tools/security/john/default.nix
@@ -6,15 +6,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "john-${version}";
-  version = "1.8.0-jumbo-1";
+  version = "1.9.0-jumbo-1";
 
   src = fetchurl {
-    url = "http://www.openwall.com/john/j/${name}.tar.xz";
-    sha256 = "08q92sfdvkz47rx6qjn7qv57cmlpy7i7rgddapq5384mb413vjds";
+    url = "http://www.openwall.com/john/k/${name}.tar.xz";
+    sha256 = "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm";
   };
 
-  patches = [ ./gcc5.patch ];
-
   postPatch = ''
     sed -ri -e '
       s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/!
diff --git a/pkgs/tools/security/john/gcc5.patch b/pkgs/tools/security/john/gcc5.patch
deleted file mode 100644
index 73da83483f90..000000000000
--- a/pkgs/tools/security/john/gcc5.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/common.h b/src/common.h
---- a/src/common.h
-+++ b/src/common.h
-@@ -31,7 +31,9 @@ typedef unsigned long long ARCH_WORD_64;
- #define is_aligned(PTR, CNT) ((((ARCH_WORD)(const void *)(PTR))&(CNT-1))==0)
- 
- #ifdef __GNUC__
--#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || defined(__INTEL_COMPILER)
-+#if __GNUC__ >= 5
-+#define MAYBE_INLINE __attribute__((gnu_inline)) inline
-+#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || defined(__INTEL_COMPILER)
- #define MAYBE_INLINE __attribute__((always_inline)) inline
- #elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
- #define MAYBE_INLINE __attribute__((always_inline))
diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/tools/security/radamsa/default.nix
index 3126dd2b4faf..7a78233dbced 100644
--- a/pkgs/tools/security/radamsa/default.nix
+++ b/pkgs/tools/security/radamsa/default.nix
@@ -1,26 +1,42 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchFromGitLab, bash }:
 
+let
+  # Fetch explicitly, otherwise build will try to do so
+  owl = fetchurl {
+    name = "ol.c.gz";
+    url = "https://gitlab.com/owl-lisp/owl/uploads/0d0730b500976348d1e66b4a1756cdc3/ol-0.1.19.c.gz";
+    sha256 = "0kdmzf60nbpvdn8j3l51i9lhcwfi4aw1zj4lhbp4adyg8n8pp4c6";
+  };
+in
 stdenv.mkDerivation rec {
-  name = "radamsa-${version}";
-  version = "0.5";
+  pname = "radamsa";
+  version = "0.6";
 
-  src = fetchurl {
-    url = "https://github.com/aoh/radamsa/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "1d2chp45fbdb2v5zpsx6gh3bv8fhcjv0zijz10clcznadnm8c6p2";
+  src = fetchFromGitLab {
+    owner = "akihe";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0mi1mwvfnlpblrbmp0rcyf5p74m771z6nrbsly6cajyn4mlpmbaq";
   };
 
   patchPhase = ''
     substituteInPlace ./tests/bd.sh  \
       --replace "/bin/echo" echo
-    substituteInPlace ./Makefile \
-      --replace "PREFIX=/usr" "PREFIX=$out" \
-      --replace "BINDIR=/bin" "BINDIR="
+
+    ln -s ${owl} ol.c.gz
+
+    patchShebangs tests
   '';
+
+  makeFlags = [ "PREFIX=${placeholder "out"}" "BINDIR=" ];
+
+  checkInputs = [ bash ];
+  doCheck = true;
   
   meta = {
     description = "A general purpose fuzzer";
     longDescription = "Radamsa is a general purpose data fuzzer. It reads data from given sample files, or standard input if none are given, and outputs modified data. It is usually used to generate malformed data for testing programs.";
-    homepage = https://github.com/aoh/radamsa;
+    homepage =  https://gitlab.com/akihe/radamsa;
     maintainers = [ stdenv.lib.maintainers.markWot ];
     platforms = stdenv.lib.platforms.all;
   };