b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #13513 from grahamc/omnibus-cves

Browse source 
Several CVEs
This commit is contained in:
Franz Pletz 2016-02-28 04:14:20 +01:00
parent f71676481d 7df907b272
commit bc4dbca2b3
10 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/services/web-servers/apache-httpd/moodle.nix
View file

@ -46,16 +46,16 @@ let
'';
# Unpack Moodle and put the config file in its root directory.
moodleRoot = pkgs.stdenv.mkDerivation rec {
name= "moodle-2.8.5";
name= "moodle-2.8.10";
src = pkgs.fetchurl {
url = "https://download.moodle.org/stable28/${name}.tgz";
sha256 = "1a159a193010cddedce10ee009184502e6f732e4d7c85167d8597fe5dff9e190";
sha256 = "0c3r5081ipcwc9s6shakllnrkd589y2ln5z5m1q09l4h6a7cy4z2";
};
buildPhase =
''
'';
'';
installPhase =
''
@ -132,7 +132,7 @@ in
cleartext in the Nix store!
'';
};
dbPrefix = mkOption {
default = "mdl_";
example = "my_other_mdl_";
@ -158,7 +158,7 @@ in
type = types.path;
};
extraConfig = mkOption {
default = "";
example =

6
pkgs/applications/graphics/PythonMagick/default.nix
View file

@ -2,7 +2,7 @@
let
version = "0.9.11";
version = "0.9.12";
in
@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
name = "pythonmagick-${version}";
src = fetchurl {
url = "http://www.imagemagick.org/download/python/releases/PythonMagick-${version}.tar.gz";
sha256 = "01z01mlqkk0lvrh2jsmf84qjw29sq4rpj0653x7nqy7mrszwwp2v";
url = "http://www.imagemagick.org/download/python/releases/PythonMagick-${version}.tar.xz";
sha256 = "1l1kr3d7l40fkxgs6mrlxj65alv2jizm9hhgg9i9g90a8qj8642b";
};
buildInputs = [python boost pkgconfig imagemagick];

4
pkgs/applications/graphics/xara/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation {
url = http://downloads2.xara.com/opensource/XaraLX-0.7r1785.tar.bz2;
sha256 = "05xbzq1i1vw2mdsv7zjqfpxfv3g1j0g5kks0gq6sh373xd6y8lyh";
};
nativeBuildInputs = [ automake pkgconfig gettext perl zip ];
buildInputs = [ wxGTK gtk libxml2 freetype pango ];
@ -17,4 +17,6 @@ stdenv.mkDerivation {
patches = map fetchurl (import ./debian-patches.nix);
prePatch = "patchShebangs Scripts";
meta.broken = true;
}

2
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View file

@ -13,7 +13,7 @@
enableOfficialBranding ? false
}:
let version = "38.3.0"; in
let version = "38.6.0"; in
let verName = "${version}"; in
stdenv.mkDerivation rec {

8
pkgs/applications/version-management/git-and-tools/cgit/default.nix
View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "cgit-${version}";
version = "0.11.2";
version = "0.12";
src = fetchurl {
url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
sha256 = "0fryh56kyah7v9a8zzhbhwlyy2j116w87sxmgrn2kmwk0rvnw4if";
sha256 = "1dx54hgfyabmg9nm5qp6d01f54nlbqbbdwhwl0llb9imjf237qif";
};
# cgit is tightly coupled with git and needs a git source tree to build.
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
# NOTE: as of 0.10.1, the git version is compatible from 1.9.0 to
# 1.9.2 (see the repository history)
gitSrc = fetchurl {
url = "mirror://kernel/software/scm/git/git-2.3.2.tar.xz";
sha256 = "09gqijsjfnxlbsxbxzlvllg37bfs9f4jwa2plqsanmba09i89sqq";
url = "mirror://kernel/software/scm/git/git-2.7.0.tar.xz";
sha256 = "03bvb8s5j8i54qbi3yayl42bv0wf2fpgnh1a2lkhbj79zi7b77zs";
};
buildInputs = [

3
pkgs/development/libraries/jasper/default.nix
View file

@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
};
patches = [
./jasper-CVE-2016-1867.diff
./jasper-CVE-2014-8137-variant2.diff
./jasper-CVE-2014-8137-noabort.diff
./jasper-CVE-2014-8138.diff
@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ libjpeg ];
configureFlags = "--enable-shared";
meta = {
homepage = https://www.ece.uvic.ca/~frodo/jasper/;
description = "JPEG2000 Library";

11
pkgs/development/libraries/jasper/jasper-CVE-2016-1867.diff Normal file
View file

@ -0,0 +1,11 @@
--- jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c 2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c 2016-01-14 14:22:24.569056412 +0100
@@ -429,7 +429,7 @@
}
for (pi->compno = pchg->compnostart, pi->picomp =
- &pi->picomps[pi->compno]; pi->compno < JAS_CAST(int, pchg->compnoend); ++pi->compno,
+ &pi->picomps[pi->compno]; pi->compno < JAS_CAST(int, pchg->compnoend) && pi->compno < pi->numcomps; ++pi->compno,
++pi->picomp) {
pirlvl = pi->picomp->pirlvls;
pi->xstep = pi->picomp->hsamp * (1 << (pirlvl->prcwidthexpn +

6
pkgs/development/libraries/libbsd/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
let name = "libbsd-0.7.0";
let name = "libbsd-0.8.2";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz";
sha256 = "1fqhbi0vd6xjxazf633x388cc8qyn58l78704s0h6k63wlbhwfqg";
sha256 = "02i5brb2007sxq3mn862mr7yxxm0g6nj172417hjyvjax7549xmj";
};
patchPhase = ''
@ -15,7 +15,7 @@ in stdenv.mkDerivation {
--replace "{exec_prefix}" "{prefix}"
'';
meta = {
meta = {
description = "Common functions found on BSD systems";
homepage = http://libbsd.freedesktop.org/;
license = stdenv.lib.licenses.bsd3;

4
pkgs/development/libraries/mbedtls/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
name = "mbedtls-1.3.14";
name = "mbedtls-1.3.16";
src = fetchurl {
url = "https://polarssl.org/download/${name}-gpl.tgz";
sha256 = "1y3gr3kfai3d13j08r4pv42sh47nbfm4nqi9jq8c9d06qidr2xmy";
sha256 = "f413146c177c52d4ad8f48015e2fb21dd3a029ca30a2ea000cbc4f9bd092c933";
};
nativeBuildInputs = [ perl ];

4
pkgs/servers/sql/mysql/5.5.x.nix
View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "mysql-${version}";
version = "5.5.45";
version = "5.5.48";
src = fetchurl {
url = "mirror://mysql/MySQL-5.5/${name}.tar.gz";
sha256 = "0clkr3r44j8nsgmjzv6r09pb0vjangn5hpyjxgg5ynr674ygskkl";
sha256 = "10fpzvf6hxvqgaq8paiz8fvhcbbs4qnzqw0svq40bvlyhx2qfgyc";
};
patches = if stdenv.isCygwin then [