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: 3bc2b975fdca
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: 7010635ac274
Choose a head ref
  • 4 commits
  • 4 files changed
  • 4 contributors

Commits on Mar 8, 2020

  1. fetchmail: update from version 6.3.26 to 6.4.2 

    The new version supports OpenSSL 1.x. Should be back-ported to
release-20.03.

See https://sourceforge.net/projects/fetchmail/files/branch_6.4/
for the changelog.

(cherry picked from commit 85befe9)
    @peti @tokudan
    peti authored and tokudan committed Mar 8, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    9226f82 View commit details

Commits on Mar 9, 2020

  1. rkt: add CVEs 

    https://www.twistlock.com/labs-blog/breaking-out-of-coresos-rkt-3-new-cves/
(cherry picked from commit c4c936f)
    @zowoq @Mic92
    zowoq authored and Mic92 committed Mar 9, 2020
    Copy the full SHA
    58fa229 View commit details

  2. notable: update license to unfree 

    Notable used to be released under AGPL-v3 until v1.5.x but is is now
nonfree.

See https://github.com/notable/notable/blob/master/SOURCE_CODE.md

(cherry picked from commit 08edf7f)
    @lsix
    lsix committed Mar 9, 2020
    Copy the full SHA
    cd5d243 View commit details

  3. Merge pull request #82048 from tokudan/20.03/fetchmail642 

    fetchmail: 6.3.26 -> 6.4.2 [security] [20.03]
    @lsix
    lsix authored Mar 9, 2020
    Copy the full SHA
    7010635 View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/misc/fetchmail/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, openssl }:

let
version = "6.3.26";
version = "6.4.2";
in
stdenv.mkDerivation {
pname = "fetchmail";
inherit version;

src = fetchurl {
url = "mirror://sourceforge/fetchmail.berlios/fetchmail-${version}.tar.bz2";
sha256 = "08rafrs1dlr11myr0p99kg4k80qyy0fa63gg3ac88zn49174lwhw";
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
sha256 = "0c563if3kribnj771l14aj06irmrlhm61dc68w6dp7zj4qrnn7z2";
};

buildInputs = [ openssl ];
2 changes: 1 addition & 1 deletion pkgs/applications/misc/notable/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ appimageTools.wrapType2 rec {
meta = with lib; {
description = "The markdown-based note-taking app that doesn't suck";
homepage = https://github.com/notable/notable;
license = licenses.agpl3;
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ dtzWill ];
};
5 changes: 5 additions & 0 deletions pkgs/applications/virtualization/rkt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -69,5 +69,10 @@ in stdenv.mkDerivation rec {
license = licenses.asl20;
maintainers = with maintainers; [ ragge steveej ];
platforms = [ "x86_64-linux" ];
knownVulnerabilities = [
"CVE-2019-10144: processes run with `rkt enter` are given all capabilities during stage 2"
"CVE-2019-10145: processes run with `rkt enter` do not have seccomp filtering during stage 2"
"CVE-2019-10147: processes run with `rkt enter` are not limited by cgroups during stage 2"
];
};
}
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -18907,9 +18907,7 @@ in

fehlstart = callPackage ../applications/misc/fehlstart { };

fetchmail = callPackage ../applications/misc/fetchmail {
openssl = openssl_1_0_2;
};
fetchmail = callPackage ../applications/misc/fetchmail { };

fff = callPackage ../applications/misc/fff { };