public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clearsilver: fix build

Browse Source 
fixes CVE-2011-4357
cc @grahamc, @fpletz, @domenkozar, @rbvermaa
This commit is contained in:
Robin Gloster 2017-02-28 15:12:45 +01:00
parent 5190b46eb2
commit 6784a44296
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/clearsilver/builder.sh
View File

@ -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

25
pkgs/development/libraries/clearsilver/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python }: { stdenv, fetchurl, fetchpatch, python }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "clearsilver-0.10.5"; name = "clearsilver-0.10.5";
@ -8,12 +8,29 @@ stdenv.mkDerivation rec {
sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y"; 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"; description = "Fast, powerful, and language-neutral HTML template system";
homepage = http://www.clearsilver.net/; homepage = http://www.clearsilver.net/;
license = licenses.free;
}; };
} }