Update Automake (CVE-2009-4029 security fix).

svn path=/nixpkgs/trunk/; revision=18881
This commit is contained in:
Ludovic Courtès 2009-12-10 20:54:58 +00:00
parent adbaa14548
commit 3b6cc2a5c2
2 changed files with 14 additions and 10 deletions

View File

@ -1,15 +1,15 @@
{stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false}: {stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "automake-1.10.2"; name = "automake-1.10.3";
builder = ./builder.sh; builder = ./builder.sh;
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
src = fetchurl { src = fetchurl {
url = "mirror://gnu/automake/${name}.tar.bz2"; url = "mirror://gnu/automake/${name}.tar.bz2";
sha256 = "03v4gsvi71nhqvnxxbhkrksdg5icrn8yda021852njfragzck2n3"; sha256 = "1p0sgv8zl6ah6vwpqf7jkrjr3cw8ydpmnbi0ljb1dhrrp0xv92p9";
}; };
buildInputs = [perl autoconf makeWrapper]; buildInputs = [perl autoconf makeWrapper];
@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
# Disable indented log output from Make, otherwise "make.test" will # Disable indented log output from Make, otherwise "make.test" will
# fail. # fail.
preCheck = "unset NIX_INDENT_MAKE"; preCheck = "unset NIX_INDENT_MAKE";
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
# "fixed" path in generated files! # "fixed" path in generated files!
dontPatchShebangs = true; dontPatchShebangs = true;
meta = { meta = {
homepage = http://www.gnu.org/software/automake/; homepage = http://www.gnu.org/software/automake/;
description = "GNU Automake, a GNU standard-compliant makefile generator"; description = "GNU Automake, a GNU standard-compliant makefile generator";
@ -35,5 +35,7 @@ stdenv.mkDerivation rec {
''; '';
license = "GPLv2+"; license = "GPLv2+";
maintainers = [ stdenv.lib.maintainers.ludo ];
}; };
} }

View File

@ -1,15 +1,15 @@
{stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}: {stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "automake-1.11"; name = "automake-1.11.1";
builder = ./builder.sh; builder = ./builder.sh;
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
src = fetchurl { src = fetchurl {
url = "mirror://gnu/automake/${name}.tar.bz2"; url = "mirror://gnu/automake/${name}.tar.bz2";
sha256 = "1h5a821z4i3dbgqg67igvbxcwn487kkkkx83q0m00n9mw9xz5ai9"; sha256 = "1bn7jl11wbkyy4ivgja92zkyjj8w3agwp2xnf7g8f7qa1qy9s5av";
}; };
buildInputs = [perl autoconf makeWrapper]; buildInputs = [perl autoconf makeWrapper];
@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
# Disable indented log output from Make, otherwise "make.test" will # Disable indented log output from Make, otherwise "make.test" will
# fail. # fail.
preCheck = "unset NIX_INDENT_MAKE"; preCheck = "unset NIX_INDENT_MAKE";
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
# "fixed" path in generated files! # "fixed" path in generated files!
dontPatchShebangs = true; dontPatchShebangs = true;
meta = { meta = {
homepage = http://www.gnu.org/software/automake/; homepage = http://www.gnu.org/software/automake/;
description = "GNU Automake, a GNU standard-compliant makefile generator"; description = "GNU Automake, a GNU standard-compliant makefile generator";
@ -35,5 +35,7 @@ stdenv.mkDerivation rec {
''; '';
license = "GPLv2+"; license = "GPLv2+";
maintainers = [ stdenv.lib.maintainers.ludo ];
}; };
} }