Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a2eb06a4d2dc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3563f68da5e6
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 10, 2019

  1. Merge #57095: gtk3: Fix for missing symbols (again) 

    (cherry picked from commit 3ea5f97)
Forward-picking from staging to staging-next.  It seems quite
an important fix with little risk of breakage, and it isn't such a huge
rebuild, especially considering the unfinished amount on staging-next ATM.
    @infinisil @vcunat
    infinisil authored and vcunat committed Mar 10, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 916062A1C4748647
    Learn about vigilant mode
    Copy the full SHA
    2206a3e View commit details

  2. libarchive: apply upstream CVE patches 

    Fixes #57150.
    @vcunat
    vcunat committed Mar 10, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5767c18 View commit details

  3. Merge branch 'staging-next' into staging 

    libarchive: larger security rebuild
    @vcunat
    vcunat committed Mar 10, 2019
    Copy the full SHA
    3563f68 View commit details
Showing with 15 additions and 0 deletions.
  1. +15 −0 pkgs/development/libraries/libarchive/default.nix
15 changes: 15 additions & 0 deletions pkgs/development/libraries/libarchive/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,6 +17,21 @@ stdenv.mkDerivation rec {
sha256 = "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms";
};

patches = [
(fetchpatch {
# details: https://github.com/libarchive/libarchive/pull/1105
name = "cve-2018-1000877.diff"; # CVE-2018-1000877..80
url = "https://github.com/libarchive/libarchive/pull/1105.diff";
sha256 = "0mxcawfdy9m40mykzwhkl39a6vnh4ypgy0ipcz74qm4bi72x0gyf";
})
(fetchpatch {
# details: https://github.com/libarchive/libarchive/pull/1120
name = "cve-2019-1000019_cve-2019-1000020.diff";
url = "https://github.com/libarchive/libarchive/pull/1120.diff";
sha256 = "1mgx92v8hm7hw9j34nbfriqfkxshh3cy25rhavr7kl7lz4x5a6g4";
})
];

outputs = [ "out" "lib" "dev" ];

nativeBuildInputs = [ pkgconfig ];