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: 6958957214b8
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: d6c1b566b770
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on May 8, 2020

  1. squid: apply patch for CVE-2020-11945 

    http://www.squid-cache.org/Advisories/SQUID-2020_4.txt

Fixes: CVE-2020-11945
    @mweinelt
    mweinelt committed May 8, 2020
    Copy the full SHA
    1cc1584 View commit details

  2. Merge pull request #87297 from mweinelt/20.03/pr/squid 

    [20.03] squid: apply patch for CVE-2020-11945
    @7c6f434c
    7c6f434c authored May 8, 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
    0fdd3e8 View commit details

  3. microcodeIntel: 20191115 → 20200508 

    (cherry picked from commit d2ad98b)
    @mweinelt
    mweinelt committed May 8, 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
    6b17e35 View commit details

  4. Merge pull request #87304 from mweinelt/20.03/pr/microcode/intel 

    [20.03] microcodeIntel: 20191115 → 20200508
    @andir
    andir authored May 8, 2020
    Copy the full SHA
    d6c1b56 View commit details
Showing with 14 additions and 5 deletions.
  1. +2 −2 pkgs/os-specific/linux/microcode/intel.nix
  2. +12 −3 pkgs/servers/squid/default.nix
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 = "20191115";
version = "20200508";

src = fetchFromGitHub {
owner = "intel";
repo = "Intel-Linux-Processor-Microcode-Data-Files";
rev = "microcode-${version}";
sha256 = "0pzi5qmrcrdf6nsds4bvyq1hnvv9d1dlrvqrbzcrpxk84rcjwq1x";
sha256 = "1cs4b7q9j2lw2y09rfa82aijbfmy4lddahz8qlz9gwajf2ziqns8";
};

nativeBuildInputs = [ iucode-tool libarchive ];
15 changes: 12 additions & 3 deletions pkgs/servers/squid/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap
{ stdenv, fetchurl, fetchpatch, perl, openldap, pam, db, cyrus_sasl, libcap
, expat, libxml2, openssl, pkgconfig
}:

stdenv.mkDerivation rec {
name = "squid-4.10";
pname = "squid";
version = "4.10";

src = fetchurl {
url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz";
url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz";
sha256 = "07sz0adv8nkhy797675bpra7lvdkwjq9isw1ddgylhlazl511w4q";
};

patches = [
(fetchpatch {
name = "CVE-2020-11945.patch";
url = "http://www.squid-cache.org/Versions/v4/changesets/squid-4-eeebf0f37a72a2de08348e85ae34b02c34e9a811.patch";
sha256 = "1mdi1camvaa6pmpiypw4zmmc4a4mgqgcvdic5wajysgwsqvbz1f3";
})
];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [
perl openldap db cyrus_sasl expat libxml2 openssl