From 3b6cc2a5c2ac5eaa50d5995dbcb75093867071d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 10 Dec 2009 20:54:58 +0000
Subject: [PATCH] Update Automake (CVE-2009-4029 security fix).

svn path=/nixpkgs/trunk/; revision=18881
---
 .../tools/misc/automake/automake-1.10.x.nix          | 12 +++++++-----
 .../tools/misc/automake/automake-1.11.x.nix          | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/misc/automake/automake-1.10.x.nix b/pkgs/development/tools/misc/automake/automake-1.10.x.nix
index 5296f0cbec32..c015c0115fe4 100644
--- a/pkgs/development/tools/misc/automake/automake-1.10.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.10.x.nix
@@ -1,15 +1,15 @@
 {stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false}:
 
 stdenv.mkDerivation rec {
-  name = "automake-1.10.2";
+  name = "automake-1.10.3";
 
   builder = ./builder.sh;
-  
+
   setupHook = ./setup-hook.sh;
 
   src = fetchurl {
     url = "mirror://gnu/automake/${name}.tar.bz2";
-    sha256 = "03v4gsvi71nhqvnxxbhkrksdg5icrn8yda021852njfragzck2n3";
+    sha256 = "1p0sgv8zl6ah6vwpqf7jkrjr3cw8ydpmnbi0ljb1dhrrp0xv92p9";
   };
 
   buildInputs = [perl autoconf makeWrapper];
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
   # 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 Automake, a GNU standard-compliant makefile generator";
@@ -35,5 +35,7 @@ stdenv.mkDerivation rec {
     '';
 
     license = "GPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }
diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix
index 663ce366c482..e82237152c1b 100644
--- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix
@@ -1,15 +1,15 @@
 {stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}:
 
 stdenv.mkDerivation rec {
-  name = "automake-1.11";
+  name = "automake-1.11.1";
 
   builder = ./builder.sh;
-  
+
   setupHook = ./setup-hook.sh;
 
   src = fetchurl {
     url = "mirror://gnu/automake/${name}.tar.bz2";
-    sha256 = "1h5a821z4i3dbgqg67igvbxcwn487kkkkx83q0m00n9mw9xz5ai9";
+    sha256 = "1bn7jl11wbkyy4ivgja92zkyjj8w3agwp2xnf7g8f7qa1qy9s5av";
   };
 
   buildInputs = [perl autoconf makeWrapper];
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
   # 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 Automake, a GNU standard-compliant makefile generator";
@@ -35,5 +35,7 @@ stdenv.mkDerivation rec {
     '';
 
     license = "GPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }