JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tar, gzip: Adjust the `gets' patch.

Browse Source 
Fixes the incorrect patches introduced in
9786a98261.
This commit is contained in:
Ludovic Courtès 2012-07-01 17:32:03 +02:00
parent bcdf987533
commit e80145b909
4 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/archivers/gnutar/default.nix
View File

@ -45,6 +45,6 @@ stdenv.mkDerivation (rec {
crossAttrs = crossAttrs =
# XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs. # XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs.
(stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") { (stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") {
patches = [ ../../misc/coreutils/gets-undeclared.patch ]; patches = [ ./gets-undeclared.patch ];
}); });
}) })

26
pkgs/tools/archivers/gnutar/gets-undeclared.patch Normal file
View File

@ -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
--- tar-1.26/gnu/stdio.in.h 2012-07-02 14:28:45.000000000 +0200
+++ tar-1.26/gnu/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)

2
pkgs/tools/compression/gzip/default.nix
View File

@ -38,6 +38,6 @@ stdenv.mkDerivation (rec {
crossAttrs = crossAttrs =
# XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs. # XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs.
(stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") { (stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") {
patches = [ ../../misc/coreutils/gets-undeclared.patch ]; patches = [ ./gets-undeclared.patch ];
}); });
}) })

26
pkgs/tools/compression/gzip/gets-undeclared.patch Normal file
View File

@ -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)