diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2015-05-30 18:06:26 +0200 |
---|---|---|
committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2015-05-30 18:07:20 +0200 |
commit | 080dc99df72072e146e0bbcf6e370cbb18dc2eb5 (patch) | |
tree | c461dcf430550fec74f9ae08f2bc2a5c1bb76568 /pkgs/servers/computing/torque | |
parent | 643c5154891032ec66555a43e205f671b84f40b1 (diff) |
torque: update from 4.2.8 to 4.2.10, fixes CVE-2014-3684
Diffstat (limited to 'pkgs/servers/computing/torque')
-rw-r--r-- | pkgs/servers/computing/torque/default.nix | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index d95e929ff824e..6d0037f74bdb6 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchurl, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux }: +{ stdenv, fetchurl, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux +, file, libtool, which }: stdenv.mkDerivation rec { - name = "torque-4.2.8"; + name = "torque-4.2.10"; src = fetchurl { name = "${name}.tar.gz"; - url = "http://www.adaptivecomputing.com/index.php?wpfb_dl=2730"; - sha256 = "1sjpvndzm9ccdmfwdf9887ppmapawfsh5qdkzr92kadg5jxp796j"; + url = "http://www.adaptivecomputing.com/index.php?wpfb_dl=2880"; + sha256 = "1qpsk3bla6b6m7m0i1xpr183yj79liy3p34xhnz1grgq0776wg5l"; }; - buildInputs = [ openssl flex bison pkgconfig groff libxml2 utillinux ]; + buildInputs = [ openssl flex bison pkgconfig groff libxml2 utillinux libtool + which ]; enableParallelBuilding = true; preConfigure = '' + substituteInPlace ./configure \ + --replace '/usr/bin/file' '${file}/bin/file' + + # fix broken libxml2 detection + sed -i '/xmlLib\=/c\xmlLib=xml2' ./configure + for s in fifo cray_t3e dec_cluster msic_cluster sgi_origin umn_cluster; do substituteInPlace src/scheduler.cc/samples/$s/Makefile.in \ --replace "schedprivdir = " "schedprivdir = $out/" |