From c86efac8848cf708e4ab089a206c96261427da13 Mon Sep 17 00:00:00 2001 From: shdluan Date: Sat, 31 Jul 2021 09:12:05 +0000 Subject: [PATCH 1/3] update nagios.spec. --- nagios.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nagios.spec b/nagios.spec index 5faacfb..64f48eb 100644 --- a/nagios.spec +++ b/nagios.spec @@ -123,7 +123,9 @@ install -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} html/images/logos/ --with-template-objects \ --with-template-extinfo \ --enable-event-broker \ - STRIP=/bin/true + STRIP=/bin/true \ + CFLAGS="$CLASS -fcommon" +%define debug_package %{nil} make %{?_smp_mflags} all %{__make} dox %{__make} %{?_smp_mflags} -C contrib -- Gitee From 1570e512c34fc2d124fbc6fcb98fccad68cafbc8 Mon Sep 17 00:00:00 2001 From: shdluan Date: Mon, 2 Aug 2021 07:21:20 +0000 Subject: [PATCH 2/3] update nagios.spec. --- nagios.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nagios.spec b/nagios.spec index 64f48eb..d5271e7 100644 --- a/nagios.spec +++ b/nagios.spec @@ -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/ @@ -278,6 +278,9 @@ fi %{_libdir}/%{name}/cgi/ %changelog +* Mon Aug 2 2021 shdluan - 4.4.3-8 +-fix pack failure when use gcc 10 + * Thu Nov 26 2020 lingsheng - 4.4.3-7 - Drop unexpected output in scripts -- Gitee From fe92846441426bec8eaa0035c3050149136b9d5a Mon Sep 17 00:00:00 2001 From: shdluan Date: Tue, 3 Aug 2021 21:06:08 +0800 Subject: [PATCH 3/3] fix multiple definition Signed-off-by: shdluan --- nagios-0015-fix-multiple-definition.patch | 39 +++++++++++++++++++++++ nagios.spec | 5 ++- 2 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 nagios-0015-fix-multiple-definition.patch diff --git a/nagios-0015-fix-multiple-definition.patch b/nagios-0015-fix-multiple-definition.patch new file mode 100644 index 0000000..0b8ca06 --- /dev/null +++ b/nagios-0015-fix-multiple-definition.patch @@ -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 diff --git a/nagios.spec b/nagios.spec index d5271e7..0bac2f5 100644 --- a/nagios.spec +++ b/nagios.spec @@ -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) @@ -123,9 +124,7 @@ install -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} html/images/logos/ --with-template-objects \ --with-template-extinfo \ --enable-event-broker \ - STRIP=/bin/true \ - CFLAGS="$CLASS -fcommon" -%define debug_package %{nil} + STRIP=/bin/true make %{?_smp_mflags} all %{__make} dox %{__make} %{?_smp_mflags} -C contrib -- Gitee