tjh.dev
Merge pull request #170013 from berbiche/john-gcc-11-patch
john: add gcc11 patch
authored by Rick van Schijndel and committed by GitHub fd2c8f93 357f1b79
+17
-7
pkgs/tools/security/john/default.nix
+17
-7
pkgs/tools/security/john/default.nix
···
1
-
{ lib, stdenv, fetchurl, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2
2
-
, gcc, python3Packages, perl, perlPackages, makeWrapper
1
+
{ lib, stdenv, fetchFromGitHub, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2
2
+
, gcc, python3Packages, perl, perlPackages, makeWrapper, fetchpatch
3
3
}:
4
4
5
5
with lib;
···
8
8
pname = "john";
9
9
version = "1.9.0-jumbo-1";
10
10
11
-
src = fetchurl {
12
-
url = "http://www.openwall.com/john/k/${pname}-${version}.tar.xz";
13
-
sha256 = "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm";
11
+
src = fetchFromGitHub {
12
+
owner = "openwall";
13
+
repo = pname;
14
+
rev = "1.9.0-Jumbo-1";
15
+
sha256 = "sha256-O1iPh5QTMjZ78sKvGbvSpaHFbBuVc1z49UKTbMa24Rs=";
14
16
};
17
+
18
+
patches = [
19
+
(fetchpatch {
20
+
name = "fix-gcc-11-struct-allignment-incompatibility.patch";
21
+
url = "https://github.com/openwall/john/commit/154ee1156d62dd207aff0052b04c61796a1fde3b.patch";
22
+
sha256 = "sha256-3rfS2tu/TF+KW2MQiR+bh4w/FVECciTooDQNTHNw31A=";
23
+
})
24
+
];
15
25
16
26
postPatch = ''
17
27
sed -ri -e '
···
69
79
70
80
meta = {
71
81
description = "John the Ripper password cracker";
72
-
license = licenses.gpl2;
73
-
homepage = "https://github.com/magnumripper/JohnTheRipper/";
82
+
license = licenses.gpl2Plus;
83
+
homepage = "https://github.com/openwall/john/";
74
84
maintainers = with maintainers; [ offline matthewbauer ];
75
85
platforms = platforms.unix;
76
86
};