From 742416addbb5665f39c98337a921eb52f37adf85 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <v@cunat.cz>
Date: Fri, 5 Apr 2019 20:59:44 +0200
Subject: Revert "Merge #58997 gettext: apply patch for CVE 2018-1875"

This reverts commit f93e17647527410a75af8d920ab2fafc43b59e3e, reversing
changes made to 2771375d6e62d2ffdf4ee469a8a96f245afe321e.
The MR was meant for staging, not staging-next, so let's move it.
---
 pkgs/development/libraries/gettext/default.nix     | 13 ++-----
 .../tools/misc/automake/automake-1.15.x.nix        | 43 ----------------------
 pkgs/top-level/all-packages.nix                    |  2 -
 3 files changed, 3 insertions(+), 55 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/automake/automake-1.15.x.nix

diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 1dae2c443c8c..8ed898813aef 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, libiconv, xz, bison, automake115x, autoconf }:
+{ stdenv, lib, fetchurl, libiconv, xz }:
 
 stdenv.mkDerivation rec {
   name = "gettext-${version}";
@@ -8,14 +8,7 @@ stdenv.mkDerivation rec {
     url = "mirror://gnu/gettext/${name}.tar.gz";
     sha256 = "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z";
   };
-  patches = [
-    ./absolute-paths.diff
-    (fetchurl {
-      name = "CVE-2018-18751.patch";
-      url = "https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=patch;h=dce3a16e5e9368245735e29bf498dcd5e3e474a4";
-      sha256 = "1lpjwwcjr1sb879faj0xyzw02kma0ivab6xwn3qciy13qy6fq5xn";
-    })
-  ];
+  patches = [ ./absolute-paths.diff ];
 
   outputs = [ "out" "man" "doc" "info" ];
 
@@ -47,7 +40,7 @@ stdenv.mkDerivation rec {
     sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in
   '';
 
-  nativeBuildInputs = [ xz xz.bin bison automake115x autoconf];
+  nativeBuildInputs = [ xz xz.bin ];
   # HACK, see #10874 (and 14664)
   buildInputs = stdenv.lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv;
 
diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix
deleted file mode 100644
index e1aeb025c30f..000000000000
--- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, perl, autoconf }:
-
-stdenv.mkDerivation rec {
-  name = "automake-1.15";
-
-  src = fetchurl {
-    url = "mirror://gnu/automake/${name}.tar.xz";
-    sha256 = "0dl6vfi2lzz8alnklwxzfz624b95hb1ipjvd3mk177flmddcf24r";
-  };
-
-  nativeBuildInputs = [ autoconf perl ];
-  buildInputs = [ autoconf ];
-
-  setupHook = ./setup-hook.sh;
-
-  # Disable indented log output from Make, otherwise "make.test" will
-  # fail.
-  preCheck = "unset NIX_INDENT_MAKE";
-  doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths
-  doInstallCheck = false; # runs the same thing, fails the same tests
-
-  # The test suite can run in parallel.
-  enableParallelBuilding = true;
-
-  # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
-  # "fixed" path in generated files!
-  dontPatchShebangs = true;
-
-  meta = {
-    branch = "1.15";
-    homepage = https://www.gnu.org/software/automake/;
-    description = "GNU standard-compliant makefile generator";
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    longDescription = ''
-      GNU Automake is a tool for automatically generating
-      `Makefile.in' files compliant with the GNU Coding
-      Standards.  Automake requires the use of Autoconf.
-    '';
-
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85b3b58a1c5c..1dfe98d71b7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8519,8 +8519,6 @@ in
 
   automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { };
 
-  automake115x = callPackage ../development/tools/misc/automake/automake-1.15.x.nix { };
-
   automake116x = callPackage ../development/tools/misc/automake/automake-1.16.x.nix { };
 
   automoc4 = callPackage ../development/tools/misc/automoc4 { };
-- 
cgit 1.4.1