From 10fe751bf2610972a705b1a5b6a05aef004adf6a Mon Sep 17 00:00:00 2001 From: Jose Pedro Oliveira Date: Oct 24 2013 16:37:44 +0000 Subject: Removed the gnulib/stdio.h/gets patch: no longer needed as the included gnulib has been resynced with upstream. --- diff --git a/nagios-plugins-0006-glibc-2.16-no-longer-defines-gets-for-ISO-C11-ISO-C-.patch b/nagios-plugins-0006-glibc-2.16-no-longer-defines-gets-for-ISO-C11-ISO-C-.patch deleted file mode 100644 index e203462..0000000 --- a/nagios-plugins-0006-glibc-2.16-no-longer-defines-gets-for-ISO-C11-ISO-C-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From dff271c97b03d858ceabd0c2e07a6006b97d1537 Mon Sep 17 00:00:00 2001 -From: Jose Pedro Oliveira -Date: Wed, 27 Jun 2012 11:02:01 +0100 -Subject: [PATCH 06/10] glibc 2.16 no longer defines gets for ISO C11, ISO - C++11, and _GNU_SOURCE - ---- - gl/stdio.in.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gl/stdio.in.h b/gl/stdio.in.h -index 80b9dbf..9147bde 100644 ---- a/gl/stdio.in.h -+++ b/gl/stdio.in.h -@@ -140,8 +140,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " - /* 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@ --- -1.8.3.1 - diff --git a/nagios-plugins.spec b/nagios-plugins.spec index 03e6abd..fd51643 100644 --- a/nagios-plugins.spec +++ b/nagios-plugins.spec @@ -16,7 +16,6 @@ Patch3: nagios-plugins-0003-Fedora-specific-fixes-for-searching-for-diff-and-tai Patch4: nagios-plugins-0004-Fedora-specific-patch-for-not-to-fixing-fully-qualif.patch # https://bugzilla.redhat.com/512559 Patch5: nagios-plugins-0005-Prevent-check_swap-from-returning-OK-if-no-swap-acti.patch -Patch6: nagios-plugins-0006-glibc-2.16-no-longer-defines-gets-for-ISO-C11-ISO-C-.patch Patch7: nagios-plugins-0007-Fix-the-use-lib-statement-and-the-external-ntp-comma.patch # backported from upstream, https://bugzilla.redhat.com/504721 Patch8: nagios-plugins-0008-This-patch-fixes-the-regular-expression-for-the-arra.patch @@ -550,10 +549,6 @@ Provides check_wave support for Nagios. %patch3 -p1 -b .proper_paths %patch4 -p1 -b .no_need_fo_fix_paths %patch5 -p1 -b .fix_missing_swap - -# patching file gl/stdio.in.h -# Hunk #1 FAILED at 140. -#patch6 -p1 -b .gets %patch7 -p1 -b .ext_ntp_cmds # can't find file to patch at input line 18