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: 9bdbd595db01
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: 3e238c552d2d
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Dec 3, 2018

  1. udisks: 2.8.0 -> 2.8.1 

    https://github.com/storaged-project/udisks/blob/udisks-2.8.1/NEWS
(cherry picked from commit 9a74fd0)
    @dtzWill @c0bw3b
    dtzWill authored and c0bw3b committed Dec 3, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    SuperSandro2000 Sandro
    GPG key ID: 3AF5A43A3EECC2E5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4bb9ffd View commit details

  2. Merge pull request #51479 from c0bw3b/sec/1809/udisks 

    [18.09] udisks: 2.8.0 -> 2.8.1
    @c0bw3b
    c0bw3b authored Dec 3, 2018
    Copy the full SHA
    b09e113 View commit details

  3. strongswan: fix patch's CVE number 

    The patch above this one is the one fixing the previous CVEs.

fixes #51461
    @globin
    globin committed Dec 3, 2018
    Copy the full SHA
    3e238c5 View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 pkgs/os-specific/linux/udisks/2-default.nix
  2. +1 −1 pkgs/tools/networking/strongswan/default.nix
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/udisks/2-default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,15 +6,15 @@
}:

let
version = "2.8.0";
version = "2.8.1";
in stdenv.mkDerivation rec {
name = "udisks-${version}";

src = fetchFromGitHub {
owner = "storaged-project";
repo = "udisks";
rev = name;
sha256 = "110g3vyai3p6vjzy01yd0bbvxk7n7dl5glxf54f3jvqf0zmaqipx";
sha256 = "073iqa0pwa7ab0qw33h3ic89508a78incmg6rq914d6br7s030zy";
};

outputs = [ "out" "man" "dev" "devdoc" ];
2 changes: 1 addition & 1 deletion pkgs/tools/networking/strongswan/default.nix
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
sha256 = "04a5ql6clig5zq9914i4iyrrxcc36w2hzmwsrl69rxnq8hwhw1ql";
})
(fetchpatch {
name = "fix-for-CVE-2018-16151-and-CVE-2018-16152.patch";
name = "CVE-2018-17540.patch";
url = "https://download.strongswan.org/patches/28_gmp_pkcs1_overflow_patch/strongswan-4.4.0-5.7.0_gmp-pkcs1-overflow.patch";
sha256 = "1h8m9rsqzkl71x25h1aavs5xkqm20083law339phfjlrpbjpnizp";
})