gnum4: drop obsolete patches
This commit is contained in:
parent
ee3dc2d0c9
commit
e4f6e4b15d
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||||||
&& !stdenv.isSunOS; # XXX: `test-setlocale2.sh' fails
|
&& !stdenv.isSunOS; # XXX: `test-setlocale2.sh' fails
|
||||||
|
|
||||||
# Upstream is aware of it; it may be in the next release.
|
# Upstream is aware of it; it may be in the next release.
|
||||||
patches = [ ./s_isdir.patch ./readlink-EINVAL.patch ./no-gets.patch ];
|
patches = [ ./s_isdir.patch ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.gnu.org/software/m4/;
|
homepage = http://www.gnu.org/software/m4/;
|
||||||
|
@ -1,26 +0,0 @@
|
|||||||
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-devel/m4/files/m4-1.4.16-no-gets.patch?revision=1.1
|
|
||||||
|
|
||||||
https://bugs.gentoo.org/424978
|
|
||||||
|
|
||||||
hack until m4 pulls a newer gnulib version
|
|
||||||
|
|
||||||
From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eric Blake <eblake@redhat.com>
|
|
||||||
Date: Thu, 29 Mar 2012 13:30:41 -0600
|
|
||||||
Subject: [PATCH] stdio: don't assume gets any more
|
|
||||||
|
|
||||||
Gnulib intentionally does not have a gets module, and now that C11
|
|
||||||
and glibc have dropped it, we should be more proactive about warning
|
|
||||||
any user on a platform that still has a declaration of this dangerous
|
|
||||||
interface.
|
|
||||||
|
|
||||||
--- a/lib/stdio.in.h
|
|
||||||
+++ b/lib/stdio.in.h
|
|
||||||
@@ -125,7 +125,6 @@
|
|
||||||
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@
|
|
@ -1,18 +0,0 @@
|
|||||||
Newer Linux kernels would return EINVAL instead of ENOENT.
|
|
||||||
The patch below, taken from Gnulib, allows the test to pass when
|
|
||||||
these Linux versions are in use:
|
|
||||||
https://lists.gnu.org/archive/html/bug-gnulib/2011-03/msg00308.html .
|
|
||||||
|
|
||||||
diff --git a/tests/test-readlink.h b/tests/test-readlink.h
|
|
||||||
index 08d5662..7247fc4 100644
|
|
||||||
--- a/tests/test-readlink.h
|
|
||||||
+++ b/tests/test-readlink.h
|
|
||||||
@@ -38,7 +38,7 @@ test_readlink (ssize_t (*func) (char const *, char *, size_t), bool print)
|
|
||||||
ASSERT (errno == ENOENT);
|
|
||||||
errno = 0;
|
|
||||||
ASSERT (func ("", buf, sizeof buf) == -1);
|
|
||||||
- ASSERT (errno == ENOENT);
|
|
||||||
+ ASSERT (errno == ENOENT || errno == EINVAL);
|
|
||||||
errno = 0;
|
|
||||||
ASSERT (func (".", buf, sizeof buf) == -1);
|
|
||||||
ASSERT (errno == EINVAL);
|
|
Loading…
x
Reference in New Issue
Block a user