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: 16b3b1eef03e
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: 86fa45b0ff1a
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 13, 2020

  1. librdf_raptor2: add patch for CVE-2017-18926 

    Fixes two heap overflows in the raptor2 rdf parsing library.

https://www.openwall.com/lists/oss-security/2017/06/07/1
(cherry picked from commit 22140b2)
    @mweinelt @erictapen
    mweinelt authored and erictapen committed Nov 13, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    51105e3 View commit details

  2. microcodeIntel: 20200616 -> 20201110 

    Release notes:
https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20201110

Security advisories:
https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00381.html
https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00389.html

Fixes: CVE-2020-8694, CVE-2020-8695, CVE-2020-8696, CVE-2020-8698
(cherry picked from commit a79902f)
    @mweinelt
    mweinelt committed Nov 13, 2020
    Copy the full SHA
    18a94f8 View commit details

  3. microcodeIntel: 20201110 -> 20201112 

    Update to Pentium Silver N/J5xxx, Celeron N/J4xxx

https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00381.html
https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00389.html

Fixes: CVE-2020-8694, CVE-2020-8695, CVE-2020-8696, CVE-2020-8698
(cherry picked from commit eaf889a)
    @mweinelt
    mweinelt committed Nov 13, 2020
    Copy the full SHA
    bad3f7b View commit details

Commits on Nov 14, 2020

  1. Merge pull request #103707 from mweinelt/20.03/microcodeIntel 

    [20.03] microcodeIntel: 20200616 -> 20201112
    @andir
    andir authored Nov 14, 2020
    Copy the full SHA
    86fa45b View commit details
Showing with 13 additions and 4 deletions.
  1. +11 −2 pkgs/development/libraries/librdf/raptor2.nix
  2. +2 −2 pkgs/os-specific/linux/microcode/intel.nix
13 changes: 11 additions & 2 deletions pkgs/development/libraries/librdf/raptor2.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
{ stdenv, fetchurl, libxml2, libxslt }:

stdenv.mkDerivation rec {
name = "raptor2-2.0.15";
pname = "raptor2";
version = "2.0.15";

src = fetchurl {
url = "http://download.librdf.org/source/${name}.tar.gz";
url = "http://download.librdf.org/source/${pname}-${version}.tar.gz";
sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed";
};

patches = [
(fetchurl {
name = "CVE-2017-18926.patch";
url = "https://github.com/dajobe/raptor/commit/590681e546cd9aa18d57dc2ea1858cb734a3863f.patch";
sha256 = "1qlpb5rm3j2yi0x6zgdi5apymg5zlvwq3g1zl417gkjrlvxmndgp";
})
];

buildInputs = [ libxml2 libxslt ];

postInstall = "rm -rvf $out/share/gtk-doc";
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/microcode/intel.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "microcode-intel";
version = "20200616";
version = "20201112";

src = fetchFromGitHub {
owner = "intel";
repo = "Intel-Linux-Processor-Microcode-Data-Files";
rev = "microcode-${version}";
sha256 = "13jrs8hwh7dhjjb9kncb8lk199afaxglkh1cfisl6zca1h36g563";
sha256 = "104l3py5z6405wpa2fscqpc5r9dgrf1ckaf27hrswivi32gvp7f2";
};

nativeBuildInputs = [ iucode-tool libarchive ];