From d16b0e3ae51279245824f8a4c76e7af72771159d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 7 Feb 2015 07:30:05 +0100
Subject: [PATCH] xdg-utils: update from git to fix CVE-2014-9622

Fixes #6193.
Disabling docs generation might be another alternative
to the build-time dependency blowup.

(cherry picked from commit 346c8d7a989c19d4186aa5b7c8e685cd0807f5d0)

Conflicts (simple):
	pkgs/tools/X11/xdg-utils/default.nix
---
 pkgs/tools/X11/xdg-utils/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 52ddb5a0f6b1..96dc2e11764c 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -1,13 +1,17 @@
-{ stdenv, fetchurl, file }:
+{ stdenv, fetchgit, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto, w3m }:
 
 stdenv.mkDerivation rec {
-  name = "xdg-utils-1.1.0-rc1";
+  name = "xdg-utils-1.1.0-rc3p7";
   
-  src = fetchurl {
-    url = "http://portland.freedesktop.org/download/${name}.tar.gz";
-    sha256 = "00lisw4x43sp189lb7dz46j2l09y5v2fijk3d0sxx3mvwj55a1bv";
+  src = fetchgit {
+    url = "git://anongit.freedesktop.org/xdg/xdg-utils";
+    rev = "e8ee3b18d16e41b95148111b920a0c8beed3ac6c";
+    sha256 = "0qy9h7vh6sw7wmadjvasw4sdhb9fvv7bn32ifgasdx7ag3r3939w";
   };
 
+  # just needed when built from git
+  buildInputs = [ libxslt docbook_xml_dtd_412 docbook_xsl xmlto w3m ];
+
   postInstall = ''
     substituteInPlace $out/bin/xdg-mime --replace /usr/bin/file ${file}/bin/file
   '';
@@ -20,3 +24,4 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.linux;
   };
 }
+