rush: 1.7 -> 1.8 (#20424)

This commit is contained in:
Lancelot SIX 2016-11-15 14:33:56 +01:00 committed by zimbatm
parent 1958f07c63
commit 39297fa36b
3 changed files with 15 additions and 16 deletions

View file

@ -1,14 +1,14 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
name = "rush-1.7";
name = "rush-1.8";
src = fetchurl {
url = "mirror://gnu/rush/${name}.tar.gz";
sha256 = "0fh0gbbp0iiq3wbkf503xb40r8ljk42vyj9bnlflbz82d6ipy1rm";
sha256 = "1vxdb81ify4xcyygh86250pi50krb16dkj42i5ii4ns3araiwckz";
};
patches = [ ./gets.patch ];
patches = [ ./fix-format-security-error.patch ];
doCheck = true;

View file

@ -0,0 +1,12 @@
diff -Nur rush-1.8.orig/lib/wordsplit.c rush-1.8/lib/wordsplit.c
--- rush-1.8.orig/lib/wordsplit.c 2016-08-18 20:11:43.000000000 +0200
+++ rush-1.8/lib/wordsplit.c 2016-11-14 14:37:02.976177414 +0100
@@ -2330,7 +2330,7 @@
break;
default:
- wsp->ws_error (wordsplit_strerror (wsp));
+ wsp->ws_error ("%s", wordsplit_strerror (wsp));
}
}

View file

@ -1,13 +0,0 @@
--- rush-1.7/gnu/stdio.in.h.org 2010-06-13 19:14:59.000000000 +0200
+++ rush-1.7/gnu/stdio.in.h 2013-12-30 14:29:55.000000000 +0100
@@ -138,8 +138,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not
/* 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. */
+#if defined gets
#undef gets
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+#endif
#if @GNULIB_FOPEN@
# if @REPLACE_FOPEN@