From ad19bb5ff849dfa9af2ad52afda361198391db43 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 24 Feb 2020 23:08:00 +0100 Subject: ipmitool: migrate to openssl 1.1 This adds a patch from debian to switch ipmitool to openssl 1.1. Upstream seems to already carry a version of this but that is yet to be part of a release. --- pkgs/tools/system/ipmitool/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/system') diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 3105cba5a344..e86dc14b0201 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, openssl, static ? false }: +{ stdenv, lib, fetchurl, openssl, fetchpatch, static ? false }: let pkgname = "ipmitool"; @@ -12,7 +12,14 @@ stdenv.mkDerivation { sha256 = "0kfh8ny35rvwxwah4yv91a05qwpx74b5slq2lhrh71wz572va93m"; }; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/i/ipmitool/1.8.18-6/debian/patches/0120-openssl1.1.patch"; + sha256 = "1xvsjxb782lzy72bnqqnsk3r5h4zl3na95s4pqn2qg7cic2mnbfk"; + }) + ]; + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace src/plugins/ipmi_intf.c --replace "s6_addr16" "s6_addr" ''; -- cgit 1.4.1