forked from mirrors/nixpkgs
libcgroup: 0.41 -> 0.42.2
This commit is contained in:
parent
f1452b8978
commit
32fdb916a1
|
@ -1,26 +1,21 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, pam, bison, flex }:
|
||||
{ lib, stdenv, fetchFromGitHub, pam, bison, flex, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcgroup";
|
||||
version = "0.41";
|
||||
version = "0.42.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libcg/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0lgvyq37gq84sk30sg18admxaj0j0p5dq3bl6g74a1ppgvf8pqz4";
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1h8s70lm6g7r0wj7j3xgj2g3j9fifvsy2pna6w0j3i5hh42qfms4";
|
||||
};
|
||||
|
||||
buildInputs = [ pam bison flex ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2018-14348.patch";
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch?id=33e9f4c81de754bbf76b893ea1133ed023f2a0e5";
|
||||
sha256 = "1x0x29ld0cgmfwq4qy13s6d5c8sym1frfh1j2q47d8gfw6qaxka5";
|
||||
})
|
||||
];
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/tools/Makefile.in \
|
||||
substituteInPlace src/tools/Makefile.am \
|
||||
--replace 'chmod u+s' 'chmod +x'
|
||||
'';
|
||||
|
||||
|
|
Loading…
Reference in a new issue