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: 0715f2f1a9b3
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: 147bd882fc66
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Aug 28, 2019

  1. dovecot: apply patch for CVE-2019-11500

    @andir
    andir committed Aug 28, 2019
    Copy the full SHA
    f525dc4 View commit details

  2. dovecot_pigeonhole: apply patch for CVE-2019-11500

    @andir
    andir committed Aug 28, 2019
    Copy the full SHA
    b788227 View commit details

Commits on Aug 29, 2019

  1. Merge pull request #67639 from andir/19.03/dovecot 

    [19.03] dovecot apply CVE-2019-11500 patches
    @andir
    andir authored Aug 29, 2019
    Copy the full SHA
    147bd88 View commit details
Showing with 26 additions and 1 deletion.
  1. +12 −0 pkgs/servers/mail/dovecot/default.nix
  2. +14 −1 pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
12 changes: 12 additions & 0 deletions pkgs/servers/mail/dovecot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -55,6 +55,18 @@ stdenv.mkDerivation rec {
sha256 = "1di6adkd8f6gjkpf8aiqxzwvscsq188qqah6b7r23q9j3zlv47mv";
})

(fetchpatch {
name = "CVE-2019-11500-1.patch";
url = https://github.com/dovecot/core/commit/85fcb895ca7f0bcb8ee72047fe0e1e78532ff90b.patch;
sha256 = "0cn0sk5giaf2z26zp53cj9h0xcbj347ad6zgp2k377fphn9yjcc5";
})

(fetchpatch {
name = "CVE-2019-11500-2.patch";
url = https://github.com/dovecot/core/commit/f904cbdfec25582bc5e2a7435bf82ff769f2526a.patch;
sha256 = "1dcp8axbpcib837n2x54xxylyglbh2zh9bf0y3vpvmapya162s1a";
})

];

configureFlags = [
15 changes: 14 additions & 1 deletion pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, dovecot, openssl }:
{ stdenv, fetchurl, dovecot, openssl, fetchpatch }:

stdenv.mkDerivation rec {
name = "dovecot-pigeonhole-${version}";
@@ -11,6 +11,19 @@ stdenv.mkDerivation rec {

buildInputs = [ dovecot openssl ];

patches = [
(fetchpatch {
name = "CVE-2019-11500-1.patch";
url = https://github.com/dovecot/pigeonhole/commit/7ce9990a5e6ba59e89b7fe1c07f574279aed922c.patch;
sha256 = "07l4m2wkqn910zb8d477q6asryfqzhbhxl4fl0w89s763maiam9v";
})
(fetchpatch {
name = "CVE-2019-11500-2.patch";
url = https://github.com/dovecot/pigeonhole/commit/4a299840cdb51f61f8d1ebc0210b19c40dfbc1cc.patch;
sha256 = "1p7jl3fcxr63yrgj5m11sbmbfnibrx5v9aifscn1wq858jnn8myf";
})
];

preConfigure = ''
substituteInPlace src/managesieve/managesieve-settings.c --replace \
".executable = \"managesieve\"" \