gzip: Update to 1.5
This fixes the gets() problem in gzip. Also disabled "make check" because it depends on Perl and more/less, which is undesirable in the stdenv bootstrap.
This commit is contained in:
parent
fcc18aad0a
commit
51a6b27cc7
@ -1,15 +1,13 @@
|
||||
{stdenv, fetchurl}:
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
name = "gzip-1.4";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gzip-1.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gzip/${name}.tar.gz";
|
||||
sha256 = "1vhiyzls60fws48scw48wvwn8mpv1f4yhcsnafys239qvb9wyrni";
|
||||
url = "mirror://gnu/gzip/${name}.tar.xz";
|
||||
sha256 = "0wx1nqk709kx75cwp2axachnbxryp4gyl06qxn5nl95184w0mhls";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/gzip/;
|
||||
description = "Gzip, the GNU zip compression program";
|
||||
@ -31,13 +29,3 @@ stdenv.mkDerivation (rec {
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
};
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
{
|
||||
crossAttrs =
|
||||
# XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs.
|
||||
(stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") {
|
||||
patches = [ ./gets-undeclared.patch ];
|
||||
});
|
||||
})
|
||||
|
@ -1,26 +0,0 @@
|
||||
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)
|
Loading…
x
Reference in New Issue
Block a user