From 5888f27c563427b1771979d3e794806302fe7ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Jan 2014 13:49:08 +0100
Subject: [PATCH] automake-1.10: remove, probably vulnerable CVE-2012-3386

The only user was xorg ATM, which I would remove from anyway.
---
 .../tools/misc/automake/automake-1.10.x.nix   | 41 -------------------
 pkgs/top-level/all-packages.nix               |  5 +--
 2 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/automake/automake-1.10.x.nix

diff --git a/pkgs/development/tools/misc/automake/automake-1.10.x.nix b/pkgs/development/tools/misc/automake/automake-1.10.x.nix
deleted file mode 100644
index 80b033425a13..000000000000
--- a/pkgs/development/tools/misc/automake/automake-1.10.x.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false}:
-
-stdenv.mkDerivation rec {
-  name = "automake-1.10.3";
-
-  builder = ./builder.sh;
-
-  setupHook = ./setup-hook.sh;
-
-  src = fetchurl {
-    url = "mirror://gnu/automake/${name}.tar.bz2";
-    sha256 = "1p0sgv8zl6ah6vwpqf7jkrjr3cw8ydpmnbi0ljb1dhrrp0xv92p9";
-  };
-
-  buildInputs = [perl autoconf makeWrapper];
-
-  inherit doCheck;
-
-  # Disable indented log output from Make, otherwise "make.test" will
-  # fail.
-  preCheck = "unset NIX_INDENT_MAKE";
-
-  # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
-  # "fixed" path in generated files!
-  dontPatchShebangs = true;
-
-  meta = {
-    homepage = http://www.gnu.org/software/automake/;
-    description = "GNU standard-compliant makefile generator";
-
-    longDescription = ''
-      GNU Automake is a tool for automatically generating
-      `Makefile.in' files compliant with the GNU Coding
-      Standards.  Automake requires the use of Autoconf.
-    '';
-
-    license = "GPLv2+";
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8fd441f9948..4693d5cf24d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3372,8 +3372,6 @@ let
 
   automake = automake112x;
 
-  automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { };
-
   automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { };
 
   automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { };
@@ -6344,8 +6342,7 @@ let
     inherit fetchurl fetchgit stdenv pkgconfig intltool freetype fontconfig
       libxslt expat libdrm libpng zlib perl mesa_drivers
       dbus libuuid openssl gperf m4
-      autoconf libtool xmlto asciidoc udev flex bison python mtdev pixman;
-    automake = automake110x;
+      autoconf automake libtool xmlto asciidoc udev flex bison python mtdev pixman;
     mesa = mesa_noglu;
   });