graphicsmagick: 1.3.21 -> 1.3.23, disable popen (security)

http://permalink.gmane.org/gmane.comp.security.oss.general/19669
This commit is contained in:
Franz Pletz 2016-05-30 10:26:31 +02:00
parent 57e4cd680a
commit 769dce0e27
2 changed files with 23 additions and 5 deletions

View file

@ -1,22 +1,28 @@
{stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript
, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz
, libX11, quantumdepth ? 8}:
, libX11, libwebp, quantumdepth ? 8}:
let version = "1.3.21"; in
let version = "1.3.23"; in
stdenv.mkDerivation {
name = "graphicsmagick-${version}";
src = fetchurl {
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
sha256 = "07rwpxy62r9m4r2cg6yll2nr698mxyvbji8vgsivcxhpk56k0ich";
sha256 = "03g6l2h8cmf231y1vma0z7x85070jm1ysgs9ppqcd3jj56jka9gx";
};
configureFlags = "--enable-shared --with-quantum-depth=" + toString quantumdepth;
patches = [ ./disable-popen.patch ];
configureFlags = [
"--enable-shared"
"--with-quantum-depth=${toString quantumdepth}"
"--with-gslib=yes"
];
buildInputs =
[ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2
zlib libtool
zlib libtool libwebp
];
nativeBuildInputs = [ xz ];

View file

@ -0,0 +1,12 @@
http://permalink.gmane.org/gmane.comp.security.oss.general/19669
--- a/magick/blob.c Sat Nov 07 14:49:16 2015 -0600
+++ b/magick/blob.c Sun May 29 14:12:57 2016 -0500
@@ -68,6 +68,7 @@
*/
#define DefaultBlobQuantum 65541
+#undef HAVE_POPEN
/*
Enum declarations.