diff options
| author | Robin Gloster <mail@glob.in> | 2017-02-28 15:12:45 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-02-28 15:14:55 +0100 |
| commit | 6784a4429620e6a7581e09abb5da010bff23678a (patch) | |
| tree | ba9781efcf4954de92d7a2e701fc7e7e9074e9ec | |
| parent | 5190b46eb28c94d4ad13393364e99b1dc4688997 (diff) | |
| download | nixpkgs-6784a4429620e6a7581e09abb5da010bff23678a.tar nixpkgs-6784a4429620e6a7581e09abb5da010bff23678a.tar.gz nixpkgs-6784a4429620e6a7581e09abb5da010bff23678a.tar.bz2 nixpkgs-6784a4429620e6a7581e09abb5da010bff23678a.tar.lz nixpkgs-6784a4429620e6a7581e09abb5da010bff23678a.tar.xz nixpkgs-6784a4429620e6a7581e09abb5da010bff23678a.tar.zst nixpkgs-6784a4429620e6a7581e09abb5da010bff23678a.zip | |
clearsilver: fix build
fixes CVE-2011-4357 cc @grahamc, @fpletz, @domenkozar, @rbvermaa
| -rw-r--r-- | pkgs/development/libraries/clearsilver/builder.sh | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/clearsilver/default.nix | 25 |
2 files changed, 21 insertions, 13 deletions
diff --git a/pkgs/development/libraries/clearsilver/builder.sh b/pkgs/development/libraries/clearsilver/builder.sh deleted file mode 100644 index 2acff02e135..00000000000 --- a/pkgs/development/libraries/clearsilver/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -mkdir -p $out -mkdir -p $out/site-packages - -export PYTHON_SITE=$out/site-packages -configureFlags="--with-python=$python/bin/python --disable-apache --disable-perl --disable-ruby --disable-java --disable-csharp" - -genericBuild diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index 34a26e9da86..cd1789a13bb 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python }: +{ stdenv, fetchurl, fetchpatch, python }: stdenv.mkDerivation rec { name = "clearsilver-0.10.5"; @@ -8,12 +8,29 @@ stdenv.mkDerivation rec { sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y"; }; - builder = ./builder.sh; + PYTHON_SITE = "$(out)/site-packages"; - inherit stdenv python; + configureFlags = "--with-python=${python}/bin/python --disable-apache --disable-perl --disable-ruby --disable-java --disable-csharp"; - meta = { + preInstall = '' + mkdir -p $out + mkdir -p $out/site-packages + ''; + + patches = [ + (fetchpatch { + url = "https://sources.debian.net/data/main/c/clearsilver/0.10.5-1.6/debian/patches/clang-gcc5.patch"; + sha256 = "0d44v9jx0b6k8nvrhknd958i9rs59kdh73z0lb4f1mzi8if16c38"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/c/clearsilver/0.10.5-1.6/debian/patches/CVE-2011-4357.diff"; + sha256 = "1lfncavxdqckrz03gv97lcliygbpi9lnih944vmdbn9zw6fwcipi"; + }) + ]; + + meta = with stdenv.lib; { description = "Fast, powerful, and language-neutral HTML template system"; homepage = http://www.clearsilver.net/; + license = licenses.free; }; } |