!12 fix multi defination of variable when use gcc 10
From: @shdluan Reviewed-by: @small_leek Signed-off-by: @small_leek
This commit is contained in:
commit
f598154a8c
39
nagios-0015-fix-multiple-definition.patch
Normal file
39
nagios-0015-fix-multiple-definition.patch
Normal file
@ -0,0 +1,39 @@
|
||||
--- ./xdata/xsddefault.c.xiugai 2021-08-03 16:18:47.678788632 +0800
|
||||
+++ ./xdata/xsddefault.c 2021-08-03 16:19:25.719135981 +0800
|
||||
@@ -38,22 +38,22 @@
|
||||
|
||||
#ifdef NSCGI
|
||||
#include "../include/cgiutils.h"
|
||||
-time_t program_start;
|
||||
-int daemon_mode;
|
||||
-time_t last_log_rotation;
|
||||
-int enable_notifications;
|
||||
-int execute_service_checks;
|
||||
-int accept_passive_service_checks;
|
||||
-int execute_host_checks;
|
||||
-int accept_passive_host_checks;
|
||||
-int enable_event_handlers;
|
||||
-int obsess_over_services;
|
||||
-int obsess_over_hosts;
|
||||
+extern time_t program_start;
|
||||
+extern int daemon_mode;
|
||||
+extern time_t last_log_rotation;
|
||||
+extern int enable_notifications;
|
||||
+extern int execute_service_checks;
|
||||
+extern int accept_passive_service_checks;
|
||||
+extern int execute_host_checks;
|
||||
+extern int accept_passive_host_checks;
|
||||
+extern int enable_event_handlers;
|
||||
+extern int obsess_over_services;
|
||||
+extern int obsess_over_hosts;
|
||||
int check_service_freshness;
|
||||
int check_host_freshness;
|
||||
-int enable_flap_detection;
|
||||
-int process_performance_data;
|
||||
-int nagios_pid;
|
||||
+extern int enable_flap_detection;
|
||||
+extern int process_performance_data;
|
||||
+extern int nagios_pid;
|
||||
int buffer_stats[1][3];
|
||||
int program_stats[MAX_CHECK_STATS_TYPES][3];
|
||||
#endif
|
||||
@ -1,6 +1,6 @@
|
||||
Name: nagios
|
||||
Version: 4.4.3
|
||||
Release: 7
|
||||
Release: 8
|
||||
Summary: Host/service/network monitoring program
|
||||
License: GPLv2
|
||||
URL: https://www.nagios.org/projects/nagios-core/
|
||||
@ -31,6 +31,7 @@ Patch0011: nagios-0011-remove-rpmbuild.patch
|
||||
Patch0012: nagios-0012-fix-spool.patch
|
||||
Patch0013: nagios-0013-fix-plugin.patch
|
||||
Patch0014: nagios-0014-fix-uidgid.patch
|
||||
Patch0015: nagios-0015-fix-multiple-definition.patch
|
||||
BuildRequires: doxygen gcc gperf libjpeg-devel libpng-devel zlib-devel gd-devel > 1.8
|
||||
BuildRequires: perl-generators perl(CPAN) perl(ExtUtils::MakeMaker) perl(ExtUtils::Embed)
|
||||
BuildRequires: perl(Test::Harness) perl(Test::More) perl(Test::Simple)
|
||||
@ -276,6 +277,9 @@ fi
|
||||
%{_libdir}/%{name}/cgi/
|
||||
|
||||
%changelog
|
||||
* Mon Aug 2 2021 shdluan <shdluan@163.com> - 4.4.3-8
|
||||
-fix pack failure when use gcc 10
|
||||
|
||||
* Thu Nov 26 2020 lingsheng <lingsheng@huawei.com> - 4.4.3-7
|
||||
- Drop unexpected output in scripts
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user