Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6d9a4a615ee2
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e4105b542a0c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 29, 2020

  1. opensmtpd: apply patch for CVE-2020-7247.patch 

    Backport the fix included in the bump from 6.6.1p1 -> 6.6.2p1.

Master PR: NixOS/nixpkgs#78741
    @flokli
    flokli committed Jan 29, 2020
    Copy the full SHA
    f5c74e6 View commit details

  2. Merge pull request #78752 from flokli/opensmtpd-CVE-2020-7247 

    [19.09] opensmtpd: apply patch for CVE-2020-7247.patch
    @obadz
    obadz authored Jan 29, 2020
    Copy the full SHA
    e4105b5 View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 pkgs/servers/mail/opensmtpd/default.nix
5 changes: 5 additions & 0 deletions pkgs/servers/mail/opensmtpd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,11 @@ 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`