commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2020-06-04 17:55:19
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new.3606 (New)
Package is "nagios"
Thu Jun 4 17:55:19 2020 rev:19 rq:811250 version:4.4.6
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2020-04-14
16:24:53.075776313 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new.3606/nagios.changes 2020-06-04
17:55:23.624809095 +0200
@@ -1,0 +2,14 @@
+Wed Jun 3 14:41:41 UTC 2020 - Stefan Botter
+
+- 4.4.6
+* Fixed Map display in Internet Explorer 11 (#714)
+* Fixed duplicate properties appearing in statusjson.cgi (#718)
+* Fixed NERD not building when enabled in ./configure (#723)
+* Fixed build process when using GCC 10 (#721)
+* Fixed postauth vulnerabilities in histogram.js, map.js, trends.js
+ (CVE-2020-1408)
+* When using systemd, configuration will be verified before
+ reloading (#715)
+* Fixed HARD OK states triggering on the maximum check attempt (#757)
+
+---
Old:
nagios-4.4.5.tar.gz
New:
nagios-4.4.6.tar.gz
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.yDpve9/_old 2020-06-04 17:55:24.684812354 +0200
+++ /var/tmp/diff_new_pack.yDpve9/_new 2020-06-04 17:55:24.688812367 +0200
@@ -30,7 +30,7 @@
%endif
Name: nagios
-Version:4.4.5
+Version:4.4.6
Release:0
Summary:The Nagios Network Monitor
License:GPL-2.0-or-later
@@ -232,7 +232,7 @@
may compile against.
%prep
-%setup -q
+%setup -q -n nagioscore-%{name}-%{version}
%patch3 -p1
%patch4 -p1
%patch11 -p1
++ nagios-4.4.5.tar.gz -> nagios-4.4.6.tar.gz ++
/work/SRC/openSUSE:Factory/nagios/nagios-4.4.5.tar.gz
/work/SRC/openSUSE:Factory/.nagios.new.3606/nagios-4.4.6.tar.gz differ: char 5,
line 1
commit nagios for openSUSE:Factory
Hello community, here is the log from the commit of package nagios for openSUSE:Factory checked in at 2020-04-14 15:09:26 Comparing /work/SRC/openSUSE:Factory/nagios (Old) and /work/SRC/openSUSE:Factory/.nagios.new.2738 (New) Package is "nagios" Tue Apr 14 15:09:26 2020 rev:18 rq:793008 version:4.4.5 Changes: --- /work/SRC/openSUSE:Factory/nagios/nagios.changes2020-04-07 10:32:45.342610710 +0200 +++ /work/SRC/openSUSE:Factory/.nagios.new.2738/nagios.changes 2020-04-14 16:24:53.075776313 +0200 @@ -77 +77 @@ -* Fixed XSS vulnerability in Alert Summary report (CVE-2018-18245) +* Fixed XSS vulnerability in Alert Summary report (CVE-2018-18245, boo#1119832) @@ -124 +124 @@ - pointer dereference (Trevor McDonald) + pointer dereference (Trevor McDonald) (boo#1101293, boo#1101289, boo#1101290) Other differences: --
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2020-04-07 10:31:53
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new.3248 (New)
Package is "nagios"
Tue Apr 7 10:31:53 2020 rev:17 rq:791853 version:4.4.5
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2020-02-04
19:55:08.405384130 +0100
+++ /work/SRC/openSUSE:Factory/.nagios.new.3248/nagios.changes 2020-04-07
10:32:45.342610710 +0200
@@ -1,0 +2,17 @@
+Mon Apr 6 15:55:26 UTC 2020 - l...@linux-schulserver.de - 4.4.5
+
+- fix boo#1156309, CVE-2019-3698 : Symbolic Link (Symlink) following
+ vulnerability in the cronjob allows local attackers to cause cause
+ DoS or potentially escalate privileges by winning a race.
+- enhance systemd service: check nagios config before reloading
+- enable build for SLE11 by excluding some special macros and
+ directories via 'sles_version != 11' condition
+- add nagios-archive.service and nagios-archive.timer as replacement
+ for the script in cron.weekly: no need for cron on systemd systems
+- run set_permissions and verifyscript for /etc/cron.weekly on those
+ distributions that need it
+- enhance rpmlint: ignore empty htpasswd file
+- enable php apache module and not php5 on newer distributions
+- try to harden the rcnagios script
+
+---
New:
nagios-archive.service
nagios-archive.timer
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.7xvNSK/_old 2020-04-07 10:32:47.638613702 +0200
+++ /var/tmp/diff_new_pack.7xvNSK/_new 2020-04-07 10:32:47.642613707 +0200
@@ -49,6 +49,8 @@
Source11: %{name}-html-pages.tar.bz2
Source12: %{name}.service
Source13: %{name}.tmpfiles
+Source14: %{name}-archive.timer
+Source15: %{name}-archive.service
Source20: %{name}-rpmlintrc
# PATCH-FIX-UPSTREAM unescape hex characters in CGI input - avoid addional '+'
Patch3: nagios-fix_encoding_trends.cgi.patch
@@ -87,6 +89,8 @@
BuildRequires: pkgconfig(systemd)
Source100: nagios_systemd
%{?systemd_ordering}
+%else
+Recommends: cron
%endif
Provides: monitoring_daemon
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -97,10 +101,10 @@
Requires(pre): %fillup_prereq
%if 0%{?suse_version} < 01200
Requires(pre): %insserv_prereq
+Requires: cron
%endif
Requires(pre): shadow
Recommends: %{name}-www
-Recommends: cron
# this package contains shared tools with icinga
Recommends: monitoring-tools
Recommends: icinga-monitoring-tools
@@ -355,7 +359,16 @@
# sysconfig script
install -D -m 0644 %{SOURCE3} %{buildroot}%{_fillupdir}/sysconfig.%{name}
# install cronjob (gzip' the logfiles)
-install -D -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/cron.weekly/%{name}
+%if %{with systemd}
+sed -e 's|__NAGIOS_USER__|%{nagios_user}|g' \
+-e 's|__NAGIOS_GROUP__|%{nagios_group}|g' %{SOURCE4} >
%{buildroot}%{_sbindir}/nagios-archive
+install -Dm0644 %{SOURCE14} %{buildroot}/%{_unitdir}/nagios-archive.timer
+install -Dm0644 %{SOURCE15} %{buildroot}/%{_unitdir}/nagios-archive.service
+%else
+mkdir %{buildroot}%{_sysconfdir}/cron.weekly
+sed -e 's|__NAGIOS_USER__|%{nagios_user}|g' \
+-e 's|__NAGIOS_GROUP__|%{nagios_group}|g' %{SOURCE4} >
%{buildroot}%{_sysconfdir}/cron.weekly/%{name}
+%endif
# install empty htpasswd file (boo#961115)
touch %{buildroot}%{_sysconfdir}/%{name}/htpasswd.users
# important ghost files
@@ -410,7 +423,7 @@
fi
fi
%if %{with systemd}
-%service_add_pre %{name}.service
+%service_add_pre %{name}.service %{name}-archive.service %{name}-archive.timer
%endif
%post
@@ -432,31 +445,39 @@
fi
fi
%if %{with systemd}
-%service_add_post %{name}.service
+%service_add_post %{name}.service %{name}-archive.service %{name}-archive.timer
systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/%{name}.conf
%fillup_only
%else
%{fillup_and_insserv %{name}}
+%if 0%{?sles_version} != 11
+%set_permissions /etc/cron.weekly/
+%endif
+%endif
+%if 0%{?sles_version} != 11
+%set_permissions /var/spool/nagios/
%endif
-%set_permissions /var/spool/nagios
%preun
%if %{with systemd}
-%service_del_preun %{name}.service
+%service_del_preun %{name}.service %{name}-archive.service
%{name}-archive.timer
%else
%stop_on_removal %{name}
%endif
%postun
%if %{with systemd}
-%service_del_postun %{name}.service
+%service_del_postun %{name}.service %{name}-archive.service
%{name}-archive.timer
%else
%restart_on_update %{name}
%{insserv_cleanup}
%endif
%verifyscript
-%verify_permissions -e /var/spool/nagios
+%if ! %{with systemd}
+%verify_permissions -e /etc/cron.weekly/
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2020-02-04 19:55:04
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new.26092 (New)
Package is "nagios"
Tue Feb 4 19:55:04 2020 rev:16 rq:769779 version:4.4.5
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2019-12-24
14:30:27.178589970 +0100
+++ /work/SRC/openSUSE:Factory/.nagios.new.26092/nagios.changes 2020-02-04
19:55:08.405384130 +0100
@@ -1,0 +2,6 @@
+Mon Feb 3 15:07:25 UTC 2020 - Dominique Leuenberger
+
+- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to
+ shortcut through the -mini flavors.
+
+---
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.nJuyoO/_old 2020-02-04 19:55:10.589385403 +0100
+++ /var/tmp/diff_new_pack.nJuyoO/_new 2020-02-04 19:55:10.625385424 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nagios
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,7 +35,7 @@
Summary:The Nagios Network Monitor
License:GPL-2.0-or-later
Group: System/Monitoring
-Url:http://www.nagios.org/
+URL:http://www.nagios.org/
Source0:%{name}-%{version}.tar.gz
Source1:rc%{name}
Source2:%{name}-exec-start-pre
@@ -84,9 +84,9 @@
BuildRequires: unzip
BuildRequires: zlib-devel
%if %{with systemd}
-BuildRequires: systemd
+BuildRequires: pkgconfig(systemd)
Source100: nagios_systemd
-%{?systemd_requires}
+%{?systemd_ordering}
%endif
Provides: monitoring_daemon
BuildRoot: %{_tmppath}/%{name}-%{version}-build
commit nagios for openSUSE:Factory
Hello community, here is the log from the commit of package nagios for openSUSE:Factory checked in at 2019-12-24 14:30:18 Comparing /work/SRC/openSUSE:Factory/nagios (Old) and /work/SRC/openSUSE:Factory/.nagios.new.6675 (New) Package is "nagios" Tue Dec 24 14:30:18 2019 rev:15 rq:759028 version:4.4.5 Changes: --- /work/SRC/openSUSE:Factory/nagios/nagios.changes2019-11-20 12:38:15.545786929 +0100 +++ /work/SRC/openSUSE:Factory/.nagios.new.6675/nagios.changes 2019-12-24 14:30:27.178589970 +0100 @@ -1,0 +2,26 @@ +Fri Dec 20 12:51:27 UTC 2019 - Stefan Botter + +- 4.4.5 +* Reverted changes related to #625 due to CPU load issues +* Partially reverted changes for #647 due to CPU load issues +* Fixed "Quick Search" so that leading/trailing whitespace doesn't affect output (#681) (Sebastian Wolf) +* Fixed build issues on non-RPM-based platforms (#617) (T.J. Yang) + +- 4.4.4 +* Fixed log rotation logic to not repeatedly schedule rotation on a DST change (#610, #626) (Jaroslav Jindrak & Sebastian Wolf) +* Fixed $SERVICEPROBLEMID$ to be reset after service recovery (#621) (Sebastian Wolf) +* Fixed defunct worker processes appearing after nagios was reloaded (#441, #620) (Sebastian Wolf) +* Fixed main nagios thread to release nagios.qh on a closed connection (#635) (Sebastian Wolf) +* Fixed semicolon escaping to remove prepended backslash (\) (#643) (Sebastian Wolf) +* Fixed 'Checks of this host have been disabled' message showing on passive-only hosts (#632) (Vojtěch Širůček & Sebastian Wolf) +* Fixed last_hard_state showing the current hard state when service status is brokered (#633) (Sebastian Wolf) +* Fixed long plugin output (>8KB) occasionally getting truncated (#625) (Sebastian Wolf) +* Fixed check scheduling for objects with large check_intervals and small timeperiods (#647) (Sebastian Wolf) +* Fixed SOFT recoveries sending when services had HARD recovery some time after host recovery (#651) (Sebastian Wolf) +* Fixed incorrect permissions on debugging builds of FreeBSD (#420) (Sebastian Wolf) +* Fixed NEB callback lists being partially orphaned when multiple modules subscribe to one callback (#590) (Sebastian Wolf) +* Fixed memory leaks in run_async_service_check(), run_async_host_check() when checks are brokered (#664) (Sebastian Wolf) +* Fixed potential XSS in main.php, map.php (#671, #672) (Jak Gibb) +* Removed NEB brokering for nagios daemonization, since daemonization occurs before NEB initialization (#591) (Sebastian Wolf) + +--- Old: nagios-4.4.3.tar.gz New: nagios-4.4.5.tar.gz Other differences: -- ++ nagios.spec ++ --- /var/tmp/diff_new_pack.mpMbQ4/_old 2019-12-24 14:30:28.162590446 +0100 +++ /var/tmp/diff_new_pack.mpMbQ4/_new 2019-12-24 14:30:28.166590448 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -30,7 +30,7 @@ %endif Name: nagios -Version:4.4.3 +Version:4.4.5 Release:0 Summary:The Nagios Network Monitor License:GPL-2.0-or-later ++ nagios-4.4.3.tar.gz -> nagios-4.4.5.tar.gz ++ /work/SRC/openSUSE:Factory/nagios/nagios-4.4.3.tar.gz /work/SRC/openSUSE:Factory/.nagios.new.6675/nagios-4.4.5.tar.gz differ: char 5, line 1
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2019-11-20 12:38:13
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new.26869 (New)
Package is "nagios"
Wed Nov 20 12:38:13 2019 rev:14 rq:749850 version:4.4.3
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2019-09-05
12:44:46.127450506 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new.26869/nagios.changes 2019-11-20
12:38:15.545786929 +0100
@@ -1,0 +2,5 @@
+Wed Nov 13 08:28:43 UTC 2019 - Ansgar Esztermann
+
+- compile with -ffat-lto-objects to prevent build failure
+
+---
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.uuizJ4/_old 2019-11-20 12:38:16.389786580 +0100
+++ /var/tmp/diff_new_pack.uuizJ4/_new 2019-11-20 12:38:16.393786579 +0100
@@ -12,10 +12,12 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
+
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2019-09-05 12:44:41
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new.7948 (New)
Package is "nagios"
Thu Sep 5 12:44:41 2019 rev:13 rq:728283 version:4.4.3
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2019-04-22
12:26:38.228956048 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new.7948/nagios.changes 2019-09-05
12:44:46.127450506 +0200
@@ -1,0 +2,6 @@
+Tue Aug 20 11:54:43 CEST 2019 - ku...@suse.de
+
+- Add /etc/cron.weekly to filelist, as this is now part of cron,
+ which we don't want to require
+
+---
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.ZwFI5V/_old 2019-09-05 12:44:47.911450156 +0200
+++ /var/tmp/diff_new_pack.ZwFI5V/_new 2019-09-05 12:44:47.915450156 +0200
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -96,7 +96,7 @@
%if 0%{?suse_version} < 01200
Requires(pre): %insserv_prereq
%endif
-Requires(pre): pwdutils
+Requires(pre): shadow
Recommends: %{name}-www
Recommends: cron
# this package contains shared tools with icinga
@@ -145,7 +145,7 @@
Requires(pre): sed
%if 0%{?suse_version}
Requires(pre): apache2
-Requires(pre): pwdutils
+Requires(pre): shadow
%else
Requires(pre): httpd
Requires(pre): shadow-utils
@@ -538,6 +538,7 @@
%ghost %dir %{nslockfile_dir}
%attr(0644,%{nagios_user},%{nagios_group}) %verify(not md5 size mtime) %ghost
%config(missingok,noreplace) %{nslockfile}
%endif
+%dir %{_sysconfdir}/cron.weekly
%attr(0755,root,root) %{_sysconfdir}/cron.weekly/*
%config(noreplace) %{nagios_sysconfdir}/*.cfg
%config(noreplace) %{nagios_sysconfdir}/objects/*.cfg
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2019-04-22 12:26:34
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new.5536 (New)
Package is "nagios"
Mon Apr 22 12:26:34 2019 rev:12 rq:696474 version:4.4.3
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2019-01-24
14:14:56.867256217 +0100
+++ /work/SRC/openSUSE:Factory/.nagios.new.5536/nagios.changes 2019-04-22
12:26:38.228956048 +0200
@@ -1,0 +2,5 @@
+Sat Apr 20 06:25:38 UTC 2019 - Stefan
+
+- revert setting of sbindir back to nagios_cgidir
+
+---
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.8MgmMX/_old 2019-04-22 12:26:40.104955317 +0200
+++ /var/tmp/diff_new_pack.8MgmMX/_new 2019-04-22 12:26:40.108955316 +0200
@@ -258,7 +258,7 @@
--prefix=%{_prefix} \
--exec-prefix=%{_sbindir} \
--bindir=%{_sbindir} \
- --sbindir=%{_sbindir} \
+ --sbindir=%{nagios_cgidir} \
--libexecdir=%{nagios_plugindir} \
--datadir=%{nagios_datadir} \
--sysconfdir=%{nagios_sysconfdir} \
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2019-01-24 14:14:56
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new.28833 (New)
Package is "nagios"
Thu Jan 24 14:14:56 2019 rev:11 rq:667956 version:4.4.3
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2018-10-23
20:42:44.840375361 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new.28833/nagios.changes 2019-01-24
14:14:56.867256217 +0100
@@ -1,0 +2,39 @@
+Sun Jan 20 08:48:24 UTC 2019 - o...@botter.cc - 4.4.3
+
+- update to 4.4.3
+* Fixed services sending recovery emails when they recover if host in
+ down state (#572) (Scott Wilkerson)
+* Fixed a make error when building on the aarch64 architecture (#598)
+ (Gareth Randall)
+* Fixed --with-cgibindir and --with-webdir to actually set values given
+ (#585) (lawsontyler)
+* Fixed soft recovery states for services (#575) (Jake Omann)
+* Fixed XSS vulnerability in Alert Summary report (CVE-2018-18245)
+ (Jake Omann)
+* Fixed services in soft states sometimes not switching into hard states
+ (#576) (Jake Omann)
+* Fixed last_state_change to update when a state goes from soft -> hard
+ state (#592) (Jake Omann)
+* Fixed Map link always being set to undefined host and don't show link
+ for Nagios Process root note (#539) (Jake Omann)
+* Fixed notifications sending when services went into hard state on a
+ down or unreachable host (#584) (Jake Omann)
+* Fixed log_host_retries not logging the host soft state checks (#599)
+ (Jake Omann)
+* Fixed stalking_options N option to properly log only when a
+ notification is actually sent (#604) (Jake Omann)
+* Fixed issue with service status totals being zero when
+ servicegroup=all on servicegroup status page (#579) (Jake Omann)
+* Fixed escalation notifications logic and recovery notifications not
+ going out (#582) (Jake Omann)
+* Fixed not finding child index causing duplicate hosts showing in the
+ Map (#471) (Jake Omann)
+* Fixed Map configuration popup checkboxes not working and Root Node
+ not populating (#543) (Jake Omann)
+* Fixed cleanup and deinit of neb modules on reload (#573) (Jake Omann)
+
+- rebase nagios-4.2.2-enable-ppc64le.patch (allow ppc64le builds in
+ contrib Makefile) to:
+ nagios-4.4.3-enable-ppc64le.patch
+
+---
Old:
nagios-4.2.2-enable-ppc64le.patch
nagios-4.4.2.tar.gz
New:
nagios-4.4.3-enable-ppc64le.patch
nagios-4.4.3.tar.gz
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.w2kv2G/_old 2019-01-24 14:14:57.483255504 +0100
+++ /var/tmp/diff_new_pack.w2kv2G/_new 2019-01-24 14:14:57.483255504 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nagios
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -28,7 +28,7 @@
%endif
Name: nagios
-Version:4.4.2
+Version:4.4.3
Release:0
Summary:The Nagios Network Monitor
License:GPL-2.0-or-later
@@ -61,7 +61,7 @@
# PATCH-FIX-OPENSUSE use KOHANNA if available
Patch17:nagios-4.1.0-add_KOHANNA.conf
# PATCH-FIX-UPSTREAM allow ppc64le builds in contrib Makefile
-Patch18:nagios-4.2.2-enable-ppc64le.patch
+Patch18:nagios-4.4.3-enable-ppc64le.patch
BuildRequires: doxygen
# yes: we still build for SLE10
%if 0%{?suse_version} > 1020
@@ -106,6 +106,7 @@
%else
Requires(pre): shadow-utils
%endif
+Requires(pre): permissions
Requires(pre): sed
Requires: mailx
%define nslockfile_dir /var/run/%{name}
@@ -257,12 +258,13 @@
--prefix=%{_prefix} \
--exec-prefix=%{_sbindir} \
--bindir=%{_sbindir} \
- --sbindir=%{nagios_cgidir} \
+ --sbindir=%{_sbindir} \
--libexecdir=%{nagios_plugindir} \
--datadir=%{nagios_datadir} \
--sysconfdir=%{nagios_sysconfdir} \
--with-init-dir=%{_sysconfdir}/init.d \
--localstatedir=%{nagios_localstatedir} \
+ --with-cgibindir=%{nagios_cgidir} \
--with-cgiurl=/%{name}/cgi-bin \
--with-htmurl=/%{name} \
--with-httpd-conf=%{apache2_sysconfdir} \
@@ -434,6 +436,7 @@
%else
%{fillup_and_insserv %{name}}
%endif
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2018-10-23 20:42:05
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is "nagios"
Tue Oct 23 20:42:05 2018 rev:10 rq:643969 version:4.4.2
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2018-10-18
15:39:11.470102365 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2018-10-23
20:42:44.840375361 +0200
@@ -1,0 +2,6 @@
+Mon Oct 15 08:38:12 UTC 2018 - aesz...@gwdg.de
+
+- install /var/spool/nagios setgid nagcmd so external applications
+ like the webinterface can issue commands to nagios (boo#1028975)
+
+---
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.VtujCn/_old 2018-10-23 20:42:45.544374520 +0200
+++ /var/tmp/diff_new_pack.VtujCn/_new 2018-10-23 20:42:45.544374520 +0200
@@ -539,7 +539,7 @@
# directories with special handling:
%attr(0755,root,%{nagios_command_group}) %dir %{nagios_sysconfdir}
%attr(0755,root,%{nagios_command_group}) %dir
%{nagios_sysconfdir}/objects
-%attr(0775,%{nagios_user},%{nagios_command_group}) %dir %{nagios_spooldir}
+%attr(2775,%{nagios_user},%{nagios_command_group}) %dir %{nagios_spooldir}
%attr(0775,%{nagios_user},%{nagios_command_group}) %dir %{nagios_localstatedir}
%attr(0755,%{nagios_user},%{nagios_group}) %dir %{nagios_logdir}
%attr(0755,%{nagios_user},%{nagios_group}) %dir
%{nagios_logdir}/archives
commit nagios for openSUSE:Factory
Hello community, here is the log from the commit of package nagios for openSUSE:Factory checked in at 2018-10-18 15:38:56 Comparing /work/SRC/openSUSE:Factory/nagios (Old) and /work/SRC/openSUSE:Factory/.nagios.new (New) Package is "nagios" Thu Oct 18 15:38:56 2018 rev:9 rq:642789 version:4.4.2 Changes: --- /work/SRC/openSUSE:Factory/nagios/nagios.changes2018-06-13 15:37:38.252430708 +0200 +++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2018-10-18 15:39:11.470102365 +0200 @@ -1,0 +2,99 @@ +Mon Oct 15 07:55:03 UTC 2018 - l...@linux-schulserver.de - 4.4.2 + +- update to 4.4.2 +* Fix comment data being duplicated after a `service nagios reload` + or similar (#549) (Bryan Heden) +* Fix check_interval and retry_interval not changing at the + appropriate times (#551) (Scott Wilkerson) +* Fixed passive checks sending recovery email when host was + previously UP (#552) (Scott Wilkerson) +* Fixed flapping comments duplication on nagios reload (#554) + (Christian Jung) +* Fix for CVE-2018-13441, CVE-2018-13458, CVE-2018-13457 null + pointer dereference (Trevor McDonald) +* Fixed syntax error in file: default-init.in (#558) (Christian Zettel) +* Reset current notification number and state flags when the host recovers, + reset all service variables when they recover fixes (#557) (Scott Wilkerson) +* Fixed wrong counting of service status totals when showing + servicegroup details (#548) (Christian Zettel, Bryan Heden) +* Fixed avail.cgi not printing CSV output when checkbox is checked + (for any type: host/service/hostgroup/servicegroup) (#570) (Bryan Heden) +* Fixed nagios not logging SOFT state changes after 1 (Scott Wilkerson) + +4.4.1 - 2018-06-25 +-- +* Revert some macro->kvvec changes causing problems when + `enable_environment_macros` was enabled (Bryan Heden) +* Adjust `process_macro_r` function logic so that it handles + macros properly (Bryan Heden) +* Fix spec file for systemd (Karsten Weiss, Fr3dY, Bryan Heden) +* Fix bug where `ssize_t` typedef to int on some systems (Bryan Heden) + +4.4.0 - 2018-06-19 +-- +ENHANCEMENTS +* new status for check dependencies (John Frickson) +* Allow more flexible requirements for comments (John Frickson) +* Add a `statusCRITICALACK` class for the status column (John Frickson) +* CSV output based on groups (all options) (John Frickson) +* New Macro(s) to generate URL for host / service object to be + used in notifications (John Frickson) +* New Macro(s) to determine if host/service notifications are + enabled (#419) (Bryan Heden) +* New Macro(s) for obtaining the host/service notification + periods (#350) (Bryan Heden) +* enable_page_tour interface option (Bryan Heden) +* Code cleanups in important sections (Workers, Handling Results) (Bryan Heden) +* Automatic mail program detection (with same /bin/mail failback) (Bryan Heden) +* Incorporated [autoconf-macros](https://github.com/NagiosEnterprises/autoconf-macros) + into Core (Bryan Heden) +* Lots of enhancements/additions to configure/make process. (Bryan Heden) + + Moved all files to startup/ + + Added upstart job +* Added system limit detection (RLIMIT_NPROC) to check for anticipated + fork() failures (#434) (Bryan Heden) +* Added stalking on notifications (`N` or `notifications` option when + specifying `stalking_options`) (#342) (Bryan Heden) +* Added automatic `systemctl daemon-reload` and `initctl reload-configuration` + where applicable on `make install-init` (Bryan Heden) +* Added case-insentive command submission. (#373) (Bryan Heden) +* Enabled `check_external_commands` by default (Bryan Heden) +FIXES +* Command line macro detection skips potential macros with no ending + dollar sign (Bryan Heden, Jake Omann) +* Fixed a lockup condition sometimes encountered on shutdown or restart (Aaron Beck) +* Fixed negative time offset calculations computing incorrectly sometimes (bbeutel) +* Fixed reloads causing defunct (zombie) processes (#441) (Bryan Heden) +* Fixed wait3(), wait4() implementations (replaced with waitpid()) (#326) (Bryan Heden) +* Fixed additive inheritance not testing for duplicates in + hosts/services/(+escalations) (#392) (Bryan Heden) +* Fixed very very (around 600k chars or greater) large plugin + output crashing Nagios (#432) (Bryan Heden) +* Fixed first_notification_delay not beeing calculated from + last_hard_state_change (#425) (Christian Zettel) +* Fixed duplicate downtime ID occuring from downtimes in retention + file (#506) (Franz [feisenko]) +* Fixed segfault when navbarsearch was used in status.cgi for something + other than a host (#489) (Bryan Heden) +* Fixed some miscellaneous ./configure issues on Solaris (Bryan Heden, Troy Lea) +* Fixed "Locate host on map" link (#496) (Troy Lea) +* Fixed service groups defined with
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2018-06-13 15:36:04
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is "nagios"
Wed Jun 13 15:36:04 2018 rev:8 rq:614948 version:4.3.4
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2018-03-12
12:12:32.765708042 +0100
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2018-06-13
15:37:38.252430708 +0200
@@ -1,0 +2,5 @@
+Tue Jun 5 23:42:39 UTC 2018 - adaugher...@tamu.edu
+
+- fix setting default values in nagios-exec-start-pre
+
+---
Other differences:
--
++ nagios-exec-start-pre ++
--- /var/tmp/diff_new_pack.Z3HDFG/_old 2018-06-13 15:37:39.352390227 +0200
+++ /var/tmp/diff_new_pack.Z3HDFG/_new 2018-06-13 15:37:39.356390080 +0200
@@ -32,18 +32,18 @@
temp_path="$(get_var temp_path)"
# use default values if above check doesn't work
-: ${check_result_path:-/var/spool/nagios}
-: ${command_file:-/var/spool/nagios/nagios.cmd}
-: ${lock_file:-/var/run/nagios/nagios.pid}
-: ${log_file:-/var/log/nagios/nagios.log}
-: ${nagios_user:-nagios}
-: ${nagios_group:-nagios}
-: ${nagios_cmdgrp:-nagcmd}
-: ${resource_file:-/etc/nagios/resource.cfg}
-: ${state_retention_file:-/var/log/nagios/retention.dat}
-: ${status_file:-/var/log/nagios/status.dat}
-: ${temp_file:-/var/log/nagios/nagios.tmp}
-: ${temp_path:-/var/run/nagios/tmp}
+: ${check_result_path:=/var/spool/nagios}
+: ${command_file:=/var/spool/nagios/nagios.cmd}
+: ${lock_file:=/var/run/nagios/nagios.pid}
+: ${log_file:=/var/log/nagios/nagios.log}
+: ${nagios_user:=nagios}
+: ${nagios_group:=nagios}
+: ${nagios_cmdgrp:=nagcmd}
+: ${resource_file:=/etc/nagios/resource.cfg}
+: ${state_retention_file:=/var/log/nagios/retention.dat}
+: ${status_file:=/var/log/nagios/status.dat}
+: ${temp_file:=/var/log/nagios/nagios.tmp}
+: ${temp_path:=/var/run/nagios/tmp}
# remove some perhaps left over files
for file in "$command_file" "$lock_file" "$status_file" "$temp_file"; do
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2018-03-12 12:12:24
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is "nagios"
Mon Mar 12 12:12:24 2018 rev:7 rq:585448 version:4.3.4
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2018-02-09
15:53:35.662357599 +0100
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2018-03-12
12:12:32.765708042 +0100
@@ -1,0 +2,5 @@
+Thu Mar 8 20:54:38 UTC 2018 - crrodrig...@opensuse.org
+
+- remove unused xorg-x11-devel BuildRequires
+
+---
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.IbJQX1/_old 2018-03-12 12:12:35.301617568 +0100
+++ /var/tmp/diff_new_pack.IbJQX1/_new 2018-03-12 12:12:35.305617425 +0100
@@ -31,7 +31,7 @@
Version:4.3.4
Release:0
Summary:The Nagios Network Monitor
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: System/Monitoring
Url:http://www.nagios.org/
Source0:%{name}-%{version}.tar.gz
@@ -111,7 +111,6 @@
Requires(pre): shadow-utils
%endif
Requires(pre): sed
-BuildRequires: xorg-x11-devel
Requires: mailx
%define nslockfile_dir /var/run/%{name}
%define nslockfile %nslockfile_dir/%{name}.pid
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2018-02-09 15:53:34
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is "nagios"
Fri Feb 9 15:53:34 2018 rev:6 rq:574641 version:4.3.4
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2017-12-06
09:00:45.524220157 +0100
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2018-02-09
15:53:35.662357599 +0100
@@ -1,0 +2,6 @@
+Tue Jan 30 09:16:07 UTC 2018 - o...@botter.cc
+
+- fix upstream issue #455, memleak introduced with 4.3.3
+ nagios-4.3.4-fix_memleak_4.3.3.diff
+
+---
New:
nagios-4.3.4-fix_memleak_4.3.3.diff
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.OptTCK/_old 2018-02-09 15:53:37.010309181 +0100
+++ /var/tmp/diff_new_pack.OptTCK/_new 2018-02-09 15:53:37.010309181 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nagios
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -64,6 +64,8 @@
Patch17:nagios-4.1.0-add_KOHANNA.conf
# PATCH-FIX-UPSTREAM allow ppc64le builds in contrib Makefile
Patch18:nagios-4.2.2-enable-ppc64le.patch
+# PATCH-FIX-UPSTREAM fix memleak in macros.c introduced with 4.3.3
+Patch19:nagios-4.3.4-fix_memleak_4.3.3.diff
BuildRequires: doxygen
# yes: we still build for SLE10
%if 0%{?suse_version} > 1020
@@ -237,6 +239,7 @@
%patch16 -p1
%patch17 -p1
%patch18 -p1
+%patch19 -p1
find -name ".gitignore" | xargs rm
# fixing permissions the dirty way
chmod 644 Changelog LEGAL LICENSE README sample-config/README
sample-config/template-object/README
++ nagios-4.3.4-fix_memleak_4.3.3.diff ++
diff --git a/common/macros.c b/common/macros.c
index c864939c..b98c9d43 100644
--- a/common/macros.c
+++ b/common/macros.c
@@ -2954,6 +2954,7 @@ int clear_service_macros_r(nagios_macros *mac) {
my_free(mac->x[MACRO_SERVICEACTIONURL]);
my_free(mac->x[MACRO_SERVICENOTESURL]);
my_free(mac->x[MACRO_SERVICENOTES]);
+ my_free(mac->x[MACRO_SERVICEINFOURL]);
my_free(mac->x[MACRO_SERVICEGROUPNAMES]);
@@ -2977,6 +2978,7 @@ int clear_host_macros_r(nagios_macros *mac) {
my_free(mac->x[MACRO_HOSTACTIONURL]);
my_free(mac->x[MACRO_HOSTNOTESURL]);
my_free(mac->x[MACRO_HOSTNOTES]);
+ my_free(mac->x[MACRO_HOSTINFOURL]);
/* numbers or by necessity autogenerated strings */
my_free(mac->x[MACRO_HOSTGROUPNAMES]);
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2017-12-06 09:00:42
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is "nagios"
Wed Dec 6 09:00:42 2017 rev:5 rq:548947 version:4.3.4
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2017-12-05
01:29:47.866258358 +0100
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2017-12-06
09:00:45.524220157 +0100
@@ -1,0 +2,6 @@
+Fri Dec 1 23:39:38 UTC 2017 - l...@linux-schulserver.de
+
+- update to 4.1.0 fixed boo#939829 already, mentioned here just
+ for reference
+
+---
@@ -8,0 +15,6 @@
+
+---
+Thu Nov 23 13:50:57 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new
+ %_fillupdir macro (boo#1069468)
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.VaOXWm/_old 2017-12-06 09:00:46.756175063 +0100
+++ /var/tmp/diff_new_pack.VaOXWm/_new 2017-12-06 09:00:46.756175063 +0100
@@ -16,6 +16,11 @@
#
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+ %define _fillupdir /var/adm/fillup-templates
+%endif
+
%if 0%{?suse_version} >= 1230
%bcond_without systemd
%else
@@ -348,7 +353,7 @@
touch %{buildroot}%{nslockfile}
%endif
# sysconfig script
-install -D -m 0644 %{SOURCE3}
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+install -D -m 0644 %{SOURCE3} %{buildroot}%{_fillupdir}/sysconfig.%{name}
# install cronjob (gzip' the logfiles)
install -D -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/cron.weekly/%{name}
# install empty htpasswd file (boo#961115)
@@ -521,7 +526,7 @@
%attr(0755,root,root) %{_sbindir}/rc%{name}
%attr(0755,root,root) %{_sbindir}/upgrade_nagios
%{_mandir}/man8/upgrade_nagios.8*
-%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+%{_fillupdir}/sysconfig.%{name}
%if %{with systemd}
%attr(0755,root,root) %{nagios_libdir}/%{name}-exec-start-pre
%{_unitdir}/%{name}.service
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2017-12-05 01:29:43
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is "nagios"
Tue Dec 5 01:29:43 2017 rev:4 rq:547323 version:4.3.4
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2017-10-17
01:53:21.328080958 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2017-12-05
01:29:47.866258358 +0100
@@ -1,0 +2,9 @@
+Fri Dec 1 22:19:07 UTC 2017 - l...@linux-schulserver.de
+
+- fix a possible symlink attack for files/dirs created by root
+ fixes CVE-2016-8641 (bsc#1011630 and bsc#1018047)
+- remove the pre-configured administrative account with fixed
+ password from the htpasswd file and provide an empty one instead
+ (fixes boo#961115 - CVE-2016-0726)
+
+---
Old:
nagios-htpasswd.users
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.0Lgsz6/_old 2017-12-05 01:29:49.934183232 +0100
+++ /var/tmp/diff_new_pack.0Lgsz6/_new 2017-12-05 01:29:49.938183086 +0100
@@ -36,7 +36,6 @@
Source4:suse.de-nagios
Source5:nagios.8
Source6:nagiosstats.8
-Source7:nagios-htpasswd.users
Source8:upgrade_nagios.sh
Source9:upgrade_nagios.8
Source10: %{name}-README.SuSE
@@ -352,8 +351,8 @@
install -D -m 0644 %{SOURCE3}
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
# install cronjob (gzip' the logfiles)
install -D -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/cron.weekly/%{name}
-# install htpasswd file
-install -m 0640 %{SOURCE7} %{buildroot}%{_sysconfdir}/%{name}/htpasswd.users
+# install empty htpasswd file (boo#961115)
+touch %{buildroot}%{_sysconfdir}/%{name}/htpasswd.users
# important ghost files
touch %{buildroot}%{nagios_state_retention_file}
touch %{buildroot}%{nagios_status_file}
++ nagios-README.SuSE ++
--- /var/tmp/diff_new_pack.0Lgsz6/_old 2017-12-05 01:29:49.986181343 +0100
+++ /var/tmp/diff_new_pack.0Lgsz6/_new 2017-12-05 01:29:49.986181343 +0100
@@ -18,7 +18,7 @@
* htpasswd2 -c SYSCONFDIR/htpasswd.users nagiosadmin
* And set the correct rights for this file:
* chmod 640 SYSCONFDIR/htpasswd.users
-* chown root:www SYSCONFDIR/htpasswd.users
+* chown --no-dereference root:www SYSCONFDIR/htpasswd.users
*
* You should also add a mail alias for the nagiosadmin to your
* /etc/aliases file like:
++ nagios-exec-start-pre ++
--- /var/tmp/diff_new_pack.0Lgsz6/_old 2017-12-05 01:29:50.002180762 +0100
+++ /var/tmp/diff_new_pack.0Lgsz6/_new 2017-12-05 01:29:50.006180616 +0100
@@ -54,7 +54,7 @@
if [ ! -e "$file" ]; then
touch "$file"
fi
-chown ${nagios_user}:${nagios_cmdgrp} "$file"
+chown --no-dereference ${nagios_user}:${nagios_cmdgrp} "$file"
done
for dir in "$check_result_path" $(dirname "$status_file"); do
install -d -m755 -o${nagios_user} -g${nagios_cmdgrp} "$dir"
@@ -76,4 +76,4 @@
;;
esac
chmod 660 "$resource_file"
-chown ${nagios_user}:${nagios_cmdgrp} "$resource_file"
+chown --no-dereference ${nagios_user}:${nagios_cmdgrp} "$resource_file"
++ rcnagios ++
--- /var/tmp/diff_new_pack.0Lgsz6/_old 2017-12-05 01:29:50.106176983 +0100
+++ /var/tmp/diff_new_pack.0Lgsz6/_new 2017-12-05 01:29:50.106176983 +0100
@@ -83,16 +83,16 @@
if [ ! -e "$file" ]; then
touch "$file"
fi
- chown $nagios_user:$nagios_cmdgrp "$file"
+ chown --no-dereference $nagios_user:$nagios_cmdgrp "$file"
done
for dir in "$check_result_path" $(dirname $status_file); do
if [ ! -d "$dir" ]; then
mkdir -p "$dir"
fi
- chown $nagios_user:$nagios_cmdgrp "$dir"
+ chown --no-dereference $nagios_user:$nagios_cmdgrp "$dir"
done
chmod 660 "$resource_file"
-chown $nagios_user:$nagios_cmdgrp "$resource_file"
+chown --no-dereference $nagios_user:$nagios_cmdgrp "$resource_file"
}
check_lock_file() {
@@ -200,8 +200,8 @@
sleep 1
NAGIOS_TIMEOUT=$(($NAGIOS_TIMEOUT-1))
done
-chgrp $nagios_cmdgrp "$command_file"
-chown $nagios_user:$nagios_cmdgrp "$check_result_path"
+chgrp --no-dereference $nagios_cmdgrp "$command_file"
+chown --no-dereference $nagios_user:$nagios_cmdgrp
"$check_result_path"
fi
else
echo "Error in configuration - please read $NAGIOS_CFG_ERR_LOG"
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2017-10-17 01:53:20
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is "nagios"
Tue Oct 17 01:53:20 2017 rev:3 rq:534166 version:4.3.4
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2017-10-11
23:03:42.486712284 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2017-10-17
01:53:21.328080958 +0200
@@ -1,0 +2,6 @@
+Thu Oct 12 14:45:16 CEST 2017 - sbra...@suse.com
+
+- Do not introduce new RPM group just for nagios-contrib.
+ Use established Development/Tools/Other instead.
+
+---
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.l3uoBF/_old 2017-10-17 01:53:22.852009580 +0200
+++ /var/tmp/diff_new_pack.l3uoBF/_new 2017-10-17 01:53:22.856009392 +0200
@@ -200,7 +200,7 @@
%package contrib
Summary:Files from the contrib directory
-Group: Development/Utils
+Group: Development/Tools/Other
Requires: %{name} = %{version}
%description contrib
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2017-10-11 23:03:37
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is "nagios"
Wed Oct 11 23:03:37 2017 rev:2 rq:533189 version:4.3.4
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2017-08-30
16:21:13.378202601 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2017-10-11
23:03:42.486712284 +0200
@@ -1,0 +2,19 @@
+Wed Sep 13 07:59:39 UTC 2017 - l...@linux-schulserver.de
+
+- update to 4.3.4
+ * Improved config file parsing (Mark Felder)
+ * Fixed configure script to check for existence of /run for lock
+file (in regards to CVE-2017-12847, Bryan Heden)
+ * Use absolute paths when deleting check results files (Emmanuel Dreyfus)
+ * Add sanity checking in reassign_worker (sq5bpf)
+ * xodtemplate.c wrong option-deprecation code warning (alex2grad / John
Frickson)
+ * On-demand host check always use cached host state (John Frickson)
+ * 'á' causes Serivce Status Information to not be displayed (John Frickson)
+ * New Macro(s) to generate URL for host / service object (John Frickson)
+ * Fix minor map issues (Troy Lea)
+ * Fix lockfile issues (Bryan Heden)
+ * Switch order of daemon_init and drop_priveleges (CVE-2017-12847, Bryan
Heden)
+ * Add an OpenRC init script (Michael Orlitzky)
+- only require insserv on older SUSE distributions
+
+---
Old:
nagios-4.3.2.tar.gz
New:
nagios-4.3.4.tar.gz
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.A8xB01/_old 2017-10-11 23:03:43.862652000 +0200
+++ /var/tmp/diff_new_pack.A8xB01/_new 2017-10-11 23:03:43.866651826 +0200
@@ -1,8 +1,7 @@
#
# spec file for package nagios
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2015-2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +23,7 @@
%endif
Name: nagios
-Version:4.3.2
+Version:4.3.4
Release:0
Summary:The Nagios Network Monitor
License:GPL-2.0+
@@ -66,7 +65,6 @@
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
-BuildRequires: unzip
BuildRequires: bzip2
BuildRequires: freetype2-devel
BuildRequires: gd-devel
@@ -79,6 +77,7 @@
BuildRequires: net-tools
BuildRequires: openssl-devel
BuildRequires: pcre-devel
+BuildRequires: unzip
BuildRequires: zlib-devel
%if %{with systemd}
BuildRequires: systemd
@@ -92,7 +91,9 @@
Requires(pre): grep
%if 0%{?suse_version}
Requires(pre): %fillup_prereq
+%if 0%{?suse_version} < 01200
Requires(pre): %insserv_prereq
+%endif
Requires(pre): pwdutils
Recommends: %{name}-www
Recommends: cron
@@ -148,7 +149,6 @@
Requires(pre): shadow-utils
%endif
-
%description www
Nagios is a program that will monitor hosts and services on your
network. It has the ability to email or page you when a problem arises
@@ -447,8 +447,8 @@
%service_del_postun %{name}.service
%else
%restart_on_update %{name}
-%endif
%{insserv_cleanup}
+%endif
%post www
wwwusr=%{nagios_command_user}
++ nagios-4.3.2.tar.gz -> nagios-4.3.4.tar.gz ++
/work/SRC/openSUSE:Factory/nagios/nagios-4.3.2.tar.gz
/work/SRC/openSUSE:Factory/.nagios.new/nagios-4.3.4.tar.gz differ: char 5, line
1
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2014-06-19 13:20:05
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is nagios
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2014-05-06
14:02:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2014-06-19
13:20:13.0 +0200
@@ -1,0 +2,25 @@
+Thu Jun 5 16:00:00 UTC 2014 - l...@linux-schulserver.de
+
+- use systemctl on newer distributions (bnc #881289)
+
+---
+Tue Jun 3 17:56:51 UTC 2014 - l...@linux-schulserver.de
+
+- update to 4.0.7:
+ ENHANCEMENTS
+ * Added value of custom variables to Object JSON output for hosts,
+services and contacts (Eric Stanley)
+ FIXES
+ * Fixed bug #616: Unescape plugin output read from checkresult files,
+fix multiline perf data concatenation, and avoid extra memory
+allocation and copies. (Eric Mislivec)
+ * Fixed bug #609: Image on home page doesn't have correct image
+path prefix. (Derek Brewer)
+ * Fixed bug #608: Extra newline in service check timeout
+output string. (Mauno Pihelgas)
+ * Fixed bug #596: Crashes checking contact authorization for host
+escalations. (Alexey Dvoryanchikov - duplicates #590, #586)
+ * Fixed bug #496: Syntax error in exfoliation's common.css.
+(Karsten Weiss)
+
+---
Old:
nagios-4.0.6.tar.bz2
New:
nagios-4.0.7.tar.bz2
nagios-exec-start-pre
nagios.service
nagios.tmpfiles
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.msWoEB/_old 2014-06-19 13:20:14.0 +0200
+++ /var/tmp/diff_new_pack.msWoEB/_new 2014-06-19 13:20:14.0 +0200
@@ -16,8 +16,14 @@
#
+%if 0%{?suse_version} = 1230
+%bcond_without systemd
+%else
+%bcond_with systemd
+%endif
+
Name: nagios
-Version:4.0.6
+Version:4.0.7
Release:0
Summary:The Nagios Network Monitor
License:GPL-2.0+
@@ -25,6 +31,7 @@
Url:http://www.nagios.org/
Source0:%{name}-%{version}.tar.bz2
Source1:rc%{name}
+Source2:%{name}-exec-start-pre
Source3:%{name}.sysconfig
Source4:suse.de-nagios
Source5:nagios.8
@@ -34,6 +41,8 @@
Source9:upgrade_nagios.8
Source10: %{name}-README.SuSE
Source11: %{name}-html-pages.tar.bz2
+Source12: %{name}.service
+Source13: %{name}.tmpfiles
Source20: %{name}-rpmlintrc
# PATCH-FIX-UPSTREAM Fixes the output of spurious $ signs in commandoutput
(deb#480001)
Patch2: nagios-fix_spurious_dollar_signs_added_to_command_lines.patch
@@ -65,6 +74,10 @@
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: zlib-devel
+%if %{with systemd}
+BuildRequires: systemd
+%{?systemd_requires}
+%endif
Provides: monitoring_daemon
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(pre): %fillup_prereq
@@ -310,8 +323,16 @@
# install SuSE specials
#
# init-script
+%if %{with systemd}
+ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}
+install -D -m0755 %{SOURCE2}
%{buildroot}/%{nagios_libdir}/%{name}-exec-start-pre
+install -D -m0644 %{SOURCE12} %{buildroot}/%{_unitdir}/%{name}.service
+install -D -m0644 %{SOURCE13}
%{buildroot}/%{_prefix}/lib/tmpfiles.d/%{name}.conf
+%else
install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{name}
ln -sf ../../etc/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name}
+touch %{buildroot}%{nslockfile}
+%endif
# sysconfig script
install -D -m 0644 %{SOURCE3}
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
# install cronjob (gzip' the logfiles)
@@ -322,7 +343,6 @@
touch %{buildroot}%{nagios_state_retention_file}
touch %{buildroot}%{nagios_status_file}
touch %{buildroot}%{nagios_logdir}/config.err
-touch %{buildroot}%{nslockfile}
# install manpages
install -Dm644 %{SOURCE5} %{buildroot}%{_mandir}/man8/%{name}.8
install -Dm644 %{SOURCE6} %{buildroot}%{_mandir}/man8/nagiostats.8
@@ -384,6 +404,9 @@
%{nnmmsg} Added %{nagios_user} to %{nagios_command_group}
fi
fi
+%if %{with systemd}
+%service_add_pre %{name}.service
+%endif
%post
# Update ?
@@ -403,13 +426,27 @@
fi
fi
fi
-%{fillup_and_insserv nagios}
+%if %{with systemd}
+%service_add_post %{name}.service
+systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/%{name}.conf
+%fillup_only
+%else
+%{fillup_and_insserv %{name}}
+%endif
%preun
+%if %{with systemd}
+%service_del_preun %{name}.service
+%else
%stop_on_removal %{name}
+%endif
%postun
+%if
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2014-05-06 14:02:14
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is nagios
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2014-04-15
11:46:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2014-05-06
14:02:16.0 +0200
@@ -1,0 +2,19 @@
+Sat May 3 18:27:45 UTC 2014 - l...@linux-schulserver.de
+
+- update to 4.0.6:
+ ENHANCEMENTS
+ * Added name of authenticated user to JSON CGI results object
+ * Added Nagios Core version to the Status JSON CGI programstatus query
+ * Added daemon status to main page
+ FIXES
+ * Fixed bug #600: Service Check Timeout State always returns OK (0) status
+ * Fixed bug #583: Status Check Output of (No output on stdout) stderr
+ * Fixed bug #573: Service checks returns (No output on stdout) stderr
+ * Fixed bug #438: Reloads during downtime causes wrong availability
+ calculations
+ * Fixed feed updates when daemon can not access external networks
+ * Archive JSON: Fixed bugs calculating availability
+ * Archive JSON: Allow missing logs to be skipped
+- refreshed patches to apply with latest source
+
+---
Old:
nagios-4.0.4-remove-date-time.patch
nagios-4.0.5.tar.bz2
New:
nagios-4.0.6-remove-date-time.patch
nagios-4.0.6.tar.bz2
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.1rre8V/_old 2014-05-06 14:02:17.0 +0200
+++ /var/tmp/diff_new_pack.1rre8V/_new 2014-05-06 14:02:17.0 +0200
@@ -17,7 +17,7 @@
Name: nagios
-Version:4.0.5
+Version:4.0.6
Release:0
Summary:The Nagios Network Monitor
License:GPL-2.0+
@@ -43,9 +43,10 @@
Patch4: nagios-random_data.patch
# PATCH-FIX-OPENSUSE disable Nagios online update checks for distributed
packages
Patch11:nagios-disable_phone_home.patch
-Patch12:nagios-4.0.4-remove-date-time.patch
# PATCH-FIX-UPSTREAM fix against CVE-2014-1878
Patch13:nagios-CVE-2014-1878.patch
+# PATCH-FIX-OPENSUSE fake compile time in json sources to avoid problems in OBS
+Patch14:nagios-4.0.6-remove-date-time.patch
BuildRequires: doxygen
# yes: we still build for SLE10
%if 0%{?suse_version} 1020
@@ -198,12 +199,12 @@
%prep
%setup -q
-%patch2 -p0
-%patch3 -p0
+%patch2 -p1
+%patch3 -p1
%patch4 -p1
%patch11 -p1
-%patch12 -p1
%patch13 -p1
+%patch14 -p1
find -name .gitignore | xargs rm
# fixing permissions the dirty way
chmod 644 Changelog LEGAL LICENSE README sample-config/README
sample-config/template-object/README
++ nagios-4.0.4-remove-date-time.patch -
nagios-4.0.6-remove-date-time.patch ++
--- /work/SRC/openSUSE:Factory/nagios/nagios-4.0.4-remove-date-time.patch
2014-03-30 12:19:37.0 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios-4.0.6-remove-date-time.patch
2014-05-06 14:02:15.0 +0200
@@ -1,57 +1,45 @@
-From: Andreas Stieger andreas.stie...@gmx.de
-Date: Mon, 17 Mar 2014 19:18:34 +
-Subject: prevent unneccessary rebuilds due to __DATE__ and __TIME__ macros
-Upstream: no
-
-Fixes build warnings:
-nagios-www.i586: W: file-contains-date-and-time
/usr/lib/nagios/cgi/statusjson.cgi
-nagios-www.i586: W: file-contains-date-and-time
/usr/lib/nagios/cgi/objectjson.cgi
-nagios-www.i586: W: file-contains-date-and-time
/usr/lib/nagios/cgi/archivejson.cgi
-Your file uses __DATE and __TIME__ this causes the package to rebuild when
-not needed
-
- cgi/archivejson.c |2 +-
- cgi/objectjson.c |2 +-
- cgi/statusjson.c |2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-Index: nagios-4.0.4/cgi/archivejson.c
+Index: nagios-4.0.6/cgi/archivejson.c
===
nagios-4.0.4.orig/cgi/archivejson.c
-+++ nagios-4.0.4/cgi/archivejson.c
-@@ -742,7 +742,7 @@ int main(void) {
+--- nagios-4.0.6.orig/cgi/archivejson.c
nagios-4.0.6/cgi/archivejson.c
+@@ -1,4 +1,4 @@
+-/**
++/**
+ *
+ * ARCHIVEJSON.C - Nagios CGI for returning JSON-formatted archive data
+ *
+@@ -757,7 +757,7 @@ int main(void) {
json_result(query_time, THISCGI,
svm_get_string_from_value(cgi_data.query,
valid_queries),
get_query_status(query_status, cgi_data.query),
--
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2014-04-15 11:46:47
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is nagios
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2014-03-30
12:19:37.0 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2014-04-15
11:46:48.0 +0200
@@ -1,0 +2,11 @@
+Sat Apr 12 14:04:27 UTC 2014 - l...@linux-schulserver.de
+
+- update to 4.0.5:
+ + Fixed bug #595: Nagios 4 security fix
+ + Fixed bug #594: Nagios 4 fix contactgroups parsing
+ + Fixed bug #577: Nagios 4 checks stalled when write to socket failed
+ + Fixed bug #580: Nagios 4 memory leak
+ + Fixed bug where audio alerts wouldn't work with a 0 height and
+width - http://support.nagios.com/forum/viewtopic.php?t=26387
+
+---
Old:
nagios-4.0.4.tar.bz2
New:
nagios-4.0.5.tar.bz2
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.wOf4rK/_old 2014-04-15 11:46:49.0 +0200
+++ /var/tmp/diff_new_pack.wOf4rK/_new 2014-04-15 11:46:49.0 +0200
@@ -17,7 +17,7 @@
Name: nagios
-Version:4.0.4
+Version:4.0.5
Release:0
Summary:The Nagios Network Monitor
License:GPL-2.0+
++ nagios-4.0.4.tar.bz2 - nagios-4.0.5.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nagios-4.0.4/Changelog new/nagios-4.0.5/Changelog
--- old/nagios-4.0.4/Changelog 2014-03-14 18:24:57.0 +0100
+++ new/nagios-4.0.5/Changelog 2014-04-11 20:37:42.0 +0200
@@ -2,6 +2,17 @@
Nagios Core 4 Change Log
+4.0.5 - 04/11/2014
+--
+* Fixed bug #595: Nagios 4 security fix (Alexey Dvoryanchikov, Eric Stanley)
+* Fixed bug #594: Nagios 4 fix contactgroups parsing (Alexey Dvoryanchikov,
Eric Stanley)
+* Fixed bug #577: Nagios 4 checks stalled when write to socket failed (Alexey
Dvoryanchikov)
+* Fixed bug #580: Nagios 4 memory leak (Eric Stanley)
+* Fixed init script to remove the switching of users when performing
configuration verification which was causing failures if nagios user was set to
nologin (Scott Wilkerson)
+* Fixed auto creation of RAMDISK via environment variables in init script to
properly check existence using $RAMDISK_DIR environment variable. (Scott
Wilkerson)
+* Fixed unreferenced variable NagiosVarDir in daemon-init (Eric Mislivec)
+* Fixed bug where audio alerts wouldn't work with a 0 height and width -
http://support.nagios.com/forum/viewtopic.php?t=26387 (Scott Wilkerson)
+
4.0.4 - 03/14/2014
--
ENHANCEMENTS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nagios-4.0.4/base/checks.c
new/nagios-4.0.5/base/checks.c
--- old/nagios-4.0.4/base/checks.c 2014-03-14 18:24:57.0 +0100
+++ new/nagios-4.0.5/base/checks.c 2014-04-11 20:37:42.0 +0200
@@ -308,7 +308,7 @@
my_free(processed_command);
clear_volatile_macros_r(mac);
- return OK;
+ return runchk_result;
}
@@ -2107,7 +2107,7 @@
clear_volatile_macros_r(mac);
my_free(processed_command);
- return OK;
+ return runchk_result;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nagios-4.0.4/base/notifications.c
new/nagios-4.0.5/base/notifications.c
--- old/nagios-4.0.4/base/notifications.c 2014-03-14 18:24:57.0
+0100
+++ new/nagios-4.0.5/base/notifications.c 2014-04-11 20:37:42.0
+0200
@@ -259,9 +259,13 @@
*/
clear_summary_macros_r(mac);
clear_contact_macros_r(mac);
+ clear_contactgroup_macros_r(mac);
clear_argv_macros_r(mac);
clear_host_macros_r(mac);
+ clear_hostgroup_macros_r(mac);
clear_service_macros_r(mac);
+ clear_servicegroup_macros_r(mac);
+ clear_datetime_macros_r(mac);
if(type == NOTIFICATION_NORMAL) {
@@ -1202,8 +1206,11 @@
*/
clear_summary_macros_r(mac);
clear_contact_macros_r(mac);
+ clear_contactgroup_macros_r(mac);
clear_argv_macros_r(mac);
clear_host_macros_r(mac);
+ clear_hostgroup_macros_r(mac);
+ clear_datetime_macros_r(mac);
if(type == NOTIFICATION_NORMAL) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore'
commit nagios for openSUSE:Factory
Hello community, here is the log from the commit of package nagios for openSUSE:Factory checked in at 2014-03-30 09:10:39 Comparing /work/SRC/openSUSE:Factory/nagios (Old) and /work/SRC/openSUSE:Factory/.nagios.new (New) Package is nagios Changes: --- /work/SRC/openSUSE:Factory/nagios/nagios.changes2014-02-02 18:41:35.0 +0100 +++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2014-03-30 12:19:37.0 +0200 @@ -1,0 +2,115 @@ +Fri Mar 28 21:01:21 UTC 2014 - l...@linux-schulserver.de + +- fix stack-based buffer overflow in the cmd_submitf function + in cgi/cmd.c - CVE-2014-1878 (bnc#864843) + nagios-CVE-2014-1878.patch + +--- +Mon Mar 17 19:20:30 UTC 2014 - andreas.stie...@gmx.de + +- add nagios-4.0.4-remove-date-time.patch to prevent unneccessary + rebuilds due to __DATE__ and __TIME__ macros + +--- +Sun Mar 16 18:05:24 UTC 2014 - l...@linux-schulserver.de + +- update to 4.0.4: + ENHANCEMENTS + * JSON CGIs moved to beta status (Eric Stanley) + FIXES + * Fixed bug #491,#553: Rebuilt the daemon-init scripts back to +something that should work on all systems (Scott Wilkerson) + +--- +Sat Mar 1 17:55:49 UTC 2014 - l...@linux-schulserver.de + +- update to 4.0.3 + ENHANCEMENTS + * Aliased hourly_value to importance and minimum_value to +minimum_importance and deprecated the former (Eric Stanley) + * Added host and service importance macros (Eric Stanley) + * Added notifications on flexible downtime expiration (Dan Wittenberg) + FIXES + * Bug #548: Temporary fix that rejects all external command during +restart to prevent Core from crashing (Eric Stanley) + * Corrected calculation of host importance and importance defaults (Eric +Stanley) + * Fixed bug #498: Nagios 4 enable_environment_macros=1 not working (Eric +Stanley, Alexey Dvoryanchikov) + * No longer checks whether logs can be written when verifying +configuration (Eric Stanley) + * Fixed CGI bug where the CGI could read past the end of the list of CGI +variables, potentially crashing the CGI (Scott Wilkerson) + * Fixed inheritance of hourly_value from host and service templates +(Scott Wilkerson) + * Fixed bug #502: 4.0.0: Configuration - Service Escalations = +incomplete list (Eric Stanley) + * Fixed bug #523: quotes and double quotes in plugin message are +converted to HTML escapes in Nagios 4.0 (duplicate of bug #524) + * Fixed bug #524: URLs returned in plugin check results are not +correctly displayed (Eric Stanley) + * Fixed bug where passive service checks would return Service check +timed out after 0.00 seconds (Scott Wilkerson) +- print recommendation to run the upgrade_nagios script in case + of an update (via logger command) +- added man page for nagios_upgrade + +--- +Thu Jan 24 21:14:34 UTC 2014 - l...@linux-schulserver.de + +- update to 4.0.2 + FIXES + * Fixed 528: Nagios 4.0.1: Logrotation: Only current host- and +servicestates saved in rotated logfiles (duplicate of 507) + * Fixed 507: Nagios 4.0.0 - Problem during log rotate (Stefano Ghelfi) + * Fixed 530: RPM spec file sets wrong permissions on plugins +directory (duplicate of bug 494) + * Fixed 494: nagios.spec fixes (with patch) (Karsten Weiss) + * Fixed 515: Segsegv after starting up nagios (duplicate of bug 526) + * Fixed 513: Crash while entering downtime for service +(duplicate of bug 526) + * Fixed 529: Core Worker failed to reap child in 4.0.1 Description + * Fixed 514: scheduled downtime not showing in web interface +(Eric Stanley) + * Fixed 526: sort_downtime() corrupts scheduled_downtime_list +causing segfault (Adam James) + * Fixed 492: Nagios 4 fails to remove/add checks upon reload +(Eric Stanley) + * Fixed 484: Beta4.0.0b4 service checks returning (No output +on stdout) (Eric Stanley) + * Fixed 470: statusmap doesn't display info (Cameron Moore) + * Fixed 499: Security issue in daemon-init.in, function +check_config (Tómas Edwardsson) + +--- +Thu Jan 23 12:01:00 UTC 2014 - l...@linux-schulserver.de + +- update to 4.0.1 + ENHANCEMENTS + * Added compiler flags in RPM spec file to reduce compiler noise +(Dan Wittenberg) + * Added logging of failure in dlclose() call (Anton Lofgren) + * Added a simple query handler interface, nagios-qh.rb +(Dan Wittenberg) + * Multiple code simplifications, additional error handling in +downtime code (Andreas Ericsson) + FIXES + * Reverted commit f99a9a7b which set check_interval to 1 if
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2014-02-02 18:41:34
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is nagios
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2013-09-27
17:47:42.0 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2014-02-02
18:41:35.0 +0100
@@ -1,0 +2,14 @@
+Wed Jan 22 16:53:49 UTC 2014 - o...@botter.cc
+
+- bring package back to compiling state after introducing
+ incompatible changes in nagios.spec with submit from
+ Dec 27th (spec file changes obviously already for nagios 4.0,
+ whereas we are still at 3.5.1).
+
+---
+Fri Dec 27 14:49:18 UTC 2013 - l...@linux-schulserver.de
+
+- Fix possible denial of service in CGI executables:
+ * nagios-CVE-2013-7108.patch (bnc#856837)
+
+---
New:
nagios-CVE-2013-7108.patch
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.lxMtJm/_old 2014-02-02 18:41:37.0 +0100
+++ /var/tmp/diff_new_pack.lxMtJm/_new 2014-02-02 18:41:37.0 +0100
@@ -45,6 +45,8 @@
Patch11:nagios-disable_phone_home.patch
# PATCH-FIX-UPSTREAM fix CVE-2013-2214
Patch12:nagios-CVE-2013-2214.patch
+# PATCH-FIX-UPSTREAM fix CVE-2013-7108
+Patch13:nagios-CVE-2013-7108.patch
BuildRequires: apache2-devel
BuildRequires: freetype2-devel
BuildRequires: gd-devel
@@ -188,6 +190,7 @@
%patch10 -p0
%patch11 -p0
%patch12 -p1
+%patch13 -p1
find -name .gitignore | xargs rm
# fix p1.pl [dos]
perl -p -i -e 's|\r\n|\n|' contrib/p1.pl
++ nagios-CVE-2013-7108.patch ++
Index: nagios/cgi/avail.c
===
--- nagios.orig/cgi/avail.c
+++ nagios/cgi/avail.c
@@ -1141,7 +1141,6 @@ int process_cgivars(void) {
/* do some basic length checking on the variable identifier to
prevent buffer overflows */
if(strlen(variables[x]) = MAX_INPUT_BUFFER - 1) {
- x++;
continue;
}
Index: nagios/cgi/config.c
===
--- nagios.orig/cgi/config.c
+++ nagios/cgi/config.c
@@ -386,7 +386,6 @@ int process_cgivars(void) {
/* do some basic length checking on the variable identifier to
prevent buffer overflows */
if(strlen(variables[x]) = MAX_INPUT_BUFFER - 1) {
- x++;
continue;
}
Index: nagios/cgi/extinfo.c
===
--- nagios.orig/cgi/extinfo.c
+++ nagios/cgi/extinfo.c
@@ -651,7 +651,6 @@ int process_cgivars(void) {
/* do some basic length checking on the variable identifier to
prevent buffer overflows */
if(strlen(variables[x]) = MAX_INPUT_BUFFER - 1) {
- x++;
continue;
}
Index: nagios/cgi/histogram.c
===
--- nagios.orig/cgi/histogram.c
+++ nagios/cgi/histogram.c
@@ -1069,7 +1069,6 @@ int process_cgivars(void) {
/* do some basic length checking on the variable identifier to
prevent buffer overflows */
if(strlen(variables[x]) = MAX_INPUT_BUFFER - 1) {
- x++;
continue;
}
Index: nagios/cgi/notifications.c
===
--- nagios.orig/cgi/notifications.c
+++ nagios/cgi/notifications.c
@@ -358,7 +358,6 @@ int process_cgivars(void) {
/* do some basic length checking on the variable identifier to
prevent buffer overflows */
if(strlen(variables[x]) = MAX_INPUT_BUFFER - 1) {
- x++;
continue;
}
Index: nagios/cgi/outages.c
===
--- nagios.orig/cgi/outages.c
+++ nagios/cgi/outages.c
@@ -269,7 +269,6 @@ int process_cgivars(void) {
/* do some basic length checking on the variable identifier to
prevent buffer overflows */
if(strlen(variables[x]) = MAX_INPUT_BUFFER - 1) {
- x++;
continue;
}
Index: nagios/cgi/status.c
===
--- nagios.orig/cgi/status.c
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2013-09-27 17:47:41
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is nagios
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2013-09-07
12:32:20.0 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2013-09-27
17:47:42.0 +0200
@@ -1,0 +2,12 @@
+Tue Sep 24 16:30:12 UTC 2013 - l...@linux-schulserver.de
+
+- cleanup file list
+
+---
+Wed Sep 11 14:32:17 UTC 2013 - l...@linux-schulserver.de
+
+- Recommend monitoring-tools package for those who want to convert
+ their (real old) nagios configuration (using the subpackage from
+ icinga)
+
+---
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.MO7ojJ/_old 2013-09-27 17:47:43.0 +0200
+++ /var/tmp/diff_new_pack.MO7ojJ/_new 2013-09-27 17:47:43.0 +0200
@@ -17,11 +17,11 @@
Name: nagios
+Version:3.5.1
+Release:0
Summary:The Nagios Network Monitor
License:GPL-2.0+
Group: System/Monitoring
-Version:3.5.1
-Release:0
Url:http://www.nagios.org/
Source0:%{name}-%{version}.tar.bz2
Source1:rc%{name}
@@ -45,15 +45,6 @@
Patch11:nagios-disable_phone_home.patch
# PATCH-FIX-UPSTREAM fix CVE-2013-2214
Patch12:nagios-CVE-2013-2214.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Provides: monitoring_daemon
-PreReq: %fillup_prereq
-PreReq: %insserv_prereq
-PreReq: /bin/logger
-PreReq: coreutils
-PreReq: grep
-PreReq: pwdutils
-PreReq: sed
BuildRequires: apache2-devel
BuildRequires: freetype2-devel
BuildRequires: gd-devel
@@ -66,16 +57,27 @@
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: zlib-devel
+Requires(pre): %fillup_prereq
+Requires(pre): %insserv_prereq
+Requires(pre): /bin/logger
+Requires(pre): coreutils
+Requires(pre): grep
+Requires(pre): pwdutils
+Requires(pre): sed
+Provides: monitoring_daemon
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} 1010
BuildRequires: XFree86-devel
BuildRequires: XFree86-libs
BuildRequires: libapr0
Requires: cron
%else
-BuildRequires: libapr-util1-devel
BuildRequires: xorg-x11-devel
-Recommends: cron
+BuildRequires: pkgconfig(apr-util-1)
Recommends: %{name}-www
+Recommends: cron
+# this package contains shared tools with icinga
+Recommends: monitoring-tools
# we enable nagios embedded perl, but if people disable it...
Recommends: perl = %{perl_version}
# as long as it is enabled we need the following requires
@@ -109,22 +111,21 @@
This package provides core programs for Nagios. The web interface,
documentation, and development files are built as separate packages
-
%package www
Summary:Provides the HTML and CGI files for the Nagios web interface
Group: System/Monitoring
-Provides: monitoring_webfrontend
-PreReq: /bin/logger
-PreReq: apache2
-PreReq: coreutils
-PreReq: gawk
-PreReq: grep
-PreReq: pwdutils
-PreReq: sed
+Requires(pre): /bin/logger
+Requires(pre): apache2
+Requires(pre): coreutils
+Requires(pre): gawk
+Requires(pre): grep
+Requires(pre): pwdutils
+Requires(pre): sed
Requires: %{name} = %{version}
Requires: gd
Requires: mod_php_any
Requires: php
+Provides: monitoring_webfrontend
%description www
Nagios is a program that will monitor hosts and services on your
@@ -163,7 +164,6 @@
Please enable the flag NAGIOSDCH in the apache configuration.
Note: The HTML pages use 'side' and 'main' and frame targets.
-
%package devel
Summary:Development files for Nagios
Group: Development/Libraries/C and C++
@@ -181,7 +181,6 @@
This package provides include files that Nagios-related applications
may compile against.
-
%prep
%setup -q -n %{name}
%patch2 -p0
@@ -239,8 +238,8 @@
#
# make daemonchk.cgi and event handlers
#
-make %{?jobs:-j%jobs} all
-make %{?jobs:-j%jobs} -C contrib
+make %{?_smp_mflags} all
+make %{?_smp_mflags} -C contrib
pushd contrib/eventhandlers 1/dev/null
for f in `find . -type f` ; do
F=`mktemp temp.XX`
@@ -260,23 +259,23 @@
mkdir -p %{buildroot}%{_sbindir}
mkdir -p %{buildroot}%apache2_sysconfdir/
mkdir -p %{buildroot}%nslockfile_dir
-%{__make} install install-commandmode install-config install-webconf
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2013-09-07 12:32:19
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is nagios
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2013-09-02
15:00:50.0 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2013-09-07
12:32:20.0 +0200
@@ -1,0 +2,6 @@
+Thu Sep 5 18:03:39 CEST 2013 - m...@suse.de
+
+- add libperl_requires, as we link against libperl and thus
+ need a specific version of perl
+
+---
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.rGcJ8I/_old 2013-09-07 12:32:23.0 +0200
+++ /var/tmp/diff_new_pack.rGcJ8I/_new 2013-09-07 12:32:23.0 +0200
@@ -78,6 +78,8 @@
Recommends: %{name}-www
# we enable nagios embedded perl, but if people disable it...
Recommends: perl = %{perl_version}
+# as long as it is enabled we need the following requires
+%{?libperl_requires}
%endif
Recommends: icinga-monitoring-tools
%if 0%{?suse_version} 1020
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2013-09-02 15:00:48
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is nagios
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2013-08-05
20:48:15.0 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2013-09-02
15:00:50.0 +0200
@@ -1,0 +2,17 @@
+Fri Aug 30 23:14:55 UTC 2013 - schneem...@b1-systems.de
+
+- update to 3.5.1:
+ + Added handler for SIGXFSZ signal (Eric Stanley)
+ + Fixed bug #444: Nagios 3.5.0 problem with macro $ADMINEMAIL$ :
+@ is converted to %40 after 2 nagios reload (Duplicate of bug #407)
+ + Fixed bug #407: Reloading nagios config causes spaces in notifications
+to become plus signs (Alexey Dvoryanchikov)
+ + Fixed bug #445: Adding triggered downtime for child hosts causes a
+SIGSEGV on restart/reload (Eric Stanley)
+ + Fixed bug #375: Freshness expiration never reached and bug #427:
+freshness threshold doesn't work if it is set long
+(Scott Wilkerson, Eric Stanley)
+ + Fixed bug #432: Downtime scheduled as Nagios Process and not
+the Users name (Sam Lansing, Eric Stanley)
+
+---
Old:
nagios-3.5.0.tar.bz2
New:
nagios-3.5.1.tar.bz2
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.EVytA3/_old 2013-09-02 15:00:51.0 +0200
+++ /var/tmp/diff_new_pack.EVytA3/_new 2013-09-02 15:00:51.0 +0200
@@ -20,7 +20,7 @@
Summary:The Nagios Network Monitor
License:GPL-2.0+
Group: System/Monitoring
-Version:3.5.0
+Version:3.5.1
Release:0
Url:http://www.nagios.org/
Source0:%{name}-%{version}.tar.bz2
++ nagios-3.5.0.tar.bz2 - nagios-3.5.1.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nagios/Changelog new/nagios/Changelog
--- old/nagios/Changelog2013-03-15 12:14:02.0 +0100
+++ new/nagios/Changelog2013-08-30 19:46:14.0 +0200
@@ -2,6 +2,15 @@
Nagios 3.x Change Log
#
+3.5.1 - 08/30/2013
+--
+* Added handler for SIGXFSZ signal (Eric Stanley)
+* Fixed bug #444: Nagios 3.5.0 problem with macro $ADMINEMAIL$ : @ is
converted to %40 after 2 nagios reload (Duplicate of bug #407)
+* Fixed bug #407: Reloading nagios config causes spaces in notifications to
become plus signs (Alexey Dvoryanchikov)
+* Fixed bug #445: Adding triggered downtime for child hosts causes a SIGSEGV
on restart/reload (Eric Stanley)
+* Fixed bug #375: Freshness expiration never reached and bug #427: freshness
threshold doesn't work if it is set long (Scott Wilkerson, Eric Stanley)
+* Fixed bug #432: Downtime scheduled as Nagios Process and not the Users
name (Sam Lansing, Eric Stanley)
+
3.5.0 - 03/15/2013
--
* Fixed bug #403: The configuration page of the webui doesn't use entity
encoding when displaying the command expansion item (Eric Stanley, Phil
Randal)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nagios/base/checks.c new/nagios/base/checks.c
--- old/nagios/base/checks.c2013-03-09 22:46:35.0 +0100
+++ new/nagios/base/checks.c2013-08-30 19:46:14.0 +0200
@@ -2086,7 +2086,7 @@
*/
if(temp_service-check_type == SERVICE_CHECK_PASSIVE) {
if(temp_service-last_check event_start
- event_start - last_program_stop freshness_threshold *
0.618) {
+ event_start - last_program_stop freshness_threshold *
0.618) {
expiration_time = event_start + freshness_threshold;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nagios/base/nagios.c new/nagios/base/nagios.c
--- old/nagios/base/nagios.c2013-03-15 12:14:02.0 +0100
+++ new/nagios/base/nagios.c2013-08-30 19:46:14.0 +0200
@@ -3,7 +3,7 @@
* NAGIOS.C - Core Program Code For Nagios
*
* Program: Nagios Core
- * Version: 3.5.0
+ * Version: 3.5.1
* License: GPL
* Copyright (c) 2009-2010 Nagios Core Development Team and Community
Contributors
* Copyright (c) 1999-2009 Ethan Galstad
@@ -438,6 +438,12 @@
exit(ERROR);
}
+ /*
+* Set the signal handler for the SIGXFSZ signal here because
+* we may encounter this signal before the other signal handlers
+* are set.
+*/
+ signal(SIGXFSZ,
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2013-08-05 20:48:13
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is nagios
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2013-03-20
09:53:32.0 +0100
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2013-08-05
20:48:15.0 +0200
@@ -1,0 +2,17 @@
+Fri Jul 26 09:50:38 UTC 2013 - thard...@suse.com
+
+- added icinga-monitoring-tools as recommend and removed the duplicated nagios
files
+
+---
+Fri Jun 28 08:27:25 UTC 2013 - l...@linux-schulserver.de
+
+- added nagios-CVE-2013-2214.patch fixing unauthorized host/service
+ views displayed in servicegroup view (bnc#827020)
+
+---
+Thu Jun 27 15:47:56 UTC 2013 - l...@linux-schulserver.de
+
+- fix permission problem on /usr/lib/nagios/plugins introduced with
+ one of the latest updates
+
+---
Old:
convertcfg.8
mini_epn.8
new_mini_epn.8
New:
nagios-CVE-2013-2214.patch
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.eDLk0Z/_old 2013-08-05 20:48:16.0 +0200
+++ /var/tmp/diff_new_pack.eDLk0Z/_new 2013-08-05 20:48:16.0 +0200
@@ -25,14 +25,11 @@
Url:http://www.nagios.org/
Source0:%{name}-%{version}.tar.bz2
Source1:rc%{name}
-Source2:convertcfg.8
Source3:%{name}.sysconfig
Source4:suse.de-nagios
Source5:nagios.8
Source6:nagiosstats.8
Source7:nagios-htpasswd.users
-Source8:mini_epn.8
-Source9:new_mini_epn.8
#
Source10: %{name}-README.SuSE
Source11: %{name}-html-pages.tar.bz2
@@ -46,6 +43,8 @@
Patch10:nagios-p1.pl-location.patch
# PATCH-FIX-OPENSUSE disable Nagios online update checks for distributed
packages
Patch11:nagios-disable_phone_home.patch
+# PATCH-FIX-UPSTREAM fix CVE-2013-2214
+Patch12:nagios-CVE-2013-2214.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: monitoring_daemon
PreReq: %fillup_prereq
@@ -80,6 +79,7 @@
# we enable nagios embedded perl, but if people disable it...
Recommends: perl = %{perl_version}
%endif
+Recommends: icinga-monitoring-tools
%if 0%{?suse_version} 1020
Recommends: %{name}-plugins
%else
@@ -186,12 +186,10 @@
%patch3 -p0
%patch10 -p0
%patch11 -p0
+%patch12 -p1
find -name .gitignore | xargs rm
# fix p1.pl [dos]
perl -p -i -e 's|\r\n|\n|' contrib/p1.pl
-# fix p1.pl pathname of mini_epn
-sed -i 's|p1.pl|%{nagios_libdir}/p1.pl|g' contrib/mini_epn.c
-sed -i 's|p1.pl|%{nagios_libdir}/p1.pl|g' contrib/new_mini_epn.c
# fix file permissions
chmod -x Changelog LEGAL LICENSE README
@@ -317,9 +315,6 @@
# install manpages
install -Dm644 %{S:5} %{buildroot}%{_mandir}/man8/%{name}.8
install -Dm644 %{S:6} %{buildroot}%{_mandir}/man8/nagiostats.8
-install -Dm644 %{S:8} %{buildroot}%{_mandir}/man8/mini_epn.8
-install -Dm644 %{S:9} %{buildroot}%{_mandir}/man8/new_mini_epn.8
-install -Dm644 %{S:2} %{buildroot}%{_mandir}/man8/convertcfg.8
# fixing permissions the dirty way
for file in README sample-config/README
sample-config/template-object/README; do
chmod 644 $RPM_BUILD_DIR/%{name}/$file
@@ -345,6 +340,10 @@
EOF
mv -f %{buildroot}%{apache2_sysconfdir}/%{name}.conf.in
%{buildroot}%{apache2_sysconfdir}/%{name}.conf
popd /dev/null
+#delete monitoring-tools because they are provided by icinga-monitoring-tools
+rm -f %{buildroot}/%{_sbindir}/convertcfg
+rm -f %{buildroot}/%{_sbindir}/mini_epn
+rm -f %{buildroot}/%{_sbindir}/new_mini_epn
%clean
%{__rm} -rf %{buildroot}
@@ -490,9 +489,7 @@
%files
%defattr(-,root,root)
%doc Changelog LEGAL LICENSE README README.SuSE sample-config/
-%{_mandir}/man8/convertcfg*
%{_mandir}/man8/%{name}*
-%{_mandir}/man8/*mini_epn*
%_sysconfdir/init.d/%name
%ghost %config(missingok,noreplace) %{nagios_logdir}/config.err
%config(noreplace) %{nagios_sysconfdir}/*.cfg
@@ -502,12 +499,9 @@
%{nagios_localstatedir}
%attr(0755,root,root) %{nagios_libdir}/p1.pl
%exclude %{nagios_cgidir}/*
-%{_sbindir}/convertcfg
-%{_sbindir}/mini_epn
-%{_sbindir}/new_mini_epn
%{_sbindir}/rc%name
%dir %{nagios_libdir}
-%dir %{nagios_plugindir}
+%attr(755,root,root) %dir %{nagios_plugindir}
%dir %{nagios_eventhandlerdir}
%{nagios_eventhandlerdir}/*
# defattr change
++ nagios-CVE-2013-2214.patch ++
Index: nagios/cgi/status.c
===
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2013-03-20 09:53:31
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is nagios, Maintainer is lr...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2013-02-14
21:12:57.0 +0100
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2013-03-20
09:53:32.0 +0100
@@ -1,0 +2,27 @@
+Sun Mar 17 21:22:07 UTC 2013 - l...@linux-schulserver.de
+
+- adapt static html pages to reflect the current version
+
+---
+Sat Mar 16 15:37:12 UTC 2013 - schneem...@b1-systems.de
+
+- update to 3.5.0:
+ + Fixed bug #403: The configuration page of the webui doesn't use
+entity encoding when displaying the command expansion item (Eric
+Stanley, Phil Randal)
+ + Fixed bug #424: Nagios Core 3.4.4 seg fault (core dump) on restart
+after removing config for running service (Eric Stanley)
+ + Updated CGI utility functions to support UTF-8 characters (Eric Stanley)
+ + Fixed bug where selecting Command Expansion from Configuration CGI
+page would display commands instead (Eric Stanley)
+ + Fixed bug #369: status.cgi crashes with segfault when there are german
+ulauts (äöüß) in the hostname or the servicename (Eric Stanley)
+ + Fixed bug #418: Scheduled Downtime Notifications Resent On Nagios
+Restart/reload (Eric Stanley
+
+---
+Wed Mar 13 15:51:51 UTC 2013 - l...@linux-schulserver.de
+
+- general update for 12.1, 12.2 and 12.3 for bnc#809180
+
+---
Old:
nagios-3.4.4.tar.bz2
New:
nagios-3.5.0.tar.bz2
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.HUe7gO/_old 2013-03-20 09:53:35.0 +0100
+++ /var/tmp/diff_new_pack.HUe7gO/_new 2013-03-20 09:53:35.0 +0100
@@ -20,7 +20,7 @@
Summary:The Nagios Network Monitor
License:GPL-2.0+
Group: System/Monitoring
-Version:3.4.4
+Version:3.5.0
Release:0
Url:http://www.nagios.org/
Source0:%{name}-%{version}.tar.bz2
@@ -331,6 +331,8 @@
pushd %{buildroot}%{nagios_datadir} /dev/null
tar -xf %{SOURCE11}
tar -xf %{SOURCE12}
+sed -i s|Version 3.4.3|Version %{version}|g; \
+ s|version=3.4.3|version=%{version}|g main.html
# jip: ugly at the moment
#LINES=$(echo $(wc -l %%{buildroot}%%{apache2_sysconfdir}/%%{name}.conf | awk
' { print $1}')-2 | bc)
LINES=40
++ nagios-3.4.4.tar.bz2 - nagios-3.5.0.tar.bz2 ++
3102 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nagios for openSUSE:Factory
Hello community, here is the log from the commit of package nagios for openSUSE:Factory checked in at 2013-02-14 21:10:25 Comparing /work/SRC/openSUSE:Factory/nagios (Old) and /work/SRC/openSUSE:Factory/.nagios.new (New) Package is nagios, Maintainer is lr...@suse.com Changes: --- /work/SRC/openSUSE:Factory/nagios/nagios.changes2013-01-17 09:50:18.0 +0100 +++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2013-02-14 21:10:27.0 +0100 @@ -1,0 +2,6 @@ +Thu Feb 14 09:50:37 UTC 2013 - l...@linux-schulserver.de + +- provide 'monitoring_daemon' in the init script to allow other + init scripts to depend on it + +--- Other differences: -- ++ rcnagios ++ --- /var/tmp/diff_new_pack.DbQTo7/_old 2013-02-14 21:10:29.0 +0100 +++ /var/tmp/diff_new_pack.DbQTo7/_new 2013-02-14 21:10:29.0 +0100 @@ -16,7 +16,7 @@ # System startup script for nagios # ### BEGIN INIT INFO -# Provides: nagios +# Provides: nagios monitoring_daemon # Required-Start: $local_fs $remote_fs $syslog $network # Required-Stop: $local_fs $remote_fs $syslog $network # Should-Start: $time sendmail httpd2 xntpd $named cron ndo2db -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2013-01-17 09:50:15
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is nagios, Maintainer is lr...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2012-12-28
22:45:53.0 +0100
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2013-01-17
09:50:18.0 +0100
@@ -1,0 +2,25 @@
+Sat Jan 12 18:25:49 UTC 2013 - l...@linux-schulserver.de
+
+- update to 3.4.4:
+ + Fixed bug #408: service checks get duplicated on reload (Eric Stanley)
+ + Added NULL pointer checks to CGI code. (Eric Stanley)
+ + Fixed buffer overflow vulnerability in CGI code. Thanks to Neohapsis
+for finding this. (Eric Stanley)
+- refreshed patches
+
+---
+Wed Jan 9 11:10:21 CET 2013 - l...@linux-schulserver.de
+
+- added new subpackage nagios-www-dch (don't call home):
+ + add plain html pages to allow users to disable PHP and
+loading of external references
+ + re-added documentation (no external link any more)
+
+---
+Tue Jan 1 15:02:49 UTC 2013 - l...@linux-schulserver.de
+
+- use new rpm macros for basic user-/groupadd commands:
+ %%nagios_user_group_add
+ %%nagios_command_user_group_add
+
+---
Old:
nagios-3.4.3.tar.bz2
New:
nagios-3.0.6-docs.tar.bz2
nagios-3.4.4.tar.bz2
nagios-html-pages.tar.bz2
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.qzU3o8/_old 2013-01-17 09:50:19.0 +0100
+++ /var/tmp/diff_new_pack.qzU3o8/_new 2013-01-17 09:50:19.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nagios
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Summary:The Nagios Network Monitor
License:GPL-2.0+
Group: System/Monitoring
-Version:3.4.3
+Version:3.4.4
Release:0
Url:http://www.nagios.org/
Source0:%{name}-%{version}.tar.bz2
@@ -35,6 +35,8 @@
Source9:new_mini_epn.8
#
Source10: %{name}-README.SuSE
+Source11: %{name}-html-pages.tar.bz2
+Source12: %{name}-3.0.6-docs.tar.bz2
Source20: %{name}-rpmlintrc
# PATCH-FIX-UPSTREAM Fixes the output of spurious $ signs in commandoutput
(deb#480001)
Patch2: nagios-fix_spurious_dollar_signs_added_to_command_lines.patch
@@ -136,6 +138,29 @@
for the Nagios web interface. In addition, HTML documentation is
included in this package.
+%package www-dch
+Summary:HTML and CGI files that do not call home
+Group: System/Monitoring
+Requires: %{name}-www = %{version}
+
+%description www-dch
+Several CGI programs are included with Nagios in order to allow you to
+view the current service status, problem history, notification history,
+and log file via the web.
+
+Since Version 3.1, some of those CGI files and the Nagios process itself
+try to detect the latest version and fetching news feeds from the upstream
+server www.nagios.org.
+
+This additional package provides simply HTML files that do not call
+home and also allow to run the web interface without PHP support.
+
+There is also an offline version of the documentation included in this
+package.
+
+Please enable the flag NAGIOSDCH in the apache configuration.
+Note: The HTML pages use 'side' and 'main' and frame targets.
+
%package devel
Summary:Development files for Nagios
@@ -301,39 +326,32 @@
done
# we use nagios_spooldir for this
test -d %{buildroot}%{nagios_localstatedir}/rw rmdir
%{buildroot}%{nagios_localstatedir}/rw
+# install plain html files to allow users to use Nagios without internet
connection
+# and without PHP at all
+pushd %{buildroot}%{nagios_datadir} /dev/null
+tar -xf %{SOURCE11}
+tar -xf %{SOURCE12}
+# jip: ugly at the moment
+#LINES=$(echo $(wc -l %%{buildroot}%%{apache2_sysconfdir}/%%{name}.conf | awk
' { print $1}')-2 | bc)
+LINES=40
+head -n $LINES %{buildroot}%{apache2_sysconfdir}/%{name}.conf
%{buildroot}%{apache2_sysconfdir}/%{name}.conf.in
+cat %{buildroot}%{apache2_sysconfdir}/%{name}.conf.in EOF
+IfDefine KOHANA2
+ DirectoryIndex index.html index.php
+/IfDefine
+/Directory
+EOF
+mv -f %{buildroot}%{apache2_sysconfdir}/%{name}.conf.in
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2012-12-28 22:45:50
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is nagios, Maintainer is lr...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2012-11-30
12:27:50.0 +0100
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2012-12-28
22:45:53.0 +0100
@@ -1,0 +2,30 @@
+Mon Dec 17 10:29:13 UTC 2012 - l...@linux-schulserver.de
+
+- update to 3.4.3:
+ * Applied fix for pagination and sorting on status.cgi #381
+(Phil Randal)
+ * Fixed issue where deleting a downtime could cause Nagios to crash
+(Eric Stanley)
+ * Corrected logic so that end times for flexible downtimes are
+calculated from the downtime start rather than the current time
+in the case where Nagios is restarted (Eric Stanley)
+ * Fixed issue introduced by fix for bug #124 where flexible
+downtimes are not taken into account on Nagios restart.
+(Scott Wilkerson, Eric Stanley)
+ * Fixed bug #247: If a service reports no performance data, the
+perfdata log file has no line indicating the test.
+(omnik...@free.fr)
+ * Fixed link for unhandled unreachable host problems on tactical
+overview page (Rudolf Cejka)
+ * Fixed bug #345 with wild card searches not paging properly
+on status.cgi (Phil Randal)
+ * Fixed bug #343 on status.cgi where Service Group Summary can
+potentially show wrong totals (Mark Ziesemer)
+ * Fixed memory leaks on SIGHUP (Carlos Velasco)
+- refreshed patches
+- just require php not php5 to allow a switch to php53
+- do not compress logfiles per default to allow searching via
+ webinterface
+- init script now uses daemonchk.cgi to check for status (if present)
+
+---
Old:
nagios-3.4.1.tar.bz2
New:
nagios-3.4.3.tar.bz2
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.rbTE7e/_old 2012-12-28 22:45:55.0 +0100
+++ /var/tmp/diff_new_pack.rbTE7e/_new 2012-12-28 22:45:55.0 +0100
@@ -20,7 +20,7 @@
Summary:The Nagios Network Monitor
License:GPL-2.0+
Group: System/Monitoring
-Version:3.4.1
+Version:3.4.3
Release:0
Url:http://www.nagios.org/
Source0:%{name}-%{version}.tar.bz2
@@ -120,7 +120,7 @@
Requires: %{name} = %{version}
Requires: gd
Requires: mod_php_any
-Requires: php5
+Requires: php
%description www
Nagios is a program that will monitor hosts and services on your
@@ -157,10 +157,10 @@
%prep
%setup -q -n %{name}
-%patch2 -p1
-%patch3 -p1
+%patch2 -p0
+%patch3 -p0
%patch10 -p0
-%patch11 -p1
+%patch11 -p0
find -name .gitignore | xargs rm
# fix p1.pl [dos]
perl -p -i -e 's|\r\n|\n|' contrib/p1.pl
@@ -351,33 +351,32 @@
fi
%post
-%{fillup_and_insserv nagios}
# Update ?
if [ ${1:-0} -gt 1 ]; then
- if [ -f %{nagios_sysconfdir}/nagios.cfg ]; then
+ if [ -f '%{nagios_sysconfdir}/nagios.cfg' ]; then
DATE=$(date +%Y-%m-%d-%H:%M)
TMPFILE=$(mktemp /tmp/%{name}-XX)
- NAGIOS_CFG=%{nagios_sysconfdir}/nagios.cfg
+ NAGIOS_CFG='%{nagios_sysconfdir}/nagios.cfg'
cp -f $NAGIOS_CFG ${NAGIOS_CFG}_${DATE}
- if ! grep -q ^lock_file=%{nslockfile} $NAGIOS_CFG ; then
+ if ! grep -q ^lock_file=%{nslockfile} $NAGIOS_CFG ; then
echo - updating pid lock_file= to %{nslockfile} in $NAGIOS_CFG
$TMPFILE
-sed -i s@^lock_file=.*@lock_file=%{nslockfile}@ $NAGIOS_CFG
+sed -i s@^lock_file=.*@lock_file=%{nslockfile}@ $NAGIOS_CFG
fi
- if grep -q ^service_reaper_frequency $NAGIOS_CFG ; then
+ if grep -q ^service_reaper_frequency $NAGIOS_CFG ; then
echo - renaming service_reaper_frequency to
check_result_reaper_frequency in $NAGIOS_CFG $TMPFILE
-sed -i s@service_reaper_frequency@check_result_reaper_frequency@
$NAGIOS_CFG
+sed -i s@service_reaper_frequency@check_result_reaper_frequency@
$NAGIOS_CFG
fi
- if grep -q ^aggregate_status_updates $NAGIOS_CFG ; then
+ if grep -q ^aggregate_status_updates $NAGIOS_CFG ; then
echo - aggregate_status_updates option has been removed from
$NAGIOS_CFG $TMPFILE
-sed -i s@^aggregate_status_updates@# aggregate_status_updates@
$NAGIOS_CFG
+sed -i s@^aggregate_status_updates@# aggregate_status_updates@
$NAGIOS_CFG
fi
- if grep -q ^downtime_file $NAGIOS_CFG ; then
-set -- $(grep ^downtime_file $NAGIOS_CFG | sed 's@=@ @')
+ if grep -q ^downtime_file $NAGIOS_CFG ; then
+set -- $(grep ^downtime_file $NAGIOS_CFG | sed 's@=@ @')
shift
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2012-11-30 12:25:52
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is nagios, Maintainer is lr...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2012-10-19
08:48:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2012-11-30
12:27:50.0 +0100
@@ -1,0 +2,12 @@
+Mon Nov 26 11:35:24 UTC 2012 - aesz...@gwdg.de
+
+- Use usermod instead of groupmod when suse_version 1220 due to
+ pwdutils/shadow switch.
+
+---
+Tue Nov 20 07:53:48 UTC 2012 - dims...@opensuse.org
+
+- Fix useradd invocation: -o is useless without -u and newer
+ versions of pwdutils/shadowutils fail on this now.
+
+---
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.DHq2BW/_old 2012-11-30 12:27:51.0 +0100
+++ /var/tmp/diff_new_pack.DHq2BW/_new 2012-11-30 12:27:51.0 +0100
@@ -331,7 +331,7 @@
then
: OK user %{nagios_user} already present
else
-useradd -r -o -g %{nagios_group} -s /bin/false -c User for Nagios -d
%{nagios_localstatedir} %{nagios_user} 2 /dev/null || :
+useradd -r -g %{nagios_group} -s /bin/false -c User for Nagios -d
%{nagios_localstatedir} %{nagios_user} 2 /dev/null || :
%{nnmmsg} Added user %{nagios_user} for package %{name}
fi
# update?
@@ -341,7 +341,11 @@
: # %%{nagios_user} is already in %%nagios_command_group group
else
# Add %%{nagios_user} to %%nagios_command_group.
+%if 0%{?suse_version} 1220
+ usermod -a -G %{nagios_command_group} %{nagios_user}
+%else
groupmod -A %{nagios_user} %{nagios_command_group} 2/dev/null
+%endif
%{nnmmsg} Added %{nagios_user} to %{nagios_command_group}
fi
fi
@@ -438,7 +442,11 @@
: # $wwwusr (default: %%nagios_command_user) is already in Nagios cmd group
else
# modify apache user, adding it to nagios_command_group
+ %if 0%{?suse_version} 1220
+usermod -a -G %{nagios_command_group} $wwwusr
+ %else
groupmod -A $wwwusr %{nagios_command_group} 2/dev/null
+ %endif
%nnmmsg User $wwwusr added to group %{nagios_command_group} so sending
commands to Nagios from the CGI is possible.
fi
# Update ?
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2012-10-19 08:48:06
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is nagios, Maintainer is lr...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2012-06-10
23:19:57.0 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2012-10-19
08:48:09.0 +0200
@@ -1,0 +2,7 @@
+Thu Oct 11 12:24:39 UTC 2012 - l...@linux-schulserver.de
+
+- add virtual provides 'monitoring_daemon' and
+ 'monitoring_webfrontend' to allow 3rd party packages to run also
+ with compatible solutions like icinga
+
+---
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.57tBg0/_old 2012-10-19 08:48:10.0 +0200
+++ /var/tmp/diff_new_pack.57tBg0/_new 2012-10-19 08:48:10.0 +0200
@@ -45,6 +45,7 @@
# PATCH-FIX-OPENSUSE disable Nagios online update checks for distributed
packages
Patch11:nagios-disable_phone_home.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Provides: monitoring_daemon
PreReq: %fillup_prereq
PreReq: %insserv_prereq
PreReq: /bin/logger
@@ -108,6 +109,7 @@
%package www
Summary:Provides the HTML and CGI files for the Nagios web interface
Group: System/Monitoring
+Provides: monitoring_webfrontend
PreReq: /bin/logger
PreReq: apache2
PreReq: coreutils
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2012-06-10 23:19:44
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is nagios, Maintainer is lr...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2012-06-01
07:21:52.0 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2012-06-10
23:19:57.0 +0200
@@ -1,0 +2,14 @@
+Sun Jun 10 16:09:54 UTC 2012 - l...@linux-schulserver.de
+
+- remove checks.c-declare-temp_buffer.patch again as this is
+ fixed with the latest version
+- added manpages for {new,}mini_epn and convertcfg
+
+---
+Mon Jun 4 00:20:17 CEST 2012 - r...@suse.de
+
+- update to 3.4.1
+ * Double quotes in check_command definition break functionality
+ (#332, reverts #86)
+
+---
Old:
checks.c-declare-temp_buffer.patch
nagios-3.4.0.tar.bz2
New:
convertcfg.8
mini_epn.8
nagios-3.4.1.tar.bz2
new_mini_epn.8
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.wiS4Fc/_old 2012-06-10 23:19:59.0 +0200
+++ /var/tmp/diff_new_pack.wiS4Fc/_new 2012-06-10 23:19:59.0 +0200
@@ -20,19 +20,22 @@
Summary:The Nagios Network Monitor
License:GPL-2.0+
Group: System/Monitoring
-Version:3.4.0
+Version:3.4.1
Release:0
Url:http://www.nagios.org/
Source0:%{name}-%{version}.tar.bz2
Source1:rc%{name}
-Source2:%{name}-rpmlintrc
+Source2:convertcfg.8
Source3:%{name}.sysconfig
Source4:suse.de-nagios
Source5:nagios.8
Source6:nagiosstats.8
Source7:nagios-htpasswd.users
+Source8:mini_epn.8
+Source9:new_mini_epn.8
#
Source10: %{name}-README.SuSE
+Source20: %{name}-rpmlintrc
# PATCH-FIX-UPSTREAM Fixes the output of spurious $ signs in commandoutput
(deb#480001)
Patch2: nagios-fix_spurious_dollar_signs_added_to_command_lines.patch
# PATCH-FIX-UPSTREAM unescape hex characters in CGI input - avoid addional '+'
@@ -41,7 +44,6 @@
Patch10:nagios-p1.pl-location.patch
# PATCH-FIX-OPENSUSE disable Nagios online update checks for distributed
packages
Patch11:nagios-disable_phone_home.patch
-Patch14:checks.c-declare-temp_buffer.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq
PreReq: %insserv_prereq
@@ -157,7 +159,6 @@
%patch3 -p1
%patch10 -p0
%patch11 -p1
-%patch14 -p1
find -name .gitignore | xargs rm
# fix p1.pl [dos]
perl -p -i -e 's|\r\n|\n|' contrib/p1.pl
@@ -289,6 +290,9 @@
# install manpages
install -Dm644 %{S:5} %{buildroot}%{_mandir}/man8/%{name}.8
install -Dm644 %{S:6} %{buildroot}%{_mandir}/man8/nagiostats.8
+install -Dm644 %{S:8} %{buildroot}%{_mandir}/man8/mini_epn.8
+install -Dm644 %{S:9} %{buildroot}%{_mandir}/man8/new_mini_epn.8
+install -Dm644 %{S:2} %{buildroot}%{_mandir}/man8/convertcfg.8
# fixing permissions the dirty way
for file in README sample-config/README
sample-config/template-object/README; do
chmod 644 $RPM_BUILD_DIR/%{name}/$file
@@ -454,7 +458,9 @@
%files
%defattr(-,root,root)
%doc Changelog LEGAL LICENSE README README.SuSE sample-config/
+%{_mandir}/man8/convertcfg*
%{_mandir}/man8/%{name}*
+%{_mandir}/man8/*mini_epn*
%_sysconfdir/init.d/%name
%ghost %config(missingok,noreplace) %{nagios_logdir}/config.err
%config(noreplace) %{nagios_sysconfdir}/*.cfg
++ convertcfg.8 ++
'\ t
.\ Title: convertcfg
.\Author: [see the AUTHOR section]
.\ Generator: DocBook XSL Stylesheets v1.75.2 http://docbook.sf.net/
.\ Date: 06/10/2012
.\Manual: convertcfg
.\Source: Nagios
.\ Language: English
.\
.TH CONVERTCFG 8 06/10/2012 Nagios convertcfg
.\ -
.\ * set default formatting
.\ -
.\ disable hyphenation
.nh
.\ disable justification (adjust text to left margin only)
.ad l
.\ -
.\ * MAIN CONTENT STARTS HERE *
.\ -
.SH NAME
convertcfg \- Nagios Config File Converter
.SH SYNOPSIS
.sp
\fBconvertcfg config file object type\fR
.SH DESCRIPTION
.sp
Nagios Config File Converter, written by Ethan Galstad
(egalstad@nagios\.org)\.
.sp
This utility is designed to aide you in converting your old 'host' config
file(s) to the new template-based config file style\. It
commit nagios for openSUSE:Factory
Hello community, here is the log from the commit of package nagios for openSUSE:Factory checked in at 2012-06-01 07:21:40 Comparing /work/SRC/openSUSE:Factory/nagios (Old) and /work/SRC/openSUSE:Factory/.nagios.new (New) Package is nagios, Maintainer is lr...@suse.com Changes: --- /work/SRC/openSUSE:Factory/nagios/nagios.changes2012-05-09 18:32:19.0 +0200 +++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2012-06-01 07:21:52.0 +0200 @@ -1,0 +2,7 @@ +Wed May 23 10:44:57 UTC 2012 - l...@linux-schulserver.de + +- run config check first before restart (init script) +- ignore subsys-unsupported rpmlint check as the init script just + removes it + +--- Other differences: -- ++ nagios-rpmlintrc ++ --- /var/tmp/diff_new_pack.l6CC7t/_old 2012-06-01 07:21:55.0 +0200 +++ /var/tmp/diff_new_pack.l6CC7t/_new 2012-06-01 07:21:55.0 +0200 @@ -2,6 +2,7 @@ addFilter(zero-length.*/usr/share/nagios/stylesheets/common.css); # we need xntp for SLES9 addFilter(init-script-non-var-dependency.*/etc/init.d/nagios xntpd); +addFilter(subsys-unsupported.*/etc/init.d/nagios); # nagios comes with embedded perl addFilter(no-dependency-on.*perl) # The name of that package is used since years - no need to change it for this new 'policy' ++ rcnagios ++ --- /var/tmp/diff_new_pack.l6CC7t/_old 2012-06-01 07:21:55.0 +0200 +++ /var/tmp/diff_new_pack.l6CC7t/_new 2012-06-01 07:21:55.0 +0200 @@ -251,6 +251,7 @@ rc_status ;; restart) + $0 check $0 stop $0 start rc_status -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2011-12-09 09:31:57
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is nagios, Maintainer is lr...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2011-11-07
14:22:57.0 +0100
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2011-12-09
09:31:59.0 +0100
@@ -1,0 +2,6 @@
+Wed Dec 7 14:04:52 UTC 2011 - ch...@computersalat.de
+
+- fix p1.pl
+ * remove ^M (antidos ;))
+
+---
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.JMSneQ/_old 2011-12-09 09:32:05.0 +0100
+++ /var/tmp/diff_new_pack.JMSneQ/_new 2011-12-09 09:32:05.0 +0100
@@ -161,6 +161,8 @@
%patch11 -p0
%patch13 -p0
find -name .gitignore | xargs rm
+# fix p1.pl [dos]
+perl -p -i -e 's|\r\n|\n|' contrib/p1.pl
# fix p1.pl pathname of mini_epn
sed -i 's|p1.pl|%{nagios_libdir}/p1.pl|g' contrib/mini_epn.c
sed -i 's|p1.pl|%{nagios_libdir}/p1.pl|g' contrib/new_mini_epn.c
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2011-12-06 18:30:42
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is nagios, Maintainer is lr...@suse.com
Changes:
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.feUXTa/_old 2011-12-06 18:52:24.0 +0100
+++ /var/tmp/diff_new_pack.feUXTa/_new 2011-12-06 18:52:24.0 +0100
@@ -21,7 +21,7 @@
Summary:The Nagios Network Monitor
Version:3.3.1
Release:1
-License:GPLv2+
+License:GPL-2.0+
Group: System/Monitoring
Url:http://www.nagios.org/
Source0:%{name}-%{version}.tar.bz2
@@ -106,7 +106,7 @@
%package www
-License:GPLv2+
+License:GPL-2.0+
Summary:Provides the HTML and CGI files for the Nagios web interface
Group: System/Monitoring
PreReq: /bin/logger
@@ -135,7 +135,7 @@
%package devel
-License:GPLv2+
+License:GPL-2.0+
Summary:Development files for Nagios
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory checked
in at 2011-11-07 14:22:55
Comparing /work/SRC/openSUSE:Factory/nagios (Old)
and /work/SRC/openSUSE:Factory/.nagios.new (New)
Package is nagios, Maintainer is lr...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/nagios/nagios.changes2011-10-28
19:59:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2011-11-07
14:22:57.0 +0100
@@ -1,0 +2,8 @@
+Tue Nov 1 13:02:02 UTC 2011 - l...@linux-schulserver.de
+
+- skip fdupes call and ignore that we might save 4k on the disk
+ = fixes bnc #721346
+- fix file permissions in docudir
+- use nagios-rpm-macros
+
+---
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.hRDQw0/_old 2011-11-07 14:22:59.0 +0100
+++ /var/tmp/diff_new_pack.hRDQw0/_new 2011-11-07 14:22:59.0 +0100
@@ -18,15 +18,6 @@
Name: nagios
-%define nsusr nagios
-%define nsgrp nagios
-%define cmdusr wwwrun
-%define cmdgrp nagcmd
-%define nslockfile_dir /var/run/%{name}
-%define nslockfile %nslockfile_dir/%{name}.pid
-%define apache2_sysconfdir %(/usr/sbin/apxs2 -q SYSCONFDIR)/conf.d
-# Macro that print mesages to syslog at package (un)install time
-%define nnmmsg logger -t %{name}/rpm
Summary:The Nagios Network Monitor
Version:3.3.1
Release:1
@@ -70,6 +61,7 @@
BuildRequires: mailx
BuildRequires: openssl-devel
BuildRequires: pcre-devel
+BuildRequires: nagios-rpm-macros
BuildRequires: net-tools
BuildRequires: zlib-devel
%if 0%{?suse_version} 1010
@@ -86,12 +78,16 @@
Recommends: perl = %{perl_version}
%endif
%if 0%{?suse_version} 1020
-BuildRequires: fdupes
Recommends: %{name}-plugins
%else
Requires: %{name}-plugins
%endif
Requires: mailx
+%define nslockfile_dir /var/run/%{name}
+%define nslockfile %nslockfile_dir/%{name}.pid
+%define apache2_sysconfdir %(/usr/sbin/apxs2 -q SYSCONFDIR)/conf.d
+# Macro that print mesages to syslog at package (un)install time
+%define nnmmsg logger -t %{name}/rpm
%description
Nagios is a program that will monitor hosts and services on your
@@ -109,11 +105,6 @@
documentation, and development files are built as separate packages
-
-Authors:
-
-Ethan Galstad nag...@nagios.org
-
%package www
License:GPLv2+
Summary:Provides the HTML and CGI files for the Nagios web interface
@@ -143,11 +134,6 @@
included in this package.
-
-Authors:
-
-Ethan Galstad nag...@nagios.org
-
%package devel
License:GPLv2+
Summary:Development files for Nagios
@@ -167,12 +153,6 @@
may compile against.
-
-Authors:
-
-Ethan Galstad nag...@nagios.org
-
-
%prep
%setup -q -n %{name}
%patch2 -p0
@@ -182,8 +162,10 @@
%patch13 -p0
find -name .gitignore | xargs rm
# fix p1.pl pathname of mini_epn
-sed -i 's|p1.pl|%{_prefix}/lib/%{name}/p1.pl|g' contrib/mini_epn.c
-sed -i 's|p1.pl|%{_prefix}/lib/%{name}/p1.pl|g' contrib/new_mini_epn.c
+sed -i 's|p1.pl|%{nagios_libdir}/p1.pl|g' contrib/mini_epn.c
+sed -i 's|p1.pl|%{nagios_libdir}/p1.pl|g' contrib/new_mini_epn.c
+# fix file permissions
+chmod -x Changelog LEGAL LICENSE README
%build
# if the following command fails, then apache dependencies are not met
@@ -192,21 +174,21 @@
--prefix=%{_prefix} \
--exec-prefix=%{_sbindir} \
--bindir=%{_sbindir} \
- --sbindir=%{_prefix}/lib/%{name}/cgi \
- --libexecdir=%{_prefix}/lib/%{name}/plugins \
- --datadir=%{_datadir}/%{name} \
- --sysconfdir=%{_sysconfdir}/%{name} \
+ --sbindir=%{nagios_cgidir} \
+ --libexecdir=%{nagios_plugindir} \
+ --datadir=%{nagios_datadir} \
+ --sysconfdir=%{nagios_sysconfdir} \
--with-init-dir=%{_sysconfdir}/init.d \
- --localstatedir=/var/lib/%{name} \
+ --localstatedir=%{nagios_localstatedir} \
--with-cgiurl=/%{name}/cgi-bin \
--with-htmurl=/%{name} \
--with-httpd-conf=%{apache2_sysconfdir} \
- --with-checkresult-dir=/var/spool/%{name} \
+ --with-checkresult-dir=%{nagios_spooldir} \
--with-lockfile=%{nslockfile} \
- --with-nagios-user=%{nsusr} \
- --with-nagios-group=%{nsgrp} \
- --with-command-user=%{cmdusr} \
- --with-command-group=%{cmdgrp} \
+ --with-nagios-user=%{nagios_user} \
+ --with-nagios-group=%{nagios_group} \
+ --with-command-user=%{nagios_command_user} \
+ --with-command-group=%{nagios_command_group} \
--with-gd-lib=%{_libdir}
commit nagios for openSUSE:Factory
Hello community, here is the log from the commit of package nagios for openSUSE:Factory checked in at 2011-10-28 19:38:12 Comparing /work/SRC/openSUSE:Factory/nagios (Old) and /work/SRC/openSUSE:Factory/.nagios.new (New) Package is nagios, Maintainer is lr...@suse.com Changes: --- /work/SRC/openSUSE:Factory/nagios/nagios.changes2011-09-23 02:14:09.0 +0200 +++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2011-10-28 19:59:05.0 +0200 @@ -1,0 +2,7 @@ +Fri Oct 7 18:37:43 UTC 2011 - l...@linux-schulserver.de + +- also check (and fix) the ownership of the directory where + $status_file lives - Nagios uses this directory for temporary + files + +--- Other differences: -- ++ rcnagios ++ --- /var/tmp/diff_new_pack.CkG6aC/_old 2011-10-28 19:59:27.0 +0200 +++ /var/tmp/diff_new_pack.CkG6aC/_new 2011-10-28 19:59:27.0 +0200 @@ -84,7 +84,7 @@ fi chown $nagios_user:$nagios_cmdgrp $file done -for dir in $check_result_path ; do + for dir in $check_result_path $(dirname $status_file); do if [ ! -d $dir ]; then mkdir -p $dir fi -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory
checked in at Wed Jul 27 11:09:11 CEST 2011.
--- nagios/nagios.changes 2011-07-08 13:42:00.0 +0200
+++ /mounts/work_src_done/STABLE/nagios/nagios.changes 2011-07-26
23:03:30.0 +0200
@@ -1,0 +2,5 @@
+Tue Jul 26 21:06:13 UTC 2011 - andrea.turr...@gmail.com
+
+- fixed typos in nagios.spec
+
+
calling whatdependson for head-i586
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.d7oc0u/_old 2011-07-27 11:08:58.0 +0200
+++ /var/tmp/diff_new_pack.d7oc0u/_new 2011-07-27 11:08:58.0 +0200
@@ -29,7 +29,7 @@
%define nnmmsg logger -t %{name}/rpm
Summary:The Nagios Network Monitor
Version:3.2.3
-Release:5
+Release:7
License:GPLv2+
Group: System/Monitoring
Url:http://www.nagios.org/
@@ -111,7 +111,7 @@
which return the status of the checks to Nagios. The plugins are
available at http://sourceforge.net/projects/nagiosplug
-This package provide core programs for nagios. The web interface,
+This package provides core programs for Nagios. The web interface,
documentation, and development files are built as separate packages
@@ -156,7 +156,7 @@
%package devel
License:GPLv2+
-Summary:Development files for nagios
+Summary:Development files for Nagios
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Requires: gcc
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nagios for openSUSE:Factory
Hello community,
here is the log from the commit of package nagios for openSUSE:Factory
checked in at Fri Jul 8 15:48:35 CEST 2011.
--- nagios/nagios.changes 2010-10-06 22:25:41.0 +0200
+++ /mounts/work_src_done/STABLE/nagios/nagios.changes 2011-07-08
13:42:00.0 +0200
@@ -1,0 +2,27 @@
+Fri Jul 8 11:35:37 UTC 2011 - l...@linux-schulserver.de
+
+- removed setuid bit from /var/spool/nagios - configure the
+ right permissions on service start instead
+- use the right STDERR in the cron script
+- cleanup files section
+
+---
+Tue Jul 5 14:57:40 UTC 2011 - l...@linux-schulserver.de
+
+- integrated cron script from Daniel Kozar (bnc#701208)
+
+---
+Mon Jul 4 17:03:22 UTC 2011 - l...@linux-schulserver.de
+
+- fixes in init script if check_external_commands are enabled
+- added nagios-3.2.3-CVE-2011-1523.patch to fix
+ CVE-2011-1523 (bnc#682966)
+
+---
+Sun Mar 13 16:21:14 UTC 2011 - l...@linux-schulserver.de
+
+- install /var/spool/nagios with setgroup bit set, so all new files
+ in this directory belong to the command group (maybe we should
+ use a permissions file for this?)
+
+---
calling whatdependson for head-i586
New:
nagios-3.2.3-CVE-2011-1523.patch
nagios-htpasswd.users
Other differences:
--
++ nagios.spec ++
--- /var/tmp/diff_new_pack.hRVFoM/_old 2011-07-08 15:46:21.0 +0200
+++ /var/tmp/diff_new_pack.hRVFoM/_new 2011-07-08 15:46:21.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package nagios (Version 3.2.3)
+# spec file for package nagios
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,7 @@
%define nnmmsg logger -t %{name}/rpm
Summary:The Nagios Network Monitor
Version:3.2.3
-Release:1
+Release:5
License:GPLv2+
Group: System/Monitoring
Url:http://www.nagios.org/
@@ -40,6 +40,7 @@
Source4:suse.de-nagios
Source5:nagios.8
Source6:nagiosstats.8
+Source7:nagios-htpasswd.users
#
Source10: %{name}-README.SuSE
# PATCH-FIX-UPSTREAM fix for missing expression in return statement bnc#395203
@@ -56,7 +57,8 @@
Patch10:nagios-p1.pl-location.patch
# PATCH-FIX-OPENSUSE disable Nagios online update checks for distributed
packages
Patch11:nagios-disable_phone_home.patch
-#
+# PATCH-FIX-UPSTREAM fix CVE-2011-1523
+Patch12:nagios-3.2.3-CVE-2011-1523.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq
PreReq: %insserv_prereq
@@ -186,6 +188,7 @@
%patch7 -p0
%patch10 -p0
%patch11 -p0
+%patch12 -p0
find -name .cvsignore | xargs rm
find -name .gitignore | xargs rm
# fix p1.pl pathname of mini_epn
@@ -222,7 +225,7 @@
--enable-event-broker \
--enable-embedded-perl
#
-# %bindir/p1.pl is not a good place for a perl-_module_!
+# /usr/bin/p1.pl is not a good place for a perl-_module_!
#
sed -i 's#@p1pldir@#%{_prefix}/lib/nagios#g' Makefile include/locations.h
sample-config/nagios.cfg
#
@@ -269,6 +272,7 @@
# install event handlers
%{__install} -d -m0755
%{buildroot}%{_prefix}/lib/%{name}/plugins/eventhandlers/
%{__cp} -afpv contrib/eventhandlers/*
%{buildroot}%{_prefix}/lib/%{name}/plugins/eventhandlers/
+find %{buildroot}%{_prefix}/lib/%{name}/plugins/eventhandlers/ -type f -exec
chmod +x {} \;
# install directory for event brokers like ndoutils
%{__install} -d -m0755 %{buildroot}%{_prefix}/lib/%{name}/brokers
# install headers for development package
@@ -302,9 +306,10 @@
# sysconfig script
%{__install} -D -m 0644 %{S:3}
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
# install cronjob (gzip' the logfiles)
-%{__install} -D -m 0640 %{S:4} %{buildroot}%{_sysconfdir}/cron.weekly/%{name}
+%{__install} -D -m 0755 %{S:4} %{buildroot}%{_sysconfdir}/cron.weekly/%{name}
+# install htpasswd file
+%{__install} -m 0640 %{S:7} %{buildroot}%{_sysconfdir}/%{name}/htpasswd.users
# important ghost files
-touch %{buildroot}%{_sysconfdir}/%{name}/htpasswd.users
touch %{buildroot}%{_localstatedir}/lib/%{name}/retention.dat
touch %{buildroot}%{_localstatedir}/lib/%{name}/status.dat
touch %{buildroot}%{_localstatedir}/log/%{name}/config.err
@@ -314,7 +319,7 @@
install -Dm644 %{S:6} %{buildroot}%{_mandir}/man8/nagiosstats.8
# some rpmlint stuff
%if 0%{?suse_version} 1020
-%fdupes -s %{buildroot}
+%fdupes -s
