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.
This commit is contained in:
Andreas Rammhold 2020-02-24 23:08:00 +01:00
parent 9532ca329e
commit ad19bb5ff8
No known key found for this signature in database
GPG key ID: E432E410B5E48C86
2 changed files with 10 additions and 5 deletions

View file

@ -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"
'';

View file

@ -4261,9 +4261,7 @@ in
ipget = callPackage ../applications/networking/ipget { };
ipmitool = callPackage ../tools/system/ipmitool {
openssl = openssl_1_0_2;
};
ipmitool = callPackage ../tools/system/ipmitool {};
ipmiutil = callPackage ../tools/system/ipmiutil {};