JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34483 from andir/dovecot-cve-2017-15132

Browse Source 
dovecot: fix CVE-2017-15132
This commit is contained in:
Andreas Rammhold 2018-02-01 12:29:34 +00:00 committed by GitHub
commit f92fd9554e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/servers/mail/dovecot/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl
{ stdenv, lib, fetchurl, fetchpatch, perl, pkgconfig, systemd, openssl
, bzip2, zlib, lz4, inotify-tools, pam, libcap
, clucene_core_2, icu, openldap, libsodium, libstemmer
# Auth modules
@ -47,6 +47,16 @@ stdenv.mkDerivation rec {
# so we can symlink plugins from several packages there.
# The symlinking needs to be done in NixOS.
./2.2.x-module_dir.patch
(fetchpatch {
name = "CVE-2017-14132_part1.patch";
url = https://github.com/dovecot/core/commit/1a29ed2f96da1be22fa5a4d96c7583aa81b8b060.patch;
sha256 = "1pcfzxr8xlwbpa7z19grp7mlvdnan6ln8zw74dj4pdmynmlk4aw9";
})
(fetchpatch {
name = "CVE-2017-14132_part2.patch";
url = https://github.com/dovecot/core/commit/a9b135760aea6d1790d447d351c56b78889dac22.patch;
sha256 = "0082iid5rvjmh003xi9s09jld2rb31hbvni0yai1h1ggbmd5zf8l";
})
];
configureFlags = [

34
pkgs/servers/mail/dovecot/plugins/antispam/default.nix
View File

@ -1,34 +0,0 @@
{ stdenv, fetchhg, autoconf, automake, dovecot, openssl }:
stdenv.mkDerivation {
name = "dovecot-antispam-20130429";
src = fetchhg {
url = "http://hg.dovecot.org/dovecot-antispam-plugin/";
rev = "5ebc6aae4d7c";
sha256 = "181i79c9sf3a80mgmycfq1f77z7fpn3j2s0qiddrj16h3yklf4gv";
};
buildInputs = [ dovecot openssl ];
nativeBuildInputs = [ autoconf automake ];
preConfigure = ''
./autogen.sh
# Ugly hack; any ideas?
sed "s,^dovecot_moduledir=.*,dovecot_moduledir=$out/lib/dovecot," ${dovecot}/lib/dovecot/dovecot-config > dovecot-config
'';
configureFlags = [
"--with-dovecot=."
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://wiki2.dovecot.org/Plugins/Antispam;
description = "An antispam plugin for the Dovecot IMAP server";
license = licenses.gpl2;
maintainers = with maintainers; [ abbradar ];
platforms = platforms.linux;
};
}

1
pkgs/top-level/all-packages.nix
View File

@ -11901,7 +11901,6 @@ with pkgs;
dovecot = callPackage ../servers/mail/dovecot { };
dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { };
dovecot_antispam = callPackage ../servers/mail/dovecot/plugins/antispam { };
dspam = callPackage ../servers/mail/dspam {
inherit (perlPackages) NetSMTP;