cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #170013 from berbiche/john-gcc-11-patch

Browse source 
john: add gcc11 patch
This commit is contained in:
Rick van Schijndel 2022-05-03 20:02:08 +02:00 committed by GitHub
commit fd2c8f930f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/tools/security/john/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2 { lib, stdenv, fetchFromGitHub, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2
, gcc, python3Packages, perl, perlPackages, makeWrapper , gcc, python3Packages, perl, perlPackages, makeWrapper, fetchpatch
}: }:
with lib; with lib;
@ -8,11 +8,21 @@ stdenv.mkDerivation rec {
pname = "john"; pname = "john";
version = "1.9.0-jumbo-1"; version = "1.9.0-jumbo-1";
src = fetchurl { src = fetchFromGitHub {
url = "http://www.openwall.com/john/k/${pname}-${version}.tar.xz"; owner = "openwall";
sha256 = "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm"; repo = pname;
rev = "1.9.0-Jumbo-1";
sha256 = "sha256-O1iPh5QTMjZ78sKvGbvSpaHFbBuVc1z49UKTbMa24Rs=";
}; };
patches = [
(fetchpatch {
name = "fix-gcc-11-struct-allignment-incompatibility.patch";
url = "https://github.com/openwall/john/commit/154ee1156d62dd207aff0052b04c61796a1fde3b.patch";
sha256 = "sha256-3rfS2tu/TF+KW2MQiR+bh4w/FVECciTooDQNTHNw31A=";
})
];
postPatch = '' postPatch = ''
sed -ri -e ' sed -ri -e '
s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/! s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/!
@ -69,8 +79,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "John the Ripper password cracker"; description = "John the Ripper password cracker";
license = licenses.gpl2; license = licenses.gpl2Plus;
homepage = "https://github.com/magnumripper/JohnTheRipper/"; homepage = "https://github.com/openwall/john/";
maintainers = with maintainers; [ offline matthewbauer ]; maintainers = with maintainers; [ offline matthewbauer ];
platforms = platforms.unix; platforms = platforms.unix;
}; };