Merge pull request #18230 from eikek/recutils-1.7

recutils: 1.5 -> 1.7
This commit is contained in:
Tuomas Tynkkynen 2016-09-03 01:27:10 +03:00 committed by GitHub
commit 3949abee65
2 changed files with 6 additions and 33 deletions

View file

@ -1,21 +1,23 @@
{ fetchurl, stdenv, gettext, emacs, curl, check, bc }:
stdenv.mkDerivation rec {
name = "recutils-1.5";
name = "recutils-1.7";
src = fetchurl {
url = "mirror://gnu/recutils/${name}.tar.gz";
sha256 = "1v2xzwwwhc5j5kmvg4sv6baxjpsfqh8ln7ilv4mgb1408rs7xmky";
sha256 = "0cdwa4094x3yx7vn98xykvnlp9rngvd58d19vs3vh5hrvggccg93";
};
patches = [ ./glibc.patch ];
doCheck = true;
hardeningDisable = [ "format" ];
buildInputs = [ curl emacs ] ++ (stdenv.lib.optionals doCheck [ check bc ]);
postInstall = ''
${emacs}/bin/emacs -Q -batch -f batch-byte-compile $out/share/emacs/site-lisp/*.el #*/
'';
meta = {
description = "Tools and libraries to access human-editable, text-based databases";

View file

@ -1,29 +0,0 @@
--- recutils-1.5/lib/stdio.in.h
+++ recutils-1.5/lib/stdio.in.h
@@ -699,22 +699,11 @@
# endif
#endif
-#if @GNULIB_GETS@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-# undef gets
-# define gets rpl_gets
-# endif
-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (gets, char *, (char *s));
-# else
-_GL_CXXALIAS_SYS (gets, char *, (char *s));
-# undef gets
-# endif
-_GL_CXXALIASWARN (gets);
/* 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. */
+ so any use of gets warrants an unconditional warning; besides, C11
+ removed it. */
+#undef gets
+#if HAVE_RAW_DECL_GETS
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
#endif