forked from mirrors/nixpkgs
shishi: minor update to fix build with new libtasn1
This commit is contained in:
parent
a7980953d2
commit
22c04a2fe1
|
@ -1,15 +1,13 @@
|
|||
{ fetchurl, stdenv, libtasn1, libgcrypt, gnutls }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "shishi-1.0.1";
|
||||
name = "shishi-1.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/shishi/${name}.tar.gz";
|
||||
sha256 = "13c6w9rpaqb3am65nrn86byvmll5r78pld2vb0i68491vww4fzlx";
|
||||
sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d";
|
||||
};
|
||||
|
||||
patches = [ ./no-gets.patch ];
|
||||
|
||||
buildInputs = [ libtasn1 libgcrypt gnutls ] ;
|
||||
|
||||
NIX_CFLAGS_COMPILE
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
diff --git a/gl/stdio.in.h b/gl/stdio.in.h
|
||||
index 06d9780..fa04a10 100644
|
||||
--- a/gl/stdio.in.h
|
||||
+++ b/gl/stdio.in.h
|
||||
@@ -713,10 +713,13 @@ _GL_CXXALIAS_SYS (gets, char *, (char *s));
|
||||
# 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. */
|
||||
+#ifdef gets
|
||||
+#undef gets
|
||||
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
|
||||
#if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
|
Loading…
Reference in a new issue