diff options
| author | Will Dietz <w@wdtz.org> | 2019-06-03 20:57:14 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2019-06-04 15:02:28 -0500 |
| commit | 0e3a443f58bf2d0c6cc75998e859bc9becaa7869 (patch) | |
| tree | 36e499b920bb8ca0e16264d6612a8bb4b38d2962 /pkgs/tools/security | |
| parent | 984120f4c957f75216bd157c24ea38d8f9730411 (diff) | |
john: 1.8.0-jumbo-1 -> 1.9.0-jumbo-1
https://www.openwall.com/lists/announce/2019/05/14/1
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/john/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/security/john/gcc5.patch | 14 |
2 files changed, 3 insertions, 19 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)) |