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: 0a11634a29c1
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: 8260cd5bc65f
Choose a head ref
  • 4 commits
  • 2 files changed
  • 4 contributors

Commits on May 20, 2020

  1. dovecot: 2.3.9.3 -> 2.3.10 

    (cherry picked from commit 8d08f45)
    @r-ryantm @mweinelt
    r-ryantm authored and mweinelt committed May 20, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    CRBroughton Craig R Broughton
    GPG key ID: A9923C0202EEA387
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e6d819a View commit details

  2. dovecot: v2.3.10 → v2.3.10.1 

    Fixes: CVE-2020-10957, CVE-2020-10958, CVE-2020-10967
(cherry picked from commit 6cf4885)
    @mweinelt
    mweinelt committed May 20, 2020
    Copy the full SHA
    0d49c4a View commit details

Commits on Jun 12, 2020

  1. gnutls: 3.6.13 -> 3.6.14 

    Fixes CVE-2020-13777 [1].

Changes: https://lists.gnupg.org/pipermail/gnutls-help/2020-June/004648.html

[1] https://nvd.nist.gov/vuln/detail/CVE-2020-13777

(cherry picked from commit 1dba117, PR #89884)
19.09 isn't really supported anymore, but this CVE seems very important.
    @cole-h @vcunat
    cole-h authored and vcunat committed Jun 12, 2020
    Copy the full SHA
    716f393 View commit details

  2. Merge pull request #88436 from mweinelt/19.09/dovecot

    @Mic92
    Mic92 authored Jun 12, 2020
    Copy the full SHA
    8260cd5 View commit details
Showing with 7 additions and 6 deletions.
  1. +2 −2 pkgs/development/libraries/gnutls/default.nix
  2. +5 −4 pkgs/servers/mail/dovecot/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gnutls/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@

assert guileBindings -> guile != null;
let
version = "3.6.13";
version = "3.6.14";

# XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .
@@ -24,7 +24,7 @@ stdenv.mkDerivation {

src = fetchurl {
url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz";
sha256 = "0f1gnm0756qms5cpx6yn6xb8d3imc2gkqmygf12n9x6r8zs1s11j";
sha256 = "0qwxsfizynly0ns537vnhnlm5lh03la4vbsmz675n0n7vqd7ac2n";
};

outputs = [ "bin" "dev" "out" "man" "devdoc" ];
9 changes: 5 additions & 4 deletions pkgs/servers/mail/dovecot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,8 @@
}:

stdenv.mkDerivation rec {
name = "dovecot-2.3.9.3";
pname = "dovecot";
version = "2.3.10.1";

nativeBuildInputs = [ perl pkgconfig ];
buildInputs =
@@ -20,8 +21,8 @@ stdenv.mkDerivation rec {
++ lib.optional withSQLite sqlite;

src = fetchurl {
url = "https://dovecot.org/releases/2.3/${name}.tar.gz";
sha256 = "0lcnqib63nv32xr3nr4s3x8k77mbgrhc13swjl2xqnzw4fabd7zq";
url = "https://dovecot.org/releases/2.3/${pname}-${version}.tar.gz";
sha256 = "035idr2j81s5mngnhd58rih79dhwwak7q01mqbx3rcmi4cpychk6";
};

enableParallelBuilding = true;
@@ -81,7 +82,7 @@ stdenv.mkDerivation rec {
++ lib.optional withSQLite "--with-sqlite";

meta = {
homepage = https://dovecot.org/;
homepage = "https://dovecot.org/";
description = "Open source IMAP and POP3 email server written with security primarily in mind";
maintainers = with stdenv.lib.maintainers; [ peti rickynils fpletz globin ];
platforms = stdenv.lib.platforms.unix;