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

Commits on Feb 10, 2020

  1. aspell: 0.60.6.1 -> 0.60.8 

    See http://aspell.net/aspell-0.60.8.txt for release information.
(#71242)

The fix for CVE-2019-20433 may break compatibility for some
applications, hence a version bump instead of adding a patch.

Also: backport of 648678f
    @lsix @wamserma
    lsix authored and wamserma committed Feb 10, 2020
    Copy the full SHA
    24ad802 View commit details

Commits on Apr 15, 2020

  1. Merge pull request #79772 from wamserma/fix-aspell-CVEs-backport 

    [19.09] aspell: 0.60.6.1 -> 0.60.8
    @risicle
    risicle authored Apr 15, 2020
    Copy the full SHA
    b67bc34 View commit details
Showing with 4 additions and 15 deletions.
  1. +4 −15 pkgs/development/libraries/aspell/default.nix
19 changes: 4 additions & 15 deletions pkgs/development/libraries/aspell/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,31 +15,20 @@ let
in

stdenv.mkDerivation rec {
name = "aspell-0.60.6.1";
name = "aspell-0.60.8";

src = fetchurl {
url = "mirror://gnu/aspell/${name}.tar.gz";
sha256 = "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm";
sha256 = "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr";
};

patches = [
(fetchpatch { # remove in >= 0.60.7
name = "gcc-7.patch";
url = "https://github.com/GNUAspell/aspell/commit/8089fa02122fed0a.diff";
sha256 = "1b3p1zy2lqr2fknddckm58hyk95hw4scf6hzjny1v9iaic2p37ix";
})
(fetchpatch {
name = "CVE-2019-17544.patch";
url = "https://github.com/GNUAspell/aspell/commit/80fa26c74279fced8d778351cff19d1d8f44fe4e.patch";
sha256 = "0k5dnh8gcb7chnyx7jgkksqmz2hm05hmrvcd0znsfib975pvp4rg";
})
] ++ stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
patches = stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;

postPatch = ''
patch interfaces/cc/aspell.h < ${./clang.patch}
'';

nativeBuildInputs = [ perl ];
buildInputs = [ perl ];

doCheck = true;