Merge pull request #218251 from helsinki-systems/sslsplit_ossl3

sslsplit: fix build with openssl_3
This commit is contained in:
ajs124 2023-02-27 11:49:19 +01:00 committed by GitHub
commit 572d4f4ce7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, openssl, libevent, libpcap, libnet, zlib }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, libevent, libpcap, libnet, zlib }:
stdenv.mkDerivation rec {
pname = "sslsplit";
@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "1p43z9ln5rbc76v0j1k3r4nhvfw71hq8jzsallb54z9hvwfvqp3l";
};
patches = [
(fetchpatch {
name = "fix-openssl-3-build.patch";
url = "https://github.com/droe/sslsplit/commit/e17de8454a65d2b9ba432856971405dfcf1e7522.patch";
hash = "sha256-sEwP7f2PSqXdMqLub9zrfQgH8I4oe9klVPzNpJjrPJ8=";
})
];
buildInputs = [ openssl libevent libpcap libnet zlib ];
makeFlags = [

View File

@ -12269,9 +12269,7 @@ with pkgs;
ssldump = callPackage ../tools/networking/ssldump { };
sslsplit = callPackage ../tools/networking/sslsplit {
openssl = openssl_1_1;
};
sslsplit = callPackage ../tools/networking/sslsplit { };
sstp = callPackage ../tools/networking/sstp {};