[Pkg-nagios-changes] [pkg-nagios] r2087 - in nagios-plugins/trunk/debian: . patches

[Jan Wagner]

Author: waja
Date: 2013-06-24 16:20:15 +0000 (Mon, 24 Jun 2013)
New Revision: 2087

Added:
   nagios-plugins/trunk/debian/patches/05_fix_gets_undefined_in_iso_c11.dpatch
Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/00list
Log:
patch out _GL_WARN_ON_USE

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2013-06-24 15:51:30 UTC (rev 2086)
+++ nagios-plugins/trunk/debian/changelog	2013-06-24 16:20:15 UTC (rev 2087)
@@ -8,6 +8,7 @@
     - Closes: #713839, thanks to Russell Sim
   * Enable Extra-Opts by adding --enable-extra-opts to configure flags
     (Closes: #698119)
+  * Fix FTBFS: do not assume that gets is defined (LP: #1097848).
 
  -- Jan Wagner <waja at cyconet.org>  Wed, 27 Jun 2012 23:14:40 +0200
 

Modified: nagios-plugins/trunk/debian/patches/00list
===================================================================
--- nagios-plugins/trunk/debian/patches/00list	2013-06-24 15:51:30 UTC (rev 2086)
+++ nagios-plugins/trunk/debian/patches/00list	2013-06-24 16:20:15 UTC (rev 2087)
@@ -1,2 +1,4 @@
 02_check_icmp_links.dpatch
+05_fix_gets_undefined_in_iso_c11.dpatch
 # commited upstream
+

Added: nagios-plugins/trunk/debian/patches/05_fix_gets_undefined_in_iso_c11.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/05_fix_gets_undefined_in_iso_c11.dpatch	                        (rev 0)
+++ nagios-plugins/trunk/debian/patches/05_fix_gets_undefined_in_iso_c11.dpatch	2013-06-24 16:20:15 UTC (rev 2087)
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 17_fix_gets_undefined_in_iso_c11.dpatch by  <ubuntu at server-e76384a2-51cb-4595-9b66-9ed53c1e0c44.canonistack>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+##
+## DP: Do not assume that gets is defined. gets got dropped in ISO C11,
+## DP: but the embedded old version of gnulib assumes it is defined. Since Ubuntu
+## DP: now does not define gets, it is safe to disable this warning, which fixes the
+## DP: FTBFS.
+## DP: 
+## DP: Author: Robie Basak <robie.basak at canonical.com>
+## DP: Bug: http://sourceforge.net/support/tracker.php?aid=3600122
+## DP: Bug-Ubuntu: https://launchpad.net/bugs/1097848
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-plugins-1.4.15~/gl/stdio.in.h nagios-plugins-1.4.15/gl/stdio.in.h
+--- nagios-plugins-1.4.15~/gl/stdio.in.h	2010-07-27 20:47:15.000000000 +0000
++++ nagios-plugins-1.4.15/gl/stdio.in.h	2013-01-09 17:17:13.112864259 +0000
+@@ -141,7 +141,14 @@
+    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");
++
++/* gets is no longer defined in ISO C11. This has been updated in upstream
++ * gnulib:
++ *     http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=66712c23388e93e5c518ebc8515140fa0c807348
++ * Since Ubuntu now does not define gets, it is safe to disable this warning.
++ * https://launchpad.net/bugs/1097848
++ * _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++ */
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@