alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge #168941: nginxStable: add patch for CVE-2021-3618

Browse source
This commit is contained in:
Vladimír Čunát 2022-04-23 16:58:48 +02:00
parent c2657131b2 6951ba02f4
commit 46561f0891
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/servers/http/nginx/generic.nix
View file

@ -18,6 +18,7 @@
, sha256 ? null # when not specifying src
, configureFlags ? []
, buildInputs ? []
, extraPatches ? []
, fixPatch ? p: p
, preConfigure ? ""
, postInstall ? null
@ -134,7 +135,8 @@ stdenv.mkDerivation {
url = "https://raw.githubusercontent.com/openwrt/packages/c057dfb09c7027287c7862afab965a4cd95293a3/net/nginx/patches/103-sys_nerr.patch";
sha256 = "0s497x6mkz947aw29wdy073k8dyjq8j99lax1a1mzpikzr4rxlmd";
})
] ++ mapModules "patches");
] ++ mapModules "patches")
++ extraPatches;
hardeningEnable = optional (!stdenv.isDarwin) "pie";

9
pkgs/servers/http/nginx/stable.nix
View file

@ -1,6 +1,13 @@
{ callPackage, ... } @ args:
{ callPackage, fetchpatch, ... } @ args:
callPackage ./generic.nix args {
version = "1.20.2";
sha256 = "0hjsyjzd35qyw49w210f67g678kvzinw4kg1acb0l6c2fxspd24m";
extraPatches = [
(fetchpatch {
name = "CVE-2021-3618.patch";
url = "https://github.com/nginx/nginx/commit/173f16f736c10eae46cd15dd861b04b82d91a37a.patch";
sha256 = "0cnxmbkp6ip61w7y1ihhnvziiwzz3p3wi2vpi5c7yaj5m964k5db";
})
];
}