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

Merge security fixes adapted from #31437

Browse Source
This commit is contained in:
Vladimír Čunát
2017-11-11 13:33:25 +01:00
parent 57f5e2aa76 17fae2499a
commit cbfb586151
9 changed files with 64 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/libexif/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, gettext }:
{ stdenv, fetchurl, fetchpatch, gettext }:
stdenv.mkDerivation rec {
name = "libexif-0.6.21";
@@ -8,6 +8,15 @@ stdenv.mkDerivation rec {
sha256 = "06nlsibr3ylfwp28w8f5466l6drgrnydgxrm4jmxzrmk5svaxk8n";
};
patches = [
(fetchpatch {
name = "CVE-2017-7544.patch";
url = https://sourceforge.net/p/libexif/bugs/_discuss/thread/fc394c4b/489a/attachment/xx.pat;
sha256 = "1qgk8hgnxr8d63jsc4vljxz9yg33mbml280dq4a6050rmk9wq4la";
})
];
patchFlags = "-p0";
buildInputs = [ gettext ];
meta = {

4
pkgs/development/libraries/libextractor/default.nix
View File

@@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null;
assert videoSupport -> ffmpeg != null && libmpeg2 != null;
stdenv.mkDerivation rec {
name = "libextractor-1.4";
name = "libextractor-1.6";
src = fetchurl {
url = "mirror://gnu/libextractor/${name}.tar.gz";
sha256 = "0v7ns5jhsyp1wzvbaydfgxnva5zd63gkzm9djhckmam9liq824l4";
sha256 = "17gnpgspdhfgcr27j8sn9105vb4lw22yqdrhic62l79q5v5avm16";
};
preConfigure =

10
pkgs/development/libraries/qpdf/default.nix
View File

@@ -1,18 +1,18 @@
{ stdenv, fetchurl, pcre, zlib, perl }:
{ stdenv, fetchurl, libjpeg, zlib, perl }:
let version = "6.0.0";
let version = "7.0.0";
in
stdenv.mkDerivation rec {
name = "qpdf-${version}";
src = fetchurl {
url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz";
sha256 = "0csj2p2gkxrc0rk8ykymlsdgfas96vzf1dip3y1x7z1q9plwgzd9";
sha256 = "0py6p27fx4qrwq9mvcybna42b0bdi359x38lzmggxl5a9khqvl7y";
};
nativeBuildInputs = [ perl ];
buildInputs = [ pcre zlib ];
buildInputs = [ zlib libjpeg ];
postPatch = ''
patchShebangs qpdf/fix-qdf
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://qpdf.sourceforge.net/;
description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files";
license = licenses.artistic2;
license = licenses.asl20; # as of 7.0.0, people may stay at artistic2
maintainers = with maintainers; [ abbradar ];
platforms = platforms.all;
};