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

Commits on Oct 7, 2019

  1. zziplib: apply patches for CVE-2018-16548

    @delroth
    delroth committed Oct 7, 2019
    Copy the full SHA
    aa74d07 View commit details

Commits on Oct 12, 2019

  1. Merge #70558: zziplib: apply patches for CVE-2018-16548 

    ...into staging-next
    @vcunat
    vcunat committed Oct 12, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    758b2e4 View commit details
Showing with 16 additions and 0 deletions.
  1. +16 −0 pkgs/development/libraries/zziplib/default.nix
16 changes: 16 additions & 0 deletions pkgs/development/libraries/zziplib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,22 @@ stdenv.mkDerivation rec {
url = "https://github.com/gdraheim/zziplib/commit/f609ae8971f3c0ce6.diff";
sha256 = "0jhiz4fgr93wzh6q03avn95b2nsf6402jaki6hxirxyhs5v9ahry";
})

(fetchpatch {
name = "CVE-2018-16548-part1.patch";
url = "https://github.com/gdraheim/zziplib/commit/9411bde3e4a70a81ff3ffd256b71927b2d90dcbb.patch";
sha256 = "0cy8i182zbvcqzs5z2j13d5sl7hbh59pkgw4xkyg5yz739q4fp9b";
})
(fetchpatch {
name = "CVE-2018-16548-part2.patch";
url = "https://github.com/gdraheim/zziplib/commit/d2e5d5c53212e54a97ad64b793a4389193fec687.patch";
sha256 = "153wd4vab8xqj9avcpx8g2zw9qsp9nkaqi7yc65pz3r7xfcxwdla";
})
(fetchpatch {
name = "CVE-2018-16548-part3.patch";
url = "https://github.com/gdraheim/zziplib/commit/0e1dadb05c1473b9df2d7b8f298dab801778ef99.patch";
sha256 = "0fs6dns8l7dz5a900397g8b7x62z72b0pbpdmwk1hnx6vb7z5rz5";
})
];
postPatch = ''
sed -i -e s,--export-dynamic,, configure