Merge release-21.05 into staging-next-21.05

This commit is contained in:
github-actions[bot] 2021-08-04 06:02:02 +00:00 committed by GitHub
commit d57a0c4cd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions

View File

@ -3,6 +3,7 @@
, procps, coreutils, gnused, systemd, glibcLocales
, AppKit, Carbon, Cocoa
, nixosTests
, fetchpatch
}:
stdenv.mkDerivation rec {
@ -16,6 +17,24 @@ stdenv.mkDerivation rec {
sha256 = "0b252l9r45h8r5gibdqcn6hhbm8g6rfzhm1k9d39pwhs5x77cjqv";
};
patches = [
(fetchpatch {
name = "CVE-2021-22116.patch";
url = "https://github.com/rabbitmq/rabbitmq-server/commit/626d5219115d087a2695c0eb243c7ddb7e154563.patch";
sha256 = "0wknixb5szwmxyvna793c2qkwnv7kynimibrswxdd1941vv6ijm3";
})
(fetchpatch {
name = "CVE-2021-32718.patch";
url = "https://github.com/rabbitmq/rabbitmq-server/commit/5d15ffc5ebfd9818fae488fc05d1f120ab02703c.patch";
sha256 = "11bgknnajd38bkqaiqaqbryjxyxg5qaynv6gbflp5fgy4jj8dv7v";
})
(fetchpatch {
name = "CVE-2021-32719.patch";
url = "https://github.com/rabbitmq/rabbitmq-server/commit/f191414dbc2ca738f313bb31e432d57870922892.patch";
sha256 = "1p5wb4p9cmxmbvrcwxh8m204nabjqgpmn7sk9djgbi1d0ac65w3h";
})
];
nativeBuildInputs = [ unzip ];
buildInputs =
[ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip rsync glibcLocales ]