From fe67f42e29b0d9c4f55f1461e1a7ac54cee4dfd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 17 Mar 2020 12:07:36 +0000 Subject: [PATCH] Revert "opensmtpd: apply patch for CVE-2020-7247.patch" This reverts commit f5c74e62dc87f3c73905437517453e2a63089d9a. Already included in the opensmtpd version. --- pkgs/servers/mail/opensmtpd/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index f645a28dc64dd..76b247cfd8414 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -16,11 +16,6 @@ stdenv.mkDerivation rec { patches = [ ./proc_path.diff # TODO: upstream to OpenSMTPD, see https://github.com/NixOS/nixpkgs/issues/54045 - (fetchurl { - name = "CVE-2020-7247.patch"; - url = "https://github.com/OpenSMTPD/OpenSMTPD/commit/d2688c097e0ff53037c7403e09426771876a3907.patch"; - sha256 = "1mr5zb7mgpapf80xrcjvvzinzyiqcd3i0z4jwj11wl3zrfq5kwwn"; - }) ]; # See https://github.com/OpenSMTPD/OpenSMTPD/issues/885 for the `sh bootstrap`