diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-07-01 17:32:03 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-07-02 16:10:46 +0200 |
| commit | e80145b90953c0059fa8bc2701dbba6a481e4fbd (patch) | |
| tree | 621560ab820c95c5d817b19537cf6b225bc95fe0 /pkgs/tools/compression/gzip | |
| parent | bcdf987533d4c3de4b38a82d92b531701f141e61 (diff) | |
| download | nixpkgs-e80145b90953c0059fa8bc2701dbba6a481e4fbd.tar nixpkgs-e80145b90953c0059fa8bc2701dbba6a481e4fbd.tar.gz nixpkgs-e80145b90953c0059fa8bc2701dbba6a481e4fbd.tar.bz2 nixpkgs-e80145b90953c0059fa8bc2701dbba6a481e4fbd.tar.lz nixpkgs-e80145b90953c0059fa8bc2701dbba6a481e4fbd.tar.xz nixpkgs-e80145b90953c0059fa8bc2701dbba6a481e4fbd.tar.zst nixpkgs-e80145b90953c0059fa8bc2701dbba6a481e4fbd.zip | |
tar, gzip: Adjust the `gets' patch.
Fixes the incorrect patches introduced in 9786a9826107dd1d7751d06f5d22610ae5283b78.
Diffstat (limited to 'pkgs/tools/compression/gzip')
| -rw-r--r-- | pkgs/tools/compression/gzip/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/compression/gzip/gets-undeclared.patch | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index a49a741c5ca..e1d6d75da51 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation (rec { crossAttrs = # XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs. (stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") { - patches = [ ../../misc/coreutils/gets-undeclared.patch ]; + patches = [ ./gets-undeclared.patch ]; }); }) diff --git a/pkgs/tools/compression/gzip/gets-undeclared.patch b/pkgs/tools/compression/gzip/gets-undeclared.patch new file mode 100644 index 00000000000..a09f59b122a --- /dev/null +++ b/pkgs/tools/compression/gzip/gets-undeclared.patch @@ -0,0 +1,26 @@ +This patch is needed to allow builds with newer versions of +the GNU libc (2.16+). + +This is a backport of this patch: + +commit 66712c23388e93e5c518ebc8515140fa0c807348 +Author: Eric Blake <eblake@redhat.com> +Date: Thu Mar 29 13:30:41 2012 -0600 + + stdio: don't assume gets any more + +--- gzip/lib/stdio.in.h 2012-07-02 14:28:45.000000000 +0200 ++++ gzip/lib/stdio.in.h 2012-07-02 14:28:50.000000000 +0200 +@@ -160,12 +160,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not + "use gnulib module fflush for portable POSIX compliance"); + #endif + +-/* It is very rare that the developer ever has full control of stdin, +- so any use of gets warrants an unconditional warning. Assume it is +- always declared, since it is required by C89. */ +-#undef gets +-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); +- + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) |