From 2b47295d8ab0e73ee7124314ff50d770c9df1d6d Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov
Date: Fri, 23 Nov 2012 02:19:17 +0000 Subject: [PATCH] distro: Add GNU Shishi. * distro/packages/shishi.scm, distro/packages/patches/shishi-gets-undeclared.patch: New files. * Makefile.am (MODULES): Add 'shishi.scm'. (dist_patch_DATA): Add 'shishi-gets-undeclared.patch'. --- Makefile.am | 2 + .../packages/patches/shishi-gets-undeclared.patch | 27 ++++++++ distro/packages/shishi.scm | 69 ++++++++++++++++++++ 3 files changed, 98 insertions(+), 0 deletions(-) create mode 100644 distro/packages/patches/shishi-gets-undeclared.patch create mode 100644 distro/packages/shishi.scm diff --git a/Makefile.am b/Makefile.am index dbc5071..ae70a26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -72,6 +72,7 @@ MODULES = \ distro/packages/pth.scm \ distro/packages/readline.scm \ distro/packages/recutils.scm \ + distro/packages/shishi.scm \ distro/packages/system.scm \ distro/packages/texinfo.scm \ distro/packages/zile.scm @@ -98,6 +99,7 @@ dist_patch_DATA = \ distro/packages/patches/findutils-absolute-paths.patch \ distro/packages/patches/perl-no-sys-dirs.patch \ distro/packages/patches/readline-link-ncurses.patch \ + distro/packages/patches/shishi-gets-undeclared.patch \ distro/packages/patches/tar-gets-undeclared.patch bootstrapdir = $(pkgdatadir)/bootstrap diff --git a/distro/packages/patches/shishi-gets-undeclared.patch b/distro/packages/patches/shishi-gets-undeclared.patch new file mode 100644 index 0000000..f17d86e --- /dev/null +++ b/distro/packages/patches/shishi-gets-undeclared.patch @@ -0,0 +1,27 @@ +--- shishi-1.0.1/gl/stdio.in.h-orig 2012-11-21 19:07:36.000000000 +0400 ++++ shishi-1.0.1/gl/stdio.in.h 2012-11-21 19:03:20.000000000 +0400 +@@ -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. */ ++#undef gets ++#if HAVE_RAW_DECL_GETS + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); + #endif + diff --git a/distro/packages/shishi.scm b/distro/packages/shishi.scm new file mode 100644 index 0000000..1b0781a --- /dev/null +++ b/distro/packages/shishi.scm @@ -0,0 +1,69 @@ +;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*- +;;; Copyright (C) 2012 Nikita Karetnikov +;;; Copyright (C) 2012 Ludovic Courtès +;;; +;;; This file is part of Guix. +;;; +;;; Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with Guix. If not, see