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

Merge pull request #20816 from grahamc/vulnerability-rollup-10

Browse Source 
Vulnerability rollup 11 (WIP)
This commit is contained in:
Graham Christensen 2016-11-30 19:29:19 -05:00 committed by GitHub
commit 96393560d0
7 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/instant-messengers/mcabber/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mcabber-${version}"; name = "mcabber-${version}";
version = "1.0.3"; version = "1.0.4";
src = fetchurl { src = fetchurl {
url = "http://mcabber.com/files/mcabber-${version}.tar.bz2"; url = "http://mcabber.com/files/mcabber-${version}.tar.bz2";
sha256 = "16hkb7v1sqp1gqj94darwwrv23alqaiqdhqjq8gjd6f3l05bprj4"; sha256 = "02nfn5r7cjpnacym95l6bvczii232v3x2gi79gfa9syc7w0brdk3";
}; };
buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ]; buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ];
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
configureFlags = "--with-openssl=${openssl.dev} --enable-modules --enable-otr"; configureFlags = "--with-openssl=${openssl.dev} --enable-modules --enable-otr";
doCheck = true; doCheck = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://mcabber.com/; homepage = http://mcabber.com/;
description = "Small Jabber console client"; description = "Small Jabber console client";

6
pkgs/development/interpreters/mujs/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchgit, clang }: { stdenv, fetchgit, clang }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mujs-2016-09-21"; name = "mujs-2016-11-30";
src = fetchgit { src = fetchgit {
url = git://git.ghostscript.com/mujs.git; url = git://git.ghostscript.com/mujs.git;
rev = "5c337af4b3df80cf967e4f9f6a21522de84b392a"; rev = "a0ceaf5050faf419401fe1b83acfa950ec8a8a89";
sha256 = "1x5g6nycggc83md2dbr2nahjbkkmmn64bg25a8hih7z72sw41dgw"; sha256 = "13abghhqrivaip4h0fav80i8hid220dj0ddc1xnhn6w9rbnrriyg";
}; };
buildInputs = [ clang ]; buildInputs = [ clang ];

6
pkgs/development/libraries/boehm-gc/default.nix
View File

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, enableLargeConfig ? false }: { lib, stdenv, fetchurl, enableLargeConfig ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "boehm-gc-7.2f"; name = "boehm-gc-7.2g";
src = fetchurl { src = fetchurl {
url = http://www.hboehm.info/gc/gc_source/gc-7.2f.tar.gz; url = http://www.hboehm.info/gc/gc_source/gc-7.2g.tar.gz;
sha256 = "119x7p1cqw40mpwj80xfq879l9m1dkc7vbc1f3bz3kvkf8bf6p16"; sha256 = "0bvw6cc555qg5b7dgcqy3ryiw0wir79dqy0glff3hjmyy7i2jkjq";
}; };
patches = if stdenv.isCygwin then [ ./cygwin.patch ] else null; patches = if stdenv.isCygwin then [ ./cygwin.patch ] else null;

4
pkgs/development/perl-modules/DBD-mysql/default.nix
View File

@ -1,11 +1,11 @@
{ fetchurl, buildPerlPackage, DBI, mysql }: { fetchurl, buildPerlPackage, DBI, mysql }:
buildPerlPackage rec { buildPerlPackage rec {
name = "DBD-mysql-4.033"; name = "DBD-mysql-4.039";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/C/CA/CAPTTOFU/${name}.tar.gz"; url = "mirror://cpan/authors/id/C/CA/CAPTTOFU/${name}.tar.gz";
sha256 = "0769xakykps0cx368g4vaips4w3bjk383rianiavq7sq6g6bp66c"; sha256 = "0k4p3bjdbmxm2amb0qiiwmn8v83zrjkz5qp84xdjrg8k5v9aj0hn";
}; };
buildInputs = [ mysql.lib ] ; buildInputs = [ mysql.lib ] ;

2
pkgs/development/perl-modules/maatkit/default.nix
View File

@ -4,7 +4,7 @@ buildPerlPackage rec {
name = "maatkit-7540"; name = "maatkit-7540";
src = fetchurl { src = fetchurl {
url = "http://maatkit.googlecode.com/files/${name}.tar.gz" ; url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/maatkit/${name}.tar.gz";
sha256 = "1a7rxrddkrsfxb2wj01ha91ld0vapfkqcy8j9p08l76zz2l8p2v1"; sha256 = "1a7rxrddkrsfxb2wj01ha91ld0vapfkqcy8j9p08l76zz2l8p2v1";
}; };

20
pkgs/servers/http/tomcat/default.nix
View File

@ -33,32 +33,32 @@ in {
tomcat6 = common { tomcat6 = common {
versionMajor = "6"; versionMajor = "6";
versionMinor = "0.45"; versionMinor = "0.48";
sha256 = "0ba8h86padpk23xmscp7sg70g0v8ji2jbwwriz59hxqy5zhd76wg"; sha256 = "1w4jf28g8p25fmijixw6b02iqlagy2rvr57y3n90hvz341kb0bbc";
}; };
tomcat7 = common { tomcat7 = common {
versionMajor = "7"; versionMajor = "7";
versionMinor = "0.72"; versionMinor = "0.73";
sha256 = "1nx5pmz3bq3n20fdspqh8ljqy1nj67rwi1vsqjpkrvd996x7p73p"; sha256 = "11gaiy56q7pik06sdypr80sl3g6k41s171wqqwlhxffmsxm4v08f";
}; };
tomcat8 = common { tomcat8 = common {
versionMajor = "8"; versionMajor = "8";
versionMinor = "0.37"; versionMinor = "0.39";
sha256 = "0f9d4yxjzwdrayj5l3jyiclnmpb5lffvmsnp54qpf6m3gm7cj5i6"; sha256 = "16hyypdawby66qa8y66sfprcf78wjy319a0gsi4jgfqfywcsm4s0";
}; };
tomcat85 = common { tomcat85 = common {
versionMajor = "8"; versionMajor = "8";
versionMinor = "5.5"; versionMinor = "5.8";
sha256 = "0idfxjrw5q45f531gyjnv6xjkbj9nhy2v1w4z7558z96230a0fqj"; sha256 = "1rfws897m09pbnb1jc4684didpklfhqp86szv2jcqzdx0hlfxxs0";
}; };
tomcatUnstable = common { tomcatUnstable = common {
versionMajor = "9"; versionMajor = "9";
versionMinor = "0.0.M10"; versionMinor = "0.0.M13";
sha256 = "0p3pqwz9zjvr9w73divsyaa53mbazf0icxfs06wvgxsvkbgj5gq9"; sha256 = "0im3w4iqpar7x50vg7c9zkxyqf9x53xs5jvcq79xqgrmcqb9lk91";
}; };
} }

8
pkgs/servers/rpcbind/default.nix
View File

@ -1,10 +1,10 @@
{ fetchurl, stdenv, pkgconfig, libtirpc { fetchurl, fetchpatch, stdenv, pkgconfig, libtirpc
, useSystemd ? true, systemd }: , useSystemd ? true, systemd }:
let version = "0.2.3"; let version = "0.2.3";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "rpcbind-${version}"; name = "rpcbind-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2"; url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2";
sha256 = "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq"; sha256 = "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq";
@ -13,6 +13,10 @@ in stdenv.mkDerivation rec {
patches = [ patches = [
./sunrpc.patch ./sunrpc.patch
./0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch ./0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch
(fetchpatch {
url = "https://sources.debian.net/data/main/r/rpcbind/0.2.3-0.5/debian/patches/CVE-2015-7236.patch";
sha256 = "1wsv5j8f5djzxr11n4027x107cam1avmx9w34g6l5d9s61j763wq";
})
]; ];
buildInputs = [ libtirpc ] buildInputs = [ libtirpc ]