From 2fe26c0ca9d7f2794deb9287209c7879431ed631 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Aug 2021 12:12:04 +0200 Subject: [PATCH] ssldump: 1.1 -> 1.4 --- pkgs/tools/networking/ssldump/default.nix | 48 +++++++++++++++++------ 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix index fc92f43981b6..0d3e5ccf07e6 100644 --- a/pkgs/tools/networking/ssldump/default.nix +++ b/pkgs/tools/networking/ssldump/default.nix @@ -1,30 +1,52 @@ -{ lib, stdenv, fetchFromGitHub, openssl, libpcap }: +{ lib +, stdenv +, autoreconfHook +, fetchFromGitHub +, json_c +, libnet +, libpcap +, openssl +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ssldump"; - version = "1.1"; + version = "1.4"; src = fetchFromGitHub { owner = "adulau"; repo = "ssldump"; - rev = "7491b9851505acff95b2c68097e9b9f630d418dc"; - sha256 = "1j3rln86khdnc98v50hclvqaq83a24c1rfzbcbajkbfpr4yxpnpd"; + rev = "v${version}"; + sha256 = "1xnlfqsl93nxbcv4x4xsgxa6mnhcx37hijrpdb7vzla6q7xvg8qr"; }; - buildInputs = [ libpcap openssl ]; + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + json_c + libnet + libpcap + openssl + ]; + prePatch = '' sed -i -e 's|#include.*net/bpf.h|#include |' \ base/pcap-snoop.c ''; - configureFlags = [ "--with-pcap-lib=${libpcap}/lib" - "--with-pcap-inc=${libpcap}/include" - "--with-openssl-lib=${openssl}/lib" - "--with-openssl-inc=${openssl}/include" ]; - meta = { + + configureFlags = [ + "--with-pcap-lib=${libpcap}/lib" + "--with-pcap-inc=${libpcap}/include" + "--with-openssl-lib=${openssl}/lib" + "--with-openssl-inc=${openssl}/include" + ]; + + meta = with lib; { description = "An SSLv3/TLS network protocol analyzer"; homepage = "http://ssldump.sourceforge.net"; license = "BSD-style"; - maintainers = with lib.maintainers; [ aycanirican ]; - platforms = lib.platforms.linux; + maintainers = with maintainers; [ aycanirican ]; + platforms = platforms.linux; }; }