Unverified Commit 835260ee authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

nginxMainline: 1.27.5 -> 1.29.1 (#436131)

parents ab8c1125 bfd92683

pkgs/servers/http/nginx/generic.nix

+0 −7
Original line number Diff line number Diff line
@@ -218,13 +218,6 @@ stdenv.mkDerivation { 
        ./nix-etag-1.15.4.patch

        ./nix-skip-check-logs-path.patch

      ]

      ++ lib.optionals (!lib.versionAtLeast version "1.29.1") [

        (fetchpatch {

          name = "CVE-2025-53859.patch";

          url = "https://nginx.org/download/patch.2025.smtp.txt";

          hash = "sha256-v49sLskFNMoKuG8HQISw8ST7ga6DS+ngJiL0D3sUyGk=";

        })

      ]

      ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

        (fetchpatch {

          url = "https://raw.githubusercontent.com/openwrt/packages/c057dfb09c7027287c7862afab965a4cd95293a3/net/nginx/patches/102-sizeof_test_fix.patch";

pkgs/servers/http/nginx/stable.nix

+8 −1
Original line number Diff line number Diff line 
{ callPackage, ... }@args:

{ callPackage, fetchpatch, ... }@args:



callPackage ./generic.nix args {

  version = "1.28.0";

  hash = "sha256-xrXGsIbA3508o/9eCEwdDvkJ5gOCecccHD6YX1dv92o=";

  extraPatches = [

    (fetchpatch {

      name = "CVE-2025-53859.patch";

      url = "https://nginx.org/download/patch.2025.smtp.txt";

      hash = "sha256-v49sLskFNMoKuG8HQISw8ST7ga6DS+ngJiL0D3sUyGk=";

    })

  ];

}