john: 1.8.0-jumbo-1 -> 1.9.0-jumbo-1
https://www.openwall.com/lists/announce/2019/05/14/1
This commit is contained in:
parent
984120f4c9
commit
0e3a443f58
|
@ -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/!
|
||||
|
|
|
@ -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))
|
Loading…
Reference in a new issue